Skip to content
This repository was archived by the owner on Aug 11, 2022. It is now read-only.

Commit 7417000

Browse files
iarnazkat
authored andcommitted
install/deps: Factor flatNameFromTree out of install/deps
PR-URL: #13692 Credit: @iarna Reviewed-By: @zkat
1 parent 9994383 commit 7417000

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

lib/install/deps.js

+1-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var inflateShrinkwrap = require('./inflate-shrinkwrap.js')
2121
var inflateBundled = require('./inflate-bundled.js')
2222
var andFinishTracker = require('./and-finish-tracker.js')
2323
var npm = require('../npm.js')
24-
var flatName = require('./flatten-tree.js').flatName
24+
var flatNameFromTree = require('./flatten-tree.js').flatNameFromTree
2525
var createChild = require('./node.js').create
2626
var resetMetadata = require('./node.js').reset
2727
var andIgnoreErrors = require('./and-ignore-errors.js')
@@ -468,14 +468,6 @@ var updatePhantomChildren = exports.updatePhantomChildren = function (current, c
468468
}
469469
}
470470

471-
function flatNameFromTree (tree) {
472-
validate('O', arguments)
473-
if (tree.isTop) return '/'
474-
var path = flatNameFromTree(tree.parent)
475-
if (path !== '/') path += '/'
476-
return flatName(path, tree)
477-
}
478-
479471
exports._replaceModuleByPath = replaceModuleByPath
480472
function replaceModuleByPath (obj, key, child) {
481473
return replaceModule(obj, key, child, function (replacing, child) {

lib/install/flatten-tree.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
var validate = require('aproba')
33
var moduleName = require('../utils/module-name.js')
44

5-
module.exports = function (tree) {
5+
module.exports = flattenTree
6+
module.exports.flatName = flatName
7+
module.exports.flatNameFromTree = flatNameFromTree
8+
9+
function flattenTree (tree) {
610
validate('O', arguments)
711
var seen = {}
812
var flat = {}
@@ -24,7 +28,15 @@ module.exports = function (tree) {
2428
return flat
2529
}
2630

27-
var flatName = module.exports.flatName = function (path, child) {
31+
function flatName (path, child) {
2832
validate('SO', arguments)
2933
return path + (moduleName(child) || 'TOP')
3034
}
35+
36+
function flatNameFromTree (tree) {
37+
validate('O', arguments)
38+
if (tree.isTop) return '/'
39+
var path = flatNameFromTree(tree.parent)
40+
if (path !== '/') path += '/'
41+
return flatName(path, tree)
42+
}

0 commit comments

Comments
 (0)