fix(installer): improvements to automatic lazy require workflow

lib/installer.js

@@ -148,6 +148,9 @@ class Installer {
  this.tree.delDep(dep)
  }
  }
+ if (!this.tree.dependencies.size) {
+ throw new Error('No dependencies found matching filter')
+ }
  }
  this.log('silly', 'tree', this.tree)
  this.expectedTotal = 0
@@ -311,7 +314,10 @@ class Installer {
  }
 
  async tinkifyBins () {
+ const old = process.tink
+ process.tink = null
  const bins = await glob(path.join(this.prefix, 'node_modules/**/.bin/*'))
+ process.tink = old
  this.log('verbose', 'tinkifyBins', 'convering installed bins to use tink:', bins)
  return BB.map(bins, async bin => {
  const real = await realpathAsync(bin)

lib/lock-worker.js

@@ -23,14 +23,18 @@ async function main (cache, integrity, pkg) {
  other () { return true }
  })
  opts.log.heading = 'tink'
- opts.log.level = opts.loglevel
  opts.log.notice('fs', 'unpacking', `${pkg.name}@${pkg.version}`)
  try {
  if (!prepare) { prepare = require('./commands/prepare.js') }
- const { pkgCount } = await prepare.handler(opts, [pkg.name])
- if (!pkgCount) { throw new Error('no packages installed') }
+ opts.log.level = 'silent'
+ const res = await prepare.handler(opts.concat({
+ loglevel: 'silent'
+ }), [pkg.name])
+ if (res && !res.pkgCount) { throw new Error('no packages installed') }
  } catch (err) {
+ throw err
  if (!ensurePkg) { ensurePkg = require('./ensure-package.js') }
+ opts.log.level = opts.loglevel
  await ensurePkg(cache, pkg.name, pkg, opts)
  }
 }

lib/pkglock.js

@@ -310,14 +310,7 @@ async function fetchPackage (cache, pkg, hash) {
  if (!ensurePkg) { ensurePkg = require('./ensure-package.js') }
  if (!config) { config = require('./config.js') }
  if (!ensureDep) { ensureDep = require('./lock-worker.js') }
- try {
- await ensureDep(cache, hash, pkg)
- } catch (err) {
- await ensurePkg(cache, pkg.name, pkg, config().concat({
- cache,
- integrity: hash
- }))
- }
+ await ensureDep(cache, hash, pkg)
 }
 
 function fetchPackageSync (cache, pkg, integrity) {