jsii-rosetta 1.74.0 → 1.76.0

package/lib/typescript/imports.js

@@ -10,53 +10,123 @@ function analyzeImportEquals(node, context) {
     (0, ast_utils_1.matchAst)(node.moduleReference, (0, ast_utils_1.nodeOfType)('ref', ts.SyntaxKind.ExternalModuleReference), (bindings) => {
         moduleName = (0, ast_utils_1.stringFromLiteral)(bindings.ref.expression);
     });
+    const sourceName = context.textOf(node.name);
     return {
         node,
         packageName: moduleName,
         moduleSymbol: (0, jsii_utils_1.lookupJsiiSymbolFromNode)(context.typeChecker, node.name),
-        imports: { import: 'full', alias: context.textOf(node.name) },
+        imports: { import: 'full', alias: sourceName, sourceName },
     };
 }
 exports.analyzeImportEquals = analyzeImportEquals;
-function analyzeImportDeclaration(node, context) {
+function analyzeImportDeclaration(node, context, submoduleReferences) {
     const packageName = (0, ast_utils_1.stringFromLiteral)(node.moduleSpecifier);
     const starBindings = (0, ast_utils_1.matchAst)(node, (0, ast_utils_1.nodeOfType)(ts.SyntaxKind.ImportDeclaration, (0, ast_utils_1.nodeOfType)(ts.SyntaxKind.ImportClause, (0, ast_utils_1.nodeOfType)('namespace', ts.SyntaxKind.NamespaceImport))));
     if (starBindings) {
-        return {
+        const sourceName = context.textOf(starBindings.namespace.name);
+        const bareImport = {
             node,
             packageName,
             moduleSymbol: (0, jsii_utils_1.lookupJsiiSymbolFromNode)(context.typeChecker, starBindings.namespace.name),
             imports: {
                 import: 'full',
-                alias: context.textOf(starBindings.namespace.name),
+                alias: sourceName,
+                sourceName,
             },
         };
+        if (submoduleReferences == null) {
+            return bareImport;
+        }
+        const rootSymbol = context.typeChecker.getSymbolAtLocation(starBindings.namespace.name);
+        const refs = rootSymbol && Array.from(submoduleReferences.values()).filter((ref) => ref.root === rootSymbol);
+        // No submodule reference, or only 1 where the path is empty (this is used to signal the use of the bare import so it's not erased)
+        if (refs == null || refs.length === 0 || (refs.length === 1 && refs[0].path.length === 0)) {
+            return [bareImport];
+        }
+        return refs.flatMap(({ lastNode, path, root, submoduleChain }, idx, array) => {
+            if (array
+                .slice(0, idx)
+                .some((other) => other.root === root && context.textOf(other.submoduleChain) === context.textOf(submoduleChain))) {
+                // This would be a duplicate, so we're skipping it
+                return [];
+            }
+            const moduleSymbol = (0, jsii_utils_1.lookupJsiiSymbolFromNode)(context.typeChecker, lastNode);
+            return [
+                {
+                    node,
+                    packageName: [packageName, ...path.map((node) => context.textOf(node))].join('/'),
+                    moduleSymbol,
+                    imports: {
+                        import: 'full',
+                        alias: undefined,
+                        sourceName: context.textOf(submoduleChain),
+                    },
+                },
+            ];
+        });
     }
     const namedBindings = (0, ast_utils_1.matchAst)(node, (0, ast_utils_1.nodeOfType)(ts.SyntaxKind.ImportDeclaration, (0, ast_utils_1.nodeOfType)(ts.SyntaxKind.ImportClause, (0, ast_utils_1.nodeOfType)(ts.SyntaxKind.NamedImports, (0, ast_utils_1.allOfType)(ts.SyntaxKind.ImportSpecifier, 'specifiers')))));
-    const elements = [];
-    if (namedBindings) {
-        elements.push(...namedBindings.specifiers.map((spec) => {
-            // regular import { name }, renamed import { propertyName, name }
-            if (spec.propertyName) {
-                // Renamed import
-                return {
-                    sourceName: context.textOf(spec.propertyName),
-                    alias: context.textOf(spec.name),
-                    importedSymbol: (0, jsii_utils_1.lookupJsiiSymbolFromNode)(context.typeChecker, spec.propertyName),
-                };
+    const extraImports = new Array();
+    const elements = (namedBindings?.specifiers ?? []).flatMap(({ name, propertyName }) => {
+        // regular import { name }
+        // renamed import { propertyName as name }
+        const directBinding = {
+            sourceName: context.textOf(propertyName ?? name),
+            alias: propertyName && context.textOf(name),
+            importedSymbol: (0, jsii_utils_1.lookupJsiiSymbolFromNode)(context.typeChecker, propertyName ?? name),
+        };
+        if (submoduleReferences != null) {
+            const symbol = context.typeChecker.getSymbolAtLocation(name);
+            let omitDirectBinding = false;
+            for (const match of Array.from(submoduleReferences.values()).filter((ref) => ref.root === symbol)) {
+                if (match.path.length === 0) {
+                    // This is a namespace binding that is used as-is (not via a transitive path). It needs to be preserved.
+                    omitDirectBinding = false;
+                    continue;
+                }
+                const subPackageName = [packageName, ...match.path.map((node) => node.getText(node.getSourceFile()))].join('/');
+                const importedSymbol = (0, jsii_utils_1.lookupJsiiSymbolFromNode)(context.typeChecker, match.lastNode);
+                const moduleSymbol = (0, util_1.fmap)(importedSymbol, jsii_utils_1.parentSymbol);
+                const importStatement = extraImports.find((stmt) => {
+                    if (moduleSymbol != null) {
+                        return stmt.moduleSymbol === moduleSymbol;
+                    }
+                    return stmt.packageName === subPackageName;
+                }) ??
+                    extraImports[extraImports.push({
+                        moduleSymbol,
+                        node: match.lastNode,
+                        packageName: subPackageName,
+                        imports: { import: 'selective', elements: [] },
+                    }) - 1];
+                importStatement.imports.elements.push({
+                    sourceName: context.textOf(match.submoduleChain),
+                    importedSymbol,
+                });
+            }
+            if (omitDirectBinding) {
+                return [];
             }
-            return {
-                sourceName: context.textOf(spec.name),
-                importedSymbol: (0, jsii_utils_1.lookupJsiiSymbolFromNode)(context.typeChecker, spec.name),
-            };
-        }));
+        }
+        return [directBinding];
+    });
+    if (submoduleReferences == null) {
+        return {
+            node,
+            packageName,
+            imports: { import: 'selective', elements },
+            moduleSymbol: (0, util_1.fmap)(elements?.[0]?.importedSymbol, jsii_utils_1.parentSymbol),
+        };
     }
-    return {
-        node,
-        packageName,
-        imports: { import: 'selective', elements },
-        moduleSymbol: (0, util_1.fmap)(elements?.[0]?.importedSymbol, jsii_utils_1.parentSymbol),
-    };
+    return [
+        {
+            node,
+            packageName,
+            imports: { import: 'selective', elements },
+            moduleSymbol: (0, util_1.fmap)(elements?.[0]?.importedSymbol, jsii_utils_1.parentSymbol),
+        },
+        ...extraImports,
+    ];
 }
 exports.analyzeImportDeclaration = analyzeImportDeclaration;
 //# sourceMappingURL=imports.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-rosetta",
-  "version": "1.74.0",
+  "version": "1.76.0",
   "description": "Translate TypeScript code snippets to other languages",
   "main": "lib/index.js",
   "bin": {
@@ -20,13 +20,14 @@
     "@types/mock-fs": "^4.13.1",
     "@types/workerpool": "^6.1.1",
     "@types/semver": "^7.3.13",
-    "jsii-build-tools": "1.74.0",
+    "jsii-build-tools": "1.76.0",
+    "jsii-calc": "3.20.120",
     "memory-streams": "^0.1.3",
     "mock-fs": "^5.2.0"
   },
   "dependencies": {
-    "@jsii/check-node": "1.74.0",
-    "@jsii/spec": "1.74.0",
+    "@jsii/check-node": "1.76.0",
+    "@jsii/spec": "1.76.0",
     "commonmark": "^0.30.0",
     "typescript": "~3.9.10",
     "@xmldom/xmldom": "^0.8.6",
@@ -35,7 +36,7 @@
     "semver": "^7.3.8",
     "semver-intersect": "^1.4.0",
     "fast-glob": "^3.2.12",
-    "jsii": "1.74.0"
+    "jsii": "1.76.0"
   },
   "license": "Apache-2.0",
   "author": {

package/test/commands/transliterate.test.js

@@ -132,7 +132,7 @@ export class ClassName implements IInterface {
           "markdown": "# README
 
       \`\`\`csharp
-      IInterface object = new ClassName("this", 1337, new ClassNameProps { Foo = "bar" });
+      var object = new ClassName("this", 1337, new ClassNameProps { Foo = "bar" });
       object.Property = EnumType.OPTION_A;
       object.MethodCall();
 

package/test/jsii-imports.test.js

@@ -213,7 +213,7 @@ describe('no submodule', () => {
                 // eslint-disable-next-line prettier/prettier
                 expectTranslation(trans, lib_1.TargetLanguage.CSHARP, [
                     'using Example.Test.Demo;',
-                    'MyEnum x = MyEnum.OPTION_A;',
+                    'var x = MyEnum.OPTION_A;',
                 ]);
             });
         });
@@ -241,7 +241,7 @@ describe('no submodule', () => {
                 // eslint-disable-next-line prettier/prettier
                 expectTranslation(trans, lib_1.TargetLanguage.CSHARP, [
                     'using Example.Test.Demo;',
-                    'MyEnum x = MyEnum.OPTION_A;',
+                    'var x = MyEnum.OPTION_A;',
                 ]);
             });
         });
@@ -423,7 +423,7 @@ const DEFAULT_JAVA_CODE = [
 ];
 // The implementation part of the CSharp code is always the same
 const DEFAULT_CSHARP_CODE = [
-    'MyClass obj = new MyClass("value", new MyClassProps {',
+    'var obj = new MyClass("value", new MyClassProps {',
     '    MyStruct = new MyStruct {',
     '        Value = "v"',
     '    }',

package/test/translations/calls/shorthand_property.cs

@@ -1,2 +1,2 @@
-string foo = "hello";
-CallFunction(new Struct { Foo = foo });
+var foo = "hello";
+CallFunction(new Struct { Foo = foo });

package/test/translations/calls/will_type_deep_structs_directly_if_type_info_is_available.go

@@ -16,9 +16,9 @@ func foo(x *f64, outer *outerStruct) {
 }
 
 foo(jsii.Number(25), &outerStruct{
-	foo: jsii.Number(3),
-	deeper: &deeperStruct{
-		a: jsii.Number(1),
-		b: jsii.Number(2),
+	Foo: jsii.Number(3),
+	Deeper: &deeperStruct{
+		A: jsii.Number(1),
+		B: jsii.Number(2),
 	},
 })

package/test/translations/expressions/await.cs

@@ -1 +1 @@
-int x = Future();
+var x = Future();

package/test/translations/expressions/backtick_string_w_o_substitutions.cs

@@ -1 +1 @@
-string x = "some string";
+var x = "some string";

package/test/translations/expressions/computed_key.cs

@@ -1,4 +1,4 @@
-string y = "WHY?";
+var y = "WHY?";
 
 IDictionary<string, string> x = new Dictionary<string, string> { { $"key-{y}", "value" } };
 IDictionary<string, boolean> z = new Dictionary<string, boolean> { { y, true } };

package/test/translations/expressions/string_interpolation.cs

@@ -1,5 +1,5 @@
-string x = "world";
-string y = "well";
+var x = "world";
+var y = "well";
 Console.WriteLine($"Hello, {x}, it works {y}!");
 
 // And now a multi-line expression

package/test/translations/expressions/string_literal.cs

@@ -1,5 +1,5 @@
-string literal = @"
-This si a multiline string literal.
+var literal = @"
+This is a multiline string literal.
 
 ""It's cool!"".
 

package/test/translations/expressions/string_literal.go

@@ -1 +1,9 @@
-literal := "\nThis si a multiline string literal.\n\n\"It's cool!\".\n\nYEAH BABY!!\n\nLitteral \\n right here (not a newline!)\n"
+literal := `
+This is a multiline string literal.
+
+"It's cool!".
+
+YEAH BABY!!
+
+Litteral \\n right here (not a newline!)
+`

package/test/translations/expressions/string_literal.java

@@ -1 +1 @@
-String literal = "\nThis si a multiline string literal.\n\n\"It's cool!\".\n\nYEAH BABY!!\n\nLitteral \\n right here (not a newline!)\n";
+String literal = "\nThis is a multiline string literal.\n\n\"It's cool!\".\n\nYEAH BABY!!\n\nLitteral \\n right here (not a newline!)\n";

package/test/translations/expressions/string_literal.py

@@ -1,5 +1,5 @@
 literal = """
-This si a multiline string literal.
+This is a multiline string literal.
 
 "It's cool!".
 

package/test/translations/expressions/struct_assignment.cs

@@ -3,4 +3,4 @@ class Test
     public string Key { get; set; }
 }
 
-Test x = new Test { Key = "value" };
+var x = new Test { Key = "value" };

package/test/translations/imports/selective_import.java

@@ -1,6 +1,6 @@
-import scope.some.module.one;
+import scope.some.module.one.*;
 import scope.some.module.Two;
-import scope.some.module.someThree;
-import scope.some.module.four;
+import scope.some.module.someThree.*;
+import scope.some.module.four.*;
 new Two();
 renamed();

package/test/translations/imports/submodule-import.cs

@@ -0,0 +1,15 @@
+using Amazon.JSII.Tests.CalculatorNamespace;
+using Amazon.JSII.Tests.CalculatorNamespace.HomonymousForwardReferences;
+using Gen.Providers.Aws;
+
+// Access without existing type information
+var awsKmsKeyExamplekms = new Kms.KmsKey(this, "examplekms", new Struct {
+    DeletionWindowInDays = 7,
+    Description = "KMS key 1"
+});
+
+// Accesses two distinct points of the submodule hierarchy
+var myClass = new Submodule.MyClass(new SomeStruct { Prop = Submodule.Child.SomeEnum.SOME });
+
+// Access via a renamed import
+Foo.Consumer.Consume(new ConsumerProps { Homonymous = new Homonymous { StringProperty = "yes" } });

package/test/translations/imports/submodule-import.go

@@ -0,0 +1,23 @@
+import "github.com/aws/jsii/jsii-calc/go/jsiicalc/submodule"
+import "github.com/aws/jsii/jsii-calc/go/jsiicalc/submodule/child"
+import "github.com/aws/jsii/jsii-calc/go/jsiicalc"
+import "github.com/aws/jsii/jsii-calc/go/jsiicalc/foo"
+import "github.com/aws-samples/dummy/gen/providers/aws/kms"
+
+// Access without existing type information
+awsKmsKeyExamplekms := kms.NewKmsKey(this, jsii.String("examplekms"), map[string]interface{}{
+	"deletionWindowInDays": jsii.Number(7),
+	"description": jsii.String("KMS key 1"),
+})
+
+// Accesses two distinct points of the submodule hierarchy
+myClass := submodule.NewMyClass(&SomeStruct{
+	Prop: child.SomeEnum_SOME,
+})
+
+// Access via a renamed import
+foo.Consumer_Consume(&ConsumerProps{
+	Homonymous: &Homonymous{
+		StringProperty: jsii.String("yes"),
+	},
+})

package/test/translations/imports/submodule-import.java

@@ -0,0 +1,17 @@
+import software.amazon.jsii.tests.calculator.submodule.*;
+import software.amazon.jsii.tests.calculator.submodule.child.*;
+import software.amazon.jsii.tests.calculator.homonymousForwardReferences.*;
+import software.amazon.jsii.tests.calculator.homonymousForwardReferences.foo.*;
+import gen.providers.aws.kms.*;
+
+// Access without existing type information
+Object awsKmsKeyExamplekms = KmsKey.Builder.create(this, "examplekms")
+        .deletionWindowInDays(7)
+        .description("KMS key 1")
+        .build();
+
+// Accesses two distinct points of the submodule hierarchy
+MyClass myClass = MyClass.Builder.create().prop(SomeEnum.SOME).build();
+
+// Access via a renamed import
+Consumer.consume(ConsumerProps.builder().homonymous(Homonymous.builder().stringProperty("yes").build()).build());

package/test/translations/imports/submodule-import.py

@@ -0,0 +1,15 @@
+import jsii_calc as calc
+from jsii_calc import homonymous_forward_references as ns
+import ...gen.providers.aws as aws
+
+# Access without existing type information
+aws_kms_key_examplekms = aws.kms.KmsKey(self, "examplekms",
+    deletion_window_in_days=7,
+    description="KMS key 1"
+)
+
+# Accesses two distinct points of the submodule hierarchy
+my_class = calc.submodule.MyClass(prop=calc.submodule.child.SomeEnum.SOME)
+
+# Access via a renamed import
+ns.foo.Consumer.consume(homonymous=ns.foo.Homonymous(string_property="yes"))

package/test/translations/statements/statements_and_newlines.cs

@@ -1,6 +1,6 @@
 public int DoThing()
 {
-    int x = 1; // x seems to be equal to 1
+    var x = 1; // x seems to be equal to 1
     return x + 1;
 }
 
@@ -15,12 +15,12 @@ public boolean DoThing2(int x)
 
 public int DoThing3()
 {
-    int x = 1;
+    var x = 1;
     return x + 1;
 }
 
 public void DoThing4()
 {
-    int x = 1;
+    var x = 1;
     x = 85;
-}
+}

package/test/translations/structs/infer_struct_from_union.go

@@ -1,7 +1,7 @@
 takes(&myProps{
-	struct_: &someStruct{
-		enabled: jsii.Boolean(false),
-		option: jsii.String("option"),
+	Struct: &someStruct{
+		Enabled: jsii.Boolean(false),
+		Option: jsii.String("option"),
 	},
 })
 

package/test/translations/structs/optional_known_struct.go

@@ -1,3 +1,3 @@
 NewVpc(this, jsii.String("Something"), &vpcProps{
-	argument: jsii.Number(5),
+	Argument: jsii.Number(5),
 })

package/test/translations/structs/struct_starting_with_i.go

@@ -1,3 +1,3 @@
 NewIntegration(this, jsii.String("Something"), &integrationOptions{
-	argument: jsii.Number(5),
+	Argument: jsii.Number(5),
 })

package/test/translations/structs/var_new_class_known_struct.cs

@@ -1,3 +1,3 @@
-Vpc vpc = new Vpc(this, "Something", new VpcProps {
+var vpc = new Vpc(this, "Something", new VpcProps {
     Argument = 5
 });

package/test/translations/structs/var_new_class_known_struct.go

@@ -1,3 +1,3 @@
 vpc := NewVpc(this, jsii.String("Something"), &vpcProps{
-	argument: jsii.Number(5),
+	Argument: jsii.Number(5),
 })