wip

pkg-manager/resolve-dependencies/src/getCatalogResolver.ts

@@ -0,0 +1,49 @@
+import { PnpmError } from '@pnpm/error'
+import { type Catalogs } from '@pnpm/catalog-types'
+
+interface WantedDependency {
+  readonly pref: string
+  readonly alias: string
+}
+
+export function getCatalogResolver (catalogs: Catalogs) {
+  function resolveFromCatalog<T extends WantedDependency> (wantedDependency: T): T {
+    const catalogName = parseCatalogSpecifier(wantedDependency.pref)
+
+    if (catalogName == null) {
+      return wantedDependency
+    }
+
+    const catalogLookup = catalogs[catalogName]?.[wantedDependency.alias]
+    if (catalogLookup == null) {
+      throw new PnpmError(
+        'CATALOG_ENTRY_NOT_FOUND_FOR_SPEC',
+        `No catalog entry was found for catalog ${catalogName} and ${wantedDependency.alias}.`)
+    }
+
+    return {
+      ...wantedDependency,
+      pref: catalogLookup,
+    }
+  }
+
+  return resolveFromCatalog
+}
+
+const CATALOG_PROTOCOL = 'catalog:'
+
+/**
+ * Returns null if the given specifier does not start with 'catalog:'.
+ */
+function parseCatalogSpecifier (pref: string): string | 'default' | null {
+  if (!pref.startsWith(CATALOG_PROTOCOL)) {
+    return null
+  }
+
+  const catalogNameRaw = pref.slice(CATALOG_PROTOCOL.length).trim()
+
+  // Allow a specifier of 'catalog:' to be a short-hand for 'catalog:default'.
+  const catalogNameNormalized = catalogNameRaw === '' ? 'default' : catalogNameRaw
+
+  return catalogNameNormalized
+}

pkg-manager/resolve-dependencies/src/resolveDependencies.ts

@@ -60,6 +60,7 @@ import {
 } from './nodeIdUtils'
 import { wantedDepIsLocallyAvailable } from './wantedDepIsLocallyAvailable'
 import safePromiseDefer, { type SafePromiseDefer } from 'safe-promise-defer'
+import { getCatalogResolver } from './getCatalogResolver'
 
 const dependencyResolvedLogger = logger('_dependency_resolved')
 
@@ -349,6 +350,8 @@ async function resolveDependenciesOfImporters (
   ctx: ResolutionContext,
   importers: ImporterToResolve[]
 ): Promise<ResolveDependenciesOfImportersResult> {
+  const catalogResolver = getCatalogResolver(ctx.catalogs)
+
   const extendedWantedDepsForImporterPairs = importers.map((importer): [ExtendedWantedDependency[], ImporterToResolve] => {
     const { wantedDependencies, options } = importer
     const extendedWantedDeps = getDepsToResolve(wantedDependencies, ctx.wantedLockfile, {
@@ -367,18 +370,23 @@ async function resolveDependenciesOfImporters (
       const postponedPeersResolutionQueue: PostponedPeersResolutionFunction[] = []
       const pkgAddresses: PkgAddress[] = []
 
-      const resolvedDependenciesOfImporter = await Promise.all(
-        extendedWantedDeps.map((extendedWantedDep) => resolveDependenciesOfDependency(
+      async function resolveDependenciesOfImporterWantedDep (extendedWantedDep: ExtendedWantedDependency) {
+        return resolveDependenciesOfDependency(
           ctx,
           importer.preferredVersions,
           {
             ...importer.options,
             parentPkgAliases: importer.parentPkgAliases,
             pickLowestVersion: pickLowestVersion && !importer.updatePackageManifest,
           },
-          extendedWantedDep
-        ))
-      )
+          {
+            ...extendedWantedDep,
+            wantedDependency: catalogResolver(extendedWantedDep.wantedDependency),
+          })
+      }
+
+      const resolvedDependenciesOfImporter = await Promise.all(
+        extendedWantedDeps.map((resolveDependenciesOfImporterWantedDep)))
 
       for (const { resolveDependencyResult, postponedPeersResolution, postponedResolution } of resolvedDependenciesOfImporter) {
         if (resolveDependencyResult) {