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

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/loader/v/{0_12_0-alpha_6/s/7d8a8e317de06e72e1bf307d3ea8d1f0 → 0_12_0-alpha_8/s/defdc8250ae07a7f1997e7288f4130fa}/lwr_loader.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/loader/v/0_12_0-alpha_8', ['exports'], (function (exports) { 'use strict';
 
   /**
   * Copyright (c) 2021, salesforce.com, inc.
@@ -6,7 +6,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
   * 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 v0.12.0-alpha.6 */
+  /* LWR 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) {
@@ -25,7 +25,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
       super();
       this.message = generateErrorMessage(errorInfo, errorArgs);
     }
-    /*LWC compiler v6.0.0*/
+    /*LWC compiler v6.1.1*/
   }
   function invariant(condition, errorInfo) {
     if (!condition) {
@@ -697,6 +697,18 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
   /* global console,process */
 
   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);
@@ -704,6 +716,10 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
       this.profiler = config.profiler;
       this.resolver = new ImportMetadataResolver(config, this.importMetadataInvalidationCallback.bind(this));
     }
+
+    /**
+     * Module import
+     */
     async load(id, importer) {
       const metadata = importer ? {
         importer
@@ -714,16 +730,20 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
         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.resolver.getBaseUrl(); // only support baseUrl for now
 
@@ -741,7 +761,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
             // 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);
           }
 
@@ -816,6 +836,10 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
     has(id) {
       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.
@@ -882,21 +906,6 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['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;
     }
@@ -921,41 +930,23 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
       }
       return moduleRecord;
     }
-    async getModuleRecord(resolvedId, id) {
+    getModuleRecord(resolvedId, id) {
       // Look for an existing record
       const existingRecord = this.getExistingModuleRecord(resolvedId, id);
       if (existingRecord) {
         // return existing
         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),
-        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) {
       if (aliasId !== resolvedId) {
@@ -974,82 +965,87 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
         }
       }
     }
-    async getModuleDependencyRecord(dependency) {
-      const resolvedDepId = await this.resolve(dependency);
-      return this.getModuleRecord(resolvedDepId, dependency);
-    }
 
-    // execute the "top-level code" (the code outside of functions) of a module
-    async topLevelEvaluation(moduleRecord) {
-      await this.instantiateAll(moduleRecord, {});
-      return this.evaluateModule(moduleRecord, {});
+    /**
+     * 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 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]);
+      };
 
-    // 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);
-          }
+      // 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;
-      }
+      // Evaluate all it's dependents
+      const {
+        depsMapped,
+        exports
+      } = await this.evaluateDependencies(dependencies, chainMap);
 
       // evaluates the module function
-      let moduleDefault;
-      try {
-        moduleDefault = exporter(...depsMapped);
-      } catch (e) {
-        throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
-      }
+      let moduleDefault = this.evaluateModuleCode(exporter, depsMapped, moduleRecord);
       // value is returned from exporter, then we are not using named exports
       if (moduleDefault !== undefined) {
         moduleDefault = {
@@ -1065,7 +1061,7 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['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 (this.isNamedExportDefaultOnly(exports)) {
+        if (isNamedExportDefaultOnly(exports)) {
           Object.defineProperty(exports, '__useDefault', {
             value: true
           });
@@ -1103,33 +1099,16 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
           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]);
       }
     }
     async getModuleDef(resolvedId, originalId) {
@@ -1256,9 +1235,24 @@ LWR.define('lwr/loader/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'us
         this.handleStaleModuleHook = [handleStaleModule];
       }
     }
-    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;
+  }
+  function isValidResolveResponse(res) {
+    return res === null || typeof res === 'string' || res && typeof res.url === 'string';
   }
 
   /**

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/metrics/v/{0_12_0-alpha_6 → 0_12_0-alpha_8}/s/274c8343f810353bbad085a79709395f/lwr_metrics.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/metrics/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/metrics/v/0_12_0-alpha_8', ['exports'], (function (exports) { 'use strict';
 
 	// Bootstrap / shim
 	const BOOTSTRAP_PREFIX = 'lwr.bootstrap.';

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/preInit/v/{0_12_0-alpha_6 → 0_12_0-alpha_8}/s/f3a204ef43fb3057d910f80d7e9f9ba7/lwr_preInit.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/preInit/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/preInit/v/0_12_0-alpha_8', ['exports'], (function (exports) { 'use strict';
 
   /**
    * This module is called in the ABS module (app bootstrap module) to perform neccesary pre initialization steps for an LWR app.

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/profiler/v/{0_12_0-alpha_6 → 0_12_0-alpha_8}/s/a152b8d35f12ca1b5147c5cd1ee155fb/lwr_profiler.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/profiler/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/profiler/v/0_12_0-alpha_8', ['exports'], (function (exports) { 'use strict';
 
   var Phase = /*#__PURE__*/function (Phase) {
     Phase[Phase["Start"] = 0] = "Start";

package/build/__generated_site_amd_modules__/1/module/amd/1/l/en-US/mi/lwr/vault/v/{0_12_0-alpha_6 → 0_12_0-alpha_8}/s/c92abd8c1fec2d7eff62e4b097abbe14/lwr_vault.js

@@ -1,4 +1,4 @@
-LWR.define('lwr/vault/v/0_12_0-alpha_6', ['exports'], (function (exports) { 'use strict';
+LWR.define('lwr/vault/v/0_12_0-alpha_8', ['exports'], (function (exports) { 'use strict';
 
   // Credential vault for storing setters and subscribers for OAuth info
   // This module is a SINGLETON and must be excluded from ESM bundling

package/build/__generated_site_amd_modules__/1/resource/amd/lwr-error-shim.js/v/{0_12_0-alpha_6 → 0_12_0-alpha_8}/lwr-error-shim.js

@@ -4,5 +4,5 @@
 * SPDX-License-Identifier: MIT
 * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
 */
-/* LWR Error Shim v0.12.0-alpha.6 */
+/* LWR Error Shim v0.12.0-alpha.8 */
 !function(){"use strict";if(!(globalThis.LWR&&globalThis.LWR.define)){const o=new Error("The LWR application failed to bootstrap");if(!globalThis.LWR||!globalThis.LWR.onError)throw o;globalThis.LWR.onError(o)}}();