@bablr/boot 0.1.2 → 0.1.4

package/lib/index.js

@@ -2,6 +2,7 @@ const instruction = require('./languages/instruction.js');
 const regex = require('./languages/regex.js');
 const spamex = require('./languages/spamex.js');
 const string = require('./languages/string.js');
+const number = require('./languages/number.js');
 const cstml = require('./languages/cstml.js');
 const { TemplateParser } = require('./miniparser.js');
 
@@ -33,6 +34,7 @@ const i = buildTag(instruction, 'Call');
 const spam = buildTag(spamex, 'Matcher');
 const re = buildTag(regex, 'Pattern');
 const str = buildTag(string, 'String');
+const num = buildTag(number, 'Number');
 const cst = buildTag(cstml, 'Node');
 
-module.exports = { re, spam, str, i, cst };
+module.exports = { re, spam, str, num, i, cst };

package/lib/languages/cstml.js

@@ -1,20 +1,23 @@
 const Regex = require('./regex.js');
 const StringLanguage = require('./string.js');
+const Number = require('./number.js');
 const { buildCovers } = require('../utils.js');
 const sym = require('../symbols.js');
 
 const _ = /\s+/y;
 const PN = 'Punctuator';
 const ID = 'Identifier';
+const LIT = 'Literal';
 
 const name = 'CSTML';
 
-const dependencies = { Regex, String: StringLanguage };
+const dependencies = { Regex, String: StringLanguage, Number };
 
 const covers = buildCovers({
   [sym.node]: ['Attribute', 'Property', 'TagType', 'Node', 'OpenNodeTag', 'CloseNodeTag'],
   [sym.fragment]: ['Attributes'],
-  Attribute: ['StringAttribute', 'BooleanAttribute'],
+  Attribute: ['MappingAttribute', 'BooleanAttribute'],
+  AttributeValue: ['String:String', 'Number:Number'],
   TagType: ['Identifier', 'GlobalIdentifier'],
 });
 
