@weborigami/async-tree 0.3.3-jse.2 → 0.3.3-jse.3

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@weborigami/async-tree",
-  "version": "0.3.3-jse.2",
+  "version": "0.3.3-jse.3",
   "description": "Asynchronous tree drivers based on standard JavaScript classes",
   "type": "module",
   "main": "./main.js",
   "browser": "./browser.js",
   "types": "./index.ts",
   "dependencies": {
-    "@weborigami/types": "0.3.3-jse.2"
+    "@weborigami/types": "0.3.3-jse.3"
   },
   "devDependencies": {
     "@types/node": "22.13.13",

package/src/Tree.d.ts

@@ -21,4 +21,4 @@ export function toFunction(tree: Treelike): Function;
 export function traverse(tree: Treelike, ...keys: any[]): Promise<any>;
 export function traverseOrThrow(tree: Treelike, ...keys: any[]): Promise<any>;
 export function traversePath(tree: Treelike, path: string): Promise<any>;
-export function values(AsyncTree: AsyncTree): Promise<IterableIterator<any>>;
+export function values(tree: Treelike): Promise<IterableIterator<any>>;

package/src/Tree.js

@@ -26,8 +26,6 @@ import {
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
  */
 
-const treeModule = this;
-
 /**
  * Apply the key/values pairs from the source tree to the target tree.
  *
@@ -362,8 +360,8 @@ export async function remove(tree, key) {
  */
 export function root(tree) {
   let current = from(tree);
-  while (current.parent) {
-    current = current.parent;
+  while (current.parent || current[symbols.parent]) {
+    current = current.parent || current[symbols.parent];
   }
   return current;
 }
@@ -416,7 +414,7 @@ export async function traverseOrThrow(treelike, ...keys) {
 
   // If traversal operation was called with a `this` context, use that as the
   // target for function calls.
-  const target = this === treeModule ? undefined : this;
+  const target = this;
 
   // Process all the keys.
   const remainingKeys = keys.slice();
@@ -473,9 +471,10 @@ export async function traversePath(tree, path) {
 /**
  * Return the values in the specific node of the tree.
  *
- * @param {AsyncTree} tree
+ * @param {Treelike} treelike
  */
-export async function values(tree) {
+export async function values(treelike) {
+  const tree = from(treelike);
   const keys = Array.from(await tree.keys());
   const promises = keys.map(async (key) => tree.get(key));
   return Promise.all(promises);

package/src/drivers/FileTree.js

@@ -85,7 +85,12 @@ export default class FileTree {
       value = Uint8Array.from(buffer);
     }
 
-    setParent(value, this);
+    const parent =
+      key === ".."
+        ? // Special case: ".." parent is the grandparent (if it exists)
+          this.parent?.parent
+        : this;
+    setParent(value, parent);
     return value;
   }
 

package/src/operations/merge.js

@@ -16,7 +16,17 @@ import * as trailingSlash from "../trailingSlash.js";
  * @returns {AsyncTree & { description: string, trees: AsyncTree[]}}
  */
 export default function merge(...sources) {
-  const trees = sources.map((treelike) => Tree.from(treelike));
+  const trees = sources
+    .filter((source) => source)
+    .map((treelike) => Tree.from(treelike));
+
+  if (trees.length === 0) {
+    throw new TypeError("merge: all trees are null or undefined");
+  } else if (trees.length === 1) {
+    // Only one tree, no need to merge
+    return trees[0];
+  }
+
   return {
     description: "merge",