@bablr/boot 0.6.0 → 0.6.1

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

@@ -66,9 +66,12 @@ const covers = buildCovers({
     'NullTag',
     'GapTag',
     'Node',
+    'Fragment',
     'IdentifierPath',
     'OpenNodeTag',
     'CloseNodeTag',
+    'OpenFragmentTag',
+    'CloseFragmentTag',
     'Tag',
     'Number',
     'Digit',
@@ -92,7 +95,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 +166,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 +259,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;
@@ -288,7 +331,7 @@ const grammar = class CSTMLMiniparserGrammar {
   }
 
   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' });

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/package.json

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