fix: auto-install-peers in a workspace

wip
pnpm · Sep 17, 2022 · df7acc4 · df7acc4
1 parent 2e60abb
commit df7acc4
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/packages/resolve-dependencies/src/resolveDependencies.ts b/packages/resolve-dependencies/src/resolveDependencies.ts
@@ -41,6 +41,7 @@ import {
 import * as dp from 'dependency-path'
 import exists from 'path-exists'
 import pDefer from 'p-defer'
+import pShare from 'promise-share'
 import isEmpty from 'ramda/src/isEmpty'
 import fromPairs from 'ramda/src/fromPairs'
 import omit from 'ramda/src/omit'
@@ -157,13 +158,19 @@ export interface ResolutionContext {
   virtualStoreDir: string
   updateMatching?: (pkgName: string) => boolean
   workspacePackages?: WorkspacePackages
-  missingPeersOfChildrenByPkgId: Record<string, { parentNodeId: string, missingPeers: pDefer.DeferredPromise<MissingPeers> }>
+  missingPeersOfChildrenByPkgId: Record<string, { parentNodeId: string, missingPeers: MissingPeersOfChildren }>
 }
 
 export type MissingPeers = Record<string, string>
 
 export type ResolvedPeers = Record<string, PkgAddress>
 
+interface MissingPeersOfChildren {
+  resolve: (missingPeers: MissingPeers) => void
+  reject: (err: Error) => void
+  get: () => Promise<MissingPeers>
+}
+
 export type PkgAddress = {
   alias: string
   depIsLinked: boolean
@@ -179,7 +186,7 @@ export type PkgAddress = {
   updated: boolean
   rootDir: string
   missingPeers: MissingPeers
-  missingPeersOfChildren?: pDefer.DeferredPromise<MissingPeers>
+  missingPeersOfChildren?: MissingPeersOfChildren
   resolvedPeers: ResolvedPeers
   publishedAt?: string
 } & ({
@@ -639,7 +646,7 @@ async function resolveDependenciesOfDependency (
       resolveDependencyResult,
       missingPeersPromise: resolveDependencyResult.missingPeersOfChildren != null
         ? async (postponedResolutionOpts) => {
-          const missingPeers = await resolveDependencyResult.missingPeersOfChildren!.promise
+          const missingPeers = await resolveDependencyResult.missingPeersOfChildren!.get()
           const newMissing = {} as MissingPeers
           const resolvedPeers = {} as ResolvedPeers
           for (const [peerName, peerVersion] of Object.entries(missingPeers)) {
@@ -690,7 +697,7 @@ async function resolveDependenciesOfDependency (
           missingPeers: newMissing,
         }
       } catch (err) {
-        resolveDependencyResult.missingPeersOfChildren!.reject(err)
+        resolveDependencyResult.missingPeersOfChildren!.reject(err as Error)
         throw err
       }
     },
@@ -1254,14 +1261,19 @@ async function resolveDependency (
   const rootDir = pkgResponse.body.resolution.type === 'directory'
     ? path.resolve(ctx.lockfileDir, pkgResponse.body.resolution['directory'])
     : options.prefix
-  let missingPeersOfChildren!: pDefer.DeferredPromise<MissingPeers> | undefined
+  let missingPeersOfChildren!: MissingPeersOfChildren | undefined
   if (!nodeIdContains(options.parentPkg.nodeId, depPath)) {
     if (ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id]) {
       if (!options.parentPkg.nodeId.startsWith(ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].parentNodeId)) {
         missingPeersOfChildren = ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].missingPeers
       }
     } else {
-      missingPeersOfChildren = pDefer<MissingPeers>()
+      const p = pDefer<MissingPeers>()
+      missingPeersOfChildren = {
+        resolve: p.resolve,
+        reject: p.reject,
+        get: pShare(p.promise),
+      }
       ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id] = {
         parentNodeId: options.parentPkg.nodeId,
         missingPeers: missingPeersOfChildren,