@komaci/esm-generator 242.1.5 → 242.1.6

package/build/__tests__/adgAstGeneration.spec.js

@@ -14,6 +14,7 @@ describe('getAdgFunctionBody', () => {
     });
     it('only contains a return statement if no factory functions are needed', () => {
         const adg = (0, common_shared_1.initAdgMetadataObject)('adg0');
+        adg.requiredAdgFactoryFunctions.delete(common_shared_1.IdKeys.ADG_FUNC);
         const res = (0, functionAstGeneration_1.getAdgFunctionBody)(adg, moduleMetadata);
         expect(res.body).toHaveLength(1);
         expect(res.body[0].type).toBe('ReturnStatement');

package/build/__tests__/fixtures-combined-files-multiple-templates/invalid-renderFunc-no-valid-imports/c/component/component.d.ts

@@ -0,0 +1,4 @@
+export default class KomaciAction {
+    render(): any;
+}
+//# sourceMappingURL=component.d.ts.map

package/build/__tests__/fixtures-combined-files-multiple-templates/invalid-renderFunc-no-valid-imports/c/component/component.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lwc_1 = require("lwc");
+const shared_1 = __importDefault(require("force/shared"));
+class KomaciAction extends lwc_1.LightningElement {
+    render() {
+        return shared_1.default; //invalid, not returning an imported template.
+    }
+}
+exports.default = KomaciAction;
+//# sourceMappingURL=component.js.map

package/build/__tests__/fixtures-combined-files-multiple-templates/valid-render-function-complex/lightning/component/component.d.ts

@@ -0,0 +1,5 @@
+export default class KomaciAction {
+    showTemplateOne: boolean;
+    render(): any;
+}
+//# sourceMappingURL=component.d.ts.map

package/build/__tests__/fixtures-combined-files-multiple-templates/valid-render-function-complex/lightning/component/component.js

@@ -0,0 +1,31 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lwc_1 = require("lwc");
+const component_html_1 = __importDefault(require("./component.html"));
+const templateOne_html_1 = __importDefault(require("./templateOne.html"));
+class KomaciAction extends lwc_1.LightningElement {
+    constructor() {
+        super(...arguments);
+        this.showTemplateOne = true;
+    }
+    render() {
+        if (this.showTemplateOne) {
+            return templateOne_html_1.default;
+        }
+        return component_html_1.default;
+    }
+}
+__decorate([
+    lwc_1.api
+], KomaciAction.prototype, "showTemplateOne", void 0);
+exports.default = KomaciAction;
+//# sourceMappingURL=component.js.map

package/build/__tests__/fixtures-combined-files-multiple-templates/valid-render-function-simple/lightning/component/component.d.ts

@@ -0,0 +1,5 @@
+export default class Component {
+    showTemplateOne: boolean;
+    render(): any;
+}
+//# sourceMappingURL=component.d.ts.map

package/build/__tests__/fixtures-combined-files-multiple-templates/valid-render-function-simple/lightning/component/component.js

@@ -0,0 +1,27 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lwc_1 = require("lwc");
+const component_html_1 = __importDefault(require("./component.html"));
+class Component extends lwc_1.LightningElement {
+    constructor() {
+        super(...arguments);
+        this.showTemplateOne = true;
+    }
+    render() {
+        return component_html_1.default;
+    }
+}
+__decorate([
+    lwc_1.api
+], Component.prototype, "showTemplateOne", void 0);
+exports.default = Component;
+//# sourceMappingURL=component.js.map

package/build/__tests__/fixtures-source-code/generalMockSourceCode.d.ts

@@ -2,4 +2,7 @@ export declare const mockOneBadGetter = "import { LightningElement, wire, api }
 export declare const mockOnlyBadGetter = "import { LightningElement, wire, api } from 'lwc';\nimport { getRecord } from 'lightning/uiRecordApi';\nimport findContacts from '@salesforce/apex/ContactController.findContacts';\n\nexport default class Example extends LightningElement {\n    @api\n    recordId;\n\n    get searchKey() {\n        const recordName = this.record?.data?.Fields?.name;\n        this.blah = \"asdf\";  //invalid\n        if(recordName) {\n            return '%' + recordName + '%';\n        }\n        return 'Default Search Key';\n    }\n\n    @wire(getRecord, { recordId: '$recordId', layoutTypes: ['Full'], modes: ['View'] })\n    record = {};\n\n    @wire(findContacts, { searchKey: '$searchKey' })\n    contacts;\n}";
 export declare const oneGoodMockWithGetterImportUse = "import { LightningElement, wire, api } from 'lwc';\nimport { getRecord } from 'lightning/uiRecordApi';\nimport findContacts from '@salesforce/apex/ContactController.findContacts';\nimport Foo from 'force/shared';\nimport { Bar } from 'force/shared';\n\nexport default class Example extends LightningElement {\n    @api\n    recordId;\n\n    get searchKey() {\n        const recordName = this.record?.data?.Fields?.name;\n        this.blah = \"asdf\";  //invalid\n        if(recordName) {\n            return '%' + recordName + '%';\n        }\n        return 'Default Search Key';\n    }\n\n    get perfectlyGood() {\n        const recordName = this.record?.data?.Fields?.name;\n        return Foo;\n    }\n\n    get perfectlyGood2() {\n        return Bar;\n    }\n\n    @wire(getRecord, { recordId: '$recordId', layoutTypes: ['Full'], modes: ['View'] })\n    record = {};\n\n    @wire(findContacts, { searchKey: '$searchKey', filter: '$perfectlyGood', split: '$perfectlyGood2' })\n    contacts;\n}";
 export declare const emptyProgram = "";
+export declare const mockSrcCode_Pass_Valid_Render_Conditional = "import { LightningElement, api } from 'lwc';\nimport templateOne from './templateOne.html';\nimport templateTwo from './templateTwo.html';\n\nexport default class MiscMultipleTemplates extends LightningElement {\n    @api templateOne = true;\n\n    render() {\n        return this.templateOne ? templateOne : templateTwo;\n    }\n}";
+export declare const mockSrcCode_Pass_Valid_Render_DefaultTemplate = "import { LightningElement, api } from 'lwc';\nimport defaultTemplate from './komaciAction.html';\n\nexport default class KomaciAction extends LightningElement {\n  \n    render() {\n        return defaultTemplate;\n    }\n}";
+export declare const mockSrcCode_Pass_Valid_Render_MultipleReturns = "import { LightningElement, api } from 'lwc';\nimport templateOne from './templateOne.html';\nimport defaultTemplate from './komaciAction.html';\n\nexport default class KomaciAction extends LightningElement {\n    @api showTemplateOne = true;\n\n    render() {\n        if(this.templateOne){\n            return templateOne; \n        }\n        return defaultTemplate\n    }\n}";
 //# sourceMappingURL=generalMockSourceCode.d.ts.map

package/build/__tests__/fixtures-source-code/generalMockSourceCode.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emptyProgram = exports.oneGoodMockWithGetterImportUse = exports.mockOnlyBadGetter = exports.mockOneBadGetter = void 0;
+exports.mockSrcCode_Pass_Valid_Render_MultipleReturns = exports.mockSrcCode_Pass_Valid_Render_DefaultTemplate = exports.mockSrcCode_Pass_Valid_Render_Conditional = exports.emptyProgram = exports.oneGoodMockWithGetterImportUse = exports.mockOnlyBadGetter = exports.mockOneBadGetter = void 0;
 exports.mockOneBadGetter = `import { LightningElement, wire, api } from 'lwc';
 import { getRecord } from 'lightning/uiRecordApi';
 import findContacts from '@salesforce/apex/ContactController.findContacts';
@@ -90,4 +90,38 @@ export default class Example extends LightningElement {
     contacts;
 }`;
 exports.emptyProgram = ``;
+exports.mockSrcCode_Pass_Valid_Render_Conditional = `import { LightningElement, api } from 'lwc';
+import templateOne from './templateOne.html';
+import templateTwo from './templateTwo.html';
+
+export default class MiscMultipleTemplates extends LightningElement {
+    @api templateOne = true;
+
+    render() {
+        return this.templateOne ? templateOne : templateTwo;
+    }
+}`;
+exports.mockSrcCode_Pass_Valid_Render_DefaultTemplate = `import { LightningElement, api } from 'lwc';
+import defaultTemplate from './komaciAction.html';
+
+export default class KomaciAction extends LightningElement {
+  
+    render() {
+        return defaultTemplate;
+    }
+}`;
+exports.mockSrcCode_Pass_Valid_Render_MultipleReturns = `import { LightningElement, api } from 'lwc';
+import templateOne from './templateOne.html';
+import defaultTemplate from './komaciAction.html';
+
+export default class KomaciAction extends LightningElement {
+    @api showTemplateOne = true;
+
+    render() {
+        if(this.templateOne){
+            return templateOne; 
+        }
+        return defaultTemplate
+    }
+}`;
 //# sourceMappingURL=generalMockSourceCode.js.map

package/build/__tests__/functionAstGeneration.spec.js

@@ -11,6 +11,7 @@ const types_1 = require("@babel/types");
 const functionAstGeneration_1 = require("../functionAstGeneration");
 const generator_1 = __importDefault(require("@babel/generator"));
 const badImportRef_1 = require("./fixtures-source-code/badImportRef");
+const generalMockSourceCode_1 = require("./fixtures-source-code/generalMockSourceCode");
 describe('hoistLocalFunction', () => {
     const baseFilesPath = (0, path_1.join)(__dirname, 'general-komaci-docs/assorted-template-strings');
     const src = (0, fs_1.readFileSync)((0, path_1.join)(baseFilesPath, 'source.js'), {
@@ -90,6 +91,127 @@ describe('hoistLocalFunction', () => {
             .body[0].argument.tag.name).toBe('i1');
     });
 });
+describe('hoistlocalfunction for render function', () => {
+    const templateOneImportMetaData = {
+        name: 'i0',
+        generatorAlias: 'templateOne',
+        resourceName: './templateOne.html',
+        komaciDocImportRef: 'nil',
+        isFromInternalNamespace: true,
+        isFromSupportedLibrary: true,
+        usedInPriming: false,
+        staticallyAnalyzable: false,
+        templateKomaciDoc: {},
+        adgReference: 'adg1',
+    };
+    const templateTwoImportMetaData = {
+        name: 'i1',
+        generatorAlias: 'templateTwo',
+        resourceName: './templateTwo.html',
+        komaciDocImportRef: 'nil',
+        isFromInternalNamespace: true,
+        isFromSupportedLibrary: true,
+        usedInPriming: false,
+        staticallyAnalyzable: false,
+        templateKomaciDoc: {},
+        adgReference: 'adg2',
+    };
+    const defaultTemplateImportMetadata = {
+        name: 'i0',
+        generatorAlias: 'defaultTemplate',
+        resourceName: './komaciAction.html',
+        komaciDocImportRef: 'nil',
+        isFromInternalNamespace: true,
+        isFromSupportedLibrary: true,
+        usedInPriming: false,
+        staticallyAnalyzable: false,
+        templateKomaciDoc: {},
+        adgReference: 'adg0',
+    };
+    it('can hoist a validated render function, conditional return', () => {
+        const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
+        moduleMetadata.importsByName.set('templateOne', templateOneImportMetaData);
+        moduleMetadata.importsByName.set('templateTwo', templateTwoImportMetaData);
+        const renderFunctionExampleAst = (0, common_shared_1.generateAstFromSrcCode)(generalMockSourceCode_1.mockSrcCode_Pass_Valid_Render_Conditional);
+        const { renderFunction } = (0, common_shared_1.getPropertyMetadataFromAst)(renderFunctionExampleAst);
+        const renderFunctionMetadata = {
+            type: common_shared_1.FunctionTypes.RENDER_FUNCTION,
+            componentAstNode: renderFunction,
+            requiredProperties: ['templateOne'],
+            generatedName: `hoistedRenderFunction`,
+        };
+        const hoistedRenderFunction = (0, functionAstGeneration_1.hoistLocalFunction)(renderFunctionMetadata, moduleMetadata.importsByName);
+        expect(hoistedRenderFunction).not.toBeUndefined();
+        const hoistedBodyStatements = hoistedRenderFunction?.body.body;
+        expect(hoistedBodyStatements).not.toBeUndefined();
+        expect(hoistedBodyStatements).toHaveLength(1);
+        const returnStmt = hoistedBodyStatements != undefined ? hoistedBodyStatements[0] : undefined;
+        expect(returnStmt).not.toBeUndefined();
+        expect(returnStmt?.type).toBe('ReturnStatement');
+        const argument = returnStmt.argument;
+        expect(argument?.type).toBe('ConditionalExpression');
+        const consequent = argument.consequent;
+        const alternate = argument.alternate;
+        expect(consequent.name).toBe(templateOneImportMetaData.adgReference);
+        expect(alternate.name).toBe(templateTwoImportMetaData.adgReference);
+    });
+    it('can hoist a validated render when returning default template', () => {
+        const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
+        moduleMetadata.importsByName.set('defaultTemplate', defaultTemplateImportMetadata);
+        const renderFunctionExampleAst = (0, common_shared_1.generateAstFromSrcCode)(generalMockSourceCode_1.mockSrcCode_Pass_Valid_Render_DefaultTemplate);
+        const { renderFunction } = (0, common_shared_1.getPropertyMetadataFromAst)(renderFunctionExampleAst);
+        const renderFunctionMetadata = {
+            type: common_shared_1.FunctionTypes.RENDER_FUNCTION,
+            componentAstNode: renderFunction,
+            requiredProperties: ['templateOne'],
+            generatedName: `hoistedRenderFunction`,
+        };
+        const hoistedRenderFunction = (0, functionAstGeneration_1.hoistLocalFunction)(renderFunctionMetadata, moduleMetadata.importsByName);
+        expect(hoistedRenderFunction).not.toBeUndefined();
+        const hoistedBodyStatements = hoistedRenderFunction?.body.body;
+        expect(hoistedBodyStatements).not.toBeUndefined();
+        expect(hoistedBodyStatements).toHaveLength(1);
+        const returnStmt = hoistedBodyStatements != undefined ? hoistedBodyStatements[0] : undefined;
+        expect(returnStmt).not.toBeUndefined();
+        expect(returnStmt?.type).toBe('ReturnStatement');
+        const argument = returnStmt.argument;
+        expect(argument?.type).toBe('Identifier');
+        expect(argument.name).toBe(defaultTemplateImportMetadata.adgReference);
+    });
+    it('can hoist a validated render function with multiple valid returns', () => {
+        const moduleMetadata = (0, common_shared_1.initModuleMetadataObject)();
+        moduleMetadata.importsByName.set('templateOne', templateOneImportMetaData);
+        moduleMetadata.importsByName.set('defaultTemplate', defaultTemplateImportMetadata);
+        const renderFunctionExampleAst = (0, common_shared_1.generateAstFromSrcCode)(generalMockSourceCode_1.mockSrcCode_Pass_Valid_Render_MultipleReturns);
+        const { renderFunction } = (0, common_shared_1.getPropertyMetadataFromAst)(renderFunctionExampleAst);
+        const renderFunctionMetadata = {
+            type: common_shared_1.FunctionTypes.RENDER_FUNCTION,
+            componentAstNode: renderFunction,
+            requiredProperties: ['templateOne'],
+            generatedName: `hoistedRenderFunction`,
+        };
+        const hoistedRenderFunction = (0, functionAstGeneration_1.hoistLocalFunction)(renderFunctionMetadata, moduleMetadata.importsByName);
+        expect(hoistedRenderFunction).not.toBeUndefined();
+        const hoistedBodyStatements = hoistedRenderFunction?.body.body;
+        expect(hoistedBodyStatements).not.toBeUndefined();
+        expect(hoistedBodyStatements).not.toBeUndefined();
+        expect(hoistedBodyStatements).toHaveLength(2);
+        const ifStmt = hoistedBodyStatements != undefined ? hoistedBodyStatements[0] : undefined;
+        expect(ifStmt).not.toBeUndefined();
+        expect(ifStmt?.type).toBe('IfStatement');
+        const ifBody = ifStmt.consequent.body;
+        expect(ifBody).toHaveLength(1);
+        const ifReturnStmt = ifBody[0];
+        expect(ifReturnStmt).not.toBeUndefined();
+        expect(ifReturnStmt.argument.name).toBe(templateOneImportMetaData.adgReference);
+        const returnStmt = hoistedBodyStatements != undefined ? hoistedBodyStatements[1] : undefined;
+        expect(returnStmt).not.toBeUndefined();
+        expect(returnStmt?.type).toBe('ReturnStatement');
+        const argument = returnStmt.argument;
+        expect(argument?.type).toBe('Identifier');
+        expect(argument.name).toBe(defaultTemplateImportMetadata.adgReference);
+    });
+});
 describe('sanitizeFunction', () => {
     const ast = (0, common_shared_1.generateAstFromSrcCode)(badImportRef_1.sourceClass);
     const { getters } = (0, common_shared_1.getPropertyMetadataFromAst)(ast);

package/build/__tests__/genericAstGeneration.spec.js

@@ -30,6 +30,18 @@ const generator_1 = __importDefault(require("@babel/generator"));
 const common_shared_1 = require("@komaci/common-shared");
 const genericAstGeneration_1 = require("../genericAstGeneration");
 const t = __importStar(require("@babel/types"));
+/**
+ * A function to validate all adgs against to make sure we are doing the bare minimum stuff
+ * @param adgs list of all adgs
+ */
+const confirmBaselineAdgExpectations = (adgs, extraValidation) => {
+    for (const adg of adgs) {
+        expect(adg.requiredAdgFactoryFunctions.has(common_shared_1.IdKeys.ADG_FUNC)).toBeTruthy();
+        if (extraValidation) {
+            extraValidation(adg);
+        }
+    }
+};
 describe('valueToExpression', () => {
     it('composes proper statement for complex object. Includes ObjectValue, ArrayValue, PropertyReference, and Primitive Value', () => {
         const wireFunctionObject = {
@@ -583,7 +595,7 @@ describe('addImportStatements', () => {
         expect(combinedImport).not.toBeUndefined();
     });
 });
-describe('collectMetadataForNonDefaultTemplates', () => {
+describe('collectMetadataForImportedTemplates', () => {
     const templateMap = {};
     beforeEach(() => {
         // fixture-template-files/component-refernece
@@ -813,7 +825,8 @@ describe('collectMetadataForNonDefaultTemplates', () => {
         };
         moduleMetadata.importsByName.set('child1', templateImport);
         //assuming that component-reference is the default.
-        (0, genericAstGeneration_1.collectMetadataForNonDefaultTemplates)(moduleMetadata, 'component-reference');
+        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata, 'component-reference');
+        confirmBaselineAdgExpectations(Object.values(moduleMetadata.adgs));
         expect(moduleMetadata.adgGeneratorIndex).toBe(2);
         expect(moduleMetadata.importGeneratorIndex).toBe(2);
         expect(moduleMetadata.importIndexReference.get('t1-0/names/0')).not.toBeUndefined();
@@ -853,7 +866,8 @@ describe('collectMetadataForNonDefaultTemplates', () => {
         };
         moduleMetadata.importsByName.set('child2', templateImport2);
         //assuming that component-reference is the default.
-        (0, genericAstGeneration_1.collectMetadataForNonDefaultTemplates)(moduleMetadata, 'default-template');
+        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata, 'default-template');
+        confirmBaselineAdgExpectations(Object.values(moduleMetadata.adgs));
         expect(moduleMetadata.adgGeneratorIndex).toBe(3);
         expect(moduleMetadata.importGeneratorIndex).toBe(5);
         expect(moduleMetadata.importIndexReference.get('t1-0/names/0')).not.toBeUndefined();
@@ -869,7 +883,8 @@ describe('collectMetadataForNonDefaultTemplates', () => {
         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');
+        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata, 'component-reference');
+        confirmBaselineAdgExpectations(Object.values(moduleMetadata.adgs));
         expect(moduleMetadata.adgGeneratorIndex).toBe(1);
         expect(moduleMetadata.importGeneratorIndex).toBe(0);
     });

package/build/__tests__/komaci-bundle-multiple-templates-module.fixtures.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=komaci-bundle-multiple-templates-module.fixtures.spec.d.ts.map

package/build/__tests__/komaci-bundle-multiple-templates-module.fixtures.spec.js

@@ -0,0 +1,117 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const fs_1 = __importDefault(require("fs"));
+const glob_1 = __importDefault(require("glob"));
+const path_1 = __importDefault(require("path"));
+const index_1 = require("../index");
+const fs_2 = require("fs");
+const path_2 = require("path");
+const lwc_metadata_next_1 = require("@lwc-platform/lwc-metadata-next");
+const FIXTURES_DIR = path_1.default.join(__dirname, 'fixtures-combined-files-multiple-templates');
+const EXPECTED_JS_FILENAME = 'expected.src';
+// eslint-disable-next-line jest/no-disabled-tests
+describe('fixtures', () => {
+    // find all folder paths containing a directory called component. This gives us the flexability to name the parent directory
+    // either lightning for external comps and c for internal comps.
+    const fixtures = glob_1.default.sync(path_1.default.resolve(FIXTURES_DIR, '**/*/component'));
+    for (const caseEntry of fixtures) {
+        const caseFolder = path_1.default.dirname(caseEntry);
+        const relativePath = path_1.default.relative(FIXTURES_DIR, caseFolder);
+        const caseName = relativePath.split('/')[0];
+        const expectedSrcFilePath = () => {
+            return (caseFolder.slice(0, caseFolder.lastIndexOf('/')) +
+                '/' +
+                EXPECTED_JS_FILENAME);
+        };
+        const readFixtureFile = (filePath) => {
+            return fs_1.default.existsSync(filePath) ? fs_1.default.readFileSync(filePath, 'utf-8') : null;
+        };
+        const writeFixtureFile = (filePath, content) => {
+            fs_1.default.writeFileSync(filePath, content, { encoding: 'utf-8' });
+        };
+        it(`${caseName}`, () => {
+            const expectedFilePath = expectedSrcFilePath();
+            const actualModuleSrc = readAndParseBundle(caseEntry, {
+                enableKomaci: true,
+                type: 'internal',
+            }).output.modGenOutput;
+            let expectedModuleSrc = readFixtureFile(expectedFilePath);
+            if (expectedModuleSrc == null) {
+                // write file if doesn't exist (ie new fixture)
+                expectedModuleSrc = actualModuleSrc;
+                writeFixtureFile(expectedFilePath, expectedModuleSrc);
+            }
+            // check that the actual newly generated mod source matches expected
+            expect(actualModuleSrc).toEqual(expectedModuleSrc);
+        });
+    }
+});
+/**
+ * Finds all .js, .mjs, .css, and .html files within the given directory, reads their contents, and combines them into a bundle,
+ * and returning the array of BundleFile containing the file's fileName and source
+ * @param path
+ * @returns An array of BundleFile
+ */
+function readBundle(path) {
+    path = (0, path_2.resolve)(path);
+    if ((0, fs_2.existsSync)(path)) {
+        const contents = (0, fs_2.readdirSync)(path);
+        const LWC_EXT = ['.js', '.mjs', '.css', '.html'];
+        const lwcBundleFiles = contents.filter((filename) => {
+            return LWC_EXT.includes((0, path_2.extname)(filename));
+        });
+        return lwcBundleFiles.map((fileName) => ({
+            fileName,
+            source: (0, fs_2.readFileSync)((0, path_2.resolve)(path, fileName), 'utf-8').toString(),
+        }));
+    }
+    else {
+        throw new Error(`path doesn't exist: ${path}`);
+    }
+}
+/**
+ * Takes the directory path of an LWC module bundle and an optional set of config overrides. Returns the ParsedBundle, inlcuding
+ * the bundle's 1) LWC Metadata and 2) Komaci / Resolvable module.
+ * @param path
+ * @param configOverrides
+ * @returns ParsedBundle that includes the BundleConfig & GeneratorInput inputs, and BundleMetadata and generated module output
+ */
+function readAndParseBundle(path, configOverrides) {
+    const files = readBundle(path);
+    const name = (0, path_2.basename)(path);
+    const namespace = (0, path_2.basename)((0, path_2.dirname)(path));
+    const bundleConfig = {
+        namespace,
+        name,
+        type: 'internal',
+        namespaceMapping: {},
+        files,
+        enableKomaci: true,
+        ...configOverrides,
+    };
+    const metadata = (0, lwc_metadata_next_1.collectBundleMetadata)(bundleConfig);
+    // Create input to module generator.
+    const srcFileMap = files.reduce((map, { fileName, source }) => ({ ...map, [fileName]: source }), {});
+    const inputFiles = Object.fromEntries(metadata.files
+        .map(({ fileName, komaciDoc }) => [fileName, komaciDoc])
+        .filter(([, komaciDoc]) => !!komaciDoc));
+    const generatorInput = {
+        moduleInfo: {
+            name,
+            namespace: bundleConfig.namespace,
+            type: 'bundle',
+            files: inputFiles,
+        },
+        srcFileMap,
+    };
+    const modGenOutput = (0, index_1.generateKomaciModule)(generatorInput);
+    return {
+        input: { bundleConfig, generatorInput },
+        output: { modGenOutput, metadata },
+    };
+}
+//# sourceMappingURL=komaci-bundle-multiple-templates-module.fixtures.spec.js.map

package/build/componentAstProcessing.d.ts

@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { GeneratorInput } from './types';
 import { NodePath } from '@babel/core';
-import { ModuleContext, ModuleMetadata } from '@komaci/common-shared';
+import { ModuleContext, ModuleMetadata, HoistedFunctionMetadata } from '@komaci/common-shared';
 /**
  * Retrieve the file path for the js of a component
  * @param generatorState GeneratorState containg the GeneratorInput, which in turn contains the JS raw source file
@@ -31,4 +31,13 @@ export declare function processGetters(adgIndex: number, moduleContext: ModuleCo
  * @returns Information about valid templates to be added to the resolvable Module.
  */
 export declare function processTemplateStrings(adgIndex: number, moduleContext: ModuleContext, moduleMetadata: ModuleMetadata, templateStrings: Array<NodePath<t.ClassProperty>>): void;
+/**
+ * Function to validate a render function and compose a HoistedFunctionMetadata object if render function is valid.
+ * @param adgIndex the adg index
+ * @param moduleContext the module context
+ * @param moduleMetadata the moduleMetadata object
+ * @param renderFunction the render function babel object
+ * @returns a HoistedFunctionMetadata object or undefined
+ */
+export declare function processRenderFunction(adgIndex: number, moduleContext: ModuleContext, moduleMetadata: ModuleMetadata, renderFunction: NodePath<t.ClassMethod>): HoistedFunctionMetadata | undefined;
 //# sourceMappingURL=componentAstProcessing.d.ts.map

package/build/componentAstProcessing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processTemplateStrings = exports.processGetters = exports.getComponentSrcJs = void 0;
+exports.processRenderFunction = exports.processTemplateStrings = exports.processGetters = exports.getComponentSrcJs = void 0;
 const static_analyzer_1 = require("@komaci/static-analyzer");
 const common_shared_1 = require("@komaci/common-shared");
 /**
@@ -103,4 +103,32 @@ function processTemplateStrings(adgIndex, moduleContext, moduleMetadata, templat
     });
 }
 exports.processTemplateStrings = processTemplateStrings;
+/**
+ * Function to validate a render function and compose a HoistedFunctionMetadata object if render function is valid.
+ * @param adgIndex the adg index
+ * @param moduleContext the module context
+ * @param moduleMetadata the moduleMetadata object
+ * @param renderFunction the render function babel object
+ * @returns a HoistedFunctionMetadata object or undefined
+ */
+function processRenderFunction(adgIndex, moduleContext, moduleMetadata, renderFunction) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const adg = moduleMetadata.adgs.get(adgIndex);
+    const isRenderFunctionValid = (0, static_analyzer_1.validateRenderFunction)(renderFunction, adgIndex, moduleMetadata, moduleContext, false);
+    if (isRenderFunctionValid) {
+        const { identifiers } = (0, common_shared_1.implicitConsumptionMetadata)(renderFunction, adgIndex, moduleMetadata);
+        const functionMeta = {
+            type: common_shared_1.FunctionTypes.RENDER_FUNCTION,
+            componentAstNode: renderFunction,
+            requiredProperties: identifiers,
+            generatedName: `hoistedRenderFunction`,
+        };
+        (0, common_shared_1.updatePropertyUsage)('hoistedRenderFunction', identifiers, adg.properties, common_shared_1.PropertyTypes.RENDER_FUNCTION);
+        return functionMeta;
+    }
+    else {
+        return undefined;
+    }
+}
+exports.processRenderFunction = processRenderFunction;
 //# sourceMappingURL=componentAstProcessing.js.map

package/build/functionAstGeneration.js

@@ -79,7 +79,21 @@ function sanitizeFunction(nodePath, importMetadata) {
             }
             const info = importMetadata.get(path.node.name);
             if (info && info.isFromInternalNamespace && info.isFromSupportedLibrary) {
-                path.replaceWith(t.identifier(info.generatorAlias)); // replace usage of import specifier
+                const templateImport = info;
+                const importedTemplateKomaciDoc = templateImport.templateKomaciDoc;
+                //the identifier we are looking at is importing a template and we have a komaci doc for it.
+                if (importedTemplateKomaciDoc) {
+                    if (templateImport.adgReference) {
+                        path.replaceWith(t.identifier(templateImport.adgReference));
+                    }
+                    else {
+                        //This should not happen but here for coverage incase an edge case is missed we will know where to look.
+                        throw new Error(`${common_shared_1.ERROR_PREFIX}: '${path.node.name}' does not have an associated adg reference`);
+                    }
+                }
+                else {
+                    path.replaceWith(t.identifier(info.generatorAlias)); // replace usage of import specifier
+                }
             }
             else if (info &&
                 !(info.isFromInternalNamespace && info.isFromSupportedLibrary)) {

package/build/genericAstGeneration.d.ts

@@ -107,9 +107,9 @@ export declare function addUndefinedDefaultExport(): t.ExportDefaultDeclaration;
  */
 export declare function exportNamedDeclarationForDynamicImport(moduleName: string, moduleNamespace: string, targetModule?: string): t.ExportNamedDeclaration;
 /**
- * Helper function to collect metadata for non default templates.
+ * Helper function to collect metadata for imported templates. NOTE: if the default html doc is being imported it will only update the associated ADG reference
  * @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;
+export declare function collectMetadataForImportedTemplates(moduleMetadata: ModuleMetadata, defaultTemplateFileName: string, defaultAdgIndex?: number): 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.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;
+exports.collectMetadataForImportedTemplates = 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"));
@@ -63,6 +63,7 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDocMap,
     const hasTemplateKomaciDoc = defaultTemplateKomaciDoc && Object.keys(defaultTemplateKomaciDoc).length !== 0;
     const combinedModule = scriptKomaciDoc !== undefined && defaultTemplateKomaciDoc !== undefined;
     const isBundle = input.moduleInfo.type === 'bundle';
+    let renderFunctionMetadata = undefined;
     // start of metadata collection
     if (scriptKomaciDoc) {
         (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(scriptKomaciDoc, moduleMetadata);
@@ -75,13 +76,17 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDocMap,
         scriptKomaciDoc.adgs?.forEach((_, index) => (0, common_shared_1.initalizeAdgMetadata)(index, scriptKomaciDoc, moduleMetadata, componentDefaultAdgIndex === index && ast !== undefined, isBundle));
         (0, common_shared_1.mapExportNamesToAdgs)(scriptKomaciDoc.exports, moduleMetadata);
         if (ast && componentDefaultAdgIndex !== undefined) {
-            const { getters, templateStrings } = (0, common_shared_1.getPropertyMetadataFromAst)(ast);
+            const { getters, templateStrings, renderFunction } = (0, common_shared_1.getPropertyMetadataFromAst)(ast);
             const moduleContext = {
                 astContext: (0, common_shared_1.getAstContextObject)(ast),
                 isExternal: (0, common_shared_1.isExternalModule)(input.moduleInfo.namespace),
             };
             (0, componentAstProcessing_1.processGetters)(componentDefaultAdgIndex, moduleContext, moduleMetadata, getters);
             (0, componentAstProcessing_1.processTemplateStrings)(componentDefaultAdgIndex, moduleContext, moduleMetadata, templateStrings);
+            //If there is a render function, process it.
+            if (renderFunction) {
+                renderFunctionMetadata = (0, componentAstProcessing_1.processRenderFunction)(componentDefaultAdgIndex, moduleContext, moduleMetadata, renderFunction);
+            }
         }
     }
     //has a default html file
@@ -104,10 +109,9 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDocMap,
         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);
+    //as long as we have at least one template, check to see if its imported. In the case the default html doc is imported, the assocated adg refernce will be set.
+    if (Object.keys(moduleMetadata.templateKomaciDocMap).length > 0) {
+        collectMetadataForImportedTemplates(moduleMetadata, input.moduleInfo.name, componentDefaultAdgIndex);
     }
     // all metadata collected at this point, time to start building ast
     const statements = [];
@@ -153,6 +157,12 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDocMap,
                     }
                 }
             });
+            if (renderFunctionMetadata) {
+                const hoistedRenderFunction = (0, functionAstGeneration_1.hoistLocalFunction)(renderFunctionMetadata, moduleMetadata.importsByName);
+                if (hoistedRenderFunction) {
+                    statements.push(hoistedRenderFunction);
+                }
+            }
         }
         else {
             statements.push(addUndefinedDefaultExport());
@@ -620,25 +630,29 @@ function exportNamedDeclarationForDynamicImport(moduleName, moduleNamespace, tar
 }
 exports.exportNamedDeclarationForDynamicImport = exportNamedDeclarationForDynamicImport;
 /**
- * Helper function to collect metadata for non default templates.
+ * Helper function to collect metadata for imported templates. NOTE: if the default html doc is being imported it will only update the associated ADG reference
  * @param templateMap the map of html filenames to its generated komaci document
  * @param defaultTemplateFileName the name of the default template.
  */
-function collectMetadataForNonDefaultTemplates(moduleMetadata, defaultTemplateFileName) {
+function collectMetadataForImportedTemplates(moduleMetadata, defaultTemplateFileName, defaultAdgIndex) {
     moduleMetadata.importsByName.forEach((importMetadata) => {
         if ((0, common_shared_1.isTemplateImport)(importMetadata)) {
-            const templateKomaciDoc = importMetadata
-                .templateKomaciDoc;
+            const importedTemplateMetadata = importMetadata;
+            const templateKomaciDoc = importedTemplateMetadata.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);
+                importedTemplateMetadata.adgReference = `adg${templateAdgIndex}`;
                 (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(templateKomaciDoc, moduleMetadata, templateAdgIndex);
                 (0, common_shared_1.addTemplateUsageForAdg)(templateKomaciDoc, templateAdgIndex, moduleMetadata);
             }
+            else {
+                importedTemplateMetadata.adgReference = `adg${defaultAdgIndex}`;
+            }
         }
     });
 }
-exports.collectMetadataForNonDefaultTemplates = collectMetadataForNonDefaultTemplates;
+exports.collectMetadataForImportedTemplates = collectMetadataForImportedTemplates;
 //# sourceMappingURL=genericAstGeneration.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/esm-generator",
-    "version": "242.1.5",
+    "version": "242.1.6",
     "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.5",
-        "@komaci/static-analyzer": "242.1.5",
+        "@komaci/common-shared": "242.1.6",
+        "@komaci/static-analyzer": "242.1.6",
         "o11y": "^240.7.0"
     },
     "devDependencies": {
         "@babel/types": "^7.9.0",
-        "@komaci/types": "242.1.5",
+        "@komaci/types": "242.1.6",
         "@lwc-platform/sfdc-lwc-compiler": "^2.18.0-240.2"
     }
 }