@komaci/esm-generator 248.1.6 → 250.0.0

package/build/__tests__/compile-generated-module-fixtures.spec.js

@@ -11,7 +11,7 @@ const compilerConfigs_1 = require("./compilerConfigs");
 const EXPECTED_SRC_FILENAME = 'expected.src';
 describe('fixtures', () => {
     //Adding filter on the resolvable modules we try to compile until the compiler has been updated to handle imported gql queries. Will be removed in W-14269523
-    const fixtures = (0, glob_1.globSync)(path_1.default.resolve(__dirname, '**/expected.src')).filter((e) => e != `${__dirname}/fixtures-gql/multipleGqlQueries/expected.src`);
+    const fixtures = (0, glob_1.globSync)(path_1.default.resolve(__dirname, '**/expected.src')).filter((e) => !e.includes(`/fixtures-gql`));
     for (const caseEntry of fixtures) {
         const caseFolder = path_1.default.dirname(caseEntry);
         const caseName = path_1.default.relative(__dirname, caseFolder);

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

@@ -1,4 +1,4 @@
-export declare const sourceClass = "import test from 'force/shared'; // good import\nimport bad from 'invalid/import';\n\nexport default class Component {\n    get testing() {\n        return `A string that references ${test}`;\n    }\n\n    get badProp() {\n        return `altho we reference ${test} we also reference ${bad}`;\n    }\n}";
+export declare const sourceClass = "import test from 'force/shared'; // good import\nimport bad from 'invalid/import';\n\nexport default class Component {\n    get testing() {\n        return `A string that references ${test}`;\n    }\n\n    get badProp() {\n        return `altho we reference ${test} we also reference ${bad}`;\n    }\n\n    get thing() {\n        const thing = { test123: { test: 'abc'}} //should not be altered by the import existing\n        return thing?.test123?.test; //should not be altered by the import existing\n    }\n    \n    get stringThing() {\n        const test = \"hi\";\n        return test;\n    }\n}";
 export declare const expectedGoodHoist = "function g0(props) {\n  return `A string that references ${i0}`;\n}";
 export declare const expectedGoodHoistAst: import("@babel/parser").ParseResult<import("@babel/types").File>;
 //# sourceMappingURL=badImportRef.d.ts.map

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

@@ -13,6 +13,16 @@ export default class Component {
     get badProp() {
         return \`altho we reference \${test} we also reference \${bad}\`;
     }
+
+    get thing() {
+        const thing = { test123: { test: 'abc'}} //should not be altered by the import existing
+        return thing?.test123?.test; //should not be altered by the import existing
+    }
+    
+    get stringThing() {
+        const test = "hi";
+        return test;
+    }
 }`;
 exports.expectedGoodHoist = `function g0(props) {
   return \`A string that references \${i0}\`;

package/build/__tests__/functionAstGeneration.spec.js

@@ -270,6 +270,36 @@ describe('sanitizeFunction', () => {
         const generatedFunction = (0, generator_1.default)((0, types_1.file)((0, types_1.program)([hoisted])));
         expect(generatedFunction.code).toBe(badImportRef_1.expectedGoodHoist);
     });
+    it('should be able to hoist a function without breaking optional object props', () => {
+        (0, functionAstGeneration_1.sanitizeFunction)(getters[2], imports, new Map());
+        const hoisted = (0, types_1.functionDeclaration)((0, types_1.identifier)('g1'), [], // make 'props' an input parameter to the hoisted getter
+        getters[2].node.body);
+        const generatedFunction = (0, generator_1.default)((0, types_1.file)((0, types_1.program)([hoisted])));
+        expect(generatedFunction.code).toMatchInlineSnapshot(`
+            "function g1() {
+              const thing = {
+                test123: {
+                  test: 'abc'
+                }
+              }; //should not be altered by the import existing
+
+              return thing?.test123?.test; //should not be altered by the import existing
+            }"
+        `);
+    });
+    //TODO(W-14802236): g2 should return test, not i0
+    it('should be able to hoist a function with local-only variables', () => {
+        (0, functionAstGeneration_1.sanitizeFunction)(getters[3], imports, new Map());
+        const hoisted = (0, types_1.functionDeclaration)((0, types_1.identifier)('g2'), [], // make 'props' an input parameter to the hoisted getter
+        getters[3].node.body);
+        const generatedFunction = (0, generator_1.default)((0, types_1.file)((0, types_1.program)([hoisted])));
+        expect(generatedFunction.code).toMatchInlineSnapshot(`
+            "function g2() {
+              const test = \\"hi\\";
+              return i0;
+            }"
+        `);
+    });
     it('should throw an error if we try to reference a bad input', () => {
         expect(() => (0, functionAstGeneration_1.sanitizeFunction)(getters[1], imports, new Map())).toThrowError(new Error(`${common_shared_1.ERROR_PREFIX}: 'bad' does not map to valid import`));
     });

package/build/__tests__/generated-module/compile-graphql-with-scoped-import.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=compile-graphql-with-scoped-import.spec.d.ts.map

package/build/__tests__/generated-module/compile-graphql-with-scoped-import.spec.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const readAndParseBundle_1 = require("../readAndParseBundle");
+describe('test komaci can build a correct module', () => {
+    it('can handle an import name conflicting with optional property name', () => {
+        //TODO: tweak this test pattern further so that it's even less repetitive while not generating tests.
+        const componentPath = path_1.default.join(__dirname, 'lightning', 'component');
+        const actualModuleSrc = (0, readAndParseBundle_1.readAndParseBundle)(componentPath, {
+            enableKomaci: true,
+            type: 'internal',
+            enableLuvio: true,
+        }).output.modGenOutput;
+        expect(actualModuleSrc).toMatchSnapshot();
+    });
+});
+//# sourceMappingURL=compile-graphql-with-scoped-import.spec.js.map

package/build/__tests__/generated-module/lightning/component/component.d.ts

@@ -0,0 +1,18 @@
+export default class MultipleGraphQL extends LightningElement {
+    recordId: any;
+    get woQuery(): any;
+    graphqlResult: any;
+    get accountIDs(): any;
+    get graphqlVariables(): {
+        recordId: any;
+    };
+    get accRelatedRecQuery(): any;
+    graphqlAccResult: any;
+    get graphqlAccVariables(): {
+        accId: any;
+    };
+    get accountResponseString(): any;
+    get accountResponse(): string;
+}
+import { LightningElement } from "lwc";
+//# sourceMappingURL=component.d.ts.map

package/build/__tests__/generated-module/lightning/component/component.js

@@ -0,0 +1,168 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lwc_1 = require("lwc");
+const uiGraphQLApi_1 = require("lightning/uiGraphQLApi");
+class MultipleGraphQL extends lwc_1.LightningElement {
+    get woQuery() {
+        return (0, uiGraphQLApi_1.gql) `
+            query showWorkorder($recordId: ID) {
+                uiapi {
+                    query {
+                        WorkOrder(where: { Id: { eq: $recordId } })
+                            @category(name: "recordQuery") {
+                            edges {
+                                node {
+                                    Id
+                                    Status @category(name: "StringValue") {
+                                        value
+                                    }
+                                    AccountId @category(name: "IDValue") {
+                                        value
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        `;
+    }
+    get accountIDs() {
+        return this.graphqlResult?.data?.uiapi.query.WorkOrder.edges[0].node.AccountId
+            .value; // Here's the bug
+    }
+    get graphqlVariables() {
+        return {
+            recordId: this.recordId,
+        };
+    }
+    //fetching Location and Asset from Account ID
+    get accRelatedRecQuery() {
+        return (0, uiGraphQLApi_1.gql) `
+            query showAccRelRecords($accId: ID) {
+                uiapi {
+                    query {
+                        Account(where: { Id: { eq: $accId } })
+                            @category(name: "recordQuery") {
+                            edges {
+                                node {
+                                    Locations__r(where: { Active__c: { eq: true } })
+                                        @category(name: "childRelationship") {
+                                        edges {
+                                            node {
+                                                Name @category(name: "StringValue") {
+                                                    value
+                                                }
+                                                LocationType
+                                                    @category(name: "StringValue") {
+                                                    value
+                                                }
+                                                Customer_Site__r
+                                                    @category(
+                                                        name: "parentRelationship"
+                                                    ) {
+                                                    Name @category(name: "StringValue") {
+                                                        value
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    Assets(where: { Active__c: { eq: true } })
+                                        @category(name: "childRelationship") {
+                                        edges {
+                                            node {
+                                                Name @category(name: "StringValue") {
+                                                    value
+                                                }
+                                                Linked_Asset_Name__c
+                                                    @category(name: "StringValue") {
+                                                    value
+                                                }
+                                                LocationId @category(name: "IDValue") {
+                                                    value
+                                                }
+                                                Asset_Type__c
+                                                    @category(name: "StringValue") {
+                                                    value
+                                                }
+                                                Machine_Type__c
+                                                    @category(name: "StringValue") {
+                                                    value
+                                                }
+                                                Linked_Asset_Serial_Number__c
+                                                    @category(name: "StringValue") {
+                                                    value
+                                                }
+                                                AccountId @category(name: "IDValue") {
+                                                    value
+                                                }
+                                                Account
+                                                    @category(
+                                                        name: "parentRelationship"
+                                                    ) {
+                                                    Name @category(name: "StringValue") {
+                                                        value
+                                                    }
+                                                }
+                                                Location
+                                                    @category(
+                                                        name: "parentRelationship"
+                                                    ) {
+                                                    Name @category(name: "StringValue") {
+                                                        value
+                                                    }
+                                                    LocationType
+                                                        @category(name: "StringValue") {
+                                                        value
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        `;
+    }
+    //AccountID populated through result of other graphql
+    get graphqlAccVariables() {
+        return {
+            accId: this.accountIDs,
+        };
+    }
+    get accountResponseString() {
+        return this.graphqlAccResult;
+    }
+    get accountResponse() {
+        return JSON.stringify(this.graphqlAccResult);
+    }
+}
+__decorate([
+    lwc_1.api
+], MultipleGraphQL.prototype, "recordId", void 0);
+__decorate([
+    (0, lwc_1.wire)(uiGraphQLApi_1.graphql, {
+        query: '$woQuery',
+        variables: '$graphqlVariables',
+        operationName: 'showWorkorder',
+    })
+], MultipleGraphQL.prototype, "graphqlResult", void 0);
+__decorate([
+    (0, lwc_1.wire)(uiGraphQLApi_1.graphql, {
+        query: '$accRelatedRecQuery',
+        variables: '$graphqlAccVariables',
+        operationName: 'showAccRelRecords',
+    })
+], MultipleGraphQL.prototype, "graphqlAccResult", void 0);
+exports.default = MultipleGraphQL;
+//# sourceMappingURL=component.js.map

package/build/__tests__/genericAstGeneration.spec.js

@@ -296,6 +296,7 @@ describe('processWireFunctionType', () => {
     (0, common_shared_1.composeImportMetadata)('bacth_getRecord', 'lightning/uiRecordApi', true, '2/names/1', moduleMetadata);
     (0, common_shared_1.composeImportMetadata)('reducer', 'lightning/uiRecordApi', true, '2/names/2', moduleMetadata);
     (0, common_shared_1.composeImportMetadata)('CurrentPageReference', 'laf/transformWire', true, '3/names/0', moduleMetadata);
+    (0, common_shared_1.composeImportMetadata)('getApexInvoker_imperative', 'force/ldsAdaptersApex', true, '4/names/0', moduleMetadata);
     it('throws an error when a function that isnt a wire is passed in', () => {
         const throwingFunc = () => (0, genericAstGeneration_1.processWireFunctionType)({
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -373,6 +374,44 @@ describe('processWireFunctionType', () => {
   t: "WireFunction",
   wt: "apex",
   c: ctx => ({})
+}`);
+    });
+    it('effectively builds metadata for an apex priming adapter wire', () => {
+        const astStatements = (0, genericAstGeneration_1.processWireFunctionType)({
+            type: common_shared_1.FunctionTypes.PRIMING_FUNCTION,
+            requiredProperties: [],
+            importReference: { functionName: 'getApexInvoker_imperative' },
+            prevImportReference: '@salesforce/apex/foo.getBar',
+        }, moduleMetadata);
+        expect(astStatements).not.toBeUndefined();
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const { code } = (0, generator_1.default)(t.objectExpression(astStatements));
+        expect(code).toBe(`{
+  f: i6,
+  fN: "getApexInvoker_imperative",
+  t: "PrimingFunction",
+  wt: "apex",
+  af: () => i6("", "foo", "getBar", false),
+  c: ctx => ({})
+}`);
+    });
+    it('effectively builds metadata for an apexContinuation priming adapter wire', () => {
+        const astStatements = (0, genericAstGeneration_1.processWireFunctionType)({
+            type: common_shared_1.FunctionTypes.PRIMING_FUNCTION,
+            requiredProperties: [],
+            importReference: { functionName: 'getApexInvoker_imperative' },
+            prevImportReference: '@salesforce/apexContinuation/foo.getBar',
+        }, moduleMetadata);
+        expect(astStatements).not.toBeUndefined();
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const { code } = (0, generator_1.default)(t.objectExpression(astStatements));
+        expect(code).toBe(`{
+  f: i6,
+  fN: "getApexInvoker_imperative",
+  t: "PrimingFunction",
+  wt: "apex",
+  af: () => i6("", "foo", "getBar", true),
+  c: ctx => ({})
 }`);
     });
     it('effectively builds metadata for a context wire', () => {

package/build/__tests__/komaci-gql.fixtures.spec.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const glob_1 = require("glob");
 const path_1 = __importDefault(require("path"));
-const index_1 = require("../index");
-const fs_2 = require("fs");
-const path_2 = require("path");
-const metadata_1 = require("@lwc/metadata");
+const readAndParseBundle_1 = require("./readAndParseBundle");
 const FIXTURES_DIR = path_1.default.join(__dirname, 'fixtures-gql');
 const EXPECTED_JS_FILENAME = 'expected.src';
 // eslint-disable-next-line jest/no-disabled-tests
@@ -35,7 +32,7 @@ describe('fixtures', () => {
         };
         it(`${caseName}`, () => {
             const expectedFilePath = expectedSrcFilePath();
-            const actualModuleSrc = readAndParseBundle(caseEntry, {
+            const actualModuleSrc = (0, readAndParseBundle_1.readAndParseBundle)(caseEntry, {
                 enableKomaci: true,
                 type: 'internal',
                 enableLuvio: true,
@@ -51,73 +48,4 @@ describe('fixtures', () => {
         });
     }
 });
-/**
- * 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, metadata_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));
-    //Need to come back and clean this up, will be taken care of in a futire WI
-    const luvioMetadata = metadata.files.filter((file) => file.fileType == 'js' &&
-        file.luvioMetadata != undefined &&
-        file.luvioMetadata.gqlTag.length > 0).map((file) => file.luvioMetadata)[0];
-    const generatorInput = {
-        moduleInfo: {
-            name,
-            namespace: bundleConfig.namespace,
-            type: 'bundle',
-            files: inputFiles,
-        },
-        srcFileMap,
-        luvioMetadata: luvioMetadata,
-    };
-    const modGenOutput = (0, index_1.generateKomaciModule)(generatorInput);
-    return {
-        input: { bundleConfig, generatorInput },
-        output: { modGenOutput, metadata },
-    };
-}
 //# sourceMappingURL=komaci-gql.fixtures.spec.js.map

package/build/__tests__/readAndParseBundle.d.ts

@@ -0,0 +1,22 @@
+import { BundleConfig } from '@lwc/metadata';
+declare type BundleFile = {
+    fileName: string;
+    source: string;
+};
+/**
+ * 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
+ */
+export declare function readBundle(path: string): BundleFile[];
+/**
+ * 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
+ */
+export declare function readAndParseBundle(path: string, configOverrides: Partial<BundleConfig>): any;
+export {};
+//# sourceMappingURL=readAndParseBundle.d.ts.map

package/build/__tests__/readAndParseBundle.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readAndParseBundle = exports.readBundle = void 0;
+const index_1 = require("../index");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const metadata_1 = require("@lwc/metadata");
+/**
+ * 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_1.resolve)(path);
+    if ((0, fs_1.existsSync)(path)) {
+        const contents = (0, fs_1.readdirSync)(path);
+        const LWC_EXT = ['.js', '.mjs', '.css', '.html'];
+        const lwcBundleFiles = contents.filter((filename) => {
+            return LWC_EXT.includes((0, path_1.extname)(filename));
+        });
+        return lwcBundleFiles.map((fileName) => ({
+            fileName,
+            source: (0, fs_1.readFileSync)((0, path_1.resolve)(path, fileName), 'utf-8').toString(),
+        }));
+    }
+    else {
+        throw new Error(`path doesn't exist: ${path}`);
+    }
+}
+exports.readBundle = readBundle;
+/**
+ * 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_1.basename)(path);
+    const namespace = (0, path_1.basename)((0, path_1.dirname)(path));
+    const bundleConfig = {
+        namespace,
+        name,
+        type: 'internal',
+        namespaceMapping: {},
+        files,
+        enableKomaci: true,
+        ...configOverrides,
+    };
+    const metadata = (0, metadata_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));
+    //Need to come back and clean this up, will be taken care of in a futire WI
+    const luvioMetadata = metadata.files.filter((file) => file.fileType == 'js' &&
+        file.luvioMetadata != undefined &&
+        file.luvioMetadata.gqlTag.length > 0).map((file) => file.luvioMetadata)[0];
+    const generatorInput = {
+        moduleInfo: {
+            name,
+            namespace: bundleConfig.namespace,
+            type: 'bundle',
+            files: inputFiles,
+        },
+        srcFileMap,
+        luvioMetadata: luvioMetadata,
+    };
+    const modGenOutput = (0, index_1.generateKomaciModule)(generatorInput);
+    return {
+        input: { bundleConfig, generatorInput },
+        output: { modGenOutput, metadata },
+    };
+}
+exports.readAndParseBundle = readAndParseBundle;
+//# sourceMappingURL=readAndParseBundle.js.map

package/build/compositionAstGeneration.d.ts

@@ -15,7 +15,8 @@ export declare function compositionsToArrayExpression(moduleMetadata: ModuleMeta
 /**
  * Convert any of the Komaci composition types into a babel expression, to be included in the generated module.
  * NOTE: For instances where a composition has an isActive coditional, the module will be using the u function provided by the fct factory object to
- * to check for an unresolved value. This function can be overridden, otherwise the default implementaitno will be used. https://salesforce.quip.com/XY4WAbfaLR5E
+ * to check for an unresolved value. This function can be overridden, otherwise the default implementaitno will be used.
+ * https://gus.lightning.force.com/lightning/r/ADM_Work__c/a07EE00001emCyhYAE/view
  * @param {ModuleMetadata} moduleMetadata collected module metadata about this given component
  * @param {Composition} composition the Composition to covert
  * @param {string[]} iterationContext if this is being called from inside an iteration we need that prepend context for bindingToExpression

package/build/compositionAstGeneration.js

@@ -68,7 +68,8 @@ exports.compositionsToArrayExpression = compositionsToArrayExpression;
 /**
  * Convert any of the Komaci composition types into a babel expression, to be included in the generated module.
  * NOTE: For instances where a composition has an isActive coditional, the module will be using the u function provided by the fct factory object to
- * to check for an unresolved value. This function can be overridden, otherwise the default implementaitno will be used. https://salesforce.quip.com/XY4WAbfaLR5E
+ * to check for an unresolved value. This function can be overridden, otherwise the default implementaitno will be used.
+ * https://gus.lightning.force.com/lightning/r/ADM_Work__c/a07EE00001emCyhYAE/view
  * @param {ModuleMetadata} moduleMetadata collected module metadata about this given component
  * @param {Composition} composition the Composition to covert
  * @param {string[]} iterationContext if this is being called from inside an iteration we need that prepend context for bindingToExpression

package/build/functionAstGeneration.js

@@ -69,9 +69,15 @@ exports.hoistLocalFunction = hoistLocalFunction;
 function sanitizeFunction(nodePath, importMetadata, gqlMetadataMap) {
     const Visitors = {
         Identifier(path) {
-            if ((path.parent.type === 'MemberExpression' &&
+            if (((path.parent.type === 'MemberExpression' ||
+                path.parent.type === 'OptionalMemberExpression') &&
                 path.parent.property === path.node) ||
-                path.parent.type === 'Decorator') {
+                path.parent.type === 'Decorator' ||
+                path.parent.type === 'ObjectProperty' ||
+                path.parent.type === 'VariableDeclarator'
+            // TODO(W-14802236): Disabled this special case to avoid breaking reasonable scenarios returning a hoisted import
+            // (path.parent.type === 'ReturnStatement' && path.parent.argument === path.node)
+            ) {
                 //when a property shares a same name with an import,
                 //it will be identified as an import
                 //this check skips the scenario

package/build/genericAstGeneration.js

@@ -375,6 +375,27 @@ function processWireFunctionType(adgFunc, moduleMetadata) {
                 funcObjProps.push(t.objectProperty(types_1.ID.REDUCER_FUNC_ID, t.identifier(reducerImport.generatorAlias)));
             }
             funcObjProps.push(t.objectProperty(types_1.ID.FUNC_TYPE, t.stringLiteral(types_1.PRIMING_FUNCTION)));
+            // Apex specific properties
+            if (wasApexWire(resourceName)) {
+                funcObjProps.push(t.objectProperty(types_1.ID.WIRE_TYPE, t.stringLiteral('apex')));
+                if (adgFunc.prevImportReference !== undefined) {
+                    // build apex factory expression
+                    // import ref split: example, ['@salesforce', 'apex', 'foo.bar']
+                    const refSplit = adgFunc.prevImportReference.split('/');
+                    const parts = refSplit[2].split('.');
+                    const method = parts.pop() || '';
+                    const classname = parts.pop() || '';
+                    const namespace = parts.pop() || '';
+                    const isContinuation = refSplit[1] === 'apexContinuation';
+                    const apexFactory = t.arrowFunctionExpression([], t.callExpression(t.identifier(adapterImport.generatorAlias), [
+                        t.stringLiteral(namespace),
+                        t.stringLiteral(classname),
+                        t.stringLiteral(method),
+                        t.booleanLiteral(isContinuation),
+                    ]));
+                    funcObjProps.push(t.objectProperty(types_1.ID.APEX_FACTORY, apexFactory));
+                }
+            }
         }
         else {
             // Traditional wire adapter.
@@ -443,6 +464,14 @@ function isSupportedContextWire(exportName) {
 function isApexWire(resourceName) {
     return !!(resourceName && resourceName.startsWith('@salesforce/apex/'));
 }
+/**
+ * Determines whether the resourceName of a priming function import statement is that of an Apex wire
+ * @param {string | undefined} resourceName a string representing the priming function resource name ('force/ldsAdaptersApex')
+ * @returns {boolean} true if the resource name represent that of an Apex wire, false otherwise
+ */
+function wasApexWire(resourceName) {
+    return resourceName !== undefined && resourceName.startsWith('force/ldsAdaptersApex');
+}
 /**
  * Retrieves the name of an Apex wire
  * @param {string} resourceName a string representing the resource name (ex: '@salesforce/apex/ContactController.getContactList')

package/build/types.js

@@ -71,6 +71,7 @@ exports.ID = {
     IMG_FUNC: t.identifier('img'),
     HOISTED_RENDER_FUNC_ID: t.identifier('hoistedRender'),
     CONDITION_FUNC: t.identifier('c'),
+    APEX_FACTORY: t.identifier('af'),
 };
 // 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": "248.1.6",
+    "version": "250.0.0",
     "description": "Komaci generator for ADG ES modules",
     "homepage": "https://komaci.dev/",
     "repository": {
@@ -29,11 +29,11 @@
         "@babel/core": "^7.9.0",
         "@babel/generator": "^7.9.0",
         "@babel/types": "^7.9.0",
-        "@komaci/common-shared": "248.1.6",
-        "@komaci/static-analyzer": "248.1.6"
+        "@komaci/common-shared": "250.0.0",
+        "@komaci/static-analyzer": "250.0.0"
     },
     "devDependencies": {
-        "@komaci/types": "248.1.6",
+        "@komaci/types": "250.0.0",
         "@lwc-platform/sfdc-lwc-compiler": "248.3.9-3.5.0",
         "@lwc/metadata": "3.5.0-0"
     }