@lwrjs/loader 0.17.2-alpha.3 → 0.17.2-alpha.31

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.17.2-alpha.3 */
+/* LWR Module Loader v0.17.2-alpha.31 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -108,7 +108,7 @@ const STALE_HOOK_ERROR = Object.freeze({
     level: 0,
     message: 'An error occurred handling module conflict',
 });
-const MODULE_ALREADY_LOADED = Object.freeze({
+Object.freeze({
     code: 3017,
     level: 0,
     message: 'Marking module(s) as externally loaded, but they are already loaded:',
@@ -538,20 +538,21 @@ class ImportMetadataResolver {
         if (!uri) {
             throw new LoaderError(UNRESOLVEABLE_MAPPING_ERROR, [specifier]);
         }
-        return globalThis.fetch(uri).then((res) => {
-            if (!res.ok) {
-                this.config.profiler.logOperationStart({ id: MAPPINGS_ERROR, specifier });
-                throw new LoaderError(UNRESOLVED, [specifier]);
-            }
-            return res
-                .json()
-                .then((ret) => {
-                    return ret ;
-                })
-                .catch((err) => {
+
+        return globalThis
+            .fetch(uri)
+            .then((res) => {
+                if (!res.ok) {
+                    this.config.profiler.logOperationStart({ id: MAPPINGS_ERROR, specifier });
                     throw new LoaderError(UNRESOLVED, [specifier]);
+                }
+                return res.json().then((ret) => {
+                    return ret ;
                 });
-        });
+            })
+            .catch((err) => {
+                throw new LoaderError(UNRESOLVED, [specifier]);
+            });
     }
 
      saveImportURIRecord(specifier, uri, identity, isRoot) {
@@ -597,20 +598,39 @@ function evaluateHandleStaleModuleHooks(
 
 const MODULE_LOAD_TIMEOUT_TIMER = 60 * 1000; // 1m
 
+var MODULE_WARNING; (function (MODULE_WARNING) {
+    const MODULE_REDEFINE = 'Module redefine attempted'; MODULE_WARNING["MODULE_REDEFINE"] = MODULE_REDEFINE;
+    const MODULE_ALREADY_LOADED = 'Marking module(s) as externally loaded, but they are already loaded'; MODULE_WARNING["MODULE_ALREADY_LOADED"] = MODULE_ALREADY_LOADED;
+    const ALIAS_UPDATE = 'Alias update attempt'; MODULE_WARNING["ALIAS_UPDATE"] = ALIAS_UPDATE;
+})(MODULE_WARNING || (MODULE_WARNING = {}));
+
 /*!
  * Copyright (C) 2023 salesforce.com, inc.
  */
 // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
 const SUPPORTS_TRUSTED_TYPES = typeof trustedTypes !== 'undefined';
