@lwrjs/loader 0.6.0-alpha.11 → 0.6.0-alpha.15

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

@@ -33,7 +33,7 @@ var import_scriptLoad = __toModule(require("./scriptLoad"));
 var import_importMetadataResolver = __toModule(require("./importMetadataResolver"));
 var import_moduleInvalidation = __toModule(require("../hooks/moduleInvalidation"));
 var import_resolveAndLoadHook = __toModule(require("../hooks/resolveAndLoadHook"));
-var import_metrics = __toModule(require("../../../../metrics"));
+var import_metrics = __toModule(require("lwr/metrics"));
 var import_constants = __toModule(require("../constants/constants"));
 var ModuleRegistry = class {
   constructor(config) {

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

@@ -33,11 +33,13 @@ var import_scriptLoad = __toModule(require("./scriptLoad"));
 var import_resolveAndLoadHook = __toModule(require("../hooks/resolveAndLoadHook"));
 var import_moduleInvalidation = __toModule(require("../hooks/moduleInvalidation"));
 var import_constants = __toModule(require("../constants/constants"));
+var import_metrics = __toModule(require("lwr/metrics"));
 var ModuleRegistry = class {
-  constructor(baseUrl) {
+  constructor(config) {
     this.namedDefineRegistry = new Map();
     this.moduleRegistry = new Map();
-    this.baseUrl = baseUrl;
+    this.baseUrl = config.baseUrl;
+    this.profiler = config.profiler;
   }
   async load(id, importer) {
     const resolvedId = await this.resolve(id, importer);
@@ -137,6 +139,7 @@ var ModuleRegistry = class {
     if (mod && mod.external) {
       mod.external.resolveExternal(moduleDef);
     }
+    this.profiler.logOperationStart({id: import_metrics.MODULE_DEFINE, specifier: name});
     this.namedDefineRegistry.set(name, moduleDef);
     this.lastDefine = moduleDef;
     if (signatures.hashes) {
@@ -353,6 +356,8 @@ var ModuleRegistry = class {
       return moduleDef;
     }
     const parentUrl = this.baseUrl;
+    const specifier = moduleName || originalId;
+    this.profiler.logOperationStart({id: import_metrics.MODULE_FETCH, specifier});
     return Promise.resolve().then(async () => {
       const loadHooks = this.loadHook;
       if (loadHooks) {
@@ -381,8 +386,10 @@ var ModuleRegistry = class {
       if (!moduleDef) {
         throw new import_messages.LoaderError(import_messages.FAIL_INSTANTIATE, [resolvedId]);
       }
+      this.profiler.logOperationEnd({id: import_metrics.MODULE_FETCH, specifier});
       return moduleDef;
     }).catch((e) => {
+      this.profiler.logOperationStart({id: import_metrics.MODULE_ERROR, specifier});
       throw e;
     });
   }

package/build/modules/lwr/esmLoader/esmLoader.js

@@ -4,14 +4,25 @@
 * 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.6.0-alpha.11 */
+/* LWR ESM Module Loader v0.6.0-alpha.15 */
 /**
  * Simplified version of the AMD Import Metadata Resolver.
  * Just reads the ImportMetadata at construction time.
  */
 class ImportResolver {
-    constructor(importMetada) {
+    constructor(config) {
+        var _a, _b;
         this.importURICache = new Map();
+        this.modifiers = '';
+        this.normalizeMetadata(config);
+        // only fetch mappings if fingerprints is ON
+        this.mappingEndpoint = (config === null || config === void 0 ? void 0 : config.importMappings) ? undefined : (_a = config === null || config === void 0 ? void 0 : config.endpoints) === null || _a === void 0 ? void 0 : _a.uris.mapping;
+        if ((_b = config === null || config === void 0 ? void 0 : config.endpoints) === null || _b === void 0 ? void 0 : _b.modifiers) {
+            // Add URI modifiers to mapping endpoint query
+            this.modifiers = Object.entries(config.endpoints.modifiers).reduce((q, [k, v]) => (q += `${k}=${v}&`), '?');
+        }
+    }
+    normalizeMetadata(importMetada) {
         // Normalize the URI cache to optimize retrieval
         if (importMetada && importMetada.imports) {
             for (const [uri, value] of Object.entries(importMetada.imports)) {
@@ -24,8 +35,21 @@ class ImportResolver {
             }
         }
     }
-    resolve(specifier) {
-        return this.importURICache.get(specifier);
+    async fetchMappings(specifier) {
+        const mappingUri = `${this.mappingEndpoint}${encodeURIComponent(specifier)}${this.modifiers}`;
+        const res = await globalThis.fetch(mappingUri);
+        if (res.ok) {
+            const mappings = await res.json();
+            this.normalizeMetadata(mappings);
+        }
+    }
+    async resolve(specifier) {
+        let uri = this.importURICache.get(specifier);
+        if (!uri && this.mappingEndpoint) {
+            await this.fetchMappings(specifier);
+            uri = this.importURICache.get(specifier);
+        }
+        return uri;
     }
 }
 
@@ -54,21 +78,21 @@ let resolverLegacy;
 function init(config) {
     // Save config from globalThis.LWR
     esmLoaderConfig = config;
-    const { imports, index, importMappings } = config;
-    resolver = new ImportResolver({ imports, index });
+    const { imports, index, importMappings, endpoints } = config;
+    resolver = new ImportResolver({ imports, index, endpoints, importMappings });
     resolverLegacy = new ImportResolverLegacy(importMappings);
 }
-function load(specifier, importer) {
-    const uri = resolveUrl(specifier, importer);
+async function load(specifier, importer) {
+    const uri = await resolveUrl(specifier, importer);
     return import(uri);
 }
-function resolveUrl(specifier, importer) {
+async function resolveUrl(specifier, importer) {
     let uri;
     if (!resolver || !resolverLegacy) {
         throw new Error('The ESM Loader was not initialized');
     }
     // Check if the URI is in the import metadata
-    uri = resolver.resolve(specifier);
+    uri = await resolver.resolve(specifier);
     if (uri) {
         return uri;
     }
@@ -88,6 +112,10 @@ function resolveUrl(specifier, importer) {
             if (importer) {
                 uri += `?importer=${encodeURIComponent(importer)}`;
             }
+            if (endpoints.modifiers) {
+                // Add URI modifiers to query
+                uri += Object.entries(endpoints.modifiers).reduce((q, [k, v]) => (q += `${k}=${v}&`), importer ? '&' : '?');
+            }
         }
     }
     return uri;

package/build/modules/lwr/loader/loader.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 Module Loader v0.6.0-alpha.11 */
+/* LWR Module Loader v0.6.0-alpha.15 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -301,12 +301,12 @@ if (hasDocument) {
 }
 
 // Bootstrap / shim
-// Loader: modules
+
 const LOADER_PREFIX = 'lwr.loader.';
 const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
 const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
-const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
-// Loader: mappings
+const MODULE_ERROR = `${LOADER_PREFIX}module.error`; // Loader: mappings
+
 const MAPPINGS_FETCH = `${LOADER_PREFIX}mappings.fetch`;
 const MAPPINGS_ERROR = `${LOADER_PREFIX}mappings.error`;
 
@@ -1121,6 +1121,14 @@ class Loader {
             };
         }
         this.registry = new ModuleRegistry(Object.freeze({ endpoints: config.endpoints, baseUrl, profiler }));
+        // TODO: W-10539691 - temp workaround for LWR-Java -- remove once appId is implemented there
+        if (config.appMetadata && !config.appMetadata.appId) {
+            // Parse the appId from the bootstrapModule
+            // LWR-Java bootstrap module format: @lwr-bootstrap/my/app/v/0_0_1 -- my/app is the appId
+            const match = config.appMetadata.bootstrapModule.match(/@lwr-bootstrap\/(.+)\/v\/.+/);
+            const appId = match && match[1];
+            config.appMetadata.appId = appId;
+        }
         // TODO: https://github.com/salesforce/lwr/issues/1087
         this.services = Object.freeze({
             addLoaderPlugin: this.registry.addLoaderPlugin.bind(this.registry),

package/build/modules/lwr/loaderLegacy/loaderLegacy.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 Legacy Module Loader v0.6.0-alpha.11 */
+/* LWR Legacy Module Loader v0.6.0-alpha.15 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -401,14 +401,22 @@ function evaluateHandleStaleModuleHooks(handleStaleModuleHooks, hookArgs) {
     }
 }
 
+// Bootstrap / shim
+
+const LOADER_PREFIX = 'lwr.loader.';
+const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
+const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
+const MODULE_ERROR = `${LOADER_PREFIX}module.error`; // Loader: mappings
+
 /* global console,process */
 class ModuleRegistry {
-    constructor(baseUrl) {
+    constructor(config) {
         // A registry for named AMD defines containing the *metadata* of AMD module
         this.namedDefineRegistry = new Map();
         // The evaluted module registry where the module identifier (name or URL?) is the key
         this.moduleRegistry = new Map();
-        this.baseUrl = baseUrl;
+        this.baseUrl = config.baseUrl;
+        this.profiler = config.profiler;
     }
     async load(id, importer) {
         const resolvedId = await this.resolve(id, importer);
@@ -523,6 +531,7 @@ class ModuleRegistry {
             // if module is "external", resolve the external promise to notify any dependees
             mod.external.resolveExternal(moduleDef);
         }
+        this.profiler.logOperationStart({ id: MODULE_DEFINE, specifier: name });
         this.namedDefineRegistry.set(name, moduleDef);
         this.lastDefine = moduleDef;
         // Check signatures of dependencies against those in the namedDefineRegistry
@@ -793,6 +802,8 @@ class ModuleRegistry {
             return moduleDef;
         }
         const parentUrl = this.baseUrl; // only support baseUrl for now
+        const specifier = moduleName || originalId;
+        this.profiler.logOperationStart({ id: MODULE_FETCH, specifier });
         return Promise.resolve()
             .then(async () => {
             const loadHooks = this.loadHook;
@@ -830,9 +841,11 @@ class ModuleRegistry {
             if (!moduleDef) {
                 throw new LoaderError(FAIL_INSTANTIATE, [resolvedId]);
             }
+            this.profiler.logOperationEnd({ id: MODULE_FETCH, specifier });
             return moduleDef;
         })
             .catch((e) => {
+            this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
             throw e;
         });
     }
@@ -1060,7 +1073,10 @@ async function evaluateImportMaps(baseUrl) {
  * The LWR loader is inspired and borrows from the algorithms and native browser principles of https://github.com/systemjs/systemjs
  */
 class Loader {
-    constructor(baseUrl) {
+    constructor(config) {
+        config = config || {};
+        let baseUrl = config.baseUrl;
+        let profiler = config.profiler;
         if (baseUrl) {
             // add a trailing slash, if it does not exist
             baseUrl = baseUrl.replace(/\/?$/, '/');
@@ -1072,10 +1088,23 @@ class Loader {
             throw new LoaderError(NO_BASE_URL);
         }
         this.baseUrl = baseUrl;
-        this.registry = new ModuleRegistry(baseUrl);
+        if (!profiler) {
+            // default noop profiler
+            profiler = {
+                logOperationStart: () => {
+                    /* noop */
+                },
+                logOperationEnd: () => {
+                    /* noop */
+                },
+            };
+        }
+        this.registry = new ModuleRegistry({ baseUrl, profiler });
+        // TODO: https://github.com/salesforce/lwr/issues/1087
         this.services = Object.freeze({
             addLoaderPlugin: this.registry.addLoaderPlugin.bind(this.registry),
             handleStaleModule: this.registry.registerHandleStaleModuleHook.bind(this.registry),
+            appMetadata: config.appMetadata,
         });
     }
     /**

package/package.json

@@ -5,7 +5,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.11",
+    "version": "0.6.0-alpha.15",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -55,41 +55,32 @@
         "build:shim:bundle:minify": "MINIFY=true yarn build:shim:bundle",
         "build:shim": "rollup --config scripts/rollup-shim.config.cjs",
         "build:loader": "rollup --config scripts/rollup.config.cjs",
-        "build": "tsc -b; yarn build:shim && yarn build:loader && yarn build:shim:bundle && yarn build:shim:bundle:minify"
+        "build:ts": "tsc -b",
+        "build": "yarn build:ts && yarn build:shim && yarn build:loader && yarn build:shim:bundle && yarn build:shim:bundle:minify"
     },
     "devDependencies": {
-        "@lwrjs/compiler": "0.6.0-alpha.11",
-        "@lwrjs/diagnostics": "0.6.0-alpha.11",
-        "@lwrjs/types": "0.6.0-alpha.11",
+        "@lwrjs/compiler": "0.6.0-alpha.15",
+        "@lwrjs/diagnostics": "0.6.0-alpha.15",
+        "@lwrjs/types": "0.6.0-alpha.15",
         "rollup-plugin-terser": "^7.0.2"
     },
     "dependencies": {
-        "@lwrjs/shared-utils": "0.6.0-alpha.11"
+        "@lwrjs/shared-utils": "0.6.0-alpha.15"
     },
     "lwc": {
         "modules": [
             {
                 "dir": "build/modules"
-            },
-            {
-                "name": "lwr/metrics",
-                "path": "build/metrics.js"
-            },
-            {
-                "name": "lwr/profiler",
-                "path": "build/shim/profiler.js"
             }
         ],
         "expose": [
             "lwr/esmLoader",
             "lwr/loader",
-            "lwr/loaderLegacy",
-            "lwr/metrics",
-            "lwr/profiler"
+            "lwr/loaderLegacy"
         ]
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "18ab72188c2d52e32cca47333951a9c76f996039"
+    "gitHead": "ebff01c190ee6f2777028f103e51446a1a8f00f7"
 }

package/build/cjs/metrics.cjs

@@ -1,43 +0,0 @@
-var __defProp = Object.defineProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
-};
-
-// packages/@lwrjs/loader/src/metrics.ts
-__markAsModule(exports);
-__export(exports, {
-  BOOTSTRAP_AVAILABILITY: () => BOOTSTRAP_AVAILABILITY,
-  BOOTSTRAP_DURATION: () => BOOTSTRAP_DURATION,
-  BOOTSTRAP_END: () => BOOTSTRAP_END,
-  BOOTSTRAP_ERROR: () => BOOTSTRAP_ERROR,
-  BOOTSTRAP_PREFIX: () => BOOTSTRAP_PREFIX,
-  LOADER_PREFIX: () => LOADER_PREFIX,
-  MAPPINGS_ERROR: () => MAPPINGS_ERROR,
-  MAPPINGS_FETCH: () => MAPPINGS_FETCH,
-  MAPPINGS_FETCH_COUNT: () => MAPPINGS_FETCH_COUNT,
-  MAPPINGS_FETCH_DURATION: () => MAPPINGS_FETCH_DURATION,
-  MODULE_DEFINE: () => MODULE_DEFINE,
-  MODULE_DEFINE_COUNT: () => MODULE_DEFINE_COUNT,
-  MODULE_ERROR: () => MODULE_ERROR,
-  MODULE_FETCH: () => MODULE_FETCH,
-  MODULE_FETCH_COUNT: () => MODULE_FETCH_COUNT,
-  MODULE_FETCH_DURATION: () => MODULE_FETCH_DURATION
-});
-var BOOTSTRAP_PREFIX = "lwr.bootstrap.";
-var BOOTSTRAP_END = `${BOOTSTRAP_PREFIX}end`;
-var BOOTSTRAP_ERROR = `${BOOTSTRAP_PREFIX}error`;
-var BOOTSTRAP_DURATION = `${BOOTSTRAP_PREFIX}duration`;
-var BOOTSTRAP_AVAILABILITY = `${BOOTSTRAP_PREFIX}availability`;
-var LOADER_PREFIX = "lwr.loader.";
-var MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
-var MODULE_DEFINE_COUNT = `${MODULE_DEFINE}.count`;
-var MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
-var MODULE_FETCH_COUNT = `${MODULE_FETCH}.count`;
-var MODULE_FETCH_DURATION = `${MODULE_FETCH}.duration`;
-var MODULE_ERROR = `${LOADER_PREFIX}module.error`;
-var MAPPINGS_FETCH = `${LOADER_PREFIX}mappings.fetch`;
-var MAPPINGS_FETCH_COUNT = `${MAPPINGS_FETCH}.count`;
-var MAPPINGS_FETCH_DURATION = `${MAPPINGS_FETCH}.duration`;
-var MAPPINGS_ERROR = `${LOADER_PREFIX}mappings.error`;

package/build/metrics.d.ts

@@ -1,18 +0,0 @@
-export declare type LWRMetric = 'lwr.bootstrap.end' | 'lwr.bootstrap.error' | 'lwr.loader.module.define' | 'lwr.loader.module.fetch' | 'lwr.loader.mappings.fetch' | 'lwr.loader.module.error' | 'lwr.loader.mappings.error';
-export declare const BOOTSTRAP_PREFIX = "lwr.bootstrap.";
-export declare const BOOTSTRAP_END: LWRMetric;
-export declare const BOOTSTRAP_ERROR: LWRMetric;
-export declare const BOOTSTRAP_DURATION: string;
-export declare const BOOTSTRAP_AVAILABILITY: string;
-export declare const LOADER_PREFIX = "lwr.loader.";
-export declare const MODULE_DEFINE: LWRMetric;
-export declare const MODULE_DEFINE_COUNT: string;
-export declare const MODULE_FETCH: LWRMetric;
-export declare const MODULE_FETCH_COUNT: string;
-export declare const MODULE_FETCH_DURATION: string;
-export declare const MODULE_ERROR: LWRMetric;
-export declare const MAPPINGS_FETCH: LWRMetric;
-export declare const MAPPINGS_FETCH_COUNT: string;
-export declare const MAPPINGS_FETCH_DURATION: string;
-export declare const MAPPINGS_ERROR: LWRMetric;
-//# sourceMappingURL=metrics.d.ts.map

package/build/metrics.js

@@ -1,20 +0,0 @@
-// Bootstrap / shim
-export const BOOTSTRAP_PREFIX = 'lwr.bootstrap.';
-export const BOOTSTRAP_END = `${BOOTSTRAP_PREFIX}end`;
-export const BOOTSTRAP_ERROR = `${BOOTSTRAP_PREFIX}error`;
-export const BOOTSTRAP_DURATION = `${BOOTSTRAP_PREFIX}duration`;
-export const BOOTSTRAP_AVAILABILITY = `${BOOTSTRAP_PREFIX}availability`;
-// Loader: modules
-export const LOADER_PREFIX = 'lwr.loader.';
-export const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
-export const MODULE_DEFINE_COUNT = `${MODULE_DEFINE}.count`;
-export const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
-export const MODULE_FETCH_COUNT = `${MODULE_FETCH}.count`;
-export const MODULE_FETCH_DURATION = `${MODULE_FETCH}.duration`;
-export const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
-// Loader: mappings
-export const MAPPINGS_FETCH = `${LOADER_PREFIX}mappings.fetch`;
-export const MAPPINGS_FETCH_COUNT = `${MAPPINGS_FETCH}.count`;
-export const MAPPINGS_FETCH_DURATION = `${MAPPINGS_FETCH}.duration`;
-export const MAPPINGS_ERROR = `${LOADER_PREFIX}mappings.error`;
-//# sourceMappingURL=metrics.js.map

package/build/shim/profiler.d.ts

@@ -1,23 +0,0 @@
-import { LWRMetric } from '../metrics';
-declare const enum Phase {
-    Start = 0,
-    End = 1
-}
-interface LWRLogInfo {
-    id: LWRMetric;
-    specifier?: string;
-}
-interface LWRDispatcherInfo extends LWRLogInfo {
-    phase: Phase;
-}
-declare type LogOperation = (info: LWRLogInfo) => void;
-export declare type LogDispatcher = (info: LWRDispatcherInfo) => void;
-export interface ProfilerAPI {
-    logOperationStart: LogOperation;
-    logOperationEnd: LogOperation;
-}
-export declare function attachDispatcher(dispatcher: LogDispatcher): void;
-export declare function logOperationStart({ id, specifier }: LWRLogInfo): void;
-export declare function logOperationEnd({ id, specifier }: LWRLogInfo): void;
-export {};
-//# sourceMappingURL=profiler.d.ts.map

package/build/shim/profiler.js

@@ -1,47 +0,0 @@
-var Phase;
-(function (Phase) {
-    Phase[Phase["Start"] = 0] = "Start";
-    Phase[Phase["End"] = 1] = "End";
-})(Phase || (Phase = {}));
-// Attach a custom dispatcher
-let customDispatcher;
-export function attachDispatcher(dispatcher) {
-    customDispatcher = dispatcher;
-}
-// Check if the Performance API is available
-// e.g. JSDom (used in Jest) doesn't implement these
-const perf = globalThis.performance;
-const isPerfSupported = typeof perf !== 'undefined' &&
-    typeof perf.mark === 'function' &&
-    typeof perf.clearMarks === 'function' &&
-    typeof perf.measure === 'function' &&
-    typeof perf.clearMeasures === 'function';
-// For marking request metrics
-// Fallback to the Performance API if there is no custom dispatcher
-export function logOperationStart({ id, specifier }) {
-    if (customDispatcher) {
-        customDispatcher({ id, phase: Phase.Start, specifier });
-    }
-    else if (isPerfSupported) {
-        perf.mark(id + (specifier ? `.${specifier}` : ''));
-    }
-}
-// For measuring duration metrics
-// Fallback to the Performance API if there is no custom dispatcher
-/* istanbul ignore next */
-export function logOperationEnd({ id, specifier }) {
-    if (customDispatcher) {
-        customDispatcher({ id, phase: Phase.End, specifier });
-    }
-    else if (isPerfSupported) {
-        const suffix = specifier ? `.${specifier}` : '';
-        const markName = id + suffix;
-        const measureName = `${id}.duration${suffix}`;
-        perf.measure(measureName, markName);
-        // Clear the created mark and measure to avoid filling the performance entry buffer
-        // Even if they get deleted, existing PerformanceObservers preserve copies of the entries
-        perf.clearMarks(markName);
-        perf.clearMeasures(measureName);
-    }
-}
-//# sourceMappingURL=profiler.js.map