Convert mod.utilities from a method to a function.

pulumi · Nov 11, 2022 · 59e583b · 59e583b
1 parent f0b3513
commit 59e583b
Show file tree

Hide file tree

Showing 60 changed files with 99 additions and 99 deletions.
diff --git a/pkg/codegen/nodejs/gen.go b/pkg/codegen/nodejs/gen.go
@@ -1581,13 +1581,13 @@ func (mod *modContext) sdkImportsWithPath(nested, utilities bool, dirpath string
 	}
 	// Add utility imports if enabled.
 	if utilities {
-		imports = append(imports, mod.utilitiesImport(relRoot))
+		imports = append(imports, utilitiesImport(relRoot))
 	}
 
 	return imports
 }
 
-func (mod *modContext) utilitiesImport(relRoot string) string {
+func utilitiesImport(relRoot string) string {
 	return fmt.Sprintf("import * as utilities from \"%s/utilities\";", relRoot)
 }
 
@@ -2236,7 +2236,7 @@ func (mod *modContext) genIndex(exports []fileInfo) string {
 		imports = mod.sdkImports(false, true)
 	} else if len(children) > 0 || len(mod.functions) > 0 {
 		// Even if there are no resources, exports ref utilities.
-		imports = append(imports, mod.utilitiesImport(mod.getRelativePath()))
+		imports = append(imports, utilitiesImport(mod.getRelativePath()))
 	}
 	mod.genHeader(w, imports, nil, nil)
 

diff --git a/pkg/codegen/testing/test/testdata/azure-native-nested-types/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/azure-native-nested-types/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/cyclic-types/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/cyclic-types/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/dash-named-schema/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/dash-named-schema/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/dashed-import-schema/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/dashed-import-schema/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/different-enum/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/different-enum/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/enum-reference/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/enum-reference/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/external-enum/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/external-enum/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/external-node-compatibility/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/external-node-compatibility/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/hyphen-url/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/hyphen-url/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/naming-collisions/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/naming-collisions/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/nested-module-thirdparty/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/nested-module-thirdparty/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/nested-module/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/nested-module/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/plain-and-default/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/plain-and-default/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/plain-schema-gh6957/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/plain-schema-gh6957/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },

diff --git a/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/tsconfig.json b/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-		"baseUrl": ".",
+        "baseUrl": ".",
         "outDir": "bin",
         "target": "es2016",
         "module": "commonjs",
@@ -12,7 +12,7 @@
         "noFallthroughCasesInSwitch": true,
         "forceConsistentCasingInFileNames": true,
 		"paths": {
-			"@/*": ["*"]
+            "@/*": ["*"]
 		},
         "strict": true
     },