@bablr/agast-vm-helpers 0.1.0 → 0.1.1

package/lib/builders.js

@@ -261,7 +261,11 @@ export const buildSpace = () => {
 };
 
 export const buildIdentifier = (name) => {
-  return t.node(l.Instruction, 'Identifier', [t.lit(name)]);
+  return t.s_node(l.Instruction, 'Identifier', name);
+};
+
+export const buildKeyword = (name) => {
+  return t.s_node(l.Instruction, 'Identifier', name);
 };
 
 export const buildCall = (verb, ...args) => {
@@ -295,8 +299,8 @@ export const buildDigit = (value) => {
   return t.s_node(l.CSTML, 'Digit', value);
 };
 
-export const buildInteger = (value) => {
-  const digits = value.toString(10).split('');
+export const buildInteger = (value, base = 10) => {
+  const digits = value.toString(base).split('');
 
   return t.node(
     l.CSTML,
@@ -330,6 +334,8 @@ export const buildNumber = (value) => {
   }
 };
 
+const buildLiteralTerminal = (lit) => freeze({ type: 'Literal', value: lit });
+
 export const buildString = (value) => {
   const pieces = isArray(value) ? value : [value];
   const terminals = [];
@@ -359,22 +365,45 @@ export const buildString = (value) => {
           chr === '\n' ||
           chr === '\r' ||
           chr === '\t' ||
-          chr === '\0'
+          chr === '\0' ||
+          chr.charCodeAt(0) < 32
         ) {
           if (lit) {
-            terminals.push(freeze({ type: 'Literal', value: lit }));
+            terminals.push(buildLiteralTerminal(lit));
             lit = '';
           }
 
+          let value;
+
+          if (escapables[chr]) {
+            value = t.node(l.CSTML, 'EscapeCode', [t.ref`sigilToken`], {
+              sigilToken: buildKeyword(escapables[chr]),
+              digits: null,
+            });
+          } else if (chr.charCodeAt(0) < 32) {
+            const hexDigits = chr.charCodeAt(0).toString(16).padStart(4, '0');
+            value = t.node(
+              l.CSTML,
+              'EscapeCode',
+              [t.ref`sigilToken`, ...[...hexDigits].map((d) => t.ref`digits[]`)],
+              {
+                sigilToken: buildKeyword('u'),
+                digits: [...hexDigits].map((digit) => buildDigit(digit)),
+              },
+            );
+          } else {
+            value = buildKeyword(chr);
+          }
+
           terminals.push(
             t.buildEmbedded(
               t.e_node(
                 l.CSTML,
-                'Escape',
-                [t.ref`escape`, t.ref`escapee`],
+                'EscapeSequence',
+                [t.ref`escape`, t.ref`value`],
                 {
                   escape: t.s_node(l.CSTML, 'Punctuator', '\\'),
-                  escapee: t.s_node(l.CSTML, 'Literal', escapables[chr] || chr),
+                  value,
                 },
                 { cooked: chr },
               ),
@@ -385,7 +414,7 @@ export const buildString = (value) => {
         }
       }
     } else {
-      terminals.push(freeze({ type: 'Literal', value: lit }));
+      terminals.push(buildLiteralTerminal(lit));
       lit = '';
 
       if (piece == null) {
@@ -398,7 +427,7 @@ export const buildString = (value) => {
     }
   }
 
-  if (lit) terminals.push(freeze({ type: 'Literal', value: lit }));
+  if (lit) terminals.push(buildLiteralTerminal(lit));
   lit = '';
 
   return t.node(l.CSTML, 'String', [t.ref`open`, t.ref`content`, t.ref`close`], {
@@ -521,6 +550,8 @@ export const buildExpression = (expr) => {
       return buildBoolean(expr);
     case 'string':
       return buildString(expr);
+    case 'number':
+      return buildInteger(expr);
     case 'object': {
       switch (getPrototypeOf(expr)) {
         case Array.prototype:

package/package.json

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