@bablr/boot 0.2.3 → 0.3.0

package/lib/builders.js

@@ -70,18 +70,10 @@ const buildNodeOpenTag = (flags, type, attributes = {}) => {
   return freeze({ type: 'OpenNodeTag', value: freeze({ flags, type, attributes }) });
 };
 
-const buildFragmentOpenTag = (flags = {}, language) => {
-  return freeze({ type: 'OpenFragmentTag', value: freeze({ flags: freeze(flags), language }) });
-};
-
 const buildNodeCloseTag = (type) => {
   return freeze({ type: 'CloseNodeTag', value: freeze({ type }) });
 };
 
-const buildFragmentCloseTag = () => {
-  return freeze({ type: 'CloseFragmentTag', value: freeze({}) });
-};
-
 const buildLiteral = (value) => {
   return freeze({ type: 'Literal', value });
 };
@@ -374,9 +366,7 @@ const lit = (str) => buildLiteral(stripArray(str));
 
 const gap = buildGap;
 const nodeOpen = buildNodeOpenTag;
-const fragOpen = buildFragmentOpenTag;
 const nodeClose = buildNodeCloseTag;
-const fragClose = buildFragmentCloseTag;
 const node = buildNode;
 const s_node = buildSyntacticNode;
 const e_node = buildEscapeNode;
