@lwrjs/module-registry 0.6.0-alpha.2 → 0.6.0-alpha.6

package/build/cjs/index.cjs

@@ -1,28 +1,28 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
-  __markAsModule(target);
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+    __defProp(target, name, {get: all[name], enumerable: true});
 };
-var __reExport = (target, module2, desc) => {
+var __exportStar = (target, module2, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
       if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
   }
   return target;
 };
 var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
 };
 
 // packages/@lwrjs/module-registry/src/index.ts
+__markAsModule(exports);
 __export(exports, {
   LwrModuleRegistry: () => LwrModuleRegistry
 });
@@ -38,6 +38,7 @@ var LwrModuleRegistry = class {
     this.providers = [];
     this.moduleDefCache = new Map();
     this.moduleLinkedCache = new Map();
+    this.inflightModuleDefinitions = new import_shared_utils.InflightTasks();
     this.name = "lwr-module-registry";
     this.context = context;
     this.globalConfig = globalConfig;
@@ -48,10 +49,10 @@ var LwrModuleRegistry = class {
     if (globalConfig.environment?.default) {
       this.interchangeableModules = (0, import_shared_utils.discoverInterchangeableModules)(globalConfig.lwc.modules, globalConfig.lwc.interchangeableModulesMap);
     }
-    context.appObserver.onModuleSourceChange(async ({ payload: moduleCompiled }) => {
+    context.appObserver.onModuleSourceChange(async ({payload: moduleCompiled}) => {
       const id = moduleCompiled.id;
       if (!this.moduleDefCache.has(id)) {
-        console.log("[WARNING] Unable to find match in moduleDefCache", { id });
+        console.log("[WARNING] Unable to find match in moduleDefCache", {id});
       }
       this.moduleDefCache.delete(id);
       const linkedModules = this.moduleLinkedCache.get(id);
@@ -70,7 +71,7 @@ var LwrModuleRegistry = class {
       const uri = (0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, signature);
       return uri;
     }
-    const { bundle, format } = runtimeEnvironment;
+    const {bundle, format} = runtimeEnvironment;
     if (bundle) {
       return new Promise((resolve, reject) => {
         (0, import_signature.getBundleSignature)(moduleId, this).then((bundleSignature) => resolve((0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, bundleSignature))).catch(reject);
@@ -88,34 +89,41 @@ var LwrModuleRegistry = class {
     return this.delegateGetModuleEntryOnServices(moduleId, runtimeParams);
   }
   async getModule(moduleId, runtimeParams) {
-    const { locker } = this.globalConfig;
     const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
     const cacheDisabled = process.env.NOCACHE === "true";
     if (cacheDisabled === false && this.moduleDefCache.has(moduleEntry.id)) {
       return this.moduleDefCache.get(moduleEntry.id);
     }
+    const createModulePromiseCtor = async () => {
+      return this.createModuleDefinition(moduleId, runtimeParams).then((moduleDef) => {
+        if (cacheDisabled === false) {
+          this.moduleDefCache.set(moduleDef.id, moduleDef);
+        }
+        return moduleDef;
+      });
+    };
+    return this.inflightModuleDefinitions.execute(moduleEntry.id, createModulePromiseCtor, this);
+  }
+  async createModuleDefinition(moduleId, runtimeParams) {
+    const {locker} = this.globalConfig;
     const moduleCompiled = await this.delegateGetModuleOnProviders(moduleId, runtimeParams);
     if (locker.enabled && !locker.clientOnly) {
-      const { runtimeEnvironment } = this.context;
+      const {runtimeEnvironment} = this.context;
       const sourcemap = typeof runtimeEnvironment.sourceMapUrl === "string";
-      const { code: lockerizedCode } = this.context.compiler.lockerize(moduleCompiled, locker, sourcemap);
+      const {code: lockerizedCode} = this.context.compiler.lockerize(moduleCompiled, locker, sourcemap);
       moduleCompiled.compiledSource = lockerizedCode;
     }
     const moduleRecord = await (0, import_module_record.getModuleRecord)(moduleCompiled, this, this.context.compiler);
-    const moduleDef = { ...moduleCompiled, moduleRecord };
-    if (cacheDisabled === false) {
-      this.moduleDefCache.set(moduleDef.id, moduleDef);
-    }
-    return moduleDef;
+    return {...moduleCompiled, moduleRecord};
   }
   async getLinkedModule(moduleId, runtimeEnvironment, runtimeParams) {
     const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
     const id = moduleEntry.id;
-    const { format, compat, debug, minify } = runtimeEnvironment;
+    const {format, compat, debug, minify} = runtimeEnvironment;
     const locale = runtimeParams?.["locale"];
     const environment = runtimeParams?.["environment"];
     const {
-      locker: { enabled: lockerEnabled }
+      locker: {enabled: lockerEnabled}
     } = this.globalConfig;
     const cacheDisabled = process.env.NOCACHE === "true";
     if (cacheDisabled === false && this.moduleLinkedCache.has(id)) {
@@ -138,17 +146,17 @@ var LwrModuleRegistry = class {
     const moduleLinked = await this.createLinkedModuleDefinition(moduleDef, runtimeEnvironment, runtimeParams);
     if (cacheDisabled === false) {
       const linkedMap = this.moduleLinkedCache.get(id) || new Map();
-      linkedMap.set((0, import_shared_utils.getCacheKeyFromJson)({ format, compat, debug, minify, lockerEnabled, locale, environment }), moduleLinked);
+      linkedMap.set((0, import_shared_utils.getCacheKeyFromJson)({format, compat, debug, minify, lockerEnabled, locale, environment}), moduleLinked);
       this.moduleLinkedCache.set(id, linkedMap);
     }
     return moduleLinked;
   }
   async createLinkedModuleDefinition(moduleDef, runtimeEnvironment, runtimeParams) {
-    const { format, minify, debug } = runtimeEnvironment;
+    const {format, minify, debug} = runtimeEnvironment;
     const minified = !!minify && !debug;
-    const { amdLoader, esmLoader } = this.globalConfig;
+    const {amdLoader, esmLoader} = this.globalConfig;
     if (format === "amd") {
-      const loaderModuleEntry = await this.getModuleEntry({ specifier: amdLoader }, runtimeParams);
+      const loaderModuleEntry = await this.getModuleEntry({specifier: amdLoader}, runtimeParams);
       const {
         id,
         code: linkedES6,
@@ -156,14 +164,15 @@ var LwrModuleRegistry = class {
       } = await (0, import_linker.link)(this, moduleDef, import_amd_strategy.default, runtimeEnvironment, runtimeParams, {
         amdLoaderModule: loaderModuleEntry
       }, this.interchangeableModules);
-      const { code: amdSource } = await this.context.compiler.convertToAmd(linkedES6, {
+      const {code: amdSource} = await this.context.compiler.convertToAmd(linkedES6, {
         id
       });
       let linkedAmdSource = amdSource;
       if (minified) {
-        const { code: minifiedCode } = await this.context.compiler.minifyJavascript(amdSource);
+        const {code: minifiedCode} = await this.context.compiler.minifyJavascript(amdSource);
         linkedAmdSource = minifiedCode;
       }
+      linkedModuleRecord.dynamicImports = linkedModuleRecord.dynamicImports?.filter((imp) => imp.moduleNameType !== import_shared_utils.ModuleNameType.unresolved);
       return {
         ...moduleDef,
         linkedSource: linkedAmdSource,
@@ -177,16 +186,17 @@ var LwrModuleRegistry = class {
       let loaderModuleEntry;
       const dynamicImports = moduleDef.moduleRecord.dynamicImports;
       if (moduleDef.moduleEntry.specifier !== esmLoader && dynamicImports && dynamicImports.some((d) => d.moduleNameType === import_shared_utils.ModuleNameType.unresolved)) {
-        loaderModuleEntry = await this.getModuleEntry({ specifier: esmLoader }, runtimeParams);
+        loaderModuleEntry = await this.getModuleEntry({specifier: esmLoader}, runtimeParams);
       }
-      const { code: esmLinkedSource, linkedModuleRecord } = await (0, import_linker.link)(this, moduleDef, import_esm_strategy.default, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
+      const {code: esmLinkedSource, linkedModuleRecord} = await (0, import_linker.link)(this, moduleDef, import_esm_strategy.default, runtimeEnvironment, runtimeParams, loaderModuleEntry && {
         esmLoaderModule: loaderModuleEntry
       }, this.interchangeableModules, this.globalConfig.bundleConfig?.exclude);
       let transformedEsmCode = esmLinkedSource;
       if (minified) {
-        const { code: minifiedEsm } = await this.context.compiler.minifyJavascript(transformedEsmCode);
+        const {code: minifiedEsm} = await this.context.compiler.minifyJavascript(transformedEsmCode);
         transformedEsmCode = minifiedEsm;
       }
+      linkedModuleRecord.dynamicImports = linkedModuleRecord.dynamicImports?.filter((imp) => imp.moduleNameType !== import_shared_utils.ModuleNameType.unresolved);
       return {
         ...moduleDef,
         linkedConfig: {

package/build/cjs/linker/linker.cjs

@@ -1,28 +1,28 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
-  __markAsModule(target);
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+    __defProp(target, name, {get: all[name], enumerable: true});
 };
-var __reExport = (target, module2, desc) => {
+var __exportStar = (target, module2, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
       if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
   }
   return target;
 };
 var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
 };
 
 // packages/@lwrjs/module-registry/src/linker/linker.ts
+__markAsModule(exports);
 __export(exports, {
   link: () => link
 });
@@ -30,12 +30,12 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_shared_utils2 = __toModule(require("@lwrjs/shared-utils"));
 var import_signature = __toModule(require("../signature.cjs"));
 async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironment, runtimeParams, config, interchangeableModules, exclude) {
-  const { specifier, version, compiledSource, moduleRecord } = moduleDef;
-  const { imports, dynamicImports } = moduleRecord;
+  const {specifier, version, compiledSource, moduleRecord} = moduleDef;
+  const {imports, dynamicImports} = moduleRecord;
   const codeStringBuilder = (0, import_shared_utils.createStringBuilder)(compiledSource);
   const amdLoaderModule = config?.amdLoaderModule;
   const esmLoaderModule = config?.esmLoaderModule;
-  const id = strategy({ specifier, version }, runtimeEnvironment, runtimeParams);
+  const id = strategy({specifier, version}, runtimeEnvironment, runtimeParams);
   let linkedImports = [];
   let linkedDynamicImports = [];
   if (imports && imports.length > 0) {
@@ -62,32 +62,32 @@ async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironment, run
       if (runtimeEnvironment.bundle && runtimeEnvironment.format === "esm" && exclude?.includes(importRef.specifier)) {
         signature = await (0, import_signature.getBundleSignature)(importRef, moduleRegistry);
       }
-      const { locations, sourceSpecifier } = importRef;
+      const {locations, sourceSpecifier} = importRef;
       const link2 = strategy(importRef, runtimeEnvironment, runtimeParams, signature);
       const linkedLocations = locations.map((location) => {
-        const { startColumn, endColumn } = location;
+        const {startColumn, endColumn} = location;
         codeStringBuilder.overwrite(startColumn, endColumn, link2);
         return {
           startColumn,
           endColumn: endColumn + link2.length
         };
       });
-      return { ...importRef, sourceSpecifier, specifier: link2, locations: linkedLocations };
+      return {...importRef, sourceSpecifier, specifier: link2, locations: linkedLocations};
     }));
   }
   if (dynamicImports && dynamicImports.length > 0) {
     let loaderSizeOffset = 0;
     linkedDynamicImports = await Promise.all(dynamicImports.map(async (importRef) => {
-      const { locations, sourceSpecifier } = importRef;
+      const {locations, sourceSpecifier} = importRef;
       let signature;
       const isStringLiteral = importRef.moduleNameType === import_shared_utils2.ModuleNameType.string;
       if (isStringLiteral && runtimeEnvironment.bundle && runtimeEnvironment.format === "esm") {
         signature = await (0, import_signature.getBundleSignature)(importRef, moduleRegistry);
       }
       const link2 = isStringLiteral ? strategy(importRef, runtimeEnvironment, runtimeParams, signature) : importRef.specifier;
-      const linkedLocations = locations.map(({ location, importLocation }) => {
-        const { startColumn, endColumn } = location;
-        const { startColumn: importStart, endColumn: importEnd } = importLocation;
+      const linkedLocations = locations.map(({location, importLocation}) => {
+        const {startColumn, endColumn} = location;
+        const {startColumn: importStart, endColumn: importEnd} = importLocation;
         if (isStringLiteral) {
           codeStringBuilder.overwrite(startColumn + 1, endColumn - 1, link2);
         }
@@ -95,7 +95,7 @@ async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironment, run
           codeStringBuilder.overwrite(importStart, importEnd, "load(");
           loaderSizeOffset = 2;
           if (!isStringLiteral) {
-            const importerSpecifier = (0, import_shared_utils2.getSpecifier)({ specifier, version });
+            const importerSpecifier = (0, import_shared_utils2.getSpecifier)({specifier, version});
             codeStringBuilder.overwrite(endColumn, endColumn + 1, `, '${importerSpecifier}')`);
             loaderSizeOffset = -1 * importerSpecifier.length - 2;
           }
@@ -111,17 +111,17 @@ async function link(moduleRegistry, moduleDef, strategy, runtimeEnvironment, run
           }
         };
       });
-      return { ...importRef, sourceSpecifier, specifier: link2, locations: linkedLocations };
+      return {...importRef, sourceSpecifier, specifier: link2, locations: linkedLocations};
     }));
   }
   if (dynamicImports && dynamicImports.length > 0 && (amdLoaderModule || esmLoaderModule)) {
-    const { version: version2, specifier: specifier2 } = amdLoaderModule || esmLoaderModule;
-    const { namespace, name } = (0, import_shared_utils2.explodeSpecifier)(specifier2);
+    const {version: version2, specifier: specifier2} = amdLoaderModule || esmLoaderModule;
+    const {namespace, name} = (0, import_shared_utils2.explodeSpecifier)(specifier2);
     let signature;
     if (esmLoaderModule && runtimeEnvironment.bundle) {
-      signature = await (0, import_signature.getBundleSignature)({ version: version2, specifier: specifier2 }, moduleRegistry);
+      signature = await (0, import_signature.getBundleSignature)({version: version2, specifier: specifier2}, moduleRegistry);
     }
-    const loaderLink = strategy({ specifier: specifier2, version: version2 }, runtimeEnvironment, runtimeParams, signature);
+    const loaderLink = strategy({specifier: specifier2, version: version2}, runtimeEnvironment, runtimeParams, signature);
     codeStringBuilder.prepend(`import { load } from "${loaderLink}";
 `);
     linkedImports.unshift({

package/build/cjs/linker/strategies/amd-strategy.cjs

@@ -1,33 +1,33 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
-  __markAsModule(target);
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+    __defProp(target, name, {get: all[name], enumerable: true});
 };
-var __reExport = (target, module2, desc) => {
+var __exportStar = (target, module2, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
       if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
   }
   return target;
 };
 var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
 };
 
 // packages/@lwrjs/module-registry/src/linker/strategies/amd-strategy.ts
+__markAsModule(exports);
 __export(exports, {
   default: () => amdLinkingStrategy
 });
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function amdLinkingStrategy(moduleId) {
-  const { specifier, version } = moduleId;
-  return (0, import_shared_utils.getSpecifier)({ specifier, version: (0, import_shared_utils.normalizeVersionToUri)(version) });
+  const {specifier, version} = moduleId;
+  return (0, import_shared_utils.getSpecifier)({specifier, version: (0, import_shared_utils.normalizeVersionToUri)(version)});
 }

package/build/cjs/linker/strategies/esm-strategy.cjs

@@ -1,28 +1,28 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
-  __markAsModule(target);
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+    __defProp(target, name, {get: all[name], enumerable: true});
 };
-var __reExport = (target, module2, desc) => {
+var __exportStar = (target, module2, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
       if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
   }
   return target;
 };
 var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
 };
 
 // packages/@lwrjs/module-registry/src/linker/strategies/esm-strategy.ts
+__markAsModule(exports);
 __export(exports, {
   default: () => linkEsm
 });
@@ -30,14 +30,14 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var SIGNATURE_SIGIL = "s";
 var LATEST_SIG = "latest";
 function linkEsm(moduleId, environment, params = {}, signature) {
-  const { bundle, debug } = environment;
-  const { specifier, version } = moduleId;
+  const {bundle, debug} = environment;
+  const {specifier, version} = moduleId;
   const uriPrefix = (0, import_shared_utils.getModuleUriPrefix)(environment, params);
-  const vSpecifier = (0, import_shared_utils.getSpecifier)({ specifier, version: (0, import_shared_utils.normalizeVersionToUri)(version) });
+  const vSpecifier = (0, import_shared_utils.getSpecifier)({specifier, version: (0, import_shared_utils.normalizeVersionToUri)(version)});
   const encodedVSpecifier = encodeURIComponent(vSpecifier);
   const latestSignature = signature === void 0 || signature === LATEST_SIG;
   const sigilSignature = latestSignature ? LATEST_SIG : `${SIGNATURE_SIGIL}/${signature}`;
-  const prettyUrl = (bundle ? "bundle_" : "") + `${specifier.replace(/[\/\.\#]/g, "_")}`;
+  const prettyUrl = (bundle ? "bundle_" : "") + (0, import_shared_utils.prettyModuleUriSuffix)(specifier);
   const debugModifier = debug ? "?debug=true" : "";
   return `${uriPrefix}${encodedVSpecifier}/${sigilSignature}/${prettyUrl}.js${debugModifier}`;
 }

package/build/cjs/module-record.cjs

@@ -1,28 +1,28 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
-  __markAsModule(target);
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+    __defProp(target, name, {get: all[name], enumerable: true});
 };
-var __reExport = (target, module2, desc) => {
+var __exportStar = (target, module2, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
       if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
   }
   return target;
 };
 var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
 };
 
 // packages/@lwrjs/module-registry/src/module-record.ts
+__markAsModule(exports);
 __export(exports, {
   getModuleRecord: () => getModuleRecord
 });
@@ -34,7 +34,7 @@ async function resolveRelativeImport(registry, moduleSpecifier, importeeEntry, v
     moduleSpecifier = `./${import_path.default.join(importeePath, "..", moduleSpecifier)}`;
   }
   const specifier = `${importeeSpecifier}#${moduleSpecifier.substr(2)}`;
-  const { namespace, name } = (0, import_shared_utils.explodeSpecifier)(specifier);
+  const {namespace, name} = (0, import_shared_utils.explodeSpecifier)(specifier);
   const dependencyModuleEntry = await registry.getModuleEntry({
     specifier,
     version,
@@ -51,8 +51,8 @@ async function resolveRelativeImport(registry, moduleSpecifier, importeeEntry, v
   };
 }
 async function resolveExternalImport(registry, moduleSpecifier, importeeEntry, location) {
-  const { namespace, name, specifier } = (0, import_shared_utils.explodeSpecifier)(moduleSpecifier);
-  const { entry, virtual } = importeeEntry;
+  const {namespace, name, specifier} = (0, import_shared_utils.explodeSpecifier)(moduleSpecifier);
+  const {entry, virtual} = importeeEntry;
   const moduleEntryRoot = virtual ? void 0 : import_path.default.dirname(entry);
   const dependencyModuleEntry = await registry.getModuleEntry({
     specifier: moduleSpecifier,
@@ -72,16 +72,16 @@ async function resolveExternalImport(registry, moduleSpecifier, importeeEntry, l
 async function getModuleRecord(compiledModule, registry, compiler) {
   const imports = [];
   const dynamicImports = [];
-  const { compiledMetadata: defaultCompilerMetadata, moduleEntry, version } = compiledModule;
+  const {compiledMetadata: defaultCompilerMetadata, moduleEntry, version} = compiledModule;
   const compiledMetadata = defaultCompilerMetadata || {};
-  const { imports: compiledModuleImports, dynamicImports: compiledModuleDynamicImports } = await compiler.getModuleMetadata(compiledModule.compiledSource);
+  const {imports: compiledModuleImports, dynamicImports: compiledModuleDynamicImports} = await compiler.getModuleMetadata(compiledModule.compiledSource);
   Object.assign(compiledMetadata, {
     imports: compiledModuleImports,
     dynamicImports: compiledModuleDynamicImports
   });
   if (compiledMetadata && compiledMetadata.imports && compiledMetadata.imports.length > 0) {
     const visitedImports = new Set();
-    for (const { moduleSpecifier, location } of compiledMetadata.imports) {
+    for (const {moduleSpecifier, location} of compiledMetadata.imports) {
       if (!visitedImports.has(moduleSpecifier)) {
         visitedImports.add(moduleSpecifier);
         if (moduleSpecifier.startsWith(".")) {
@@ -124,7 +124,7 @@ async function getModuleRecord(compiledModule, registry, compiler) {
             ]
           });
         } else if (moduleSpecifier.startsWith(".")) {
-          const { locations, ...resolvedImport } = await resolveRelativeImport(registry, moduleSpecifier, moduleEntry, version, location);
+          const {locations, ...resolvedImport} = await resolveRelativeImport(registry, moduleSpecifier, moduleEntry, version, location);
           dynamicImports.push({
             ...resolvedImport,
             moduleNameType: import_shared_utils.ModuleNameType.string,
@@ -136,7 +136,7 @@ async function getModuleRecord(compiledModule, registry, compiler) {
             ]
           });
         } else {
-          const { locations, ...resolvedImport } = await resolveExternalImport(registry, moduleSpecifier, moduleEntry, location);
+          const {locations, ...resolvedImport} = await resolveExternalImport(registry, moduleSpecifier, moduleEntry, location);
           dynamicImports.push({
             ...resolvedImport,
             moduleNameType: import_shared_utils.ModuleNameType.string,
@@ -151,7 +151,7 @@ async function getModuleRecord(compiledModule, registry, compiler) {
       } else {
         const importReference = dynamicImports.find((i) => i.sourceSpecifier === moduleSpecifier);
         if (importReference) {
-          importReference.locations.push({ location, importLocation });
+          importReference.locations.push({location, importLocation});
         }
       }
     }

package/build/cjs/signature.cjs

@@ -1,28 +1,28 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
-  __markAsModule(target);
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+    __defProp(target, name, {get: all[name], enumerable: true});
 };
-var __reExport = (target, module2, desc) => {
+var __exportStar = (target, module2, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
       if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
   }
   return target;
 };
 var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
 };
 
 // packages/@lwrjs/module-registry/src/signature.ts
+__markAsModule(exports);
 __export(exports, {
   getBundleSignature: () => getBundleSignature
 });
@@ -43,7 +43,7 @@ async function getRecursiveModuleHash(definitions, registry, hash, visitedDefini
     if (visitedDefinitions.has(definition.id)) {
       continue;
     }
-    const { ownHash, moduleRecord } = definition;
+    const {ownHash, moduleRecord} = definition;
     hash.update(ownHash);
     if (moduleRecord.imports) {
       imports.push(...moduleRecord.imports);
@@ -64,6 +64,6 @@ async function getBundleSignature(moduleId, registry) {
 }
 function getLWCVersion() {
   const require2 = (0, import_module.createRequire)(import_path.default.join((0, import_process.cwd)(), "./env-config.js"));
-  const { version } = require2("lwc/package.json");
+  const {version} = require2("lwc/package.json");
   return version;
 }

package/build/es/index.d.ts

@@ -14,11 +14,13 @@ export declare class LwrModuleRegistry implements ModuleRegistry {
     emitter: LwrAppEmitter;
     globalConfig: NormalizedLwrGlobalConfig;
     private interchangeableModules?;
+    private inflightModuleDefinitions;
     constructor(context: RegistryContext, globalConfig: NormalizedLwrGlobalConfig, registries?: ModuleProvider[]);
     resolveModuleUri<R extends RuntimeEnvironment, S extends string | undefined>(moduleId: Required<Pick<ModuleId, 'specifier' | 'version'>>, runtimeEnvironment: R, runtimeParams?: RuntimeParams, signature?: S): S extends string ? string : Promise<string>;
     addModuleProviders(registries: ModuleProvider[]): void;
     getModuleEntry<T extends AbstractModuleId>(moduleId: T, runtimeParams?: RuntimeParams): Promise<ModuleEntry>;
     getModule<T extends AbstractModuleId>(moduleId: T, runtimeParams?: RuntimeParams): Promise<ModuleDefinition>;
+    private createModuleDefinition;
     getLinkedModule<T extends AbstractModuleId>(moduleId: T, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<LinkedModuleDefinition>;
     private createLinkedModuleDefinition;
     private delegateGetModuleEntryOnServices;

package/build/es/index.js

@@ -1,5 +1,5 @@
 import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
-import { discoverInterchangeableModules, getCacheKeyFromJson, LATEST_SIGNATURE, ModuleNameType, } from '@lwrjs/shared-utils';
+import { discoverInterchangeableModules, getCacheKeyFromJson, InflightTasks, LATEST_SIGNATURE, ModuleNameType, } from '@lwrjs/shared-utils';
 import { link } from './linker/linker.js';
 import { getModuleRecord } from './module-record.js';
 import amdLinkingStrategy from './linker/strategies/amd-strategy.js';
@@ -10,6 +10,7 @@ export class LwrModuleRegistry {
         this.providers = [];
         this.moduleDefCache = new Map();
         this.moduleLinkedCache = new Map();
+        this.inflightModuleDefinitions = new InflightTasks();
         this.name = 'lwr-module-registry';
         this.context = context;
         this.globalConfig = globalConfig;
@@ -72,12 +73,25 @@ export class LwrModuleRegistry {
         return this.delegateGetModuleEntryOnServices(moduleId, runtimeParams);
     }
     async getModule(moduleId, runtimeParams) {
-        const { locker } = this.globalConfig;
         const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
         const cacheDisabled = process.env.NOCACHE === 'true';
         if (cacheDisabled === false && this.moduleDefCache.has(moduleEntry.id)) {
+            // TODO add to profiling
+            // console.log('[INFO] Module Cache Hit: %s', moduleEntry.id);
             return this.moduleDefCache.get(moduleEntry.id);
         }
+        const createModulePromiseCtor = async () => {
+            return this.createModuleDefinition(moduleId, runtimeParams).then((moduleDef) => {
+                if (cacheDisabled === false) {
+                    this.moduleDefCache.set(moduleDef.id, moduleDef);
+                }
+                return moduleDef;
+            });
+        };
+        return this.inflightModuleDefinitions.execute(moduleEntry.id, createModulePromiseCtor, this);
+    }
+    async createModuleDefinition(moduleId, runtimeParams) {
+        const { locker } = this.globalConfig;
         const moduleCompiled = await this.delegateGetModuleOnProviders(moduleId, runtimeParams); // provider source + hash
         /** Locker before collecting dep module records so locker imports are processed normally */
         if (locker.enabled && !locker.clientOnly) {
@@ -87,11 +101,7 @@ export class LwrModuleRegistry {
             moduleCompiled.compiledSource = lockerizedCode;
         }
         const moduleRecord = await getModuleRecord(moduleCompiled, this, this.context.compiler);
-        const moduleDef = { ...moduleCompiled, moduleRecord };
-        if (cacheDisabled === false) {
-            this.moduleDefCache.set(moduleDef.id, moduleDef);
-        }
-        return moduleDef;
+        return { ...moduleCompiled, moduleRecord };
     }
     async getLinkedModule(moduleId, runtimeEnvironment, runtimeParams) {
         const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
@@ -149,6 +159,8 @@ export class LwrModuleRegistry {
                 const { code: minifiedCode } = await this.context.compiler.minifyJavascript(amdSource);
                 linkedAmdSource = minifiedCode;
             }
+            // Filter out variable dynamic imports
+            linkedModuleRecord.dynamicImports = linkedModuleRecord.dynamicImports?.filter((imp) => imp.moduleNameType !== ModuleNameType.unresolved);
             return {
                 ...moduleDef,
                 linkedSource: linkedAmdSource,
@@ -178,6 +190,8 @@ export class LwrModuleRegistry {
                 const { code: minifiedEsm } = await this.context.compiler.minifyJavascript(transformedEsmCode);
                 transformedEsmCode = minifiedEsm;
             }
+            // Filter out variable dynamic imports
+            linkedModuleRecord.dynamicImports = linkedModuleRecord.dynamicImports?.filter((imp) => imp.moduleNameType !== ModuleNameType.unresolved);
             return {
                 ...moduleDef,
                 linkedConfig: {

package/build/es/linker/strategies/esm-strategy.js

@@ -1,4 +1,4 @@
-import { getModuleUriPrefix, getSpecifier, normalizeVersionToUri } from '@lwrjs/shared-utils';
+import { getModuleUriPrefix, getSpecifier, normalizeVersionToUri, prettyModuleUriSuffix, } from '@lwrjs/shared-utils';
 const SIGNATURE_SIGIL = 's';
 const LATEST_SIG = 'latest';
 export default function linkEsm(moduleId, environment, params = {}, signature) {
@@ -9,8 +9,7 @@ export default function linkEsm(moduleId, environment, params = {}, signature) {
     const encodedVSpecifier = encodeURIComponent(vSpecifier);
     const latestSignature = signature === undefined || signature === LATEST_SIG;
     const sigilSignature = latestSignature ? LATEST_SIG : `${SIGNATURE_SIGIL}/${signature}`;
-    // eslint-disable-next-line no-useless-escape
-    const prettyUrl = (bundle ? 'bundle_' : '') + `${specifier.replace(/[\/\.\#]/g, '_')}`;
+    const prettyUrl = (bundle ? 'bundle_' : '') + prettyModuleUriSuffix(specifier);
     const debugModifier = debug ? '?debug=true' : '';
     return `${uriPrefix}${encodedVSpecifier}/${sigilSignature}/${prettyUrl}.js${debugModifier}`;
 }

package/package.json

@@ -4,8 +4,8 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.2",
-    "homepage": "https://lwr.dev/",
+    "version": "0.6.0-alpha.6",
+    "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
         "url": "https://github.com/salesforce/lwr.git",
@@ -30,18 +30,18 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.6.0-alpha.2",
-        "@lwrjs/shared-utils": "0.6.0-alpha.2",
+        "@lwrjs/diagnostics": "0.6.0-alpha.6",
+        "@lwrjs/shared-utils": "0.6.0-alpha.6",
         "es-module-lexer": "^0.3.18",
         "ws": "^7.2.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.0-alpha.2",
+        "@lwrjs/types": "0.6.0-alpha.6",
         "@types/es-module-lexer": "^0.3.0",
         "@types/ws": "^7.2.4"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "5b0f761312e566fdaeec26ac3dbb704f8421b1a9"
+    "gitHead": "5d624e196dd46787399e6a269479508abe236081"
 }