Reimplemented using idealTree param

PR-URL: #257 Credit: @ruyadorno Close: #257 Reviewed-by: @isaacs
npm · Oct 7, 2019 · f3299ac · f3299ac
1 parent 3547d99
commit f3299ac
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 67 deletions.
diff --git a/lib/install/actions.js b/lib/install/actions.js
@@ -49,7 +49,7 @@ Object.keys(actions).forEach(function (actionName) {
     if (pkg.knownInstallable) {
       actionP = runAction(action, staging, pkg, log)
     } else {
-      actionP = isInstallable(pkg.package).then(() => {
+      actionP = isInstallable(null, pkg.package).then(() => {
         pkg.knownInstallable = true
         return runAction(action, staging, pkg, log)
       })

diff --git a/lib/install/deps.js b/lib/install/deps.js
@@ -665,7 +665,7 @@ function resolveWithNewModule (pkg, tree, log, next) {
   validate('OOOF', arguments)
 
   log.silly('resolveWithNewModule', packageId(pkg), 'checking installable status')
-  return isInstallable(pkg, (err) => {
+  return isInstallable(tree, pkg, (err) => {
     let installable = !err
     addBundled(pkg, (bundleErr) => {
       var parent = earliestInstallable(tree, tree, pkg, log) || tree

diff --git a/lib/install/validate-args.js b/lib/install/validate-args.js
@@ -16,7 +16,7 @@ module.exports = function (idealTree, args, next) {
     chain([
       [hasMinimumFields, pkg],
       [checkSelf, idealTree, pkg, force],
-      [isInstallable, pkg]
+      [isInstallable, idealTree, pkg]
     ], done)
   }, next)
 }
@@ -31,17 +31,24 @@ function hasMinimumFields (pkg, cb) {
   }
 }
 
-function setWarnings (pkg, warn) {
-  if (!pkg.warnings) pkg.warnings = []
-  if (pkg.warnings.every(i => (
+function setWarnings (idealTree, warn) {
+  function top (tree) {
+    if (tree.parent) return top(tree.parent)
+    return tree
+  }
+
+  var topTree = top(idealTree)
+  if (!topTree.warnings) topTree.warnings = []
+
+  if (topTree.warnings.every(i => (
     i.code !== warn.code ||
     i.required !== warn.required ||
     i.pkgid !== warn.pkgid))) {
-    pkg.warnings.push(warn)
+    topTree.warnings.push(warn)
   }
 }
 
-var isInstallable = module.exports.isInstallable = function (pkg, next) {
+var isInstallable = module.exports.isInstallable = function (idealTree, pkg, next) {
   var force = npm.config.get('force')
   var nodeVersion = npm.config.get('node-version')
   if (/-/.test(nodeVersion)) {
@@ -52,7 +59,7 @@ var isInstallable = module.exports.isInstallable = function (pkg, next) {
   var strict = npm.config.get('engine-strict')
   checkEngine(pkg, npm.version, nodeVersion, force, strict, iferr(next, thenWarnEngineIssues))
   function thenWarnEngineIssues (warn) {
-    if (warn) setWarnings(pkg, warn)
+    if (idealTree && warn) setWarnings(idealTree, warn)
     checkPlatform(pkg, force, next)
   }
 }

diff --git a/lib/install/validate-tree.js b/lib/install/validate-tree.js
@@ -22,8 +22,7 @@ module.exports = function (idealTree, log, next) {
     [asyncMap, modules, function (mod, done) {
       chain([
         mod.parent && !mod.isLink && [checkGit, mod.realpath],
-        [checkErrors, mod, idealTree],
-        [checkWarnings, mod, idealTree]
+        [checkErrors, mod, idealTree]
       ], done)
     }],
     [thenValidateAllPeerDeps, idealTree],
@@ -37,15 +36,6 @@ function checkErrors (mod, idealTree, next) {
   next()
 }
 
-function checkWarnings (mod, idealTree, next) {
-  const warnings = mod.package.warnings
-  if (warnings && (mod.parent || path.resolve(npm.globalDir, '..') !== mod.path)) {
-    warnings.forEach(warn => idealTree.warnings.push(warn))
-    delete mod.package.warnings
-  }
-  next()
-}
-
 function thenValidateAllPeerDeps (idealTree, next) {
   validate('OF', arguments)
   validateAllPeerDeps(idealTree, function (tree, pkgname, version) {

diff --git a/test/tap/check-engine-reqs.js b/test/tap/check-engine-reqs.js
@@ -47,9 +47,9 @@ test('warns on bad engine not strict', function (t) {
     t.ifError(err, 'npm ran without issue')
     t.is(code, 0, 'result code')
     var result = JSON.parse(stdout)
-    t.match(result.warnings[1], /Unsupported engine/, 'reason for optional failure in JSON')
-    t.match(result.warnings[1], /1.0.0-not-a-real-version/, 'should print mismatch version info')
-    t.match(result.warnings[1], /Not compatible with your version of node/, 'incompatibility message')
+    t.match(result.warnings[0], /Unsupported engine/, 'reason for optional failure in JSON')
+    t.match(result.warnings[0], /1.0.0-not-a-real-version/, 'should print mismatch version info')
+    t.match(result.warnings[0], /Not compatible with your version of node/, 'incompatibility message')
     t.done()
   })
 })

diff --git a/test/tap/validate-tree-check-warnings.js b/test/tap/validate-tree-check-warnings.js