@bablr/agast-vm-helpers 0.2.0 → 0.3.0

package/lib/builders.js

@@ -4,6 +4,7 @@ import {
   interpolateArrayChildren,
   interpolateString,
 } from '@bablr/agast-helpers/template';
+import { isNull } from '@bablr/agast-helpers/tree';
 import * as t from '@bablr/agast-helpers/shorthand';
 import * as l from './languages.js';
 
@@ -26,7 +27,7 @@ export const buildReference = (name, isArray) => {
     [t.ref`name`, ...when(isArray, [t.ref`arrayOperatorToken`]), t.ref`sigilToken`],
     {
       name: buildIdentifier(name),
-      arrayOperatorToken: isArray ? t.s_node(l.CSTML, 'Punctuator', '[]') : null,
+      arrayOperatorToken: isArray ? t.s_node(l.CSTML, 'Punctuator', '[]') : t.null_node(),
       sigilToken: t.s_node(l.CSTML, 'Punctuator', ':'),
     },
   );
@@ -60,11 +61,11 @@ export const buildFlags = (flags = {}) => {
       ...when(expression, [t.ref`expressionToken`]),
     ],
     properties: {
-      triviaToken: trivia && t.s_node(l.CSTML, 'Punctuator', '#'),
-      intrinsicToken: intrinsic && t.s_node(l.CSTML, 'Punctuator', '~'),
-      tokenToken: token && t.s_node(l.CSTML, 'Punctuator', '*'),
-      escapeToken: escape && t.s_node(l.CSTML, 'Punctuator', '@'),
-      expressionToken: expression && t.s_node(l.CSTML, 'Punctuator', '+'),
+      triviaToken: trivia ? t.s_node(l.CSTML, 'Punctuator', '#') : t.null_node(),
+      intrinsicToken: intrinsic ? t.s_node(l.CSTML, 'Punctuator', '~') : t.null_node(),
+      tokenToken: token ? t.s_node(l.CSTML, 'Punctuator', '*') : t.null_node(),
+      escapeToken: escape ? t.s_node(l.CSTML, 'Punctuator', '@') : t.null_node(),
+      expressionToken: expression ? t.s_node(l.CSTML, 'Punctuator', '+') : t.null_node(),
     },
   };
 };
@@ -82,9 +83,15 @@ export const buildFullyQualifiedSpamMatcher = (
 ) => {
   const attributes_ = buildAttributes(attributes);
 
-  const lArr = language ? [...language] : [];
+  let language_;
 
-  let language_ = lArr.length === 0 ? null : lArr;
+  if (isString(language)) {
+    language_ = language;
+  } else {
+    let lArr = isString(language) ? language : language ? [...language] : [];
+
+    language_ = lArr.length === 0 ? null : lArr;
+  }
 
   return t.node(
     l.Spamex,
@@ -102,23 +109,17 @@ export const buildFullyQualifiedSpamMatcher = (
     {
       openToken: t.s_node(l.CSTML, 'Punctuator', '<'),
       flags: buildFlags(flags),
-      language: buildLanguage(language_),
-      languageSeparator: language_ && type && t.s_node(l.CSTML, 'Punctuator', ':'),
-      type: type && buildIdentifier(type),
-      intrinsicValue: intrinsicValue && buildString(intrinsicValue),
+      language: language_ ? buildLanguage(language_) : t.null_node(),
+      languageSeparator: language_ && type ? t.s_node(l.CSTML, 'Punctuator', ':') : t.null_node(),
+      type: type ? buildIdentifier(type) : t.null_node(),
+      intrinsicValue: intrinsicValue ? buildString(intrinsicValue) : t.null_node(),
       attributes: attributes_,
       closeToken: t.s_node(l.CSTML, 'Punctuator', '>'),
     },
   );
 };
 
-export const buildNodeOpenTag = (
-  flags,
-  language,
-  type = null,
-  intrinsicValue = null,
-  attributes = {},
-) => {
+export const buildNodeOpenTag = (flags, language, type = null, attributes = {}) => {
   const attributes_ = buildAttributes(attributes);
 
   let language_ = !language || language.length === 0 ? null : language;
@@ -131,21 +132,17 @@ export const buildNodeOpenTag = (
       t.ref`flags`,
       ...when(language_, [t.ref`language`, t.ref`languageSeparator`]),
       ...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())),
-      when(intrinsicValue, [t.embedded(buildSpace), t.ref`selfClosingToken`]),
       t.ref`closeToken`,
     ],
     {
       openToken: t.s_node(l.CSTML, 'Punctuator', '<'),
       flags: buildFlags(flags),
-      language: buildLanguage(language_),
-      languageSeparator: language_ && type && t.s_node(l.CSTML, 'Punctuator', ':'),
-      type: type && buildIdentifier(type),
-      intrinsicValue: intrinsicValue && buildString(intrinsicValue),
+      language: language_ && type ? buildLanguage(language_) : t.null_node(),
+      languageSeparator: language_ && type ? t.s_node(l.CSTML, 'Punctuator', ':') : t.null_node(),
+      type: type ? buildIdentifier(type) : t.null_node(),
       attributes: attributes_,
-      selfClosingToken: intrinsicValue && t.s_node(l.CSTML, 'Punctuator', '/'),
       closeToken: t.s_node(l.CSTML, 'Punctuator', '>'),
     },
   );
@@ -178,7 +175,7 @@ export const buildDoctypeTag = (attributes) => {
 };
 
 export const buildIdentifierPath = (path) => {
-  const path_ = [...path];
+  const path_ = isString(path) ? [path] : [...path];
   const segments = path_.map((name) => buildIdentifier(name));
   const separators = path_.slice(0, -1).map((_) => t.s_node(l.CSTML, 'Punctuator', '.'));
 
@@ -198,7 +195,9 @@ export const buildIdentifierPath = (path) => {
 };
 
 export const buildLanguage = (language) => {
-  return language && buildIdentifierPath(language);
+  return language && isString(language) && language.startsWith('https://')
+    ? buildString(language)
+    : buildIdentifierPath(language);
 };
 
 export const buildNodeCloseTag = (type, language) => {
@@ -214,9 +213,9 @@ export const buildNodeCloseTag = (type, language) => {
     ],
     {
       openToken: t.s_node(l.CSTML, 'Punctuator', '</'),
-      language: buildLanguage(language),
-      languageSeparator: language && type ? t.s_node(l.CSTML, 'Punctuator', ':') : null,
-      type: type && buildIdentifier(type),
+      language: language ? buildLanguage(language) : t.null_node(),
+      languageSeparator: language && type ? t.s_node(l.CSTML, 'Punctuator', ':') : t.null_node(),
+      type: type ? buildIdentifier(type) : t.null_node(),
       closeToken: t.s_node(l.CSTML, 'Punctuator', '>'),
     },
   );
@@ -354,7 +353,7 @@ export const buildString = (value) => {
           if (escapables[chr]) {
             value = t.node(l.CSTML, 'EscapeCode', [t.ref`sigilToken`], {
               sigilToken: buildKeyword(escapables[chr]),
-              digits: null,
+              digits: t.null_node(),
             });
           } else if (chr.charCodeAt(0) < 32) {
             const hexDigits = chr.charCodeAt(0).toString(16).padStart(4, '0');
@@ -372,7 +371,7 @@ export const buildString = (value) => {
           }
 
           terminals.push(
-            t.buildEmbedded(
+            t.buildEmbeddedNode(
               t.e_node(
                 l.CSTML,
                 'EscapeSequence',
@@ -509,7 +508,7 @@ export const buildMappingAttribute = (key, value) => {
 
 export const buildBooleanAttribute = (key, value) => {
   return t.node(l.CSTML, 'BooleanAttribute', [...when(!value, [t.ref`negateToken`]), t.ref`key`], {
-    negateToken: !value ? t.s_node(l.CSTML, 'Puncutator', '!') : null,
+    negateToken: !value ? t.s_node(l.CSTML, 'Puncutator', '!') : t.null_node(),
     key: buildIdentifier(key),
   });
 };
@@ -519,7 +518,7 @@ export const buildAttribute = (key, value) => {
 };
 
 export const buildExpression = (expr) => {
-  if (expr == null) return buildNull();
+  if (isNull(expr)) return buildNull();
 
   switch (typeof expr) {
     case 'boolean':
@@ -572,7 +571,7 @@ export const buildNodeMatcher = (flags, language, type, attributes = {}) => {
     {
       openToken: t.s_node(l.CSTML, 'Punctuator', '<'),
       language: buildLanguage(language_),
-      languageSeparator: language_ && type && t.s_node(l.CSTML, 'Punctuator', ':'),
+      languageSeparator: language_ && type ? t.s_node(l.CSTML, 'Punctuator', ':') : t.null_node(),
       flags: flags_,
       type: buildIdentifier(type),
       attributes: attributes_,

package/lib/deembed.js

@@ -0,0 +1,17 @@
+const { isArray } = Array;
+const isString = (val) => typeof val === 'string';
+const isNumber = (val) => typeof val === 'number';
+
+export const deembedExpression = (expr) => {
+  if (isString(expr) || expr == null || typeof expr === 'boolean' || isNumber(expr)) {
+    return expr;
+  } else if (isArray(expr)) {
+    return expr.map((value) => deembedExpression(value));
+  } else if (typeof expr === 'object') {
+    return Object.fromEntries(
+      Object.entries(expr.value).map(({ 0: key, 1: value }) => [key, deembedExpression(value)]),
+    );
+  } else {
+    throw new Error();
+  }
+};

package/lib/embed.js

@@ -0,0 +1,21 @@
+import { buildEmbeddedExpression } from './internal-builders.js';
+
+const { isArray } = Array;
+const isString = (val) => typeof val === 'string';
+const isNumber = (val) => typeof val === 'number';
+
+export const embedExpression = (expr) => {
+  if (isString(expr) || expr == null || typeof expr === 'boolean' || isNumber(expr)) {
+    return expr;
+  } else if (isArray(expr)) {
+    return expr.map((value) => embedExpression(value));
+  } else if (typeof expr === 'object') {
+    return buildEmbeddedExpression(
+      Object.fromEntries(
+        Object.entries(expr).map(({ 0: key, 1: value }) => [key, embedExpression(value)]),
+      ),
+    );
+  } else {
+    throw new Error();
+  }
+};

package/lib/index.js

@@ -1,4 +1,5 @@
-import { getCooked } from '@bablr/agast-helpers/tree';
+import { getCooked, isNull } from '@bablr/agast-helpers/tree';
+import * as sym from '@bablr/agast-helpers/symbols';
 
 export * from './builders.js';
 
@@ -31,28 +32,24 @@ const reifyFlags = (flags) => {
   let { triviaToken, escapeToken, tokenToken, expressionToken, intrinsicToken } = flags.properties;
 
   return {
-    token: !!tokenToken,
-    escape: !!escapeToken,
-    trivia: !!triviaToken,
-    intrinsic: !!intrinsicToken,
-    expression: !!expressionToken,
+    token: reifyExpression(tokenToken),
+    escape: reifyExpression(escapeToken),
+    trivia: reifyExpression(triviaToken),
+    intrinsic: reifyExpression(intrinsicToken),
+    expression: reifyExpression(expressionToken),
   };
 };
 
 export const reifyLanguage = (language) => {
   const value = reifyExpression(language);
 
-  if (typeof value === 'string' && !value.startsWith('https://')) {
-    throw new Error('bad language');
-  }
-
-  return value;
+  return typeof value === 'string' && !value.startsWith('https://') ? [value] : value;
 };
 
 export const reifyExpression = (node) => {
   if (node instanceof Promise) throw new Error();
 
-  if (!node) return null;
+  if (!node || node.type === sym.null) return null;
 
   if (node.language === 'https://bablr.org/languages/core/en/cstml') {
     switch (node.type) {
@@ -73,7 +70,7 @@ export const reifyExpression = (node) => {
 
         name = reifyExpression(name);
 
-        return { type: 'Reference', value: { name, isArray: !!arrayOperatorToken } };
+        return { type: 'Reference', value: { name, isArray: !isNull(arrayOperatorToken) } };
       }
 
       case 'Literal': {
@@ -87,17 +84,16 @@ export const reifyExpression = (node) => {
       }
 
       case 'OpenNodeTag': {
-        let { flags, language, type, attributes, intrinsicValue } = node.properties;
+        let { flags, language, type, attributes } = node.properties;
 
         flags = reifyFlags(flags);
         language = reifyLanguage(language);
         type = reifyExpression(type);
         attributes = reifyAttributes(attributes);
-        intrinsicValue = reifyExpression(intrinsicValue);
 
         return {
           type: 'OpenNodeTag',
-          value: { flags, language, type, intrinsicValue, properties: {}, attributes },
+          value: { flags, language, type, attributes },
         };
       }
 
@@ -119,6 +115,10 @@ export const reifyExpression = (node) => {
         return node.properties.sign === '-' ? -Infinity : Infinity;
       }
 
+      case 'Punctuator': {
+        return getCooked(node);
+      }
+
       case 'String':
         return node.properties.content ? getCooked(node.properties.content) : '';
 
@@ -148,7 +148,7 @@ export const reifyExpression = (node) => {
       let { flags, language, type, attributes, intrinsicValue } = node.properties;
 
       flags = reifyFlags(flags);
-      language = reifyExpression(language);
+      language = reifyLanguage(language);
       type = reifyExpression(type);
       attributes = reifyAttributes(attributes);
       intrinsicValue = reifyExpression(intrinsicValue);
@@ -205,7 +205,7 @@ export const reifyExpression = (node) => {
 };
 
 export const reifyExpressionShallow = (node) => {
-  if (!node) return null;
+  if (!node || node.type === sym.null) return null;
 
   if (
     ![
@@ -244,7 +244,7 @@ export const reifyAttributes = (attributes) => {
       if (attr.type === 'MappingAttribute') {
         return [reifyExpression(attr.properties.key), reifyExpression(attr.properties.value)];
       } else if (attr.type === 'BooleanAttribute') {
-        return [reifyExpression(attr.properties.key), !attr.properties.negateToken];
+        return [reifyExpression(attr.properties.key), isNull(attr.properties.negateToken)];
       } else {
         throw new Error();
       }

package/lib/internal-builders.js

@@ -0,0 +1 @@
+export * from '@bablr/agast-helpers/builders';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/agast-vm-helpers",
   "description": "Helper functions for working with the BABLR VM",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [
@@ -9,13 +9,16 @@
   ],
   "exports": {
     ".": "./lib/index.js",
-    "./facades": "./lib/facades.js",
     "./builders": "./lib/builders.js",
+    "./deembed": "./lib/deembed.js",
+    "./embed": "./lib/embed.js",
+    "./facades": "./lib/facades.js",
+    "./internal-builders": "./lib/internal-builders.js",
     "./languages": "./lib/languages.js"
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.2.0"
+    "@bablr/agast-helpers": "0.3.0"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",