Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
  • Loading branch information
wraithgar committed Apr 6, 2022
commit cfc3d9ee19f66faa578b62c51757a180050a7794
4 changes: 0 additions & 4 deletions node_modules/treeverse/index.js

This file was deleted.

27 changes: 14 additions & 13 deletions node_modules/treeverse/lib/breadth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
27 changes: 14 additions & 13 deletions node_modules/treeverse/lib/depth-descent.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
16 changes: 9 additions & 7 deletions node_modules/treeverse/lib/depth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions node_modules/treeverse/lib/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
breadth: require('./breadth.js'),
depth: require('./depth.js'),
}
34 changes: 24 additions & 10 deletions node_modules/treeverse/package.json
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> (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"
}
}
20 changes: 13 additions & 7 deletions package-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
},
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion workspaces/arborist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down