@lwrjs/loader 0.11.0-alpha.4 → 0.11.0-alpha.7

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

@@ -46,8 +46,14 @@ var ModuleRegistry = class {
     this.profiler = config.profiler;
   }
   async load(id, importer) {
+    const metadata = importer ? {importer} : {};
+    this.profiler.logOperationStart({
+      id: import_metrics.MODULE_DYNAMIC_LOAD,
+      specifier: id,
+      metadata
+    });
     const resolvedId = await this.resolve(id, importer);
-    const moduleRecord = this.getModuleRecord(resolvedId, id);
+    const moduleRecord = await this.getModuleRecord(resolvedId, id);
     if (moduleRecord.evaluated) {
       return moduleRecord.module;
     } else {
@@ -234,14 +240,14 @@ var ModuleRegistry = class {
     }
     return moduleRecord;
   }
-  getModuleRecord(resolvedId, id) {
+  async getModuleRecord(resolvedId, id) {
     const existingRecord = this.getExistingModuleRecord(resolvedId, id);
     if (existingRecord) {
       return existingRecord;
     }
     const instantiation = this.getModuleDef(resolvedId, id);
     const dependencyRecords = instantiation.then((moduleDef) => {
-      const dependencies = moduleDef.dependencies;
+      const dependencies = moduleDef && moduleDef.dependencies || [];
       const filtered = dependencies.map((dep) => {
         if (dep === "exports") {
           return;
@@ -261,7 +267,7 @@ var ModuleRegistry = class {
     };
     this.moduleRegistry.set(resolvedId, newModuleRecord);
     this.storeModuleAlias(id, resolvedId);
-    return newModuleRecord;
+    return dependencyRecords.then(() => newModuleRecord);
   }
   storeModuleAlias(aliasId, resolvedId) {
     if (aliasId !== resolvedId) {
@@ -270,7 +276,9 @@ var ModuleRegistry = class {
       } else if (import_dom.hasConsole) {
         const currentResolvedId = this.aliases.get(aliasId);
         if (currentResolvedId !== resolvedId) {
-          console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+          if (process.env.NODE_ENV !== "production" && import_dom.hasConsole) {
+            console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+          }
         }
       }
     }
@@ -303,7 +311,7 @@ var ModuleRegistry = class {
     }
     const {exporter, dependencies} = await moduleRecord.instantiation;
     const exports2 = {};
-    const depsMapped = await Promise.all(dependencies.map(async (dep) => {
+    const depsMapped = dependencies ? await Promise.all(dependencies.map(async (dep) => {
       if (dep === "exports") {
         return exports2;
       }
@@ -320,11 +328,16 @@ var ModuleRegistry = class {
         return module2.__defaultInterop ? module2.default : module2;
       }
       throw new import_messages.LoaderError(import_messages.FAILED_DEP, [resolvedDepId]);
-    }));
+    })) : [];
     if (moduleRecord.evaluated) {
       return moduleRecord.module;
     }
-    let moduleDefault = exporter(...depsMapped);
+    let moduleDefault;
+    try {
+      moduleDefault = exporter(...depsMapped);
+    } catch (e) {
+      throw new import_messages.LoaderError(import_messages.EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+    }
     if (moduleDefault !== void 0) {
       moduleDefault = {default: moduleDefault};
       Object.defineProperty(moduleDefault, "__defaultInterop", {value: true});
@@ -421,7 +434,9 @@ var ModuleRegistry = class {
       this.profiler.logOperationEnd({id: import_metrics.MODULE_FETCH, specifier});
       return moduleDef;
     }).catch((e) => {
-      this.profiler.logOperationStart({id: import_metrics.MODULE_ERROR, specifier});
+      if (!(e instanceof import_messages.LoaderError)) {
+        this.profiler.logOperationStart({id: import_metrics.MODULE_ERROR, specifier});
+      }
       throw e;
     });
   }

package/build/modules/lwr/esmLoader/esmLoader.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 ESM Module Loader v0.11.0-alpha.4 */
+/* LWR ESM Module Loader v0.11.0-alpha.7 */
 function _optionalChain$1(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 

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.11.0-alpha.4 */
+/* LWR Module Loader v0.11.0-alpha.7 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -128,6 +128,11 @@ const BAD_IMPORT_METADATA = Object.freeze({
     level: 0,
     message: 'Invalid import metadata: {0} {1}',
 });
+const EXPORTER_ERROR = Object.freeze({
+    code: 3021,
+    level: 0,
+    message: 'Error evaluating module "{0}", error was "{1}"',
+});
 
 /* importMap errors */
 Object.freeze({
@@ -324,6 +329,7 @@ if (hasDocument) {
 // Loader: modules
 const LOADER_PREFIX = 'lwr.loader.';
 const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
+const MODULE_DYNAMIC_LOAD = `${LOADER_PREFIX}moduleRegistry.dynamicLoad`;
 const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
 const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
 
@@ -684,7 +690,7 @@ function isResponseAPromise(
 
 async function evaluateLoadHookResponse(response, id) {
     return Promise.resolve().then(async () => {
-        if (!response.status) {
+        if (!response || !response.status) {
             throw new LoaderError(INVALID_LOADER_SERVICE_RESPONSE);
         }
         if (response.status !== 200) {
@@ -711,6 +717,10 @@ async function evaluateLoadHookResponse(response, id) {
             // TODO eval source maps for debugging
             eval(trusted.createScript(code));
         } catch (e) {
+            if (process.env.NODE_ENV !== 'production' && hasConsole) {
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                console.error(e);
+            }
             throw new LoaderError(FAIL_LOAD, [id]);
         }
 
@@ -791,7 +801,6 @@ async function evaluateLoadHook(
 
 
 
-
 
 
 class ModuleRegistry {
@@ -806,8 +815,14 @@ class ModuleRegistry {
     }
 
     async load(id, importer) {
+        const metadata = importer ? { importer } : {};
+        this.profiler.logOperationStart({
+            id: MODULE_DYNAMIC_LOAD,
+            specifier: id,
+            metadata,
+        });
         const resolvedId = await this.resolve(id, importer);
-        const moduleRecord = this.getModuleRecord(resolvedId, id);
+        const moduleRecord = await this.getModuleRecord(resolvedId, id);
         if (moduleRecord.evaluated) {
             return moduleRecord.module;
         } else {
@@ -881,6 +896,8 @@ class ModuleRegistry {
                 // return the plain id if it is already defined && the resolvedUrl is NOT already in the module registry
                 if (
                     this.namedDefineRegistry.has(resolvedOrPlain) &&
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore has check right above
                     this.namedDefineRegistry.get(resolvedOrPlain).defined
                 ) {
                     const record = this.moduleRegistry.get(resolvedUrl);
@@ -1021,7 +1038,7 @@ class ModuleRegistry {
         return moduleRecord;
     }
 
-     getModuleRecord(resolvedId, id) {
+     async getModuleRecord(resolvedId, id) {
         // Look for an existing record
         const existingRecord = this.getExistingModuleRecord(resolvedId, id);
         if (existingRecord) {
@@ -1032,7 +1049,7 @@ class ModuleRegistry {
         // Create a new Module Record
         const instantiation = this.getModuleDef(resolvedId, id);
         const dependencyRecords = instantiation.then((moduleDef) => {
-            const dependencies = moduleDef.dependencies;
+            const dependencies = moduleDef.dependencies || [];
             // get dep and filter out exports
             const filtered = dependencies
                 .map((dep) => {
@@ -1058,7 +1075,9 @@ class ModuleRegistry {
 
         this.moduleRegistry.set(resolvedId, newModuleRecord);
         this.storeModuleAlias(id, resolvedId);
-        return newModuleRecord;
+
+        // Wait for the dependencies to resolve the return the moduleRecord
+        return dependencyRecords.then(() => newModuleRecord);
     }
 
      storeModuleAlias(aliasId, resolvedId) {
@@ -1070,7 +1089,10 @@ class ModuleRegistry {
                 const currentResolvedId = this.aliases.get(aliasId);
                 if (currentResolvedId !== resolvedId) {
                     // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
-                    console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                    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}`);
+                    }
                 }
             }
         }
@@ -1119,37 +1141,39 @@ class ModuleRegistry {
         const { exporter, dependencies } = await moduleRecord.instantiation;
         // The exports object automatically gets filled in by the exporter evaluation
         const exports = {};
-        const depsMapped = await Promise.all(
-            dependencies.map(async (dep) => {
-                if (dep === 'exports') {
-                    return exports;
-                }
-                const resolvedDepId = await this.resolve(dep);
-
-                const moduleRecord = this.moduleRegistry.get(resolvedDepId) ;
-                if (!moduleRecord) {
-                    throw new LoaderError(FAILED_DEP, [resolvedDepId]);
-                }
-
-                const module = moduleRecord.module;
-
-                /**
-                 * Circular dependencies are handled properly when named exports are used,
-                 * however, for default exports there is a bug: https://github.com/rollup/rollup/issues/3384
-                 *
-                 * The workaround below applies for circular dependencies (!moduleRecord.evaluated)
-                 */
-                if (!moduleRecord.evaluated) {
-                    return this.getCircularDependencyWrapper(module);
-                }
-
-                if (module) {
-                    return module.__defaultInterop ? module.default : module;
-                }
-
-                throw new LoaderError(FAILED_DEP, [resolvedDepId]);
-            }),
-        );
+        const depsMapped = dependencies
+            ? await Promise.all(
+                  dependencies.map(async (dep) => {
+                      if (dep === 'exports') {
+                          return exports;
+                      }
+                      const resolvedDepId = await this.resolve(dep);
+
+                      const moduleRecord = this.moduleRegistry.get(resolvedDepId) ;
+                      if (!moduleRecord) {
+                          throw new LoaderError(FAILED_DEP, [resolvedDepId]);
+                      }
+
+                      const module = moduleRecord.module;
+
+                      /**
+                       * Circular dependencies are handled properly when named exports are used,
+                       * however, for default exports there is a bug: https://github.com/rollup/rollup/issues/3384
+                       *
+                       * The workaround below applies for circular dependencies (!moduleRecord.evaluated)
+                       */
+                      if (!moduleRecord.evaluated) {
+                          return this.getCircularDependencyWrapper(module);
+                      }
+
+                      if (module) {
+                          return module.__defaultInterop ? module.default : module;
+                      }
+
+                      throw new LoaderError(FAILED_DEP, [resolvedDepId]);
+                  }),
+              )
+            : [];
 
         // W-10029836 - In the case where we could be instantiating multiple graphs at the same time lets make sure the module have not already been evaluated
         if (moduleRecord.evaluated) {
@@ -1157,8 +1181,12 @@ class ModuleRegistry {
         }
 
         // evaluates the module function
-        let moduleDefault = exporter(...depsMapped);
-
+        let moduleDefault;
+        try {
+            moduleDefault = exporter(...depsMapped);
+        } catch (e) {
+            throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+        }
         // value is returned from exporter, then we are not using named exports
         if (moduleDefault !== undefined) {
             moduleDefault = { default: moduleDefault };
@@ -1307,7 +1335,12 @@ class ModuleRegistry {
                 return moduleDef;
             })
             .catch((e) => {
-                this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
+                // Create module error marks for all errors caused by the loader
+                // Note: these marks do not include errors caused by invalid server responses or loader hooks
+                if (!(e instanceof LoaderError)) {
+                    this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
+                }
+
                 throw e;
             });
     }

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.11.0-alpha.4 */
+/* LWR Legacy Module Loader v0.11.0-alpha.7 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -118,6 +118,11 @@ const FAIL_HOOK_LOAD = Object.freeze({
     level: 0,
     message: 'Error loading "{0}" from hook',
 });
+const EXPORTER_ERROR = Object.freeze({
+    code: 3021,
+    level: 0,
+    message: 'Error evaluating module "{0}", error was {1}',
+});
 
 /* importMap errors */
 const BAD_IMPORT_MAP = Object.freeze({
@@ -416,7 +421,7 @@ function isResponseAPromise(
 
 async function evaluateLoadHookResponse(response, id) {
     return Promise.resolve().then(async () => {
-        if (!response.status) {
+        if (!response || !response.status) {
             throw new LoaderError(INVALID_LOADER_SERVICE_RESPONSE);
         }
         if (response.status !== 200) {
@@ -443,6 +448,10 @@ async function evaluateLoadHookResponse(response, id) {
             // TODO eval source maps for debugging
             eval(trusted.createScript(code));
         } catch (e) {
+            if (process.env.NODE_ENV !== 'production' && hasConsole) {
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                console.error(e);
+            }
             throw new LoaderError(FAIL_LOAD, [id]);
         }
 
@@ -510,6 +519,7 @@ function evaluateHandleStaleModuleHooks(
 // Loader: modules
 const LOADER_PREFIX = 'lwr.loader.';
 const MODULE_DEFINE = `${LOADER_PREFIX}module.define`;
+const MODULE_DYNAMIC_LOAD = `${LOADER_PREFIX}moduleRegistry.dynamicLoad`;
 const MODULE_FETCH = `${LOADER_PREFIX}module.fetch`;
 const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
 
@@ -564,6 +574,7 @@ const MODULE_ERROR = `${LOADER_PREFIX}module.error`;
 
 
 
+
 
 
 class ModuleRegistry {
@@ -575,8 +586,14 @@ class ModuleRegistry {
     }
 
     async load(id, importer) {
+        const metadata = importer ? { importer } : {};
+        this.profiler.logOperationStart({
+            id: MODULE_DYNAMIC_LOAD,
+            specifier: id,
+            metadata,
+        });
         const resolvedId = await this.resolve(id, importer);
-        const moduleRecord = this.getModuleRecord(resolvedId, id);
+        const moduleRecord = await this.getModuleRecord(resolvedId, id);
         if (moduleRecord.evaluated) {
             return moduleRecord.module;
         } else {
@@ -653,6 +670,8 @@ class ModuleRegistry {
                 // return the plain id if it is already defined && the resolvedUrl is NOT already in the module registry
                 if (
                     this.namedDefineRegistry.has(resolvedOrPlain) &&
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore has check right above
                     this.namedDefineRegistry.get(resolvedOrPlain).defined
                 ) {
                     const record = this.moduleRegistry.get(resolved);
@@ -706,7 +725,7 @@ class ModuleRegistry {
             defined: true,
         };
         if (mod && mod.external) {
-            // if module is "external", resolve the external promise to notify any dependees
+            // if module is "external", resolve the external promise to notify any dependencies
             mod.external.resolveExternal(moduleDef);
         }
 
@@ -834,7 +853,7 @@ class ModuleRegistry {
         return moduleRecord;
     }
 
-     getModuleRecord(resolvedId, id) {
+     async getModuleRecord(resolvedId, id) {
         // Look for an existing record
         const existingRecord = this.getExistingModuleRecord(resolvedId, id);
         if (existingRecord) {
@@ -845,7 +864,7 @@ class ModuleRegistry {
         // Create a new Module Record
         const instantiation = this.getModuleDef(resolvedId, id);
         const dependencyRecords = instantiation.then((moduleDef) => {
-            const dependencies = moduleDef.dependencies;
+            const dependencies = (moduleDef && moduleDef.dependencies) || [];
             // get dep and filter out exports
             const filtered = dependencies
                 .map((dep) => {
@@ -870,7 +889,9 @@ class ModuleRegistry {
         };
         this.moduleRegistry.set(resolvedId, newModuleRecord);
         this.storeModuleAlias(id, resolvedId);
-        return newModuleRecord;
+
+        // Wait for the dependencies to resolve the return the moduleRecord
+        return dependencyRecords.then(() => newModuleRecord);
     }
 
      storeModuleAlias(aliasId, resolvedId) {
@@ -881,8 +902,10 @@ 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
-                    console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                    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}`);
+                    }
                 }
             }
         }
@@ -931,37 +954,39 @@ class ModuleRegistry {
         const { exporter, dependencies } = await moduleRecord.instantiation;
         // The exports object automatically gets filled in by the exporter evaluation
         const exports = {};
-        const depsMapped = await Promise.all(
-            dependencies.map(async (dep) => {
-                if (dep === 'exports') {
-                    return exports;
-                }
-                const resolvedDepId = await this.resolve(dep);
-
-                const moduleRecord = this.moduleRegistry.get(resolvedDepId) ;
-                if (!moduleRecord) {
-                    throw new LoaderError(FAILED_DEP, [resolvedDepId]);
-                }
-
-                const module = moduleRecord.module;
-
-                /**
-                 * Circular dependencies are handled properly when named exports are used,
-                 * however, for default exports there is a bug: https://github.com/rollup/rollup/issues/3384
-                 *
-                 * The workaround below applies for circular dependencies (!moduleRecord.evaluated)
-                 */
-                if (!moduleRecord.evaluated) {
-                    return this.getCircularDependencyWrapper(module);
-                }
-
-                if (module) {
-                    return module.__defaultInterop ? module.default : module;
-                }
-
-                throw new LoaderError(FAILED_DEP, [resolvedDepId]);
-            }),
-        );
+        const depsMapped = dependencies
+            ? await Promise.all(
+                  dependencies.map(async (dep) => {
+                      if (dep === 'exports') {
+                          return exports;
+                      }
+                      const resolvedDepId = await this.resolve(dep);
+
+                      const moduleRecord = this.moduleRegistry.get(resolvedDepId) ;
+                      if (!moduleRecord) {
+                          throw new LoaderError(FAILED_DEP, [resolvedDepId]);
+                      }
+
+                      const module = moduleRecord.module;
+
+                      /**
+                       * Circular dependencies are handled properly when named exports are used,
+                       * however, for default exports there is a bug: https://github.com/rollup/rollup/issues/3384
+                       *
+                       * The workaround below applies for circular dependencies (!moduleRecord.evaluated)
+                       */
+                      if (!moduleRecord.evaluated) {
+                          return this.getCircularDependencyWrapper(module);
+                      }
+
+                      if (module) {
+                          return module.__defaultInterop ? module.default : module;
+                      }
+
+                      throw new LoaderError(FAILED_DEP, [resolvedDepId]);
+                  }),
+              )
+            : [];
 
         // W-10029836 - In the case where we could be instantiating multiple graphs at the same time lets make sure the module have not already been evaluated
         if (moduleRecord.evaluated) {
@@ -969,7 +994,12 @@ class ModuleRegistry {
         }
 
         // evaluates the module function
-        let moduleDefault = exporter(...depsMapped);
+        let moduleDefault;
+        try {
+            moduleDefault = exporter(...depsMapped);
+        } catch (e) {
+            throw new LoaderError(EXPORTER_ERROR, [moduleRecord.id, e.message || e]);
+        }
 
         // value is returned from exporter, then we are not using named exports
         if (moduleDefault !== undefined) {
@@ -1119,7 +1149,12 @@ class ModuleRegistry {
                 return moduleDef;
             })
             .catch((e) => {
-                this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
+                // Create module error marks for all errors caused by the loader
+                // Note: these marks do not include errors caused by invalid server responses or loader hooks
+                if (!(e instanceof LoaderError)) {
+                    this.profiler.logOperationStart({ id: MODULE_ERROR, specifier });
+                }
+
                 throw e;
             });
     }

package/package.json

@@ -5,7 +5,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.4",
+    "version": "0.11.0-alpha.7",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -62,16 +62,16 @@
     },
     "devDependencies": {
         "@locker/trusted-types": "0.20.0",
-        "@lwrjs/diagnostics": "0.11.0-alpha.4",
-        "@lwrjs/types": "0.11.0-alpha.4",
+        "@lwrjs/diagnostics": "0.11.0-alpha.7",
+        "@lwrjs/types": "0.11.0-alpha.7",
         "@rollup/plugin-node-resolve": "^15.0.2",
         "@rollup/plugin-sucrase": "^5.0.1",
         "@rollup/plugin-terser": "^0.4.3",
         "rollup": "^2.78.0"
     },
     "dependencies": {
-        "@lwrjs/client-modules": "0.11.0-alpha.4",
-        "@lwrjs/shared-utils": "0.11.0-alpha.4"
+        "@lwrjs/client-modules": "0.11.0-alpha.7",
+        "@lwrjs/shared-utils": "0.11.0-alpha.7"
     },
     "lwc": {
         "modules": [
@@ -91,5 +91,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "89a7e9815e0e381d9fd67212f0471d9a11f73985"
+    "gitHead": "872180fbd00df214ab91971d7ec80ba138a73756"
 }