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

package/build/cjs/modules/lwr/loader/moduleRegistry/moduleRegistry.cjs

@@ -53,12 +53,12 @@ var ModuleRegistry = class {
       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;
     }
@@ -76,7 +76,7 @@ var ModuleRegistry = class {
         if (response || response === null) {
           result = (0, import_resolveAndLoadHook.isResponseAPromise)(response) ? await response : response;
         }
-        if (!this.isValidResolveResponse(result)) {
+        if (!isValidResolveResponse(result)) {
           throw new import_messages.LoaderError(import_messages.INVALID_LOADER_SERVICE_RESPONSE);
         }
         if (result !== null) {
@@ -211,34 +211,21 @@ var ModuleRegistry = class {
     }
     return moduleRecord;
   }
-  async getModuleRecord(resolvedId, id) {
+  getModuleRecord(resolvedId, id) {
     const existingRecord = this.getExistingModuleRecord(resolvedId, id);
     if (existingRecord) {
       return existingRecord;
     }
-    const instantiation = this.getModuleDef(resolvedId, id);
-    const dependencyRecords = instantiation.then((moduleDef) => {
-      const dependencies = moduleDef.dependencies || [];
-      const filtered = dependencies.map((dep) => {
-        if (dep === "exports") {
-          return;
-        }
-        (0, import_messages.invariant)(dep !== "require", import_messages.NO_AMD_REQUIRE);
-        return this.getModuleDependencyRecord.call(this, dep);
-      }).filter((depRecord) => depRecord !== void 0);
-      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);
-    return dependencyRecords.then(() => newModuleRecord);
+    return newModuleRecord;
   }
   storeModuleAlias(aliasId, resolvedId) {
     if (aliasId !== resolvedId) {
@@ -254,66 +241,60 @@ var ModuleRegistry = class {
       }
     }
   }
-  async getModuleDependencyRecord(dependency) {
-    const resolvedDepId = await this.resolve(dependency);
-    return this.getModuleRecord(resolvedDepId, dependency);
-  }
-  async topLevelEvaluation(moduleRecord) {
-    await this.instantiateAll(moduleRecord, {});
-    return this.evaluateModule(moduleRecord, {});
-  }
-  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];
-          await this.instantiateAll(depRecord, instantiatedMap);
+  async evaluateDependencies(dependencies, evaluationMap) {
+    const exports2 = {};
+    const promiseArray = [];
+    if (dependencies) {
+      for (const dep of dependencies) {
+        if (dep === "exports") {
+          promiseArray.push(Promise.resolve(exports2));
+        } else {
+          (0, import_messages.invariant)(dep !== "require", import_messages.NO_AMD_REQUIRE);
+          promiseArray.push(this.evaluateDependent(dep, evaluationMap));
         }
       }
     }
+    return Promise.all(promiseArray).then((results) => {
+      const depsMapped = results.filter((result) => result !== void 0);
+      return {depsMapped, exports: exports2};
+    });
   }
-  async evaluateModule(moduleRecord, evaluationMap) {
-    const dependencyModuleRecords = await moduleRecord.dependencyRecords;
-    if (dependencyModuleRecords.length > 0) {
-      evaluationMap[moduleRecord.id] = true;
-      await this.evaluateModuleDependencies(dependencyModuleRecords, evaluationMap);
-    }
-    const {exporter, dependencies} = await moduleRecord.instantiation;
-    const exports2 = {};
-    const depsMapped = dependencies ? await Promise.all(dependencies.map(async (dep) => {
-      if (dep === "exports") {
-        return exports2;
-      }
-      const resolvedDepId = await this.resolve(dep);
-      const moduleRecord2 = this.moduleRegistry.get(resolvedDepId);
-      if (!moduleRecord2) {
-        throw new import_messages.LoaderError(import_messages.FAILED_DEP, [resolvedDepId]);
-      }
-      const module2 = moduleRecord2.module;
-      if (!moduleRecord2.evaluated) {
-        return this.getCircularDependencyWrapper(module2);
-      }
-      if (module2) {
-        return module2.__defaultInterop ? module2.default : module2;
+  async evaluateDependent(dep, evaluationMap) {
+    const resolvedDepId = await this.resolve(dep);
+    const depModuleRecord = this.getModuleRecord(resolvedDepId, dep);
+    let module2 = depModuleRecord.module;
+    const handleReturn = (module3) => {
+      if (module3) {
+        return module3.__defaultInterop ? module3.default : module3;
       }
       throw new import_messages.LoaderError(import_messages.FAILED_DEP, [resolvedDepId]);
-    })) : [];
-    if (moduleRecord.evaluated) {
-      return moduleRecord.module;
+    };
+    if (depModuleRecord.evaluated) {
+      return handleReturn(module2);
     }
-    let moduleDefault;
-    try {
-      moduleDefault = exporter(...depsMapped);
-    } catch (e) {
-      throw new import_messages.LoaderError(import_messages.EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+    if (!evaluationMap[depModuleRecord.id]) {
+      if (!depModuleRecord.evaluationPromise) {
+        depModuleRecord.evaluationPromise = this.evaluateModule(depModuleRecord, evaluationMap);
+      }
+      return depModuleRecord.evaluationPromise.then((module3) => {
+        return handleReturn(module3);
+      });
+    } else {
+      module2 = getCircularDependencyWrapper(module2);
     }
+    return handleReturn(module2);
+  }
+  async evaluateModule(moduleRecord, evaluationMap) {
+    const chainMap = {...evaluationMap};
+    chainMap[moduleRecord.id] = true;
+    const {exporter, dependencies} = await moduleRecord.instantiation;
+    const {depsMapped, exports: exports2} = await this.evaluateDependencies(dependencies, chainMap);
+    let moduleDefault = this.evaluateModuleCode(exporter, depsMapped, moduleRecord);
     if (moduleDefault !== void 0) {
       moduleDefault = {default: moduleDefault};
       Object.defineProperty(moduleDefault, "__defaultInterop", {value: true});
     } else {
-      if (this.isNamedExportDefaultOnly(exports2)) {
+      if (isNamedExportDefaultOnly(exports2)) {
         Object.defineProperty(exports2, "__useDefault", {value: true});
       }
     }
@@ -338,27 +319,16 @@ var ModuleRegistry = class {
     if (moduleExports.__esModule) {
       Object.defineProperty(moduleRecord.module, "__esModule", {value: true});
     }
-    moduleRecord.evaluated = true;
     Object.freeze(moduleRecord.module);
+    moduleRecord.evaluated = true;
+    moduleRecord.evaluationPromise = null;
     return moduleRecord.module;
   }
-  isNamedExportDefaultOnly(exports2) {
-    return exports2 !== void 0 && Object.getOwnPropertyNames(exports2).length === 2 && Object.prototype.hasOwnProperty.call(exports2, "default") && Object.prototype.hasOwnProperty.call(exports2, "__esModule");
-  }
-  getCircularDependencyWrapper(module2) {
-    const tmp = () => {
-      return module2.__useDefault || module2.__defaultInterop ? module2.default : module2;
-    };
-    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;
-        await this.evaluateModule(depRecord, evaluationMap);
-      }
+  evaluateModuleCode(evaluatedExporter, depsMapped, moduleRecord) {
+    try {
+      return evaluatedExporter(...depsMapped);
+    } catch (e) {
+      throw new import_messages.LoaderError(import_messages.EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
     }
   }
   async getModuleDef(resolvedId, originalId) {
@@ -455,7 +425,17 @@ var ModuleRegistry = class {
       this.handleStaleModuleHook = [handleStaleModule];
     }
   }
-  isValidResolveResponse(res) {
-    return res === null || typeof res === "string" || res && typeof res.url === "string";
-  }
 };
+function isNamedExportDefaultOnly(exports2) {
+  return exports2 !== void 0 && Object.getOwnPropertyNames(exports2).length === 2 && Object.prototype.hasOwnProperty.call(exports2, "default") && Object.prototype.hasOwnProperty.call(exports2, "__esModule");
+}
+function getCircularDependencyWrapper(module2) {
+  const tmp = () => {
+    return module2.__useDefault || module2.__defaultInterop ? module2.default : module2;
+  };
+  tmp.__circular__ = true;
+  return tmp;
+}
+function isValidResolveResponse(res) {
+  return res === null || typeof res === "string" || res && typeof res.url === "string";
+}

package/build/cjs/modules/lwr/loaderLegacy/moduleRegistry/moduleRegistry.cjs

@@ -53,12 +53,12 @@ var ModuleRegistry = class {
       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;
     }
@@ -77,7 +77,7 @@ var ModuleRegistry = class {
         if (response || response === null) {
           result = (0, import_resolveAndLoadHook.isResponseAPromise)(response) ? await response : response;
         }
-        if (!this.isValidResolveResponse(result)) {
+        if (!isValidResolveResponse(result)) {
           throw new import_messages.LoaderError(import_messages.INVALID_LOADER_SERVICE_RESPONSE);
         }
         if (result !== null) {
@@ -243,34 +243,21 @@ var ModuleRegistry = class {
     }
     return moduleRecord;
   }
-  async getModuleRecord(resolvedId, id) {
+  getModuleRecord(resolvedId, id) {
     const existingRecord = this.getExistingModuleRecord(resolvedId, id);
     if (existingRecord) {
       return existingRecord;
     }
-    const instantiation = this.getModuleDef(resolvedId, id);
-    const dependencyRecords = instantiation.then((moduleDef) => {
-      const dependencies = moduleDef && moduleDef.dependencies || [];
-      const filtered = dependencies.map((dep) => {
-        if (dep === "exports") {
-          return;
-        }
-        (0, import_messages.invariant)(dep !== "require", import_messages.NO_AMD_REQUIRE);
-        return this.getModuleDependencyRecord.call(this, dep);
-      }).filter((depRecord) => depRecord !== void 0);
-      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);
-    return dependencyRecords.then(() => newModuleRecord);
+    return newModuleRecord;
   }
   storeModuleAlias(aliasId, resolvedId) {
     if (aliasId !== resolvedId) {
@@ -286,66 +273,60 @@ var ModuleRegistry = class {
       }
     }
   }
-  async getModuleDependencyRecord(dependency) {
-    const resolvedDepId = await this.resolve(dependency);
-    return this.getModuleRecord(resolvedDepId, dependency);
-  }
-  async topLevelEvaluation(moduleRecord) {
-    await this.instantiateAll(moduleRecord, {});
-    return this.evaluateModule(moduleRecord, {});
-  }
-  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];
-          await this.instantiateAll(depRecord, instantiatedMap);
+  async evaluateDependencies(dependencies, evaluationMap) {
+    const exports2 = {};
+    const promiseArray = [];
+    if (dependencies) {
+      for (const dep of dependencies) {
+        if (dep === "exports") {
+          promiseArray.push(Promise.resolve(exports2));
+        } else {
+          (0, import_messages.invariant)(dep !== "require", import_messages.NO_AMD_REQUIRE);
+          promiseArray.push(this.evaluateDependent(dep, evaluationMap));
         }
       }
     }
+    return Promise.all(promiseArray).then((results) => {
+      const depsMapped = results.filter((result) => result !== void 0);
+      return {depsMapped, exports: exports2};
+    });
   }
-  async evaluateModule(moduleRecord, evaluationMap) {
-    const dependencyModuleRecords = await moduleRecord.dependencyRecords;
-    if (dependencyModuleRecords.length > 0) {
-      evaluationMap[moduleRecord.id] = true;
-      await this.evaluateModuleDependencies(dependencyModuleRecords, evaluationMap);
-    }
-    const {exporter, dependencies} = await moduleRecord.instantiation;
-    const exports2 = {};
-    const depsMapped = dependencies ? await Promise.all(dependencies.map(async (dep) => {
-      if (dep === "exports") {
-        return exports2;
-      }
-      const resolvedDepId = await this.resolve(dep);
-      const moduleRecord2 = this.moduleRegistry.get(resolvedDepId);
-      if (!moduleRecord2) {
-        throw new import_messages.LoaderError(import_messages.FAILED_DEP, [resolvedDepId]);
-      }
-      const module2 = moduleRecord2.module;
-      if (!moduleRecord2.evaluated) {
-        return this.getCircularDependencyWrapper(module2);
-      }
-      if (module2) {
-        return module2.__defaultInterop ? module2.default : module2;
+  async evaluateDependent(dep, evaluationMap) {
+    const resolvedDepId = await this.resolve(dep);
+    const depModuleRecord = this.getModuleRecord(resolvedDepId, dep);
+    let module2 = depModuleRecord.module;
+    const handleReturn = (module3) => {
+      if (module3) {
+        return module3.__defaultInterop ? module3.default : module3;
       }
       throw new import_messages.LoaderError(import_messages.FAILED_DEP, [resolvedDepId]);
-    })) : [];
-    if (moduleRecord.evaluated) {
-      return moduleRecord.module;
+    };
+    if (depModuleRecord.evaluated) {
+      return handleReturn(module2);
     }
-    let moduleDefault;
-    try {
-      moduleDefault = exporter(...depsMapped);
-    } catch (e) {
-      throw new import_messages.LoaderError(import_messages.EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+    if (!evaluationMap[depModuleRecord.id]) {
+      if (!depModuleRecord.evaluationPromise) {
+        depModuleRecord.evaluationPromise = this.evaluateModule(depModuleRecord, evaluationMap);
+      }
+      return depModuleRecord.evaluationPromise.then((module3) => {
+        return handleReturn(module3);
+      });
+    } else {
+      module2 = getCircularDependencyWrapper(module2);
     }
+    return handleReturn(module2);
+  }
+  async evaluateModule(moduleRecord, evaluationMap) {
+    const chainMap = {...evaluationMap};
+    chainMap[moduleRecord.id] = true;
+    const {exporter, dependencies} = await moduleRecord.instantiation;
+    const {depsMapped, exports: exports2} = await this.evaluateDependencies(dependencies, chainMap);
+    let moduleDefault = this.evaluateModuleCode(exporter, depsMapped, moduleRecord);
     if (moduleDefault !== void 0) {
       moduleDefault = {default: moduleDefault};
       Object.defineProperty(moduleDefault, "__defaultInterop", {value: true});
     } else {
-      if (this.isNamedExportDefaultOnly(exports2)) {
+      if (isNamedExportDefaultOnly(exports2)) {
         Object.defineProperty(exports2, "__useDefault", {value: true});
       }
     }
@@ -370,27 +351,16 @@ var ModuleRegistry = class {
     if (moduleExports.__esModule) {
       Object.defineProperty(moduleRecord.module, "__esModule", {value: true});
     }
-    moduleRecord.evaluated = true;
     Object.freeze(moduleRecord.module);
+    moduleRecord.evaluated = true;
+    moduleRecord.evaluationPromise = null;
     return moduleRecord.module;
   }
-  isNamedExportDefaultOnly(exports2) {
-    return exports2 !== void 0 && Object.getOwnPropertyNames(exports2).length === 2 && Object.prototype.hasOwnProperty.call(exports2, "default") && Object.prototype.hasOwnProperty.call(exports2, "__esModule");
-  }
-  getCircularDependencyWrapper(module2) {
-    const tmp = () => {
-      return module2.__useDefault || module2.__defaultInterop ? module2.default : module2;
-    };
-    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;
-        await this.evaluateModule(depRecord, evaluationMap);
-      }
+  evaluateModuleCode(evaluatedExporter, depsMapped, moduleRecord) {
+    try {
+      return evaluatedExporter(...depsMapped);
+    } catch (e) {
+      throw new import_messages.LoaderError(import_messages.EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
     }
   }
   async getModuleDef(resolvedId, originalId) {
@@ -470,7 +440,17 @@ var ModuleRegistry = class {
       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";
+}
+function isNamedExportDefaultOnly(exports2) {
+  return exports2 !== void 0 && Object.getOwnPropertyNames(exports2).length === 2 && Object.prototype.hasOwnProperty.call(exports2, "default") && Object.prototype.hasOwnProperty.call(exports2, "__esModule");
+}
+function getCircularDependencyWrapper(module2) {
+  const tmp = () => {
+    return module2.__useDefault || module2.__defaultInterop ? module2.default : module2;
+  };
+  tmp.__circular__ = true;
+  return tmp;
+}

package/build/modules/lwr/esmLoader/esmLoader.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 ESM Module Loader v0.12.0-alpha.6 */
+/* LWR ESM Module Loader v0.12.0-alpha.8 */
 function _optionalChain$1(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }