@lwrjs/shared-utils 0.12.0-alpha.26 → 0.12.0-alpha.28

package/build/cjs/mappings.cjs

@@ -25,11 +25,13 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   getImportMetadataMappings: () => getImportMetadataMappings,
+  isExternalFileSpecifier: () => isExternalFileSpecifier,
   isExternalSpecifier: () => isExternalSpecifier,
   toImportMetadata: () => toImportMetadata
 });
 var import_graph = __toModule(require("./graph.cjs"));
 var import_identity = __toModule(require("./identity.cjs"));
+var import_fs = __toModule(require("./fs.cjs"));
 async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler) {
   const visitedCache = new Map();
   let importMetadata = {
@@ -47,7 +49,7 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
       const moduleGraph = await (0, import_graph.getModuleGraphs)(specifier, {includeUris: true, includeLinkedDefinitions: true, depth}, moduleRegistry, runtimeEnvironment.bundle ? moduleBundler : moduleRegistry, runtimeEnvironment, runtimeParams, visitedCache);
       importMetadata = await toImportMetadata(moduleGraph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
     }
-    if (requestedSpecifier !== specifier) {
+    if (moduleId.importer && requestedSpecifier !== specifier) {
       const requestedSpecifierPlusImporter = `${requestedSpecifier}?importer=${moduleId.importer}`;
       const specifiersArray = Object.values(importMetadata.imports).find((a) => a.includes(specifier));
       if (!specifiersArray) {
@@ -62,25 +64,28 @@ async function toImportMetadata(moduleGraph, existingImportMetadata = {imports:
   const specifier = moduleGraph.graphs[0].specifier;
   const uri = moduleGraph.uriMap[specifier];
   const definition = moduleGraph.linkedDefinitions[specifier];
-  if (isExternalSpecifier(specifier, moduleRegistry.getConfig().bundleConfig)) {
-    return {imports: {}, index: {}};
-  }
   if (!uri) {
     throw new Error("URI was not included in the graph: " + specifier);
   }
   if (!definition) {
     throw new Error("Linked module definition was not included in the graph: " + specifier);
   }
+  if (isExternalSpecifier(specifier, moduleRegistry.getConfig().bundleConfig)) {
+    const externalMapping = {imports: {}, index: {}};
+    externalMapping.imports[uri] = [specifier];
+    externalMapping.index[specifier] = uri;
+    return externalMapping;
+  }
   const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, moduleRegistry, runtimeEnvironment, runtimeParams);
   let importMetadata = mergeImportMetadata(existingImportMetadata, rootMetadata);
   const depSpecifiers = runtimeEnvironment.format === "esm" ? moduleGraph.graphs[0].dynamicRefs : moduleGraph.graphs[0].static;
   for (const depSpecifier of depSpecifiers) {
-    const depUri = moduleGraph.uriMap[depSpecifier];
-    const depDef = moduleGraph.linkedDefinitions[depSpecifier];
-    const depMissing = !depUri || !depDef;
     if (isExternalSpecifier(depSpecifier, moduleRegistry.getConfig().bundleConfig)) {
       continue;
     }
+    const depUri = moduleGraph.uriMap[depSpecifier];
+    const depDef = moduleGraph.linkedDefinitions[depSpecifier];
+    const depMissing = !depUri || !depDef;
     if (depMissing && runtimeEnvironment.format !== "esm") {
       if (!depUri) {
         throw new Error("URI was not included in the graph for dependent: " + depSpecifier);
@@ -92,8 +97,11 @@ async function toImportMetadata(moduleGraph, existingImportMetadata = {imports:
       continue;
     }
     if (!importMetadata.imports[depUri]) {
-      const depMetadata = await normalizeImportMetadata((0, import_identity.getSpecifier)(depDef), depUri, depDef, moduleRegistry, runtimeEnvironment, runtimeParams);
-      importMetadata = mergeImportMetadata(importMetadata, depMetadata);
+      const depDefSpecifier = (0, import_identity.getSpecifier)(depDef);
+      if (!isExternalSpecifier(depDefSpecifier, moduleRegistry.getConfig().bundleConfig)) {
+        const depMetadata = await normalizeImportMetadata(depDefSpecifier, depUri, depDef, moduleRegistry, runtimeEnvironment, runtimeParams);
+        importMetadata = mergeImportMetadata(importMetadata, depMetadata);
+      }
     }
   }
   return importMetadata;
@@ -143,7 +151,7 @@ async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runti
   return index;
 }
 async function getVersionedSpecifier(moduleId, moduleRegistry, runtimeParams) {
-  if (!moduleId.importer || moduleId.version) {
+  if (moduleId.version) {
     return (0, import_identity.getSpecifier)(moduleId);
   }
   const versionedModuleEntry = await moduleRegistry.getModuleEntry({
@@ -153,5 +161,9 @@ async function getVersionedSpecifier(moduleId, moduleRegistry, runtimeParams) {
 }
 function isExternalSpecifier(id, bundleConfig) {
   const {specifier} = (0, import_identity.explodeSpecifier)(id);
-  return !!(bundleConfig?.external && bundleConfig.external[specifier]);
+  return !!(bundleConfig?.external && Object.prototype.hasOwnProperty.call(bundleConfig.external, specifier));
+}
+function isExternalFileSpecifier(id, bundleConfig) {
+  const {specifier} = (0, import_identity.explodeSpecifier)(id);
+  return !!(bundleConfig?.external && bundleConfig.external[specifier] && bundleConfig.external[specifier].startsWith(import_fs.PROTOCOL_FILE));
 }

package/build/es/mappings.d.ts

@@ -17,4 +17,5 @@ export declare function getImportMetadataMappings(moduleIds: AbstractModuleId[],
  */
 export declare function toImportMetadata(moduleGraph: FlattenedModuleGraphs, existingImportMetadata: ImportMetadata | undefined, moduleRegistry: ModuleRegistry, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams): Promise<ImportMetadata>;
 export declare function isExternalSpecifier(id: string, bundleConfig: BundleConfig): boolean;
+export declare function isExternalFileSpecifier(id: string, bundleConfig: BundleConfig): boolean;
 //# sourceMappingURL=mappings.d.ts.map

package/build/es/mappings.js

@@ -1,5 +1,6 @@
 import { getModuleGraphs, GraphDepth } from './graph.js';
 import { explodeSpecifier, getSpecifier, isBundleDefinition, VERSION_NOT_PROVIDED } from './identity.js';
+import { PROTOCOL_FILE } from './fs.js';
 /**
  * Get the Import Metadata for the LWR Mapping Api (https://rfcs.lwc.dev/rfcs/lwr/0000-mapping-api)
  */
@@ -30,7 +31,7 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
             importMetadata = await toImportMetadata(moduleGraph, importMetadata, moduleRegistry, runtimeEnvironment, runtimeParams);
         }
         // If the requested specifier is not the same as the versioned specifier, include the requested specifier's importer.
-        if (requestedSpecifier !== specifier) {
+        if (moduleId.importer && requestedSpecifier !== specifier) {
             const requestedSpecifierPlusImporter = `${requestedSpecifier}?importer=${moduleId.importer}`;
             const specifiersArray = Object.values(importMetadata.imports).find((a) => a.includes(specifier));
             if (!specifiersArray) {
@@ -58,16 +59,19 @@ export async function toImportMetadata(moduleGraph, existingImportMetadata = { i
     const specifier = moduleGraph.graphs[0].specifier;
     const uri = moduleGraph.uriMap[specifier];
     const definition = moduleGraph.linkedDefinitions[specifier];
-    if (isExternalSpecifier(specifier, moduleRegistry.getConfig().bundleConfig)) {
-        // Ignore Externals
-        return { imports: {}, index: {} };
-    }
     if (!uri) {
         throw new Error('URI was not included in the graph: ' + specifier);
     }
     if (!definition) {
         throw new Error('Linked module definition was not included in the graph: ' + specifier);
     }
+    // Add a single entry for an external
+    if (isExternalSpecifier(specifier, moduleRegistry.getConfig().bundleConfig)) {
+        const externalMapping = { imports: {}, index: {} };
+        externalMapping.imports[uri] = [specifier];
+        externalMapping.index[specifier] = uri;
+        return externalMapping;
+    }
     // Merge in the existing metadata with imports for the root specifier
     const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, moduleRegistry, runtimeEnvironment, runtimeParams);
     let importMetadata = mergeImportMetadata(existingImportMetadata, rootMetadata);
@@ -78,13 +82,13 @@ export async function toImportMetadata(moduleGraph, existingImportMetadata = { i
         ? moduleGraph.graphs[0].dynamicRefs
         : moduleGraph.graphs[0].static;
     for (const depSpecifier of depSpecifiers) {
-        const depUri = moduleGraph.uriMap[depSpecifier];
-        const depDef = moduleGraph.linkedDefinitions[depSpecifier];
-        const depMissing = !depUri || !depDef;
         if (isExternalSpecifier(depSpecifier, moduleRegistry.getConfig().bundleConfig)) {
             // Ignore Externals
             continue;
         }
+        const depUri = moduleGraph.uriMap[depSpecifier];
+        const depDef = moduleGraph.linkedDefinitions[depSpecifier];
+        const depMissing = !depUri || !depDef;
         if (depMissing && runtimeEnvironment.format !== 'esm') {
             if (!depUri) {
                 throw new Error('URI was not included in the graph for dependent: ' + depSpecifier);
@@ -98,9 +102,12 @@ export async function toImportMetadata(moduleGraph, existingImportMetadata = { i
             continue;
         }
         if (!importMetadata.imports[depUri]) {
-            // eslint-disable-next-line no-await-in-loop
-            const depMetadata = await normalizeImportMetadata(getSpecifier(depDef), depUri, depDef, moduleRegistry, runtimeEnvironment, runtimeParams);
-            importMetadata = mergeImportMetadata(importMetadata, depMetadata);
+            const depDefSpecifier = getSpecifier(depDef);
+            if (!isExternalSpecifier(depDefSpecifier, moduleRegistry.getConfig().bundleConfig)) {
+                // eslint-disable-next-line no-await-in-loop
+                const depMetadata = await normalizeImportMetadata(depDefSpecifier, depUri, depDef, moduleRegistry, runtimeEnvironment, runtimeParams);
+                importMetadata = mergeImportMetadata(importMetadata, depMetadata);
+            }
         }
     }
     return importMetadata;
@@ -162,7 +169,7 @@ async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runti
     return index;
 }
 async function getVersionedSpecifier(moduleId, moduleRegistry, runtimeParams) {
-    if (!moduleId.importer || moduleId.version) {
+    if (moduleId.version) {
         return getSpecifier(moduleId);
     }
     const versionedModuleEntry = await moduleRegistry.getModuleEntry({
@@ -172,6 +179,12 @@ async function getVersionedSpecifier(moduleId, moduleRegistry, runtimeParams) {
 }
 export function isExternalSpecifier(id, bundleConfig) {
     const { specifier } = explodeSpecifier(id);
-    return !!(bundleConfig?.external && bundleConfig.external[specifier]);
+    return !!(bundleConfig?.external && Object.prototype.hasOwnProperty.call(bundleConfig.external, specifier));
+}
+export function isExternalFileSpecifier(id, bundleConfig) {
+    const { specifier } = explodeSpecifier(id);
+    return !!(bundleConfig?.external &&
+        bundleConfig.external[specifier] &&
+        bundleConfig.external[specifier].startsWith(PROTOCOL_FILE));
 }
 //# sourceMappingURL=mappings.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.26",
+    "version": "0.12.0-alpha.28",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -37,7 +37,7 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.12.0-alpha.26",
+        "@lwrjs/diagnostics": "0.12.0-alpha.28",
         "es-module-lexer": "^1.3.0",
         "fast-json-stable-stringify": "^2.1.0",
         "magic-string": "^0.30.7",
@@ -50,12 +50,12 @@
         "slugify": "^1.4.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.26",
+        "@lwrjs/types": "0.12.0-alpha.28",
         "@types/mime-types": "2.1.4",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "56d2243c9149f1b70f106c43de0c574dcf02734c"
+    "gitHead": "5228219171bb2d28a4c7b32f1f6238e396ac3cbd"
 }