@pnpm/installing.deps-resolver 1100.1.2 → 1100.1.4

package/lib/getNonDevWantedDependencies.d.ts

@@ -7,6 +7,9 @@ export interface WantedDependency {
     injected?: boolean;
     saveCatalogName?: string;
 }
-type GetNonDevWantedDependenciesManifest = Pick<DependencyManifest, 'bundleDependencies' | 'bundledDependencies' | 'optionalDependencies' | 'dependencies' | 'dependenciesMeta'>;
+type GetNonDevWantedDependenciesManifest = Pick<DependencyManifest, 'bundleDependencies' | 'bundledDependencies' | 'optionalDependencies' | 'dependencies' | 'dependenciesMeta'> & {
+    name?: string;
+    version?: string;
+};
 export declare function getNonDevWantedDependencies(pkg: GetNonDevWantedDependenciesManifest): WantedDependency[];
 export {};

package/lib/getNonDevWantedDependencies.js

@@ -1,5 +1,11 @@
 import { pickBy } from 'ramda';
+import { assertValidDependencyAliases } from './validateDependencyAlias.js';
 export function getNonDevWantedDependencies(pkg) {
+    const pkgDescription = pkg.name != null
+        ? `Package "${pkg.name}${pkg.version != null ? `@${pkg.version}` : ''}"`
+        : 'Package';
+    assertValidDependencyAliases(pkg.dependencies, pkgDescription);
+    assertValidDependencyAliases(pkg.optionalDependencies, pkgDescription);
     let bd = pkg.bundledDependencies ?? pkg.bundleDependencies;
     if (bd === true) {
         bd = pkg.dependencies != null ? Object.keys(pkg.dependencies) : [];

package/lib/getWantedDependencies.js

@@ -1,5 +1,10 @@
 import { filterDependenciesByType } from '@pnpm/pkg-manifest.utils';
+import { assertValidDependencyAliases } from './validateDependencyAlias.js';
 export function getWantedDependencies(pkg, opts) {
+    assertValidDependencyAliases(pkg.dependencies, 'The current package');
+    assertValidDependencyAliases(pkg.devDependencies, 'The current package');
+    assertValidDependencyAliases(pkg.optionalDependencies, 'The current package');
+    assertValidDependencyAliases(pkg.peerDependencies, 'The current package');
     let depsToInstall = filterDependenciesByType(pkg, opts?.includeDirect ?? {
         dependencies: true,
         devDependencies: true,

package/lib/resolveDependencies.d.ts

@@ -77,6 +77,7 @@ export interface ResolutionContext {
     defaultTag: string;
     dryRun: boolean;
     forceFullResolution: boolean;
+    updateChecksums?: boolean;
     ignoreScripts?: boolean;
     resolvedPkgsById: ResolvedPkgsById;
     resolvePeersFromWorkspaceRoot?: boolean;

package/lib/resolveDependencies.js

@@ -321,8 +321,12 @@ export async function resolveDependencies(ctx, preferredVersions, wantedDependen
     const postponedResolutionsQueue = [];
     const postponedPeersResolutionQueue = [];
     const pkgAddresses = [];
-    await Promise.all(extendedWantedDeps.map(async (extendedWantedDep) => {
-        const { resolveDependencyResult, postponedResolution, postponedPeersResolution, } = await resolveDependenciesOfDependency(ctx, preferredVersions, options, extendedWantedDep);
+    // Resolve in parallel, then drain the results in input order. Pushing
+    // from inside the Promise.all callbacks would leak completion-order timing
+    // into pkgAddresses / postponedResolutionsQueue, which downstream
+    // determines how cyclic peer suffixes are assigned. See pnpm/pnpm#8155.
+    const resolvedDependencies = await Promise.all(extendedWantedDeps.map((extendedWantedDep) => resolveDependenciesOfDependency(ctx, preferredVersions, options, extendedWantedDep)));
+    for (const { resolveDependencyResult, postponedResolution, postponedPeersResolution } of resolvedDependencies) {
         if (resolveDependencyResult) {
             pkgAddresses.push(resolveDependencyResult);
         }
@@ -332,7 +336,7 @@ export async function resolveDependencies(ctx, preferredVersions, wantedDependen
         if (postponedPeersResolution) {
             postponedPeersResolutionQueue.push(postponedPeersResolution);
         }
-    }));
+    }
     const newPreferredVersions = Object.create(preferredVersions);
     const currentParentPkgAliases = {};
     for (const pkgAddress of pkgAddresses) {
@@ -446,6 +450,7 @@ async function resolveDependenciesOfDependency(ctx, preferredVersions, options,
         proceed: extendedWantedDep.proceed || updateShouldContinue || ctx.updatedSet.size > 0,
         publishedBy: options.publishedBy,
         update: update ? options.updateToLatest ? 'latest' : 'compatible' : false,
+        updateChecksums: ctx.updateChecksums,
         updateDepth,
         updateRequested,
         supportedArchitectures: options.supportedArchitectures,
@@ -781,6 +786,7 @@ async function resolveDependency(wantedDependency, ctx, options) {
             trustPolicyExclude: ctx.trustPolicyExclude,
             trustPolicyIgnoreAfter: ctx.trustPolicyIgnoreAfter,
             update: options.update,
+            updateChecksums: options.updateChecksums,
             workspacePackages: ctx.workspacePackages,
             supportedArchitectures: options.supportedArchitectures,
             onFetchError: (err) => {

package/lib/resolveDependencyTree.d.ts

@@ -76,6 +76,7 @@ export interface ResolveDependenciesOptions {
     engineStrict: boolean;
     force: boolean;
     forceFullResolution: boolean;
+    updateChecksums?: boolean;
     ignoreScripts?: boolean;
     hooks: {
         readPackage?: ReadPackageHook;

package/lib/resolveDependencyTree.js

@@ -24,6 +24,7 @@ export async function resolveDependencyTree(importers, opts) {
         engineStrict: opts.engineStrict,
         force: opts.force,
         forceFullResolution: opts.forceFullResolution,
+        updateChecksums: opts.updateChecksums,
         ignoreScripts: opts.ignoreScripts,
         injectWorkspacePackages: opts.injectWorkspacePackages,
         linkWorkspacePackagesDepth: opts.linkWorkspacePackagesDepth ?? -1,

package/lib/validateDependencyAlias.d.ts

@@ -0,0 +1,2 @@
+export declare function isValidDependencyAlias(alias: string): boolean;
+export declare function assertValidDependencyAliases(deps: Record<string, unknown> | undefined, parentPkgDescription: string): void;

package/lib/validateDependencyAlias.js

@@ -0,0 +1,24 @@
+import { PnpmError } from '@pnpm/error';
+import validateNpmPackageName from 'validate-npm-package-name';
+// An alias is the directory name pnpm creates inside `node_modules`, so
+// it must be a valid npm package name. Anything else (path-traversal
+// shapes such as `@x/../../../../../.git/hooks`, control characters,
+// names that collide with pnpm's own `node_modules` layout such as
+// `.bin` / `.pnpm` / `node_modules`) is rejected. Matches the
+// `validForOldPackages` check `parseWantedDependency` applies to
+// CLI-given names.
+export function isValidDependencyAlias(alias) {
+    return typeof alias === 'string' && validateNpmPackageName(alias).validForOldPackages;
+}
+export function assertValidDependencyAliases(deps, parentPkgDescription) {
+    if (deps == null)
+        return;
+    for (const alias of Object.keys(deps)) {
+        if (!isValidDependencyAlias(alias)) {
+            throw new PnpmError('INVALID_DEPENDENCY_NAME', `${parentPkgDescription} contains a dependency with an invalid name: ${JSON.stringify(alias)}`, {
+                hint: 'A dependency name must be a valid npm package name — a single `name` or `@scope/name` consisting of URL-friendly characters, with no leading `.` or `_`, and not equal to reserved names such as `node_modules`.',
+            });
+        }
+    }
+}
+//# sourceMappingURL=validateDependencyAlias.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.deps-resolver",
-  "version": "1100.1.2",
+  "version": "1100.1.4",
   "description": "Resolves dependency graph of a package",
   "keywords": [
     "pnpm",
@@ -36,43 +36,45 @@
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "rename-overwrite": "^7.0.1",
     "safe-promise-defer": "^2.0.0",
-    "semver": "^7.7.2",
+    "semver": "^7.8.1",
     "semver-range-intersect": "^0.3.1",
+    "validate-npm-package-name": "7.0.2",
     "version-selector-type": "^3.0.0",
     "@pnpm/catalogs.types": "1100.0.0",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/catalogs.resolver": "1100.0.0",
-    "@pnpm/config.version-policy": "1100.1.1",
-    "@pnpm/core-loggers": "1100.1.1",
-    "@pnpm/deps.graph-hasher": "1100.2.1",
-    "@pnpm/deps.path": "1100.0.4",
+    "@pnpm/config.version-policy": "1100.1.2",
+    "@pnpm/core-loggers": "1100.1.2",
+    "@pnpm/deps.graph-hasher": "1100.2.2",
+    "@pnpm/deps.path": "1100.0.5",
     "@pnpm/deps.peer-range": "1100.0.1",
-    "@pnpm/fetching.pick-fetcher": "1100.0.8",
+    "@pnpm/catalogs.resolver": "1100.0.0",
+    "@pnpm/hooks.types": "1100.0.9",
+    "@pnpm/fetching.pick-fetcher": "1100.0.9",
+    "@pnpm/lockfile.preferred-versions": "1100.0.12",
+    "@pnpm/lockfile.types": "1100.0.8",
+    "@pnpm/lockfile.utils": "1100.0.10",
+    "@pnpm/patching.config": "1100.0.5",
+    "@pnpm/lockfile.pruner": "1100.0.8",
+    "@pnpm/pkg-manifest.reader": "1100.0.5",
+    "@pnpm/resolving.npm-resolver": "1101.3.3",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/lockfile.preferred-versions": "1100.0.11",
-    "@pnpm/lockfile.pruner": "1100.0.7",
-    "@pnpm/lockfile.types": "1100.0.7",
-    "@pnpm/hooks.types": "1100.0.8",
-    "@pnpm/lockfile.utils": "1100.0.9",
-    "@pnpm/patching.config": "1100.0.4",
     "@pnpm/patching.types": "1100.0.0",
-    "@pnpm/pkg-manifest.utils": "1100.2.0",
-    "@pnpm/resolving.npm-resolver": "1101.3.1",
-    "@pnpm/types": "1101.1.1",
-    "@pnpm/store.controller-types": "1100.1.1",
+    "@pnpm/resolving.resolver-base": "1100.3.1",
+    "@pnpm/store.controller-types": "1100.1.2",
     "@pnpm/workspace.spec-parser": "1100.0.0",
-    "@pnpm/resolving.resolver-base": "1100.3.0",
-    "@pnpm/pkg-manifest.reader": "1100.0.4"
+    "@pnpm/pkg-manifest.utils": "1100.2.1",
+    "@pnpm/types": "1101.2.0"
   },
   "peerDependencies": {
-    "@pnpm/logger": ">=1001.0.0 <1002.0.0"
+    "@pnpm/logger": "^1001.0.1"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
     "@types/normalize-path": "^3.0.2",
     "@types/ramda": "0.31.1",
     "@types/semver": "7.7.1",
-    "@pnpm/installing.deps-resolver": "1100.1.2",
+    "@types/validate-npm-package-name": "^4.0.2",
+    "@pnpm/installing.deps-resolver": "1100.1.4",
     "@pnpm/logger": "1100.0.0"
   },
   "engines": {