@@ -22,7 +25,7 @@ const grammar = class CSTMLMiniparserGrammar {
   Fragment(p) {
     p.eatMatchTrivia(_);
     while (p.match(/<[^/]/y) || p.atExpression) {
-      p.eatProduction('Property', { path: 'properties' });
+      p.eatProduction('Property', { path: 'properties[]' });
       p.eatMatchTrivia(_);
     }
   }
@@ -73,7 +76,7 @@ const grammar = class CSTMLMiniparserGrammar {
       if (p.atExpression) {
         p.eatProduction('Attributes'); // ??
       } else {
-        p.eatProduction('Attribute', { path: '[attributes]' });
+        p.eatProduction('Attribute', { path: 'attributes[]' });
       }
       if (p.match(/\s+\w/y) || (p.match(/\s+$/y) && !p.quasisDone)) {
         sp = p.eatMatchTrivia(_);
@@ -86,7 +89,7 @@ const grammar = class CSTMLMiniparserGrammar {
   // @Cover
   Attribute(p) {
     if (p.match(/\w+\s*=/y)) {
-      p.eatProduction('StringAttribute');
+      p.eatProduction('MappingAttribute');
     } else {
       p.eatProduction('BooleanAttribute');
     }
@@ -98,12 +101,21 @@ const grammar = class CSTMLMiniparserGrammar {
   }
 
   // @Node
-  StringAttribute(p) {
-    p.eat(/\w+/y, ID, { path: 'key' });
+  MappingAttribute(p) {
+    p.eat(/\w+/y, LIT, { path: 'key' });
     p.eatMatchTrivia(_);
     p.eat('=', PN, { path: 'mapOperator' });
     p.eatMatchTrivia(_);
-    p.eatProduction('String:String', { path: 'value' });
+    p.eatProduction('AttributeValue', { path: 'value' });
+  }
+
+  // @Cover
+  AttributeValue(p) {
+    if (p.match(/['"]/y)) {
+      p.eatProduction('String:String');
+    } else if (p.match(/-|\d/y)) {
+      p.eatProduction('Number:Number');
+    }
   }
 
   // @Cover

package/lib/languages/instruction.js

@@ -69,7 +69,7 @@ const grammar = class InstructionMiniparserGrammar {
     let first = true;
     let sep;
     while (first || (sep && (p.match(/./y) || p.atExpression))) {
-      p.eatProduction('Property', { path: '[properties]' });
+      p.eatProduction('Property', { path: 'properties[]' });
       sep = p.eatMatchTrivia(_);
       first = false;
     }
@@ -97,7 +97,7 @@ const grammar = class InstructionMiniparserGrammar {
     let first = true;
     let sep;
     while (first || (sep && (p.match(/./y) || p.atExpression))) {
-      p.eatProduction('Expression', { path: '[elements]' });
+      p.eatProduction('Expression', { path: 'elements[]' });
       sep = p.eatMatchTrivia(_);
       first = false;
     }
@@ -113,7 +113,7 @@ const grammar = class InstructionMiniparserGrammar {
 
     let i = 0;
     while (i === 0 || (sep && (p.match(/./y) || p.atExpression))) {
-      p.eatProduction('Expression', { path: '[values]' });
+      p.eatProduction('Expression', { path: 'values[]' });
       sep = p.eatMatchTrivia(_);
       i++;
     }
@@ -128,7 +128,7 @@ const grammar = class InstructionMiniparserGrammar {
 
   // @Node
   Null(p) {
-    p.eat(/null/y, KW, { path: 'value' });
+    p.eat('null', KW, { path: 'value' });
   }
 };
 

package/lib/languages/number.js

@@ -0,0 +1,38 @@
+const { buildCovers } = require('../utils.js');
+const sym = require('../symbols.js');
+
+const name = 'Number';
+
+const dependencies = {};
+
+const covers = buildCovers({
+  [sym.node]: ['Number', 'Digit'],
+  Number: ['LiteralNumber', 'SymbolicNumber'],
+});
+
+const grammar = class NumberMiniparserGrammar {
+  // @Node
+  LiteralNumber(p) {
+    p.eatMatch('-', 'Punctuator', { path: 'negative' });
+    p.eatProduction('Digits', { path: 'digits[]' });
+  }
+
+  // @Node
+  SymbolicNumber(p) {
+    p.eatMatch('-', 'Punctuator', { path: 'negative' });
+    p.eat('Infinity', 'Keyword', { path: 'value' });
+  }
+
+  Digits(p) {
+    while (p.match(/\d/y)) {
+      p.eatProduction('Digit');
+    }
+  }
+
+  // @Node
+  Digit(p) {
+    p.eatLiteral(/\d/y);
+  }
+};
+
+module.exports = { name, dependencies, covers, grammar };

package/lib/languages/regex.js

@@ -76,7 +76,7 @@ const cookEscape = (escape, span) => {
   }
 
   if (hexMatch) {
-    return parseInt(hexMatch[1], 16);
+    return String.fromCodePoint(parseInt(hexMatch[1], 16));
   }
 
   let litMatch = /\\([nrt0])/y.exec(escape);
@@ -98,9 +98,9 @@ const grammar = class RegexMiniparserGrammar {
   // @Node
   Pattern(p) {
     p.eat('/', PN, { path: 'open', balanced: '/' });
-    p.eatProduction('Alternatives', { path: '[alternatives]' });
+    p.eatProduction('Alternatives', { path: 'alternatives[]' });
     p.eat('/', PN, { path: 'close', balancer: true });
-    p.eatProduction('Flags', { path: '[flags]' });
+    p.eatProduction('Flags', { path: 'flags[]' });
   }
 
   Flags(p) {
@@ -116,19 +116,18 @@ const grammar = class RegexMiniparserGrammar {
   // @Node
   Flag(p) {
     const flag = p.eatMatch(/[gimsuy]/y, KW, { path: 'value' });
-
     return { attrs: { kind: flagsReverse[flag] } };
   }
 
   Alternatives(p) {
     do {
       p.eatProduction('Alternative');
-    } while (p.eatMatch('|', PN, { path: '[separators]' }));
+    } while (p.eatMatch('|', PN, { path: 'separators[]' }));
   }
 
   // @Node
   Alternative(p) {
-    p.eatProduction('Elements', { path: '[elements]' });
+    p.eatProduction('Elements', { path: 'elements[]' });
   }
 
   Elements(p) {
@@ -163,14 +162,14 @@ const grammar = class RegexMiniparserGrammar {
   // @Node
   Group(p) {
     p.eat('(?:', PN, { path: 'open', balanced: ')' });
-    p.eatProduction('Alternatives', { path: '[alternatives]' });
+    p.eatProduction('Alternatives', { path: 'alternatives[]' });
     p.eat(')', PN, { path: 'close', balancer: true });
   }
 
   // @Node
   CapturingGroup(p) {
     p.eat('(', PN, { path: 'open', balanced: ')' });
-    p.eatProduction('Alternatives', { path: '[alternatives]' });
+    p.eatProduction('Alternatives', { path: 'alternatives[]' });
     p.eat(')', PN, { path: 'close', balancer: true });
   }
 
@@ -226,7 +225,7 @@ const grammar = class RegexMiniparserGrammar {
 
     let first = !negate;
     while (p.match(/./sy)) {
-      p.eatProduction('CharacterClassElement', { path: '[elements]' }, { first });
+      p.eatProduction('CharacterClassElement', { path: 'elements[]' }, { first });
       first = false;
     }
 
@@ -307,7 +306,7 @@ const grammar = class RegexMiniparserGrammar {
         max = p.eatMatch(/\d+/y, 'Number', { path: 'max' });
       }
 
-      attrs = { min, max };
+      attrs = { min: min && parseInt(min, 10), max: max && parseInt(max, 10) };
 
       p.eat('}', PN, { path: 'close', balancer: true });
     }

package/lib/languages/spamex.js

@@ -1,5 +1,6 @@
 const Regex = require('./regex.js');
 const StringLanguage = require('./string.js');
+const Number = require('./number.js');
 const { buildCovers } = require('../utils.js');
 const sym = require('../symbols.js');
 
@@ -11,11 +12,12 @@ const LIT = 'Literal';
 
 const name = 'Spamex';
 
-const dependencies = { Regex, String: StringLanguage };
+const dependencies = { Regex, String: StringLanguage, Number };
 
 const covers = buildCovers({
   [sym.node]: ['Attribute', 'TagType', 'Matcher', 'Literal'],
-  Attribute: ['StringAttribute', 'BooleanAttribute'],
+  Attribute: ['MappingAttribute', 'BooleanAttribute'],
+  AttributeValue: ['String:String', 'Number:Number'],
   Matcher: ['NodeMatcher', 'TerminalMatcher', 'TriviaTerminalMatcher', 'StringMatcher'],
   StringMatcher: ['String:String', 'Regex:Pattern'],
   TagType: ['Identifier', 'GlobalIdentifier'],
@@ -54,7 +56,7 @@ const grammar = class SpamexMiniparserGrammar {
     let sp = p.eatMatchTrivia(_);
 
     if ((sp && p.match(/\w+/y)) || p.atExpression) {
-      p.eatProduction('Attributes', { path: '[attributes]' });
+      p.eatProduction('Attributes', { path: 'attributes[]' });
       sp = p.eatMatchTrivia(_);
     }
 
@@ -75,7 +77,7 @@ const grammar = class SpamexMiniparserGrammar {
     }
 
     if (sp && p.match(/\w+/y)) {
-      p.eatProduction('Attributes', { path: '[attributes]' });
+      p.eatProduction('Attributes', { path: 'attributes[]' });
       sp = p.eatMatchTrivia(_);
     }
 
@@ -96,7 +98,7 @@ const grammar = class SpamexMiniparserGrammar {
   // @Cover
   Attribute(p) {
     if (p.match(/\w+\s*=/y)) {
-      p.eatProduction('StringAttribute');
+      p.eatProduction('MappingAttribute');
     } else {
       p.eatProduction('BooleanAttribute');
     }
@@ -108,12 +110,21 @@ const grammar = class SpamexMiniparserGrammar {
   }
 
   // @Node
-  StringAttribute(p) {
+  MappingAttribute(p) {
     p.eat(/\w+/y, LIT, { path: 'key' });
     p.eatMatchTrivia(_);
     p.eat('=', PN, { path: 'mapOperator' });
     p.eatMatchTrivia(_);
-    p.eatProduction('String:String', { path: 'value' });
+    p.eatProduction('AttributeValue', { path: 'value' });
+  }
+
+  // @Cover
+  AttributeValue(p) {
+    if (p.match(/['"]/y)) {
+      p.eatProduction('String:String');
+    } else if (p.match(/-|\d/y)) {
+      p.eatProduction('Number:Number');
+    }
   }
 
   // @Cover

package/lib/languages/string.js

@@ -14,10 +14,10 @@ const PN = 'Punctuator';
 
 const escapables = new Map(
   objectEntries({
-    n: '\n'.codePointAt(0),
-    r: '\r'.codePointAt(0),
-    t: '\t'.codePointAt(0),
-    0: '\0'.codePointAt(0),
+    n: '\n',
+    r: '\r',
+    t: '\t',
+    0: '\0',
   }),
 );
 
@@ -41,7 +41,7 @@ const cookEscape = (escape, span) => {
   }
 
   if (hexMatch) {
-    return parseInt(hexMatch[1], 16);
+    return String.fromCodePoint(parseInt(hexMatch[1], 16));
   }
 
   const litPattern = span === 'String:Single' ? /\\([\\nrt0'])/y : /\\([\\nrt0"])/y;

package/lib/miniparser.js

@@ -5,7 +5,7 @@ const isString = require('iter-tools-es/methods/is-string');
 const isObject = require('iter-tools-es/methods/is-object');
 const sym = require('./symbols.js');
 const { Match } = require('./match.js');
-const { set, isRegex, isArray, parsePath, getPrototypeOf, buildNode } = require('./utils.js');
+const { set, isRegex, isArray, getPrototypeOf, buildNode, parsePath } = require('./utils.js');
 
 class TemplateParser {
   constructor(rootLanguage, quasis, expressions) {
@@ -172,9 +172,8 @@ class TemplateParser {
         }
       } else if (parentPath?.node && (isNode || covers.has(type))) {
         const { properties, children } = parentPath.node;
-        const { pathName } = parsePath(this.m.attrs.path);
 
-        children.push({ ...ref(pathName), id });
+        children.push({ ...ref(this.m.attrs.path), id });
 
         set(properties, this.m.attrs.path, result);
       }
@@ -195,9 +194,7 @@ class TemplateParser {
           node.attributes = result.attrs;
         }
         if (parentPath?.node && !covers.has(type)) {
-          const { pathName } = parsePath(this.m.attrs.path);
-
-          parentPath.node.children.push(ref(pathName));
+          parentPath.node.children.push(ref(this.m.attrs.path));
 
           set(parentPath.node.properties, this.m.attrs.path, node);
         }
@@ -280,16 +277,16 @@ class TemplateParser {
     }
 
     const path = lastChild.value;
-    const pathIsArray = isArray(properties[path]);
+    const { pathIsArray, pathName } = parsePath(path);
 
-    this.held = pathIsArray ? arrayLast(properties[path]) : properties[path];
+    this.held = pathIsArray ? arrayLast(properties[pathName]) : properties[pathName];
 
     children.pop();
 
     if (pathIsArray) {
-      properties[path].pop();
+      properties[pathName].pop();
     } else {
-      properties[path] = null;
+      properties[pathName] = null;
     }
 
     return this.eval(this.buildId(id), attrs, props);
@@ -309,7 +306,7 @@ class TemplateParser {
 
     set(this.node.properties, attrs.path, buildNode(this.buildId(type), [lit(result)]));
 
-    this.node.children.push(ref(parsePath(attrs.path).pathName));
+    this.node.children.push(ref(attrs.path));
 
     return result;
   }
@@ -337,7 +334,7 @@ class TemplateParser {
 
       set(this.node.properties, attrs.path, buildNode(this.buildId(type), [lit(result)]));
 
-      this.node.children.push(ref(parsePath(attrs.path).pathName));
+      this.node.children.push(ref(attrs.path));
     }
     return result;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/boot",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"
@@ -18,7 +18,7 @@
     "@babel/helper-module-imports": "^7.22.15",
     "@babel/template": "^7.22.15",
     "@babel/types": "7.23.0",
-    "@bablr/boot-helpers": "0.1.0",
+    "@bablr/boot-helpers": "0.1.1",
     "escape-string-regexp": "4.0.0",
     "iter-tools-es": "^7.5.3"
   },

package/shorthand.macro.js

@@ -11,6 +11,7 @@ const i = require('./lib/languages/instruction.js');
 const re = require('./lib/languages/regex.js');
 const spam = require('./lib/languages/spamex.js');
 const str = require('./lib/languages/string.js');
+const num = require('./lib/languages/number.js');
 const cstml = require('./lib/languages/cstml.js');
 const { addNamespace, addNamed } = require('@babel/helper-module-imports');
 const { PathResolver } = require('@bablr/boot-helpers/path');
@@ -146,6 +147,7 @@ const languages = {
   re,
   spam,
   str,
+  num,
   cst: cstml,
 };
 
@@ -154,6 +156,7 @@ const topTypes = {
   re: 'Pattern',
   spam: 'Matcher',
   str: 'String',
+  num: 'Number',
   cst: 'Node',
 };
 
@@ -173,6 +176,7 @@ const shorthandMacro = ({ references }) => {
     references.spam,
     references.re,
     references.str,
+    references.num,
     references.cst,
   )) {
     if (!bindings.t) {