@komaci/esm-generator 242.1.6 → 242.1.8

package/build/__tests__/genericAstGeneration.spec.js

@@ -825,7 +825,7 @@ describe('collectMetadataForImportedTemplates', () => {
         };
         moduleMetadata.importsByName.set('child1', templateImport);
         //assuming that component-reference is the default.
-        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata, 'component-reference');
+        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata);
         confirmBaselineAdgExpectations(Object.values(moduleMetadata.adgs));
         expect(moduleMetadata.adgGeneratorIndex).toBe(2);
         expect(moduleMetadata.importGeneratorIndex).toBe(2);
@@ -866,7 +866,7 @@ describe('collectMetadataForImportedTemplates', () => {
         };
         moduleMetadata.importsByName.set('child2', templateImport2);
         //assuming that component-reference is the default.
-        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata, 'default-template');
+        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata);
         confirmBaselineAdgExpectations(Object.values(moduleMetadata.adgs));
         expect(moduleMetadata.adgGeneratorIndex).toBe(3);
         expect(moduleMetadata.importGeneratorIndex).toBe(5);
@@ -883,10 +883,36 @@ describe('collectMetadataForImportedTemplates', () => {
         const defaultAdg = (0, common_shared_1.initAdgMetadataObject)('adg0');
         moduleMetadata.adgs.set(0, defaultAdg);
         //assuming that component-reference is the default.
-        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata, 'component-reference');
+        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata);
         confirmBaselineAdgExpectations(Object.values(moduleMetadata.adgs));
         expect(moduleMetadata.adgGeneratorIndex).toBe(1);
         expect(moduleMetadata.importGeneratorIndex).toBe(0);
     });
+    it('proerly sets the adgReference when importing 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);
+        //importing component-refernece explicitly.
+        const templateImport = {
+            name: 'default',
+            komaciDocImportRef: '0/names/0',
+            importAlias: 'defaultTemplate',
+            generatorAlias: 'i0',
+            resourceName: './component-reference',
+            staticallyAnalyzable: true,
+            templateKomaciDoc: templateMap['component-reference'],
+            usedInPriming: true,
+            isFromInternalNamespace: true,
+            isFromSupportedLibrary: true,
+        };
+        moduleMetadata.importsByName.set('defaultTemplate', templateImport);
+        //assuming that component-reference is the default.
+        (0, genericAstGeneration_1.collectMetadataForImportedTemplates)(moduleMetadata);
+        confirmBaselineAdgExpectations(Object.values(moduleMetadata.adgs));
+        expect(moduleMetadata.adgGeneratorIndex).toBe(2);
+        expect(templateImport.adgReference).toBe('adg1');
+    });
 });
 //# sourceMappingURL=genericAstGeneration.spec.js.map

package/build/componentAstProcessing.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processRenderFunction = exports.processTemplateStrings = exports.processGetters = exports.getComponentSrcJs = void 0;
+const types_1 = require("./types");
 const static_analyzer_1 = require("@komaci/static-analyzer");
 const common_shared_1 = require("@komaci/common-shared");
 /**
@@ -121,7 +122,7 @@ function processRenderFunction(adgIndex, moduleContext, moduleMetadata, renderFu
             type: common_shared_1.FunctionTypes.RENDER_FUNCTION,
             componentAstNode: renderFunction,
             requiredProperties: identifiers,
-            generatedName: `hoistedRenderFunction`,
+            generatedName: types_1.ID.HOISTED_RENDER_FUNC_ID.name,
         };
         (0, common_shared_1.updatePropertyUsage)('hoistedRenderFunction', identifiers, adg.properties, common_shared_1.PropertyTypes.RENDER_FUNCTION);
         return functionMeta;

package/build/functionAstGeneration.d.ts

@@ -68,7 +68,7 @@ export declare function getAdgFunctionBody(adg: AdgMetadata, moduleMetadata: Mod
  * @param {Composition[]} compositions array of Compositions to convert
  * @returns {t.ArrowFunctionExpression} an inline ArrowFunctionExpression representing the input Compositions
  */
