@lwrjs/shared-utils 0.15.0-alpha.23 → 0.15.0-alpha.25

package/build/cjs/graph.cjs

@@ -118,9 +118,17 @@ async function getModuleGraphs(specifier, options, moduleRegistry, defRegistry,
   }
   const flattened = [];
   await traverse(moduleDef, depth, flattened, 0, acc, defRegistry, runtimeEnvironment, runtimeParams);
+  let extraFlat = new Set();
+  if (options.includeUris || options.includeLinkedDefinitions) {
+    const allDeps = flattened.reduce((all, node) => {
+      all.push(node.specifier, ...node.static, ...node.dynamicRefs);
+      return all;
+    }, []).filter((dep) => acc.has(dep));
+    extraFlat = new Set(allDeps);
+  }
   const uriMap = {};
   if (options.includeUris) {
-    for (const visitedSpecifier of acc.keys()) {
+    for (const visitedSpecifier of extraFlat.keys()) {
       const moduleId = await (0, import_identity.getVersionedModuleId)(visitedSpecifier, moduleRegistry, runtimeParams);
       const uri = await defRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
       uriMap[visitedSpecifier] = uri;
@@ -128,7 +136,7 @@ async function getModuleGraphs(specifier, options, moduleRegistry, defRegistry,
   }
   const linkedDefinitions = {};
   if (options.includeLinkedDefinitions) {
-    for (const visitedSpecifier of acc.keys()) {
+    for (const visitedSpecifier of extraFlat.keys()) {
       const versionedModuleId2 = await (0, import_identity.getVersionedModuleId)(visitedSpecifier, moduleRegistry, runtimeParams);
       const module2 = isBundler(defRegistry) ? await defRegistry.getModuleBundle(versionedModuleId2, runtimeEnvironment, runtimeParams) : await defRegistry.getLinkedModule(versionedModuleId2, runtimeEnvironment, runtimeParams);
       linkedDefinitions[visitedSpecifier] = module2;

package/build/es/graph.js

@@ -123,9 +123,22 @@ options, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visited
     }
     const flattened = [];
     await traverse(moduleDef, depth, flattened, 0, acc, defRegistry, runtimeEnvironment, runtimeParams);
+    let extraFlat = new Set();
+    if (options.includeUris || options.includeLinkedDefinitions) {
+        // Get a set of the root specifier and all dependencies
+        // DO NOT use the visited map for including URIs and linked defs because it includes
+        // entries from previous runs of getModuleGraphs() which belong to OTHER root specifiers
+        const allDeps = flattened
+            .reduce((all, node) => {
+            all.push(node.specifier, ...node.static, ...node.dynamicRefs);
+            return all;
+        }, [])
+            .filter((dep) => acc.has(dep));
+        extraFlat = new Set(allDeps);
+    }
     const uriMap = {};
     if (options.includeUris) {
-        for (const visitedSpecifier of acc.keys()) {
+        for (const visitedSpecifier of extraFlat.keys()) {
             // eslint-disable-next-line no-await-in-loop
             const moduleId = await getVersionedModuleId(visitedSpecifier, moduleRegistry, runtimeParams);
             // eslint-disable-next-line no-await-in-loop
@@ -135,7 +148,7 @@ options, moduleRegistry, defRegistry, runtimeEnvironment, runtimeParams, visited
     }
     const linkedDefinitions = {};
     if (options.includeLinkedDefinitions) {
-        for (const visitedSpecifier of acc.keys()) {
+        for (const visitedSpecifier of extraFlat.keys()) {
             // eslint-disable-next-line no-await-in-loop
             const versionedModuleId = await getVersionedModuleId(visitedSpecifier, moduleRegistry, runtimeParams);
             const module = isBundler(defRegistry)

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.23",
+    "version": "0.15.0-alpha.25",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -37,7 +37,7 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.15.0-alpha.23",
+        "@lwrjs/diagnostics": "0.15.0-alpha.25",
         "es-module-lexer": "^1.5.4",
         "fast-json-stable-stringify": "^2.1.0",
         "magic-string": "^0.30.9",
@@ -50,13 +50,13 @@
         "slugify": "^1.4.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.23",
+        "@lwrjs/types": "0.15.0-alpha.25",
         "@types/mime-types": "2.1.4",
         "@types/path-to-regexp": "^1.7.0",
-        "memfs": "^4.9.3"
+        "memfs": "^4.13.0"
     },
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "07592ebcbcfd739a9a8882b2f8f56da50332250d"
+    "gitHead": "0e430bd7cbd44f66c9a30d86d2dc69fa592af0ea"
 }