@bablr/agast-helpers 0.6.1 → 0.7.0

package/lib/builders.js

@@ -8,20 +8,16 @@ import {
   ShiftTag,
   GapTag,
   NullTag,
-  ArrayInitializerTag,
+  InitializerTag,
   LiteralTag,
-  EmbeddedObject,
-  EmbeddedTag,
   TokenGroup,
-  EmbeddedMatcher,
-  EmbeddedRegex,
   EmbeddedNode,
 } from './symbols.js';
 
 const { freeze } = Object;
 const { isArray } = Array;
 
-const isObject = (val) => val !== null && typeof value !== 'object';
+const isObject = (val) => val !== null && typeof val === 'object';
 
 function* relatedNodes(properties) {
   for (const value of Object.values(properties)) {
@@ -41,9 +37,8 @@ const find = (predicate, iterable) => {
   }
 };
 
-export const buildEmbeddedObject = (expr) => {
-  if (!isObject(expr)) throw new Error();
-  return freeze({ type: EmbeddedObject, value: expr });
+export const buildTokenGroup = (tokens) => {
+  return freeze({ type: TokenGroup, value: tokens });
 };
 
 export const buildEmbeddedNode = (node) => {
@@ -51,57 +46,6 @@ export const buildEmbeddedNode = (node) => {
   return freeze({ type: EmbeddedNode, value: node });
 };
 
-export const buildEmbeddedMatcher = (node) => {
-  if (!isObject(node)) throw new Error();
-  return freeze({ type: EmbeddedMatcher, value: node });
-};
-
-export const buildEmbeddedRegex = (node) => {
-  if (!isObject(node)) throw new Error();
-  return freeze({ type: EmbeddedRegex, value: node });
-};
-
-export const buildEmbeddedTag = (tag) => {
-  if (!isObject(tag)) throw new Error();
-  return freeze({ type: EmbeddedTag, value: tag });
-};
-
-export const buildEffect = (value) => {
-  return freeze({ type: 'Effect', value });
-};
-
-export const buildWriteEffect = (text, options = {}) => {
-  return buildEffect(
-    freeze({
-      verb: 'write',
-      value: buildEmbeddedObject(freeze({ text, options: buildEmbeddedObject(freeze(options)) })),
-    }),
-  );
-};
-
-export const buildAnsiPushEffect = (spans = '') => {
-  return buildEffect(
-    freeze({
-      verb: 'ansi-push',
-      value: buildEmbeddedObject(
-        freeze({ spans: spans === '' ? freeze([]) : freeze(spans.split(' ')) }),
-      ),
-    }),
-  );
-};
-
-export const buildAnsiPopEffect = () => {
-  return buildEffect(freeze({ verb: 'ansi-pop', value: undefined }));
-};
-
-export const buildTokenGroup = (tokens) => {
-  return freeze({ type: TokenGroup, value: tokens });
-};
-
-export const buildCall = (verb, ...args) => {
-  return { verb, arguments: args };
-};
-
 export const buildBeginningOfStreamToken = () => {
   return freeze({ type: Symbol.for('@bablr/beginning-of-stream'), value: undefined });
 };
@@ -109,15 +53,23 @@ export const buildBeginningOfStreamToken = () => {
 export const buildReferenceTag = (name, isArray = false, flags = referenceFlags, index = null) => {
   if (name == null || !/[a-zA-Z.#@]/.test(name)) throw new Error('reference must have a name');
   if (index != null && !Number.isFinite(index)) throw new Error();
-  return freeze({ type: ReferenceTag, value: freeze({ name, isArray, index, flags }) });
+  let { hasGap, expression } = flags;
+
+  hasGap = !!hasGap;
+  expression = !!expression;
+
+  return freeze({
+    type: ReferenceTag,
+    value: freeze({ name, isArray, index, flags: freeze({ hasGap, expression }) }),
+  });
 };
 
 export const buildNullTag = () => {
   return freeze({ type: NullTag, value: undefined });
 };
 
-export const buildArrayInitializerTag = () => {
-  return freeze({ type: ArrayInitializerTag, value: undefined });
+export const buildInitializerTag = (isArray = false) => {
+  return freeze({ type: InitializerTag, value: { isArray } });
 };
 
 export const buildGapTag = () => {