@lwrjs/shared-utils 0.6.0-alpha.11 → 0.6.0-alpha.15

package/build/cjs/mappings.cjs

@@ -38,7 +38,10 @@ async function getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeP
   for (const moduleId of moduleIds) {
     const specifier = (0, import_identity.getSpecifier)(moduleId);
     if (!visitedCache.has(specifier)) {
-      const depth = {static: import_graph.GraphDepth.ALL, dynamic: 0};
+      const depth = {
+        static: runtimeEnvironment.format === "esm" ? import_graph.GraphDepth.NONE : import_graph.GraphDepth.ALL,
+        dynamic: runtimeEnvironment.format === "esm" ? 1 : 0
+      };
       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);
     }
@@ -57,15 +60,20 @@ async function toImportMetadata(moduleGraph, existingImportMetadata = {imports:
   }
   const rootMetadata = await normalizeImportMetadata(specifier, uri, definition, moduleRegistry, runtimeEnvironment, runtimeParams);
   let importMetadata = mergeImportMetadata(existingImportMetadata, rootMetadata);
-  const depSpecifiers = moduleGraph.graphs[0].static;
+  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];
-    if (!depUri) {
-      throw new Error("URI was not included in the graph for dependent: " + depSpecifier);
-    }
-    if (!depDef) {
-      throw new Error("Linked dependent module definition was not included in the graph: " + 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);
+      }
+      if (!depDef) {
+        throw new Error("Linked dependent module definition was not included in the graph: " + depSpecifier);
+      }
+    } else if (depMissing) {
+      continue;
     }
     if (!importMetadata.imports[depUri]) {
       const depMetadata = await normalizeImportMetadata((0, import_identity.getSpecifier)(depDef), depUri, depDef, moduleRegistry, runtimeEnvironment, runtimeParams);

package/build/es/mappings.js

@@ -13,8 +13,12 @@ export async function getImportMetadataMappings(moduleIds, runtimeEnvironment, r
         const specifier = getSpecifier(moduleId);
         // Check if we have already visited
         if (!visitedCache.has(specifier)) {
-            // Traversal of the Module Graph is done to get all the URLS for discoverable static dependencies.
-            const depth = { static: GraphDepth.ALL, dynamic: 0 };
+            // Traversal of the Module Graph is done to get all the URLs for discoverable dependencies.
+            // AMD gathers static imports while ESM gathers dynamic imports
+            const depth = {
+                static: runtimeEnvironment.format === 'esm' ? GraphDepth.NONE : GraphDepth.ALL,
+                dynamic: runtimeEnvironment.format === 'esm' ? 1 : 0,
+            };
             // eslint-disable-next-line no-await-in-loop
             const moduleGraph = await getModuleGraphs(specifier, 
             // include uris and linked definitions
@@ -52,16 +56,27 @@ export async function toImportMetadata(moduleGraph, existingImportMetadata = { i
     // 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);
-    // root module dependencies
-    const depSpecifiers = moduleGraph.graphs[0].static;
+    // root module dependencies:
+    //  - static for AMD; dynamic dependencies require a new mapping request
+    //  - dynamic for ESM; static dependencies are imported via fully qualified URLs
+    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];
-        if (!depUri) {
-            throw new Error('URI was not included in the graph for dependent: ' + 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);
+            }
+            if (!depDef) {
+                throw new Error('Linked dependent module definition was not included in the graph: ' + depSpecifier);
+            }
         }
-        if (!depDef) {
-            throw new Error('Linked dependent module definition was not included in the graph: ' + depSpecifier);
+        else if (depMissing) {
+            // Ignore variable dynamic imports
+            continue;
         }
         if (!importMetadata.imports[depUri]) {
             // eslint-disable-next-line no-await-in-loop

package/package.json

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