@lwrjs/module-registry 0.9.9-alpha.8 → 0.10.0-alpha.1

package/build/cjs/index.cjs

@@ -28,6 +28,7 @@ __export(exports, {
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_compiler = __toModule(require("@lwrjs/shared-utils/compiler"));
 var import_linker = __toModule(require("./linker/linker.cjs"));
 var import_module_record = __toModule(require("./module-record.cjs"));
 var import_amd_strategy = __toModule(require("./linker/strategies/amd-strategy.cjs"));
@@ -66,10 +67,17 @@ var LwrModuleRegistry = class {
       }
     });
   }
-  resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
+  resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams) {
+    const uri = (0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, signature);
+    return uri;
+  }
+  async resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
     if (signature !== void 0) {
-      const uri = (0, import_esm_strategy.default)(moduleId, runtimeEnvironment, runtimeParams, signature);
-      return uri;
+      return this.resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams);
+    }
+    const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
+    if (moduleEntry.src) {
+      return moduleEntry.src;
     }
     const {bundle, format} = runtimeEnvironment;
     if (bundle) {
@@ -109,23 +117,16 @@ var LwrModuleRegistry = class {
       const {runtimeEnvironment} = this.context;
       const {minify, sourceMapUrl} = runtimeEnvironment;
       const sourcemap = typeof sourceMapUrl === "string" || !minify;
-      const {code: lockerizedCode} = this.context.compiler.lockerize(moduleCompiled, locker, sourcemap);
+      const {code: lockerizedCode} = (0, import_compiler.lockerize)(moduleCompiled, locker, sourcemap);
       moduleCompiled.compiledSource = lockerizedCode;
     }
-    const moduleRecord = await (0, import_module_record.getModuleRecord)(moduleCompiled, this, this.context.compiler);
+    const moduleRecord = await (0, import_module_record.getModuleRecord)(moduleCompiled, this);
     return {...moduleCompiled, moduleRecord};
   }
   async getLinkedModule(moduleId, runtimeEnvironment, runtimeParams) {
     const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
     const id = moduleEntry.id;
-    const {
-      format,
-      compat,
-      debug,
-      minify,
-      bundle,
-      env: {NODE_ENV: envMode}
-    } = runtimeEnvironment;
+    const {format, compat, debug, minify, bundle} = runtimeEnvironment;
     const locale = runtimeParams?.["locale"];
     const environment = runtimeParams?.["environment"];
     const {
@@ -152,17 +153,10 @@ var LwrModuleRegistry = class {
     const moduleDef = await this.getModule(moduleId, runtimeParams);
     const moduleLinked = await this.createLinkedModuleDefinition(moduleDef, runtimeEnvironment, runtimeParams);
     if (format === "amd" && !bundle) {
-      moduleLinked.linkedSource = (await this.context.compiler.convertToAmd(moduleLinked.linkedSource, {
+      moduleLinked.linkedSource = (await (0, import_compiler.convertToAmd)(moduleLinked.linkedSource, {
         id: moduleLinked.id
       })).code;
     }
-    const minified = !!minify && !debug;
-    if (minified && !bundle) {
-      moduleLinked.linkedSource = (await this.context.compiler.minifyJavascript(moduleLinked.linkedSource)).code;
-      moduleLinked.linkedConfig.minified = true;
-    } else {
-      moduleLinked.linkedSource = (await this.context.compiler.parseJavascript(moduleLinked.linkedSource, {envMode})).code;
-    }
     if (cacheDisabled === false) {
       const linkedMap = this.moduleLinkedCache.get(id) || new Map();
       linkedMap.set((0, import_shared_utils.getCacheKeyFromJson)({
@@ -255,6 +249,7 @@ var LwrModuleRegistry = class {
     return {
       getModuleEntry: this.getModuleEntry.bind(this),
       getModule: this.getModule.bind(this),
+      getLinkedModule: this.getLinkedModule.bind(this),
       resolveModuleUri: this.resolveModuleUri.bind(this)
     };
   }

package/build/cjs/linker/linker.cjs

@@ -47,12 +47,12 @@ async function link(moduleRegistry, moduleDef, versionStrategy, uriStrategy, run
           const context = runtimeParams.environment;
           if (contextMap?.has(context)) {
             const overrideSpecifier = contextMap.get(context);
-            const overrideEntry = await moduleRegistry.getModuleEntry({
-              specifier: overrideSpecifier
-            });
+            const moduleId = (0, import_shared_utils2.explodeSpecifier)(overrideSpecifier);
+            const overrideEntry = await moduleRegistry.getModuleEntry(moduleId);
             if (overrideEntry) {
               importRef = {
                 ...importRef,
+                ...moduleId,
                 ...overrideEntry
               };
             }

package/build/cjs/module-record.cjs

@@ -69,12 +69,12 @@ async function resolveExternalImport(registry, moduleSpecifier, importeeEntry, l
     interchangeable: dependencyModuleEntry.interchangeable
   };
 }
-async function getModuleRecord(compiledModule, registry, compiler) {
+async function getModuleRecord(compiledModule, registry) {
   const imports = [];
   const dynamicImports = [];
   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 (0, import_shared_utils.getImportMetadata)(compiledModule.compiledSource);
   Object.assign(compiledMetadata, {
     imports: compiledModuleImports,
     dynamicImports: compiledModuleDynamicImports

package/build/cjs/signature.cjs

@@ -27,11 +27,10 @@ __export(exports, {
   getBundleSignature: () => getBundleSignature
 });
 var import_crypto = __toModule(require("crypto"));
-var import_resolve = __toModule(require("resolve"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var LWC_VERSION = getLWCVersion();
+var import_config = __toModule(require("@lwrjs/config"));
 var ENABLED_FINGERPRINTS = !(0, import_shared_utils.getFeatureFlags)().LEGACY_LOADER;
-var ENV_KEY = `LWC:${LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
+var ENV_KEY = `LWC:${import_config.LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
 async function getRecursiveModuleHash(modules, registry, hash, visitedDefinitions = new Set(), excludes = new Set()) {
   if (!modules.length) {
     return;
@@ -62,8 +61,3 @@ async function getBundleSignature(moduleId, registry, excludes) {
   await getRecursiveModuleHash([moduleId], registry, hash, new Set(), new Set(excludes));
   return hash.digest("hex");
 }
-function getLWCVersion() {
-  const packageJsonPath = import_resolve.default.sync(`lwc/package.json`);
-  const {version} = JSON.parse((0, import_shared_utils.readFile)(packageJsonPath));
-  return version;
-}

package/build/es/index.d.ts

@@ -1,8 +1,7 @@
-import { ModuleProvider, LinkedModuleDefinition, LwrAppObserver, Compiler, RuntimeEnvironment, LwrAppEmitter, ModuleRegistry, ModuleEntry, PublicModuleRegistry, NormalizedLwrGlobalConfig, ModuleDefinition, AbstractModuleId, ModuleId, RuntimeParams } from '@lwrjs/types';
+import type { AbstractModuleId, LinkedModuleDefinition, LwrAppEmitter, LwrAppObserver, ModuleDefinition, ModuleEntry, ModuleId, ModuleProvider, ModuleRegistry, NormalizedLwrGlobalConfig, PublicModuleRegistry, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
 interface RegistryContext {
     appObserver: LwrAppObserver;
     appEmitter: LwrAppEmitter;
-    compiler: Compiler;
     runtimeEnvironment: RuntimeEnvironment;
 }
 export declare class LwrModuleRegistry implements ModuleRegistry {
@@ -16,7 +15,8 @@ export declare class LwrModuleRegistry implements ModuleRegistry {
     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>;
+    resolveModuleUriSync<R extends RuntimeEnvironment, S extends string | undefined>(moduleId: Required<Pick<ModuleId, 'specifier' | 'version'>>, signature: S, runtimeEnvironment: R, runtimeParams?: RuntimeParams): string;
+    resolveModuleUri<R extends RuntimeEnvironment, S extends string | undefined>(moduleId: Required<Pick<ModuleId, 'specifier' | 'version'>>, runtimeEnvironment: R, runtimeParams?: RuntimeParams, signature?: S): 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>;

package/build/es/index.js

@@ -1,5 +1,7 @@
 import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
 import { discoverInterchangeableModules, getCacheKeyFromJson, InflightTasks, LATEST_SIGNATURE, ModuleNameType, } from '@lwrjs/shared-utils';
+// dependencies @locker/compiler and rollup are in this package.json is to satisfy the shared-utils/compiler optional dependencies
+import { convertToAmd, lockerize } from '@lwrjs/shared-utils/compiler';
 import { link } from './linker/linker.js';
 import { getModuleRecord } from './module-record.js';
 import amdLinkingStrategy from './linker/strategies/amd-strategy.js';
@@ -41,11 +43,21 @@ export class LwrModuleRegistry {
             }
         });
     }
-    resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
+    resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams) {
+        const uri = esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, signature);
+        return uri;
+    }
+    async resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature) {
+        // If we have a signature just sync resolve the uri
         if (signature !== undefined) {
-            const uri = esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, signature);
-            return uri;
+            return this.resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams);
+        }
+        // Get the module entry to see if the src is provided by the provider.
+        const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
+        if (moduleEntry.src) {
+            return moduleEntry.src;
         }
+        // Else compute the URL from source
         const { bundle, format } = runtimeEnvironment;
         if (bundle) {
             return new Promise((resolve, reject) => {
@@ -53,7 +65,7 @@ export class LwrModuleRegistry {
                     .then((bundleSignature) => resolve(esmLinkingStrategy(moduleId, runtimeEnvironment, runtimeParams, bundleSignature)))
                     .catch(reject);
             });
-            // For individual files we a module URL
+            // For individual files we return a module URL
         }
         else {
             return new Promise((resolve, reject) => {
@@ -98,17 +110,17 @@ export class LwrModuleRegistry {
             // in addition to being explicitly enabled.
             const { minify, sourceMapUrl } = runtimeEnvironment;
             const sourcemap = typeof sourceMapUrl === 'string' || !minify;
-            const { code: lockerizedCode } = this.context.compiler.lockerize(moduleCompiled, locker, sourcemap);
+            const { code: lockerizedCode } = lockerize(moduleCompiled, locker, sourcemap);
             moduleCompiled.compiledSource = lockerizedCode;
         }
-        const moduleRecord = await getModuleRecord(moduleCompiled, this, this.context.compiler);
+        const moduleRecord = await getModuleRecord(moduleCompiled, this);
         return { ...moduleCompiled, moduleRecord };
     }
     async getLinkedModule(moduleId, runtimeEnvironment, runtimeParams) {
         const moduleEntry = await this.getModuleEntry(moduleId, runtimeParams);
         const id = moduleEntry.id;
         // cache key pivots from the runtimeEnvironment
-        const { format, compat, debug, minify, bundle, env: { NODE_ENV: envMode }, } = runtimeEnvironment;
+        const { format, compat, debug, minify, bundle } = runtimeEnvironment;
         const locale = runtimeParams?.['locale'];
         const environment = runtimeParams?.['environment'];
         const { locker: { enabled: lockerEnabled }, } = this.globalConfig;
@@ -135,19 +147,10 @@ export class LwrModuleRegistry {
         // the bundler will convert the linked source to AMD when bundling is enabled
         if (format === 'amd' && !bundle) {
             // convert the linkedSource to the transport AMD format
-            moduleLinked.linkedSource = (await this.context.compiler.convertToAmd(moduleLinked.linkedSource, {
+            moduleLinked.linkedSource = (await convertToAmd(moduleLinked.linkedSource, {
                 id: moduleLinked.id,
             })).code;
         }
-        const minified = !!minify && !debug;
-        // the bundler will minify when bundling is enabled
-        if (minified && !bundle) {
-            moduleLinked.linkedSource = (await this.context.compiler.minifyJavascript(moduleLinked.linkedSource)).code;
-            moduleLinked.linkedConfig.minified = true;
-        }
-        else {
-            moduleLinked.linkedSource = (await this.context.compiler.parseJavascript(moduleLinked.linkedSource, { envMode })).code;
-        }
         // Add to cache
         if (cacheDisabled === false) {
             const linkedMap = this.moduleLinkedCache.get(id) || new Map();
@@ -245,6 +248,7 @@ export class LwrModuleRegistry {
         return {
             getModuleEntry: this.getModuleEntry.bind(this),
             getModule: this.getModule.bind(this),
+            getLinkedModule: this.getLinkedModule.bind(this),
             resolveModuleUri: this.resolveModuleUri.bind(this),
         };
     }

package/build/es/linker/linker.js

@@ -27,12 +27,12 @@ export async function link(moduleRegistry, moduleDef, versionStrategy, uriStrate
                     const context = runtimeParams.environment;
                     if (contextMap?.has(context)) {
                         const overrideSpecifier = contextMap.get(context);
-                        const overrideEntry = await moduleRegistry.getModuleEntry({
-                            specifier: overrideSpecifier,
-                        });
+                        const moduleId = explodeSpecifier(overrideSpecifier);
+                        const overrideEntry = await moduleRegistry.getModuleEntry(moduleId);
                         if (overrideEntry) {
                             importRef = {
                                 ...importRef,
+                                ...moduleId,
                                 ...overrideEntry,
                             };
                         }

package/build/es/module-record.d.ts

@@ -1,3 +1,3 @@
-import { ModuleCompiled, ModuleRecord, ModuleRegistry, Compiler } from '@lwrjs/types';
-export declare function getModuleRecord(compiledModule: ModuleCompiled, registry: ModuleRegistry, compiler: Compiler): Promise<ModuleRecord>;
+import type { ModuleCompiled, ModuleRecord, ModuleRegistry } from '@lwrjs/types';
+export declare function getModuleRecord(compiledModule: ModuleCompiled, registry: ModuleRegistry): Promise<ModuleRecord>;
 //# sourceMappingURL=module-record.d.ts.map

package/build/es/module-record.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { explodeSpecifier, ModuleNameType } from '@lwrjs/shared-utils';
+import { explodeSpecifier, getImportMetadata, ModuleNameType } from '@lwrjs/shared-utils';
 async function resolveRelativeImport(registry, moduleSpecifier, importeeEntry, version, location) {
     // Resolve any relative parts in the import specifier
     // eg: "c/app#app.html" => "c/app"
@@ -51,13 +51,13 @@ async function resolveExternalImport(registry, moduleSpecifier, importeeEntry, l
         interchangeable: dependencyModuleEntry.interchangeable,
     };
 }
-export async function getModuleRecord(compiledModule, registry, compiler) {
+export async function getModuleRecord(compiledModule, registry) {
     const imports = [];
     const dynamicImports = [];
     const { compiledMetadata: defaultCompilerMetadata, moduleEntry, version } = compiledModule;
     const compiledMetadata = defaultCompilerMetadata || {};
     // Get imports metadata and merge with rest of compiledModule metadata
-    const { imports: compiledModuleImports, dynamicImports: compiledModuleDynamicImports } = await compiler.getModuleMetadata(compiledModule.compiledSource);
+    const { imports: compiledModuleImports, dynamicImports: compiledModuleDynamicImports } = await getImportMetadata(compiledModule.compiledSource);
     Object.assign(compiledMetadata, {
         imports: compiledModuleImports,
         dynamicImports: compiledModuleDynamicImports,

package/build/es/signature.js

@@ -1,7 +1,6 @@
 import crypto from 'crypto';
-import resolve from 'resolve';
-import { getFeatureFlags, getSpecifier, readFile } from '@lwrjs/shared-utils';
-const LWC_VERSION = getLWCVersion();
+import { getFeatureFlags, getSpecifier } from '@lwrjs/shared-utils';
+import { LWC_VERSION } from '@lwrjs/config';
 const ENABLED_FINGERPRINTS = !getFeatureFlags().LEGACY_LOADER;
 const ENV_KEY = `LWC:${LWC_VERSION},FINGERPRINTS:${ENABLED_FINGERPRINTS}`;
 async function getRecursiveModuleHash(modules, registry, hash, visitedDefinitions = new Set(), excludes = new Set()) {
@@ -65,12 +64,4 @@ export async function getBundleSignature(moduleId, registry, excludes) {
     await getRecursiveModuleHash([moduleId], registry, hash, new Set(), new Set(excludes));
     return hash.digest('hex');
 }
-/**
- * Get the configured LWC version
- */
-function getLWCVersion() {
-    const packageJsonPath = resolve.sync(`lwc/package.json`);
-    const { version } = JSON.parse(readFile(packageJsonPath));
-    return version;
-}
 //# sourceMappingURL=signature.js.map

package/package.json

@@ -4,15 +4,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.9-alpha.8",
+    "version": "0.10.0-alpha.1",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
-        "url": "https://github.com/salesforce/lwr.git",
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr.git",
         "directory": "packages/@lwrjs/module-registry"
     },
     "bugs": {
-        "url": "https://github.com/salesforce/lwr/issues"
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr/issues"
     },
     "type": "module",
     "types": "build/es/index.d.ts",
@@ -30,16 +30,18 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.9.9-alpha.8",
-        "@lwrjs/shared-utils": "0.9.9-alpha.8",
-        "es-module-lexer": "^0.3.18"
+        "@locker/compiler": "0.18.14",
+        "@lwrjs/diagnostics": "0.10.0-alpha.1",
+        "@lwrjs/shared-utils": "0.10.0-alpha.1",
+        "es-module-lexer": "^0.3.18",
+        "rollup": "~2.45.2"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.9-alpha.8",
+        "@lwrjs/types": "0.10.0-alpha.1",
         "@types/es-module-lexer": "^0.3.0"
     },
     "engines": {
-        "node": ">=14.15.4 <19"
+        "node": ">=16.0.0 <20"
     },
-    "gitHead": "ac15f9c862f53f0fab34ea229c8c27b1d66c9f7e"
+    "gitHead": "2683dd5839b4da2ed93d42874cfceb78cbb5bf0d"
 }