@komaci/esm-generator 242.1.0 → 242.1.1

package/build/__tests__/compositionAstGeneration.spec.js

@@ -193,7 +193,7 @@ describe('imageToExpression', () => {
 });
 describe('compositionToArrayExpression', () => {
     const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
-    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, true);
+    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, 0);
     it('could handle a single composition', () => {
         const res = (0, compositionAstGeneration_1.compositionsToArrayExpression)(moduleMetadata, [
             complexDoc.compositions[0].compositions[2].compositions[0],
@@ -215,7 +215,9 @@ describe('compositionToArrayExpression', () => {
 });
 describe('compositionToExpression', () => {
     const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
-    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, true);
+    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, 0);
+    moduleMetadata.adgs.set(0, (0, common_shared_1.initAdgMetadataObject)('adg0'));
+    (0, common_shared_1.addTemplateUsageForAdg)(complexDoc, 0, moduleMetadata);
     it('effectiely builds a conditional expression for a component with isActive', () => {
         const res = (0, compositionAstGeneration_1.compositionToExpression)(moduleMetadata, complexDoc.compositions[0].compositions[2].compositions[1]);
         expect(res.type).toBe('ConditionalExpression');
@@ -237,7 +239,7 @@ describe('compositionToExpression', () => {
 });
 describe('containerToExpression', () => {
     const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
-    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, true);
+    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, 0);
     it('uses the element function when container has a key', () => {
         const container = Object.assign({}, complexDoc.compositions[0].compositions[2].compositions[0]);
         container.key = { type: 'Binding', value: 'test' };
@@ -264,7 +266,7 @@ describe('containerToExpression', () => {
 });
 describe('composedAdgToExpression', () => {
     const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
-    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, true);
+    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, 0);
     it('properly composed composedAdg with no children', () => {
         const res = (0, compositionAstGeneration_1.composedAdgToExpression)(moduleMetadata, complexDoc.compositions[0].compositions[1].compositions[1]
             .compositions[0]);
@@ -283,7 +285,7 @@ describe('composedAdgToExpression', () => {
 });
 describe('iterationToExpression', () => {
     const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
-    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, true);
+    (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(complexDoc, moduleMetadata, 0);
     it('can compose an iteration factory call from a iterator composition', () => {
         const res = (0, compositionAstGeneration_1.iterationToExpression)(moduleMetadata, {
             type: 'Iteration',
@@ -297,7 +299,7 @@ describe('iterationToExpression', () => {
                     type: 'ComposedAdg',
                     input: {
                         type: 'ImportReference',
-                        value: '0/names/0',
+                        value: 't0-0/names/0',
                     },
                     properties: {
                         label: {

package/build/__tests__/fixtures-combined-files/only-named-export-with-template/actual.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=actual.d.ts.map

package/build/__tests__/fixtures-combined-files/only-named-export-with-template/actual.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=actual.js.map

package/build/__tests__/functionAstGeneration.spec.js

@@ -377,8 +377,8 @@ describe('adgToExpression', () => {
         const result = (0, functionAstGeneration_1.adgToExpression)(adgMetadata, moduleMetadata);
         expect(result).not.toBeUndefined();
         expect(result.arguments).toHaveLength(5);
-        expect(result.arguments[0].type).toBe('CallExpression');
-        expect(result.arguments[0].callee.name).toBe('i1');
+        expect(result.arguments[0].type).toBe('Identifier');
+        expect(result.arguments[0].name).toBe('i1');
         expect(result.arguments[1].type).toBe('ObjectExpression');
         expect(result.arguments[2].type).toBe('ArrayExpression');
         expect(result.arguments[2].elements).toHaveLength(0);
@@ -389,7 +389,9 @@ describe('adgToExpression', () => {
 });
 describe('produceErrorAdgFunction', () => {
     it('should produce a resolvable module with an adg with only one node that shows what the error was', () => {
-        const expected = `export default function (fct, ctx) {
+        const expected = `import registerAdgFunction from "komaci/registerAdgFunction";
+
+function adg0(fct, ctx) {
   const {
     adg
   } = fct;
@@ -402,7 +404,9 @@ describe('produceErrorAdgFunction', () => {
   }], (fct, ctx) => {
     return [];
   }, []);
-}`;
+}
+
+export default registerAdgFunction(adg0);`;
         const testError = new Error('something bad happened');
         testError.stack = 'full stack normally';
         const res = (0, functionAstGeneration_1.produceErrorAdgFunction)((0, common_shared_1.initModuleMetadataObject)(), testError);

package/build/__tests__/genericAstGeneration.spec.js

@@ -583,4 +583,295 @@ describe('addImportStatements', () => {
         expect(combinedImport).not.toBeUndefined();
     });
 });
+describe('collectMetadataForNonDefaultTemplates', () => {
+    const templateMap = {};
+    beforeEach(() => {
+        // fixture-template-files/component-refernece
+        templateMap['component-reference'] = {
+            compositions: [
+                {
+                    type: 'Container',
+                    compositions: [
+                        {
+                            type: 'ComposedAdg',
+                            input: {
+                                type: 'ImportReference',
+                                value: '0/names/0',
+                            },
+                            properties: {},
+                        },
+                        {
+                            type: 'ComposedAdg',
+                            input: {
+                                type: 'ImportReference',
+                                value: '0/names/0',
+                            },
+                            properties: {
+                                attribute1: {
+                                    type: 'PrimitiveValue',
+                                    value: 'literalString1',
+                                },
+                                attribute2: {
+                                    type: 'PrimitiveValue',
+                                    value: 'lteralString2',
+                                },
+                            },
+                        },
+                        {
+                            type: 'ComposedAdg',
+                            input: {
+                                type: 'ImportReference',
+                                value: '0/names/0',
+                            },
+                            properties: {
+                                attribute1: {
+                                    type: 'Binding',
+                                    value: 'record',
+                                },
+                                attribute2: {
+                                    type: 'Binding',
+                                    value: 'recordId',
+                                },
+                                attribute3: {
+                                    type: 'Binding',
+                                    value: 'record/data/Name',
+                                },
+                            },
+                        },
+                        {
+                            type: 'ComposedAdg',
+                            input: {
+                                type: 'ImportReference',
+                                value: '0/names/0',
+                            },
+                            properties: {
+                                attribute1: {
+                                    type: 'PrimitiveValue',
+                                    value: 'literalString1',
+                                },
+                                attribute2: {
+                                    type: 'Binding',
+                                    value: 'recordId',
+                                },
+                                attribute3: {
+                                    type: 'PrimitiveValue',
+                                    value: true,
+                                },
+                            },
+                        },
+                        {
+                            type: 'ComposedAdg',
+                            input: {
+                                type: 'ImportReference',
+                                value: '0/names/0',
+                            },
+                            properties: {
+                                attributeUpperCase: {
+                                    type: 'PrimitiveValue',
+                                    value: 'convert kebab to camel',
+                                },
+                            },
+                        },
+                        {
+                            type: 'ComposedAdg',
+                            input: {
+                                type: 'ImportReference',
+                                value: '0/names/0',
+                            },
+                            properties: {
+                                StartsWithUpperCase: {
+                                    type: 'PrimitiveValue',
+                                    value: 'should be StartsWithUpperCase',
+                                },
+                            },
+                        },
+                        {
+                            type: 'ComposedAdg',
+                            input: {
+                                type: 'ImportReference',
+                                value: '1/names/0',
+                            },
+                            properties: {},
+                        },
+                        {
+                            type: 'ComposedAdg',
+                            input: {
+                                type: 'ImportReference',
+                                value: '2/names/0',
+                            },
+                            properties: {
+                                label: {
+                                    type: 'PrimitiveValue',
+                                    value: 'Base',
+                                },
+                                title: {
+                                    type: 'PrimitiveValue',
+                                    value: 'Looks like a link',
+                                },
+                                variant: {
+                                    type: 'PrimitiveValue',
+                                    value: 'base',
+                                },
+                            },
+                        },
+                    ],
+                },
+            ],
+            imports: [
+                {
+                    resourceName: '@salesforce/komaci/c__child1__child1.js',
+                    names: ['default'],
+                },
+                {
+                    resourceName: '@salesforce/komaci/c__upperCaseInName__upperCaseInName.js',
+                    names: ['default'],
+                },
+                {
+                    resourceName: '@salesforce/komaci/lightning__button__button.js',
+                    names: ['default'],
+                },
+            ],
+            exports: {
+                default: {
+                    type: 'CompositionReference',
+                    value: 0,
+                },
+            },
+        };
+        //fixture-template-files/conditional-simple
+        templateMap['conditional-simple'] = {
+            compositions: [
+                {
+                    type: 'Container',
+                    compositions: [
+                        {
+                            type: 'Container',
+                            isActive: {
+                                input: {
+                                    type: 'Binding',
+                                    value: 'someCondition',
+                                },
+                                negate: false,
+                            },
+                            compositions: [
+                                {
+                                    type: 'ComposedAdg',
+                                    input: {
+                                        type: 'ImportReference',
+                                        value: '0/names/0',
+                                    },
+                                    properties: {},
+                                },
+                                {
+                                    type: 'ComposedAdg',
+                                    input: {
+                                        type: 'ImportReference',
+                                        value: '1/names/0',
+                                    },
+                                    properties: {},
+                                },
+                            ],
+                        },
+                    ],
+                },
+            ],
+            exports: {
+                default: {
+                    type: 'CompositionReference',
+                    value: 0,
+                },
+            },
+            imports: [
+                {
+                    resourceName: '@salesforce/komaci/c__child1__child1.js',
+                    names: ['default'],
+                },
+                {
+                    resourceName: '@salesforce/komaci/c__child2__child2.js',
+                    names: ['default'],
+                },
+            ],
+        };
+    });
+    it('collects metadata info for non default templates', () => {
+        const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
+        moduleMetadata.templateKomaciDocMap = templateMap;
+        moduleMetadata.adgGeneratorIndex = 1;
+        const defaultAdg = (0, common_shared_1.initAdgMetadataObject)('adg0');
+        moduleMetadata.adgs.set(0, defaultAdg);
+        const templateImport = {
+            name: 'default',
+            komaciDocImportRef: '0/names/0',
+            importAlias: 'child1',
+            generatorAlias: 'i0',
+            resourceName: './conditional-simple',
+            staticallyAnalyzable: true,
+            templateKomaciDoc: templateMap['conditional-simple'],
+            usedInPriming: true,
+            isFromInternalNamespace: true,
+            isFromSupportedLibrary: true,
+        };
+        moduleMetadata.importsByName.set('child1', templateImport);
+        //assuming that component-reference is the default.
+        (0, genericAstGeneration_1.collectMetadataForNonDefaultTemplates)(moduleMetadata, 'component-reference');
+        expect(moduleMetadata.adgGeneratorIndex).toBe(2);
+        expect(moduleMetadata.importGeneratorIndex).toBe(2);
+        expect(moduleMetadata.importIndexReference.get('t1-0/names/0')).not.toBeUndefined();
+        expect(moduleMetadata.importIndexReference.get('t1-1/names/0')).not.toBeUndefined();
+    });
+    it('collects metadata info for non default templates, multiple non default templates', () => {
+        templateMap['default-template'] = {};
+        const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
+        moduleMetadata.templateKomaciDocMap = templateMap;
+        moduleMetadata.adgGeneratorIndex = 1;
+        const defaultAdg = (0, common_shared_1.initAdgMetadataObject)('adg0');
+        moduleMetadata.adgs.set(0, defaultAdg);
+        const templateImport = {
+            name: 'default',
+            komaciDocImportRef: '0/names/0',
+            importAlias: 'child1',
+            generatorAlias: 'i0',
+            resourceName: './component-reference',
+            staticallyAnalyzable: true,
+            templateKomaciDoc: templateMap['component-reference'],
+            usedInPriming: true,
+            isFromInternalNamespace: true,
+            isFromSupportedLibrary: true,
+        };
+        moduleMetadata.importsByName.set('child1', templateImport);
+        const templateImport2 = {
+            name: 'default',
+            komaciDocImportRef: '1/names/0',
+            importAlias: 'child2',
+            generatorAlias: 'i1',
+            resourceName: './conditional-simple',
+            staticallyAnalyzable: true,
+            templateKomaciDoc: templateMap['conditional-simple'],
+            usedInPriming: true,
+            isFromInternalNamespace: true,
+            isFromSupportedLibrary: true,
+        };
+        moduleMetadata.importsByName.set('child2', templateImport2);
+        //assuming that component-reference is the default.
+        (0, genericAstGeneration_1.collectMetadataForNonDefaultTemplates)(moduleMetadata, 'default-template');
+        expect(moduleMetadata.adgGeneratorIndex).toBe(3);
+        expect(moduleMetadata.importGeneratorIndex).toBe(5);
+        expect(moduleMetadata.importIndexReference.get('t1-0/names/0')).not.toBeUndefined();
+        expect(moduleMetadata.importIndexReference.get('t1-1/names/0')).not.toBeUndefined();
+        expect(moduleMetadata.importIndexReference.get('t1-2/names/0')).not.toBeUndefined();
+        expect(moduleMetadata.importIndexReference.get('t2-0/names/0')).not.toBeUndefined();
+        expect(moduleMetadata.importIndexReference.get('t2-1/names/0')).not.toBeUndefined();
+    });
+    it('no changes when only looking at the default', () => {
+        const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
+        moduleMetadata.templateKomaciDocMap = templateMap;
+        moduleMetadata.adgGeneratorIndex = 1;
+        const defaultAdg = (0, common_shared_1.initAdgMetadataObject)('adg0');
+        moduleMetadata.adgs.set(0, defaultAdg);
+        //assuming that component-reference is the default.
+        (0, genericAstGeneration_1.collectMetadataForNonDefaultTemplates)(moduleMetadata, 'component-reference');
+        expect(moduleMetadata.adgGeneratorIndex).toBe(1);
+        expect(moduleMetadata.importGeneratorIndex).toBe(0);
+    });
+});
 //# sourceMappingURL=genericAstGeneration.spec.js.map

package/build/__tests__/index.spec.js

@@ -41,7 +41,8 @@ describe('Handling errors that throw inside a call to generateKomaciModule', ()
             },
         };
         const res = (0, __1.generateKomaciModule)(input);
-        const expectedModuleFirstHalf = 'export default function (fct, ctx) {\n' +
+        const expectedModuleFirstHalf = 'import registerAdgFunction from "komaci/registerAdgFunction";\n\n' +
+            'function adg0(fct, ctx) {\n' +
             '  const {\n' +
             '    adg\n' +
             '  } = fct;\n' +
@@ -49,10 +50,13 @@ describe('Handling errors that throw inside a call to generateKomaciModule', ()
             '    t: "ErrorFunction",\n' +
             '    c: {\n' +
             '      "error": "[komaci esm-generator] unrecognized input type",\n';
-        const expectedModuleSecondHalf = '    return [];\n' + '  }, []);\n' + '}';
+        const expectedModuleSecondHalf = '    return [];\n' +
+            '  }, []);\n' +
+            '}\n' +
+            '\nexport default registerAdgFunction(adg0);';
         const lines = res.split('\n');
-        const skipStack = lines.slice(0, 8).join('\n') + '\n';
-        const skipStackEnd = lines.slice(lines.length - 3).join('\n');
+        const skipStack = lines.slice(0, 10).join('\n') + '\n';
+        const skipStackEnd = lines.slice(lines.length - 5).join('\n');
         expect(skipStack).toBe(expectedModuleFirstHalf);
         expect(skipStackEnd).toBe(expectedModuleSecondHalf);
     });
@@ -75,7 +79,8 @@ describe('Handling errors that throw inside a call to generateKomaciModule', ()
             throw 'not an error';
         });
         const res = (0, __1.generateKomaciModule)(input);
-        const expectedModuleFirstHalf = 'export default function (fct, ctx) {\n' +
+        const expectedModuleFirstHalf = 'import registerAdgFunction from "komaci/registerAdgFunction";\n\n' +
+            'function adg0(fct, ctx) {\n' +
             '  const {\n' +
             '    adg\n' +
             '  } = fct;\n' +
@@ -83,10 +88,13 @@ describe('Handling errors that throw inside a call to generateKomaciModule', ()
             '    t: "ErrorFunction",\n' +
             '    c: {\n' +
             '      "error": "[komaci] Something that is not an error was thrown"\n';
-        const expectedModuleSecondHalf = '    return [];\n' + '  }, []);\n' + '}';
+        const expectedModuleSecondHalf = '    return [];\n' +
+            '  }, []);\n' +
+            '}\n' +
+            '\nexport default registerAdgFunction(adg0);';
         const lines = res.split('\n');
-        const skipStack = lines.slice(0, 8).join('\n') + '\n';
-        const skipStackEnd = lines.slice(lines.length - 3).join('\n');
+        const skipStack = lines.slice(0, 10).join('\n') + '\n';
+        const skipStackEnd = lines.slice(lines.length - 5).join('\n');
         expect(skipStack).toBe(expectedModuleFirstHalf);
         expect(skipStackEnd).toBe(expectedModuleSecondHalf);
     });
@@ -109,7 +117,8 @@ describe('Handling errors that throw inside a call to generateKomaciModule', ()
             throw undefined;
         });
         const res = (0, __1.generateKomaciModule)(input);
-        const expectedModuleFirstHalf = 'export default function (fct, ctx) {\n' +
+        const expectedModuleFirstHalf = 'import registerAdgFunction from "komaci/registerAdgFunction";\n\n' +
+            'function adg0(fct, ctx) {\n' +
             '  const {\n' +
             '    adg\n' +
             '  } = fct;\n' +
@@ -117,10 +126,13 @@ describe('Handling errors that throw inside a call to generateKomaciModule', ()
             '    t: "ErrorFunction",\n' +
             '    c: {\n' +
             '      "error": "[komaci] Something that is not an error was thrown"\n';
-        const expectedModuleSecondHalf = '    return [];\n' + '  }, []);\n' + '}';
+        const expectedModuleSecondHalf = '    return [];\n' +
+            '  }, []);\n' +
+            '}\n' +
+            '\nexport default registerAdgFunction(adg0);';
         const lines = res.split('\n');
-        const skipStack = lines.slice(0, 8).join('\n') + '\n';
-        const skipStackEnd = lines.slice(lines.length - 3).join('\n');
+        const skipStack = lines.slice(0, 10).join('\n') + '\n';
+        const skipStackEnd = lines.slice(lines.length - 5).join('\n');
         expect(skipStack).toBe(expectedModuleFirstHalf);
         expect(skipStackEnd).toBe(expectedModuleSecondHalf);
     });

package/build/compositionAstGeneration.js

@@ -152,7 +152,7 @@ function composedAdgToExpression(moduleMetadata, composedAdg, iterationContext)
     const params = [];
     // arg1: Input source to the composed graph function.
     if (composedAdg.input.type === 'ImportReference') {
-        const importName = moduleMetadata.importIndexReference.get('t-' + composedAdg.input.value);
+        const importName = moduleMetadata.importIndexReference.get(composedAdg.input.value);
         const importInfo = importName
             ? moduleMetadata.importsByName.get(importName)
             : undefined;

package/build/functionAstGeneration.js

@@ -121,8 +121,7 @@ function adgToExpression(adg, moduleMetadata) {
                 }
                 else {
                     exp = t.identifier(importMetadata.generatorAlias);
-                    const parentFunc = t.callExpression(exp, [types_1.ID.FACTORY, types_1.ID.CONTEXT]);
-                    params.push(parentFunc);
+                    params.push(exp);
                 }
             }
         }
@@ -230,14 +229,17 @@ exports.composeAdgFunction = composeAdgFunction;
  */
 function addExportStatement(adgName, exportName) {
     if (exportName === 'default') {
-        // e.g. `export default adg0`
-        return t.exportDefaultDeclaration(t.identifier(adgName));
+        // e.g. `export default registerAdgFunction(adg0)`
+        return t.exportDefaultDeclaration(t.callExpression(t.identifier('registerAdgFunction'), [
+            t.identifier(adgName),
+        ]));
     }
     else {
-        // e.g. `export const MyComponentClass = adg0`
-        return t.exportNamedDeclaration(t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier(exportName), t.identifier(adgName)),
+        // e.g  `export const Foo = registerAdgFunction(adg0)`
+        const expVar = t.variableDeclarator(t.identifier(exportName), t.callExpression(t.identifier('registerAdgFunction'), [
+            t.identifier(adgName),
         ]));
+        return t.exportNamedDeclaration(t.variableDeclaration('const', [expVar]));
     }
 }
 exports.addExportStatement = addExportStatement;
@@ -309,6 +311,7 @@ function produceErrorAdgFunction(moduleMetadata, error) {
             value: error.stack,
         };
     }
+    const registerAdgImport = t.importDeclaration([t.importDefaultSpecifier(t.identifier('registerAdgFunction'))], t.stringLiteral('komaci/registerAdgFunction'));
     const adg = (0, common_shared_1.initAdgMetadataObject)('adg0');
     adg.compositions = [];
     adg.requiredAdgFactoryFunctions.add(common_shared_1.IdKeys.ADG_FUNC);
@@ -324,13 +327,18 @@ function produceErrorAdgFunction(moduleMetadata, error) {
     adg.requiredAdgFactoryFunctions.add(common_shared_1.IdKeys.ADG_FUNC);
     const adgFuncCall = adgToExpression(adg, moduleMetadata);
     const factoryFuncs = getFactoryFuncDeclaration(adg.requiredAdgFactoryFunctions);
+    const funcDec = t.functionDeclaration(t.identifier(adg.defaultGeneratedName), [types_1.ID.FACTORY, types_1.ID.CONTEXT], t.blockStatement([
+        // it is literally impossible for this to be undefined given the adgToExpression call
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        factoryFuncs,
+        t.returnStatement(adgFuncCall),
+    ]));
     return t.program([
-        t.exportDefaultDeclaration(t.functionDeclaration(null, [types_1.ID.FACTORY, types_1.ID.CONTEXT], t.blockStatement([
-            // it is literally impossible for this to be undefined given the adgToExpression call
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            factoryFuncs,
-            t.returnStatement(adgFuncCall),
-        ]))),
+        registerAdgImport,
+        funcDec,
+        t.exportDefaultDeclaration(t.callExpression(t.identifier('registerAdgFunction'), [
+            t.identifier(adg.defaultGeneratedName),
+        ])),
     ]);
 }
 exports.produceErrorAdgFunction = produceErrorAdgFunction;

package/build/genericAstGeneration.d.ts

@@ -12,11 +12,13 @@ import { Binding, PrimitiveValue, PropertyReference, Value, KomaciDocument } fro
  *
  * @param input Generator input
  * @param scriptKomaciDoc The js komaci doc if it exists
- * @param templateKomaciDoc The tempalte komaci doc if it exists
+ * @param templateKomaciDocMap A map of template komaci docs.
  * @param source string pointing to the source of the script doc if it exists
  * @returns The babel AST for the generated resolvable module
  */
-export declare function generateResolvableModule(input: GeneratorInput, scriptKomaciDoc?: KomaciDocument, templateKomaciDoc?: KomaciDocument, source?: string): t.File;
+export declare function generateResolvableModule(input: GeneratorInput, scriptKomaciDoc?: KomaciDocument, templateKomaciDocMap?: {
+    [fName: string]: KomaciDocument;
+}, source?: string): t.File;
 /**
  * Adds a babel import decleration to the AST for each Komaci import
  *
@@ -104,4 +106,10 @@ export declare function addUndefinedDefaultExport(): t.ExportDefaultDeclaration;
  * @returns ExportNamedDeclaration containing the statement of the dynamic import of the target module
  */
 export declare function exportNamedDeclarationForDynamicImport(moduleName: string, moduleNamespace: string, targetModule?: string): t.ExportNamedDeclaration;
+/**
+ * Helper function to collect metadata for non default templates.
+ * @param templateMap the map of html filenames to its generated komaci document
+ * @param defaultTemplateFileName the name of the default template.
+ */
+export declare function collectMetadataForNonDefaultTemplates(moduleMetadata: ModuleMetadata, defaultTemplateFileName: string): void;
 //# sourceMappingURL=genericAstGeneration.d.ts.map

package/build/genericAstGeneration.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportNamedDeclarationForDynamicImport = exports.addUndefinedDefaultExport = exports.propertyToExpression = exports.functionToExpression = exports.bindingToExpression = exports.primitiveToExpression = exports.valueToExpression = exports.processWireFunctionType = exports.processErrorFunction = exports.addImportStatements = exports.generateResolvableModule = void 0;
+exports.collectMetadataForNonDefaultTemplates = exports.exportNamedDeclarationForDynamicImport = exports.addUndefinedDefaultExport = exports.propertyToExpression = exports.functionToExpression = exports.bindingToExpression = exports.primitiveToExpression = exports.valueToExpression = exports.processWireFunctionType = exports.processErrorFunction = exports.addImportStatements = exports.generateResolvableModule = void 0;
 const common_shared_1 = require("@komaci/common-shared");
 const static_analyzer_1 = require("@komaci/static-analyzer");
 const t = __importStar(require("@babel/types"));
@@ -44,16 +44,24 @@ const CONTEXT_MAPPING = {
  *
  * @param input Generator input
  * @param scriptKomaciDoc The js komaci doc if it exists
- * @param templateKomaciDoc The tempalte komaci doc if it exists
+ * @param templateKomaciDocMap A map of template komaci docs.
  * @param source string pointing to the source of the script doc if it exists
  * @returns The babel AST for the generated resolvable module
  */
-function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDoc, source) {
+function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDocMap, source) {
     const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
     let componentDefaultAdgIndex;
+    if (templateKomaciDocMap) {
+        moduleMetadata.templateKomaciDocMap = templateKomaciDocMap;
+    }
+    //looks for the html file that matches the script filename.
+    const defaultTemplateKomaciDoc = moduleMetadata.templateKomaciDocMap &&
+        moduleMetadata.templateKomaciDocMap[input.moduleInfo.name]
+        ? moduleMetadata.templateKomaciDocMap[input.moduleInfo.name]
+        : undefined;
     const hasScriptKomaciDoc = scriptKomaciDoc && Object.keys(scriptKomaciDoc).length !== 0;
-    const hasTemplateKomaciDoc = templateKomaciDoc && Object.keys(templateKomaciDoc).length !== 0;
-    const combinedModule = scriptKomaciDoc !== undefined && templateKomaciDoc !== undefined;
+    const hasTemplateKomaciDoc = defaultTemplateKomaciDoc && Object.keys(defaultTemplateKomaciDoc).length !== 0;
+    const combinedModule = scriptKomaciDoc !== undefined && defaultTemplateKomaciDoc !== undefined;
     const isBundle = input.moduleInfo.type === 'bundle';
     // start of metadata collection
     if (scriptKomaciDoc) {
@@ -76,13 +84,17 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDoc, sou
             (0, componentAstProcessing_1.processTemplateStrings)(componentDefaultAdgIndex, moduleContext, moduleMetadata, templateStrings);
         }
     }
+    //has a default html file
     if (hasTemplateKomaciDoc) {
         componentDefaultAdgIndex = (0, common_shared_1.reconcileDefaultAdg)(componentDefaultAdgIndex, moduleMetadata);
-        (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(templateKomaciDoc, moduleMetadata, true);
-        (0, common_shared_1.addTemplateUsageForDefaultAdg)(templateKomaciDoc, componentDefaultAdgIndex, moduleMetadata);
-        if (isBundle && !hasScriptKomaciDoc) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            (0, common_shared_1.upliftFakePropsFromTemplate)(moduleMetadata.adgs.get(componentDefaultAdgIndex));
+        if (componentDefaultAdgIndex !== undefined) {
+            (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(defaultTemplateKomaciDoc, moduleMetadata, componentDefaultAdgIndex);
+            (0, common_shared_1.addTemplateUsageForAdg)(defaultTemplateKomaciDoc, componentDefaultAdgIndex, moduleMetadata);
+            if (isBundle && !hasScriptKomaciDoc) {
+                (0, common_shared_1.upliftFakePropsFromTemplate)(
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                moduleMetadata.adgs.get(componentDefaultAdgIndex));
+            }
         }
     }
     // for script only docs we assume there there is still a html file around so we build the import to reference that html
@@ -92,6 +104,11 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDoc, sou
         newImport.isFromSupportedLibrary = true;
         newImport.generatorAlias = 'comp1';
     }
+    //if there is a default komaci doc, its already processed. need to process the rest of the template komaci docs that aren't the default if there is any.
+    if (!hasTemplateKomaciDoc ||
+        Object.keys(moduleMetadata.templateKomaciDocMap).length > 1) {
+        collectMetadataForNonDefaultTemplates(moduleMetadata, input.moduleInfo.name);
+    }
     // all metadata collected at this point, time to start building ast
     const statements = [];
     const program = t.program(statements);
@@ -103,7 +120,7 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDoc, sou
     if (!combinedModule && hasTemplateKomaciDoc) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const adg = moduleMetadata.adgs.get(componentDefaultAdgIndex);
-        const compositionsArray = (0, compositionAstGeneration_1.compositionsToArrayExpression)(moduleMetadata, templateKomaciDoc.compositions) || t.arrayExpression([]);
+        const compositionsArray = (0, compositionAstGeneration_1.compositionsToArrayExpression)(moduleMetadata, defaultTemplateKomaciDoc.compositions) || t.arrayExpression([]);
         // Create default export of the main template function.
         // e.g. `export default function (fct, ctx) {...}`
         const params = [types_1.ID.FACTORY, types_1.ID.CONTEXT];
@@ -119,6 +136,11 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDoc, sou
         statements.push(t.exportDefaultDeclaration(t.functionDeclaration(null, params, body)));
     }
     else {
+        if (combinedModule || hasScriptKomaciDoc) {
+            // add import for registerAdgFunction
+            const registerAdgImport = t.importDeclaration([t.importDefaultSpecifier(t.identifier('registerAdgFunction'))], t.stringLiteral('komaci/registerAdgFunction'));
+            statements.push(registerAdgImport);
+        }
         // uplift local functions from default exported adg
         if (componentDefaultAdgIndex !== undefined) {
             const defaultAdg = moduleMetadata.adgs.get(componentDefaultAdgIndex);
@@ -597,4 +619,26 @@ function exportNamedDeclarationForDynamicImport(moduleName, moduleNamespace, tar
     ]));
 }
 exports.exportNamedDeclarationForDynamicImport = exportNamedDeclarationForDynamicImport;
+/**
+ * Helper function to collect metadata for non default templates.
+ * @param templateMap the map of html filenames to its generated komaci document
+ * @param defaultTemplateFileName the name of the default template.
+ */
+function collectMetadataForNonDefaultTemplates(moduleMetadata, defaultTemplateFileName) {
+    moduleMetadata.importsByName.forEach((importMetadata) => {
+        if ((0, common_shared_1.isTemplateImport)(importMetadata)) {
+            const templateKomaciDoc = importMetadata
+                .templateKomaciDoc;
+            const segs = (0, common_shared_1.getFilepathSegments)(importMetadata.resourceName);
+            if (segs[1].replace('/', '') !== defaultTemplateFileName) {
+                const templateAdgIndex = moduleMetadata.adgGeneratorIndex++;
+                const templateAdgMetadata = (0, common_shared_1.initAdgMetadataObject)(`adg${templateAdgIndex}`);
+                moduleMetadata.adgs.set(templateAdgIndex, templateAdgMetadata);
+                (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(templateKomaciDoc, moduleMetadata, templateAdgIndex);
+                (0, common_shared_1.addTemplateUsageForAdg)(templateKomaciDoc, templateAdgIndex, moduleMetadata);
+            }
+        }
+    });
+}
+exports.collectMetadataForNonDefaultTemplates = collectMetadataForNonDefaultTemplates;
 //# sourceMappingURL=genericAstGeneration.js.map

package/build/index.js

@@ -55,15 +55,14 @@ exports.generateKomaciModule = generateKomaciModule;
 function processGeneratorInputAndState(input) {
     if (input.moduleInfo.type === 'file') {
         // Determine file type based on extension in file name.
-        const segments = input.moduleInfo.fileName.split('.');
-        if (segments.length < 2) {
-            throw new Error(types_1.ERROR_PREFIX + 'unable to determine file type');
-        }
+        const segments = (0, common_shared_1.getFilepathSegments)(input.moduleInfo.fileName);
         const fileExt = segments[segments.length - 1];
         let sourceFile;
         const source = (0, componentAstProcessing_1.getComponentSrcJs)(input);
         if (fileExt === 'html') {
-            sourceFile = (0, genericAstGeneration_1.generateResolvableModule)(input, undefined, input.moduleInfo.komaciDoc, source);
+            const templateMap = {};
+            templateMap[input.moduleInfo.name] = input.moduleInfo.komaciDoc;
+            sourceFile = (0, genericAstGeneration_1.generateResolvableModule)(input, undefined, templateMap, source);
         }
         else if (fileExt === 'js') {
             sourceFile = (0, genericAstGeneration_1.generateResolvableModule)(input, input.moduleInfo.komaciDoc, undefined, source);
@@ -82,15 +81,9 @@ function processGeneratorInputAndState(input) {
         let sourceFile;
         for (const [fullFilename, komaciDoc] of Object.entries(docMap)) {
             // Determine file type based on extension in file name.
-            const segments = fullFilename.split('.');
-            if (segments.length < 2) {
-                throw new Error(types_1.ERROR_PREFIX + 'unable to determine file type');
-            }
+            const segments = (0, common_shared_1.getFilepathSegments)(fullFilename);
             filename = segments[0]; // the filename, up to but not including, the file separator character
             fileExt = segments[segments.length - 1]; // filename extension, not including the separator
-            if (filename !== input.moduleInfo.name) {
-                continue; // ignore files whose name do not match moduleInfo.name
-            }
             let filesObj = {};
             // check for existing map entry in order to append to it
             // to support multiple files per filetype in the future
@@ -112,11 +105,9 @@ function processGeneratorInputAndState(input) {
         const komaciJSDoc = filesMap && filesMap['js'] && filesMap['js'][input.moduleInfo.name]
             ? filesMap['js'][input.moduleInfo.name]
             : {};
-        const komaciHTMLDoc = filesMap && filesMap['html'] && filesMap['html'][input.moduleInfo.name]
-            ? filesMap['html'][input.moduleInfo.name]
-            : {};
+        const komaciHtmlDocMap = filesMap && filesMap['html'] ? filesMap['html'] : {};
         // eslint-disable-next-line prefer-const
-        sourceFile = (0, genericAstGeneration_1.generateResolvableModule)(input, komaciJSDoc, komaciHTMLDoc, source);
+        sourceFile = (0, genericAstGeneration_1.generateResolvableModule)(input, komaciJSDoc, komaciHtmlDocMap, source);
         // Generate source from constructed AST.
         const babelOutput = (0, generator_1.default)(sourceFile);
         return babelOutput.code;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/esm-generator",
-    "version": "242.1.0",
+    "version": "242.1.1",
     "description": "Komaci generator for ADG ES modules",
     "homepage": "https://komaci.dev/",
     "repository": {
@@ -28,13 +28,13 @@
     "dependencies": {
         "@babel/core": "^7.9.0",
         "@babel/generator": "^7.9.0",
-        "@komaci/common-shared": "242.1.0",
-        "@komaci/static-analyzer": "242.1.0",
+        "@komaci/common-shared": "242.1.1",
+        "@komaci/static-analyzer": "242.1.1",
         "o11y": "^240.7.0"
     },
     "devDependencies": {
         "@babel/types": "^7.9.0",
-        "@komaci/types": "242.1.0",
+        "@komaci/types": "242.1.1",
         "@lwc-platform/sfdc-lwc-compiler": "^2.18.0-240.2"
     }
 }