@bablr/boot 0.10.0 → 0.11.1

package/lib/index.js

@@ -1,26 +1,39 @@
-import * as cstmll from './languages/cstml.js';
-import * as spamex from './languages/spamex.js';
-import * as regex from './languages/regex.js';
-import * as instruction from './languages/instruction.js';
+import cstmll from './languages/cstml.js';
+import spamex from './languages/spamex.js';
+import regex from './languages/regex.js';
+import instruction from './languages/instruction.js';
 
 import { TemplateParser } from './miniparser.js';
 import { buildEmbeddedMatcher, buildEmbeddedRegex } from '@bablr/agast-vm-helpers/builders';
+import { reifyExpression } from '@bablr/agast-vm-helpers';
+import { interpolate } from '@bablr/agast-helpers/template';
+import { buildGapTag } from '@bablr/agast-helpers/builders';
+import { buildNode } from '@bablr/agast-helpers/path';
 
 const trees = new WeakMap();
 
 export const buildTag = (language, defaultType) => {
   const defaultTag = (quasis, ...exprs) => {
     let tree;
-    if (trees.has(quasis) && !exprs.length) {
+    if (trees.has(quasis)) {
       tree = trees.get(quasis);
     } else {
-      tree = new TemplateParser(language, quasis.raw, exprs).eval({
+      tree = new TemplateParser(
+        language,
+        quasis.raw,
+        exprs.map((e) => buildNode(buildGapTag())),
+      ).eatProduction({
         language: language.name,
-        type: defaultType,
+        name: defaultType,
       });
 
       trees.set(quasis, tree);
     }
+
+    if (exprs.length) {
+      tree = interpolate(tree, exprs);
+    }
+
     return tree;
   };
 
@@ -29,21 +42,30 @@ export const buildTag = (language, defaultType) => {
       return defaultTag.apply(receiver, argsList);
     },
 
-    get(_, type) {
+    get(_, name) {
       const trees = new WeakMap();
 
       return (quasis, ...exprs) => {
         let tree;
-        if (trees.has(quasis) && !exprs.length) {
+        if (trees.has(quasis)) {
           tree = trees.get(quasis);
         } else {
-          tree = new TemplateParser(language, quasis.raw, exprs).eval({
+          tree = new TemplateParser(
+            language,
+            quasis.raw,
+            exprs.map((e) => buildNode(buildGapTag())),
+          ).eatProduction({
             language: language.name,
-            type,
+            name,
           });
 
           trees.set(quasis, tree);
         }
+
+        if (exprs.length) {
+          tree = interpolate(tree, exprs);
+        }
+
         return tree;
       };
     },
@@ -52,7 +74,7 @@ export const buildTag = (language, defaultType) => {
 
 export const parse = (language, type, sourceText, expressions = []) => {
   let source = Array.isArray(sourceText) ? sourceText : [sourceText];
-  return new TemplateParser(language, source, expressions).eval({
+  return new TemplateParser(language, source, expressions).eatProduction({
     language: language.name,
     type,
   });
@@ -60,12 +82,19 @@ export const parse = (language, type, sourceText, expressions = []) => {
 
 export const str = buildTag(cstmll, 'String');
 export const num = buildTag(cstmll, 'Integer');
-export const cst = buildTag(cstmll, 'Node');
+export const cst = buildTag(cstmll, 'Document');
+export const t_ = buildTag(cstmll, 'Tag');
 export const cstml = cst;
-export const spam_ = buildTag(spamex, 'Matcher');
+export const spam_ = buildTag(spamex, 'PropertyMatcher');
 export const re_ = buildTag(regex, 'Pattern');
 export const i = buildTag(instruction, 'Call');
 
+export const t = new Proxy(t_, {
+  apply(tag, _, args) {
+    return reifyExpression(tag(...args));
+  },
+});
+
 export const spam = new Proxy(spam_, {
   apply(tag, _, args) {
     return buildEmbeddedMatcher(tag(...args));

package/lib/languages/cstml.js

@@ -1,9 +1,8 @@
-import * as sym from '@bablr/agast-vm-helpers/symbols';
-import * as JSON from './json.js';
-import { get, sourceTextFor } from '@bablr/agast-helpers/tree';
+import JSON from './json.js';
+import { get } from '@bablr/agast-helpers/tree';
 
 const _ = /\s+/y;
-const PN = 'Punctuator';
+const PN = null;
 const KW = 'Keyword';
 
 export const name = 'CSTML';
@@ -16,11 +15,11 @@ export const dependencies = {
 
 export const covers = new Map([
   [
-    sym.node,
+    Symbol.for('@bablr/node'),
     new Set([
       'Document',
-      'DocumentVersion',
       'DoctypeTag',
+      'BoundNode',
       'Property',
       'ReferenceTag',
       'ReferenceFlags',
@@ -29,31 +28,50 @@ export const covers = new Map([
       'GlobalIdentifier',
       'NullTag',
       'GapTag',
-      'Node',
+      'ShiftTag',
+      'TreeNode',
+      'NullNode',
+      'GapNode',
       'IdentifierPath',
+      'BindingSegment',
       'OpenNodeTag',
       'CloseNodeTag',
       'LiteralTag',
       'BindingTag',
-      'InitializerTag',
       'AttributeDefinition',
       'Number',
       'Digit',
-      'Content',
       'NodeFlags',
     ]),
   ],
+  [
+    'Tag',
+    new Set([
+      'DoctypeTag',
+      'ReferenceTag',
+      'NullTag',
+      'GapTag',
+      'ShiftTag',
+      'OpenNodeTag',
+      'CloseNodeTag',
+      'LiteralTag',
+      'BindingTag',
+      'AttributeDefinition',
+    ]),
+  ],
+  [
+    'Expression',
+    new Set(['ShiftExpression', 'BindingExpression', 'TreeNode', 'NullNode', 'GapNode']),
+  ],
 ]);
 
 export const grammar = class CSTMLMiniparserGrammar {
-  // @Node
   Document(p) {
     p.eatProduction('DoctypeTag', { path: 'doctype' });
     p.eatMatchTrivia(_);
-    p.eatProduction('Node', { path: 'tree' }, { forceFragment: true });
+    p.eatProduction('Expression', { path: 'tree' });
   }
 
-  // @Node
   DoctypeTag(p) {
     p.eat('<!', PN, { path: 'openToken' });
     p.eatProduction('JSON:UnsignedInteger', { path: 'version' });
@@ -70,39 +88,32 @@ export const grammar = class CSTMLMiniparserGrammar {
     p.eat('>', PN, { path: 'closeToken' });
   }
 
-  // @Node
   NullTag(p) {
     p.eat('null', KW, { path: 'sigilToken' });
   }
 
-  // @Node
   GapTag(p) {
     p.eat('<//>', PN, { path: 'sigilToken' });
   }
 
-  // @Node
   LiteralTag(p) {
     p.eatProduction('JSON:String', { path: 'value' });
   }
 
-  //@Node
-  InitializerTag(p) {
-    let isArray;
-    if ((isArray = p.match('['))) {
-      p.eat('[]', PN, { path: 'sigilToken' });
-    } else {
-      p.eat('undefined', PN, { path: 'sigilToken' });
+  TreeNode(p, props) {
+    if (p.match(/['"]/y)) {
+      do {
+        p.eatProduction('LiteralTag', { path: 'children[]' });
+        p.eatMatchTrivia(_);
+      } while (p.match(/['"]/y));
+      return;
     }
-    return { attrs: { isArray } };
-  }
 
-  // @Node
-  Node(p, props) {
-    let open = p.eatProduction('OpenNodeTag', { path: 'open', noInterpolate: true }, props);
+    let open = p.eatProduction('OpenNodeTag', { path: 'openTag', noInterpolate: true }, props);
 
     p.eatMatchTrivia(_);
 
-    if (open.attributes.balanced) {
+    if (open.value.attributes.selfClosing) {
       let token = !!get(['flags', 'token'], open);
 
       while (p.atExpression || !(p.match(/<\/[^/]/y) || p.done)) {
@@ -110,7 +121,7 @@ export const grammar = class CSTMLMiniparserGrammar {
         p.eatMatchTrivia(_);
       }
 
-      p.eatProduction('CloseNodeTag', { path: 'close', noInterpolate: true });
+      p.eatProduction('CloseNodeTag', { path: 'closeTag', noInterpolate: true });
     }
   }
 
@@ -138,9 +149,8 @@ export const grammar = class CSTMLMiniparserGrammar {
     }
   }
 
-  // @Node
   AttributeDefinition(p) {
-    p.eat('{', PN, { path: 'openToken', balanced: '}' });
+    p.eat('{', PN, { path: 'openToken' });
     p.eatMatchTrivia(_);
     p.eatProduction('IdentifierPath', { path: 'key' });
     p.eatMatchTrivia(_);
@@ -148,88 +158,73 @@ export const grammar = class CSTMLMiniparserGrammar {
     p.eatMatchTrivia(_);
     p.eatProduction('JSON:Expression', { path: 'value' });
     p.eatMatchTrivia(_);
-    p.eat('}', PN, { path: 'closeToken', balancer: true });
+    p.eat('}', PN, { path: 'closeToken' });
   }
 
-  // @Node
   Property(p) {
-    let ref = null;
-    if (p.match(/[a-zA-Z`\\\u{80}-\u{10ffff}.]|[.#@_]/uy)) {
-      ref = p.eatProduction('ReferenceTag', { path: 'reference' });
+    if (p.match(/[a-zA-Z`\\\u{80}-\u{10ffff}.#@_]/uy)) {
+      p.eatProduction('ReferenceTag', { path: 'referenceTag' });
     }
     p.eatMatchTrivia(_);
-    if (p.match(':')) {
-      p.eatProduction('BindingTag', { path: 'binding' });
-      p.eatMatchTrivia(_);
-    }
-    let refType = ref && get('type', ref);
-    p.eatProduction('PropertyValue', {
+    p.eatProduction('Expression', {
       path: 'value',
-      allowFragment: refType && sourceTextFor(refType) === '_',
     });
   }
 
-  PropertyValue(p, { allowFragment }) {
+  NullNode(p) {
+    p.eatProduction('NullTag', { path: 'sigilTag' });
+  }
+
+  GapNode(p) {
+    p.eatProduction('GapTag', { path: 'sigilTag' });
+  }
+
+  Node(p) {
     if (p.match('null')) {
-      p.eatProduction('NullTag');
-    } else if (p.match(/\[\]|undefined/y)) {
-      p.eatProduction('InitializerTag');
+      p.eatProduction('NullNode');
     } else if (p.match('<//>')) {
-      p.eatProduction('GapTag');
+      p.eatProduction('GapNode');
+    } else if (p.match('</>') || p.match('<!')) {
+      p.fail();
     } else {
-      p.eatProduction('Node', { allowFragment, propertyValue: true });
+      p.eatProduction('TreeNode', { propertyValue: true });
     }
   }
 
-  // @Node
-  NodeFlags(p) {
-    p.eatMatch('*', PN, { path: 'tokenToken' });
-    p.eatMatch('$', PN, { path: 'hasGapToken' });
-    p.eatMatch('_', PN, { path: 'fragmentToken' });
-    p.eatMatch('_', PN, { path: 'multiFragmentToken' });
-  }
+  NodeFlags(p, props) {
+    let token = !!(p.eatMatch('*', PN, { path: 'tokenToken' }) || props.token);
+    let hasGap = !!p.eatMatch('$', PN, { path: 'hasGapToken' });
 
-  // @Node
-  OpenNodeTag(p, { forceFragment = false, allowFragment = true, propertyValue = false } = {}) {
-    if (p.match(/['"]/y)) {
-      p.eatProduction('JSON:String', { path: 'literalValue' });
-      return;
-    }
+    return { attrs: { token, hasGap } };
+  }
 
-    p.eat('<', PN, { path: 'openToken', startSpan: 'Tag', balanced: '>' });
+  OpenNodeTag(p) {
+    p.eat('<', PN, { path: 'openToken' });
 
-    let flags = null;
     if (!p.atExpression) {
-      flags = p.eatProduction('NodeFlags', { path: 'flags' });
+      p.eatProduction('NodeFlags', { path: 'flags' });
     }
 
     let sp = null;
 
-    let fragmentFlag = get('fragmentToken', flags);
-    let multiFragmentFlag = get('multiFragmentFlag', flags);
-    let tokenFlag = get('tokenToken', flags);
-
-    if (propertyValue && fragmentFlag && !multiFragmentFlag) throw new Error();
-
-    if (forceFragment && !fragmentFlag) throw new Error();
-
-    if (!fragmentFlag && !p.match(/./sy)) {
-      throw new Error();
+    let type;
+    if ((type = p.match(/__|_/y))) {
+      p.eat(type, null, { path: 'type' });
     }
 
-    if (fragmentFlag && !allowFragment) {
+    if (!type && !p.match(/./sy)) {
       throw new Error();
     }
 
-    if (!fragmentFlag) {
-      p.eatProduction('Identifier', { path: 'type' });
-
-      sp = p.eatMatchTrivia(_);
+    if (type !== '__' && p.match(/[a-zA-Z`u{80}-\u{10ffff}]/uy)) {
+      p.eatProduction('Identifier', { path: 'name' });
+    }
 
-      let iv;
+    sp = p.eatMatchTrivia(_);
 
+    if (!type) {
       if (sp && (p.match(/['"]/y) || p.atExpression)) {
-        iv = p.eatProduction('JSON:String', { path: 'literalValue' });
+        p.eatProduction('JSON:String', { path: 'literalValue' });
 
         sp = p.eatMatchTrivia(_);
       }
@@ -242,48 +237,92 @@ export const grammar = class CSTMLMiniparserGrammar {
       p.eatMatchTrivia(_);
     }
     let sc = p.eatMatch('/', PN, { path: 'selfClosingToken' });
-    p.eat('>', PN, { path: 'closeToken', endSpan: 'Tag', balancer: true });
+    p.eat('>', PN, { path: 'closeToken' });
 
-    const balanced = !sc && (p.path.depth > 0 || p.span.type !== 'Bare');
+    const selfClosing = !sc && (p.path.depth > 0 || p.span.type !== 'Bare');
 
-    return { attrs: { balanced } };
+    return { attrs: { selfClosing } };
   }
 
-  // @Node
   CloseNodeTag(p) {
-    p.eat('</', PN, { path: 'openToken', startSpan: 'Tag', balanced: '>' });
-    p.eat('>', PN, { path: 'closeToken', endSpan: 'Tag', balancer: true });
+    p.eat('</', PN, { path: 'openToken' });
+    p.eat('>', PN, { path: 'closeToken' });
+  }
+
+  Expression(p) {
+    p.eatProduction('BoundNode');
+
+    p.eatMatchTrivia('_');
+
+    if (p.match('^^^')) {
+      return { shift: 'ShiftExpression' };
+    }
+  }
+
+  BoundNode(p) {
+    while (p.match(':')) {
+      p.eatProduction('BindingTag', { path: 'bindingTags' });
+      p.eatMatchTrivia(_);
+    }
+    p.eatProduction('Node', { path: 'node' });
+  }
+
+  ShiftExpression(p) {
+    p.eatProduction('BoundNode', { path: 'original' });
+    p.eatMatchTrivia(_);
+    p.eatProduction('ShiftTag', { path: 'sigilTag' });
+    p.eatMatchTrivia(_);
+    p.eatProduction('TreeNode', { path: 'value' });
   }
 
-  // @Node
   BindingTag(p) {
-    p.eat(':', PN, { path: 'openToken', startSpan: 'Tag', balanced: ':' });
-    if (!p.match(':')) {
-      p.eatProduction('IdentifierPath');
+    p.eat(':', PN, { path: 'openToken' });
+
+    p.eatMatchTrivia(_);
+    let first = true;
+    while (!p.match(':') && (first || p.match('/'))) {
+      if (!first) {
+        p.eat('/', PN, { path: '#separatorTokens' });
+      }
+      p.eatProduction('BindingSegment', { path: 'segments[]' });
+      p.eatMatchTrivia(_);
+      first = false;
     }
-    p.eat(':', PN, { path: 'closeToken', endSpan: 'Tag', balancer: true });
+    p.eat(':', PN, { path: 'closeToken' });
+  }
+
+  BindingSegment(p) {
+    p.eatMatchTrivia(_);
+    if (p.match('..')) {
+      p.eat('..', PN, { path: 'path' });
+    } else {
+      p.eatProduction('Identifier', { path: 'path' });
+    }
+    p.eatMatchTrivia(_);
   }
 
   IdentifierPath(p) {
-    p.eatProduction('Identifier', { path: 'segments[]' });
-    while (p.match('.')) {
-      p.eat('.', PN, { path: 'separatorTokens[]' });
+    let first = true;
+    while (first || p.match('.')) {
+      if (!first) {
+        p.eat('.', PN, { path: '#separatorTokens' });
+      }
+
       p.eatProduction('Identifier', { path: 'segments[]' });
+      first = false;
     }
   }
 
-  // @Node
   Identifier(p) {
     let res, q;
     q = p.match('`');
-    if (q) p.eat('`', PN, { path: 'openToken', balanced: '`' });
+    if (q) p.eat('`', PN, { path: 'openToken' });
 
-    p.eatProduction('IdentifierContent', { path: 'content', span: 'Identifier' }, { quoted: !!q });
+    p.eatProduction('IdentifierContent', { path: 'content' }, { quoted: !!q });
 
-    if (q) p.eat('`', PN, { path: 'closeToken', balancer: true });
+    if (q) p.eat('`', PN, { path: 'closeToken' });
   }
 
-  // @Node
   IdentifierContent(p, props) {
     let { quoted = false } = props || {};
 
@@ -301,19 +340,37 @@ export const grammar = class CSTMLMiniparserGrammar {
     } while (lit || esc);
   }
 
-  // @Cover
   Tag(p) {
-    if (p.match(/['"]/y)) {
+    p.eatMatchTrivia(_);
+    if (p.match('{')) {
+      p.eatProduction('AttributeDefinition');
+    } else if (p.match('null')) {
+      p.eatProduction('NullTag');
+    } else if (p.match(/[.#@_a-zA-Z\u0060\u{80}-\u{10ffff}]/uy)) {
+      p.eatProduction('ReferenceTag');
+    } else if (p.match(':')) {
+      p.eatProduction('BindingTag');
+    } else if (p.match('<!')) {
+      p.eatProduction('DoctypeTag');
+    } else if (p.match('<//>')) {
+      p.eatProduction('GapTag');
+    } else if (p.match('^^^')) {
+      p.eatProduction('ShiftTag');
+    } else if (p.match('</')) {
+      p.eatProduction('CloseNodeTag');
+    } else if (p.match('<')) {
+      p.eatProduction('OpenNodeTag');
+    } else if (p.match(/['"]/y)) {
       p.eatProduction('LiteralTag');
     } else {
       throw new Error();
     }
+    p.eatMatchTrivia(_);
   }
 
-  // @Node
   ReferenceTag(p) {
     let type;
-    if ((type = p.match(/[.#@_]/y))) {
+    if ((type = p.match(/\.\.|[.#@_]/y))) {
       p.eat(type, PN, { path: 'type' });
     }
 
@@ -322,16 +379,22 @@ export const grammar = class CSTMLMiniparserGrammar {
     }
     p.eatMatchTrivia(_);
 
-    if (p.match(/[+$]/y)) {
-      p.eatProduction('ReferenceFlags', { path: 'flags' });
-      p.eatMatchTrivia(_);
-    }
+    p.eatProduction('ReferenceFlags', { path: 'flags' });
+    p.eatMatchTrivia(_);
     p.eat(':', PN, { path: 'mapToken' });
   }
 
-  // @Node
   ReferenceFlags(p) {
+    p.eatMatch('[]', PN, { path: 'arrayToken' });
     p.eatMatch('+', PN, { path: 'expressionToken' });
-    p.eatMatch('$', PN, { path: 'hasGapToken' });
+    let i = p.eatMatch('*', PN, { path: 'intrinsicToken' });
+    let g = p.eatMatch('$', PN, { path: 'hasGapToken' });
+    if (i && g) p.fail();
+  }
+
+  ShiftTag(p) {
+    p.eat('^^^', PN, { path: 'sigilToken' });
   }
 };
+
+export default { name, canonicalURL, dependencies, covers, grammar };