@bablr/btree 0.3.0 → 0.4.0

package/README.md

@@ -1,13 +1,18 @@
 # @bablr/btree
 
-Functional utilities for working with btrees such as those used in agAST. These trees could also correctly be termed sum trees, and are represented as:
+Functional utilities for working with btrees such as those used in agAST.
 
 ```js
-let leafNode = [...data];
+expect(push(['a', 'b'], 'c')).toEqual([
+  3,
+  [['a'], ['b', 'c']],
+]);
 
-let branchNode = [sum, [...nodes]];
-
-let tree = [3, [[node1, node2], [node3]]];
+expect(addAt(0, [3, [['x'], ['y', 'z']]], 'w')).toEqual([
+  4,
+  [
+    ['w', 'x'],
+    ['y', 'z'],
+  ],
+]);
 ```
-
-You can differentiate non-leaf nodes because they have a number as their first element. This is possible the data stored in this tree will always be object-typed.

package/lib/enhanceable.js

@@ -94,7 +94,7 @@ export const buildModule = (
     const isLeaf = isLeafNode(node);
     const values = getValues(node);
 
-    if (isArray(value)) Error('cannot set arrays as btree values');
+    if (!Number.isFinite(idx)) throw new Error();
 
     if (!isLeaf && !isArray(value)) {
       throw new Error();
@@ -102,17 +102,14 @@ export const buildModule = (
 
     if (isLeaf && isArray(value) && node.length) throw new Error();
 
-    const newValues = [...values];
+    const newValues = values.slice();
     newValues[idx] = value;
     return treeFromValues(newValues);
   };
 
   const addAt = (idx, tree, value) => {
-    if (idx < 0) throw new Error('invalid argument');
+    if (idx < 0 || !Number.isFinite(idx)) throw new Error('invalid argument');
     if (!isArray(tree)) throw new Error();
-
-    let isLeaf = isLeafNode(tree);
-
     if (isArray(value)) throw new Error('cannot add arrays to btrees');
 
     let path = findPath(idx, tree);
@@ -126,7 +123,7 @@ export const buildModule = (
 
     for (;;) {
       if (pushout) {
-        values = [...values];
+        values = values.slice();
 
         let finiteIndex = index === Infinity ? values.length : index;
 
@@ -204,7 +201,7 @@ export const buildModule = (
         let targetSiblingIndex = targetSibling && (prevSibling ? parentIndex - 1 : parentIndex + 1);
 
         if (targetSibling) {
-          let targetValues = [...getValues(targetSibling)];
+          let targetValues = getValues(targetSibling).slice();
 
           const donationIdx = targetSibling === prevSibling ? targetValues.length - 1 : 0;
           const donated = targetValues[donationIdx];
@@ -215,7 +212,7 @@ export const buildModule = (
             index: targetSiblingIndex,
           };
 
-          values = [...values];
+          values = values.slice();
 
           values.splice(targetSibling === prevSibling ? values.length : 0, 0, donated);
 
@@ -233,13 +230,17 @@ export const buildModule = (
       path = path.pop();
       ({ node, index } = path.value);
 
-      values = [...getValues(node)];
+      values = getValues(node).slice();
 
       values.splice(index, 1, returnValue);
 
       if (adjustSibling) {
         const { index, node } = adjustSibling;
-        values.splice(index, 1, ...(node ? [node] : []));
+        if (node) {
+          values.splice(index, 1, node);
+        } else {
+          values.splice(index, 1);
+        }
       }
 
       returnValue = node = setValues(node, values);
@@ -317,13 +318,6 @@ export const buildModule = (
     }
   };
 
-  function* indexes(count, backwards = false) {
-    const increment = backwards ? -1 : 1;
-    for (let i = backwards ? count - 1 : 0; backwards ? i >= 0 : i < count; i += increment) {
-      yield i;
-    }
-  }
-
   const findPath = (idx, tree) => {
     if (idx == null) throw new Error();
 
@@ -352,11 +346,17 @@ export const buildModule = (
         let candidateNode;
         let i;
 
-        for (i of indexes(values.length, idx < 0)) {
+        let backwards = idx < 0;
+        const increment = backwards ? -1 : 1;
+        for (
+          let i = backwards ? values.length - 1 : 0;
+          backwards ? i >= 0 : i < values.length;
+          i += increment
+        ) {
           candidateNode = values[i];
           const sum = getSize(candidateNode);
           const nextCount = currentIdx + sum * direction;
-          if (idx < 0 ? nextCount <= targetIdx : nextCount > targetIdx || nextCount >= treeSum) {
+          if (backwards ? nextCount <= targetIdx : nextCount > targetIdx || nextCount >= treeSum) {
             path = path.push({ index: i, node });
             node = candidateNode;
             continue stack;
@@ -404,8 +404,10 @@ export const buildModule = (
 
   return {
     buildModule,
-    treeFrom,
-    treeFromValues,
+    btreeFrom: treeFrom,
+    from: treeFrom,
+    btreeFromValues: treeFromValues,
+    fromValues: treeFromValues,
     findBalancePoint,
     splitValues,
     collapses,

package/lib/index.js

@@ -1,8 +1,12 @@
-import { buildModule } from './enhanceable.js';
+import { defaultNodeSize, buildModule } from './enhanceable.js';
+
+export { defaultNodeSize };
 
 export const {
-  defaultNodeSize,
-  treeFromValues,
+  btreeFrom,
+  from,
+  btreeFromValues,
+  fromValues,
   findBalancePoint,
   splitValues,
   collapses,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/btree",
   "description": "Functional utilities for working with btrees such as those used in agAST",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -19,7 +19,7 @@
     "@iter-tools/imm-stack": "1.1.0"
   },
   "devDependencies": {
-    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
+    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.32.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",