@ms-cloudpack/package-utilities 5.1.2 → 5.1.3

package/lib/addExportsMapEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addExportsMapEntry.d.ts","sourceRoot":"","sources":["../src/addExportsMapEntry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAG/F;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,OAAO,EAAE,kBAAkB,CAAC;IAE5B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC,OAAO,CAAC,CAkDlB"}
+{"version":3,"file":"addExportsMapEntry.d.ts","sourceRoot":"","sources":["../src/addExportsMapEntry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAG/F;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,OAAO,EAAE,kBAAkB,CAAC;IAE5B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GAC7C,OAAO,CAAC,OAAO,CAAC,CAoDlB"}

package/lib/addExportsMapEntry.js

@@ -10,34 +10,35 @@ export async function addExportsMapEntry(options, context) {
         packagePath,
         filePath: options.filePath || options.importPath || '',
     }, context);
+    // Only do work if a file path was found.
+    if (!filePath) {
+        return false;
+    }
     // Create a local for casting.
     const localExports = exports;
-    // Only do work if a file path was provided.
-    if (filePath) {
-        // If this is the only entry we're adding, set it to a string to minimize the exports map.
-        if (!typesPath &&
-            !sourcePath &&
-            condition === 'default' &&
-            (!localExports[importPath] || typeof localExports[importPath] === 'string')) {
-            localExports[importPath] = filePath;
+    // If this is the only entry we're adding, set it to a string to minimize the exports map.
+    if (!typesPath &&
+        !sourcePath &&
+        condition === 'default' &&
+        (!localExports[importPath] || typeof localExports[importPath] === 'string')) {
+        localExports[importPath] = filePath;
+    }
+    else {
+        let exportsEntry = (localExports[importPath] ??= {});
+        // Promote string-based exports into objects with default conditions.
+        if (typeof exportsEntry === 'string') {
+            exportsEntry = exports[importPath] = { default: exportsEntry };
+        }
+        if (typesPath) {
+            exportsEntry['types'] = typesPath;
         }
-        else {
-            let exportsEntry = (localExports[importPath] ??= {});
-            // Promote string-based exports into objects with default conditions.
-            if (typeof exportsEntry === 'string') {
-                exportsEntry = exports[importPath] = { default: exportsEntry };
-            }
-            if (typesPath) {
-                exportsEntry['types'] = typesPath;
-            }
-            if (sourcePath) {
-                exportsEntry['source'] = sourcePath;
-            }
-            // Add the entry for the condition.
-            exportsEntry[condition] = filePath;
+        if (sourcePath) {
+            exportsEntry['source'] = sourcePath;
         }
+        // Add the entry for the condition.
+        exportsEntry[condition] = filePath;
     }
-    return !!filePath;
+    return true;
 }
 function makeSafeImportKey(key) {
     if (!key || key === '' || key === '.') {

package/lib/addExportsMapEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"addExportsMapEntry.js","sourceRoot":"","sources":["../src/addExportsMapEntry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAyCrE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAkC,EAClC,OAA8C;IAE9C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;IAChE,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;IAChE,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,GAChF,GAAG,MAAM,iBAAiB,CACzB;QACE,WAAW;QACX,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE;KACvD,EACD,OAAO,CACR,CAAC;IAEF,8BAA8B;IAC9B,MAAM,YAAY,GAAG,OAA0D,CAAC;IAEhF,4CAA4C;IAC5C,IAAI,QAAQ,EAAE;QACZ,0FAA0F;QAC1F,IACE,CAAC,SAAS;YACV,CAAC,UAAU;YACX,SAAS,KAAK,SAAS;YACvB,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,OAAO,YAAY,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC,EAC3E;YACA,YAAY,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;SACrC;aAAM;YACL,IAAI,YAAY,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;YAErD,qEAAqE;YACrE,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;gBACpC,YAAY,GAAI,OAAkD,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;aAC5G;YAED,IAAI,SAAS,EAAE;gBACb,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;aACnC;YAED,IAAI,UAAU,EAAE;gBACd,YAAY,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;aACrC;YAED,mCAAmC;YACnC,YAAY,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;SACpC;KACF;IAED,OAAO,CAAC,CAAC,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,GAAG,EAAE;QACrC,OAAO,GAAG,CAAC;KACZ;IAED,4CAA4C;IAC5C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACvB,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;KACjB;IAED,6CAA6C;IAC7C,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACzB,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;KAClB;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import { findFileInPackage } from './findFileInPackage.js';\nimport type { PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/bundler-types';\nimport { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * Options fo addExportsMapEntry.\n */\nexport interface AddExportsMapEntryOptions {\n  /**\n   * The exports map to add the entry to.\n   */\n  exports: PackageJsonExports;\n\n  /**\n   * The package path to add the entry for. This is used to resolve relative paths.\n   */\n  packagePath: string;\n\n  /**\n   * The import path to add the entry for. This is used as the key in the exports map. Defaults\n   * to \".\" being the package import.\n   */\n  importPath?: string;\n\n  /**\n   * The relative path to the physical file location, representing the \"key\" in the exports map. Can be a partial\n   * location, in which case we will attempt to search for the file and associated source/d.ts files. Defaults to\n   * assuming `index.js`.\n   */\n  filePath?: string;\n\n  /**\n   * Optional types path. If not provided, types will be discovered for internal packages that have source files.\n   * This is useful mainly when converting the default import from a package.json that has explicit typings listed.\n   */\n  typesPath?: string;\n\n  /**\n   * The condition to add the entry for. (Example: \"import\", \"require\", \"browser\", \"types\") Defaults to \"default\"\n   */\n  condition?: string;\n}\n\n/**\n * Given an exports map and details about an import path, adds the entry.\n */\nexport async function addExportsMapEntry(\n  options: AddExportsMapEntryOptions,\n  context: { packages: PackageDefinitionsCache },\n): Promise<boolean> {\n  const { exports, packagePath, condition = 'default' } = options;\n  const importPath = makeSafeImportKey(options.importPath || '.');\n  const {\n    filePath,\n    sourcePath,\n    typesPath = options.typesPath ? safeRelativePath(options.typesPath) : undefined,\n  } = await findFileInPackage(\n    {\n      packagePath,\n      filePath: options.filePath || options.importPath || '',\n    },\n    context,\n  );\n\n  // Create a local for casting.\n  const localExports = exports as Record<string, string | Record<string, string>>;\n\n  // Only do work if a file path was provided.\n  if (filePath) {\n    // If this is the only entry we're adding, set it to a string to minimize the exports map.\n    if (\n      !typesPath &&\n      !sourcePath &&\n      condition === 'default' &&\n      (!localExports[importPath] || typeof localExports[importPath] === 'string')\n    ) {\n      localExports[importPath] = filePath;\n    } else {\n      let exportsEntry = (localExports[importPath] ??= {});\n\n      // Promote string-based exports into objects with default conditions.\n      if (typeof exportsEntry === 'string') {\n        exportsEntry = (exports as Record<string, Record<string, string>>)[importPath] = { default: exportsEntry };\n      }\n\n      if (typesPath) {\n        exportsEntry['types'] = typesPath;\n      }\n\n      if (sourcePath) {\n        exportsEntry['source'] = sourcePath;\n      }\n\n      // Add the entry for the condition.\n      exportsEntry[condition] = filePath;\n    }\n  }\n\n  return !!filePath;\n}\n\nfunction makeSafeImportKey(key: string) {\n  if (!key || key === '' || key === '.') {\n    return '.';\n  }\n\n  // if the key starts with a slash, add a dot\n  if (key.startsWith('/')) {\n    key = '.' + key;\n  }\n\n  // if the key doesn't start with \"./\", add it\n  if (!key.startsWith('./')) {\n    key = './' + key;\n  }\n\n  return key;\n}\n"]}
+{"version":3,"file":"addExportsMapEntry.js","sourceRoot":"","sources":["../src/addExportsMapEntry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAyCrE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAkC,EAClC,OAA8C;IAE9C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;IAChE,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;IAChE,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,GAChF,GAAG,MAAM,iBAAiB,CACzB;QACE,WAAW;QACX,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE;KACvD,EACD,OAAO,CACR,CAAC;IAEF,yCAAyC;IACzC,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,KAAK,CAAC;KACd;IAED,8BAA8B;IAC9B,MAAM,YAAY,GAAG,OAA0D,CAAC;IAEhF,0FAA0F;IAC1F,IACE,CAAC,SAAS;QACV,CAAC,UAAU;QACX,SAAS,KAAK,SAAS;QACvB,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,OAAO,YAAY,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC,EAC3E;QACA,YAAY,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;KACrC;SAAM;QACL,IAAI,YAAY,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QAErD,qEAAqE;QACrE,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;YACpC,YAAY,GAAI,OAAkD,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;SAC5G;QAED,IAAI,SAAS,EAAE;YACb,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;SACnC;QAED,IAAI,UAAU,EAAE;YACd,YAAY,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;SACrC;QAED,mCAAmC;QACnC,YAAY,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;KACpC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,GAAG,EAAE;QACrC,OAAO,GAAG,CAAC;KACZ;IAED,4CAA4C;IAC5C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACvB,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;KACjB;IAED,6CAA6C;IAC7C,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACzB,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;KAClB;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import { findFileInPackage } from './findFileInPackage.js';\nimport type { PackageDefinitionsCache, PackageJsonExports } from '@ms-cloudpack/bundler-types';\nimport { safeRelativePath } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * Options fo addExportsMapEntry.\n */\nexport interface AddExportsMapEntryOptions {\n  /**\n   * The exports map to add the entry to.\n   */\n  exports: PackageJsonExports;\n\n  /**\n   * The package path to add the entry for. This is used to resolve relative paths.\n   */\n  packagePath: string;\n\n  /**\n   * The import path to add the entry for. This is used as the key in the exports map. Defaults\n   * to \".\" being the package import.\n   */\n  importPath?: string;\n\n  /**\n   * The relative path to the physical file location, representing the \"key\" in the exports map. Can be a partial\n   * location, in which case we will attempt to search for the file and associated source/d.ts files. Defaults to\n   * assuming `index.js`.\n   */\n  filePath?: string;\n\n  /**\n   * Optional types path. If not provided, types will be discovered for internal packages that have source files.\n   * This is useful mainly when converting the default import from a package.json that has explicit typings listed.\n   */\n  typesPath?: string;\n\n  /**\n   * The condition to add the entry for. (Example: \"import\", \"require\", \"browser\", \"types\") Defaults to \"default\"\n   */\n  condition?: string;\n}\n\n/**\n * Given an exports map and details about an import path, adds the entry.\n */\nexport async function addExportsMapEntry(\n  options: AddExportsMapEntryOptions,\n  context: { packages: PackageDefinitionsCache },\n): Promise<boolean> {\n  const { exports, packagePath, condition = 'default' } = options;\n  const importPath = makeSafeImportKey(options.importPath || '.');\n  const {\n    filePath,\n    sourcePath,\n    typesPath = options.typesPath ? safeRelativePath(options.typesPath) : undefined,\n  } = await findFileInPackage(\n    {\n      packagePath,\n      filePath: options.filePath || options.importPath || '',\n    },\n    context,\n  );\n\n  // Only do work if a file path was found.\n  if (!filePath) {\n    return false;\n  }\n\n  // Create a local for casting.\n  const localExports = exports as Record<string, string | Record<string, string>>;\n\n  // If this is the only entry we're adding, set it to a string to minimize the exports map.\n  if (\n    !typesPath &&\n    !sourcePath &&\n    condition === 'default' &&\n    (!localExports[importPath] || typeof localExports[importPath] === 'string')\n  ) {\n    localExports[importPath] = filePath;\n  } else {\n    let exportsEntry = (localExports[importPath] ??= {});\n\n    // Promote string-based exports into objects with default conditions.\n    if (typeof exportsEntry === 'string') {\n      exportsEntry = (exports as Record<string, Record<string, string>>)[importPath] = { default: exportsEntry };\n    }\n\n    if (typesPath) {\n      exportsEntry['types'] = typesPath;\n    }\n\n    if (sourcePath) {\n      exportsEntry['source'] = sourcePath;\n    }\n\n    // Add the entry for the condition.\n    exportsEntry[condition] = filePath;\n  }\n\n  return true;\n}\n\nfunction makeSafeImportKey(key: string) {\n  if (!key || key === '' || key === '.') {\n    return '.';\n  }\n\n  // if the key starts with a slash, add a dot\n  if (key.startsWith('/')) {\n    key = '.' + key;\n  }\n\n  // if the key doesn't start with \"./\", add it\n  if (!key.startsWith('./')) {\n    key = './' + key;\n  }\n\n  return key;\n}\n"]}

package/lib/createResolveMap/addLinkedEntryDependencies.d.ts

@@ -4,7 +4,6 @@ import type { ResolveMapEntry } from '../types/ResolveMapEntry.js';
 /**
  * Given a linkedEntry, iterates through dependencies to ensure they are added to the packageMap,
  * preferring packageMap dependencies over linkedMap dependencies.
- * @param options
  */
 export declare function addLinkedEntryDependencies(options: {
     appMap: PackageMap;

package/lib/createResolveMap/addLinkedEntryDependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addLinkedEntryDependencies.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/addLinkedEntryDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;;;GAIG;AAEH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE;IACP,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,UAAU,CAAC;IACpB,WAAW,EAAE,eAAe,CAAC;CAC9B,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,iBAsFF"}
+{"version":3,"file":"addLinkedEntryDependencies.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/addLinkedEntryDependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE;IACP,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,UAAU,CAAC;IACpB,WAAW,EAAE,eAAe,CAAC;CAC9B,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,iBAoFF"}

package/lib/createResolveMap/addLinkedEntryDependencies.js

@@ -2,7 +2,6 @@ import { satisfies } from 'semver';
 /**
  * Given a linkedEntry, iterates through dependencies to ensure they are added to the packageMap,
  * preferring packageMap dependencies over linkedMap dependencies.
- * @param options
  */
 export async function addLinkedEntryDependencies(options, context) {
     const { appMap, linkMap, linkedEntry } = options;
@@ -16,63 +15,58 @@ export async function addLinkedEntryDependencies(options, context) {
         }
     }
     while (entriesToVisit.length) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked the length
         const entry = entriesToVisit.pop();
-        if (entry) {
-            const { name, version, dependencies } = entry;
-            const linkDefinition = await packages.get(entry.path);
-            const versionRequirements = {
-                ...(linkDefinition?.dependencies || {}),
-                ...(linkDefinition?.peerDependencies || {}),
-            };
-            // Iterate through the dependencies of the linked package.
-            if (dependencies) {
-                for (const [dependencyName, linkedDependencyVersion] of Object.entries(dependencies)) {
-                    const appVersions = appMap[dependencyName];
-                    const versionRequirement = versionRequirements[dependencyName];
-                    let isSatisfied = false;
-                    if (!appVersions) {
-                        // The app does not have any version of this dependency, we need to bring over the version
-                        // used by the linkedEntry.
-                        const dependencyEntry = linkMap[dependencyName]?.[linkedDependencyVersion];
-                        appMap[dependencyName] = { [linkedDependencyVersion]: dependencyEntry };
+        const { name, version, dependencies } = entry;
+        const linkDefinition = await packages.get(entry.path);
+        const versionRequirements = {
+            ...(linkDefinition?.dependencies || {}),
+            ...(linkDefinition?.peerDependencies || {}),
+        };
+        // Iterate through the dependencies of the linked package.
+        for (const [dependencyName, linkedDependencyVersion] of Object.entries(dependencies)) {
+            const versionRequirement = versionRequirements[dependencyName];
+            if (!versionRequirement) {
+                continue;
+            }
+            const appVersions = appMap[dependencyName];
+            if (!appVersions) {
+                // The app does not have any version of this dependency, so we need to bring over the version
+                // used by the linkedEntry.
+                const dependencyEntry = linkMap[dependencyName]?.[linkedDependencyVersion];
+                if (dependencyEntry) {
+                    appMap[dependencyName] = { [linkedDependencyVersion]: dependencyEntry };
+                    dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };
+                    // Recurse through the dependency's dependencies.
+                    enqueue(dependencyEntry);
+                }
+            }
+            else {
+                // We have one or more versions of this dependency already. If a sufficient version
+                // of the dependency is already in the appMap, we we just need to update the linkedEntry's
+                // dependency and the dependency's requiredBy record for the parent.
+                const appDependencyVersions = Object.values(appVersions);
+                if (appDependencyVersions.length === 1 && !appDependencyVersions[0]?.isExternal) {
+                    continue;
+                }
+                // See if an existing version of the dependency satisfies the semver.
+                const appDependencyEntry = appDependencyVersions.find((e) => e.isLinked || satisfies(e.version, versionRequirement));
+                if (appDependencyEntry) {
+                    // If the dependency satisfies the semver, use that!
+                    entry.dependencies[dependencyName] = appDependencyEntry.version;
+                    appDependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;
+                    enqueue(appDependencyEntry);
+                }
+                else {
+                    // We have at least one version of this dependency but nothing satisfies the requirement.
+                    // We need to introduce a duplicate. During the final pass, we will remove non-required deps.
+                    const dependencyEntry = Object.values(linkMap[dependencyName] || {}).find((e) => satisfies(e.version, versionRequirement));
+                    if (dependencyEntry) {
+                        appVersions[dependencyEntry.version] = dependencyEntry;
+                        entry.dependencies[dependencyName] = linkedDependencyVersion;
                         dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };
                         // Recursive through the dependency's dependencies.
                         enqueue(dependencyEntry);
-                        isSatisfied = true;
-                    }
-                    else {
-                        // We have at least 1 or more versions of this dependency already. If a sufficient version
-                        // of the dependency is already in the appMap, we we just need to update the linkedEntry's
-                        // dependency and the dependency's requiredBy record for the parent.
-                        const appDependencyVersions = Object.values(appMap[dependencyName]);
-                        if (appDependencyVersions.length === 1 && !appDependencyVersions[0].isExternal) {
-                            continue;
-                        }
-                        for (const appDependencyEntry of appDependencyVersions) {
-                            // If the dependency satisfies the semver, use that!
-                            if (appDependencyEntry.isLinked || satisfies(appDependencyEntry.version, versionRequirement)) {
-                                entry.dependencies[dependencyName] = appDependencyEntry.version;
-                                appDependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;
-                                enqueue(appDependencyEntry);
-                                isSatisfied = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!isSatisfied) {
-                        // We have at least 1 version of this dependency but nothing satisfies the requirement. We
-                        // need to introduce a duplicate. During the final pass, we will remove non-required deps.
-                        const dependencyEntries = linkMap[dependencyName];
-                        for (const dependencyEntry of Object.values(dependencyEntries)) {
-                            if (satisfies(dependencyEntry.version, versionRequirement)) {
-                                appMap[dependencyName][dependencyEntry.version] = dependencyEntry;
-                                entry.dependencies[dependencyName] = linkedDependencyVersion;
-                                dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };
-                                // Recursive through the dependency's dependencies.
-                                enqueue(dependencyEntry);
-                                break;
-                            }
-                        }
                     }
                 }
             }

package/lib/createResolveMap/addLinkedEntryDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"addLinkedEntryDependencies.js","sourceRoot":"","sources":["../../src/createResolveMap/addLinkedEntryDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { satisfies } from 'semver';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\n\n/**\n * Given a linkedEntry, iterates through dependencies to ensure they are added to the packageMap,\n * preferring packageMap dependencies over linkedMap dependencies.\n * @param options\n */\n\nexport async function addLinkedEntryDependencies(\n  options: {\n    appMap: PackageMap;\n    linkMap: PackageMap;\n    linkedEntry: ResolveMapEntry;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { appMap, linkMap, linkedEntry } = options;\n  const { packages } = context;\n  const visitedEntryPaths = new Set<string>(linkedEntry.path);\n  const entriesToVisit: ResolveMapEntry[] = [linkedEntry];\n\n  function enqueue(newEntry: ResolveMapEntry) {\n    if (!visitedEntryPaths.has(newEntry.path)) {\n      visitedEntryPaths.add(newEntry.path);\n      entriesToVisit.push(newEntry);\n    }\n  }\n\n  while (entriesToVisit.length) {\n    const entry = entriesToVisit.pop();\n\n    if (entry) {\n      const { name, version, dependencies } = entry;\n\n      const linkDefinition = await packages.get(entry.path);\n      const versionRequirements = {\n        ...(linkDefinition?.dependencies || {}),\n        ...(linkDefinition?.peerDependencies || {}),\n      };\n\n      // Iterate through the dependencies of the linked package.\n      if (dependencies) {\n        for (const [dependencyName, linkedDependencyVersion] of Object.entries(dependencies)) {\n          const appVersions = appMap[dependencyName];\n          const versionRequirement = versionRequirements[dependencyName] as string;\n          let isSatisfied = false;\n\n          if (!appVersions) {\n            // The app does not have any version of this dependency, we need to bring over the version\n            // used by the linkedEntry.\n            const dependencyEntry = linkMap[dependencyName]?.[linkedDependencyVersion];\n            appMap[dependencyName] = { [linkedDependencyVersion]: dependencyEntry };\n            dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };\n\n            // Recursive through the dependency's dependencies.\n            enqueue(dependencyEntry);\n            isSatisfied = true;\n          } else {\n            // We have at least 1 or more versions of this dependency already. If a sufficient version\n            // of the dependency is already in the appMap, we we just need to update the linkedEntry's\n            // dependency and the dependency's requiredBy record for the parent.\n            const appDependencyVersions = Object.values(appMap[dependencyName]);\n\n            if (appDependencyVersions.length === 1 && !appDependencyVersions[0].isExternal) {\n              continue;\n            }\n\n            for (const appDependencyEntry of appDependencyVersions) {\n              // If the dependency satisfies the semver, use that!\n              if (appDependencyEntry.isLinked || satisfies(appDependencyEntry.version, versionRequirement)) {\n                entry.dependencies[dependencyName] = appDependencyEntry.version;\n                appDependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n                enqueue(appDependencyEntry);\n                isSatisfied = true;\n                break;\n              }\n            }\n          }\n\n          if (!isSatisfied) {\n            // We have at least 1 version of this dependency but nothing satisfies the requirement. We\n            // need to introduce a duplicate. During the final pass, we will remove non-required deps.\n            const dependencyEntries = linkMap[dependencyName];\n\n            for (const dependencyEntry of Object.values(dependencyEntries)) {\n              if (satisfies(dependencyEntry.version, versionRequirement)) {\n                appMap[dependencyName][dependencyEntry.version] = dependencyEntry;\n                entry.dependencies[dependencyName] = linkedDependencyVersion;\n                dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };\n                // Recursive through the dependency's dependencies.\n                enqueue(dependencyEntry);\n                break;\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"addLinkedEntryDependencies.js","sourceRoot":"","sources":["../../src/createResolveMap/addLinkedEntryDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { satisfies } from 'semver';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\n\n/**\n * Given a linkedEntry, iterates through dependencies to ensure they are added to the packageMap,\n * preferring packageMap dependencies over linkedMap dependencies.\n */\nexport async function addLinkedEntryDependencies(\n  options: {\n    appMap: PackageMap;\n    linkMap: PackageMap;\n    linkedEntry: ResolveMapEntry;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { appMap, linkMap, linkedEntry } = options;\n  const { packages } = context;\n  const visitedEntryPaths = new Set<string>(linkedEntry.path);\n  const entriesToVisit: ResolveMapEntry[] = [linkedEntry];\n\n  function enqueue(newEntry: ResolveMapEntry) {\n    if (!visitedEntryPaths.has(newEntry.path)) {\n      visitedEntryPaths.add(newEntry.path);\n      entriesToVisit.push(newEntry);\n    }\n  }\n\n  while (entriesToVisit.length) {\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked the length\n    const entry = entriesToVisit.pop()!;\n\n    const { name, version, dependencies } = entry;\n\n    const linkDefinition = await packages.get(entry.path);\n    const versionRequirements = {\n      ...(linkDefinition?.dependencies || {}),\n      ...(linkDefinition?.peerDependencies || {}),\n    };\n\n    // Iterate through the dependencies of the linked package.\n    for (const [dependencyName, linkedDependencyVersion] of Object.entries(dependencies)) {\n      const versionRequirement = versionRequirements[dependencyName];\n      if (!versionRequirement) {\n        continue;\n      }\n\n      const appVersions = appMap[dependencyName];\n\n      if (!appVersions) {\n        // The app does not have any version of this dependency, so we need to bring over the version\n        // used by the linkedEntry.\n        const dependencyEntry = linkMap[dependencyName]?.[linkedDependencyVersion];\n        if (dependencyEntry) {\n          appMap[dependencyName] = { [linkedDependencyVersion]: dependencyEntry };\n          dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };\n\n          // Recurse through the dependency's dependencies.\n          enqueue(dependencyEntry);\n        }\n      } else {\n        // We have one or more versions of this dependency already. If a sufficient version\n        // of the dependency is already in the appMap, we we just need to update the linkedEntry's\n        // dependency and the dependency's requiredBy record for the parent.\n        const appDependencyVersions = Object.values(appVersions);\n\n        if (appDependencyVersions.length === 1 && !appDependencyVersions[0]?.isExternal) {\n          continue;\n        }\n\n        // See if an existing version of the dependency satisfies the semver.\n        const appDependencyEntry = appDependencyVersions.find(\n          (e) => e.isLinked || satisfies(e.version, versionRequirement),\n        );\n\n        if (appDependencyEntry) {\n          // If the dependency satisfies the semver, use that!\n          entry.dependencies[dependencyName] = appDependencyEntry.version;\n          appDependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n          enqueue(appDependencyEntry);\n        } else {\n          // We have at least one version of this dependency but nothing satisfies the requirement.\n          // We need to introduce a duplicate. During the final pass, we will remove non-required deps.\n          const dependencyEntry = Object.values(linkMap[dependencyName] || {}).find((e) =>\n            satisfies(e.version, versionRequirement),\n          );\n          if (dependencyEntry) {\n            appVersions[dependencyEntry.version] = dependencyEntry;\n            entry.dependencies[dependencyName] = linkedDependencyVersion;\n            dependencyEntry.requiredBy = { [`${name}@${version}`]: versionRequirement };\n            // Recursive through the dependency's dependencies.\n            enqueue(dependencyEntry);\n          }\n        }\n      }\n    }\n  }\n}\n"]}

package/lib/createResolveMap/convertToResolveMap.d.ts

@@ -5,6 +5,6 @@ import type { PackageMap } from '../types/PackageMap.js';
  */
 export declare function convertToResolveMap(options: {
     appMap: PackageMap;
-    paths: string[];
+    rootPaths: string[];
 }): ResolveMap;
 //# sourceMappingURL=convertToResolveMap.d.ts.map

package/lib/createResolveMap/convertToResolveMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertToResolveMap.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/convertToResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,UAAU,CAsBhG"}
+{"version":3,"file":"convertToResolveMap.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/convertToResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,UAAU,CAuBpG"}

package/lib/createResolveMap/convertToResolveMap.js

@@ -3,12 +3,12 @@ import { entrySorter } from './entrySorter.js';
  * Given a PackageMap and all root paths (appPath and linked paths), returns a ResolveMap.
  */
 export function convertToResolveMap(options) {
-    const { paths, appMap } = options;
+    const { rootPaths, appMap } = options;
     const resolveMap = {};
     for (const [packageName, packageEntries] of Object.entries(appMap)) {
         // Filter to root packages and packages which are required by other packages.
         const sortedPackageEntries = Object.values(packageEntries)
-            .filter((e) => paths.indexOf(e.path) >= 0 || Object.keys(e.requiredBy).length)
+            .filter((e) => rootPaths.includes(e.path) || Object.keys(e.requiredBy).length)
             .sort(entrySorter);
         // Get the sorted package entries based on the most to least requiredBy references. This
         // ends up reducing the size of the resolve map by minimizing scoped cases.

package/lib/createResolveMap/convertToResolveMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertToResolveMap.js","sourceRoot":"","sources":["../../src/createResolveMap/convertToResolveMap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAgD;IAClF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,UAAU,GAAe,EAAE,CAAC;IAElC,KAAK,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAClE,6EAA6E;QAC7E,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;aACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;aAC7E,IAAI,CAAC,WAAW,CAAC,CAAC;QACrB,wFAAwF;QACxF,2EAA2E;QAC3E,IAAI,oBAAoB,CAAC,MAAM,EAAE;YAC/B,MAAM,KAAK,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YAElE,wDAAwD;YACxD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnC,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aACrG;SACF;KACF;IAED,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import type { ResolveMap } from '../types/ResolveMap.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { entrySorter } from './entrySorter.js';\n\n/**\n * Given a PackageMap and all root paths (appPath and linked paths), returns a ResolveMap.\n */\nexport function convertToResolveMap(options: { appMap: PackageMap; paths: string[] }): ResolveMap {\n  const { paths, appMap } = options;\n  const resolveMap: ResolveMap = {};\n\n  for (const [packageName, packageEntries] of Object.entries(appMap)) {\n    // Filter to root packages and packages which are required by other packages.\n    const sortedPackageEntries = Object.values(packageEntries)\n      .filter((e) => paths.indexOf(e.path) >= 0 || Object.keys(e.requiredBy).length)\n      .sort(entrySorter);\n    // Get the sorted package entries based on the most to least requiredBy references. This\n    // ends up reducing the size of the resolve map by minimizing scoped cases.\n    if (sortedPackageEntries.length) {\n      const entry = (resolveMap[packageName] = sortedPackageEntries[0]);\n\n      // Update scoped versions (version to resolve map entry)\n      if (sortedPackageEntries.length > 1) {\n        entry.scopedVersions = Object.fromEntries(sortedPackageEntries.slice(1).map((e) => [e.version, e]));\n      }\n    }\n  }\n\n  return resolveMap;\n}\n"]}
+{"version":3,"file":"convertToResolveMap.js","sourceRoot":"","sources":["../../src/createResolveMap/convertToResolveMap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAoD;IACtF,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,UAAU,GAAe,EAAE,CAAC;IAElC,KAAK,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAClE,6EAA6E;QAC7E,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;aACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;aAC7E,IAAI,CAAC,WAAW,CAAC,CAAC;QAErB,wFAAwF;QACxF,2EAA2E;QAC3E,IAAI,oBAAoB,CAAC,MAAM,EAAE;YAC/B,MAAM,KAAK,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YAElE,wDAAwD;YACxD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnC,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aACrG;SACF;KACF;IAED,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import type { ResolveMap } from '../types/ResolveMap.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { entrySorter } from './entrySorter.js';\n\n/**\n * Given a PackageMap and all root paths (appPath and linked paths), returns a ResolveMap.\n */\nexport function convertToResolveMap(options: { appMap: PackageMap; rootPaths: string[] }): ResolveMap {\n  const { rootPaths, appMap } = options;\n  const resolveMap: ResolveMap = {};\n\n  for (const [packageName, packageEntries] of Object.entries(appMap)) {\n    // Filter to root packages and packages which are required by other packages.\n    const sortedPackageEntries = Object.values(packageEntries)\n      .filter((e) => rootPaths.includes(e.path) || Object.keys(e.requiredBy).length)\n      .sort(entrySorter);\n\n    // Get the sorted package entries based on the most to least requiredBy references. This\n    // ends up reducing the size of the resolve map by minimizing scoped cases.\n    if (sortedPackageEntries.length) {\n      const entry = (resolveMap[packageName] = sortedPackageEntries[0]);\n\n      // Update scoped versions (version to resolve map entry)\n      if (sortedPackageEntries.length > 1) {\n        entry.scopedVersions = Object.fromEntries(sortedPackageEntries.slice(1).map((e) => [e.version, e]));\n      }\n    }\n  }\n\n  return resolveMap;\n}\n"]}

package/lib/createResolveMap/createResolveMap.d.ts

@@ -2,14 +2,15 @@ import type { LinkedPath } from '../types/LinkedPath.js';
 import type { ResolveMap } from '../types/ResolveMap.js';
 import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
 /**
- * Create a resolve map for a given app path. We do this by walking the dependency tree
- * of the app to build a map of all packages and their dependencies. We then sort the
- * dependencies by the number of other packages that depend on them. The package with the
- * most dependencies is considered the dominant version and is the one that will be used
- * by the bundler. Once this has been resolved, linkedPaths are evaluated separately by
- * discovering their dependencies and redirecting any existing dependencies to the linked
- * package. Transitive dependencies of the linked package are validated and any dependencies
- * which aren't already in the resolve map are added as scoped versions.
+ * Create a resolve map for a given `appPath`.
+ * 1. Walk the dependency tree to build a map of all packages and their dependencies.
+ * 2. If `linkedPaths` are provided, for each one:
+ *    1. Walk its dependency tree to build a map as above.
+ *    2. Redirect any existing dependencies to the linked package.
+ *    3. Ensure that any transitive dependencies of the linked package which aren't already
+ *       satisfied in the resolve map are added as scoped versions.
+ * 3. For each dependency, sort the versions by the number of packages that depend on that version.
+ *    The most popular version will be considered the "default", to reduce the size of scoped versions.
  */
 export declare function createResolveMap(options: {
     appPath: string;

package/lib/createResolveMap/createResolveMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createResolveMap.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/createResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2BAA2B;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAmBrB"}
+{"version":3,"file":"createResolveMap.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/createResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2BAA2B;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAmBrB"}

package/lib/createResolveMap/createResolveMap.js

@@ -2,20 +2,21 @@ import { convertToResolveMap } from './convertToResolveMap.js';
 import { findPackagesFromPath } from './findPackagesFromPath.js';
 import { linkPath } from './linkPath.js';
 /**
- * Create a resolve map for a given app path. We do this by walking the dependency tree
- * of the app to build a map of all packages and their dependencies. We then sort the
- * dependencies by the number of other packages that depend on them. The package with the
- * most dependencies is considered the dominant version and is the one that will be used
- * by the bundler. Once this has been resolved, linkedPaths are evaluated separately by
- * discovering their dependencies and redirecting any existing dependencies to the linked
- * package. Transitive dependencies of the linked package are validated and any dependencies
- * which aren't already in the resolve map are added as scoped versions.
+ * Create a resolve map for a given `appPath`.
+ * 1. Walk the dependency tree to build a map of all packages and their dependencies.
+ * 2. If `linkedPaths` are provided, for each one:
+ *    1. Walk its dependency tree to build a map as above.
+ *    2. Redirect any existing dependencies to the linked package.
+ *    3. Ensure that any transitive dependencies of the linked package which aren't already
+ *       satisfied in the resolve map are added as scoped versions.
+ * 3. For each dependency, sort the versions by the number of packages that depend on that version.
+ *    The most popular version will be considered the "default", to reduce the size of scoped versions.
  */
 export async function createResolveMap(options, context) {
     const { appPath, additionalPaths = [], linkedPaths = [], gitRootPath } = options;
     // First we discover the dependencies for the app.
     const appMap = await findPackagesFromPath({
-        paths: [appPath, ...additionalPaths],
+        searchPaths: [appPath, ...additionalPaths],
         gitRootPath,
     }, context);
     // Next, we iterate through linked paths to inject them into the packageMap.
@@ -23,6 +24,6 @@ export async function createResolveMap(options, context) {
         await linkPath({ linkedPath, appMap }, context);
     }
     // Finally we condense into a resolve map.
-    return convertToResolveMap({ appMap, paths: [appPath, ...additionalPaths] });
+    return convertToResolveMap({ appMap, rootPaths: [appPath, ...additionalPaths] });
 }
 //# sourceMappingURL=createResolveMap.js.map

package/lib/createResolveMap/createResolveMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../../src/createResolveMap/createResolveMap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAOC,EACD,OAEC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEjF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QACpC,WAAW;KACZ,EACD,OAAO,CACR,CAAC;IAEF,4EAA4E;IAC5E,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;KACjD;IAED,0CAA0C;IAC1C,OAAO,mBAAmB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;AAC/E,CAAC","sourcesContent":["import type { LinkedPath } from '../types/LinkedPath.js';\nimport type { ResolveMap } from '../types/ResolveMap.js';\nimport { convertToResolveMap } from './convertToResolveMap.js';\nimport { findPackagesFromPath } from './findPackagesFromPath.js';\nimport { linkPath } from './linkPath.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\n/**\n * Create a resolve map for a given app path. We do this by walking the dependency tree\n * of the app to build a map of all packages and their dependencies. We then sort the\n * dependencies by the number of other packages that depend on them. The package with the\n * most dependencies is considered the dominant version and is the one that will be used\n * by the bundler. Once this has been resolved, linkedPaths are evaluated separately by\n * discovering their dependencies and redirecting any existing dependencies to the linked\n * package. Transitive dependencies of the linked package are validated and any dependencies\n * which aren't already in the resolve map are added as scoped versions.\n */\nexport async function createResolveMap(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: LinkedPath[];\n    gitRootPath?: string;\n    /** @deprecated Not used */\n    useStrictVersioning?: boolean;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [], linkedPaths = [], gitRootPath } = options;\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      paths: [appPath, ...additionalPaths],\n      gitRootPath,\n    },\n    context,\n  );\n\n  // Next, we iterate through linked paths to inject them into the packageMap.\n  for (const linkedPath of linkedPaths) {\n    await linkPath({ linkedPath, appMap }, context);\n  }\n\n  // Finally we condense into a resolve map.\n  return convertToResolveMap({ appMap, paths: [appPath, ...additionalPaths] });\n}\n"]}
+{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../../src/createResolveMap/createResolveMap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAOC,EACD,OAEC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEjF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QAC1C,WAAW;KACZ,EACD,OAAO,CACR,CAAC;IAEF,4EAA4E;IAC5E,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;KACjD;IAED,0CAA0C;IAC1C,OAAO,mBAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;AACnF,CAAC","sourcesContent":["import type { LinkedPath } from '../types/LinkedPath.js';\nimport type { ResolveMap } from '../types/ResolveMap.js';\nimport { convertToResolveMap } from './convertToResolveMap.js';\nimport { findPackagesFromPath } from './findPackagesFromPath.js';\nimport { linkPath } from './linkPath.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\n/**\n * Create a resolve map for a given `appPath`.\n * 1. Walk the dependency tree to build a map of all packages and their dependencies.\n * 2. If `linkedPaths` are provided, for each one:\n *    1. Walk its dependency tree to build a map as above.\n *    2. Redirect any existing dependencies to the linked package.\n *    3. Ensure that any transitive dependencies of the linked package which aren't already\n *       satisfied in the resolve map are added as scoped versions.\n * 3. For each dependency, sort the versions by the number of packages that depend on that version.\n *    The most popular version will be considered the \"default\", to reduce the size of scoped versions.\n */\nexport async function createResolveMap(\n  options: {\n    appPath: string;\n    additionalPaths?: string[];\n    linkedPaths?: LinkedPath[];\n    gitRootPath?: string;\n    /** @deprecated Not used */\n    useStrictVersioning?: boolean;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [], linkedPaths = [], gitRootPath } = options;\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      searchPaths: [appPath, ...additionalPaths],\n      gitRootPath,\n    },\n    context,\n  );\n\n  // Next, we iterate through linked paths to inject them into the packageMap.\n  for (const linkedPath of linkedPaths) {\n    await linkPath({ linkedPath, appMap }, context);\n  }\n\n  // Finally we condense into a resolve map.\n  return convertToResolveMap({ appMap, rootPaths: [appPath, ...additionalPaths] });\n}\n"]}

package/lib/createResolveMap/detachEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detachEntry.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/detachEntry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,eAAe,CAAA;CAAE,QAkClF"}
+{"version":3,"file":"detachEntry.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/detachEntry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,eAAe,CAAA;CAAE,QAmClF"}

package/lib/createResolveMap/detachEntry.js

@@ -3,30 +3,30 @@ import { parseRequiredBy } from './parseRequiredBy.js';
  * Removes requiredBy references for an entry being removed.
  */
 export function detachEntry(options) {
-    const { appMap, entry: entryToRemove } = options;
-    const dependenciesToDetach = [entryToRemove];
+    const { appMap } = options;
+    const dependenciesToDetach = [options.entry];
     while (dependenciesToDetach.length) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length
         const entry = dependenciesToDetach.pop();
         const { name, version, requiredBy } = entry;
-        if (!entry.isLinked) {
-            if (appMap[name]?.[version]) {
-                // Disconnect the entry from consumers.
-                for (const requiredByName of Object.keys(requiredBy)) {
-                    const [parentName, parentVersion] = parseRequiredBy(requiredByName);
-                    const parentEntry = appMap[parentName]?.[parentVersion];
-                    if (parentEntry) {
-                        delete parentEntry.dependencies[name];
-                    }
-                }
-                // Disconnect dependencies from the entry.
-                for (const [dependencyName, dependencyVersion] of Object.entries(entry.dependencies)) {
-                    const dependencyEntry = appMap[dependencyName]?.[dependencyVersion];
-                    if (dependencyEntry) {
-                        delete dependencyEntry.requiredBy[`${name}@${version}`];
-                        if (Object.keys(dependencyEntry.requiredBy).length === 0) {
-                            dependenciesToDetach.push(dependencyEntry);
-                        }
-                    }
+        if (entry.isLinked || !appMap[name]?.[version]) {
+            continue;
+        }
+        // Disconnect the entry from consumers.
+        for (const requiredByName of Object.keys(requiredBy)) {
+            const { name: parentName, version: parentVersion } = parseRequiredBy(requiredByName);
+            const parentEntry = appMap[parentName]?.[parentVersion];
+            if (parentEntry) {
+                delete parentEntry.dependencies[name];
+            }
+        }
+        // Disconnect dependencies from the entry.
+        for (const [dependencyName, dependencyVersion] of Object.entries(entry.dependencies)) {
+            const dependencyEntry = appMap[dependencyName]?.[dependencyVersion];
+            if (dependencyEntry) {
+                delete dependencyEntry.requiredBy[`${name}@${version}`];
+                if (Object.keys(dependencyEntry.requiredBy).length === 0) {
+                    dependenciesToDetach.push(dependencyEntry);
                 }
             }
         }

package/lib/createResolveMap/detachEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"detachEntry.js","sourceRoot":"","sources":["../../src/createResolveMap/detachEntry.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,OAAuD;IACjF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACjD,MAAM,oBAAoB,GAAsB,CAAC,aAAa,CAAC,CAAC;IAEhE,OAAO,oBAAoB,CAAC,MAAM,EAAE;QAClC,MAAM,KAAK,GAAG,oBAAoB,CAAC,GAAG,EAAqB,CAAC;QAC5D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;QAE5C,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACnB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;gBAC3B,uCAAuC;gBACvC,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;oBACpD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;oBACpE,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC;oBAExD,IAAI,WAAW,EAAE;wBACf,OAAO,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;qBACvC;iBACF;gBAED,0CAA0C;gBAC1C,KAAK,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;oBACpF,MAAM,eAAe,GAAG,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC;oBAEpE,IAAI,eAAe,EAAE;wBACnB,OAAO,eAAe,CAAC,UAAU,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC;wBACxD,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;4BACxD,oBAAoB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;yBAC5C;qBACF;iBACF;aACF;SACF;KACF;AACH,CAAC","sourcesContent":["import type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { parseRequiredBy } from './parseRequiredBy.js';\n\n/**\n * Removes requiredBy references for an entry being removed.\n */\nexport function detachEntry(options: { appMap: PackageMap; entry: ResolveMapEntry }) {\n  const { appMap, entry: entryToRemove } = options;\n  const dependenciesToDetach: ResolveMapEntry[] = [entryToRemove];\n\n  while (dependenciesToDetach.length) {\n    const entry = dependenciesToDetach.pop() as ResolveMapEntry;\n    const { name, version, requiredBy } = entry;\n\n    if (!entry.isLinked) {\n      if (appMap[name]?.[version]) {\n        // Disconnect the entry from consumers.\n        for (const requiredByName of Object.keys(requiredBy)) {\n          const [parentName, parentVersion] = parseRequiredBy(requiredByName);\n          const parentEntry = appMap[parentName]?.[parentVersion];\n\n          if (parentEntry) {\n            delete parentEntry.dependencies[name];\n          }\n        }\n\n        // Disconnect dependencies from the entry.\n        for (const [dependencyName, dependencyVersion] of Object.entries(entry.dependencies)) {\n          const dependencyEntry = appMap[dependencyName]?.[dependencyVersion];\n\n          if (dependencyEntry) {\n            delete dependencyEntry.requiredBy[`${name}@${version}`];\n            if (Object.keys(dependencyEntry.requiredBy).length === 0) {\n              dependenciesToDetach.push(dependencyEntry);\n            }\n          }\n        }\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"detachEntry.js","sourceRoot":"","sources":["../../src/createResolveMap/detachEntry.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,OAAuD;IACjF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,oBAAoB,GAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhE,OAAO,oBAAoB,CAAC,MAAM,EAAE;QAClC,8FAA8F;QAC9F,MAAM,KAAK,GAAG,oBAAoB,CAAC,GAAG,EAAG,CAAC;QAC1C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;QAE5C,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE;YAC9C,SAAS;SACV;QAED,uCAAuC;QACvC,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACpD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;YACrF,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC;YAExD,IAAI,WAAW,EAAE;gBACf,OAAO,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aACvC;SACF;QAED,0CAA0C;QAC1C,KAAK,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YACpF,MAAM,eAAe,GAAG,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC;YAEpE,IAAI,eAAe,EAAE;gBACnB,OAAO,eAAe,CAAC,UAAU,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC;gBACxD,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBACxD,oBAAoB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;iBAC5C;aACF;SACF;KACF;AACH,CAAC","sourcesContent":["import type { ResolveMapEntry } from '../types/ResolveMapEntry.js';\nimport type { PackageMap } from '../types/PackageMap.js';\nimport { parseRequiredBy } from './parseRequiredBy.js';\n\n/**\n * Removes requiredBy references for an entry being removed.\n */\nexport function detachEntry(options: { appMap: PackageMap; entry: ResolveMapEntry }) {\n  const { appMap } = options;\n  const dependenciesToDetach: ResolveMapEntry[] = [options.entry];\n\n  while (dependenciesToDetach.length) {\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length\n    const entry = dependenciesToDetach.pop()!;\n    const { name, version, requiredBy } = entry;\n\n    if (entry.isLinked || !appMap[name]?.[version]) {\n      continue;\n    }\n\n    // Disconnect the entry from consumers.\n    for (const requiredByName of Object.keys(requiredBy)) {\n      const { name: parentName, version: parentVersion } = parseRequiredBy(requiredByName);\n      const parentEntry = appMap[parentName]?.[parentVersion];\n\n      if (parentEntry) {\n        delete parentEntry.dependencies[name];\n      }\n    }\n\n    // Disconnect dependencies from the entry.\n    for (const [dependencyName, dependencyVersion] of Object.entries(entry.dependencies)) {\n      const dependencyEntry = appMap[dependencyName]?.[dependencyVersion];\n\n      if (dependencyEntry) {\n        delete dependencyEntry.requiredBy[`${name}@${version}`];\n        if (Object.keys(dependencyEntry.requiredBy).length === 0) {\n          dependenciesToDetach.push(dependencyEntry);\n        }\n      }\n    }\n  }\n}\n"]}

package/lib/createResolveMap/findPackagesFromPath.d.ts

@@ -8,7 +8,7 @@ export declare function findPackagesFromPath(options: {
     /**
      * Paths to search for package.json files and traverse their dependencies to build a PackageMap.
      */
-    paths: string[];
+    searchPaths: string[];
     /**
      * Where to stop looking for packages. If not specified, will look for a git root. If one is not
      * found, will use the first path in the paths array.

package/lib/createResolveMap/findPackagesFromPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findPackagesFromPath.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAe,MAAM,6BAA6B,CAAC;AAOxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,EACD,OAAO,EAAE;IACP;;OAEG;IACH,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CA0FrB"}
+{"version":3,"file":"findPackagesFromPath.d.ts","sourceRoot":"","sources":["../../src/createResolveMap/findPackagesFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAe,MAAM,6BAA6B,CAAC;AAOxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,EACD,OAAO,EAAE;IACP;;OAEG;IACH,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CA0CrB"}