@ms-cloudpack/package-utilities 12.3.15 → 12.3.17

package/lib/resolveMap/createHelpers/findPackagesFromPath.js

@@ -82,7 +82,7 @@ async function visitPackage(options, context) {
         };
         const dependencyPackage = await findPackage({ dependencyName, startPath: packagePath, rootPath, importerContext: depImporterContext, realPathCache }, context);
         if (!dependencyPackage) {
-            if (packageDefinition.peerDependencies?.[dependencyName]) {
+            if (packageDefinition.peerDependencies?.[dependencyName] !== undefined) {
                 // Ignore missing peer dependencies
                 console.debug(`Ignoring missing peer dependency "${dependencyName}" required by "${name}@${version}"`);
                 continue;

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  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  context: {\n    /**\n     * Package cache.\n     */\n    packages: PackageDefinitionsCache;\n  },\n): Promise<PackageMap> {\n  const { searchPaths, discoverPackages, skipResolveDependencies, rootPath } = 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          { packagePath, packageMap, rootPath, importerContext, realPathCache, skipResolveDependencies },\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  },\n  context: Parameters<typeof findPackagesFromPath>[1],\n): Promise<PackagePathInfo[]> {\n  const { packagePath, packageMap, rootPath, importerContext, realPathCache, skipResolveDependencies } = 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      { dependencyName, startPath: packagePath, rootPath, importerContext: depImporterContext, realPathCache },\n      context,\n    );\n    if (!dependencyPackage) {\n      if (packageDefinition.peerDependencies?.[dependencyName]) {\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":"AAMA,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAKvE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAwBC,EACD,OAKC;IAED,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACrF,MAAM,UAAU,GAAe,EAAE,CAAC;IAClC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,MAAM,aAAa,GAAuC,EAAE,CAAC;IAE7D,IAAI,gBAAgB,IAAI,uBAAuB,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,QAAQ,UAAU,4DAA4D,CAAC,CAAC;QAClG,CAAC;QAED,IAAI,YAA+B,CAAC;QAEpC,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;YAExG,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpG,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;YAC3B,8FAA8F;YAC9F,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC,KAAK,EAAG,CAAC;YAE/D,4FAA4F;YAC5F,+FAA+F;YAC/F,0FAA0F;YAC1F,8FAA8F;YAC9F,gGAAgG;YAChG,gGAAgG;YAChG,8FAA8F;YAC9F,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBACnC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAE9B,MAAM,eAAe,GAAG,MAAM,YAAY,CACxC,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,uBAAuB,EAAE,EAC9F,OAAO,CACR,CAAC;gBAEF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;oBAC7C,uFAAuF;oBACvF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC;wBAClD,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,YAAY,CACzB,OAKC,EACD,OAAmD;IAEnD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAC/G,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IAE/E,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;IAC5C,MAAM,KAAK,GAAG,kBAAkB,CAAC;QAC/B,WAAW,EAAE,eAAe,EAAE,YAAY,IAAI,IAAI;QAClD,WAAW,EAAE,WAAW;QACxB,UAAU;QACV,UAAU,EAAE,iBAAiB;KAC9B,CAAC,CAAC;IAEH,IAAI,uBAAuB,EAAE,CAAC;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,sDAAsD;IACtD,MAAM,YAAY,GAAG,eAAe,CAAC,iBAAiB,CAA2B,CAAC;IAElF,MAAM,eAAe,GAAsB,EAAE,CAAC;IAE9C,KAAK,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAChF,MAAM,kBAAkB,GAA2B;YACjD,UAAU,EAAE,IAAI;YAChB,aAAa,EAAE,OAAO;YACtB,YAAY,EAAE,cAAc;YAC5B,kBAAkB;SACnB,CAAC;QAEF,MAAM,iBAAiB,GAAG,MAAM,WAAW,CACzC,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,EACxG,OAAO,CACR,CAAC;QACF,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,IAAI,iBAAiB,CAAC,gBAAgB,EAAE,CAAC,cAAc,CAAC,KAAK,SAAS,EAAE,CAAC;gBACvE,mCAAmC;gBACnC,OAAO,CAAC,KAAK,CAAC,qCAAqC,cAAc,kBAAkB,IAAI,IAAI,OAAO,GAAG,CAAC,CAAC;gBACvG,SAAS;YACX,CAAC;YAED,MAAM,IAAI,KAAK,CACb;gBACE,kCAAkC;gBAClC,YAAY,CAAC;oBACX,eAAe,cAAc,eAAe,kBAAkB,GAAG;oBACjE,gBAAgB,WAAW,EAAE;iBAC9B,CAAC;gBACF,EAAE;gBACF,sDAAsD;aACvD,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,oBAAoB,EAAE,GAAG,iBAAiB,CAAC;QAE5F,IAAI,CAAC,CAAC,oBAAoB,CAAC,IAAI,IAAI,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,IAAI,cAAc,8CAA8C,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,eAAe,GAAG,kBAAkB,CAAC;YACzC,WAAW,EAAE,cAAc;YAC3B,WAAW,EAAE,cAAc;YAC3B,UAAU;YACV,UAAU,EAAE,oBAAoB;SACjC,CAAC,CAAC;QAEH,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC;QAClE,eAAe,CAAC,UAAU,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,GAAG,kBAAkB,CAAC;QAEtE,eAAe,CAAC,IAAI,CAAC;YACnB,WAAW,EAAE,cAAc;YAC3B,eAAe,EAAE,kBAAkB;SACpC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CAAC,OAK3B;IACC,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAChF,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAE/B,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAExB,IAAI,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IACtC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG;YAClC,IAAI;YACJ,OAAO;YACP,IAAI,EAAE,WAAW;YACjB,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,EAAE;SACf,CAAC;QAEF,IAAI,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC;YACnC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import type {\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  context: {\n    /**\n     * Package cache.\n     */\n    packages: PackageDefinitionsCache;\n  },\n): Promise<PackageMap> {\n  const { searchPaths, discoverPackages, skipResolveDependencies, rootPath } = 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          { packagePath, packageMap, rootPath, importerContext, realPathCache, skipResolveDependencies },\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  },\n  context: Parameters<typeof findPackagesFromPath>[1],\n): Promise<PackagePathInfo[]> {\n  const { packagePath, packageMap, rootPath, importerContext, realPathCache, skipResolveDependencies } = 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      { dependencyName, startPath: packagePath, rootPath, importerContext: depImporterContext, realPathCache },\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "12.3.15",
+  "version": "12.3.17",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.25.2",
+    "@ms-cloudpack/common-types": "^0.26.1",
     "@ms-cloudpack/json-utilities": "^0.1.10",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.1.9",
+    "@ms-cloudpack/path-utilities": "^3.1.11",
     "@ms-cloudpack/task-reporter": "^0.17.2",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",