@lwrjs/shared-utils 0.7.0-alpha.1 → 0.7.0-alpha.4

package/build/cjs/graph.cjs

@@ -28,6 +28,7 @@ __export(exports, {
   getModuleGraphs: () => getModuleGraphs
 });
 var import_identity = __toModule(require("./identity.cjs"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_import_metadata = __toModule(require("./import-metadata.cjs"));
 var GraphDepth;
 (function(GraphDepth2) {
@@ -110,7 +111,9 @@ async function getModuleGraphs(specifier, options, moduleRegistry, defRegistry,
   };
   const moduleDef = isBundler(defRegistry) ? await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams) : await defRegistry.getModule(versionedModuleId, runtimeParams);
   if (!moduleDef) {
-    throw new Error("Missing module Definition");
+    throw (0, import_diagnostics.createSingleDiagnosticError)({
+      description: import_diagnostics.descriptions.UNRESOLVABLE.MODULE_ENTRY(versionedModuleId.specifier)
+    }, import_diagnostics.LwrUnresolvableError);
   }
   const flattened = [];
   await traverse(moduleDef, depth, flattened, 0, acc, defRegistry, runtimeEnvironment, runtimeParams);

package/build/cjs/identity.cjs

@@ -218,7 +218,10 @@ function getModuleIdentity(req) {
 }
 function getMappingIdentity(req) {
   const {specifiers} = req.params;
-  const moduleIds = explodeSpecifiers(specifiers);
+  const moduleIds = explodeSpecifiers(specifiers).map((obj) => ({
+    ...obj,
+    importer: req.query.importer
+  }));
   return {
     moduleIds
   };

package/build/cjs/mappings.cjs

@@ -36,7 +36,8 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
     index: {}
   };
   for (const moduleId of moduleIds) {
-    const specifier = (0, import_identity.getSpecifier)(moduleId);
+    const requestedSpecifier = (0, import_identity.getSpecifier)(moduleId);
+    const specifier = await getVersionedSpecifier(moduleId, moduleRegistry);
     if (!visitedCache.has(specifier)) {
       const depth = {
         static: runtimeEnvironment.format === "esm" ? import_graph.GraphDepth.NONE : import_graph.GraphDepth.ALL,
@@ -45,6 +46,14 @@ 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) {
+      const requestedSpecifierPlusImporter = `${requestedSpecifier}?importer=${moduleId.importer}`;
+      const specifiersArray = Object.values(importMetadata.imports).find((a) => a.includes(specifier));
+      if (!specifiersArray) {
+        throw new Error("Could not find: " + specifier + " in " + JSON.stringify(importMetadata.imports));
+      }
+      specifiersArray.push(requestedSpecifierPlusImporter);
+    }
   }
   return importMetadata;
 }
@@ -127,3 +136,12 @@ async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runti
   await Promise.all(promises);
   return index;
 }
+async function getVersionedSpecifier(moduleId, moduleRegistry) {
+  if (!moduleId.importer || moduleId.version) {
+    return (0, import_identity.getSpecifier)(moduleId);
+  }
+  const versionedModuleEntry = await moduleRegistry.getModuleEntry({
+    ...moduleId
+  });
+  return (0, import_identity.getSpecifier)(versionedModuleEntry);
+}

package/build/es/graph.js

@@ -1,4 +1,5 @@
 import { getSpecifier, getVersionedModuleId, isBundleDefinition } from './identity.js';
+import { LwrUnresolvableError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
 import { ModuleNameType } from './import-metadata.js';
 export var GraphDepth;
 (function (GraphDepth) {
@@ -116,7 +117,9 @@ options, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visited
         ? await defRegistry.getModuleBundle(versionedModuleId, runtimeEnvironment, runtimeParams)
         : await defRegistry.getModule(versionedModuleId, runtimeParams);
     if (!moduleDef) {
-        throw new Error('Missing module Definition');
+        throw createSingleDiagnosticError({
+            description: descriptions.UNRESOLVABLE.MODULE_ENTRY(versionedModuleId.specifier),
+        }, LwrUnresolvableError);
     }
     const flattened = [];
     await traverse(moduleDef, depth, flattened, 0, acc, defRegistry, runtimeEnvironment, runtimeParams);

package/build/es/identity.js

@@ -281,7 +281,10 @@ export function getModuleIdentity(req) {
 }
 export function getMappingIdentity(req) {
     const { specifiers } = req.params;
-    const moduleIds = explodeSpecifiers(specifiers);
+    const moduleIds = explodeSpecifiers(specifiers).map((obj) => ({
+        ...obj,
+        importer: req.query.importer,
+    }));
     return {
         moduleIds,
     };

package/build/es/mappings.js

@@ -10,7 +10,9 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
         index: {},
     };
     for (const moduleId of moduleIds) {
-        const specifier = getSpecifier(moduleId);
+        const requestedSpecifier = getSpecifier(moduleId);
+        // eslint-disable-next-line no-await-in-loop
+        const specifier = await getVersionedSpecifier(moduleId, moduleRegistry);
         // Check if we have already visited
         if (!visitedCache.has(specifier)) {
             // Traversal of the Module Graph is done to get all the URLs for discoverable dependencies.
@@ -27,6 +29,15 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
             // eslint-disable-next-line no-await-in-loop
             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) {
+            const requestedSpecifierPlusImporter = `${requestedSpecifier}?importer=${moduleId.importer}`;
+            const specifiersArray = Object.values(importMetadata.imports).find((a) => a.includes(specifier));
+            if (!specifiersArray) {
+                throw new Error('Could not find: ' + specifier + ' in ' + JSON.stringify(importMetadata.imports));
+            }
+            specifiersArray.push(requestedSpecifierPlusImporter);
+        }
     }
     return importMetadata;
 }
@@ -141,4 +152,13 @@ async function createIndex(specifiers, moduleRegistry, runtimeEnvironment, runti
     await Promise.all(promises);
     return index;
 }
+async function getVersionedSpecifier(moduleId, moduleRegistry) {
+    if (!moduleId.importer || moduleId.version) {
+        return getSpecifier(moduleId);
+    }
+    const versionedModuleEntry = await moduleRegistry.getModuleEntry({
+        ...moduleId,
+    });
+    return getSpecifier(versionedModuleEntry);
+}
 //# sourceMappingURL=mappings.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.7.0-alpha.1",
+    "version": "0.7.0-alpha.4",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,13 +43,13 @@
         "slugify": "^1.4.5"
     },
     "devDependencies": {
-        "@lwrjs/diagnostics": "0.7.0-alpha.1",
-        "@lwrjs/types": "0.7.0-alpha.1",
+        "@lwrjs/diagnostics": "0.7.0-alpha.4",
+        "@lwrjs/types": "0.7.0-alpha.4",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "24245670d6908d37e465f2316f92385df63d22aa"
+    "gitHead": "611f98b00c050ddb2f0aca529c5d9a0d6e55cc3d"
 }