@lwrjs/loader 0.12.0-alpha.9 → 0.13.0-alpha.0

package/build/assets/prod/lwr-loader-shim-legacy.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 Shim v0.12.0-alpha.9 */
+/* LWR Legacy Module Loader Shim v0.13.0-alpha.0 */
 (function () {
   'use strict';
 
@@ -207,7 +207,7 @@
           // Parse configuration
           this.global = global;
           this.config = global.LWR ;
-          this.loaderModule = 'lwr/loaderLegacy/v/0_12_0-alpha_9';
+          this.loaderModule = 'lwr/loaderLegacy/v/0_13_0-alpha_0';
 
           // Set up error handler
           this.errorHandler = this.config.onError;
@@ -327,7 +327,7 @@
           const exporter = (exports) => {
               Object.assign(exports, { logOperationStart, logOperationEnd });
           };
-          globalLWR.define('lwr/profiler/v/0_12_0-alpha_9', ['exports'], exporter, {});
+          globalLWR.define('lwr/profiler/v/0_13_0-alpha_0', ['exports'], exporter, {});
       }
 
       // Set up the application globals, import map, root custom element...
@@ -343,6 +343,7 @@
               serverData,
               importMappings,
               endpoints,
+              env: this.global.LWR.env,
           });
 
           // Redefine all modules in the temporary cache
@@ -398,8 +399,8 @@
   // The loader module is ALWAYS required
   const GLOBAL = globalThis ;
   GLOBAL.LWR.requiredModules = GLOBAL.LWR.requiredModules || [];
-  if (GLOBAL.LWR.requiredModules.indexOf('lwr/loaderLegacy/v/0_12_0-alpha_9') < 0) {
-      GLOBAL.LWR.requiredModules.push('lwr/loaderLegacy/v/0_12_0-alpha_9');
+  if (GLOBAL.LWR.requiredModules.indexOf('lwr/loaderLegacy/v/0_13_0-alpha_0') < 0) {
+      GLOBAL.LWR.requiredModules.push('lwr/loaderLegacy/v/0_13_0-alpha_0');
   }
   new LoaderShim(GLOBAL);
 

package/build/assets/prod/lwr-loader-shim.bundle.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 Module Loader Shim v0.12.0-alpha.9 */
+/* LWR Module Loader Shim v0.13.0-alpha.0 */
 (function () {
   'use strict';
 
@@ -205,7 +205,7 @@
           // Parse configuration
           this.global = global;
           this.config = global.LWR ;
-          this.loaderSpecifier = 'lwr/loader/v/0_12_0-alpha_9';
+          this.loaderSpecifier = 'lwr/loader/v/0_13_0-alpha_0';
 
           // Set up error handler
           this.errorHandler = this.config.onError;
@@ -326,7 +326,7 @@
           const exporter = (exports) => {
               Object.assign(exports, { logOperationStart, logOperationEnd });
           };
-          globalLWR.define('lwr/profiler/v/0_12_0-alpha_9', ['exports'], exporter);
+          globalLWR.define('lwr/profiler/v/0_13_0-alpha_0', ['exports'], exporter);
       }
 
       // Set up the application globals, import map, root custom element...
@@ -343,6 +343,7 @@
               endpoints,
               imports: imports || {},
               index: index || {},
+              env: this.global.LWR.env,
           });
 
           // Redefine all modules in the temporary cache
@@ -398,14 +399,14 @@
   // The loader module is ALWAYS required
   const GLOBAL = globalThis ;
   GLOBAL.LWR.requiredModules = GLOBAL.LWR.requiredModules || [];
-  if (GLOBAL.LWR.requiredModules.indexOf('lwr/loader/v/0_12_0-alpha_9') < 0) {
-      GLOBAL.LWR.requiredModules.push('lwr/loader/v/0_12_0-alpha_9');
+  if (GLOBAL.LWR.requiredModules.indexOf('lwr/loader/v/0_13_0-alpha_0') < 0) {
+      GLOBAL.LWR.requiredModules.push('lwr/loader/v/0_13_0-alpha_0');
   }
   new LoaderShim(GLOBAL);
 
 })();
 
-LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/loader/v/0_13_0-alpha_0', ['exports'], (function (exports) { 'use strict';
 
     const templateRegex = /\{([0-9]+)\}/g;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1048,7 +1049,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
       // swallow
     }
     const trusted = createPolicy('trusted', policyOptions);
-    /*! version: 0.21.0 */
+    /*! version: 0.21.4 */
 
     /* global console,process */
 
@@ -1200,22 +1201,13 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
 
 
 
+
+
 
 
 
     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.profiler = config.profiler;
@@ -1225,9 +1217,6 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             );
         }
 
-        /**
-         * Module import
-         */
         async load(id, importer) {
             const metadata = importer ? { importer } : {};
             this.profiler.logOperationStart({
@@ -1235,23 +1224,18 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
                 specifier: id,
                 metadata,
             });
-
             const resolvedId = await this.resolve(id, importer);
-            const moduleRecord = this.getModuleRecord(resolvedId, id);
-
+            const moduleRecord = await this.getModuleRecord(resolvedId, id);
             if (moduleRecord.evaluated) {
                 return moduleRecord.module;
             } else {
                 if (!moduleRecord.evaluationPromise) {
-                    moduleRecord.evaluationPromise = this.evaluateModule(moduleRecord, {});
+                    moduleRecord.evaluationPromise = this.topLevelEvaluation(moduleRecord);
                 }
                 return moduleRecord.evaluationPromise;
             }
         }
 
-        /**
-         * Resolve id for a module
-         */
         async resolve(id, importer) {
             const parentUrl = this.resolver.getBaseUrl(); // only support baseUrl for now
 
@@ -1267,7 +1251,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
                         // eslint-disable-next-line no-await-in-loop
                         result = isResponseAPromise(response) ? await response : response;
                     }
-                    if (!isValidResolveResponse(result)) {
+                    if (!this.isValidResolveResponse(result)) {
                         throw new LoaderError(INVALID_LOADER_SERVICE_RESPONSE);
                     }
 
@@ -1353,9 +1337,6 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             return this.moduleRegistry.has(id);
         }
 
-        /**
-         * Module entry point LWR.define()
-         */
         define(name, dependencies, exporter) {
             const mod = this.namedDefineRegistry.get(name);
             // Don't allow redefining a module.
@@ -1422,6 +1403,19 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             });
         }
 
+        
+
+        // 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();}
+
+        
+
         getImportMetadataResolver() {
             return this.resolver;
         }
@@ -1447,7 +1441,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             return moduleRecord;
         }
 
-         getModuleRecord(resolvedId, id) {
+         async getModuleRecord(resolvedId, id) {
             // Look for an existing record
             const existingRecord = this.getExistingModuleRecord(resolvedId, id);
             if (existingRecord) {
@@ -1455,10 +1449,29 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
                 return existingRecord;
             }
 
+            // Create a new Module Record
+            const instantiation = this.getModuleDef(resolvedId, id);
+            const dependencyRecords = instantiation.then((moduleDef) => {
+                const dependencies = 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),
-                instantiation: this.getModuleDef(resolvedId, id),
+                dependencyRecords,
+                instantiation,
                 evaluated: false,
                 evaluationPromise: null,
             };
@@ -1466,7 +1479,8 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             this.moduleRegistry.set(resolvedId, newModuleRecord);
             this.storeModuleAlias(id, resolvedId);
 
-            return newModuleRecord;
+            // Wait for the dependencies to resolve the return the moduleRecord
+            return dependencyRecords.then(() => newModuleRecord);
         }
 
          storeModuleAlias(aliasId, resolvedId) {
@@ -1487,87 +1501,95 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             }
         }
 
