@bablr/boot 0.1.4 → 0.1.5

package/lib/languages/cstml.js

@@ -14,18 +14,31 @@ const name = 'CSTML';
 const dependencies = { Regex, String: StringLanguage, Number };
 
 const covers = buildCovers({
-  [sym.node]: ['Attribute', 'Property', 'TagType', 'Node', 'OpenNodeTag', 'CloseNodeTag'],
+  [sym.node]: [
+    'Attribute',
+    'Property',
+    'TagType',
+    'Node',
+    'OpenNodeTag',
+    'CloseNodeTag',
+    'Terminal',
+  ],
   [sym.fragment]: ['Attributes'],
   Attribute: ['MappingAttribute', 'BooleanAttribute'],
   AttributeValue: ['String:String', 'Number:Number'],
   TagType: ['Identifier', 'GlobalIdentifier'],
+  Terminal: ['Literal', 'Trivia', 'Escape'],
 });
 
 const grammar = class CSTMLMiniparserGrammar {
   Fragment(p) {
     p.eatMatchTrivia(_);
-    while (p.match(/<[^/]/y) || p.atExpression) {
-      p.eatProduction('Property', { path: 'properties[]' });
+    while (p.match(/['"]|<[^/]/y) || p.atExpression) {
+      if (p.match(/['"]/y)) {
+        p.eatProduction('Terminal', { path: 'properties[]' });
+      } else {
+        p.eatProduction('Property', { path: 'properties[]' });
+      }
       p.eatMatchTrivia(_);
     }
   }
@@ -65,7 +78,7 @@ const grammar = class CSTMLMiniparserGrammar {
   // @Node
   CloseNodeTag(p) {
     p.eat('</', PN, { path: 'open', startSpan: 'Tag', balanced: '>' });
-
+    // TODO permit .type
     p.eat('>', PN, { path: 'close', endSpan: 'Tag', balancer: true });
   }
 
@@ -138,6 +151,37 @@ const grammar = class CSTMLMiniparserGrammar {
   Identifier(p) {
     p.eatLiteral(/\w+/y);
   }
+
+  // @Cover
+  Terminal(p) {
+    if (p.match(/!['"]/y)) {
+      p.eatProduction('Escape');
+    } else if (p.match(/#['"]/y)) {
+      p.eatProduction('Trivia');
+    } else {
+      p.eatProduction('Literal');
+    }
+  }
+
+  // @Node
+  Escape(p) {
+    p.eat('!', PN, { path: 'escapeOperator' });
+    p.eatProduction('String:String', { path: 'rawValue' });
+    p.eatMatchTrivia(_);
+    p.eat(':', PN, { path: 'rawOperator' });
+    p.eatProduction('String:String', { path: 'value' });
+  }
+
+  // @Node
+  Trivia(p) {
+    p.eat('#', PN, { path: 'trivializeOperator' });
+    p.eatProduction('String:String', { path: 'value' });
+  }
+
+  // @Node
+  Literal(p) {
+    p.eatProduction('String:String', { path: 'value' });
+  }
 };
 
 module.exports = { name, dependencies, covers, grammar };

package/lib/languages/instruction.js

@@ -34,6 +34,7 @@ const grammar = class InstructionMiniparserGrammar {
   Call(p) {
     p.eat(/\w+/y, ID, { path: 'verb' });
     p.eatMatchTrivia(_);
+    p.eatMatch(/[!#]/y, PN, { path: 'verbSuffix' });
     p.eatProduction('Tuple', { path: 'arguments' });
   }
 

package/lib/languages/string.js

@@ -79,8 +79,8 @@ const grammar = class StringMiniparserGrammar {
           : p.eatMatchEscape(/\\(u(\{\d{1,6}\}|\d{4})|x[0-9a-fA-F]{2}|[\\nrt0"])/y);
       lit =
         p.span.type === 'Single'
-          ? p.eatMatchLiteral(/[^\r\n\\']+/y)
-          : p.eatMatchLiteral(/[^\r\n\\"]+/y);
+          ? p.eatMatchLiteral(/[^\r\n\0\\']+/y)
+          : p.eatMatchLiteral(/[^\r\n\0\\"]+/y);
       i++;
     } while (esc || lit);
     if (i === 1 && !esc && !lit) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/boot",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"