From 1a90b9e9ebe98cce83591e11312aaf41c830f835 Mon Sep 17 00:00:00 2001 From: Gar Date: Tue, 5 Apr 2022 09:47:54 -0700 Subject: [PATCH] deps: treeverse@2.0.0 --- node_modules/treeverse/index.js | 4 --- node_modules/treeverse/lib/breadth.js | 27 ++++++++-------- node_modules/treeverse/lib/depth-descent.js | 27 ++++++++-------- node_modules/treeverse/lib/depth.js | 16 +++++----- node_modules/treeverse/lib/index.js | 4 +++ node_modules/treeverse/package.json | 34 +++++++++++++++------ package-lock.json | 20 +++++++----- package.json | 2 +- workspaces/arborist/package.json | 2 +- 9 files changed, 80 insertions(+), 56 deletions(-) delete mode 100644 node_modules/treeverse/index.js create mode 100644 node_modules/treeverse/lib/index.js diff --git a/node_modules/treeverse/index.js b/node_modules/treeverse/index.js deleted file mode 100644 index ca0229e02c90f..0000000000000 --- a/node_modules/treeverse/index.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - breadth: require('./lib/breadth.js'), - depth: require('./lib/depth.js'), -} diff --git a/node_modules/treeverse/lib/breadth.js b/node_modules/treeverse/lib/breadth.js index 56c02ec627c8c..6681f8cf7d623 100644 --- a/node_modules/treeverse/lib/breadth.js +++ b/node_modules/treeverse/lib/breadth.js @@ -28,27 +28,28 @@ const breadth = ({ return seen.get(tree) } - const visitNode = (tree) => { - if (seen.has(tree)) - return seen.get(tree) + const visitNode = (visitTree) => { + if (seen.has(visitTree)) { + return seen.get(visitTree) + } - seen.set(tree, null) - const res = visit ? visit(tree) : tree + seen.set(visitTree, null) + const res = visit ? visit(visitTree) : visitTree if (isPromise(res)) { - const fullResult = res.then(res => { - seen.set(tree, res) - return kidNodes(tree) + const fullResult = res.then(resThen => { + seen.set(visitTree, resThen) + return kidNodes(visitTree) }) - seen.set(tree, fullResult) + seen.set(visitTree, fullResult) return fullResult } else { - seen.set(tree, res) - return kidNodes(tree) + seen.set(visitTree, res) + return kidNodes(visitTree) } } - const kidNodes = (tree) => { - const kids = getChildren(tree, seen.get(tree)) + const kidNodes = (kidTree) => { + const kids = getChildren(kidTree, seen.get(kidTree)) return isPromise(kids) ? kids.then(processKids) : processKids(kids) } diff --git a/node_modules/treeverse/lib/depth-descent.js b/node_modules/treeverse/lib/depth-descent.js index 8ac3af014ebf9..361d6bf342f1b 100644 --- a/node_modules/treeverse/lib/depth-descent.js +++ b/node_modules/treeverse/lib/depth-descent.js @@ -49,27 +49,28 @@ const depth = ({ return seen.get(tree) } - const visitNode = (tree) => { - if (seen.has(tree)) - return seen.get(tree) + const visitNode = (visitTree) => { + if (seen.has(visitTree)) { + return seen.get(visitTree) + } - seen.set(tree, null) - const res = visit ? visit(tree) : tree + seen.set(visitTree, null) + const res = visit ? visit(visitTree) : visitTree if (isPromise(res)) { - const fullResult = res.then(res => { - seen.set(tree, res) - return kidNodes(tree) + const fullResult = res.then(resThen => { + seen.set(visitTree, resThen) + return kidNodes(visitTree) }) - seen.set(tree, fullResult) + seen.set(visitTree, fullResult) return fullResult } else { - seen.set(tree, res) - return kidNodes(tree) + seen.set(visitTree, res) + return kidNodes(visitTree) } } - const kidNodes = (tree) => { - const kids = getChildren(tree, seen.get(tree)) + const kidNodes = (kidTree) => { + const kids = getChildren(kidTree, seen.get(kidTree)) return isPromise(kids) ? kids.then(processKids) : processKids(kids) } diff --git a/node_modules/treeverse/lib/depth.js b/node_modules/treeverse/lib/depth.js index dbab1c28a2d15..ecd138811ae03 100644 --- a/node_modules/treeverse/lib/depth.js +++ b/node_modules/treeverse/lib/depth.js @@ -23,19 +23,21 @@ const depth = ({ getChildren, tree, }) => { - if (!leave) + if (!leave) { return depthDescent({ visit, filter, getChildren, tree }) + } - if (seen.has(tree)) + if (seen.has(tree)) { return seen.get(tree) + } seen.set(tree, null) const visitNode = () => { const res = visit ? visit(tree) : tree if (isPromise(res)) { - const fullResult = res.then(res => { - seen.set(tree, res) + const fullResult = res.then(resThen => { + seen.set(tree, resThen) return kidNodes() }) seen.set(tree, fullResult) @@ -51,9 +53,9 @@ const depth = ({ return isPromise(kids) ? kids.then(processKids) : processKids(kids) } - const processKids = kidNodes => { - const kids = (kidNodes || []).filter(filter).map(kid => - depth({visit, leave, filter, seen, getChildren, tree: kid})) + const processKids = nodes => { + const kids = (nodes || []).filter(filter).map(kid => + depth({ visit, leave, filter, seen, getChildren, tree: kid })) return kids.some(isPromise) ? Promise.all(kids).then(leaveNode) : leaveNode(kids) diff --git a/node_modules/treeverse/lib/index.js b/node_modules/treeverse/lib/index.js new file mode 100644 index 0000000000000..f8e631578bcc9 --- /dev/null +++ b/node_modules/treeverse/lib/index.js @@ -0,0 +1,4 @@ +module.exports = { + breadth: require('./breadth.js'), + depth: require('./depth.js'), +} diff --git a/node_modules/treeverse/package.json b/node_modules/treeverse/package.json index 337194cfde970..97269b335fc4b 100644 --- a/node_modules/treeverse/package.json +++ b/node_modules/treeverse/package.json @@ -1,37 +1,51 @@ { "name": "treeverse", - "version": "1.0.4", + "version": "2.0.0", "description": "Walk any kind of tree structure depth- or breadth-first. Supports promises and advanced map-reduce operations with a very small API.", - "author": "Isaac Z. Schlueter (https://izs.me)", + "author": "GitHub Inc.", "license": "ISC", "repository": { "type": "git", - "url": "git+https://github.com/npm/treeverse.git" + "url": "https://github.com/npm/treeverse.git" }, "scripts": { "test": "tap", "snap": "tap", "preversion": "npm test", "postversion": "npm publish", - "postpublish": "git push origin --follow-tags" + "postpublish": "git push origin --follow-tags", + "lint": "eslint \"**/*.js\"", + "postlint": "template-oss-check", + "template-oss-apply": "template-oss-apply --force", + "lintfix": "npm run lint -- --fix", + "prepublishOnly": "git push origin --follow-tags", + "posttest": "npm run lint" }, "tap": { "100": true, - "coverage-map": "map.js" + "coverage-map": "test/coverage-map.js" }, "devDependencies": { - "tap": "^14.10.6", - "tcompare": "^2.3.0" + "@npmcli/eslint-config": "^3.0.1", + "@npmcli/template-oss": "3.2.2", + "tap": "^16.0.1" }, "files": [ - "index.js", + "bin/", "lib/" ], - "main": "index.js", + "main": "lib/index.js", "keywords": [ "tree", "traversal", "depth first search", "breadth first search" - ] + ], + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "templateOSS": { + "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", + "version": "3.2.2" + } } diff --git a/package-lock.json b/package-lock.json index e8845ebbe54c3..2e3800ede9ded 100644 --- a/package-lock.json +++ b/package-lock.json @@ -155,7 +155,7 @@ "tar": "^6.1.11", "text-table": "~0.2.0", "tiny-relative-date": "^1.3.0", - "treeverse": "^1.0.4", + "treeverse": "^2.0.0", "validate-npm-package-name": "^4.0.0", "which": "^2.0.2", "write-file-atomic": "^4.0.1" @@ -8716,9 +8716,13 @@ } }, "node_modules/treeverse": { - "version": "1.0.4", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-2.0.0.tgz", + "integrity": "sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==", "inBundle": true, - "license": "ISC" + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } }, "node_modules/trim": { "version": "0.0.1", @@ -9559,7 +9563,7 @@ "rimraf": "^3.0.2", "semver": "^7.3.5", "ssri": "^8.0.1", - "treeverse": "^1.0.4", + "treeverse": "^2.0.0", "walk-up-path": "^1.0.0" }, "bin": { @@ -10206,7 +10210,7 @@ "@npmcli/move-file": "^1.1.0", "@npmcli/name-from-folder": "^1.0.1", "@npmcli/node-gyp": "^1.0.3", - "@npmcli/package-json": "2.0.0", + "@npmcli/package-json": "^2.0.0", "@npmcli/run-script": "^3.0.0", "@npmcli/template-oss": "3.2.2", "benchmark": "^2.1.4", @@ -10238,7 +10242,7 @@ "ssri": "^8.0.1", "tap": "^15.1.2", "tcompare": "^5.0.6", - "treeverse": "^1.0.4", + "treeverse": "2.0.0", "walk-up-path": "^1.0.0" } }, @@ -15405,7 +15409,9 @@ } }, "treeverse": { - "version": "1.0.4" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-2.0.0.tgz", + "integrity": "sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==" }, "trim": { "version": "0.0.1", diff --git a/package.json b/package.json index 1410f3c6dfc80..58b09139c7a06 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "tar": "^6.1.11", "text-table": "~0.2.0", "tiny-relative-date": "^1.3.0", - "treeverse": "^1.0.4", + "treeverse": "^2.0.0", "validate-npm-package-name": "^4.0.0", "which": "^2.0.2", "write-file-atomic": "^4.0.1" diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 1f086c638e17d..4b12d2ea46404 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -35,7 +35,7 @@ "rimraf": "^3.0.2", "semver": "^7.3.5", "ssri": "^8.0.1", - "treeverse": "^1.0.4", + "treeverse": "^2.0.0", "walk-up-path": "^1.0.0" }, "devDependencies": {