@lwrjs/loader 0.5.9 → 0.6.0-alpha.2

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.5.9 */
+/* LWR ESM Module Loader v0.6.0-alpha.2 */
 /**
  * Simplified version of the AMD Import Metadata Resolver.
  * Just reads the ImportMetadata at construction time.
@@ -47,17 +47,26 @@ class ImportResolverLegacy {
     }
 }
 
-const endpoints = globalThis.LWR && globalThis.LWR.endpoints;
-const imports = (globalThis.LWR && globalThis.LWR.imports) || {};
-const index = (globalThis.LWR && globalThis.LWR.index) || {};
-const resolver = new ImportResolver({ imports, index });
-const resolverLegacy = new ImportResolverLegacy(globalThis.LWR && globalThis.LWR.importMappings);
+// Singleton state:
+let esmLoaderConfig;
+let resolver;
+let resolverLegacy;
+function init(config) {
+    // Save config from globalThis.LWR
+    esmLoaderConfig = config;
+    const { imports, index, importMappings } = config;
+    resolver = new ImportResolver({ imports, index });
+    resolverLegacy = new ImportResolverLegacy(importMappings);
+}
 function load(specifier, importer) {
     const uri = resolveUrl(specifier, importer);
     return import(uri);
 }
 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);
     if (uri) {
@@ -73,6 +82,7 @@ function resolveUrl(specifier, importer) {
     // do not alter the specifier if it is already a URL
     if (uri.indexOf('://') < 0 && !uri.startsWith('/')) {
         // add the specifier and importer to the default URI
+        const { endpoints } = esmLoaderConfig;
         if (endpoints && endpoints.uris && endpoints.uris.module) {
             uri = endpoints.uris.module + encodeURIComponent(specifier);
             if (importer) {
@@ -83,4 +93,4 @@ function resolveUrl(specifier, importer) {
     return uri;
 }
 
-export { load };
+export { init, load };

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.5.9 */
+/* LWR Module Loader v0.6.0-alpha.2 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -686,10 +686,11 @@ class ModuleRegistry {
             }
             const resolvedUrl = this.resolver.resolveLocal(resolvedOrPlain);
             if (resolvedUrl) {
-                // return the plain id IFF its already defined && the resolvedUrl is NOT already in the module registry
-                if (this.namedDefineRegistry.has(resolvedOrPlain)) {
+                // return the plain id if it is already defined && the resolvedUrl is NOT already in the module registry
+                if (this.namedDefineRegistry.has(resolvedOrPlain) &&
+                    this.namedDefineRegistry.get(resolvedOrPlain).defined) {
                     const record = this.moduleRegistry.get(resolvedUrl);
-                    if (!record || record.originalId !== resolvedOrPlain) {
+                    if (!record || !record.aliases.has(resolvedOrPlain)) {
                         return resolvedOrPlain;
                     }
                 }
@@ -790,6 +791,10 @@ class ModuleRegistry {
     getModuleRecord(resolvedId, id) {
         let moduleRecord = this.moduleRegistry.get(resolvedId);
         if (moduleRecord) {
+            // Make sure the original id is in the alias set
+            if (!moduleRecord.aliases.has(id)) {
+                moduleRecord.aliases.add(id);
+            }
             return moduleRecord;
         }
         const instantiation = this.getModuleDef(resolvedId, id);
@@ -809,7 +814,7 @@ class ModuleRegistry {
         });
         moduleRecord = {
             id: resolvedId,
-            originalId: id,
+            aliases: new Set([id]),
             module: Object.create(null),
             dependencyRecords,
             instantiation,

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.5.9 */
+/* LWR Legacy Module Loader v0.6.0-alpha.2 */
 const templateRegex = /\{([0-9]+)\}/g;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function templateString(template, args) {
@@ -474,15 +474,14 @@ class ModuleRegistry {
             }
             if (this.resolver) {
                 resolved = this.resolver.resolve(resolvedOrPlain, parentUrl);
-                // return the plain id IFF its already defined && the resolvedUrl is NOT already in the module registry
+                // return the plain id if it is already defined && the resolvedUrl is NOT already in the module registry
                 if (this.namedDefineRegistry.has(resolvedOrPlain) &&
                     this.namedDefineRegistry.get(resolvedOrPlain).defined) {
                     const record = this.moduleRegistry.get(resolved);
-                    if (!record || record.originalId !== resolvedOrPlain) {
+                    if (!record || !record.aliases.has(resolvedOrPlain)) {
                         return resolvedOrPlain;
                     }
                 }
-                // return resolved;
             }
             else {
                 resolved = resolvedOrPlain;
@@ -612,6 +611,10 @@ class ModuleRegistry {
     getModuleRecord(resolvedId, id) {
         let moduleRecord = this.moduleRegistry.get(resolvedId);
         if (moduleRecord) {
+            // Make sure the original id is in the alias set
+            if (!moduleRecord.aliases.has(id)) {
+                moduleRecord.aliases.add(id);
+            }
             return moduleRecord;
         }
         const instantiation = this.getModuleDef(resolvedId, id);
@@ -631,7 +634,7 @@ class ModuleRegistry {
         });
         moduleRecord = {
             id: resolvedId,
-            originalId: id,
+            aliases: new Set([id]),
             module: Object.create(null),
             dependencyRecords,
             instantiation,

package/package.json

@@ -5,7 +5,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.5.9",
+    "version": "0.6.0-alpha.2",
     "homepage": "https://lwr.dev/",
     "repository": {
         "type": "git",
@@ -54,12 +54,12 @@
         "build": "tsc -b; yarn build:shim && yarn build:loader && yarn build:shim:bundle && yarn build:shim:bundle:minify"
     },
     "devDependencies": {
-        "@lwrjs/compiler": "0.5.9",
-        "@lwrjs/types": "0.5.9",
+        "@lwrjs/compiler": "0.6.0-alpha.2",
+        "@lwrjs/types": "0.6.0-alpha.2",
         "rollup-plugin-terser": "^7.0.2"
     },
     "dependencies": {
-        "@lwrjs/shared-utils": "0.5.9"
+        "@lwrjs/shared-utils": "0.6.0-alpha.2"
     },
     "lwc": {
         "modules": [
@@ -76,5 +76,5 @@
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "0374b5f8c25aabf3a845e438a3171cbb0c229513"
+    "gitHead": "5b0f761312e566fdaeec26ac3dbb704f8421b1a9"
 }