deps: treeverse@2.0.0

6 files changed, 65 insertions, 47 deletions

diff --git a/node_modules/treeverse/index.js b/node_modules/treeverse/index.js
deleted file mode 100644
index ca0229e02..000000000
--- 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 56c02ec62..6681f8cf7 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 8ac3af014..361d6bf34 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 dbab1c28a..ecd138811 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 000000000..f8e631578
--- /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 337194cfd..97269b335 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 <i@izs.me> (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"
+  }
 }