@ms-cloudpack/package-utilities 13.1.5 → 13.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/findFileInPackage/findPackage.d.ts +3 -1
- package/lib/findFileInPackage/findPackage.d.ts.map +1 -1
- package/lib/findFileInPackage/findPackage.js +4 -0
- package/lib/findFileInPackage/findPackage.js.map +1 -1
- package/lib/resolveMap/createHelpers/findPackagesFromPath.js +1 -0
- package/lib/resolveMap/createHelpers/findPackagesFromPath.js.map +1 -1
- package/lib/resolveMap/ensureResolveMapEntry.d.ts.map +1 -1
- package/lib/resolveMap/ensureResolveMapEntry.js +1 -0
- package/lib/resolveMap/ensureResolveMapEntry.js.map +1 -1
- package/package.json +3 -3
|
@@ -9,8 +9,10 @@ export declare function findPackage(options: {
|
|
|
9
9
|
* (This is usually the actual name, except for renamed non-semver deps.)
|
|
10
10
|
*/
|
|
11
11
|
dependencyName: string;
|
|
12
|
-
/** Start searching up from the `node_modules` of this folder. */
|
|
12
|
+
/** Start searching up from the `node_modules` of this parent folder. */
|
|
13
13
|
startPath: string;
|
|
14
|
+
/** Parent definition, used for self imports. */
|
|
15
|
+
definition: PackageJson;
|
|
14
16
|
/** Context in which `dependencyName` is imported. */
|
|
15
17
|
importerContext?: PackageImporterContext;
|
|
16
18
|
/** Stop searching at this path (usually the git root). Defaults to filesystem root. */
|
|
@@ -1 +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,
|
|
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,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,UAAU,EAAE,WAAW,CAAC;IACxB,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,CAsEvE"}
|
|
@@ -7,6 +7,10 @@ import fs from 'fs';
|
|
|
7
7
|
export async function findPackage(options, context) {
|
|
8
8
|
const { dependencyName, rootPath, importerContext, realPathCache = {}, moduleResolutionConfig, appPath } = options;
|
|
9
9
|
const { packages } = context;
|
|
10
|
+
if (dependencyName == options.definition.name) {
|
|
11
|
+
// Self-import detected, returning parent path and definition
|
|
12
|
+
return { packagePath: options.startPath, definition: options.definition };
|
|
13
|
+
}
|
|
10
14
|
// Use appPath for deduped packages to ensure consistent resolution, otherwise use startPath
|
|
11
15
|
const shouldDedupe = moduleResolutionConfig?.dedupe?.includes(dependencyName);
|
|
12
16
|
let startPath;
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"findPackage.js","sourceRoot":"","sources":["../../src/findFileInPackage/findPackage.ts"],"names":[],"mappings":"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","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 parent folder. */\n startPath: string;\n /** Parent definition, used for self imports. */\n definition: PackageJson;\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 if (dependencyName == options.definition.name) {\n // Self-import detected, returning parent path and definition\n return { packagePath: options.startPath, definition: options.definition };\n }\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"]}
|
|
@@ -1 +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 /**\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"]}
|
|
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 /**\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 definition: packageDefinition,\n dependencyName,\n startPath: packagePath,\n rootPath,\n importerContext: depImporterContext,\n realPathCache,\n moduleResolutionConfig,\n appPath,\n },\n context,\n );\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"]}
|
|
@@ -1 +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,
|
|
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,CAoFlE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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"]}
|
|
1
|
+
{"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 definition,\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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/package-utilities",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.2.0",
|
|
4
4
|
"description": "Utilities for resolving/parsing packages and their imports in Cloudpack",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@ms-cloudpack/common-types": "^0.
|
|
17
|
+
"@ms-cloudpack/common-types": "^0.32.0",
|
|
18
18
|
"@ms-cloudpack/json-utilities": "^0.1.11",
|
|
19
19
|
"@ms-cloudpack/path-string-parsing": "^1.2.7",
|
|
20
|
-
"@ms-cloudpack/path-utilities": "^3.1.
|
|
20
|
+
"@ms-cloudpack/path-utilities": "^3.1.32",
|
|
21
21
|
"@ms-cloudpack/task-reporter": "^0.17.4",
|
|
22
22
|
"acorn": "^8.11.2",
|
|
23
23
|
"acorn-walk": "^8.2.1",
|