[sdk/nodejs] Avoid circular dependencies in modules

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## HEAD (Unreleased)
 
+- Avoid circular dependencies in NodeJS SDK modules (https://github.com/pulumi/pulumi-kubernetes/pull/1558)
+
 ## 3.1.0 (April 29, 2021)
 
 - Update Helm to v3.5.4 and client-go to v0.20.4 (https://github.com/pulumi/pulumi-kubernetes/pull/1536)

provider/cmd/pulumi-gen-kubernetes/main.go

@@ -167,6 +167,7 @@ func writeNodeJSClient(pkg *schema.Package, outdir, templateDir string) {
 	}
 
 	templateResources := gen.TemplateResources{}
+	packages := codegen.StringSet{}
 	for _, resource := range resources {
 		if resource.Package == "" {
 			continue
@@ -185,10 +186,13 @@ func writeNodeJSClient(pkg *schema.Package, outdir, templateDir string) {
 			tr.Properties = append(tr.Properties, tp)
 		}
 		templateResources.Resources = append(templateResources.Resources, tr)
+		groupPackage := strings.Split(resource.Package, ".")[0]
+		packages.Add(groupPackage)
 	}
 	sort.Slice(templateResources.Resources, func(i, j int) bool {
 		return templateResources.Resources[i].Token < templateResources.Resources[j].Token
 	})
+	templateResources.Packages = packages.SortedValues()
 
 	overlays := map[string][]byte{
 		"apiextensions/customResource.ts": mustLoadFile(filepath.Join(templateDir, "apiextensions", "customResource.ts")),

provider/pkg/gen/nodejs-templates/yaml/yaml.tmpl

@@ -19,7 +19,9 @@ import * as pulumi from "@pulumi/pulumi";
 import * as fs from "fs";
 import * as glob from "glob";
 import fetch from "node-fetch";
-import * as k8s from "../index";
+{{- range .Packages}}
+import * as {{.}} from "../{{.}}";
+{{- end}}
 import * as outputs from "../types/output";
 import { getVersion } from "../utilities";
 
@@ -40,8 +42,8 @@ export abstract class CollectionComponentResource extends pulumi.ComponentResour
      *     getResource("apps/v1/Deployment", "nginx")
      */
 {{- range .Resources}}
-    public getResource(groupVersionKind: "{{.GVK}}", name: string): pulumi.Output<k8s.{{.Package}}.{{.Name}}>;
-    public getResource(groupVersionKind: "{{.GVK}}", namespace: string, name: string): pulumi.Output<k8s.{{.Package}}.{{.Name}}>;
+    public getResource(groupVersionKind: "{{.GVK}}", name: string): pulumi.Output<{{.Package}}.{{.Name}}>;
+    public getResource(groupVersionKind: "{{.GVK}}", namespace: string, name: string): pulumi.Output<{{.Package}}.{{.Name}}>;
 {{- end}}
     public getResource(groupVersionKind: string, namespaceOrName: string, name?: string): pulumi.Output<pulumi.CustomResource> {
         return this.getResourceImpl(groupVersionKind, namespaceOrName, name);
@@ -517,13 +519,13 @@ export interface ConfigOpts {
         case "{{.GVK}}":
             return [id.apply(id => ({
                 name: `{{.GVK}}::${id}`,
-                resource: new k8s.{{.Package}}.{{.Name}}(id, obj, opts),
+                resource: new {{.Package}}.{{.Name}}(id, obj, opts),
             }))];
 {{- end}}
         default:
             return [id.apply(id => ({
                 name: `${apiVersion}/${kind}::${id}`,
-                resource: new k8s.apiextensions.CustomResource(id, obj, opts),
+                resource: new apiextensions.CustomResource(id, obj, opts),
             }))];
     }
 }

provider/pkg/gen/types.go

@@ -63,6 +63,7 @@ func (tr TemplateResource) IsListKind() bool {
 // TemplateResources holds a list of TemplateResource structs than can be filtered for codegen purposes.
 type TemplateResources struct {
 	Resources []TemplateResource
+	Packages  []string
 }
 
 // ListKinds returns a sorted list of resources that are a List kind.