-function createTrustedTypesPolicy(name, options) {
+const trustedTypePolicyRegistry = {
+  __proto__: null
+};
+function createDuplicateSafeTrustedTypesPolicy(name, options) {
+  // istanbul ignore next: not testable in coverage collection
+  if (trustedTypePolicyRegistry[name]) {
+    return trustedTypePolicyRegistry[name];
+  }
   // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
-  return trustedTypes.createPolicy(name, options);
+  // eslint-disable-next-line no-return-assign
+  return trustedTypePolicyRegistry[name] = trustedTypes.createPolicy(name, options);
 }
-function createFallbackPolicy(_name, options) {
-  return options;
+function createDuplicateSafeFallbackPolicy(name, options) {
+  if (trustedTypePolicyRegistry[name]) {
+    return trustedTypePolicyRegistry[name];
+  }
+  // @ts-ignore: Prevent cannot find name 'trustedTypes' error.
+  // eslint-disable-next-line no-return-assign
+  return trustedTypePolicyRegistry[name] = options;
 }
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/trusted-types
-const createPolicy = SUPPORTS_TRUSTED_TYPES ? createTrustedTypesPolicy : createFallbackPolicy;
+const createPolicy = SUPPORTS_TRUSTED_TYPES ? createDuplicateSafeTrustedTypesPolicy : createDuplicateSafeFallbackPolicy;
 const policyOptions = {
   createHTML(value) {
     return value;
@@ -658,7 +678,7 @@ try {
   // swallow
 }
 const trusted = createPolicy('trusted', policyOptions);
-/*! version: 0.23.6 */
+/*! version: 0.24.6 */
 
 /* global console,process */
 
@@ -728,7 +748,7 @@ async function evaluateLoadHookResponse(response, id) {
         code = `${code}\n//# sourceURL=${id}`; // append sourceURL for debugging
         try {
             // TODO eval source maps for debugging
-            eval(trusted.createScript(code));
+            eval(trusted.createScript(code) );
         } catch (e) {
             // eslint-disable-next-line lwr/no-unguarded-apis
             if (process.env.NODE_ENV !== 'production' && hasConsole) {
@@ -772,7 +792,7 @@ async function evaluateLoadHook(
     });
 }
 
-/* global console,process */
+/* global process console */
 
 
 
@@ -819,13 +839,20 @@ async function evaluateLoadHook(
 
 class ModuleRegistry {
     
+    
+     __init() {this.isAppMounted = false;}
 
-    constructor(config) {ModuleRegistry.prototype.__init.call(this);ModuleRegistry.prototype.__init2.call(this);ModuleRegistry.prototype.__init3.call(this);
+    constructor(config) {ModuleRegistry.prototype.__init.call(this);ModuleRegistry.prototype.__init2.call(this);ModuleRegistry.prototype.__init3.call(this);ModuleRegistry.prototype.__init4.call(this);
         this.profiler = config.profiler;
         this.resolver = new ImportMetadataResolver(
             config,
             this.importMetadataInvalidationCallback.bind(this),
         );
+        this.warnings = {
+            [MODULE_WARNING.MODULE_REDEFINE]: [],
+            [MODULE_WARNING.MODULE_ALREADY_LOADED]: [],
+            [MODULE_WARNING.ALIAS_UPDATE]: [],
+        };
     }
 
     async load(id, importer) {
@@ -957,11 +984,14 @@ class ModuleRegistry {
                 // eslint-disable-next-line lwr/no-unguarded-apis
                 process.env.NODE_ENV !== 'production' &&
                 // eslint-disable-next-line lwr/no-unguarded-apis
-                process.env.MRT_HMR !== 'true' &&
-                hasConsole
+                process.env.MRT_HMR !== 'true'
             ) {
-                // eslint-disable-next-line lwr/no-unguarded-apis
-                console.warn(`Module redefine attempted: ${name}`);
+                if (!this.warnings[MODULE_WARNING.MODULE_REDEFINE].includes(name)) {
+                    this.warnings[MODULE_WARNING.MODULE_REDEFINE].push(name);
+                }
+                if (this.isAppMounted) {
+                    this.logMessage('warning', `${MODULE_WARNING.MODULE_REDEFINE}: ${name}`);
+                }
             }
             this.lastDefine = mod;
             return;
@@ -1015,9 +1045,13 @@ class ModuleRegistry {
                 };
                 this.namedDefineRegistry.set(id, moduleDef );
                 // eslint-disable-next-line lwr/no-unguarded-apis
-            } else if (process.env.NODE_ENV !== 'production' && hasConsole) {
-                // eslint-disable-next-line lwr/no-unguarded-apis
-                console.warn(MODULE_ALREADY_LOADED.message, id);
+            } else if (process.env.NODE_ENV !== 'production') {
+                if (!this.warnings[MODULE_WARNING.MODULE_ALREADY_LOADED].includes(id)) {
+                    this.warnings[MODULE_WARNING.MODULE_ALREADY_LOADED].push(id);
+                }
+                if (this.isAppMounted) {
+                    this.logMessage('warning', `${MODULE_WARNING.MODULE_ALREADY_LOADED}: ${id}`);
+                }
             }
         });
     }
@@ -1025,13 +1059,13 @@ class ModuleRegistry {
     
 
     // A registry for named AMD defines containing the *metadata* of AMD module
-     __init() {this.namedDefineRegistry = new Map();}
+     __init2() {this.namedDefineRegistry = new Map();}
 
     // The evaluated module registry where the module identifier (name or URL?) is the key
-     __init2() {this.moduleRegistry = new Map();}
+     __init3() {this.moduleRegistry = new Map();}
 
     // Aliases of modules in the registry
-    __init3() {this.aliases = new Map();}
+    __init4() {this.aliases = new Map();}
 
     
 
@@ -1111,10 +1145,12 @@ class ModuleRegistry {
                 // Warn the user if they were not aliasing to the resolvedId
                 const currentResolvedId = this.aliases.get(aliasId);
                 if (currentResolvedId !== resolvedId) {
-                    // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
-                    if (process.env.NODE_ENV !== 'production' && hasConsole) {
-                        // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
-                        console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                    const warningMsg = `${aliasId}=>${currentResolvedId}, ${resolvedId}`;
+                    if (!this.warnings[MODULE_WARNING.ALIAS_UPDATE].includes(warningMsg)) {
+                        this.warnings[MODULE_WARNING.ALIAS_UPDATE].push(warningMsg);
+                    }
+                    if (this.isAppMounted) {
+                        this.logMessage('warning', `${MODULE_WARNING.ALIAS_UPDATE}: ${warningMsg}`);
                     }
                 }
             }
@@ -1122,7 +1158,25 @@ class ModuleRegistry {
     }
 
      async getModuleDependencyRecord(dependency) {
-        const resolvedDepId = await this.resolve(dependency);
+        // Initially resolve the dependency to get its ID, which may be a bundle URL.
+        let resolvedDepId = await this.resolve(dependency);
+
+        // If the resolved dependency ID is a URL, it indicates that the dependency
+        // is provided by a bundle that hasn't been fully instantiated yet.
+        if (isUrl(resolvedDepId)) {
+            // Retrieve the module record corresponding to the bundle URL.
+            const existingRecord = this.moduleRegistry.get(resolvedDepId);
+
+            // If a module record for the bundle exists and we haven't already created an alias for this dependency,
+            // then the bundle is still pending instantiation.
+            if (existingRecord && !this.aliases.has(dependency)) {
+                // Wait for the bundle's instantiation promise to resolve.
+                await existingRecord.instantiation;
+                // After instantiation, re-resolve the dependency.
+                // This should now return the final alias (the logical module ID) instead of the raw bundle URL.
+                resolvedDepId = await this.resolve(dependency);
+            }
+        }
         return this.getModuleRecord(resolvedDepId, dependency);
     }
 
@@ -1346,6 +1400,10 @@ class ModuleRegistry {
 
                 // Fallback to the last loader.define call
                 if (!moduleDef) {
+                    this.logMessage(
+                        'warning',
+                        `${moduleName} not found, falling back to the last loader.define call`,
+                    );
                     moduleDef = this.lastDefine;
                 }
 
@@ -1427,6 +1485,28 @@ class ModuleRegistry {
             res === null || typeof res === 'string' || (res && typeof (res ).url === 'string')
         );
     }
+
+    getModuleWarnings(isAppMounted = false) {
+        this.isAppMounted = isAppMounted;
+        return this.warnings;
+    }
+
+    logMessage(logType, message) {
+        if (
+            !hasProcessEnv ||
+            !hasConsole || // eslint-disable-next-line lwr/no-unguarded-apis
+            process.env.NODE_ENV === 'production'
+        ) {
+            return;
+        }
+        if (logType == 'warning') {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            console.warn(message);
+        } else {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            console.log(message);
+        }
+    }
 }
 
 /**
@@ -1560,6 +1640,10 @@ class Loader {
     registerExternalModules(modules) {
         this.registry.registerExternalModules(modules);
     }
+
+    getModuleWarnings(isAppMounted = false) {
+        return this.registry.getModuleWarnings(isAppMounted);
+    }
 }
 
 export { Loader };

package/build/modules/lwr/loader/moduleRegistry/importMetadataResolver.js

@@ -177,19 +177,19 @@ export class ImportMetadataResolver {
         if (!uri) {
             throw new LoaderError(UNRESOLVEABLE_MAPPING_ERROR, [specifier]);
         }
-        return globalThis.fetch(uri).then((res) => {
+        return globalThis
+            .fetch(uri)
+            .then((res) => {
             if (!res.ok) {
                 this.config.profiler.logOperationStart({ id: MAPPINGS_ERROR, specifier });
                 throw new LoaderError(UNRESOLVED, [specifier]);
             }
-            return res
-                .json()
-                .then((ret) => {
+            return res.json().then((ret) => {
                 return ret;
-            })
-                .catch((err) => {
-                throw new LoaderError(UNRESOLVED, [specifier]);
             });
+        })
+            .catch((err) => {
+            throw new LoaderError(UNRESOLVED, [specifier]);
         });
     }
     saveImportURIRecord(specifier, uri, identity, isRoot) {

package/build/modules/lwr/loader/moduleRegistry/moduleRegistry.d.ts

@@ -7,6 +7,8 @@ export type Module = {
 };
 export declare class ModuleRegistry {
     private profiler;
+    private warnings;
+    private isAppMounted;
     constructor(config: LoaderConfig);
     load(id: string, importer?: string): Promise<Module>;
     resolve(id: string, importer?: string): Promise<string>;
@@ -43,5 +45,7 @@ export declare class ModuleRegistry {
     private handleStaleModuleHook?;
     registerHandleStaleModuleHook(handleStaleModule: HandleStaleModuleHook): void;
     isValidResolveResponse(res: ResolveHookResponse): boolean;
+    getModuleWarnings(isAppMounted?: boolean): Record<string, string[]>;
+    logMessage(logType: string, message: string): void;
 }
 //# sourceMappingURL=moduleRegistry.d.ts.map

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

@@ -1,5 +1,5 @@
-/* global console,process */
-import { invariant, NO_AMD_REQUIRE, LoaderError, FAIL_INSTANTIATE, FAILED_DEP, UNRESOLVED, INVALID_HOOK, INVALID_LOADER_SERVICE_RESPONSE, MODULE_ALREADY_LOADED, MODULE_LOAD_TIMEOUT, EXPORTER_ERROR, } from '../errors/messages.js';
+/* global process console */
+import { invariant, NO_AMD_REQUIRE, LoaderError, FAIL_INSTANTIATE, FAILED_DEP, UNRESOLVED, INVALID_HOOK, INVALID_LOADER_SERVICE_RESPONSE, MODULE_LOAD_TIMEOUT, EXPORTER_ERROR, } from '../errors/messages.js';
 import { resolveIfNotPlainOrUrl, isUrl } from '../utils/url.js';
 import { hasDocument, hasConsole, hasProcessEnv } from '../utils/dom.js';
 import { loadModuleDef } from './scriptLoad.js';
@@ -7,9 +7,10 @@ import { ImportMetadataResolver } from './importMetadataResolver.js';
 import { evaluateHandleStaleModuleHooks } from '../hooks/moduleInvalidation.js';
 import { evaluateLoadHookResponse, evaluateLoadHook, isResponseAPromise, } from '../hooks/resolveAndLoadHook.js';
 import { MODULE_DEFINE, MODULE_ERROR, MODULE_FETCH, MODULE_DYNAMIC_LOAD } from 'lwr/metrics';
-import { MODULE_LOAD_TIMEOUT_TIMER } from '../constants/constants.js';
+import { MODULE_LOAD_TIMEOUT_TIMER, MODULE_WARNING } from '../constants/constants.js';
 export class ModuleRegistry {
     constructor(config) {
+        this.isAppMounted = false;
         // A registry for named AMD defines containing the *metadata* of AMD module
         this.namedDefineRegistry = new Map();
         // The evaluated module registry where the module identifier (name or URL?) is the key
@@ -18,6 +19,11 @@ export class ModuleRegistry {
         this.aliases = new Map();
         this.profiler = config.profiler;
         this.resolver = new ImportMetadataResolver(config, this.importMetadataInvalidationCallback.bind(this));
+        this.warnings = {
+            [MODULE_WARNING.MODULE_REDEFINE]: [],
+            [MODULE_WARNING.MODULE_ALREADY_LOADED]: [],
+            [MODULE_WARNING.ALIAS_UPDATE]: [],
+        };
     }
     async load(id, importer) {
         const metadata = importer ? { importer } : {};
@@ -136,10 +142,13 @@ export class ModuleRegistry {
                 // eslint-disable-next-line lwr/no-unguarded-apis
                 process.env.NODE_ENV !== 'production' &&
                 // eslint-disable-next-line lwr/no-unguarded-apis
-                process.env.MRT_HMR !== 'true' &&
-                hasConsole) {
-                // eslint-disable-next-line lwr/no-unguarded-apis
-                console.warn(`Module redefine attempted: ${name}`);
+                process.env.MRT_HMR !== 'true') {
+                if (!this.warnings[MODULE_WARNING.MODULE_REDEFINE].includes(name)) {
+                    this.warnings[MODULE_WARNING.MODULE_REDEFINE].push(name);
+                }
+                if (this.isAppMounted) {
+                    this.logMessage('warning', `${MODULE_WARNING.MODULE_REDEFINE}: ${name}`);
+                }
             }
             this.lastDefine = mod;
             return;
@@ -190,9 +199,13 @@ export class ModuleRegistry {
                 this.namedDefineRegistry.set(id, moduleDef);
                 // eslint-disable-next-line lwr/no-unguarded-apis
             }
-            else if (process.env.NODE_ENV !== 'production' && hasConsole) {
-                // eslint-disable-next-line lwr/no-unguarded-apis
-                console.warn(MODULE_ALREADY_LOADED.message, id);
+            else if (process.env.NODE_ENV !== 'production') {
+                if (!this.warnings[MODULE_WARNING.MODULE_ALREADY_LOADED].includes(id)) {
+                    this.warnings[MODULE_WARNING.MODULE_ALREADY_LOADED].push(id);
+                }
+                if (this.isAppMounted) {
+                    this.logMessage('warning', `${MODULE_WARNING.MODULE_ALREADY_LOADED}: ${id}`);
+                }
             }
         });
     }
@@ -264,17 +277,35 @@ export class ModuleRegistry {
                 // Warn the user if they were not aliasing to the resolvedId
                 const currentResolvedId = this.aliases.get(aliasId);
                 if (currentResolvedId !== resolvedId) {
-                    // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
-                    if (process.env.NODE_ENV !== 'production' && hasConsole) {
-                        // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
-                        console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                    const warningMsg = `${aliasId}=>${currentResolvedId}, ${resolvedId}`;
+                    if (!this.warnings[MODULE_WARNING.ALIAS_UPDATE].includes(warningMsg)) {
+                        this.warnings[MODULE_WARNING.ALIAS_UPDATE].push(warningMsg);
+                    }
+                    if (this.isAppMounted) {
+                        this.logMessage('warning', `${MODULE_WARNING.ALIAS_UPDATE}: ${warningMsg}`);
                     }
                 }
             }
         }
     }
     async getModuleDependencyRecord(dependency) {
-        const resolvedDepId = await this.resolve(dependency);
+        // Initially resolve the dependency to get its ID, which may be a bundle URL.
+        let resolvedDepId = await this.resolve(dependency);
+        // If the resolved dependency ID is a URL, it indicates that the dependency
+        // is provided by a bundle that hasn't been fully instantiated yet.
+        if (isUrl(resolvedDepId)) {
+            // Retrieve the module record corresponding to the bundle URL.
+            const existingRecord = this.moduleRegistry.get(resolvedDepId);
+            // If a module record for the bundle exists and we haven't already created an alias for this dependency,
+            // then the bundle is still pending instantiation.
+            if (existingRecord && !this.aliases.has(dependency)) {
+                // Wait for the bundle's instantiation promise to resolve.
+                await existingRecord.instantiation;
+                // After instantiation, re-resolve the dependency.
+                // This should now return the final alias (the logical module ID) instead of the raw bundle URL.
+                resolvedDepId = await this.resolve(dependency);
+            }
+        }
         return this.getModuleRecord(resolvedDepId, dependency);
     }
     // execute the "top-level code" (the code outside of functions) of a module
@@ -463,6 +494,7 @@ export class ModuleRegistry {
             moduleDef = moduleName && this.namedDefineRegistry.get(moduleName);
             // Fallback to the last loader.define call
             if (!moduleDef) {
+                this.logMessage('warning', `${moduleName} not found, falling back to the last loader.define call`);
                 moduleDef = this.lastDefine;
             }
             // This should not happen
@@ -534,5 +566,24 @@ export class ModuleRegistry {
     isValidResolveResponse(res) {
         return (res === null || typeof res === 'string' || (res && typeof res.url === 'string'));
     }
+    getModuleWarnings(isAppMounted = false) {
+        this.isAppMounted = isAppMounted;
+        return this.warnings;
+    }
+    logMessage(logType, message) {
+        if (!hasProcessEnv ||
+            !hasConsole || // eslint-disable-next-line lwr/no-unguarded-apis
+            process.env.NODE_ENV === 'production') {
+            return;
+        }
+        if (logType == 'warning') {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            console.warn(message);
+        }
+        else {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            console.log(message);
+        }
+    }
 }
 //# sourceMappingURL=moduleRegistry.js.map

package/build/modules/lwr/loaderLegacy/constants/constants.d.ts

@@ -1,2 +1,7 @@
 export declare const MODULE_LOAD_TIMEOUT_TIMER: number;
+export declare enum MODULE_WARNING {
+    MODULE_REDEFINE = "Module redefine attempted",
+    MODULE_ALREADY_LOADED = "Marking module(s) as externally loaded, but they are already loaded",
+    ALIAS_UPDATE = "Alias update attempt"
+}
 //# sourceMappingURL=constants.d.ts.map

package/build/modules/lwr/loaderLegacy/constants/constants.js

@@ -1,2 +1,8 @@
 export const MODULE_LOAD_TIMEOUT_TIMER = 60 * 1000; // 1m
+export var MODULE_WARNING;
+(function (MODULE_WARNING) {
+    MODULE_WARNING["MODULE_REDEFINE"] = "Module redefine attempted";
+    MODULE_WARNING["MODULE_ALREADY_LOADED"] = "Marking module(s) as externally loaded, but they are already loaded";
+    MODULE_WARNING["ALIAS_UPDATE"] = "Alias update attempt";
+})(MODULE_WARNING || (MODULE_WARNING = {}));
 //# sourceMappingURL=constants.js.map

package/build/modules/lwr/loaderLegacy/loaderLegacy.d.ts

@@ -54,5 +54,6 @@ export declare class Loader {
      * @param modules - list of module identifiers
      */
     registerExternalModules(modules: string[]): void;
+    getModuleWarnings(isAppMounted?: boolean): Record<string, string[]>;
 }
 //# sourceMappingURL=loaderLegacy.d.ts.map