@bablr/agast-helpers 0.5.1 → 0.5.3

package/lib/builders.js

@@ -45,6 +45,7 @@ export const buildEmbeddedExpression = (expr) => {
 };
 
 export const buildEmbeddedTag = (tag) => {
+  if (!isObject(tag)) return tag;
   return freeze({ type: EmbeddedTag, value: tag });
 };
 
@@ -63,6 +64,15 @@ export const buildWriteEffect = (text, options = {}) => {
   );
 };
 
+export const buildYieldEffect = (tag) => {
+  return buildEffect(
+    freeze({
+      verb: 'yield',
+      value: buildEmbeddedTag(freeze(tag)),
+    }),
+  );
+};
+
 export const buildAnsiPushEffect = (spans = '') => {
   return buildEffect(
     freeze({

package/lib/stream.js

@@ -264,7 +264,7 @@ function* __generateAllOutput(tags) {
 export const generateAllOutput = (tags) => new StreamIterable(__generateAllOutput(tags));
 
 export const printCSTML = (tags) => {
-  return stringFromStream(generateStandardOutput(generateCSTMLStrategy(tags)));
+  return stringFromStream(generateCSTML(tags));
 };
 
 function* __emptyStreamIterator() {}
@@ -309,11 +309,11 @@ export const stringFromStream = (stream) => {
   return str;
 };
 
-function* __generateCSTMLStrategy(tags, options) {
+function* __generateCSTML(tags, options) {
   let { emitEffects = false, inline: inlineOption = true } = options;
 
   if (!tags) {
-    yield buildWriteEffect('<//>');
+    yield '<//>';
     return;
   }
 
@@ -332,32 +332,32 @@ function* __generateCSTMLStrategy(tags, options) {
     const tag = co.value;
 
     if (tag.type === ReferenceTag && prevTag.type === NullTag) {
-      yield buildWriteEffect(' ');
+      yield ' ';
     }
 
     if (tag.type === 'Effect') {
       const effect = tag.value;
       if (emitEffects && effect.verb === 'write') {
-        yield buildWriteEffect(effect.value.text, effect.value.options);
+        yield effect.value.text, effect.value.options;
       }
       continue;
     }
 
     if (tag.type === TokenGroup) {
       const intrinsicValue = getCooked(tag.value);
-      yield buildWriteEffect(printSelfClosingNodeTag(tag.value[0], intrinsicValue));
+      yield printSelfClosingNodeTag(tag.value[0], intrinsicValue);
     } else {
-      yield buildWriteEffect(printTag(tag));
+      yield printTag(tag);
     }
 
     prevTag = tag;
   }
 
-  yield buildWriteEffect('\n');
+  yield '\n';
 }
 
-export const generateCSTMLStrategy = (tags, options = {}) =>
-  new StreamIterable(__generateCSTMLStrategy(tags, options));
+export const generateCSTML = (tags, options = {}) =>
+  new StreamIterable(__generateCSTML(tags, options));
 
 const isToken = (tag) => {
   return tag.value.flags.token;
@@ -436,11 +436,11 @@ function* __prettyGroupTokens(tags) {
   }
 }
 
-function* __generatePrettyCSTMLStrategy(tags, options) {
+function* __generatePrettyCSTML(tags, options) {
   let { indent = '  ', emitEffects = false, inline: inlineOption = true } = options;
 
   if (!tags) {
-    yield buildWriteEffect('<//>');
+    yield '<//>';
     return;
   }
 
@@ -465,10 +465,7 @@ function* __generatePrettyCSTMLStrategy(tags, options) {
       const effect = tag.value;
       if (emitEffects && effect.verb === 'write') {
         const writeEffect = getEmbeddedExpression(effect.value);
-        yield buildWriteEffect(
-          (first ? '' : '\n') + writeEffect.text,
-          getEmbeddedExpression(writeEffect.options),
-        );
+        yield (first ? '' : '\n') + writeEffect.text, getEmbeddedExpression(writeEffect.options);
 
         inline = false;
         first = false;
@@ -486,7 +483,7 @@ function* __generatePrettyCSTMLStrategy(tags, options) {
         tag.type === TokenGroup);
 
     if (!first && !inline) {
-      yield buildWriteEffect('\n');
+      yield '\n';
     }
 
     if (tag.type === CloseNodeTag || tag.type === CloseFragmentTag) {
@@ -499,17 +496,17 @@ function* __generatePrettyCSTMLStrategy(tags, options) {
     }
 
     if (!inline) {
-      yield buildWriteEffect(indent.repeat(indentLevel));
+      yield indent.repeat(indentLevel);
     } else {
-      yield buildWriteEffect(' ');
+      yield ' ';
     }
 
     if (tag.type === TokenGroup) {
       ref = null;
       const intrinsicValue = tag.value[0].value.flags.token ? getCooked(tag.value) : null;
-      yield buildWriteEffect(printSelfClosingNodeTag(tag.value[0], intrinsicValue));
+      yield printSelfClosingNodeTag(tag.value[0], intrinsicValue);
     } else {
-      yield buildWriteEffect(printTag(tag));
+      yield printTag(tag);
     }
 
     if (tag.type === ReferenceTag) {
@@ -524,15 +521,15 @@ function* __generatePrettyCSTMLStrategy(tags, options) {
     first = false;
   }
 
-  yield buildWriteEffect('\n');
+  yield '\n';
 }
 
-export const generatePrettyCSTMLStrategy = (tags, options = {}) => {
-  return new StreamIterable(__generatePrettyCSTMLStrategy(tags, options));
+export const generatePrettyCSTML = (tags, options = {}) => {
+  return new StreamIterable(__generatePrettyCSTML(tags, options));
 };
 
 export const printPrettyCSTML = (tags, options = {}) => {
-  return stringFromStream(generateStandardOutput(generatePrettyCSTMLStrategy(tags, options)));
+  return stringFromStream(generatePrettyCSTML(tags, options));
 };
 
 export const getCooked = (tags) => {

package/lib/tree.js

@@ -166,8 +166,8 @@ function* __treeFromStream(tokens) {
       case OpenFragmentTag: {
         const { flags } = tag.value;
 
-        const language = doctype.value.attributes['bablr-language'];
-        const attributes = doctype.value.attributes;
+        const { attributes } = doctype.value;
+        const language = attributes['bablr-language'];
 
         const node = freeze({
           flags,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/agast-helpers",
   "description": "Helper functions for working with agAST trees",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [