@bablr/agast-helpers 0.3.0 → 0.3.2

package/lib/builders.js

@@ -19,18 +19,32 @@ export const buildEffect = (value) => {
 
 export const buildWriteEffect = (text, options = {}) => {
   return buildEffect(
-    freeze({ verb: 'write', value: freeze({ text, options: buildEmbeddedExpression(options) }) }),
+    buildEmbeddedExpression(
+      freeze({
+        verb: 'write',
+        value: buildEmbeddedExpression(
+          freeze({ text, options: buildEmbeddedExpression(freeze(options)) }),
+        ),
+      }),
+    ),
   );
 };
 
 export const buildAnsiPushEffect = (spans = '') => {
   return buildEffect(
-    freeze({ verb: 'ansi-push', value: { spans: spans === '' ? [] : spans.split(' ') } }),
+    buildEmbeddedExpression(
+      freeze({
+        verb: 'ansi-push',
+        value: buildEmbeddedExpression(
+          freeze({ spans: spans === '' ? freeze([]) : freeze(spans.split(' ')) }),
+        ),
+      }),
+    ),
   );
 };
 
 export const buildAnsiPopEffect = () => {
-  return buildEffect(freeze({ verb: 'ansi-pop', value: undefined }));
+  return buildEffect(buildEmbeddedExpression(freeze({ verb: 'ansi-pop', value: undefined })));
 };
 
 export const buildTokenGroup = (tokens) => {

package/lib/stream.js

@@ -4,6 +4,11 @@ import { printSelfClosingNodeTag, printTerminal } from './print.js';
 import { buildWriteEffect, buildTokenGroup } from './builders.js';
 export * from './print.js';
 
+const getEmbeddedExpression = (obj) => {
+  if (obj.type !== 'EmbeddedExpression') throw new Error();
+  return obj.value;
+};
+
 export const getStreamIterator = (obj) => {
   return obj[Symbol.for('@@streamIterator')]?.() || obj[Symbol.iterator]?.();
 };
@@ -158,9 +163,12 @@ function* __generateStandardOutput(terminals) {
     const terminal = co.value;
 
     if (terminal.type === 'Effect') {
-      const effect = terminal.value;
-      if (effect.verb === 'write' && (effect.value.stream == null || effect.value.stream === 1)) {
-        yield* effect.value.text;
+      const effect = getEmbeddedExpression(terminal.value);
+      if (effect.verb === 'write') {
+        const writeEffect = getEmbeddedExpression(effect.value);
+        if (writeEffect.stream == null || writeEffect.stream === 1) {
+          yield* writeEffect.text;
+        }
       }
     }
   }
@@ -185,14 +193,15 @@ function* __generateAllOutput(terminals) {
     const terminal = co.value;
 
     if (terminal.type === 'Effect') {
-      const effect = terminal.value;
+      const effect = getEmbeddedExpression(terminal.value);
       if (effect.verb === 'write') {
+        const writeEffect = getEmbeddedExpression(effect.value);
         const prevStream = currentStream;
-        currentStream = effect.value.options.stream || 1;
-        if (prevStream && prevStream !== currentStream && !effect.value.text.startsWith('\n')) {
+        currentStream = getEmbeddedExpression(writeEffect.options).stream || 1;
+        if (prevStream && prevStream !== currentStream && !writeEffect.text.startsWith('\n')) {
           yield* '\n';
         }
-        yield* effect.value.text;
+        yield* writeEffect.text;
       }
     }
   }
@@ -249,10 +258,6 @@ export const stringFromStream = (stream) => {
 function* __generateCSTMLStrategy(terminals, options) {
   let { emitEffects = false, inline: inlineOption = true } = options;
 
-  if (emitEffects) {
-    throw new Error('You must use generatePrettyCSTML with emitEffects');
-  }
-
   if (!terminals) {
     yield buildWriteEffect('<//>');
     return;
@@ -297,6 +302,9 @@ function* __generateCSTMLStrategy(terminals, options) {
   yield buildWriteEffect('\n');
 }
 
+export const generateCSTMLStrategy = (terminals, options = {}) =>
+  new StreamIterable(__generateCSTMLStrategy(terminals, options));
+
 export const prettyGroupTokens = (terminals) => new StreamIterable(__prettyGroupTokens(terminals));
 
 function* __prettyGroupTokens(terminals) {
@@ -334,13 +342,17 @@ function* __prettyGroupTokens(terminals) {
         state.holding = [];
       }
 
-      if (!isOpenClose) {
+      if (!isOpenClose && terminal.type !== 'Effect') {
         yield terminal;
       }
-    } else if (!isOpenClose) {
+    } else if (!isOpenClose && terminal.type !== 'Effect') {
       state.holding.push(terminal);
     }
 
+    if (terminal.type === 'Effect') {
+      yield terminal;
+    }
+
     if (terminal.type === 'CloseNodeTag') {
       if (!state.broken && (isIntrinsicToken(state.open) || state.holding.length === 1)) {
         state.holding.push(terminal);
@@ -363,9 +375,6 @@ function* __prettyGroupTokens(terminals) {
   }
 }
 
-export const generateCSTMLStrategy = (terminals, options = {}) =>
-  new StreamIterable(__generateCSTMLStrategy(terminals, options));
-
 function* __generatePrettyCSTMLStrategy(terminals, options) {
   let { indent = '  ', emitEffects = false, inline: inlineOption = true } = options;
 
@@ -391,9 +400,13 @@ function* __generatePrettyCSTMLStrategy(terminals, options) {
     const terminal = co.value;
 
     if (terminal.type === 'Effect') {
-      const effect = terminal.value;
+      const effect = getEmbeddedExpression(terminal.value);
       if (emitEffects && effect.verb === 'write') {
-        yield buildWriteEffect((first ? '' : '\n') + effect.value.text, effect.value.options);
+        const writeEffect = getEmbeddedExpression(effect.value);
+        yield buildWriteEffect(
+          (first ? '' : '\n') + writeEffect.text,
+          getEmbeddedExpression(writeEffect.options),
+        );
 
         inline = false;
         first = false;

package/package.json

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