@lwrjs/module-registry 0.6.0-alpha.3 → 0.6.0-alpha.7

package/build/cjs/index.cjs

@@ -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;
@@ -88,12 +89,23 @@ 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;
@@ -102,11 +114,7 @@ var LwrModuleRegistry = class {
       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);
@@ -164,6 +172,7 @@ var LwrModuleRegistry = class {
         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,
@@ -187,6 +196,7 @@ var LwrModuleRegistry = class {
         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/strategies/esm-strategy.cjs

@@ -37,7 +37,7 @@ function linkEsm(moduleId, environment, params = {}, signature) {
   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/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.3",
-    "homepage": "https://lwr.dev/",
+    "version": "0.6.0-alpha.7",
+    "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.3",
-        "@lwrjs/shared-utils": "0.6.0-alpha.3",
+        "@lwrjs/diagnostics": "0.6.0-alpha.7",
+        "@lwrjs/shared-utils": "0.6.0-alpha.7",
         "es-module-lexer": "^0.3.18",
         "ws": "^7.2.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.0-alpha.3",
+        "@lwrjs/types": "0.6.0-alpha.7",
         "@types/es-module-lexer": "^0.3.0",
         "@types/ws": "^7.2.4"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "ee0ad55e8490f58602de24ab861bb4f4cce9404c"
+    "gitHead": "dc066450384dc1e27064b46ddd5f24543758a414"
 }