refactor: resolve-dependencies

packages/core/src/install/index.ts

@@ -788,6 +788,14 @@ const _installInContext: InstallFunction = async (projects, ctx, opts) => {
     }), {})
   }
 
+  let allowBuild: undefined | ((pkgName: string) => boolean)
+  if (opts.neverBuiltDependencies != null && opts.neverBuiltDependencies.length > 0) {
+    const neverBuiltDependencies = new Set(opts.neverBuiltDependencies)
+    allowBuild = (pkgName) => !neverBuiltDependencies.has(pkgName)
+  } else if (opts.onlyBuiltDependencies !== false && opts.onlyBuiltDependencies != null) {
+    const onlyBuiltDependencies = new Set(opts.onlyBuiltDependencies)
+    allowBuild = (pkgName) => onlyBuiltDependencies.has(pkgName)
+  }
   let {
     dependenciesGraph,
     dependenciesByProjectId,
@@ -800,6 +808,7 @@ const _installInContext: InstallFunction = async (projects, ctx, opts) => {
   } = await resolveDependencies(
     projectsToResolve,
     {
+      allowBuild,
       currentLockfile: ctx.currentLockfile,
       dryRun: opts.lockfileOnly,
       engineStrict: opts.engineStrict,
@@ -808,8 +817,6 @@ const _installInContext: InstallFunction = async (projects, ctx, opts) => {
       hooks: opts.hooks,
       linkWorkspacePackagesDepth: opts.linkWorkspacePackagesDepth ?? (opts.saveWorkspaceProtocol ? 0 : -1),
       lockfileDir: opts.lockfileDir,
-      neverBuiltDependencies: new Set(opts.neverBuiltDependencies),
-      onlyBuiltDependencies: opts.onlyBuiltDependencies ? new Set(opts.onlyBuiltDependencies) : false,
       nodeVersion: opts.nodeVersion,
       pnpmVersion: opts.packageManager.name === 'pnpm' ? opts.packageManager.version : '',
       preferWorkspacePackages: opts.preferWorkspacePackages,

packages/resolve-dependencies/src/index.ts

@@ -186,8 +186,7 @@ export default async function (
       // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
       if (
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        opts.neverBuiltDependencies?.has(pkg.name) ||
-        (opts.onlyBuiltDependencies !== false && !opts.onlyBuiltDependencies.has(pkg.name)) ||
+        (opts.allowBuild != null && !opts.allowBuild(pkg.name)) ||
         (opts.wantedLockfile.packages?.[depPath] == null) ||
         pkg.requiresBuild
       ) continue

packages/resolve-dependencies/src/resolveDependencies.ts

@@ -116,6 +116,7 @@ export interface ChildrenByParentDepPath {
 }
 
 export interface ResolutionContext {
+  allowBuild?: (pkgName: string) => boolean
   updatedSet: Set<string>
   defaultTag: string
   dryRun: boolean
@@ -128,8 +129,6 @@ export interface ResolutionContext {
   currentLockfile: Lockfile
   linkWorkspacePackagesDepth: number
   lockfileDir: string
-  neverBuiltDependencies: Set<string>
-  onlyBuiltDependencies: false | Set<string>
   storeController: StoreController
   // the IDs of packages that are not installable
   skipped: Set<string>
@@ -786,12 +785,11 @@ async function resolveDependency (
     logFetchResult(pkgResponse, ctx.lockfileDir)
 
     ctx.resolvedPackagesByDepPath[depPath] = getResolvedPackage({
+      allowBuild: ctx.allowBuild,
       dependencyLockfile: currentPkg.dependencyLockfile,
       depPath,
       force: ctx.force,
       hasBin,
-      neverBuiltDependencies: ctx.neverBuiltDependencies,
-      onlyBuiltDependencies: ctx.onlyBuiltDependencies,
       pkg,
       pkgResponse,
       prepare,
@@ -864,12 +862,11 @@ function pkgIsLeaf (pkg: PackageManifest) {
 
 function getResolvedPackage (
   options: {
+    allowBuild?: (pkgName: string) => boolean
     dependencyLockfile?: PackageSnapshot
     depPath: string
     force: boolean
     hasBin: boolean
-    neverBuiltDependencies: Set<string>
-    onlyBuiltDependencies: false | Set<string>
     pkg: PackageManifest
     pkgResponse: PackageResponse
     prepare: boolean
@@ -878,19 +875,9 @@ function getResolvedPackage (
 ) {
   const peerDependencies = peerDependenciesWithoutOwn(options.pkg)
 
-  let requiresBuild: boolean | undefined
-  if (options.onlyBuiltDependencies === false || options.onlyBuiltDependencies.has(options.pkg.name)) {
-    // No onlyBuiltDependencies is specified or this package is explicitly allowed.
-    if (options.neverBuiltDependencies.has(options.pkg.name)) {
-      // This package is explicitly listed.
-      requiresBuild = false
-    } else {
-      // default resolution
-      requiresBuild = options.dependencyLockfile != null ? Boolean(options.dependencyLockfile.requiresBuild) : undefined
-    }
-  } else {
-    requiresBuild = false
-  }
+  const requiresBuild = (options.allowBuild == null || options.allowBuild(options.pkg.name))
+    ? ((options.dependencyLockfile != null) ? Boolean(options.dependencyLockfile.requiresBuild) : undefined)
+    : false
 
   return {
     additionalInfo: {

packages/resolve-dependencies/src/resolveDependencyTree.ts

@@ -45,6 +45,7 @@ export interface Importer<T> {
 }
 
 export interface ResolveDependenciesOptions {
+  allowBuild?: (pkgName: string) => boolean
   currentLockfile: Lockfile
   dryRun: boolean
   engineStrict: boolean
@@ -53,8 +54,6 @@ export interface ResolveDependenciesOptions {
   hooks: {
     readPackage?: ReadPackageHook
   }
-  neverBuiltDependencies?: Set<string>
-  onlyBuiltDependencies: false | Set<string>
   nodeVersion: string
   registries: Registries
   pnpmVersion: string
@@ -77,6 +76,7 @@ export default async function<T> (
 
   const wantedToBeSkippedPackageIds = new Set<string>()
   const ctx = {
+    allowBuild: opts.allowBuild,
     childrenByParentDepPath: {} as ChildrenByParentDepPath,
     currentLockfile: opts.currentLockfile,
     defaultTag: opts.tag,
@@ -87,8 +87,6 @@ export default async function<T> (
     forceFullResolution: opts.forceFullResolution,
     linkWorkspacePackagesDepth: opts.linkWorkspacePackagesDepth ?? -1,
     lockfileDir: opts.lockfileDir,
-    neverBuiltDependencies: opts.neverBuiltDependencies ?? new Set(),
-    onlyBuiltDependencies: opts.onlyBuiltDependencies,
     nodeVersion: opts.nodeVersion,
     outdatedDependencies: {} as {[pkgId: string]: string},
     pendingNodes: [] as PendingNode[],