@komaci/esm-generator 244.1.2 → 244.1.3

package/build/__tests__/compositionAstGeneration.spec.js

@@ -419,5 +419,40 @@ describe('getCompositionConfig', () => {
         const code = (0, generator_1.default)(res).code;
         expect(code).toBe('{}');
     });
+    it('can handle a prop name having special characters', () => {
+        const res = (0, compositionAstGeneration_1.getCompositionConfig)({
+            type: 'ComposedAdg',
+            input: {
+                type: 'ImportReference',
+                value: '0/names/0',
+            },
+            properties: {
+                'foo:baz': {
+                    type: 'PrimitiveValue',
+                    value: 'bar',
+                },
+                'baz:foo': {
+                    type: 'Binding',
+                    value: 'bar',
+                },
+                baz: {
+                    type: 'Binding',
+                    value: 'bar',
+                },
+                foo: {
+                    type: 'PrimitiveValue',
+                    value: 'bar',
+                },
+            },
+        });
+        expect(res.properties[0].value
+            .properties[0].key.type).toBe('Identifier');
+        expect(res.properties[0].value
+            .properties[1].key.type).toBe('StringLiteral');
+        expect(res.properties[0].value
+            .properties[2].key.type).toBe('Identifier');
+        expect(res.properties[0].value
+            .properties[3].key.type).toBe('StringLiteral');
+    });
 });
 //# sourceMappingURL=compositionAstGeneration.spec.js.map

package/build/__tests__/genericAstGeneration.spec.js

@@ -494,6 +494,7 @@ describe('addImportStatements', () => {
     (0, common_shared_1.composeImportMetadata)('adg', '@salesforce/komaci/c__foo__foo.js', true, '4/names/0', moduleMetadata);
     moduleMetadata.importsByNamespace.set('lightning/uiTestingApi', {
         names: new Set(['default', 'regularImport']),
+        originalNames: new Set(['default', 'regularImport']),
         isDefaultSpecifier: true,
         isSupported: true,
         isNamespaceSpecifier: false,
@@ -501,6 +502,7 @@ describe('addImportStatements', () => {
     });
     moduleMetadata.importsByNamespace.set('badImport', {
         names: new Set(['tes1', 'tes2']),
+        originalNames: new Set(['tes1', 'tes2']),
         isDefaultSpecifier: false,
         isSupported: false,
         isNamespaceSpecifier: false,
@@ -508,6 +510,7 @@ describe('addImportStatements', () => {
     });
     moduleMetadata.importsByNamespace.set('@salesforce/labels', {
         names: new Set(['*']),
+        originalNames: new Set(['*']),
         isDefaultSpecifier: false,
         isSupported: true,
         isNamespaceSpecifier: true,
@@ -515,6 +518,7 @@ describe('addImportStatements', () => {
     });
     moduleMetadata.importsByNamespace.set('lightning/uiRecordApi', {
         names: new Set(['tes3', 'tes4', 'tes5']),
+        originalNames: new Set(['tes3', 'tes4', 'tes5']),
         isDefaultSpecifier: false,
         isSupported: true,
         isNamespaceSpecifier: false,
@@ -522,6 +526,7 @@ describe('addImportStatements', () => {
     });
     moduleMetadata.importsByNamespace.set('@salesforce/komaci/c__foo__foo.js', {
         names: new Set(['adg']),
+        originalNames: new Set(['adg']),
         isDefaultSpecifier: false,
         isSupported: true,
         isNamespaceSpecifier: false,

package/build/compositionAstGeneration.js

@@ -28,6 +28,7 @@ const common_shared_1 = require("@komaci/common-shared");
 const t = __importStar(require("@babel/types"));
 const genericAstGeneration_1 = require("./genericAstGeneration");
 const types_1 = require("./types");
+const hasSpecialCharacters = /^([0-9]+|(.*[^A-Za-z0-9]+.*))$/;
 /**
  * Convert an array of Komaci Compositions into a babel array of expressions.
  * This is used for both the top-level compositions in the Komaci Doc, as well
@@ -285,10 +286,14 @@ function getCompositionConfig(composition, componentId, iterationContext) {
             for (const propName of sortedCompositions) {
                 const prop = composition.properties[propName];
                 if (prop.type === 'Binding') {
-                    props.push(t.objectProperty(t.identifier(propName), (0, genericAstGeneration_1.bindingToExpression)(prop, iterationContext)));
+                    props.push(t.objectProperty(hasSpecialCharacters.test(propName)
+                        ? t.stringLiteral(propName)
+                        : t.identifier(propName), (0, genericAstGeneration_1.bindingToExpression)(prop, iterationContext)));
                 }
                 else if (prop.type === 'PrimitiveValue') {
-                    props.push(t.objectProperty(t.identifier(propName), (0, genericAstGeneration_1.primitiveToExpression)(prop)));
+                    props.push(t.objectProperty(hasSpecialCharacters.test(propName)
+                        ? t.stringLiteral(propName)
+                        : t.identifier(propName), (0, genericAstGeneration_1.primitiveToExpression)(prop)));
                 }
             }
             config.push(t.objectProperty(types_1.ID.PROPS, t.objectExpression(props)));

package/build/genericAstGeneration.js

@@ -215,6 +215,7 @@ exports.generateResolvableModule = generateResolvableModule;
  */
 function addImportStatements(moduleMetadata, statements, options) {
     if (moduleMetadata.importsByName.size > 0) {
+        const seenImports = new Set();
         const imports = Array.from(moduleMetadata.importsByName.values())
             .sort((a, b) => {
             if (a.resourceName < b.resourceName) {
@@ -227,7 +228,16 @@ function addImportStatements(moduleMetadata, statements, options) {
                 return 0;
             }
         })
-            .filter((value) => value.isFromInternalNamespace && value.usedInPriming);
+            .filter((value) => {
+            // sometimes we can have multiple import names mapped to the same import. so we want to dedup those before running them through composition
+            const isComposable = !seenImports.has(value.generatorAlias) &&
+                value.isFromInternalNamespace &&
+                value.usedInPriming;
+            if (isComposable) {
+                seenImports.add(value.generatorAlias);
+            }
+            return isComposable;
+        });
         let i = 0;
         while (i < imports.length) {
             const specifiers = [];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/esm-generator",
-    "version": "244.1.2",
+    "version": "244.1.3",
     "description": "Komaci generator for ADG ES modules",
     "homepage": "https://komaci.dev/",
     "repository": {
@@ -29,11 +29,11 @@
         "@babel/core": "^7.9.0",
         "@babel/generator": "^7.9.0",
         "@babel/types": "^7.9.0",
-        "@komaci/common-shared": "244.1.2",
-        "@komaci/static-analyzer": "244.1.2"
+        "@komaci/common-shared": "244.1.3",
+        "@komaci/static-analyzer": "244.1.3"
     },
     "devDependencies": {
-        "@komaci/types": "244.1.2",
+        "@komaci/types": "244.1.3",
         "@lwc-platform/sfdc-lwc-compiler": "242.15.1-2.28.0",
         "@lwc/metadata": "^2.28.0-0"
     }