Skip to content

Commit 1a90b9e

Browse files
wraithgarwraithgar
committed
1 parent 4a9a705 commit 1a90b9e

File tree

9 files changed

+80
-56
lines changed

9 files changed

+80
-56
lines changed

‎node_modules/treeverse/index.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎node_modules/treeverse/lib/breadth.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,28 @@ const breadth = ({
2828
return seen.get(tree)
2929
}
3030

31-
const visitNode = (tree) => {
32-
if (seen.has(tree))
33-
return seen.get(tree)
31+
const visitNode = (visitTree) => {
32+
if (seen.has(visitTree)) {
33+
return seen.get(visitTree)
34+
}
3435

35-
seen.set(tree, null)
36-
const res = visit ? visit(tree) : tree
36+
seen.set(visitTree, null)
37+
const res = visit ? visit(visitTree) : visitTree
3738
if (isPromise(res)) {
38-
const fullResult = res.then(res => {
39-
seen.set(tree, res)
40-
return kidNodes(tree)
39+
const fullResult = res.then(resThen => {
40+
seen.set(visitTree, resThen)
41+
return kidNodes(visitTree)
4142
})
42-
seen.set(tree, fullResult)
43+
seen.set(visitTree, fullResult)
4344
return fullResult
4445
} else {
45-
seen.set(tree, res)
46-
return kidNodes(tree)
46+
seen.set(visitTree, res)
47+
return kidNodes(visitTree)
4748
}
4849
}
4950

50-
const kidNodes = (tree) => {
51-
const kids = getChildren(tree, seen.get(tree))
51+
const kidNodes = (kidTree) => {
52+
const kids = getChildren(kidTree, seen.get(kidTree))
5253
return isPromise(kids) ? kids.then(processKids) : processKids(kids)
5354
}
5455

‎node_modules/treeverse/lib/depth-descent.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,28 @@ const depth = ({
4949
return seen.get(tree)
5050
}
5151

52-
const visitNode = (tree) => {
53-
if (seen.has(tree))
54-
return seen.get(tree)
52+
const visitNode = (visitTree) => {
53+
if (seen.has(visitTree)) {
54+
return seen.get(visitTree)
55+
}
5556

56-
seen.set(tree, null)
57-
const res = visit ? visit(tree) : tree
57+
seen.set(visitTree, null)
58+
const res = visit ? visit(visitTree) : visitTree
5859
if (isPromise(res)) {
59-
const fullResult = res.then(res => {
60-
seen.set(tree, res)
61-
return kidNodes(tree)
60+
const fullResult = res.then(resThen => {
61+
seen.set(visitTree, resThen)
62+
return kidNodes(visitTree)
6263
})
63-
seen.set(tree, fullResult)
64+
seen.set(visitTree, fullResult)
6465
return fullResult
6566
} else {
66-
seen.set(tree, res)
67-
return kidNodes(tree)
67+
seen.set(visitTree, res)
68+
return kidNodes(visitTree)
6869
}
6970
}
7071

71-
const kidNodes = (tree) => {
72-
const kids = getChildren(tree, seen.get(tree))
72+
const kidNodes = (kidTree) => {
73+
const kids = getChildren(kidTree, seen.get(kidTree))
7374
return isPromise(kids) ? kids.then(processKids) : processKids(kids)
7475
}
7576

‎node_modules/treeverse/lib/depth.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,21 @@ const depth = ({
2323
getChildren,
2424
tree,
2525
}) => {
26-
if (!leave)
26+
if (!leave) {
2727
return depthDescent({ visit, filter, getChildren, tree })
28+
}
2829

29-
if (seen.has(tree))
30+
if (seen.has(tree)) {
3031
return seen.get(tree)
32+
}
3133

3234
seen.set(tree, null)
3335

3436
const visitNode = () => {
3537
const res = visit ? visit(tree) : tree
3638
if (isPromise(res)) {
37-
const fullResult = res.then(res => {
38-
seen.set(tree, res)
39+
const fullResult = res.then(resThen => {
40+
seen.set(tree, resThen)
3941
return kidNodes()
4042
})
4143
seen.set(tree, fullResult)
@@ -51,9 +53,9 @@ const depth = ({
5153
return isPromise(kids) ? kids.then(processKids) : processKids(kids)
5254
}
5355

54-
const processKids = kidNodes => {
55-
const kids = (kidNodes || []).filter(filter).map(kid =>
56-
depth({visit, leave, filter, seen, getChildren, tree: kid}))
56+
const processKids = nodes => {
57+
const kids = (nodes || []).filter(filter).map(kid =>
58+
depth({ visit, leave, filter, seen, getChildren, tree: kid }))
5759
return kids.some(isPromise)
5860
? Promise.all(kids).then(leaveNode)
5961
: leaveNode(kids)

‎node_modules/treeverse/lib/index.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
breadth: require('./breadth.js'),
3+
depth: require('./depth.js'),
4+
}

‎node_modules/treeverse/package.json‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,51 @@
11
{
22
"name": "treeverse",
3-
"version": "1.0.4",
3+
"version": "2.0.0",
44
"description": "Walk any kind of tree structure depth- or breadth-first. Supports promises and advanced map-reduce operations with a very small API.",
5-
"author": "Isaac Z. Schlueter <[email protected]> (https://izs.me)",
5+
"author": "GitHub Inc.",
66
"license": "ISC",
77
"repository": {
88
"type": "git",
9-
"url": "git+https://github.com/npm/treeverse.git"
9+
"url": "https://github.com/npm/treeverse.git"
1010
},
1111
"scripts": {
1212
"test": "tap",
1313
"snap": "tap",
1414
"preversion": "npm test",
1515
"postversion": "npm publish",
16-
"postpublish": "git push origin --follow-tags"
16+
"postpublish": "git push origin --follow-tags",
17+
"lint": "eslint \"**/*.js\"",
18+
"postlint": "template-oss-check",
19+
"template-oss-apply": "template-oss-apply --force",
20+
"lintfix": "npm run lint -- --fix",
21+
"prepublishOnly": "git push origin --follow-tags",
22+
"posttest": "npm run lint"
1723
},
1824
"tap": {
1925
"100": true,
20-
"coverage-map": "map.js"
26+
"coverage-map": "test/coverage-map.js"
2127
},
2228
"devDependencies": {
23-
"tap": "^14.10.6",
24-
"tcompare": "^2.3.0"
29+
"@npmcli/eslint-config": "^3.0.1",
30+
"@npmcli/template-oss": "3.2.2",
31+
"tap": "^16.0.1"
2532
},
2633
"files": [
27-
"index.js",
34+
"bin/",
2835
"lib/"
2936
],
30-
"main": "index.js",
37+
"main": "lib/index.js",
3138
"keywords": [
3239
"tree",
3340
"traversal",
3441
"depth first search",
3542
"breadth first search"
36-
]
43+
],
44+
"engines": {
45+
"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
46+
},
47+
"templateOSS": {
48+
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
49+
"version": "3.2.2"
50+
}
3751
}

‎package-lock.json‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
"tar": "^6.1.11",
156156
"text-table": "~0.2.0",
157157
"tiny-relative-date": "^1.3.0",
158-
"treeverse": "^1.0.4",
158+
"treeverse": "^2.0.0",
159159
"validate-npm-package-name": "^4.0.0",
160160
"which": "^2.0.2",
161161
"write-file-atomic": "^4.0.1"
@@ -8716,9 +8716,13 @@
87168716
}
87178717
},
87188718
"node_modules/treeverse": {
8719-
"version": "1.0.4",
8719+
"version": "2.0.0",
8720+
"resolved": "https://registry.npmjs.org/treeverse/-/treeverse-2.0.0.tgz",
8721+
"integrity": "sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==",
87208722
"inBundle": true,
8721-
"license": "ISC"
8723+
"engines": {
8724+
"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
8725+
}
87228726
},
87238727
"node_modules/trim": {
87248728
"version": "0.0.1",
@@ -9559,7 +9563,7 @@
95599563
"rimraf": "^3.0.2",
95609564
"semver": "^7.3.5",
95619565
"ssri": "^8.0.1",
9562-
"treeverse": "^1.0.4",
9566+
"treeverse": "^2.0.0",
95639567
"walk-up-path": "^1.0.0"
95649568
},
95659569
"bin": {
@@ -10206,7 +10210,7 @@
1020610210
"@npmcli/move-file": "^1.1.0",
1020710211
"@npmcli/name-from-folder": "^1.0.1",
1020810212
"@npmcli/node-gyp": "^1.0.3",
10209-
"@npmcli/package-json": "2.0.0",
10213+
"@npmcli/package-json": "^2.0.0",
1021010214
"@npmcli/run-script": "^3.0.0",
1021110215
"@npmcli/template-oss": "3.2.2",
1021210216
"benchmark": "^2.1.4",
@@ -10238,7 +10242,7 @@
1023810242
"ssri": "^8.0.1",
1023910243
"tap": "^15.1.2",
1024010244
"tcompare": "^5.0.6",
10241-
"treeverse": "^1.0.4",
10245+
"treeverse": "2.0.0",
1024210246
"walk-up-path": "^1.0.0"
1024310247
}
1024410248
},
@@ -15405,7 +15409,9 @@
1540515409
}
1540615410
},
1540715411
"treeverse": {
15408-
"version": "1.0.4"
15412+
"version": "2.0.0",
15413+
"resolved": "https://registry.npmjs.org/treeverse/-/treeverse-2.0.0.tgz",
15414+
"integrity": "sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A=="
1540915415
},
1541015416
"trim": {
1541115417
"version": "0.0.1",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"tar": "^6.1.11",
123123
"text-table": "~0.2.0",
124124
"tiny-relative-date": "^1.3.0",
125-
"treeverse": "^1.0.4",
125+
"treeverse": "^2.0.0",
126126
"validate-npm-package-name": "^4.0.0",
127127
"which": "^2.0.2",
128128
"write-file-atomic": "^4.0.1"

‎workspaces/arborist/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"rimraf": "^3.0.2",
3636
"semver": "^7.3.5",
3737
"ssri": "^8.0.1",
38-
"treeverse": "^1.0.4",
38+
"treeverse": "^2.0.0",
3939
"walk-up-path": "^1.0.0"
4040
},
4141
"devDependencies": {

0 commit comments

Comments
 (0)