@bablr/agast-helpers 0.10.10 → 0.11.0

package/lib/tree.js

@@ -1,22 +1,22 @@
 import {
-  buildReferenceTag,
   buildOpenNodeTag,
-  buildLiteralTag,
   buildCloseNodeTag,
   tokenFlags,
   buildChild,
   buildGapTag,
   buildOpenFragmentTag,
+  buildReference,
+  parseTagType,
+  parseTag,
 } from './builders.js';
 import {
   printPrettyCSTML as printPrettyCSTMLFromStream,
   printCSTML as printCSTMLFromStream,
   printSource as printSourceFromStream,
   treeFromStream,
-  treeFromStreamSync,
-  treeFromStreamAsync,
-  evaluateReturnSync,
-  evaluateReturnAsync,
+  evaluateReturn,
+  printOpenNodeTag,
+  streamFromString,
 } from './stream.js';
 import {
   OpenNodeTag,
@@ -45,11 +45,10 @@ import {
   isNullNode,
   isGapNode,
   getOpenTag,
-  getCloseTag,
+  getCloseNodeTag,
   getRoot,
-  getTags,
 } from './path.js';
-import { freeze, isPlainObject } from './object.js';
+import { freeze, freezeRecord, isPlainObject } from './object.js';
 
 export {
   get,
@@ -60,26 +59,22 @@ export {
   isNullNode,
   isGapNode,
   getOpenTag,
-  getCloseTag,
+  getCloseNodeTag,
   getRoot,
   treeFromStream,
-  treeFromStreamSync,
-  treeFromStreamAsync,
-  evaluateReturnSync,
-  evaluateReturnAsync,
+  evaluateReturn,
 };
 
-export const buildToken = (name, value, attributes = {}) => {
-  return treeFromStreamSync([
-    buildOpenNodeTag(tokenFlags, name, null, attributes),
-    buildLiteralTag(value),
-    buildCloseNodeTag(),
+export const buildToken = (name, value, attributes = freezeRecord({})) => {
+  return treeFromStream([
+    printOpenNodeTag(buildOpenNodeTag(tokenFlags, name, value, attributes, true)),
   ]);
 };
 
-const isString = (str) => typeof str === 'string';
+let isString = (str) => typeof str === 'string';
 
-const { isArray } = Array;
+let { isArray } = Array;
+let { getTags } = Tags;
 
 export const mergeReferences = (outer, inner) => {
   let { type, name, index, flags: { array, expression, intrinsic, hasGap } = {} } = outer;
@@ -98,8 +93,7 @@ export const mergeReferences = (outer, inner) => {
   name = type === '.' ? inner.name : name;
   type = type === '.' ? inner.type : type;
 
-  return buildReferenceTag(type, name, freeze({ array, expression, intrinsic, hasGap }), index)
-    .value;
+  return buildReference(type, name, freeze({ array, expression, intrinsic, hasGap }), index);
 };
 
 export const mergeReferenceTags = (outer, inner) => {
@@ -120,12 +114,12 @@ export const isEmpty = (node) => {
   if (node == null) return true;
 
   for (const tag of Tags.traverse(getTags(node))) {
-    switch (tag.type) {
+    switch (parseTagType(tag)) {
       case Property: {
-        if (tag.value.property.reference.type === '@') {
+        if (tag.value.reference.type === '@') {
           return false;
         } else {
-          const { property } = tag.value;
+          const property = tag.value;
 
           if (!isNullNode(property.node)) {
             return false;
@@ -142,7 +136,7 @@ export const isEmpty = (node) => {
   return true;
 };
 
-export const streamFromTree = (tree, options = {}) => {
+export const streamFromTree = (tree, options = freeze({})) => {
   if (tree && !isPlainObject(tree)) throw new Error();
 
   return __streamFromTree(null, tree, options);
@@ -163,22 +157,22 @@ function* __streamFromTree(doctypeTag, rootNode, options) {
   do {
     ({ tagPath, count } = stack.pop());
     do {
-      if (tagPath.tag.type === OpenNodeTag && !tagPath.tag.value.selfClosing) count++;
-      if (tagPath.tag.type === CloseNodeTag) count--;
+      if (tagPath.type === OpenNodeTag && !tagPath.value.selfClosing) count++;
+      if (tagPath.type === CloseNodeTag) count--;
 
       let gapNode;
-      if (getGapNode && tagPath.tag.type === GapTag && (gapNode = getGapNode(tagPath.path.node))) {
+      if (
+        getGapNode &&
+        tagPath.type === GapTag &&
+        (gapNode = getGapNode(tagPath.path.node)) &&
+        gapNode !== tagPath.path.node
+      ) {
         stack.push({ tagPath: unshift ? tagPath.nextUnshifted : tagPath.next, count });
         tagPath = TagPath.fromNode(gapNode, 0);
         count = 0;
       }
 
-      if (
-        !(
-          tagPath.tag.type === AttributeDefinition ||
-          (tagPath.tag.type === BindingTag && !tagPath.tag.value.segments.length)
-        )
-      ) {
+      if (!(tagPath.type === AttributeDefinition)) {
         yield tagPath.tag;
       }
     } while ((tagPath = unshift ? tagPath.nextUnshifted : tagPath.next));
@@ -230,9 +224,12 @@ function* __vcsStreamFromTree(rootNode) {
     } else {
       let wrappedTag = child;
 
-      if (wrappedTag.type === Property) {
+      let wrappedType = parseTagType(wrappedTag);
+
+      if (wrappedType === Property) {
         for (let tag of wrappedTag.value.tags) {
-          switch (tag.type) {
+          let tagType = parseTagType(tag);
+          switch (tagType) {
             case TreeNode:
             case NullNode:
             case GapNode: {
@@ -250,7 +247,7 @@ function* __vcsStreamFromTree(rootNode) {
 
                 depth++;
                 i = 0;
-                agastNode = tag.value;
+                agastNode = tag;
                 nodeShifted = wrappedTag.value.tags[0].type === ShiftTag;
                 seenFirstProperty = false;
                 continue outer;
@@ -260,7 +257,7 @@ function* __vcsStreamFromTree(rootNode) {
             default: {
               yield tag;
 
-              if (tag.type === OpenNodeTag && tag.value.literalValue) {
+              if (tagType === OpenNodeTag && parseTag(tag).value.literalValue) {
                 ({ stack, agastNode, node, depth, i, nodeShifted } = stack);
                 seenFirstProperty = true;
               }
@@ -272,7 +269,7 @@ function* __vcsStreamFromTree(rootNode) {
       } else {
         yield wrappedTag;
 
-        if (wrappedTag.type === OpenNodeTag && wrappedTag.value.literalValue) {
+        if (wrappedType === OpenNodeTag && wrappedTag.value.literalValue) {
           ({ stack, agastNode, node, depth, i, nodeShifted } = stack);
           seenFirstProperty = true;
         }
@@ -292,11 +289,12 @@ export const getCooked = (cookable) => {
   let cooked = '';
 
   // const openTag = getOpenTag(cookable);
-  // const closeTag = getCloseTag(cookable);
+  // const closeTag = getCloseNodeTag(cookable);
 
   let referenceTag = null;
 
-  for (let tag of Tags.traverse(tags)) {
+  for (let tag_ of Tags.traverse(tags)) {
+    let tag = parseTag(tag_);
     switch (tag.type) {
       case ReferenceTag: {
         let { type } = tag.value;
@@ -338,6 +336,9 @@ export const getCooked = (cookable) => {
       }
 
       case OpenNodeTag: {
+        if (tag.value.literalValue) {
+          cooked += tag.value.literalValue;
+        }
         break;
       }
 
@@ -354,11 +355,15 @@ export const getCooked = (cookable) => {
   return cooked;
 };
 
+export const treeFromString = (input) => {
+  return treeFromStream(streamFromString(input));
+};
+
 export const printCSTML = (tree) => {
   return printCSTMLFromStream(streamFromTree(tree));
 };
 
-export const printPrettyCSTML = (tree, options = {}) => {
+export const printPrettyCSTML = (tree, options = freeze({})) => {
   return printPrettyCSTMLFromStream(streamFromTree(tree), options);
 };
 

package/package.json

@@ -1,21 +1,26 @@
 {
   "name": "@bablr/agast-helpers",
   "description": "Helper functions for working with agAST trees",
-  "version": "0.10.10",
+  "version": "0.11.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
     "lib"
   ],
   "exports": {
-    "./btree": "./lib/btree.js",
+    "./b-list-keyed": "./lib/b-list-keyed.js",
+    "./b-list": "./lib/b-list.js",
+    "./b-map": "./lib/b-map.js",
+    "./b-set": "./lib/b-set.js",
     "./builders": "./lib/builders.js",
+    "./debug": "./lib/debug.js",
+    "./debug/register": "./lib/debug.register.js",
+    "./iterable": "./lib/iterable.js",
     "./object": "./lib/object.js",
-    "./path-facade": "./lib/path-facade.js",
+    "./parse": "./lib/parse.js",
     "./path": "./lib/path.js",
     "./print": "./lib/print.js",
     "./shorthand": "./lib/shorthand.js",
-    "./spans": "./lib/spans.js",
     "./stream": "./lib/stream.js",
     "./symbols": "./lib/symbols.js",
     "./tags": "./lib/tags.js",
@@ -27,13 +32,14 @@
     "test": "mocha test/*.test.js"
   },
   "dependencies": {
-    "@bablr/btree": "0.4.5",
-    "@bablr/coroutine": "0.1.0",
-    "@bablr/stream-iterator": "2.0.0",
+    "@bablr/btree": "1.0.0",
+    "@bablr/coroutine": "1.0.1",
+    "@bablr/stream-iterator": "3.0.0",
     "@iter-tools/imm-stack": "1.2.0"
   },
   "devDependencies": {
-    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
+    "@bablr/record": "1.0.0",
+    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#23b94fb3bdfdbc3ac7ed9cb58d7979d8f07dce2b",
     "@qnighy/dedent": "0.1.1",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.32.0",

package/lib/btree.js

@@ -1 +0,0 @@
-export * from '@bablr/btree';