@lwrjs/loader 0.12.0-alpha.6 → 0.12.0-alpha.8

package/build/modules/lwr/loaderLegacy/loaderLegacy.js

@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: MIT
 * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
 */
-/* LWR Legacy Module Loader v0.12.0-alpha.6 */
+/* LWR Legacy Module Loader v0.12.0-alpha.8 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -572,19 +572,32 @@ const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
 
 
 
-
-
 
 
 
 class ModuleRegistry {
     
+    
+    
+    // A registry for named AMD defines containing the *metadata* of AMD module
+     __init() {this.namedDefineRegistry = new Map();}
+    // The evaluated module registry where the module identifier (name or URL?) is the key
+     __init2() {this.moduleRegistry = new Map();}
+    // Aliases of modules in the registry
+    __init3() {this.aliases = new Map();}
+    
+    
+    
+    
 
     constructor(config) {ModuleRegistry.prototype.__init.call(this);ModuleRegistry.prototype.__init2.call(this);ModuleRegistry.prototype.__init3.call(this);
         this.baseUrl = config.baseUrl || '';
         this.profiler = config.profiler;
     }
 
+    /**
+     * Module import
+     */
     async load(id, importer) {
         const metadata = importer ? { importer } : {};
         this.profiler.logOperationStart({
@@ -593,17 +606,21 @@ class ModuleRegistry {
             metadata,
         });
         const resolvedId = await this.resolve(id, importer);
-        const moduleRecord = await this.getModuleRecord(resolvedId, id);
+        const moduleRecord = this.getModuleRecord(resolvedId, id);
+
         if (moduleRecord.evaluated) {
             return moduleRecord.module;
         } else {
             if (!moduleRecord.evaluationPromise) {
-                moduleRecord.evaluationPromise = this.topLevelEvaluation(moduleRecord);
+                moduleRecord.evaluationPromise = this.evaluateModule(moduleRecord, {});
             }
             return moduleRecord.evaluationPromise;
         }
     }
 
+    /**
+     * Resolve id for a module
+     */
     async resolve(id, importer) {
         const parentUrl = this.baseUrl; // only support baseUrl for now
 
@@ -620,7 +637,7 @@ class ModuleRegistry {
                     // eslint-disable-next-line no-await-in-loop
                     result = isResponseAPromise(response) ? await response : response;
                 }
-                if (!this.isValidResolveResponse(result)) {
+                if (!isValidResolveResponse(result)) {
                     throw new LoaderError(INVALID_LOADER_SERVICE_RESPONSE);
                 }
 
@@ -701,6 +718,9 @@ class ModuleRegistry {
         return this.moduleRegistry.has(id);
     }
 
+    /**
+     * Module entry point LWR.define()
+     */
     define(
         name,
         dependencies,
@@ -815,24 +835,10 @@ class ModuleRegistry {
         }
     }
 
-    
     setImportResolver(resolver) {
         this.resolver = resolver;
     }
 
-    
-
-    // A registry for named AMD defines containing the *metadata* of AMD module
-     __init() {this.namedDefineRegistry = new Map();}
-
-    // The evaluated module registry where the module identifier (name or URL?) is the key
-     __init2() {this.moduleRegistry = new Map();}
-
-    // Aliases of modules in the registry
-    __init3() {this.aliases = new Map();}
-
-    
-
     // Returns an existing module record by the resolvedId or aliased id
      getExistingModuleRecord(resolvedId, aliasId) {
         const moduleRecord = this.moduleRegistry.get(resolvedId);
@@ -854,7 +860,8 @@ class ModuleRegistry {
         return moduleRecord;
     }
 
-     async getModuleRecord(resolvedId, id) {
+    // Module Records Inflight Cache
+     getModuleRecord(resolvedId, id) {
         // Look for an existing record
         const existingRecord = this.getExistingModuleRecord(resolvedId, id);
         if (existingRecord) {
@@ -862,37 +869,17 @@ class ModuleRegistry {
             return existingRecord;
         }
 
-        // Create a new Module Record
-        const instantiation = this.getModuleDef(resolvedId, id);
-        const dependencyRecords = instantiation.then((moduleDef) => {
-            const dependencies = (moduleDef && moduleDef.dependencies) || [];
-            // get dep and filter out exports
-            const filtered = dependencies
-                .map((dep) => {
-                    if (dep === 'exports') {
-                        return;
-                    }
-                    invariant(dep !== 'require', NO_AMD_REQUIRE);
-                    return this.getModuleDependencyRecord.call(this, dep);
-                })
-                .filter((depRecord) => depRecord !== undefined) ;
-
-            return Promise.all(filtered);
-        });
-
         const newModuleRecord = {
             id: resolvedId,
             module: Object.create(null),
-            dependencyRecords,
-            instantiation,
+            instantiation: this.getModuleDef(resolvedId, id),
             evaluated: false,
             evaluationPromise: null,
         };
         this.moduleRegistry.set(resolvedId, newModuleRecord);
         this.storeModuleAlias(id, resolvedId);
 
-        // Wait for the dependencies to resolve the return the moduleRecord
-        return dependencyRecords.then(() => newModuleRecord);
+        return newModuleRecord;
     }
 
      storeModuleAlias(aliasId, resolvedId) {
@@ -912,96 +899,85 @@ class ModuleRegistry {
         }
     }
 
-     async getModuleDependencyRecord(dependency) {
-        const resolvedDepId = await this.resolve(dependency);
-        return this.getModuleRecord(resolvedDepId, dependency);
-    }
+    /**
+     * Evaluate all module dependencies
+     */
+     async evaluateDependencies(
+        dependencies,
+        evaluationMap,
+    ) {
+        const exports = {};
+        const promiseArray = [];
+        if (dependencies) {
+            for (const dep of dependencies) {
+                if (dep === 'exports') {
+                    promiseArray.push(Promise.resolve(exports));
+                } else {
+                    invariant(dep !== 'require', NO_AMD_REQUIRE);
+                    promiseArray.push(this.evaluateDependent(dep, evaluationMap));
+                }
+            }
+        }
 
-    // execute the "top-level code" (the code outside of functions) of a module
-     async topLevelEvaluation(moduleRecord) {
-        await this.instantiateAll(moduleRecord, {});
-        return this.evaluateModule(moduleRecord, {});
+        return Promise.all(promiseArray).then((results) => {
+            const depsMapped = results.filter((result) => result !== undefined);
+            return { depsMapped, exports };
+        });
     }
 
-    // Returns a promise when a module and all of it's dependencies have finished instantiation
-     async instantiateAll(
-        moduleRecord,
-        instantiatedMap,
-    ) {
-        if (!instantiatedMap[moduleRecord.id]) {
-            instantiatedMap[moduleRecord.id] = true;
-            const dependencyModuleRecords = await moduleRecord.dependencyRecords;
-            if (dependencyModuleRecords) {
-                for (let i = 0; i < dependencyModuleRecords.length; i++) {
-                    const depRecord = dependencyModuleRecords[i];
-                    // eslint-disable-next-line no-await-in-loop
-                    await this.instantiateAll(depRecord, instantiatedMap);
-                }
+     async evaluateDependent(dep, evaluationMap) {
+        const resolvedDepId = await this.resolve(dep);
+
+        const depModuleRecord = this.getModuleRecord(resolvedDepId, dep);
+        let module = depModuleRecord.module;
+        const handleReturn = (module) => {
+            if (module) {
+                return module.__defaultInterop ? module.default : module;
             }
+            throw new LoaderError(FAILED_DEP, [resolvedDepId]);
+        };
+
+        // If evaluated return the module
+        if (depModuleRecord.evaluated) {
+            return handleReturn(module);
+        }
+        /**
+         * Circular dependencies are handled properly when named exports are used,
+         * however, for default exports there is a bug: https://github.com/rollup/rollup/issues/3384
+         *
+         * The workaround below applies for circular dependencies (!moduleRecord.evaluated)
+         */
+        if (!evaluationMap[depModuleRecord.id]) {
+            // If we have not started dependency evaluation kick it off
+            if (!depModuleRecord.evaluationPromise) {
+                depModuleRecord.evaluationPromise = this.evaluateModule(depModuleRecord, evaluationMap);
+            }
+            return depModuleRecord.evaluationPromise.then((module) => {
+                return handleReturn(module);
+            });
+        } else {
+            // Otherwise return a dummy circular module wrapper
+            module = getCircularDependencyWrapper(module);
         }
+        return handleReturn(module);
     }
 
      async evaluateModule(
         moduleRecord,
         evaluationMap,
     ) {
-        const dependencyModuleRecords = await moduleRecord.dependencyRecords;
-        if (dependencyModuleRecords.length > 0) {
-            evaluationMap[moduleRecord.id] = true;
-            // evaluate dependencies first
-            await this.evaluateModuleDependencies(dependencyModuleRecords, evaluationMap);
-        }
+        // Create a evaluationMap to detect cycles in this dep chain
+        const chainMap = { ...evaluationMap };
+        chainMap[moduleRecord.id] = true;
 
+        // Wait for load to finish
         const { exporter, dependencies } = await moduleRecord.instantiation;
-        // The exports object automatically gets filled in by the exporter evaluation
-        const exports = {};
-        const depsMapped = dependencies
-            ? await Promise.all(
-                  dependencies.map(async (dep) => {
-                      if (dep === 'exports') {
-                          return exports;
-                      }
-                      const resolvedDepId = await this.resolve(dep);
-
-                      const moduleRecord = this.moduleRegistry.get(resolvedDepId) ;
-                      if (!moduleRecord) {
-                          throw new LoaderError(FAILED_DEP, [resolvedDepId]);
-                      }
-
-                      const module = moduleRecord.module;
-
-                      /**
-                       * Circular dependencies are handled properly when named exports are used,
-                       * however, for default exports there is a bug: https://github.com/rollup/rollup/issues/3384
-                       *
-                       * The workaround below applies for circular dependencies (!moduleRecord.evaluated)
-                       */
-                      if (!moduleRecord.evaluated) {
-                          return this.getCircularDependencyWrapper(module);
-                      }
-
-                      if (module) {
-                          return module.__defaultInterop ? module.default : module;
-                      }
-
-                      throw new LoaderError(FAILED_DEP, [resolvedDepId]);
-                  }),
-              )
-            : [];
-
-        // W-10029836 - In the case where we could be instantiating multiple graphs at the same time lets make sure the module have not already been evaluated
-        if (moduleRecord.evaluated) {
-            return moduleRecord.module;
-        }
 
-        // evaluates the module function
-        let moduleDefault;
-        try {
-            moduleDefault = exporter(...depsMapped);
-        } catch (e) {
-            throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
-        }
+        // Evaluate all it's dependents
+        const { depsMapped, exports } = await this.evaluateDependencies(dependencies, chainMap);
 
+        // evaluates the module function
+        let moduleDefault = this.evaluateModuleCode(exporter, depsMapped, moduleRecord);
         // value is returned from exporter, then we are not using named exports
         if (moduleDefault !== undefined) {
             moduleDefault = { default: moduleDefault };
@@ -1013,7 +989,7 @@ class ModuleRegistry {
         // if no return value, then we are using the exports object
         else {
             // handle only default export with Rollup forced named exports
-            if (this.isNamedExportDefaultOnly(exports)) {
+            if (isNamedExportDefaultOnly(exports)) {
                 Object.defineProperty(exports, '__useDefault', { value: true });
             }
         }
@@ -1045,42 +1021,17 @@ class ModuleRegistry {
             Object.defineProperty(moduleRecord.module, '__esModule', { value: true });
         }
 
-        moduleRecord.evaluated = true;
         Object.freeze(moduleRecord.module);
+        moduleRecord.evaluated = true;
+        moduleRecord.evaluationPromise = null;
         return moduleRecord.module;
     }
 
-    // Determines if named exports module has only default export
-     isNamedExportDefaultOnly(exports) {
-        return (
-            exports !== undefined &&
-            Object.getOwnPropertyNames(exports).length === 2 &&
-            Object.prototype.hasOwnProperty.call(exports, 'default') &&
-            Object.prototype.hasOwnProperty.call(exports, '__esModule')
-        );
-    }
-
-    // Wrap the dependency in a function that can be called and detected by __circular__ property.
-    // The LWC engine checks for __circular__ to detect circular dependencies.
-     getCircularDependencyWrapper(module) {
-        const tmp = () => {
-            return module.__useDefault || module.__defaultInterop ? module.default : module;
-        };
-        tmp.__circular__ = true;
-        return tmp;
-    }
-
-     async evaluateModuleDependencies(
-        dependencyModuleRecords,
-        evaluationMap,
-    ) {
-        for (let i = 0; i < dependencyModuleRecords.length; i++) {
-            const depRecord = dependencyModuleRecords[i];
-            if (!depRecord.evaluated && !evaluationMap[depRecord.id]) {
-                evaluationMap[depRecord.id] = true;
-                // eslint-disable-next-line no-await-in-loop
-                await this.evaluateModule(depRecord, evaluationMap);
-            }
+     evaluateModuleCode(evaluatedExporter, depsMapped, moduleRecord) {
+        try {
+            return evaluatedExporter(...depsMapped);
+        } catch (e) {
+            throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
         }
     }
 
@@ -1160,8 +1111,6 @@ class ModuleRegistry {
             });
     }
 
-    
-    
     addLoaderPlugin(hooks) {
         if (typeof hooks !== 'object') {
             throw new LoaderError(INVALID_HOOK);
@@ -1184,7 +1133,6 @@ class ModuleRegistry {
         }
     }
 
-    
     registerHandleStaleModuleHook(handleStaleModule) {
         if (this.handleStaleModuleHook) {
             this.handleStaleModuleHook.push(handleStaleModule);
@@ -1192,12 +1140,30 @@ class ModuleRegistry {
             this.handleStaleModuleHook = [handleStaleModule];
         }
     }
+}
 
-    isValidResolveResponse(res) {
-        return (
-            res === null || typeof res === 'string' || (res && typeof (res ).url === 'string')
-        );
-    }
+function isValidResolveResponse(res) {
+    return res === null || typeof res === 'string' || (res && typeof (res ).url === 'string');
+}
+
+// Determines if named exports module has only default export
+function isNamedExportDefaultOnly(exports) {
+    return (
+        exports !== undefined &&
+        Object.getOwnPropertyNames(exports).length === 2 &&
+        Object.prototype.hasOwnProperty.call(exports, 'default') &&
+        Object.prototype.hasOwnProperty.call(exports, '__esModule')
+    );
+}
+
+// Wrap the dependency in a function that can be called and detected by __circular__ property.
+// The LWC engine checks for __circular__ to detect circular dependencies.
+function getCircularDependencyWrapper(module) {
+    const tmp = () => {
+        return module.__useDefault || module.__defaultInterop ? module.default : module;
+    };
+    tmp.__circular__ = true;
+    return tmp;
 }
 
 // find the longest set of segments from path which are a key in matchObj

package/package.json

@@ -5,7 +5,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.6",
+    "version": "0.12.0-alpha.8",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -62,16 +62,16 @@
     },
     "devDependencies": {
         "@locker/trusted-types": "0.21.0",
-        "@lwrjs/diagnostics": "0.12.0-alpha.6",
-        "@lwrjs/types": "0.12.0-alpha.6",
+        "@lwrjs/diagnostics": "0.12.0-alpha.8",
+        "@lwrjs/types": "0.12.0-alpha.8",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-sucrase": "^5.0.2",
         "@rollup/plugin-terser": "^0.4.4",
         "rollup": "^2.78.0"
     },
     "dependencies": {
-        "@lwrjs/client-modules": "0.12.0-alpha.6",
-        "@lwrjs/shared-utils": "0.12.0-alpha.6"
+        "@lwrjs/client-modules": "0.12.0-alpha.8",
+        "@lwrjs/shared-utils": "0.12.0-alpha.8"
     },
     "lwc": {
         "modules": [
@@ -91,5 +91,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "d9428f6168feea04d3de54129a5861eb4590b26c"
+    "gitHead": "fa2d2189d7309adfb47f7b125616d26cb721ed6f"
 }