@@ -398,9 +388,7 @@ module.exports = {
   buildReference,
   buildGap,
   buildNodeOpenTag,
-  buildFragmentOpenTag,
   buildNodeCloseTag,
-  buildFragmentCloseTag,
   buildLiteral,
   buildNode,
   buildSyntacticNode,
@@ -411,9 +399,7 @@ module.exports = {
   lit,
   gap,
   nodeOpen,
-  fragOpen,
   nodeClose,
-  fragClose,
   node,
   s_node,
   e_node,

package/lib/index.js

@@ -66,6 +66,10 @@ const parse = (language, type, sourceText) => {
 const getAgASTValue = (language, miniNode) => {
   if (!miniNode) return miniNode;
 
+  if (isArray(miniNode)) {
+    return miniNode.map((node) => getAgASTValue(node));
+  }
+
   const { language: languageName, type, attributes } = miniNode;
   const flags = { escape: false, trivia: false, token: false, intrinsic: false };
   const properties = {};
@@ -106,7 +110,7 @@ const getAgASTValue = (language, miniNode) => {
         type: 'Embedded',
         value: {
           flags: { escape: false, token: true, trivia: true, intrinsic: false },
-          language: 'https://bablr.org/languages/core/space-tab-newline',
+          language: 'https://bablr.org/languages/core/en/space-tab-newline',
           type: 'Space',
           children: [buildLiteral(child.value)],
           properties: {},
@@ -138,7 +142,7 @@ const getAgASTValue = (language, miniNode) => {
 
 const str = buildTag(cstml, 'String');
 const num = buildTag(cstml, 'Integer');
-const cst = buildTag(cstml, 'Fragment');
+const cst = buildTag(cstml, 'Node');
 const re = buildTag(regex, 'Pattern');
 const i = buildTag(instruction, 'Call');
 

package/lib/languages/cstml.js

@@ -1,4 +1,4 @@
-const objectEntries = require('iter-tools-es/methods/object-entries');
+const objectEntries = require('iter-tools/methods/object-entries');
 
 const { buildCovers } = require('../utils.js');
 const sym = require('../symbols.js');
@@ -11,7 +11,7 @@ const LIT = 'Literal';
 
 const name = 'CSTML';
 
-const canonicalURL = 'https://bablr.org/languages/core/cstml';
+const canonicalURL = 'https://bablr.org/languages/core/en/cstml';
 
 const dependencies = {};
 
@@ -68,10 +68,8 @@ const covers = buildCovers({
     'Gap',
     'Node',
     'IdentifierPath',
-    'OpenFragmentTag',
     'OpenNodeTag',
     'CloseNodeTag',
-    'CloseFragmentTag',
     'Terminal',
     'Number',
     'Digit',
@@ -80,7 +78,7 @@ const covers = buildCovers({
     'UnsignedInteger',
     'Flags',
   ],
-  [sym.fragment]: ['Attributes', 'Fragment'],
+  [sym.fragment]: ['Attributes'],
   Attribute: ['MappingAttribute', 'BooleanAttribute'],
   AttributeValue: ['String', 'Number'],
   TagType: ['Identifier', 'GlobalIdentifier'],
@@ -91,22 +89,10 @@ const covers = buildCovers({
 });
 
 const grammar = class CSTMLMiniparserGrammar {
-  Fragment(p) {
-    p.eatMatchTrivia(_);
-    p.eatProduction('OpenFragmentTag', { path: 'open' });
-    p.eatMatchTrivia(_);
-    while (p.match(/<[^/]/y) || p.atExpression) {
-      p.eatProduction('Node', { path: 'root' });
-      p.eatMatchTrivia(_);
-    }
-    p.eatProduction('CloseFragmentTag', { path: 'close' });
-    p.eatMatchTrivia(_);
-  }
-
   // @Node
   Document(p) {
     p.eatProduction('DoctypeTag', { path: 'doctype' });
-    p.eatProduction('Fragment', { path: 'tree' });
+    p.eatProduction('Node', { path: 'tree' });
   }
 
   // @Node
@@ -118,7 +104,7 @@ const grammar = class CSTMLMiniparserGrammar {
 
     let sp = p.eatMatchTrivia(_);
 
-    if ((sp && p.match(/\w+/y)) || p.atExpression) {
+    if ((sp && p.match(/[a-zA-Z]+/y)) || p.atExpression) {
       p.eatProduction('Attributes');
       sp = p.eatMatchTrivia(_);
     }
@@ -138,8 +124,6 @@ const grammar = class CSTMLMiniparserGrammar {
 
   // @Node
   Node(p) {
-    if (p.match('<>')) throw new Error('Fragment is not a node');
-
     let open = p.eatProduction('OpenNodeTag', { path: 'open' });
 
     p.eatMatchTrivia(_);
@@ -169,7 +153,7 @@ const grammar = class CSTMLMiniparserGrammar {
     } else {
       if (p.match(/<\*?#/y)) {
         p.eatProduction('Node');
-      } else if (p.match(/\w/y)) {
+      } else if (p.match(/[a-zA-Z]/y)) {
         p.eatProduction('Property');
       } else if (p.match(/['"]/y)) {
         p.eatProduction('Literal');
@@ -181,8 +165,6 @@ const grammar = class CSTMLMiniparserGrammar {
   Property(p) {
     p.eatProduction('Reference', { path: 'reference' });
     p.eatMatchTrivia(_);
-    p.eat(':', PN, { path: 'mapToken' });
-    p.eatMatchTrivia(_);
     p.eatProduction('PropertyValue', { path: 'value' });
   }
 
@@ -196,12 +178,6 @@ const grammar = class CSTMLMiniparserGrammar {
     }
   }
 
-  // @Node
-  OpenFragmentTag(p) {
-    p.eat('<', PN, { path: 'openToken', startSpan: 'Tag', balanced: '>' });
-    p.eat('>', PN, { path: 'closeToken', endSpan: 'Tag', balancer: true });
-  }
-
   // @Node
   Flags(p) {
     let tr = p.eatMatch('#', PN, { path: 'triviaToken' });
@@ -233,7 +209,7 @@ const grammar = class CSTMLMiniparserGrammar {
       sp = p.eatMatchTrivia(_);
     }
 
-    if ((sp && p.match(/\w+/y)) || p.atExpression) {
+    if ((sp && p.match(/[a-zA-Z]+/y)) || p.atExpression) {
       p.eatProduction('Attributes');
       sp = p.eatMatchTrivia(_);
     }
@@ -251,22 +227,16 @@ const grammar = class CSTMLMiniparserGrammar {
     p.eat('>', PN, { path: 'closeToken', endSpan: 'Tag', balancer: true });
   }
 
-  // @Node
-  CloseFragmentTag(p) {
-    p.eat('</', PN, { path: 'openToken', startSpan: 'Tag', balanced: '>' });
-    p.eat('>', PN, { path: 'closeToken', endSpan: 'Tag', balancer: true });
-  }
-
   // @Fragment
   Attributes(p) {
     let sp = true;
-    while (sp && (p.match(/\w+/y) || p.atExpression)) {
+    while (sp && (p.match(/[a-zA-Z]+/y) || p.atExpression)) {
       if (p.atExpression) {
         p.eatProduction('Attributes'); // ??
       } else {
         p.eatProduction('Attribute', { path: 'attributes[]' });
       }
-      if (p.match(/\s+\w/y) || (p.match(/\s+$/y) && !p.quasisDone)) {
+      if (p.match(/\s+[a-zA-Z]/y) || (p.match(/\s+$/y) && !p.quasisDone)) {
         sp = p.eatMatchTrivia(_);
       } else {
         sp = false;
@@ -276,7 +246,7 @@ const grammar = class CSTMLMiniparserGrammar {
 
   // @Cover
   Attribute(p) {
-    if (p.match(/\w[\w-_]*\s*=/y)) {
+    if (p.match(/[a-zA-Z][[a-zA-Z]-_]*\s*=/y)) {
       p.eatProduction('MappingAttribute');
     } else {
       p.eatProduction('BooleanAttribute');
@@ -286,12 +256,12 @@ const grammar = class CSTMLMiniparserGrammar {
   // @Node
   BooleanAttribute(p) {
     p.eat('!', KW, { path: 'negateToken' });
-    p.eat(/\w+/y, ID, { path: 'key' });
+    p.eat(/[a-zA-Z]+/y, ID, { path: 'key' });
   }
 
   // @Node
   MappingAttribute(p) {
-    p.eat(/\w+/y, LIT, { path: 'key' });
+    p.eat(/[a-zA-Z]+/y, LIT, { path: 'key' });
     p.eatMatchTrivia(_);
     p.eat('=', PN, { path: 'mapToken' });
     p.eatMatchTrivia(_);
@@ -308,7 +278,7 @@ const grammar = class CSTMLMiniparserGrammar {
   }
 
   TagType(p) {
-    if (p.match(/[\w.]+:/y)) {
+    if (p.match(/[[a-zA-Z].]+:/y)) {
       p.eatProduction('LanguageReference', { path: 'language' });
       p.eat(':', PN, { path: 'namespaceSeparatorToken' });
       p.eatProduction('Identifier', { path: 'type' });
@@ -335,7 +305,7 @@ const grammar = class CSTMLMiniparserGrammar {
 
   // @Node
   Identifier(p) {
-    p.eatLiteral(/\w[\w-_]*/y);
+    p.eatLiteral(/[a-zA-Z][[a-zA-Z]-_]*/y);
   }
 
   // @Cover
@@ -352,6 +322,8 @@ const grammar = class CSTMLMiniparserGrammar {
     p.eatProduction('Identifier', { path: 'name' });
     p.eatMatchTrivia(_);
     p.eatMatch('[]', PN, { path: 'arrayToken' });
+    p.eatMatchTrivia(_);
+    p.eat(':', PN, { path: 'mapToken' });
   }
 
   // @Cover

package/lib/languages/instruction.js

@@ -12,7 +12,7 @@ const LIT = 'Literal';
 
 const name = 'Instruction';
 
-const canonicalURL = 'https://bablr.org/languages/core/bablr-vm-instruction';
+const canonicalURL = 'https://bablr.org/languages/core/en/bablr-vm-instruction';
 
 const dependencies = { Spamex, CSTML, Regex };
 
@@ -35,7 +35,7 @@ const covers = buildCovers({
 const grammar = class InstructionMiniparserGrammar {
   // @Node
   Call(p) {
-    p.eat(/\w+/y, ID, { path: 'verb' });
+    p.eat(/[a-zA-Z]+/y, ID, { path: 'verb' });
     p.eatMatchTrivia(_);
     p.eatProduction('Tuple', { path: 'arguments' });
   }
@@ -58,8 +58,8 @@ const grammar = class InstructionMiniparserGrammar {
       p.eatProduction('Boolean');
     } else if (p.match('null')) {
       p.eatProduction('Null');
-    } else if (p.match(/\w/y)) {
-      p.eat(/\w+/y, ID, p.m.attributes);
+    } else if (p.match(/[a-zA-Z]/y)) {
+      p.eat(/[a-zA-Z]+/y, ID, p.m.attributes);
     } else if (p.match('<')) {
       p.eatProduction('Spamex:Matcher');
     }
@@ -86,7 +86,7 @@ const grammar = class InstructionMiniparserGrammar {
 
   // @Node
   Property(p) {
-    p.eat(/\w+/y, LIT, { path: 'key' });
+    p.eat(/[a-zA-Z]+/y, LIT, { path: 'key' });
     p.eatMatchTrivia(_);
     p.eat(':', PN, { path: 'mapToken' });
     p.eatMatchTrivia(_);

package/lib/languages/regex.js

@@ -1,11 +1,11 @@
-const when = require('iter-tools-es/methods/when');
+const when = require('iter-tools/methods/when');
 const { escapables } = require('./cstml.js');
 const { buildCovers } = require('../utils.js');
 const { node } = require('../symbols.js');
 
 const name = 'Regex';
 
-const canonicalURL = 'https://bablr.org/languages/core/bablr-regex-pattern';
+const canonicalURL = 'https://bablr.org/languages/core/en/bablr-regex-pattern';
 
 const dependencies = {};
 
@@ -96,10 +96,10 @@ const cookEscape = (escape, span) => {
     return String.fromCodePoint(parseInt(hexMatch[1], 16));
   }
 
-  let litMatch = /\\([nrt0])/y.exec(escape);
+  let litMatch = /\\([\\nrt0])/y.exec(escape);
 
   if (litMatch) {
-    return escapables.get(litMatch[1]);
+    return escapables.get(litMatch[1]) || litMatch[1];
   }
 
   let specialMatch = getSpecialPattern(span).exec(escape.slice(1));
@@ -154,7 +154,7 @@ const grammar = class RegexMiniparserGrammar {
   }
 
   Elements(p) {
-    while (p.match(/[^|]/y)) {
+    while (p.match(/[^|]/y || p.atExpression)) {
       p.eatProduction('Element');
     }
   }
@@ -247,6 +247,8 @@ const grammar = class RegexMiniparserGrammar {
         )
       ) {
         // done
+      } else if (p.eatMatchEscape(new RegExp(String.raw`\\${specialPattern.source}`, 'y'))) {
+        // done
       } else {
         throw new Error('escape required');
       }

package/lib/languages/spamex.js

@@ -10,7 +10,7 @@ const LIT = 'Literal';
 
 const name = 'Spamex';
 
-const canonicalURL = 'https://bablr.org/languages/core/spamex';
+const canonicalURL = 'https://bablr.org/languages/core/en/spamex';
 
 const dependencies = { CSTML, Regex };
 
@@ -25,7 +25,7 @@ const covers = buildCovers({
 const grammar = class SpamexMiniparserGrammar {
   // @Cover
   Matcher(p) {
-    if (p.match(/<(?:[*#@+~]*)?(?:\w|$)/y)) {
+    if (p.match(/<[^!/]/y)) {
       p.eatProduction('NodeMatcher');
     } else if (p.match(/['"]/y)) {
       p.eatProduction('CSTML:String');
@@ -40,14 +40,20 @@ const grammar = class SpamexMiniparserGrammar {
   NodeMatcher(p) {
     p.eat('<', PN, { path: 'openToken', startSpan: 'Tag', balanced: '>' });
 
-    p.eatProduction('CSTML:Flags', { path: 'flags' });
+    if (!p.atExpression) {
+      p.eatProduction('CSTML:Flags', { path: 'flags' });
+    }
 
-    if (p.match(/\w+:/y)) {
-      p.eat(/\w+/y, ID, { path: 'language' });
+    if (p.match(/[a-zA-Z]+:/y)) {
+      p.eat(/[a-zA-Z]+/y, ID, { path: 'language' });
       p.eat(':', PN, { path: 'namespaceSeparatorToken' });
-      p.eat(/\w+/y, ID, { path: 'type' });
+      p.eat(/[a-zA-Z]+/y, ID, { path: 'type' });
     } else {
-      p.eat(/\w+/y, ID, { path: 'type' });
+      if (p.atExpression) {
+        p.eatProduction('Identifier', { path: 'type' });
+      } else {
+        p.eatMatch(/[a-zA-Z]+/y, ID, { path: 'type' });
+      }
     }
 
     let sp = p.eatMatchTrivia(_);
@@ -58,7 +64,7 @@ const grammar = class SpamexMiniparserGrammar {
       sp = p.eatMatchTrivia(_);
     }
 
-    if ((sp && p.match(/\w+/y)) || p.atExpression) {
+    if ((sp && p.match(/[a-zA-Z]+/y)) || p.atExpression) {
       p.eatProduction('Attributes', { path: 'attributes[]' });
       sp = p.eatMatchTrivia(_);
     }
@@ -69,9 +75,9 @@ const grammar = class SpamexMiniparserGrammar {
 
   Attributes(p) {
     let sp = true;
-    while (sp && (p.match(/\w+/y) || p.atExpression)) {
+    while (sp && (p.match(/[a-zA-Z]+/y) || p.atExpression)) {
       p.eatProduction('Attribute');
-      if (p.match(/\s+\w/y)) {
+      if (p.match(/\s+[a-zA-Z]/y)) {
         sp = p.eatMatchTrivia(_);
       }
     }
@@ -79,7 +85,7 @@ const grammar = class SpamexMiniparserGrammar {
 
   // @Cover
   Attribute(p) {
-    if (p.match(/\w+\s*=/y)) {
+    if (p.match(/[a-zA-Z]+\s*=/y)) {
       p.eatProduction('MappingAttribute');
     } else {
       p.eatProduction('BooleanAttribute');
@@ -88,12 +94,12 @@ const grammar = class SpamexMiniparserGrammar {
 
   // @Node
   BooleanAttribute(p) {
-    p.eat(/\w+/y, LIT, { path: 'key' });
+    p.eat(/[a-zA-Z]+/y, LIT, { path: 'key' });
   }
 
   // @Node
   MappingAttribute(p) {
-    p.eat(/\w+/y, LIT, { path: 'key' });
+    p.eat(/[a-zA-Z]+/y, LIT, { path: 'key' });
     p.eatMatchTrivia(_);
     p.eat('=', PN, { path: 'mapToken' });
     p.eatMatchTrivia(_);
@@ -120,7 +126,7 @@ const grammar = class SpamexMiniparserGrammar {
 
   // @Node
   Identifier(p) {
-    p.eatLiteral(/\w+/y);
+    p.eatLiteral(/[a-zA-Z]+/y);
   }
 };
 

package/lib/miniparser.js

@@ -1,8 +1,8 @@
 const { ref, lit, trivia, esc } = require('@bablr/boot-helpers/types');
 const escapeRegex = require('escape-string-regexp');
-const arrayLast = require('iter-tools-es/methods/array-last');
-const isString = require('iter-tools-es/methods/is-string');
-const isObject = require('iter-tools-es/methods/is-object');
+const arrayLast = require('iter-tools/methods/array-last');
+const isString = require('iter-tools/methods/is-string');
+const isObject = require('iter-tools/methods/is-object');
 const sym = require('./symbols.js');
 const { Match } = require('./match.js');
 const { parsePath } = require('./path.js');
@@ -10,6 +10,8 @@ const { set, isRegex, isArray, getPrototypeOf, buildNode } = require('./utils.js
 
 class TemplateParser {
   constructor(rootLanguage, quasis, expressions) {
+    if (!quasis) throw new Error();
+
     this.rootLanguage = rootLanguage;
     this.spans = [];
     this.quasis = quasis;

package/lib/path.js

@@ -15,7 +15,7 @@ const stripPathBraces = (str) => (str.endsWith('[]') ? str.slice(0, -2) : str);
 const parsePath = (str) => {
   const name = stripPathBraces(str);
 
-  if (!/^\w+$/.test(name)) throw new Error();
+  if (!/[a-zA-Z]+$/.test(name)) throw new Error();
 
   return { isArray: name !== str, name };
 };

package/lib/print.js

@@ -84,7 +84,7 @@ const buildDoctypeTag = () => {
   return freeze({ type: 'DoctypeTag', value: { doctype: 'cstml', version: 0 } });
 };
 
-const buildNodeOpenTag = (flags, language, type, attributes = {}) => {
+const buildNodeOpenTag = (flags = {}, language = null, type = null, attributes = {}) => {
   let { token, trivia, escape } = flags;
 
   token = !!token;
@@ -97,27 +97,17 @@ const buildNodeOpenTag = (flags, language, type, attributes = {}) => {
   });
 };
 
-const nodeFlags = freeze({ escape: false, trivia: false, token: false });
-
-const buildFragmentOpenTag = (flags = nodeFlags) => {
-  return freeze({ type: 'OpenFragmentTag', value: freeze({ flags: freeze(flags) }) });
-};
-
 const buildNodeCloseTag = (type = null, language = null) => {
   return freeze({ type: 'CloseNodeTag', value: freeze({ language, type }) });
 };
 
-const buildFragmentCloseTag = () => {
-  return freeze({ type: 'CloseFragmentTag', value: freeze({}) });
-};
-
 function* streamFromTree(rootNode) {
   if (!rootNode || rootNode.type === 'Gap') {
     return rootNode;
   }
 
   yield buildDoctypeTag();
-  yield buildFragmentOpenTag(undefined, rootNode.language[0]);
+  yield buildNodeOpenTag(undefined, rootNode.language[0]);
 
   let stack = emptyStack.push(buildFrame(rootNode));
 
@@ -173,7 +163,7 @@ function* streamFromTree(rootNode) {
 
     stack = stack.pop();
   }
-  yield buildFragmentCloseTag();
+  yield buildNodeCloseTag();
 }
 
 const printExpression = (expr) => {
@@ -262,19 +252,10 @@ const printTerminal = (terminal) => {
       return `<${printFlags(flags)}${printTagPath(tagLanguage, type)}${attributesFrag}>`;
     }
 
-    case 'OpenFragmentTag': {
-      const { flags } = terminal.value;
-      return `<${printFlags(flags)}>`;
-    }
-
     case 'CloseNodeTag': {
       return `</>`;
     }
 
-    case 'CloseFragmentTag': {
-      return `</>`;
-    }
-
     default:
       throw new Error();
   }
@@ -296,7 +277,7 @@ const printPrettyCSTML = (tree, indent = '  ') => {
       printed += '\n';
     }
 
-    if (['CloseNodeTag', 'CloseFragmentTag'].includes(terminal.type)) {
+    if (terminal.type === 'CloseNodeTag') {
       indentLevel--;
     }
 
@@ -307,7 +288,7 @@ const printPrettyCSTML = (tree, indent = '  ') => {
     }
     printed += printTerminal(terminal);
 
-    if (['OpenFragmentTag', 'OpenNodeTag'].includes(terminal.type)) {
+    if (terminal.type === 'OpenNodeTag') {
       indentLevel++;
     }
 

package/lib/utils.js

@@ -1,6 +1,6 @@
-const every = require('iter-tools-es/methods/every');
-const isArray = require('iter-tools-es/methods/is-array');
-const isString = require('iter-tools-es/methods/is-string');
+const every = require('iter-tools/methods/every');
+const isArray = require('iter-tools/methods/is-array');
+const isString = require('iter-tools/methods/is-string');
 
 const { hasOwn, getPrototypeOf, getOwnPropertySymbols } = Object;
 const isSymbol = (value) => typeof value === 'symbol';
@@ -71,7 +71,7 @@ const set = (obj, path, value) => {
     if (hasOwn(obj, name)) {
       throw new Error('duplicate child name');
     }
-    
+
     obj[name] = value;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/boot",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"
@@ -24,7 +24,7 @@
     "@babel/types": "7.23.0",
     "@bablr/boot-helpers": "0.2.0",
     "escape-string-regexp": "4.0.0",
-    "iter-tools-es": "^7.5.3",
+    "iter-tools": "^7.5.3",
     "jest-diff": "29.7.0"
   },
   "devDependencies": {

package/shorthand.macro.js

@@ -2,11 +2,11 @@ const { spawnSync } = require('node:child_process');
 const t = require('@babel/types');
 const { expression } = require('@babel/template');
 const { diff } = require('jest-diff');
-const isObject = require('iter-tools-es/methods/is-object');
-const isUndefined = require('iter-tools-es/methods/is-undefined');
-const isNull = require('iter-tools-es/methods/is-null');
-const isString = require('iter-tools-es/methods/is-string');
-const concat = require('iter-tools-es/methods/concat');
+const isObject = require('iter-tools/methods/is-object');
+const isUndefined = require('iter-tools/methods/is-undefined');
+const isNull = require('iter-tools/methods/is-null');
+const isString = require('iter-tools/methods/is-string');
+const concat = require('iter-tools/methods/concat');
 const { createMacro } = require('babel-plugin-macros');
 const { TemplateParser, set, getAgASTValue } = require('./lib/index.js');
 const i = require('./lib/languages/instruction.js');
@@ -195,16 +195,16 @@ const getTopScope = (scope) => {
 
 const namesFor = Object.fromEntries([
   ...[i, re, spam, cstml].map((l) => [l.canonicalURL, l.name]),
-  ['https://bablr.org/languages/core/space-tab-newline', 'Space'],
+  ['https://bablr.org/languages/core/en/space-tab-newline', 'Space'],
 ]);
 
 const languages = {
-  i: '@bablr/language-bablr-vm-instruction',
-  re: '@bablr/language-regex-vm-pattern',
-  spam: '@bablr/language-spamex',
-  str: '@bablr/language-cstml',
-  num: '@bablr/language-cstml',
-  cst: '@bablr/language-cstml',
+  i: '@bablr/language-en-bablr-vm-instruction',
+  re: '@bablr/language-en-regex-vm-pattern',
+  spam: '@bablr/language-en-spamex',
+  str: '@bablr/language-en-cstml',
+  num: '@bablr/language-en-cstml',
+  cst: '@bablr/language-en-cstml',
 };
 
 const topTypes = {
@@ -213,7 +213,7 @@ const topTypes = {
   spam: 'Matcher',
   str: 'String',
   num: 'Integer',
-  cst: 'Fragment',
+  cst: 'Node',
 };
 
 const miniLanguages = {