@lwrjs/module-registry 0.6.4 → 0.7.0-alpha.2

package/build/cjs/index.cjs

@@ -74,7 +74,7 @@ var LwrModuleRegistry = class {
     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);
+        (0, import_signature.getBundleSignature)(moduleId, this, this.globalConfig?.bundleConfig?.exclude).then((bundleSignature) => resolve((0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, bundleSignature))).catch(reject);
       });
     } else {
       return new Promise((resolve, reject) => {
@@ -120,7 +120,7 @@ var LwrModuleRegistry = class {
   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, bundle} = runtimeEnvironment;
     const locale = runtimeParams?.["locale"];
     const environment = runtimeParams?.["environment"];
     const {
@@ -134,6 +134,7 @@ var LwrModuleRegistry = class {
         compat,
         debug,
         minify,
+        bundle,
         lockerEnabled,
         locale,
         environment
@@ -147,7 +148,16 @@ 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,
+        bundle,
+        lockerEnabled,
+        locale,
+        environment
+      }), moduleLinked);
       this.moduleLinkedCache.set(id, linkedMap);
     }
     return moduleLinked;

package/build/cjs/linker/linker.cjs

@@ -61,7 +61,7 @@ async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, run
       }
       let signature;
       if (runtimeEnvironment.bundle && runtimeEnvironment.format === "esm" && exclude?.includes(importRef.specifier)) {
-        signature = await (0, import_signature.getBundleSignature)(importRef, moduleRegistry);
+        signature = await (0, import_signature.getBundleSignature)(importRef, moduleRegistry, exclude);
       }
       const {locations, sourceSpecifier} = importRef;
       const link2 = strategy(importRef, runtimeEnvironment, runtimeParams, signature);
@@ -83,7 +83,7 @@ async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, run
       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);