-export declare function getInlineFunctionFromTemplateCompositions(moduleMetadata: ModuleMetadata, requiredFactoryFunctions: Set<IdKeys>, compositions: Composition[]): t.ArrowFunctionExpression;
+export declare function getInlineFunctionFromTemplateCompositions(moduleMetadata: ModuleMetadata, requiredFactoryFunctions: Set<IdKeys>, compositions: Composition[], adgMetadata: AdgMetadata): t.ArrowFunctionExpression;
 /**
  * A barebones resolvable module default export with a singular node describing the context of an error.
  *

package/build/functionAstGeneration.js

@@ -192,7 +192,7 @@ function adgToExpression(adg, moduleMetadata) {
     }
     // arg4: Imported in-line composition function.
     if (adg.compositions) {
-        params.push(getInlineFunctionFromTemplateCompositions(moduleMetadata, adg.requiredCompositionFactoryFunctions, adg.compositions));
+        params.push(getInlineFunctionFromTemplateCompositions(moduleMetadata, adg.requiredCompositionFactoryFunctions, adg.compositions, adg));
     }
     else {
         params.push(types_1.ID.DEFAULT_COMP);
@@ -284,22 +284,37 @@ exports.getAdgFunctionBody = getAdgFunctionBody;
  * @param {Composition[]} compositions array of Compositions to convert
  * @returns {t.ArrowFunctionExpression} an inline ArrowFunctionExpression representing the input Compositions
  */
-function getInlineFunctionFromTemplateCompositions(moduleMetadata, requiredFactoryFunctions, compositions) {
+function getInlineFunctionFromTemplateCompositions(moduleMetadata, requiredFactoryFunctions, compositions, adgMetadata) {
     const params = [types_1.ID.FACTORY, types_1.ID.CONTEXT];
     const statements = [];
     const body = t.blockStatement(statements);
     const emptyCompositionsArray = compositions.length < 1;
-    const compositionArrayExpr = emptyCompositionsArray
-        ? t.arrayExpression([])
-        : (0, compositionAstGeneration_1.compositionsToArrayExpression)(moduleMetadata, compositions) ||
-            t.arrayExpression([]);
-    // function body destructured factory object. e.g. `const { cg } = fct;`
-    const fctFuncs = getFactoryFuncDeclaration(requiredFactoryFunctions); // passing in false because we are not processing the script file in this method
-    if (fctFuncs && !emptyCompositionsArray) {
-        statements.push(fctFuncs);
+    if (moduleMetadata.hasRenderFunction && adgMetadata.exportName == 'default') {
+        // function body destructured factory object. e.g. `const { cg } = fct;`
+        const fctFuncs = getFactoryFuncDeclaration(requiredFactoryFunctions); // passing in false because we are not processing the script file in this method
+        if (fctFuncs) {
+            statements.push(fctFuncs);
+        }
+        const rtFuncParams = [types_1.ID.HOISTED_RENDER_FUNC_ID, types_1.ID.CONTEXT];
+        // rf(hoistedRenderFunction, CTX)
+        const rtFunc = t.callExpression(types_1.ID.RENDER_FUNC, rtFuncParams);
+        //creating the return statement
+        statements.push(t.returnStatement(rtFunc));
+        return t.arrowFunctionExpression(params, body);
+    }
+    else {
+        const compositionArrayExpr = emptyCompositionsArray
+            ? t.arrayExpression([])
+            : (0, compositionAstGeneration_1.compositionsToArrayExpression)(moduleMetadata, compositions) ||
+                t.arrayExpression([]);
+        // function body destructured factory object. e.g. `const { cg } = fct;`
+        const fctFuncs = getFactoryFuncDeclaration(requiredFactoryFunctions); // passing in false because we are not processing the script file in this method
+        if (fctFuncs && !emptyCompositionsArray) {
+            statements.push(fctFuncs);
+        }
+        statements.push(t.returnStatement(compositionArrayExpr));
+        return t.arrowFunctionExpression(params, body);
     }
-    statements.push(t.returnStatement(compositionArrayExpr));
-    return t.arrowFunctionExpression(params, body);
 }
 exports.getInlineFunctionFromTemplateCompositions = getInlineFunctionFromTemplateCompositions;
 /**

package/build/genericAstGeneration.d.ts

@@ -108,8 +108,7 @@ export declare function addUndefinedDefaultExport(): t.ExportDefaultDeclaration;
 export declare function exportNamedDeclarationForDynamicImport(moduleName: string, moduleNamespace: string, targetModule?: string): t.ExportNamedDeclaration;
 /**
  * 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.
+ * @param moduleMetadata the module metadata object.
  */
-export declare function collectMetadataForImportedTemplates(moduleMetadata: ModuleMetadata, defaultTemplateFileName: string, defaultAdgIndex?: number): void;
+export declare function collectMetadataForImportedTemplates(moduleMetadata: ModuleMetadata): void;
 //# sourceMappingURL=genericAstGeneration.d.ts.map

package/build/genericAstGeneration.js

@@ -86,11 +86,17 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDocMap,
             //If there is a render function, process it.
             if (renderFunction) {
                 renderFunctionMetadata = (0, componentAstProcessing_1.processRenderFunction)(componentDefaultAdgIndex, moduleContext, moduleMetadata, renderFunction);
+                if (renderFunctionMetadata) {
+                    moduleMetadata.hasRenderFunction = true;
+                    moduleMetadata.adgs
+                        .get(componentDefaultAdgIndex)
+                        ?.requiredCompositionFactoryFunctions.add(common_shared_1.IdKeys.RENDER_FUNC);
+                }
             }
         }
     }
