@bablr/boot 0.6.0 → 0.6.2

package/lib/index.js

@@ -220,7 +220,7 @@ const getAgASTValue = (language, miniNode) => {
 const str = buildTag(cstml, 'String');
 const num = buildTag(cstml, 'Integer');
 const cst = buildTag(cstml, 'Node');
-const spam = buildTag(spamex, 'Pattern');
+const spam = buildTag(spamex, 'Matcher');
 const re = buildTag(regex, 'Pattern');
 const i = buildTag(instruction, 'Call');
 

package/lib/languages/cstml.js

@@ -7,6 +7,7 @@ const _ = /\s+/y;
 const PN = 'Punctuator';
 const ID = 'Identifier';
 const KW = 'Keyword';
+const LIT = 'Literal';
 
 const name = 'CSTML';
 
@@ -66,9 +67,12 @@ const covers = buildCovers({
     'NullTag',
     'GapTag',
     'Node',
+    'Fragment',
     'IdentifierPath',
     'OpenNodeTag',
     'CloseNodeTag',
+    'OpenFragmentTag',
+    'CloseFragmentTag',
     'Tag',
     'Number',
     'Digit',
@@ -76,10 +80,26 @@ const covers = buildCovers({
     'Content',
     'UnsignedInteger',
     'Flags',
+    'Array',
+    'Object',
+    'Boolean',
+    'Null',
+    'Identifier',
+    'JSONProperty',
+    'JSONExpression',
   ],
   [sym.fragment]: ['Attributes'],
   Attribute: ['MappingAttribute', 'BooleanAttribute'],
-  AttributeValue: ['String', 'Number'],
+  JSONExpression: [
+    'Boolean',
+    'Null',
+    'Number',
+    'String',
+    'Array',
+    'Object',
+    'Identifier',
+    'Separator',
+  ],
   TagType: ['Identifier', 'GlobalIdentifier'],
   Tag: ['LiteralTag', 'Trivia'],
   PropertyValue: ['GapTag', 'Node', 'NullTag'],
@@ -92,7 +112,7 @@ const grammar = class CSTMLMiniparserGrammar {
   Document(p) {
     p.eatProduction('DoctypeTag', { path: 'doctype' });
     p.eatMatchTrivia(_);
-    p.eatProduction('Node', { path: 'tree' });
+    p.eatProduction('Fragment', { path: 'tree' });
   }
 
   // @Node
@@ -163,6 +183,25 @@ const grammar = class CSTMLMiniparserGrammar {
     }
   }
 
+  // @Node
+  Fragment(p) {
+    let open = p.eatProduction('OpenFragmentTag', { path: 'open' });
+
+    p.eatMatchTrivia(_);
+
+    if (open.properties.flags?.token) {
+      p.eatProduction('NodeChild', { path: 'children[]' }, { token: true });
+      p.eatMatchTrivia(_);
+    }
+
+    while (!(p.match('</') || p.done)) {
+      p.eatProduction('NodeChild', { path: 'children[]' });
+      p.eatMatchTrivia(_);
+    }
+
+    p.eatProduction('CloseFragmentTag', { path: 'close' });
+  }
+
   // @Node
   Property(p) {
     p.eatProduction('ReferenceTag', { path: 'reference' });
@@ -237,6 +276,27 @@ const grammar = class CSTMLMiniparserGrammar {
     p.eat('>', PN, { path: 'closeToken', endSpan: 'Tag', balancer: true });
   }
 
+  // @Node
+  OpenFragmentTag(p) {
+    p.eat('<', PN, { path: 'openToken', startSpan: 'Tag', balanced: '>' });
+
+    let flags = null;
+    if (!p.atExpression) {
+      flags = p.eatProduction('Flags', { path: 'flags' });
+    }
+
+    if (p.done) {
+      p.eat('>', PN, { path: 'closeToken', endSpan: 'Tag', balancer: true });
+      return;
+    }
+  }
+
+  // @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;
@@ -275,20 +335,28 @@ const grammar = class CSTMLMiniparserGrammar {
     p.eatMatchTrivia(_);
     p.eat('=', PN, { path: 'mapToken' });
     p.eatMatchTrivia(_);
-    p.eatProduction('AttributeValue', { path: 'value' });
+    p.eatProduction('JSONExpression', { path: 'value' });
   }
 
   // @Cover
-  AttributeValue(p) {
+  JSONExpression(p) {
     if (p.match(/['"]/y)) {
       p.eatProduction('String');
     } else if (p.match(/[\d+-]/y)) {
       p.eatProduction('Number');
+    } else if (p.match('[')) {
+      p.eatProduction('Array');
+    } else if (p.match('{')) {
+      p.eatProduction('Object');
+    } else if (p.match(/true|false/y)) {
+      p.eatProduction('Boolean');
+    } else if (p.match('null')) {
+      p.eatProduction('Null');
     }
   }
 
   TagType(p) {
-    if (p.match(/[a-zA-Z\.]+:/y)) {
+    if (p.match(/['"]|[a-zA-Z\.]+:/y)) {
       p.eatProduction('LanguageReference', { path: 'language' });
       p.eat(':', PN, { path: 'namespaceSeparatorToken' });
       p.eatProduction('Identifier', { path: 'type' });
@@ -352,10 +420,73 @@ const grammar = class CSTMLMiniparserGrammar {
   }
 
   // @Node
-  Literal(p) {
-    p.eatProduction('String', { path: 'value' });
+  Array(p) {
+    p.eat('[', PN, { path: 'openToken', balanced: ']' });
+
+    p.eatMatchTrivia(_);
+
+    let first = true;
+    let sep;
+    while (first || (sep && (p.match(/./y) || p.atExpression))) {
+      p.eatProduction('JSONExpression', { path: 'elements[]' });
+      if (p.match(/\s*,?/y)) {
+        sep = p.eatProduction('Separator', { path: 'separators[]' });
+      }
+
+      first = false;
+    }
+
+    p.eat(']', PN, { path: 'closeToken', balancer: true });
+  }
+
+  // @Node
+  Object(p) {
+    p.eat('{', PN, { path: 'openToken', balanced: '}' });
+
+    p.eatMatchTrivia(_);
+
+    let first = true;
+    let sep;
+    while (first || (sep && (p.match(/./y) || p.atExpression))) {
+      p.eatProduction('JSONProperty', { path: 'properties[]' });
+      if (p.match(/\s*,?/y)) {
+        sep = p.eatProduction('Separator', { path: 'separators[]' });
+      }
+      first = false;
+    }
+
+    p.eatMatchTrivia(_);
+
+    p.eat('}', PN, { path: 'closeToken', balancer: true });
+  }
+
+  // @Node
+  JSONProperty(p) {
+    p.eat(/[a-zA-Z]+/y, LIT, { path: 'key' });
+    p.eatMatchTrivia(_);
+    p.eat(':', PN, { path: 'mapToken' });
+    p.eatMatchTrivia(_);
+    p.eatProduction('JSONExpression', { path: 'value' });
+  }
+
+  // @Node
+  Boolean(p) {
+    p.eat(/true|false/y, KW, { path: 'sigilToken' });
+  }
+
+  // @Node
+  Null(p) {
+    p.eat('null', KW, { path: 'sigilToken' });
+  }
+
+  //@Node
+  Separator(p) {
+    p.eatMatchTrivia(_);
+    p.eatMatch(/,/y, PN, { path: 'separators[]' });
+    p.eatMatchTrivia(_);
   }
 
+  //@Node
   Number(p) {
     if (p.match(/-?\d/y)) {
       p.eatProduction('Integer');

package/lib/languages/instruction.js

@@ -29,6 +29,7 @@ const covers = buildCovers({
     'Boolean',
     'Null',
     'Spamex:Matcher',
+    'Separator',
   ],
 });
 
@@ -75,7 +76,9 @@ const grammar = class InstructionMiniparserGrammar {
     let sep;
     while (first || (sep && (p.match(/./y) || p.atExpression))) {
       p.eatProduction('Property', { path: 'properties[]' });
-      sep = p.eatMatchTrivia(_);
+      if (p.match(/\s*,?/y)) {
+        sep = p.eatProduction('Separator', { path: 'separators[]' });
+      }
       first = false;
     }
 
@@ -103,7 +106,10 @@ const grammar = class InstructionMiniparserGrammar {
     let sep;
     while (first || (sep && (p.match(/./y) || p.atExpression))) {
       p.eatProduction('Expression', { path: 'elements[]' });
-      sep = p.eatMatchTrivia(_);
+      if (p.match(/\s*,?/y)) {
+        sep = p.eatProduction('Separator', { path: 'separators[]' });
+      }
+
       first = false;
     }
 
@@ -114,12 +120,14 @@ const grammar = class InstructionMiniparserGrammar {
   Tuple(p) {
     p.eat('(', PN, { path: 'openToken', balanced: ')' });
 
-    let sep = p.eatMatchTrivia(_);
+    let sep;
 
     let i = 0;
     while (i === 0 || (sep && (p.match(/./y) || p.atExpression))) {
       p.eatProduction('Expression', { path: 'values[]' });
-      sep = p.eatMatchTrivia(_);
+      if (p.match(/\s*,?/y)) {
+        sep = p.eatProduction('Separator', { path: 'separators[]' });
+      }
       i++;
     }
 
@@ -131,6 +139,13 @@ const grammar = class InstructionMiniparserGrammar {
     p.eat(/true|false/y, KW, { path: 'sigilToken' });
   }
 
+  //@Node
+  Separator(p) {
+    p.eatMatchTrivia(_);
+    p.eatMatch(/,/y, PN, { path: 'separators[]' });
+    p.eatMatchTrivia(_);
+  }
+
   // @Node
   Null(p) {
     p.eat('null', KW, { path: 'sigilToken' });

package/lib/languages/spamex.js

@@ -14,18 +14,22 @@ const canonicalURL = 'https://bablr.org/languages/core/en/spamex';
 const dependencies = { CSTML, Regex };
 
 const covers = buildCovers({
-  [sym.node]: ['Attribute', 'Identifier', 'Pattern', 'Matcher', 'Literal', 'CSTML:Flags'],
+  [sym.node]: [
+    'Attribute',
+    'Identifier',
+    'Matcher',
+    'OpenNodeMatcher',
+    'CloseNodeMatcher',
+    'Literal',
+    'CSTML:Flags',
+  ],
   Attribute: ['MappingAttribute', 'BooleanAttribute'],
   AttributeValue: ['CSTML:String', 'CSTML:Number'],
-  Matcher: ['NodeMatcher', 'OpenNodeMatcher', 'CloseNodeMatcher', 'StringMatcher'],
+  Matcher: ['NodeMatcher', 'StringMatcher'],
   StringMatcher: ['CSTML:String', 'Regex:Pattern'],
 });
 
 const grammar = class SpamexMiniparserGrammar {
-  Pattern(p) {
-    p.eatProduction('Matcher', { path: 'matcher' });
-  }
-
   // @Cover
   Matcher(p) {
     if (p.match(/<[^!/]/y)) {
@@ -67,10 +71,8 @@ const grammar = class SpamexMiniparserGrammar {
       p.eatProduction('CSTML:Flags', { path: 'flags' });
     }
 
-    if (p.match(/[a-zA-Z]+:/y)) {
-      p.eat(/[a-zA-Z]+/y, ID, { path: 'language' });
-      p.eat(':', PN, { path: 'namespaceSeparatorToken' });
-      p.eat(/[a-zA-Z]+/y, ID, { path: 'type' });
+    if (p.match(/['"]|[a-zA-Z]+:/y)) {
+      p.eatProduction('CSTML:TagType', { path: 'type' });
     } else if (p.match('?')) {
       p.eat('?', PN, { path: 'type' });
     } else if (p.match(' ')) {

package/lib/miniparser.js

@@ -9,6 +9,8 @@ const { parsePath } = require('./path.js');
 const { set, isRegex, isArray, getPrototypeOf, buildNode } = require('./utils.js');
 const { ReferenceTag, LiteralTag, Escape } = require('@bablr/boot-helpers/symbols');
 
+const { hasOwn } = Object;
+
 class TemplateParser {
   constructor(rootLanguage, quasis, expressions) {
     if (!quasis) throw new Error();
@@ -197,6 +199,10 @@ class TemplateParser {
         this.spans.push({ type: 'Bare', guard: null });
       }
 
+      if (!hasOwn(getPrototypeOf(grammar), type)) {
+        throw new Error(`Unknown production {type: ${type}}`);
+      }
+
       const result = getPrototypeOf(grammar)[type].call(grammar, this, props);
 
       if (isEmbedded) {
@@ -319,7 +325,7 @@ class TemplateParser {
 
     const result = this.matchSticky(pattern, attrs, this);
 
-    if (!result) throw new Error('miniparser: parsing failed');
+    if (!result) this.fail();
 
     this.idx += result.length;
 
@@ -367,7 +373,7 @@ class TemplateParser {
   eatTrivia(pattern) {
     const result = this.matchSticky(pattern, {}, this);
 
-    if (!result) throw new Error('miniparser: parsing failed');
+    if (!result) this.fail();
 
     this.idx += result.length;
 
@@ -391,7 +397,7 @@ class TemplateParser {
   eatEscape(pattern) {
     const result = this.matchSticky(pattern, {}, this);
 
-    if (!result) throw new Error('miniparser: parsing failed');
+    if (!result) this.fail();
 
     this.idx += result.length;
 
@@ -415,7 +421,7 @@ class TemplateParser {
   eatLiteral(pattern) {
     const result = this.matchSticky(pattern, {}, this);
 
-    if (!result) throw new Error('miniparser: parsing failed');
+    if (!result) this.fail();
 
     this.idx += result.length;
 
@@ -451,6 +457,10 @@ class TemplateParser {
     this.spans.pop();
     this.spans.push(span);
   }
+
+  fail() {
+    throw new Error(`miniparser: parsing \`${this.quasis}\` failed`);
+  }
 }
 
 module.exports = { TemplateParser };

package/lib/utils.js

@@ -69,7 +69,7 @@ const set = (obj, path, value) => {
     obj[name].push(value);
   } else {
     if (hasOwn(obj, name)) {
-      throw new Error('duplicate child name');
+      throw new Error(`duplicate child name \`${name}\``);
     }
 
     obj[name] = value;

package/package.json

@@ -1,23 +1,22 @@
 {
   "name": "@bablr/boot",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"
   },
   "exports": {
     ".": {
-      "require": "./lib/index.js",
-      "import": "./lib/index.mjs"
+      "require": "./dist/cjs.bundle.js",
+      "import": "./dist/esm.bundle.js"
     },
     "./shorthand.macro": "./shorthand.macro.js"
   },
-  "files": [
-    "lib/**/*.js",
-    "lib/**/*.mjs",
-    "shorthand.macro.js"
-  ],
+  "files": ["lib/**/*.js", "lib/**/*.mjs", "shorthand.macro.js"],
   "sideEffects": false,
+  "scripts": {
+    "build": "rollup -c"
+  },
   "dependencies": {
     "@babel/helper-module-imports": "^7.22.15",
     "@babel/template": "^7.22.15",
@@ -26,7 +25,8 @@
     "@iter-tools/imm-stack": "1.1.0",
     "escape-string-regexp": "4.0.0",
     "iter-tools": "^7.5.3",
-    "jest-diff": "29.7.0"
+    "jest-diff": "29.7.0",
+    "rollup": "^4.27.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.0",
@@ -34,12 +34,16 @@
     "@babel/plugin-proposal-decorators": "^7.23.2",
     "@babel/plugin-transform-runtime": "^7.23.2",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#a49dbe6861a82d96864ee89fbf0ec1844a8a5e8e",
+    "@rollup/plugin-commonjs": "^28.0.1",
+    "@rollup/plugin-node-resolve": "^15.3.0",
     "babel-plugin-macros": "^3.1.0",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.47.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",
     "eslint-plugin-import": "^2.27.5",
     "expect": "^29.6.2",
+    "install": "^0.13.0",
+    "npm": "^10.9.0",
     "prettier": "^2.0.5"
   },
   "repository": "git@github.com:bablr-lang/boot.git",