perf: symlink leaf dependencies

Close #789

package.json

@@ -41,6 +41,7 @@
     "graceful-fs": "^4.1.11",
     "is-ci": "^1.0.10",
     "is-inner-link": "^2.0.0",
+    "is-subdir": "^1.0.0",
     "is-windows": "^1.0.0",
     "load-json-file": "^2.0.0",
     "load-yaml-file": "^0.1.0",

shrinkwrap.yaml

@@ -25,6 +25,7 @@ dependencies:
   graceful-fs: 4.1.11
   is-ci: 1.0.10
   is-inner-link: 2.0.0
+  is-subdir: 1.0.0
   is-windows: 1.0.1
   isexe: 2.0.0
   load-json-file: 2.0.0
@@ -3526,6 +3527,7 @@ specifiers:
   in-publish: ^2.0.0
   is-ci: ^1.0.10
   is-inner-link: ^2.0.0
+  is-subdir: ^1.0.0
   is-windows: ^1.0.0
   isexe: ^2.0.0
   load-json-file: ^2.0.0

src/api/install.ts

@@ -255,7 +255,8 @@ async function installInContext (
     parentNodeId: ':/:',
     currentDepth: 0,
   }
-  const nonLinkedPkgs = await pFilter(packagesToInstall, (spec: PackageSpec) => !spec.name || safeIsInnerLink(nodeModulesPath, spec.name))
+  const nonLinkedPkgs = await pFilter(packagesToInstall,
+    (spec: PackageSpec) => !spec.name || safeIsInnerLink(nodeModulesPath, spec.name, {storePath: ctx.storePath}))
   const rootPkgs = await installMultiple(
     installCtx,
     nonLinkedPkgs,

src/api/uninstall.ts

@@ -62,7 +62,7 @@ export async function uninstallInContext (pkgsToUninstall: string[], pkg: Packag
       storePath: ctx.storePath,
       skipped: Array.from(ctx.skipped).filter(pkgId => removedPkgIds.indexOf(pkgId) === -1),
     })
-    await removeOuterLinks(pkgsToUninstall, path.join(ctx.root, 'node_modules'))
+    await removeOuterLinks(pkgsToUninstall, path.join(ctx.root, 'node_modules'), {storePath: ctx.storePath})
   }
 }
 
@@ -75,9 +75,15 @@ function isDependentOn (pkg: Package, depName: string): boolean {
   .some(deptype => pkg[deptype] && pkg[deptype][depName])
 }
 
-async function removeOuterLinks (pkgsToUninstall: string[], modules: string) {
+async function removeOuterLinks (
+  pkgsToUninstall: string[],
+  modules: string,
+  opts: {
+    storePath: string,
+  }
+) {
   for (const pkgToUninstall of pkgsToUninstall) {
-    if (!await safeIsInnerLink(modules, pkgToUninstall)) {
+    if (!await safeIsInnerLink(modules, pkgToUninstall, opts)) {
       await removeTopDependency(pkgToUninstall, modules)
     }
   }

src/link/index.ts

@@ -202,7 +202,10 @@ async function linkPkg (
 ) {
   const fetchResult = await dependency.fetchingFiles
 
+  if (dependency.independent) return
+
   const pkgJsonPath = path.join(dependency.hardlinkedLocation, 'package.json')
+
   if (fetchResult.isNew || opts.force || !await exists(pkgJsonPath) || !await pkgLinkedToStore(pkgJsonPath, dependency)) {
     await linkIndexedDir(dependency.path, dependency.hardlinkedLocation, fetchResult.index)
   }

src/link/resolvePeers.ts

@@ -16,6 +16,9 @@ export type DependencyTreeNode = {
   resolution: Resolution,
   hardlinkedLocation: string,
   children: string[],
+  // an independent package is a package that
+  // has neither regular nor peer dependencies
+  independent: boolean,
   optionalDependencies: Set<string>,
   depth: number,
   resolvedId: string,
@@ -94,15 +97,20 @@ function resolvePeersOfNode (
 
   nodeIdToResolvedId[nodeId] = resolvedId
   if (!resolvedTree[resolvedId] || resolvedTree[resolvedId].depth > node.depth) {
-    const hardlinkedLocation = path.join(modules, node.pkg.name)
+    const independent = !node.children.length && R.isEmpty(node.pkg.peerDependencies)
+    const pathToUnpacked = path.join(node.pkg.path, 'node_modules', node.pkg.name)
+    const hardlinkedLocation = !independent
+      ? path.join(modules, node.pkg.name)
+      : pathToUnpacked
     resolvedTree[resolvedId] = {
       name: node.pkg.name,
       hasBundledDependencies: node.pkg.hasBundledDependencies,
       fetchingFiles: node.pkg.fetchingFiles,
       resolution: node.pkg.resolution,
-      path: path.join(node.pkg.path, 'node_modules', node.pkg.name),
+      path: pathToUnpacked,
       modules,
       hardlinkedLocation,
+      independent,
       optionalDependencies: node.pkg.optionalDependencies,
       children: R.union(node.children, resolvedPeers),
       depth: node.depth,

src/safeIsInnerLink.ts

@@ -3,13 +3,22 @@ import path = require('path')
 import isInnerLink = require('is-inner-link')
 import fs = require('mz/fs')
 import mkdirp = require('mkdirp-promise')
+import isSubdir = require('is-subdir')
 
-export default async function safeIsInnerLink (modules: string, depName: string) {
+export default async function safeIsInnerLink (
+  modules: string,
+  depName: string,
+  opts: {
+    storePath: string,
+  }
+) {
   try {
     const link = await isInnerLink(modules, depName)
 
     if (link.isInner) return true
 
+    if (isSubdir(opts.storePath, link.target)) return true
+
     logger.info(`${depName} is linked to ${modules} from ${link.target}`)
     return false
   } catch (err) {

test/shrinkwrap.ts

@@ -271,11 +271,16 @@ test('package is not marked dev if it is also a subdep of a regular dependency',
   await addDistTag('dep-of-pkg-with-1-dep', '100.0.0', 'latest')
 
   await installPkgs(['pkg-with-1-dep'], testDefaults())
+
+  t.pass('installed pkg-with-1-dep')
+
   await installPkgs(['dep-of-pkg-with-1-dep'], testDefaults({saveDev: true}))
 
+  t.pass('installed optional dependency which is also a dependency of pkg-with-1-dep')
+
   const shr = await project.loadShrinkwrap()
 
-  t.notOk(shr.packages['/dep-of-pkg-with-1-dep/100.0.0']['dev'])
+  t.notOk(shr.packages['/dep-of-pkg-with-1-dep/100.0.0']['dev'], 'package is not marked as dev')
 })
 
 test('package is not marked optional if it is also a subdep of a regular dependency', async (t: tape.Test) => {
@@ -288,5 +293,5 @@ test('package is not marked optional if it is also a subdep of a regular depende
 
   const shr = await project.loadShrinkwrap()
 
-  t.notOk(shr.packages['/dep-of-pkg-with-1-dep/100.0.0']['optional'])
+  t.notOk(shr.packages['/dep-of-pkg-with-1-dep/100.0.0']['optional'], 'package is not marked as optional')
 })

typings/local.d.ts

@@ -253,3 +253,8 @@ declare module 'dint' {
   const anything: any;
   export = anything;
 }
+
+declare module 'is-subdir' {
+  const anything: any;
+  export = anything;
+}