@komaci/esm-generator 248.1.3 → 248.1.4

package/build/__tests__/genericAstGeneration.spec.js

@@ -982,8 +982,8 @@ describe('generateGqlImportStatement', () => {
             },
             isHoisted: false,
             valid: true,
-            generatedImportAlias: 'gql0',
-            importPath: '@salesforce/gql/123456',
+            generatedImportAlias: '_123456',
+            importPath: '@salesforce/lds/c__component',
         };
         gqlMetadataMap.set('loc_242_801', gqlMetadata);
         const gqlMetadata2 = {
@@ -999,7 +999,7 @@ describe('generateGqlImportStatement', () => {
             },
             isHoisted: false,
             valid: false,
-            generatedImportAlias: 'gql1',
+            generatedImportAlias: '_123456789',
             importPath: 'temp/path',
         };
         gqlMetadataMap.set('loc_826_1316', gqlMetadata2);
@@ -1007,7 +1007,7 @@ describe('generateGqlImportStatement', () => {
         (0, genericAstGeneration_1.generateGqlImportStatements)(gqlMetadataMap, statements);
         expect(statements).toHaveLength(1);
         const code = (0, generator_1.default)(statements[0]).code;
-        expect(code).toBe('import gql0 from "@salesforce/gql/123456";');
+        expect(code).toBe('import { _123456 } from "@salesforce/lds/c__component";');
     });
 });
 //# sourceMappingURL=genericAstGeneration.spec.js.map

package/build/genericAstGeneration.js

@@ -85,7 +85,7 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDocMap,
         (0, common_shared_1.mapExportNamesToAdgs)(scriptKomaciDoc.exports, moduleMetadata);
         //we have a gql tag init the map
         if (input.luvioMetadata && input.luvioMetadata?.gqlTag.length > 0) {
-            (0, common_shared_1.initGqlMetadata)(input.luvioMetadata.gqlTag, moduleMetadata);
+            (0, common_shared_1.initGqlMetadata)(input.luvioMetadata.gqlTag, moduleMetadata, input.moduleInfo.namespace, input.moduleInfo.name);
         }
         if (ast && componentDefaultAdgIndex !== undefined) {
             const { getters, templateStrings, renderFunction } = (0, common_shared_1.getPropertyMetadataFromAst)(ast);
@@ -299,10 +299,18 @@ exports.addImportStatements = addImportStatements;
  * @param statements the ast statement array.
  */
 function generateGqlImportStatements(gqlMetadata, statements) {
+    const importsToMake = new Map();
     gqlMetadata.forEach((value) => {
         if (value.valid) {
-            const importStatement = t.importDeclaration([t.importDefaultSpecifier(t.identifier(value.generatedImportAlias))], t.stringLiteral(value.importPath));
-            statements.push(importStatement);
+            let imports = [];
+            if (!importsToMake.has(value.importPath)) {
+                importsToMake.set(value.importPath, imports);
+                const importStatement = t.importDeclaration(imports, t.stringLiteral(value.importPath));
+                statements.push(importStatement);
+            }
+            imports = importsToMake.get(value.importPath);
+            const aliasIdentifier = t.identifier(value.generatedImportAlias);
+            imports.push(t.importSpecifier(aliasIdentifier, aliasIdentifier));
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/esm-generator",
-    "version": "248.1.3",
+    "version": "248.1.4",
     "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": "248.1.3",
-        "@komaci/static-analyzer": "248.1.3"
+        "@komaci/common-shared": "248.1.4",
+        "@komaci/static-analyzer": "248.1.4"
     },
     "devDependencies": {
-        "@komaci/types": "248.1.3",
+        "@komaci/types": "248.1.4",
         "@lwc-platform/sfdc-lwc-compiler": "248.3.9-3.5.0",
         "@lwc/metadata": "3.5.0-0"
     }