+        signature = await (0, import_signature.getBundleSignature)(importRef, moduleRegistry, exclude);
       }
       const link2 = isStringLiteral ? versionStrategy(importRef, runtimeEnvironment, runtimeParams, signature) : importRef.specifier;
       const linkedLocations = locations.map(({location, importLocation}) => {
@@ -120,7 +120,7 @@ async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, run
     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, exclude);
     }
     const loaderLink = strategy({specifier: specifier2, version: version2}, runtimeEnvironment, runtimeParams, signature);
     codeStringBuilder.prepend(`import { load } from "${loaderLink}";

package/build/cjs/signature.cjs

@@ -32,34 +32,31 @@ var import_process = __toModule(require("process"));
 var import_module = __toModule(require("module"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var LWC_VERSION = getLWCVersion();
-var ENABLED_FINGERPRINTS = (0, import_shared_utils.getExperimentalFeatures)().ENABLE_FINGERPRINTS;
+var ENABLED_FINGERPRINTS = !(0, import_shared_utils.getFeatureFlags)().LEGACY_LOADER;
 var ENV_KEY = `LWC:${LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
-async function getRecursiveModuleHash(definitions, registry, hash, visitedDefinitions = new Set()) {
-  if (!definitions.length) {
+async function getRecursiveModuleHash(modules, registry, hash, visitedDefinitions = new Set()) {
+  if (!modules.length) {
     return;
   }
-  const imports = [];
+  const definitions = await Promise.all(modules.map((module2) => registry.getModule(module2)));
+  const imports = new Map();
   for (const definition of definitions) {
-    if (visitedDefinitions.has(definition.id)) {
-      continue;
-    }
     const {ownHash, moduleRecord} = definition;
     hash.update(ownHash);
-    if (moduleRecord.imports) {
-      imports.push(...moduleRecord.imports);
-    }
-    visitedDefinitions.add(definition.id);
+    visitedDefinitions.add((0, import_shared_utils.getSpecifier)(definition));
+    moduleRecord.imports?.forEach((importReference) => {
+      imports.set((0, import_shared_utils.getSpecifier)(importReference), importReference);
+    });
   }
-  if (imports.length) {
-    const dependencies = await Promise.all(imports.map(async (dependency) => registry.getModule(dependency)));
+  const dependencies = Array.from(imports, ([_, dependency]) => dependency).filter((dependency) => !visitedDefinitions.has(dependency.specifier) && !visitedDefinitions.has((0, import_shared_utils.getSpecifier)(dependency)));
+  if (dependencies.length) {
     return getRecursiveModuleHash(dependencies, registry, hash, visitedDefinitions);
   }
 }
-async function getBundleSignature(moduleId, registry) {
-  const root = await registry.getModule(moduleId);
+async function getBundleSignature(moduleId, registry, exclude) {
   const hash = import_crypto.default.createHash("sha1");
   hash.update(ENV_KEY);
-  await getRecursiveModuleHash([root], registry, hash);
+  await getRecursiveModuleHash([moduleId], registry, hash, new Set(exclude));
   return hash.digest("hex");
 }
 function getLWCVersion() {

package/build/es/index.js

@@ -49,7 +49,7 @@ export class LwrModuleRegistry {
         const { bundle, format } = runtimeEnvironment;
         if (bundle) {
             return new Promise((resolve, reject) => {
-                getBundleSignature(moduleId, this)
+                getBundleSignature(moduleId, this, this.globalConfig?.bundleConfig?.exclude)
                     .then((bundleSignature) => resolve(esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, bundleSignature)))
                     .catch(reject);
             });
@@ -110,7 +110,7 @@ export class LwrModuleRegistry {
         const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
         const id = moduleEntry.id;
         // cache key pivots from the runtimeEnvironment
-        const { format, compat, debug, minify } = runtimeEnvironment;
+        const { format, compat, debug, minify, bundle } = runtimeEnvironment;
         const locale = runtimeParams?.['locale'];
         const environment = runtimeParams?.['environment'];
         const { locker: { enabled: lockerEnabled }, } = this.globalConfig;
@@ -122,6 +122,7 @@ export class LwrModuleRegistry {
                 compat,
                 debug,
                 minify,
+                bundle,
                 lockerEnabled,
                 locale,
                 environment,
@@ -136,7 +137,16 @@ export class LwrModuleRegistry {
         // Add to cache
         if (cacheDisabled === false) {
             const linkedMap = this.moduleLinkedCache.get(id) || new Map();
-            linkedMap.set(getCacheKeyFromJson({ format, compat, debug, minify, lockerEnabled, locale, environment }), moduleLinked);
+            linkedMap.set(getCacheKeyFromJson({
+                format,
+                compat,
+                debug,
+                minify,
+                bundle,
+                lockerEnabled,
+                locale,
+                environment,
+            }), moduleLinked);
             this.moduleLinkedCache.set(id, linkedMap);
         }
         return moduleLinked;

package/build/es/linker/linker.js

@@ -44,7 +44,7 @@ export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrate
             if (runtimeEnvironment.bundle &&
                 runtimeEnvironment.format === 'esm' &&
                 exclude?.includes(importRef.specifier)) {
-                signature = await getBundleSignature(importRef, moduleRegistry);
+                signature = await getBundleSignature(importRef, moduleRegistry, exclude);
             }
             const { locations, sourceSpecifier } = importRef;
             const link = strategy(importRef, runtimeEnvironment, runtimeParams, signature);
@@ -69,7 +69,7 @@ export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrate
             const isStringLiteral = importRef.moduleNameType === ModuleNameType.string;
             // get signature for dynamic imports when bundling esm
             if (isStringLiteral && runtimeEnvironment.bundle && runtimeEnvironment.format === 'esm') {
-                signature = await getBundleSignature(importRef, moduleRegistry);
+                signature = await getBundleSignature(importRef, moduleRegistry, exclude);
             }
             // always link [literal] dynamic imports as versioned specifiers (AMD strategy)
             // linking them as URIs (ESM strategy) causes caching issues since they can contain stale signatures
@@ -119,7 +119,7 @@ export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrate
         let signature;
         if (esmLoaderModule && runtimeEnvironment.bundle) {
             // Ensure the ESM loader is signed, or there may be a clash between this import and an existing one
-            signature = await getBundleSignature({ version, specifier }, moduleRegistry);
+            signature = await getBundleSignature({ version, specifier }, moduleRegistry, exclude);
         }
         const loaderLink = strategy({ specifier, version }, runtimeEnvironment, runtimeParams, signature);
         // import {load} from 'loader/loader'

package/build/es/signature.d.ts

@@ -1,3 +1,16 @@
 import { ModuleRegistry, ModuleId } from '@lwrjs/types';
-export declare function getBundleSignature(moduleId: Required<Pick<ModuleId, 'specifier' | 'version'>>, registry: ModuleRegistry): Promise<string>;
+/**
+ * Generate a bundle signature
+ *
+ * Traverses the module graph from the specified root module to generate a
+ *  signature. Modules that are marked for exclusion will be skipped. The
+ *  bundle signature will be generated based on the environment
+ *  keys(i.e. LWC version) and the ownHash of each module in the graph.
+ *
+ * @param moduleId - root module id
+ * @param registry - module registry
+ * @param exclude - bundle config exclusions
+ * @returns a bungle signature
+ */
+export declare function getBundleSignature(moduleId: Required<Pick<ModuleId, 'specifier' | 'version'>>, registry: ModuleRegistry, exclude?: string[]): Promise<string>;
 //# sourceMappingURL=signature.d.ts.map

package/build/es/signature.js

@@ -2,36 +2,58 @@ import crypto from 'crypto';
 import path from 'path';
 import { cwd } from 'process';
 import { createRequire } from 'module';
-import { getExperimentalFeatures } from '@lwrjs/shared-utils';
+import { getFeatureFlags, getSpecifier } from '@lwrjs/shared-utils';
 const LWC_VERSION = getLWCVersion();
-const ENABLED_FINGERPRINTS = getExperimentalFeatures().ENABLE_FINGERPRINTS;
+const ENABLED_FINGERPRINTS = !getFeatureFlags().LEGACY_LOADER;
 const ENV_KEY = `LWC:${LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
-async function getRecursiveModuleHash(definitions, registry, hash, visitedDefinitions = new Set()) {
-    if (!definitions.length) {
+async function getRecursiveModuleHash(modules, registry, hash, visitedDefinitions = new Set()) {
+    if (!modules.length) {
         return;
     }
-    const imports = [];
+    const definitions = await Promise.all(modules.map((module) => registry.getModule(module)));
+    const imports = new Map();
     for (const definition of definitions) {
-        if (visitedDefinitions.has(definition.id)) {
-            continue;
-        }
         const { ownHash, moduleRecord } = definition;
+        // include module in the bundle signature
         hash.update(ownHash);
-        if (moduleRecord.imports) {
-            imports.push(...moduleRecord.imports);
-        }
-        visitedDefinitions.add(definition.id);
+        // track the module to ensure it is only processed once
+        visitedDefinitions.add(getSpecifier(definition));
+        // map imports to prevent processing duplicates
+        moduleRecord.imports?.forEach((importReference) => {
+            imports.set(getSpecifier(importReference), importReference);
+        });
     }
-    if (imports.length) {
-        const dependencies = await Promise.all(imports.map(async (dependency) => registry.getModule(dependency)));
+    // filter out bundle config exclusions and already visited dependencies
+    const dependencies = Array.from(imports, ([_, dependency]) => dependency).filter((dependency) => 
+    // exclusions are not versioned
+    !visitedDefinitions.has(dependency.specifier) &&
+        // already visited dependencies will be versioned
+        !visitedDefinitions.has(getSpecifier(dependency)));
+    if (dependencies.length) {
         return getRecursiveModuleHash(dependencies, registry, hash, visitedDefinitions);
     }
 }
-export async function getBundleSignature(moduleId, registry) {
-    const root = await registry.getModule(moduleId);
+/**
+ * Generate a bundle signature
+ *
+ * Traverses the module graph from the specified root module to generate a
+ *  signature. Modules that are marked for exclusion will be skipped. The
+ *  bundle signature will be generated based on the environment
+ *  keys(i.e. LWC version) and the ownHash of each module in the graph.
+ *
+ * @param moduleId - root module id
+ * @param registry - module registry
+ * @param exclude - bundle config exclusions
+ * @returns a bungle signature
+ */
+export async function getBundleSignature(moduleId, registry, exclude) {
     const hash = crypto.createHash('sha1');
     hash.update(ENV_KEY);
-    await getRecursiveModuleHash([root], registry, hash);
+    // add bundle config exclusions to visited definitions to prevent including
+    //  them in the bundle signature
+    // Note: if the root module is an excluded module, it will be included in
+    //  the signature
+    await getRecursiveModuleHash([moduleId], registry, hash, new Set(exclude));
     return hash.digest('hex');
 }
 /**

package/package.json

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