@bablr/agast-helpers 0.10.9 → 0.10.10

package/lib/builders.js

@@ -40,13 +40,7 @@ export const deepFreeze = (object) => {
 export const buildSpan = (name, guard = null, props = {}) => {
   if (!name) throw new Error();
   deepFreeze(props);
-  return freeze({ type: 'Explicit', name, guard, props });
-};
-
-export const buildTypedSpan = (type, name, guard = null, props = {}) => {
-  if (!type || !name) throw new Error();
-  deepFreeze(props);
-  return freeze({ type, name, guard, props });
+  return freeze({ name, guard, props });
 };
 
 export const buildProperty = (tags, shift) => {

package/lib/path.js

@@ -145,12 +145,12 @@ export const buildBoundsFromTags = (tags) => {
     openStack = BTree.unshift(gapFrame, openStack);
   }
 
-  if (lastProperty && lastProperty.value.type === TreeNode) {
+  if (lastProperty && lastProperty.value.node.type === TreeNode) {
     if (!lastProperty.value.node) throw new Error();
 
     closeStack = lastProperty.value.node.value.bounds[1];
 
-    let rootFrame = BTree.getAt(1, openStack);
+    let rootFrame = BTree.getAt(1, closeStack);
 
     closeStack = BTree.replaceAt(0, closeStack, buildPathFrame(lastProperty));
     if (rootFrame) {
@@ -639,6 +639,7 @@ export const getOr = (defaultValue, path, node) => {
 };
 
 export function* list(name, node) {
+  if (isArray(name)) throw new Error('not supported');
   let count = countList(name, node);
 
   for (let i = 0; i < count; i++) {
@@ -2175,6 +2176,8 @@ export class TagPath {
         ({ node } = tag.value);
         break;
       }
+      case GapNode:
+      case NullNode:
       case TreeNode: {
         node = tag;
         break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/agast-helpers",
   "description": "Helper functions for working with agAST trees",
-  "version": "0.10.9",
+  "version": "0.10.10",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -27,7 +27,7 @@
     "test": "mocha test/*.test.js"
   },
   "dependencies": {
-    "@bablr/btree": "0.4.4",
+    "@bablr/btree": "0.4.5",
     "@bablr/coroutine": "0.1.0",
     "@bablr/stream-iterator": "2.0.0",
     "@iter-tools/imm-stack": "1.2.0"