@ms-cloudpack/package-utilities 13.1.2 → 13.1.4

package/lib/findFileInPackage/findPackage.d.ts

@@ -21,7 +21,16 @@ export declare function findPackage(options: {
      * (see https://github.com/microsoft/cloudpack/pull/2184)
      */
     realPathCache?: Record<string, string | undefined>;
+    /**
+     * Module resolution configuration. Includes settings for custom module directories and
+     * dedupe behavior.
+     */
     moduleResolutionConfig?: ModuleResolutionConfig;
+    /**
+     * Application path to use for dedupe resolution. When provided and the dependency is in
+     * the dedupe list, resolution will start from this path instead of `startPath`.
+     */
+    appPath?: string;
 }, context: {
     packages: PackageDefinitionsCache;
 }): Promise<{

package/lib/findFileInPackage/findPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findPackage.d.ts","sourceRoot":"","sources":["../../src/findFileInPackage/findPackage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE;IACP;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,eAAe,CAAC,EAAE,sBAAsB,CAAC;IACzC,uFAAuF;IACvF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAEnD,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,WAAW,CAAA;CAAE,GAAG,SAAS,CAAC,CAoDvE"}
+{"version":3,"file":"findPackage.d.ts","sourceRoot":"","sources":["../../src/findFileInPackage/findPackage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE;IACP;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,eAAe,CAAC,EAAE,sBAAsB,CAAC;IACzC,uFAAuF;IACvF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACnD;;;OAGG;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,WAAW,CAAA;CAAE,GAAG,SAAS,CAAC,CAiEvE"}

package/lib/findFileInPackage/findPackage.js

@@ -5,8 +5,20 @@ import fs from 'fs';
  * starting at `startPath` and ending at `rootPath` (usually the git root) or the filesystem root.
  */
 export async function findPackage(options, context) {
-    const { dependencyName, rootPath, startPath, importerContext, realPathCache = {}, moduleResolutionConfig } = options;
+    const { dependencyName, rootPath, importerContext, realPathCache = {}, moduleResolutionConfig, appPath } = options;
     const { packages } = context;
+    // Use appPath for deduped packages to ensure consistent resolution, otherwise use startPath
+    const shouldDedupe = moduleResolutionConfig?.dedupe?.includes(dependencyName);
+    let startPath;
+    if (shouldDedupe) {
+        if (!appPath) {
+            throw new Error(`appPath is required when resolving deduped package "${dependencyName}"`);
+        }
+        startPath = appPath;
+    }
+    else {
+        startPath = options.startPath;
+    }
     for (const module of moduleResolutionConfig?.modules ?? ['node_modules']) {
         const isAbsolutePath = path.isAbsolute(module);
         let packagePath = isAbsolutePath ? module : startPath;

package/lib/findFileInPackage/findPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"findPackage.js","sourceRoot":"","sources":["../../src/findFileInPackage/findPackage.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAQpB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAoBC,EACD,OAEC;IAED,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,aAAa,GAAG,EAAE,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;IACrH,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,KAAK,MAAM,MAAM,IAAI,sBAAsB,EAAE,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QACzE,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACtD,MAAM,aAAa,GAAG,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEnE,GAAG,CAAC;YACF,MAAM,YAAY,GAAG,cAAc;gBACjC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC;gBACnC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;YACnD,IAAI,UAAmC,CAAC;YACxC,IAAI,QAA4B,CAAC;YAEjC,IAAI,CAAC;gBACH,kDAAkD;gBAClD,sEAAsE;gBACtE,0EAA0E;gBAC1E,QAAQ,GAAG,aAAa,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACjF,UAAU,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;YACpE,CAAC;YAAC,MAAM,CAAC;gBACP,kCAAkC;YACpC,CAAC;YAED,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;gBAC3B,aAAa,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;gBACvC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;YAC/C,CAAC;YAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5B,MAAM;YACR,CAAC;YAED,mDAAmD;YACnD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAExC,oDAAoD;YACpD,gGAAgG;YAChG,yFAAyF;YACzF,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjE,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC1C,CAAC;YAED,yCAAyC;YACzC,IAAI,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBACzC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC,QAAQ,CAAC,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,WAAW,EAAE;IAC9G,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import path from 'path';\nimport fs from 'fs';\nimport type {\n  ModuleResolutionConfig,\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n} from '@ms-cloudpack/common-types';\n\n/**\n * Find the package.json contents for `dependencyName`, searching up under `node_modules` folders\n * starting at `startPath` and ending at `rootPath` (usually the git root) or the filesystem root.\n */\nexport async function findPackage(\n  options: {\n    /**\n     * Dependency name as specified in the parent's deps and installed in `node_modules`.\n     * (This is usually the actual name, except for renamed non-semver deps.)\n     */\n    dependencyName: string;\n    /** Start searching up from the `node_modules` of this folder. */\n    startPath: string;\n    /** Context in which `dependencyName` is imported. */\n    importerContext?: PackageImporterContext;\n    /** Stop searching at this path (usually the git root). Defaults to filesystem root. */\n    rootPath?: string;\n    /**\n     * Cache of realpath results (improves perf, particularly on Windows).\n     * As of writing, this is scoped to a `findPackagesFromPath` call.\n     * (see https://github.com/microsoft/cloudpack/pull/2184)\n     */\n    realPathCache?: Record<string, string | undefined>;\n\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ packagePath: string; definition: PackageJson } | undefined> {\n  const { dependencyName, rootPath, startPath, importerContext, realPathCache = {}, moduleResolutionConfig } = options;\n  const { packages } = context;\n\n  for (const module of moduleResolutionConfig?.modules ?? ['node_modules']) {\n    const isAbsolutePath = path.isAbsolute(module);\n    let packagePath = isAbsolutePath ? module : startPath;\n    const isStoreLayout = /[\\\\/]\\.(pnpm|store)[\\\\/]/.test(packagePath);\n\n    do {\n      const resolvedPath = isAbsolutePath\n        ? path.join(module, dependencyName)\n        : path.join(packagePath, module, dependencyName);\n      let definition: PackageJson | undefined;\n      let realPath: string | undefined;\n\n      try {\n        // Get the realpath in case of a symlinked layout.\n        // realpathSync.native is faster than either realpathSync or realpath.\n        // https://github.com/microsoft/cloudpack/pull/2127#discussion_r1607070201\n        realPath = realPathCache?.[resolvedPath] || fs.realpathSync.native(resolvedPath);\n        definition = await packages.tryGet(realPath, { importerContext });\n      } catch {\n        // Ignore errors and keep looking.\n      }\n\n      if (realPath && definition) {\n        realPathCache[resolvedPath] = realPath;\n        return { packagePath: realPath, definition };\n      }\n\n      if (path.isAbsolute(module)) {\n        break;\n      }\n\n      // We haven't found it. Try to move up a directory.\n      packagePath = path.dirname(packagePath);\n\n      // If we moved up into a scope folder, skip over it.\n      // Exception: in a manager using a store layout, packages starting with @ are NOT scope folders;\n      // e.g. @foo/bar will be in a folder like @foo-bar-npm-1.2.3-abcdef1234 or @foo-bar@1.2.3\n      if (!isStoreLayout && path.basename(packagePath).startsWith('@')) {\n        packagePath = path.dirname(packagePath);\n      }\n\n      // Skip over nested node_modules folders.\n      if (packagePath.endsWith('node_modules')) {\n        packagePath = path.dirname(packagePath);\n      }\n    } while ((!rootPath || packagePath.length >= rootPath.length) && path.dirname(packagePath) !== packagePath);\n  }\n  return undefined;\n}\n"]}
+{"version":3,"file":"findPackage.js","sourceRoot":"","sources":["../../src/findFileInPackage/findPackage.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAQpB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OA4BC,EACD,OAEC;IAED,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,GAAG,EAAE,EAAE,sBAAsB,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACnH,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,4FAA4F;IAC5F,MAAM,YAAY,GAAG,sBAAsB,EAAE,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC9E,IAAI,SAAiB,CAAC;IAEtB,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,uDAAuD,cAAc,GAAG,CAAC,CAAC;QAC5F,CAAC;QACD,SAAS,GAAG,OAAO,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IAChC,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,sBAAsB,EAAE,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QACzE,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACtD,MAAM,aAAa,GAAG,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEnE,GAAG,CAAC;YACF,MAAM,YAAY,GAAG,cAAc;gBACjC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC;gBACnC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;YACnD,IAAI,UAAmC,CAAC;YACxC,IAAI,QAA4B,CAAC;YAEjC,IAAI,CAAC;gBACH,kDAAkD;gBAClD,sEAAsE;gBACtE,0EAA0E;gBAC1E,QAAQ,GAAG,aAAa,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACjF,UAAU,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;YACpE,CAAC;YAAC,MAAM,CAAC;gBACP,kCAAkC;YACpC,CAAC;YAED,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;gBAC3B,aAAa,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;gBACvC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;YAC/C,CAAC;YAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5B,MAAM;YACR,CAAC;YAED,mDAAmD;YACnD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAExC,oDAAoD;YACpD,gGAAgG;YAChG,yFAAyF;YACzF,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjE,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC1C,CAAC;YAED,yCAAyC;YACzC,IAAI,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBACzC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC,QAAQ,CAAC,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,WAAW,EAAE;IAC9G,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import path from 'path';\nimport fs from 'fs';\nimport type {\n  ModuleResolutionConfig,\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n} from '@ms-cloudpack/common-types';\n\n/**\n * Find the package.json contents for `dependencyName`, searching up under `node_modules` folders\n * starting at `startPath` and ending at `rootPath` (usually the git root) or the filesystem root.\n */\nexport async function findPackage(\n  options: {\n    /**\n     * Dependency name as specified in the parent's deps and installed in `node_modules`.\n     * (This is usually the actual name, except for renamed non-semver deps.)\n     */\n    dependencyName: string;\n    /** Start searching up from the `node_modules` of this folder. */\n    startPath: string;\n    /** Context in which `dependencyName` is imported. */\n    importerContext?: PackageImporterContext;\n    /** Stop searching at this path (usually the git root). Defaults to filesystem root. */\n    rootPath?: string;\n    /**\n     * Cache of realpath results (improves perf, particularly on Windows).\n     * As of writing, this is scoped to a `findPackagesFromPath` call.\n     * (see https://github.com/microsoft/cloudpack/pull/2184)\n     */\n    realPathCache?: Record<string, string | undefined>;\n    /**\n     * Module resolution configuration. Includes settings for custom module directories and\n     * dedupe behavior.\n     */\n    moduleResolutionConfig?: ModuleResolutionConfig;\n    /**\n     * Application path to use for dedupe resolution. When provided and the dependency is in\n     * the dedupe list, resolution will start from this path instead of `startPath`.\n     */\n    appPath?: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ packagePath: string; definition: PackageJson } | undefined> {\n  const { dependencyName, rootPath, importerContext, realPathCache = {}, moduleResolutionConfig, appPath } = options;\n  const { packages } = context;\n\n  // Use appPath for deduped packages to ensure consistent resolution, otherwise use startPath\n  const shouldDedupe = moduleResolutionConfig?.dedupe?.includes(dependencyName);\n  let startPath: string;\n\n  if (shouldDedupe) {\n    if (!appPath) {\n      throw new Error(`appPath is required when resolving deduped package \"${dependencyName}\"`);\n    }\n    startPath = appPath;\n  } else {\n    startPath = options.startPath;\n  }\n\n  for (const module of moduleResolutionConfig?.modules ?? ['node_modules']) {\n    const isAbsolutePath = path.isAbsolute(module);\n    let packagePath = isAbsolutePath ? module : startPath;\n    const isStoreLayout = /[\\\\/]\\.(pnpm|store)[\\\\/]/.test(packagePath);\n\n    do {\n      const resolvedPath = isAbsolutePath\n        ? path.join(module, dependencyName)\n        : path.join(packagePath, module, dependencyName);\n      let definition: PackageJson | undefined;\n      let realPath: string | undefined;\n\n      try {\n        // Get the realpath in case of a symlinked layout.\n        // realpathSync.native is faster than either realpathSync or realpath.\n        // https://github.com/microsoft/cloudpack/pull/2127#discussion_r1607070201\n        realPath = realPathCache?.[resolvedPath] || fs.realpathSync.native(resolvedPath);\n        definition = await packages.tryGet(realPath, { importerContext });\n      } catch {\n        // Ignore errors and keep looking.\n      }\n\n      if (realPath && definition) {\n        realPathCache[resolvedPath] = realPath;\n        return { packagePath: realPath, definition };\n      }\n\n      if (path.isAbsolute(module)) {\n        break;\n      }\n\n      // We haven't found it. Try to move up a directory.\n      packagePath = path.dirname(packagePath);\n\n      // If we moved up into a scope folder, skip over it.\n      // Exception: in a manager using a store layout, packages starting with @ are NOT scope folders;\n      // e.g. @foo/bar will be in a folder like @foo-bar-npm-1.2.3-abcdef1234 or @foo-bar@1.2.3\n      if (!isStoreLayout && path.basename(packagePath).startsWith('@')) {\n        packagePath = path.dirname(packagePath);\n      }\n\n      // Skip over nested node_modules folders.\n      if (packagePath.endsWith('node_modules')) {\n        packagePath = path.dirname(packagePath);\n      }\n    } while ((!rootPath || packagePath.length >= rootPath.length) && path.dirname(packagePath) !== packagePath);\n  }\n  return undefined;\n}\n"]}

package/lib/resolveMap/createHelpers/findPackagesFromPath.d.ts

@@ -25,7 +25,17 @@ export declare function findPackagesFromPath(options: {
      * the package(s) from the given path(s). Not compatible with `discoverPackages`.
      */
     skipResolveDependencies?: boolean;
+    /**
+     * Module resolution configuration. Includes settings for custom module directories and
+     * dedupe behavior. When `dedupe` is specified, those packages will be resolved from
+     * the `appPath` to ensure consistent resolution across the dependency tree.
+     */
     moduleResolutionConfig?: ModuleResolutionConfig;
+    /**
+     * Application path to use for dedupe resolution. Required when `moduleResolutionConfig.dedupe`
+     * is configured.
+     */
+    appPath?: string;
 }, context: {
     /**
      * Package cache.

package/lib/resolveMap/createHelpers/findPackagesFromPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findPackagesFromPath.d.ts","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/findPackagesFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EAIxB,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIxD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP;;OAEG;IACH,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CA+DrB"}
+{"version":3,"file":"findPackagesFromPath.d.ts","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/findPackagesFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EAIxB,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIxD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAEhD;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,EACD,OAAO,EAAE;IACP;;OAEG;IACH,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAoErB"}

package/lib/resolveMap/createHelpers/findPackagesFromPath.js

@@ -9,13 +9,16 @@ import { getDependencies } from '../../packageJson/getDependencies.js';
  * of the app to build a map of all packages and their dependencies.
  */
 export async function findPackagesFromPath(options, context) {
-    const { searchPaths, discoverPackages, skipResolveDependencies, rootPath, moduleResolutionConfig } = options;
+    const { searchPaths, discoverPackages, skipResolveDependencies, rootPath, moduleResolutionConfig, appPath } = options;
     const packageMap = {};
     const visitedPaths = new Set();
     const realPathCache = {};
     if (discoverPackages && skipResolveDependencies) {
         throw new Error('Cannot use `discoverPackages` with `skipResolveDependencies`');
     }
+    if (moduleResolutionConfig?.dedupe && moduleResolutionConfig.dedupe.length > 0 && !appPath) {
+        throw new Error('appPath is required when moduleResolutionConfig.dedupe is configured');
+    }
     for (const searchPath of searchPaths) {
         if (!(await isFolder(searchPath))) {
             throw new Error(`Path ${searchPath} is not a folder. Make sure the path exists and try again.`);
@@ -44,6 +47,7 @@ export async function findPackagesFromPath(options, context) {
                     packagePath,
                     packageMap,
                     rootPath,
+                    appPath,
                     importerContext,
                     realPathCache,
                     skipResolveDependencies,
@@ -65,7 +69,7 @@ export async function findPackagesFromPath(options, context) {
  * Returns a list of additional dependency paths to visit.
  */
 async function visitPackage(options, context) {
-    const { packagePath, packageMap, rootPath, importerContext, realPathCache, skipResolveDependencies, moduleResolutionConfig, } = options;
+    const { packagePath, packageMap, rootPath, appPath, importerContext, realPathCache, skipResolveDependencies, moduleResolutionConfig, } = options;
     const { packages } = context;
     const packageDefinition = await packages.get(packagePath, { importerContext });
     const { name, version } = packageDefinition;
@@ -95,6 +99,7 @@ async function visitPackage(options, context) {
             importerContext: depImporterContext,
             realPathCache,
             moduleResolutionConfig,
+            appPath,
         }, context);
         if (!dependencyPackage) {
             if (packageDefinition.peerDependencies?.[dependencyName] !== undefined) {

package/lib/resolveMap/createHelpers/findPackagesFromPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"findPackagesFromPath.js","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/findPackagesFromPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  ModuleResolutionConfig,\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n  ResolveMapEntry,\n} from '@ms-cloudpack/common-types';\nimport { isExternalPackage, isFolder } from '@ms-cloudpack/path-utilities';\nimport { bulletedList } from '@ms-cloudpack/task-reporter';\nimport { glob } from 'tinyglobby';\nimport path from 'path';\nimport { findPackage } from '../../findFileInPackage/findPackage.js';\nimport { getDependencies } from '../../packageJson/getDependencies.js';\nimport type { PackageMap } from './types/PackageMap.js';\n\ntype PackagePathInfo = { packagePath: string; importerContext?: PackageImporterContext };\n\n/**\n * Find all packages from a given path. We do this by walking the dependency tree\n * of the app to build a map of all packages and their dependencies.\n */\nexport async function findPackagesFromPath(\n  options: {\n    /**\n     * Paths to search for package.json files and traverse their dependencies to build a PackageMap.\n     */\n    searchPaths: string[];\n\n    /**\n     * Where to stop looking for dependency packages. This should be calculated by the caller\n     * (defaulting to the project/git root) or can be manually set for testing.\n     *\n     * If `skipResolveDependencies` is true, this won't be used and can be undefined.\n     */\n    rootPath: string | undefined;\n\n    /**\n     * If true will glob for all package.json files in the path and add them to the map.\n     */\n    discoverPackages?: boolean;\n\n    /**\n     * Skip the actual resolution of dependencies. The returned package map will only contain\n     * the package(s) from the given path(s). Not compatible with `discoverPackages`.\n     */\n    skipResolveDependencies?: boolean;\n\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: {\n    /**\n     * Package cache.\n     */\n    packages: PackageDefinitionsCache;\n  },\n): Promise<PackageMap> {\n  const { searchPaths, discoverPackages, skipResolveDependencies, rootPath, moduleResolutionConfig } = options;\n  const packageMap: PackageMap = {};\n  const visitedPaths = new Set<string>();\n  const realPathCache: Record<string, string | undefined> = {};\n\n  if (discoverPackages && skipResolveDependencies) {\n    throw new Error('Cannot use `discoverPackages` with `skipResolveDependencies`');\n  }\n\n  for (const searchPath of searchPaths) {\n    if (!(await isFolder(searchPath))) {\n      throw new Error(`Path ${searchPath} is not a folder. Make sure the path exists and try again.`);\n    }\n\n    let pathsToVisit: PackagePathInfo[];\n\n    if (discoverPackages) {\n      const packagePaths = await glob('**/package.json', { cwd: searchPath, ignore: ['**/node_modules/**'] });\n\n      pathsToVisit = packagePaths.map((p) => ({ packagePath: path.dirname(path.join(searchPath, p)) }));\n    } else {\n      pathsToVisit = [{ packagePath: searchPath }];\n    }\n\n    while (pathsToVisit.length) {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length\n      const { packagePath, importerContext } = pathsToVisit.shift()!;\n\n      // There's a very slight possibility (not yet observed even in large repos) that both semver\n      // and non-semver dependencies could resolve to the same package name and version and therefore\n      // be installed at the same path. (If the non-semver dependency was encountered first, the\n      // version and possibly name in the package definition would have been transformed to match by\n      // getNonSemverTransform.) It would be possible to detect this case if needed, but for now we're\n      // not going to bother because it's so rare/theoretical and the effect in practice will probably\n      // be the same as a dependency that's forced with `resolutions` to a version violating semver.\n      if (!visitedPaths.has(packagePath)) {\n        visitedPaths.add(packagePath);\n\n        const dependencyPaths = await visitPackage(\n          {\n            packagePath,\n            packageMap,\n            rootPath,\n            importerContext,\n            realPathCache,\n            skipResolveDependencies,\n            moduleResolutionConfig,\n          },\n          context,\n        );\n\n        for (const dependencyPath of dependencyPaths) {\n          // Let's avoid pushing tons of things into the work queue that we'll be skipping later.\n          if (!visitedPaths.has(dependencyPath.packagePath)) {\n            pathsToVisit.push(dependencyPath);\n          }\n        }\n      }\n    }\n  }\n\n  return packageMap;\n}\n\n/**\n * Visit a package path, and add entries for the package and its dependencies to `packageMap`.\n * Returns a list of additional dependency paths to visit.\n */\nasync function visitPackage(\n  options: PackagePathInfo & {\n    packageMap: PackageMap;\n    rootPath: string | undefined;\n    realPathCache?: Record<string, string | undefined>;\n    skipResolveDependencies: boolean | undefined;\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: Parameters<typeof findPackagesFromPath>[1],\n): Promise<PackagePathInfo[]> {\n  const {\n    packagePath,\n    packageMap,\n    rootPath,\n    importerContext,\n    realPathCache,\n    skipResolveDependencies,\n    moduleResolutionConfig,\n  } = options;\n  const { packages } = context;\n\n  const packageDefinition = await packages.get(packagePath, { importerContext });\n\n  const { name, version } = packageDefinition;\n  const entry = ensurePackageEntry({\n    packageName: importerContext?.importedName || name,\n    packagePath: packagePath,\n    packageMap,\n    definition: packageDefinition,\n  });\n\n  if (skipResolveDependencies) {\n    return [];\n  }\n\n  // Add all dependencies to the list of paths to visit.\n  const dependencies = getDependencies(packageDefinition) as Record<string, string>;\n\n  const dependencyPaths: PackagePathInfo[] = [];\n\n  for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {\n    const depImporterContext: PackageImporterContext = {\n      parentName: name,\n      parentVersion: version,\n      importedName: dependencyName,\n      versionRequirement,\n    };\n\n    const dependencyPackage = await findPackage(\n      {\n        dependencyName,\n        startPath: packagePath,\n        rootPath,\n        importerContext: depImporterContext,\n        realPathCache,\n        moduleResolutionConfig,\n      },\n      context,\n    );\n    if (!dependencyPackage) {\n      if (packageDefinition.peerDependencies?.[dependencyName] !== undefined) {\n        // Ignore missing peer dependencies\n        console.debug(`Ignoring missing peer dependency \"${dependencyName}\" required by \"${name}@${version}\"`);\n        continue;\n      }\n\n      throw new Error(\n        [\n          `A dependency could not be found:`,\n          bulletedList([\n            `Dependency: ${dependencyName} (Required: ${versionRequirement})`,\n            `Required by: ${packagePath}`,\n          ]),\n          ``,\n          `Make sure the dependency is installed and try again.`,\n        ].join('\\n'),\n      );\n    }\n\n    const { packagePath: dependencyPath, definition: dependencyDefinition } = dependencyPackage;\n\n    if (!(dependencyDefinition.name && dependencyDefinition.version)) {\n      throw new Error(`\"${dependencyPath}/package.json\" is missing a name or version.`);\n    }\n\n    const dependencyEntry = ensurePackageEntry({\n      packagePath: dependencyPath,\n      packageName: dependencyName,\n      packageMap,\n      definition: dependencyDefinition,\n    });\n\n    entry.dependencies[dependencyName] = dependencyDefinition.version;\n    dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n    dependencyPaths.push({\n      packagePath: dependencyPath,\n      importerContext: depImporterContext,\n    });\n  }\n\n  return dependencyPaths;\n}\n\n/**\n * If `packageMap` doesn't already have an entry for this package name and version, create one\n * and add it to `packageMap`. Returns the entry.\n */\nfunction ensurePackageEntry(options: {\n  packagePath: string;\n  packageName: string;\n  packageMap: PackageMap;\n  definition: PackageJson;\n}): ResolveMapEntry {\n  const { packagePath = '', packageName: name, packageMap, definition } = options;\n  const { version } = definition;\n\n  packageMap[name] ??= {};\n\n  let entry = packageMap[name][version];\n  if (!entry) {\n    entry = packageMap[name][version] = {\n      name,\n      version,\n      path: packagePath,\n      dependencies: {},\n      requiredBy: {},\n    };\n\n    if (isExternalPackage(packagePath)) {\n      entry.isExternal = true;\n    }\n  }\n\n  return entry;\n}\n"]}
+{"version":3,"file":"findPackagesFromPath.js","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/findPackagesFromPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  ModuleResolutionConfig,\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n  ResolveMapEntry,\n} from '@ms-cloudpack/common-types';\nimport { isExternalPackage, isFolder } from '@ms-cloudpack/path-utilities';\nimport { bulletedList } from '@ms-cloudpack/task-reporter';\nimport { glob } from 'tinyglobby';\nimport path from 'path';\nimport { findPackage } from '../../findFileInPackage/findPackage.js';\nimport { getDependencies } from '../../packageJson/getDependencies.js';\nimport type { PackageMap } from './types/PackageMap.js';\n\ntype PackagePathInfo = { packagePath: string; importerContext?: PackageImporterContext };\n\n/**\n * Find all packages from a given path. We do this by walking the dependency tree\n * of the app to build a map of all packages and their dependencies.\n */\nexport async function findPackagesFromPath(\n  options: {\n    /**\n     * Paths to search for package.json files and traverse their dependencies to build a PackageMap.\n     */\n    searchPaths: string[];\n\n    /**\n     * Where to stop looking for dependency packages. This should be calculated by the caller\n     * (defaulting to the project/git root) or can be manually set for testing.\n     *\n     * If `skipResolveDependencies` is true, this won't be used and can be undefined.\n     */\n    rootPath: string | undefined;\n\n    /**\n     * If true will glob for all package.json files in the path and add them to the map.\n     */\n    discoverPackages?: boolean;\n\n    /**\n     * Skip the actual resolution of dependencies. The returned package map will only contain\n     * the package(s) from the given path(s). Not compatible with `discoverPackages`.\n     */\n    skipResolveDependencies?: boolean;\n\n    /**\n     * Module resolution configuration. Includes settings for custom module directories and\n     * dedupe behavior. When `dedupe` is specified, those packages will be resolved from\n     * the `appPath` to ensure consistent resolution across the dependency tree.\n     */\n    moduleResolutionConfig?: ModuleResolutionConfig;\n\n    /**\n     * Application path to use for dedupe resolution. Required when `moduleResolutionConfig.dedupe`\n     * is configured.\n     */\n    appPath?: string;\n  },\n  context: {\n    /**\n     * Package cache.\n     */\n    packages: PackageDefinitionsCache;\n  },\n): Promise<PackageMap> {\n  const { searchPaths, discoverPackages, skipResolveDependencies, rootPath, moduleResolutionConfig, appPath } = options;\n  const packageMap: PackageMap = {};\n  const visitedPaths = new Set<string>();\n  const realPathCache: Record<string, string | undefined> = {};\n\n  if (discoverPackages && skipResolveDependencies) {\n    throw new Error('Cannot use `discoverPackages` with `skipResolveDependencies`');\n  }\n\n  if (moduleResolutionConfig?.dedupe && moduleResolutionConfig.dedupe.length > 0 && !appPath) {\n    throw new Error('appPath is required when moduleResolutionConfig.dedupe is configured');\n  }\n\n  for (const searchPath of searchPaths) {\n    if (!(await isFolder(searchPath))) {\n      throw new Error(`Path ${searchPath} is not a folder. Make sure the path exists and try again.`);\n    }\n\n    let pathsToVisit: PackagePathInfo[];\n\n    if (discoverPackages) {\n      const packagePaths = await glob('**/package.json', { cwd: searchPath, ignore: ['**/node_modules/**'] });\n\n      pathsToVisit = packagePaths.map((p) => ({ packagePath: path.dirname(path.join(searchPath, p)) }));\n    } else {\n      pathsToVisit = [{ packagePath: searchPath }];\n    }\n\n    while (pathsToVisit.length) {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- already checked length\n      const { packagePath, importerContext } = pathsToVisit.shift()!;\n\n      // There's a very slight possibility (not yet observed even in large repos) that both semver\n      // and non-semver dependencies could resolve to the same package name and version and therefore\n      // be installed at the same path. (If the non-semver dependency was encountered first, the\n      // version and possibly name in the package definition would have been transformed to match by\n      // getNonSemverTransform.) It would be possible to detect this case if needed, but for now we're\n      // not going to bother because it's so rare/theoretical and the effect in practice will probably\n      // be the same as a dependency that's forced with `resolutions` to a version violating semver.\n      if (!visitedPaths.has(packagePath)) {\n        visitedPaths.add(packagePath);\n\n        const dependencyPaths = await visitPackage(\n          {\n            packagePath,\n            packageMap,\n            rootPath,\n            appPath,\n            importerContext,\n            realPathCache,\n            skipResolveDependencies,\n            moduleResolutionConfig,\n          },\n          context,\n        );\n\n        for (const dependencyPath of dependencyPaths) {\n          // Let's avoid pushing tons of things into the work queue that we'll be skipping later.\n          if (!visitedPaths.has(dependencyPath.packagePath)) {\n            pathsToVisit.push(dependencyPath);\n          }\n        }\n      }\n    }\n  }\n\n  return packageMap;\n}\n\n/**\n * Visit a package path, and add entries for the package and its dependencies to `packageMap`.\n * Returns a list of additional dependency paths to visit.\n */\nasync function visitPackage(\n  options: PackagePathInfo & {\n    packageMap: PackageMap;\n    rootPath: string | undefined;\n    appPath: string | undefined;\n    realPathCache?: Record<string, string | undefined>;\n    skipResolveDependencies: boolean | undefined;\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: Parameters<typeof findPackagesFromPath>[1],\n): Promise<PackagePathInfo[]> {\n  const {\n    packagePath,\n    packageMap,\n    rootPath,\n    appPath,\n    importerContext,\n    realPathCache,\n    skipResolveDependencies,\n    moduleResolutionConfig,\n  } = options;\n  const { packages } = context;\n\n  const packageDefinition = await packages.get(packagePath, { importerContext });\n\n  const { name, version } = packageDefinition;\n  const entry = ensurePackageEntry({\n    packageName: importerContext?.importedName || name,\n    packagePath: packagePath,\n    packageMap,\n    definition: packageDefinition,\n  });\n\n  if (skipResolveDependencies) {\n    return [];\n  }\n\n  // Add all dependencies to the list of paths to visit.\n  const dependencies = getDependencies(packageDefinition) as Record<string, string>;\n\n  const dependencyPaths: PackagePathInfo[] = [];\n\n  for (const [dependencyName, versionRequirement] of Object.entries(dependencies)) {\n    const depImporterContext: PackageImporterContext = {\n      parentName: name,\n      parentVersion: version,\n      importedName: dependencyName,\n      versionRequirement,\n    };\n\n    const dependencyPackage = await findPackage(\n      {\n        dependencyName,\n        startPath: packagePath,\n        rootPath,\n        importerContext: depImporterContext,\n        realPathCache,\n        moduleResolutionConfig,\n        appPath,\n      },\n      context,\n    );\n    if (!dependencyPackage) {\n      if (packageDefinition.peerDependencies?.[dependencyName] !== undefined) {\n        // Ignore missing peer dependencies\n        console.debug(`Ignoring missing peer dependency \"${dependencyName}\" required by \"${name}@${version}\"`);\n        continue;\n      }\n\n      throw new Error(\n        [\n          `A dependency could not be found:`,\n          bulletedList([\n            `Dependency: ${dependencyName} (Required: ${versionRequirement})`,\n            `Required by: ${packagePath}`,\n          ]),\n          ``,\n          `Make sure the dependency is installed and try again.`,\n        ].join('\\n'),\n      );\n    }\n\n    const { packagePath: dependencyPath, definition: dependencyDefinition } = dependencyPackage;\n\n    if (!(dependencyDefinition.name && dependencyDefinition.version)) {\n      throw new Error(`\"${dependencyPath}/package.json\" is missing a name or version.`);\n    }\n\n    const dependencyEntry = ensurePackageEntry({\n      packagePath: dependencyPath,\n      packageName: dependencyName,\n      packageMap,\n      definition: dependencyDefinition,\n    });\n\n    entry.dependencies[dependencyName] = dependencyDefinition.version;\n    dependencyEntry.requiredBy[`${name}@${version}`] = versionRequirement;\n\n    dependencyPaths.push({\n      packagePath: dependencyPath,\n      importerContext: depImporterContext,\n    });\n  }\n\n  return dependencyPaths;\n}\n\n/**\n * If `packageMap` doesn't already have an entry for this package name and version, create one\n * and add it to `packageMap`. Returns the entry.\n */\nfunction ensurePackageEntry(options: {\n  packagePath: string;\n  packageName: string;\n  packageMap: PackageMap;\n  definition: PackageJson;\n}): ResolveMapEntry {\n  const { packagePath = '', packageName: name, packageMap, definition } = options;\n  const { version } = definition;\n\n  packageMap[name] ??= {};\n\n  let entry = packageMap[name][version];\n  if (!entry) {\n    entry = packageMap[name][version] = {\n      name,\n      version,\n      path: packagePath,\n      dependencies: {},\n      requiredBy: {},\n    };\n\n    if (isExternalPackage(packagePath)) {\n      entry.isExternal = true;\n    }\n  }\n\n  return entry;\n}\n"]}

package/lib/resolveMap/createHelpers/link/linkPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"linkPath.d.ts","sourceRoot":"","sources":["../../../../src/resolveMap/createHelpers/link/linkPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,KAAK,EACV,UAAU,EAEV,uBAAuB,EACvB,WAAW,EACX,sBAAsB,EACvB,MAAM,4BAA4B,CAAC;AAMpC;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,IAAI,CAAC,CA+Gf"}
+{"version":3,"file":"linkPath.d.ts","sourceRoot":"","sources":["../../../../src/resolveMap/createHelpers/link/linkPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,KAAK,EACV,UAAU,EAEV,uBAAuB,EACvB,WAAW,EACX,sBAAsB,EACvB,MAAM,4BAA4B,CAAC;AAMpC;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,WAAW,GAAG,SAAS,CAAC;IAC3C,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,IAAI,CAAC,CAgHf"}

package/lib/resolveMap/createHelpers/link/linkPath.js

@@ -20,6 +20,7 @@ export async function linkPath(options, context) {
             discoverPackages: true,
             rootPath: linkedRootPath,
             moduleResolutionConfig,
+            appPath: linkedPath.path,
         }, context);
     const entriesToLink = [];
     const { path, ignoredPackages = [], includeAll } = linkedPath;

package/lib/resolveMap/createHelpers/link/linkPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"linkPath.js","sourceRoot":"","sources":["../../../../src/resolveMap/createHelpers/link/linkPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageMap } from '../types/PackageMap.js';\nimport { addLinkedEntryDependencies } from './addLinkedEntryDependencies.js';\nimport { detachEntry } from './detachEntry.js';\nimport { findPackagesFromPath } from '../findPackagesFromPath.js';\nimport { parseRequiredBy } from '../parseRequiredBy.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type {\n  LinkedPath,\n  ResolveMapEntry,\n  PackageDefinitionsCache,\n  PackageJson,\n  ModuleResolutionConfig,\n} from '@ms-cloudpack/common-types';\nimport { dedupeLinkedPackages } from './dedupeLinkedPackages.js';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport { flattenResolveMap } from './flattenResolveMap.js';\nimport { getEffectiveResolutions } from './getEffectiveResolutions.js';\n\n/**\n * Find packages from `linkedPath` and add them to the `appMap`.\n */\nexport async function linkPath(\n  options: {\n    linkedPath: LinkedPath;\n    appMap: PackageMap;\n    appRootPath: string | undefined;\n    appRepoDefinition: PackageJson | undefined;\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<void> {\n  const { linkedPath, appMap, appRootPath, appRepoDefinition, moduleResolutionConfig } = options;\n\n  const linkedRootPath = linkedPath.rootPath || findProjectRoot(linkedPath.path, { noPackageRoot: true });\n\n  const linkMap = linkedPath?.remote\n    ? flattenResolveMap({ resolveMap: linkedPath.remote.resolveMap })\n    : await findPackagesFromPath(\n        {\n          searchPaths: [linkedPath.path],\n          discoverPackages: true,\n          rootPath: linkedRootPath,\n          moduleResolutionConfig,\n        },\n        context,\n      );\n  const entriesToLink: ResolveMapEntry[] = [];\n  const { path, ignoredPackages = [], includeAll } = linkedPath;\n  const resolutions = getEffectiveResolutions(appRepoDefinition, linkedPath.ignoreResolutions);\n\n  // Iterate through the linkMap, looking for internal packages to link to the appMap.\n  for (const [packageName, packageVersions] of Object.entries(linkMap)) {\n    const appEntries = Object.values(appMap[packageName] || {});\n\n    if (!appEntries.length) {\n      continue;\n    }\n\n    const linkedEntries = Object.values(packageVersions);\n    const linkedEntry = linkedEntries.length === 1 ? linkedEntries[0] : undefined;\n\n    // For linked dependencies, we don't want multiple versions referenced. Remove them\n    // all and add them in a second pass.\n    if (\n      linkedEntry &&\n      !linkedEntry.isExternal &&\n      ignoredPackages.indexOf(packageName) === -1 &&\n      (includeAll || isContainedInPath(linkedEntry.path, path))\n    ) {\n      // Linked packages use an asterisk for the version description. This keeps it semver compatible with\n      // anything.\n      linkedEntry.version += '-linked';\n      linkedEntry.isLinked = true;\n\n      entriesToLink.push(linkedEntry);\n    }\n  }\n\n  // We now have a list of paths to link. Iterate through them, add them to the appMap,\n  // and ensure their dependencies are satisfied.\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    linkedEntry.requiredBy = {};\n    for (const entry of existingEntries) {\n      for (const [requiredById, requirement] of Object.entries(entry.requiredBy)) {\n        const requiredByName = parseRequiredBy(requiredById).name;\n        const linkedParentEntry = Object.values(linkMap[requiredByName] || {})[0];\n        const requiredByKey = linkedParentEntry?.isLinked\n          ? (`${linkedParentEntry.name}@${linkedParentEntry.version}` as const)\n          : requiredById;\n        linkedEntry.requiredBy[requiredByKey as `${string}@${string}`] = requirement;\n      }\n    }\n  }\n\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    // We need to detach all existing entries from the appMap, along with their dependencies. Note - detaching just means that\n    // we disconnect the entry from its parent and children. If the children have no other parents, we disconnect them as well\n    // and recurse through their children.\n    for (const existingEntry of existingEntries) {\n      detachEntry({ appMap, entry: existingEntry });\n    }\n\n    // Attach the linked entry to the parents' dependencies.\n    for (const requiredById of Object.keys(linkedEntry.requiredBy)) {\n      const { name: requiredByName, version: requiredByVersion } = parseRequiredBy(requiredById);\n      let requiredByEntry = appMap[requiredByName][requiredByVersion];\n\n      // If we can't find the requiredBy entry, it likely means that the entry was already replaced with a linked entry\n      // in the app map. Fall back to the first entry.\n      requiredByEntry ??= Object.values(appMap[requiredByName])[0];\n\n      requiredByEntry.dependencies[name] = linkedEntry.version;\n    }\n\n    // Add the linked entry\n    appMap[linkedEntry.name] = { [linkedEntry.version]: linkedEntry };\n  }\n\n  const allDuplicates = [];\n\n  // Once all linked entries have been added, ensure their dependencies are resolved.\n  for (const linkedEntry of entriesToLink) {\n    const { duplicates } = await addLinkedEntryDependencies(\n      { linkedEntry, appMap: appMap, linkMap, resolutions },\n      context,\n    );\n    allDuplicates.push(...duplicates);\n  }\n\n  if (linkedPath.resolveStrategy !== 'duplicate') {\n    await dedupeLinkedPackages(\n      { appMap, allDuplicates: new Set(allDuplicates), rootPath: appRootPath, linkMap },\n      context,\n    );\n  }\n}\n\nfunction isContainedInPath(path: string, basePath: string): boolean {\n  path = normalizePath(path);\n  basePath = normalizePath(basePath);\n\n  return path.startsWith(basePath);\n}\n\nfunction normalizePath(path: string): string {\n  let normalizedPath = slash(path);\n\n  if (!normalizedPath.endsWith('/')) {\n    normalizedPath += '/';\n  }\n\n  return normalizedPath;\n}\n"]}
+{"version":3,"file":"linkPath.js","sourceRoot":"","sources":["../../../../src/resolveMap/createHelpers/link/linkPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageMap } from '../types/PackageMap.js';\nimport { addLinkedEntryDependencies } from './addLinkedEntryDependencies.js';\nimport { detachEntry } from './detachEntry.js';\nimport { findPackagesFromPath } from '../findPackagesFromPath.js';\nimport { parseRequiredBy } from '../parseRequiredBy.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type {\n  LinkedPath,\n  ResolveMapEntry,\n  PackageDefinitionsCache,\n  PackageJson,\n  ModuleResolutionConfig,\n} from '@ms-cloudpack/common-types';\nimport { dedupeLinkedPackages } from './dedupeLinkedPackages.js';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport { flattenResolveMap } from './flattenResolveMap.js';\nimport { getEffectiveResolutions } from './getEffectiveResolutions.js';\n\n/**\n * Find packages from `linkedPath` and add them to the `appMap`.\n */\nexport async function linkPath(\n  options: {\n    linkedPath: LinkedPath;\n    appMap: PackageMap;\n    appRootPath: string | undefined;\n    appRepoDefinition: PackageJson | undefined;\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<void> {\n  const { linkedPath, appMap, appRootPath, appRepoDefinition, moduleResolutionConfig } = options;\n\n  const linkedRootPath = linkedPath.rootPath || findProjectRoot(linkedPath.path, { noPackageRoot: true });\n\n  const linkMap = linkedPath?.remote\n    ? flattenResolveMap({ resolveMap: linkedPath.remote.resolveMap })\n    : await findPackagesFromPath(\n        {\n          searchPaths: [linkedPath.path],\n          discoverPackages: true,\n          rootPath: linkedRootPath,\n          moduleResolutionConfig,\n          appPath: linkedPath.path,\n        },\n        context,\n      );\n  const entriesToLink: ResolveMapEntry[] = [];\n  const { path, ignoredPackages = [], includeAll } = linkedPath;\n  const resolutions = getEffectiveResolutions(appRepoDefinition, linkedPath.ignoreResolutions);\n\n  // Iterate through the linkMap, looking for internal packages to link to the appMap.\n  for (const [packageName, packageVersions] of Object.entries(linkMap)) {\n    const appEntries = Object.values(appMap[packageName] || {});\n\n    if (!appEntries.length) {\n      continue;\n    }\n\n    const linkedEntries = Object.values(packageVersions);\n    const linkedEntry = linkedEntries.length === 1 ? linkedEntries[0] : undefined;\n\n    // For linked dependencies, we don't want multiple versions referenced. Remove them\n    // all and add them in a second pass.\n    if (\n      linkedEntry &&\n      !linkedEntry.isExternal &&\n      ignoredPackages.indexOf(packageName) === -1 &&\n      (includeAll || isContainedInPath(linkedEntry.path, path))\n    ) {\n      // Linked packages use an asterisk for the version description. This keeps it semver compatible with\n      // anything.\n      linkedEntry.version += '-linked';\n      linkedEntry.isLinked = true;\n\n      entriesToLink.push(linkedEntry);\n    }\n  }\n\n  // We now have a list of paths to link. Iterate through them, add them to the appMap,\n  // and ensure their dependencies are satisfied.\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    linkedEntry.requiredBy = {};\n    for (const entry of existingEntries) {\n      for (const [requiredById, requirement] of Object.entries(entry.requiredBy)) {\n        const requiredByName = parseRequiredBy(requiredById).name;\n        const linkedParentEntry = Object.values(linkMap[requiredByName] || {})[0];\n        const requiredByKey = linkedParentEntry?.isLinked\n          ? (`${linkedParentEntry.name}@${linkedParentEntry.version}` as const)\n          : requiredById;\n        linkedEntry.requiredBy[requiredByKey as `${string}@${string}`] = requirement;\n      }\n    }\n  }\n\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    // We need to detach all existing entries from the appMap, along with their dependencies. Note - detaching just means that\n    // we disconnect the entry from its parent and children. If the children have no other parents, we disconnect them as well\n    // and recurse through their children.\n    for (const existingEntry of existingEntries) {\n      detachEntry({ appMap, entry: existingEntry });\n    }\n\n    // Attach the linked entry to the parents' dependencies.\n    for (const requiredById of Object.keys(linkedEntry.requiredBy)) {\n      const { name: requiredByName, version: requiredByVersion } = parseRequiredBy(requiredById);\n      let requiredByEntry = appMap[requiredByName][requiredByVersion];\n\n      // If we can't find the requiredBy entry, it likely means that the entry was already replaced with a linked entry\n      // in the app map. Fall back to the first entry.\n      requiredByEntry ??= Object.values(appMap[requiredByName])[0];\n\n      requiredByEntry.dependencies[name] = linkedEntry.version;\n    }\n\n    // Add the linked entry\n    appMap[linkedEntry.name] = { [linkedEntry.version]: linkedEntry };\n  }\n\n  const allDuplicates = [];\n\n  // Once all linked entries have been added, ensure their dependencies are resolved.\n  for (const linkedEntry of entriesToLink) {\n    const { duplicates } = await addLinkedEntryDependencies(\n      { linkedEntry, appMap: appMap, linkMap, resolutions },\n      context,\n    );\n    allDuplicates.push(...duplicates);\n  }\n\n  if (linkedPath.resolveStrategy !== 'duplicate') {\n    await dedupeLinkedPackages(\n      { appMap, allDuplicates: new Set(allDuplicates), rootPath: appRootPath, linkMap },\n      context,\n    );\n  }\n}\n\nfunction isContainedInPath(path: string, basePath: string): boolean {\n  path = normalizePath(path);\n  basePath = normalizePath(basePath);\n\n  return path.startsWith(basePath);\n}\n\nfunction normalizePath(path: string): string {\n  let normalizedPath = slash(path);\n\n  if (!normalizedPath.endsWith('/')) {\n    normalizedPath += '/';\n  }\n\n  return normalizedPath;\n}\n"]}

package/lib/resolveMap/createLinkResolveMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createLinkResolveMap.d.ts","sourceRoot":"","sources":["../../src/resolveMap/createLinkResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAK/F;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAEhB,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;CAClC,GACA,OAAO,CAAC,UAAU,CAAC,CAmBrB"}
+{"version":3,"file":"createLinkResolveMap.d.ts","sourceRoot":"","sources":["../../src/resolveMap/createLinkResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAK/F;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAEhB,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;CAClC,GACA,OAAO,CAAC,UAAU,CAAC,CAoBrB"}

package/lib/resolveMap/createLinkResolveMap.js

@@ -18,6 +18,7 @@ export async function createLinkResolveMap(options, context) {
         discoverPackages: true,
         rootPath,
         moduleResolutionConfig: config.resolve,
+        appPath,
     }, context);
     return convertToLinkResolveMap({ appMap });
 }

package/lib/resolveMap/createLinkResolveMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createLinkResolveMap.js","sourceRoot":"","sources":["../../src/resolveMap/createLinkResolveMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAE1F;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAYC,EACD,OAGC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAClD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QAC1C,gBAAgB,EAAE,IAAI;QACtB,QAAQ;QACR,sBAAsB,EAAE,MAAM,CAAC,OAAO;KACvC,EACD,OAAO,CACR,CAAC;IAEF,OAAO,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC7C,CAAC","sourcesContent":["import type { PackageDefinitionsCache, ResolveMap, Session } from '@ms-cloudpack/common-types';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport { findPackagesFromPath } from './createHelpers/findPackagesFromPath.js';\nimport { convertToLinkResolveMap } from './createHelpers/link/convertToLinkResolveMap.js';\n\n/**\n * Create a link resolve map for a given `appPath`.\n * 1. Discover through the dependency tree to build a map of all packages and their dependencies.\n * 2. 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 createLinkResolveMap(\n  options: {\n    /** Path to the app whose dependencies we want to resolve. */\n    appPath: string;\n\n    /** Any additional packages whose dependencies we want to resolve. */\n    additionalPaths?: string[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the `appPath`.\n     */\n    rootPath?: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Pick<Session, 'config'>;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [] } = options;\n  const { session } = context;\n  const { config } = session;\n\n  const rootPath = options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      searchPaths: [appPath, ...additionalPaths],\n      discoverPackages: true,\n      rootPath,\n      moduleResolutionConfig: config.resolve,\n    },\n    context,\n  );\n\n  return convertToLinkResolveMap({ appMap });\n}\n"]}
+{"version":3,"file":"createLinkResolveMap.js","sourceRoot":"","sources":["../../src/resolveMap/createLinkResolveMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAE1F;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAYC,EACD,OAGC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAClD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QAC1C,gBAAgB,EAAE,IAAI;QACtB,QAAQ;QACR,sBAAsB,EAAE,MAAM,CAAC,OAAO;QACtC,OAAO;KACR,EACD,OAAO,CACR,CAAC;IAEF,OAAO,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC7C,CAAC","sourcesContent":["import type { PackageDefinitionsCache, ResolveMap, Session } from '@ms-cloudpack/common-types';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport { findPackagesFromPath } from './createHelpers/findPackagesFromPath.js';\nimport { convertToLinkResolveMap } from './createHelpers/link/convertToLinkResolveMap.js';\n\n/**\n * Create a link resolve map for a given `appPath`.\n * 1. Discover through the dependency tree to build a map of all packages and their dependencies.\n * 2. 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 createLinkResolveMap(\n  options: {\n    /** Path to the app whose dependencies we want to resolve. */\n    appPath: string;\n\n    /** Any additional packages whose dependencies we want to resolve. */\n    additionalPaths?: string[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the `appPath`.\n     */\n    rootPath?: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    session: Pick<Session, 'config'>;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [] } = options;\n  const { session } = context;\n  const { config } = session;\n\n  const rootPath = options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      searchPaths: [appPath, ...additionalPaths],\n      discoverPackages: true,\n      rootPath,\n      moduleResolutionConfig: config.resolve,\n      appPath,\n    },\n    context,\n  );\n\n  return convertToLinkResolveMap({ appMap });\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"createResolveMap.d.ts","sourceRoot":"","sources":["../../src/resolveMap/createResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,sBAAsB,EACtB,uBAAuB,EACvB,UAAU,EACX,MAAM,4BAA4B,CAAC;AAMpC;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAEhB,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAE3B,sCAAsC;IACtC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAoCrB"}
+{"version":3,"file":"createResolveMap.d.ts","sourceRoot":"","sources":["../../src/resolveMap/createResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,sBAAsB,EACtB,uBAAuB,EACvB,UAAU,EACX,MAAM,4BAA4B,CAAC;AAMpC;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IACP,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAEhB,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAE3B,sCAAsC;IACtC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAqCrB"}

package/lib/resolveMap/createResolveMap.js

@@ -30,6 +30,7 @@ export async function createResolveMap(options, context) {
         rootPath,
         skipResolveDependencies,
         moduleResolutionConfig,
+        appPath,
     }, context);
     // Next, we iterate through linked paths to inject them into the packageMap.
     for (const linkedPath of linkedPaths) {

package/lib/resolveMap/createResolveMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../../src/resolveMap/createResolveMap.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAE5D;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAuBC,EACD,OAEC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;IAErH,IAAI,uBAAuB,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,+FAA+F;IAC/F,mDAAmD;IACnD,MAAM,QAAQ,GAAG,uBAAuB;QACtC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1E,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QAC1C,QAAQ;QACR,uBAAuB;QACvB,sBAAsB;KACvB,EACD,OAAO,CACR,CAAC;IAEF,4EAA4E;IAC5E,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,QAAQ,CACZ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,EACxG,OAAO,CACR,CAAC;IACJ,CAAC;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 {\n  LinkedPath,\n  ModuleResolutionConfig,\n  PackageDefinitionsCache,\n  ResolveMap,\n} from '@ms-cloudpack/common-types';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport { convertToResolveMap } from './createHelpers/convertToResolveMap.js';\nimport { findPackagesFromPath } from './createHelpers/findPackagesFromPath.js';\nimport { linkPath } from './createHelpers/link/linkPath.js';\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    /** Path to the app whose dependencies we want to resolve. */\n    appPath: string;\n\n    /** Any additional packages whose dependencies we want to resolve. */\n    additionalPaths?: string[];\n\n    /** See `createResolveMap` comment. */\n    linkedPaths?: LinkedPath[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the `appPath`.\n     */\n    rootPath?: string;\n\n    /**\n     * Skip the actual resolution of dependencies. The returned resolve map will only contain\n     * the package(s) from the given path(s). Not compatible with `linkedPaths`.\n     */\n    skipResolveDependencies?: boolean;\n\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [], linkedPaths = [], skipResolveDependencies, moduleResolutionConfig } = options;\n\n  if (skipResolveDependencies && linkedPaths.length) {\n    throw new Error('Cannot use `linkedPaths` with `skipResolveDependencies`');\n  }\n\n  // rootPath is only used as the place to stop searching up for dependencies, so we can skip the\n  // calculation if we're not resolving dependencies.\n  const rootPath = skipResolveDependencies\n    ? undefined\n    : options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });\n\n  const repoDefinition = rootPath ? await context.packages.tryGet(rootPath) : undefined;\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      searchPaths: [appPath, ...additionalPaths],\n      rootPath,\n      skipResolveDependencies,\n      moduleResolutionConfig,\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(\n      { linkedPath, appRootPath: rootPath, appMap, appRepoDefinition: repoDefinition, moduleResolutionConfig },\n      context,\n    );\n  }\n\n  // Finally we condense into a resolve map.\n  return convertToResolveMap({ appMap, rootPaths: [appPath, ...additionalPaths] });\n}\n"]}
+{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../../src/resolveMap/createResolveMap.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAE5D;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAuBC,EACD,OAEC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;IAErH,IAAI,uBAAuB,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,+FAA+F;IAC/F,mDAAmD;IACnD,MAAM,QAAQ,GAAG,uBAAuB;QACtC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1E,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QAC1C,QAAQ;QACR,uBAAuB;QACvB,sBAAsB;QACtB,OAAO;KACR,EACD,OAAO,CACR,CAAC;IAEF,4EAA4E;IAC5E,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,QAAQ,CACZ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,EACxG,OAAO,CACR,CAAC;IACJ,CAAC;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 {\n  LinkedPath,\n  ModuleResolutionConfig,\n  PackageDefinitionsCache,\n  ResolveMap,\n} from '@ms-cloudpack/common-types';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport { convertToResolveMap } from './createHelpers/convertToResolveMap.js';\nimport { findPackagesFromPath } from './createHelpers/findPackagesFromPath.js';\nimport { linkPath } from './createHelpers/link/linkPath.js';\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    /** Path to the app whose dependencies we want to resolve. */\n    appPath: string;\n\n    /** Any additional packages whose dependencies we want to resolve. */\n    additionalPaths?: string[];\n\n    /** See `createResolveMap` comment. */\n    linkedPaths?: LinkedPath[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the `appPath`.\n     */\n    rootPath?: string;\n\n    /**\n     * Skip the actual resolution of dependencies. The returned resolve map will only contain\n     * the package(s) from the given path(s). Not compatible with `linkedPaths`.\n     */\n    skipResolveDependencies?: boolean;\n\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [], linkedPaths = [], skipResolveDependencies, moduleResolutionConfig } = options;\n\n  if (skipResolveDependencies && linkedPaths.length) {\n    throw new Error('Cannot use `linkedPaths` with `skipResolveDependencies`');\n  }\n\n  // rootPath is only used as the place to stop searching up for dependencies, so we can skip the\n  // calculation if we're not resolving dependencies.\n  const rootPath = skipResolveDependencies\n    ? undefined\n    : options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });\n\n  const repoDefinition = rootPath ? await context.packages.tryGet(rootPath) : undefined;\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      searchPaths: [appPath, ...additionalPaths],\n      rootPath,\n      skipResolveDependencies,\n      moduleResolutionConfig,\n      appPath,\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(\n      { linkedPath, appRootPath: rootPath, appMap, appRepoDefinition: repoDefinition, moduleResolutionConfig },\n      context,\n    );\n  }\n\n  // Finally we condense into a resolve map.\n  return convertToResolveMap({ appMap, rootPaths: [appPath, ...additionalPaths] });\n}\n"]}

package/lib/resolveMap/ensureResolveMapEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureResolveMapEntry.d.ts","sourceRoot":"","sources":["../../src/resolveMap/ensureResolveMapEntry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,WAAW,EACX,UAAU,EACX,MAAM,4BAA4B,CAAC;AAGpC;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IACN,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAA;CAAE,CAAC,CAkFlE"}
+{"version":3,"file":"ensureResolveMapEntry.d.ts","sourceRoot":"","sources":["../../src/resolveMap/ensureResolveMapEntry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,WAAW,EACX,UAAU,EACX,MAAM,4BAA4B,CAAC;AAGpC;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IACN,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAA;CAAE,CAAC,CAmFlE"}

package/lib/resolveMap/ensureResolveMapEntry.js

@@ -26,6 +26,7 @@ export async function ensureResolveMapEntry(params, context) {
         rootPath,
         importerContext,
         moduleResolutionConfig,
+        appPath,
     }, context);
     dependencyPath = dependencyPackage?.packagePath;
     dependencyDefinition = dependencyPackage?.definition;

package/lib/resolveMap/ensureResolveMapEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensureResolveMapEntry.js","sourceRoot":"","sources":["../../src/resolveMap/ensureResolveMapEntry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAQ/D,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAQC,EACD,OAEC;IAED,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,sBAAsB,EAAE,GAC7G,MAAM,CAAC;IACT,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,MAAM,WAAW,GAAG,mBAAmB,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;IAEnH,kEAAkE;IAClE,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,YAAY,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;IAClG,IAAI,cAAc,GAAG,YAAY,EAAE,IAAI,CAAC;IACxC,IAAI,oBAAoB,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE3F,+FAA+F;IAC/F,IAAI,cAAc,IAAI,oBAAoB,IAAI,YAAY,EAAE,UAAU,CAAC,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACnH,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC;IACtD,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnE,MAAM,iBAAiB,GAAG,MAAM,WAAW,CACzC;QACE,cAAc;QACd,SAAS,EAAE,WAAW;QACtB,QAAQ;QACR,eAAe;QACf,sBAAsB;KACvB,EACD,OAAO,CACR,CAAC;IAEF,cAAc,GAAG,iBAAiB,EAAE,WAAW,CAAC;IAChD,oBAAoB,GAAG,iBAAiB,EAAE,UAAU,CAAC;IACrD,MAAM,OAAO,GAAG,oBAAoB,EAAE,OAAO,CAAC;IAE9C,uEAAuE;IACvE,IAAI,CAAC,cAAc,IAAI,CAAC,oBAAoB,IAAI,CAAC,OAAO,EAAE,CAAC;QACzD,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC;IACtC,CAAC;IAED,yDAAyD;IACzD,IAAI,eAAe,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;SACnH,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IAEnE,sEAAsE;IACtE,IAAI,eAAe,EAAE,CAAC;QACpB,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;QACnD,eAAe,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;QACjF,+DAA+D;QAC/D,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,eAAe,CAAC,OAAO,KAAK,UAAU,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/G,CAAC;IAED,iDAAiD;IACjD,eAAe,GAAG;QAChB,IAAI,EAAE,cAAc;QACpB,OAAO;QACP,IAAI,EAAE,cAAc;QACpB,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE;YACV,CAAC,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO;SACtD;KACF,CAAC;IAEF,IAAI,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAAC;QACtC,eAAe,CAAC,UAAU,GAAG,IAAI,CAAC;IACpC,CAAC;IAED,WAAW,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;IAEnD,yCAAyC;IACzC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,UAAU,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,UAAU,CAAC,cAAc,CAAC,CAAC,cAAc,KAAK,EAAE,CAAC;QACjD,UAAU,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC;IACvE,CAAC;IAED,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;AACrD,CAAC","sourcesContent":["import { findProjectRoot, isExternalPackage } from '@ms-cloudpack/path-utilities';\nimport { findResolveMapEntry } from './findResolveMapEntry.js';\nimport type {\n  ModuleResolutionConfig,\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n  ResolveMap,\n} from '@ms-cloudpack/common-types';\nimport { findPackage } from '../findFileInPackage/findPackage.js';\n\n/**\n * Ensure that a package is in the resolve map and return the path to the package.\n */\nexport async function ensureResolveMapEntry(\n  params: {\n    definition: PackageJson;\n    packagePath: string;\n    dependencyName: string;\n    resolveMap: ResolveMap;\n    appPath: string;\n    importerContext: PackageImporterContext | undefined;\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ dependencyPath?: string; updatedResolution: boolean }> {\n  const { dependencyName, resolveMap, packagePath, appPath, definition, importerContext, moduleResolutionConfig } =\n    params;\n  const { packages } = context;\n\n  const parentEntry = findResolveMapEntry({ packageName: definition.name, version: definition.version, resolveMap });\n\n  // If we can't find the parent entry, we can't add the dependency.\n  if (!parentEntry) {\n    return { updatedResolution: false };\n  }\n\n  const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n  let dependencyPath = resolveEntry?.path;\n  let dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n  // If the dependency is already in the resolve map and required by the parent, return the path.\n  if (dependencyPath && dependencyDefinition && resolveEntry?.requiredBy[`${definition.name}@${definition.version}`]) {\n    return { dependencyPath, updatedResolution: false };\n  }\n\n  const rootPath = findProjectRoot(appPath, { noPackageRoot: true });\n\n  const dependencyPackage = await findPackage(\n    {\n      dependencyName,\n      startPath: packagePath,\n      rootPath,\n      importerContext,\n      moduleResolutionConfig,\n    },\n    context,\n  );\n\n  dependencyPath = dependencyPackage?.packagePath;\n  dependencyDefinition = dependencyPackage?.definition;\n  const version = dependencyDefinition?.version;\n\n  // If we can't find the dependency, we can't add it to the resolve map.\n  if (!dependencyPath || !dependencyDefinition || !version) {\n    return { updatedResolution: false };\n  }\n\n  // Check if the dependency is already in the resolve map.\n  let dependencyEntry = [resolveMap[dependencyName], ...Object.values(resolveMap[dependencyName]?.scopedVersions || {})]\n    .filter(Boolean)\n    .find((e) => e.version === version && e.path === dependencyPath);\n\n  // If it already exists, add the requiredBy entry and return the path.\n  if (dependencyEntry) {\n    parentEntry.dependencies[dependencyName] = version;\n    dependencyEntry.requiredBy[`${definition.name}@${definition.version}`] = version;\n    // If the dependency is scoped, we have changed the resolution.\n    return { dependencyPath, updatedResolution: dependencyEntry.version !== resolveMap[dependencyName].version };\n  }\n\n  // If it is missing from the resolve map, add it.\n  dependencyEntry = {\n    name: dependencyName,\n    version,\n    path: dependencyPath,\n    dependencies: {},\n    requiredBy: {\n      [`${definition.name}@${definition.version}`]: version,\n    },\n  };\n\n  if (isExternalPackage(dependencyPath)) {\n    dependencyEntry.isExternal = true;\n  }\n\n  parentEntry.dependencies[dependencyName] = version;\n\n  // Add the dependency to the resolve map.\n  if (!resolveMap[dependencyName]) {\n    resolveMap[dependencyName] = dependencyEntry;\n  } else {\n    resolveMap[dependencyName].scopedVersions ??= {};\n    resolveMap[dependencyName].scopedVersions[version] = dependencyEntry;\n  }\n\n  return { dependencyPath, updatedResolution: true };\n}\n"]}
+{"version":3,"file":"ensureResolveMapEntry.js","sourceRoot":"","sources":["../../src/resolveMap/ensureResolveMapEntry.ts"],"names":[],"mappings":"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","sourcesContent":["import { findProjectRoot, isExternalPackage } from '@ms-cloudpack/path-utilities';\nimport { findResolveMapEntry } from './findResolveMapEntry.js';\nimport type {\n  ModuleResolutionConfig,\n  PackageDefinitionsCache,\n  PackageImporterContext,\n  PackageJson,\n  ResolveMap,\n} from '@ms-cloudpack/common-types';\nimport { findPackage } from '../findFileInPackage/findPackage.js';\n\n/**\n * Ensure that a package is in the resolve map and return the path to the package.\n */\nexport async function ensureResolveMapEntry(\n  params: {\n    definition: PackageJson;\n    packagePath: string;\n    dependencyName: string;\n    resolveMap: ResolveMap;\n    appPath: string;\n    importerContext: PackageImporterContext | undefined;\n    moduleResolutionConfig?: ModuleResolutionConfig;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<{ dependencyPath?: string; updatedResolution: boolean }> {\n  const { dependencyName, resolveMap, packagePath, appPath, definition, importerContext, moduleResolutionConfig } =\n    params;\n  const { packages } = context;\n\n  const parentEntry = findResolveMapEntry({ packageName: definition.name, version: definition.version, resolveMap });\n\n  // If we can't find the parent entry, we can't add the dependency.\n  if (!parentEntry) {\n    return { updatedResolution: false };\n  }\n\n  const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n  let dependencyPath = resolveEntry?.path;\n  let dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n  // If the dependency is already in the resolve map and required by the parent, return the path.\n  if (dependencyPath && dependencyDefinition && resolveEntry?.requiredBy[`${definition.name}@${definition.version}`]) {\n    return { dependencyPath, updatedResolution: false };\n  }\n\n  const rootPath = findProjectRoot(appPath, { noPackageRoot: true });\n\n  const dependencyPackage = await findPackage(\n    {\n      dependencyName,\n      startPath: packagePath,\n      rootPath,\n      importerContext,\n      moduleResolutionConfig,\n      appPath,\n    },\n    context,\n  );\n\n  dependencyPath = dependencyPackage?.packagePath;\n  dependencyDefinition = dependencyPackage?.definition;\n  const version = dependencyDefinition?.version;\n\n  // If we can't find the dependency, we can't add it to the resolve map.\n  if (!dependencyPath || !dependencyDefinition || !version) {\n    return { updatedResolution: false };\n  }\n\n  // Check if the dependency is already in the resolve map.\n  let dependencyEntry = [resolveMap[dependencyName], ...Object.values(resolveMap[dependencyName]?.scopedVersions || {})]\n    .filter(Boolean)\n    .find((e) => e.version === version && e.path === dependencyPath);\n\n  // If it already exists, add the requiredBy entry and return the path.\n  if (dependencyEntry) {\n    parentEntry.dependencies[dependencyName] = version;\n    dependencyEntry.requiredBy[`${definition.name}@${definition.version}`] = version;\n    // If the dependency is scoped, we have changed the resolution.\n    return { dependencyPath, updatedResolution: dependencyEntry.version !== resolveMap[dependencyName].version };\n  }\n\n  // If it is missing from the resolve map, add it.\n  dependencyEntry = {\n    name: dependencyName,\n    version,\n    path: dependencyPath,\n    dependencies: {},\n    requiredBy: {\n      [`${definition.name}@${definition.version}`]: version,\n    },\n  };\n\n  if (isExternalPackage(dependencyPath)) {\n    dependencyEntry.isExternal = true;\n  }\n\n  parentEntry.dependencies[dependencyName] = version;\n\n  // Add the dependency to the resolve map.\n  if (!resolveMap[dependencyName]) {\n    resolveMap[dependencyName] = dependencyEntry;\n  } else {\n    resolveMap[dependencyName].scopedVersions ??= {};\n    resolveMap[dependencyName].scopedVersions[version] = dependencyEntry;\n  }\n\n  return { dependencyPath, updatedResolution: true };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "13.1.2",
+  "version": "13.1.4",
   "description": "Utilities for resolving/parsing packages and their imports in Cloudpack",
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.30.0",
+    "@ms-cloudpack/common-types": "^0.31.1",
     "@ms-cloudpack/json-utilities": "^0.1.11",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.1.28",
+    "@ms-cloudpack/path-utilities": "^3.1.30",
     "@ms-cloudpack/task-reporter": "^0.17.4",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",