-        /**
-         * 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));
-                    }
-                }
-            }
-
-            return Promise.all(promiseArray).then((results) => {
-                const depsMapped = results.filter((result) => result !== undefined);
-                return { depsMapped, exports };
-            });
+         async getModuleDependencyRecord(dependency) {
+            const resolvedDepId = await this.resolve(dependency);
+            return this.getModuleRecord(resolvedDepId, dependency);
         }
 
-         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]);
-            };
+        // execute the "top-level code" (the code outside of functions) of a module
+         async topLevelEvaluation(moduleRecord) {
+            await this.instantiateAll(moduleRecord, {});
+            return this.evaluateModule(moduleRecord, {});
+        }
 
-            // 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);
+        // 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);
+                    }
                 }
-                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,
         ) {
-            // Create a evaluationMap to detect cycles in this dep chain
-            const chainMap = { ...evaluationMap };
-            chainMap[moduleRecord.id] = true;
+            const dependencyModuleRecords = await moduleRecord.dependencyRecords;
+            if (dependencyModuleRecords.length > 0) {
+                evaluationMap[moduleRecord.id] = true;
+                // evaluate dependencies first
+                await this.evaluateModuleDependencies(dependencyModuleRecords, evaluationMap);
+            }
 
-            // Wait for load to finish
             const { exporter, dependencies } = await moduleRecord.instantiation;
-
-            // Evaluate all it's dependents
-            const { depsMapped, exports } = await this.evaluateDependencies(dependencies, chainMap);
+            // 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 = this.evaluateModuleCode(exporter, depsMapped, moduleRecord);
+            let moduleDefault;
+            try {
+                moduleDefault = exporter(...depsMapped);
+            } catch (e) {
+                throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+            }
             // value is returned from exporter, then we are not using named exports
             if (moduleDefault !== undefined) {
                 moduleDefault = { default: moduleDefault };
@@ -1579,7 +1601,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             // if no return value, then we are using the exports object
             else {
                 // handle only default export with Rollup forced named exports
-                if (isNamedExportDefaultOnly(exports)) {
+                if (this.isNamedExportDefaultOnly(exports)) {
                     Object.defineProperty(exports, '__useDefault', { value: true });
                 }
             }
@@ -1611,17 +1633,42 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
                 Object.defineProperty(moduleRecord.module, '__esModule', { value: true });
             }
 
-            Object.freeze(moduleRecord.module);
             moduleRecord.evaluated = true;
-            moduleRecord.evaluationPromise = null;
+            Object.freeze(moduleRecord.module);
             return moduleRecord.module;
         }
 
-         evaluateModuleCode(evaluatedExporter, depsMapped, moduleRecord) {
-            try {
-                return evaluatedExporter(...depsMapped);
-            } catch (e) {
-                throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+        // 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);
+                }
             }
         }
 
@@ -1633,8 +1680,8 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             const moduleName = !isUrl(resolvedId)
                 ? resolvedId
                 : originalId !== resolvedId
-                ? originalId
-                : undefined;
+                  ? originalId
+                  : undefined;
             let moduleDef = moduleName && this.namedDefineRegistry.get(moduleName);
             if (moduleDef && moduleDef.external) {
                 return moduleDef.external.moduleDefPromise;
@@ -1701,6 +1748,9 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
                 });
         }
 
+        
+        
+        
         addLoaderPlugin(hooks) {
             if (typeof hooks !== 'object') {
                 throw new LoaderError(INVALID_HOOK);
@@ -1742,6 +1792,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
             }
         }
 
+        
         registerHandleStaleModuleHook(handleStaleModule) {
             if (this.handleStaleModuleHook) {
                 this.handleStaleModuleHook.push(handleStaleModule);
@@ -1749,30 +1800,12 @@ LWR.define('lwr/loader/v/0_12_0-alpha_9', ['exports'], (function (exports) { 'us
                 this.handleStaleModuleHook = [handleStaleModule];
             }
         }
-    }
 
-    // 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;
-    }
-
-    function isValidResolveResponse(res) {
-        return res === null || typeof res === 'string' || (res && typeof (res ).url === 'string');
+        isValidResolveResponse(res) {
+            return (
+                res === null || typeof res === 'string' || (res && typeof (res ).url === 'string')
+            );
+        }
     }
 
     /**