@bablr/agast-vm-helpers 0.1.2 → 0.1.4

package/README.md

@@ -1,3 +1,12 @@
 # @bablr/agast-vm-helpers
 
-Helper functions for working with the agAST VM
+Helper functions for working with the agAST VM.
+
+
+## Usage
+
+```js
+import { buildExpression, reifyExression } from 'agast-vm-helpers';
+
+reifyExpression(buildExpression());
+```

package/lib/builders.js

@@ -20,17 +20,31 @@ function* repeat(times, ...values) {
 }
 
 export const buildReference = (name, isArray) => {
-  return t.node(l.CSTML, 'Reference', [t.ref`name`, ...when(isArray, [t.ref`arrayOperator`])], {
-    name: buildIdentifier(name),
-    arrayOperator: isArray ? t.s_node(l.CSTML, 'Punctuator', '[]') : null,
-  });
+  return t.node(
+    l.CSTML,
+    'Reference',
+    [t.ref`name`, ...when(isArray, [t.ref`arrayOperatorToken`]), t.ref`sigilToken`],
+    {
+      name: buildIdentifier(name),
+      arrayOperatorToken: isArray ? t.s_node(l.CSTML, 'Punctuator', '[]') : null,
+      sigilToken: t.s_node(l.CSTML, 'Punctuator', ':'),
+    },
+  );
 };
 
 export const buildGap = () => {
-  return t.node(l.CSTML, 'Gap', [t.ref`value`], { value: t.s_node(l.CSTML, 'Punctuator', '<//>') });
+  return t.node(l.CSTML, 'Gap', [t.ref`sigilToken`], {
+    sigilToken: t.s_node(l.CSTML, 'Punctuator', '<//>'),
+  });
 };
 