-    //has a default html file
-    if (hasTemplateKomaciDoc) {
+    //has a default html file but no render funciton ***
+    if (hasTemplateKomaciDoc && !moduleMetadata.hasRenderFunction) {
         componentDefaultAdgIndex = (0, common_shared_1.reconcileDefaultAdg)(componentDefaultAdgIndex, moduleMetadata);
         if (componentDefaultAdgIndex !== undefined) {
             (0, common_shared_1.initializeImportMetdataFromKomaciDocument)(defaultTemplateKomaciDoc, moduleMetadata, componentDefaultAdgIndex);
@@ -109,9 +115,10 @@ function generateResolvableModule(input, scriptKomaciDoc, templateKomaciDocMap,
         newImport.isFromSupportedLibrary = true;
         newImport.generatorAlias = 'comp1';
     }
-    //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);
+    //as long as we have at least one template and theres a valid render function, 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 &&
+        moduleMetadata.hasRenderFunction) {
+        collectMetadataForImportedTemplates(moduleMetadata);
     }
     // all metadata collected at this point, time to start building ast
     const statements = [];
@@ -631,26 +638,19 @@ function exportNamedDeclarationForDynamicImport(moduleName, moduleNamespace, tar
 exports.exportNamedDeclarationForDynamicImport = exportNamedDeclarationForDynamicImport;
 /**
  * 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.
+ * @param moduleMetadata the module metadata object.
  */
-function collectMetadataForImportedTemplates(moduleMetadata, defaultTemplateFileName, defaultAdgIndex) {
+function collectMetadataForImportedTemplates(moduleMetadata) {
     moduleMetadata.importsByName.forEach((importMetadata) => {
         if ((0, common_shared_1.isTemplateImport)(importMetadata)) {
             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}`;
-            }
+            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);
         }
     });
 }

package/build/types.js

@@ -48,6 +48,7 @@ exports.ID = {
     SLOT_FUNC: t.identifier('s'),
     ELEMENT_FUNC: t.identifier('e'),
     ADG_FUNC: t.identifier('adg'),
+    RENDER_FUNC: t.identifier('rf'),
     SLOT: t.identifier('slot'),
     COMPONENT_ID: t.identifier('componentId'),
     UNDEFINED: t.identifier('undefined'),
@@ -68,6 +69,7 @@ exports.ID = {
     REDUCER_FUNC_ID: t.identifier('r'),
     IMG_SRC: t.identifier('src'),
     IMG_FUNC: t.identifier('img'),
+    HOISTED_RENDER_FUNC_ID: t.identifier('hoistedRender'),
 };
 // enum representing the different states of the way an Import is used
 var ImportUsageState;

package/package.json

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