-export const buildFlags = (flags) => {
+export const buildShift = () => {
+  return t.node(l.CSTML, 'Shift', [t.ref`sigilToken`], {
+    sigilToken: t.s_node(l.CSTML, 'Punctuator', '^^^'),
+  });
+};
+
+export const buildFlags = (flags = {}) => {
   const { intrinsic = null, token = null, escape = null, trivia = null, expression = null } = flags;
 
   if ((trivia && escape) || (expression && (trivia || escape))) {
@@ -55,7 +69,7 @@ export const buildFlags = (flags) => {
   };
 };
 
-export const buildSpamMatcher = (type, value, attributes = {}) => {
+export const buildSpamMatcher = (type = null, value = null, attributes = {}) => {
   return buildFullyQualifiedSpamMatcher({}, null, type, value, attributes);
 };
 
@@ -79,7 +93,7 @@ export const buildFullyQualifiedSpamMatcher = (
       t.ref`openToken`,
       t.ref`flags`,
       ...when(language_, [t.ref`language`, t.ref`languageSeparator`]),
-      t.ref`type`,
+      ...when(type, [t.ref`type`]),
       ...when(intrinsicValue, [t.embedded(buildSpace()), t.ref`intrinsicValue`]),
       ...when(attributes_.length, [t.embedded(buildSpace())]),
       ...interpolateArrayChildren(attributes, t.ref`attributes[]`, t.embedded(buildSpace())),
@@ -90,7 +104,7 @@ export const buildFullyQualifiedSpamMatcher = (
       flags: buildFlags(flags),
       language: buildLanguage(language_),
       languageSeparator: language_ && type && t.s_node(l.CSTML, 'Punctuator', ':'),
-      type: buildIdentifier(type),
+      type: type && buildIdentifier(type),
       intrinsicValue: intrinsicValue && buildString(intrinsicValue),
       attributes: attributes_,
       closeToken: t.s_node(l.CSTML, 'Punctuator', '>'),
@@ -98,7 +112,13 @@ export const buildFullyQualifiedSpamMatcher = (
   );
 };
 
-export const buildNodeOpenTag = (flags, language, type, intrinsicValue = null, attributes = {}) => {
+export const buildNodeOpenTag = (
+  flags,
+  language,
+  type = null,
+  intrinsicValue = null,
+  attributes = {},
+) => {
   const attributes_ = buildAttributes(attributes);
 
   let language_ = !language || language.length === 0 ? null : language;
@@ -110,7 +130,7 @@ export const buildNodeOpenTag = (flags, language, type, intrinsicValue = null, a
       t.ref`openToken`,
       t.ref`flags`,
       ...when(language_, [t.ref`language`, t.ref`languageSeparator`]),
-      t.ref`type`,
+      ...when(type, [t.ref`type`]),
       ...when(intrinsicValue, [t.embedded(buildSpace()), t.ref`intrinsicValue`]),
       ...when(attributes_.length, [t.embedded(buildSpace())]),
       ...interpolateArrayChildren(attributes_, t.ref`attributes[]`, t.embedded(buildSpace())),
@@ -122,7 +142,7 @@ export const buildNodeOpenTag = (flags, language, type, intrinsicValue = null, a
       flags: buildFlags(flags),
       language: buildLanguage(language_),
       languageSeparator: language_ && type && t.s_node(l.CSTML, 'Punctuator', ':'),
-      type: buildIdentifier(type),
+      type: type && buildIdentifier(type),
       intrinsicValue: intrinsicValue && buildString(intrinsicValue),
       attributes: attributes_,
       selfClosingToken: intrinsicValue && t.s_node(l.CSTML, 'Punctuator', '/'),
@@ -157,13 +177,6 @@ export const buildDoctypeTag = (attributes) => {
   );
 };
 
-export const buildFragmentOpenTag = () => {
-  return t.node(l.CSTML, 'OpenFragmentTag', [t.ref`openToken`, t.ref`closeToken`], {
-    openToken: t.s_node(l.CSTML, 'Punctuator', '<'),
-    closeToken: t.s_node(l.CSTML, 'Punctuator', '>'),
-  });
-};
-
 export const buildIdentifierPath = (path) => {
   const path_ = [...path];
   const segments = path_.map((name) => buildIdentifier(name));
@@ -209,13 +222,6 @@ export const buildNodeCloseTag = (type, language) => {
   );
 };
 
-export const buildFragmentCloseTag = () => {
-  return t.node(l.CSTML, 'CloseFragmentTag', [t.ref`openToken`, t.ref`closeToken`], {
-    openToken: t.s_node(l.CSTML, 'Punctuator', '</'),
-    closeToken: t.s_node(l.CSTML, 'Punctuator', '>'),
-  });
-};
-
 export const buildLiteral = (value) => {
   return t.node(l.CSTML, 'Literal', [t.ref`value`], { value });
 };

package/lib/index.js

@@ -16,7 +16,7 @@ export const effectsFor = (verb) => {
       return { success: 'none', failure: 'none' };
 
     case 'guard':
-      return { success: 'none', failure: 'fail' };
+      return { success: 'fail', failure: 'none' };
 
     default:
       throw new Error('invalid match verb');
@@ -69,11 +69,11 @@ export const reifyExpression = (node) => {
       }
 
       case 'Reference': {
-        let { name, arrayOperator } = node.properties;
+        let { name, arrayOperatorToken } = node.properties;
 
         name = reifyExpression(name);
 
-        return { type: 'Reference', value: { name, isArray: !!arrayOperator } };
+        return { type: 'Reference', value: { name, isArray: !!arrayOperatorToken } };
       }
 
       case 'Literal': {
@@ -82,14 +82,6 @@ export const reifyExpression = (node) => {
         return { type: 'Literal', value: getCooked(value.properties.content) };
       }
 
-      case 'OpenFragmentTag': {
-        return { type: 'OpenFragmentTag', value: undefined };
-      }
-
-      case 'CloseFragmentTag': {
-        return { type: 'CloseFragmentTag', value: {} };
-      }
-
       case 'IdentifierPath': {
         return node.properties.segments.map((segment) => reifyExpression(segment));
       }
@@ -133,6 +125,9 @@ export const reifyExpression = (node) => {
       case 'Gap':
         return { type: 'Gap', value: undefined };
 
+      case 'Shift':
+        return { type: 'Shift', value: undefined };
+
       default:
         throw new Error();
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/agast-vm-helpers",
   "description": "Helper functions for working with the BABLR VM",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -15,7 +15,7 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.1.5"
+    "@bablr/agast-helpers": "0.1.6"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",