@bablr/boot 0.11.0 → 0.11.2

package/lib/languages/cstml.js

@@ -101,11 +101,21 @@ export const grammar = class CSTMLMiniparserGrammar {
   }
 
   TreeNode(p, props) {
+    if (p.match(/['"]/y)) {
+      p.eatProduction('OpenNodeTag', { path: 'openTag' });
+      do {
+        p.eatProduction('LiteralTag', { path: 'children[]' });
+        p.eatMatchTrivia(_);
+      } while (p.match(/['"]/y));
+      p.eatProduction('CloseNodeTag', { path: 'closeTag' }, { empty: true });
+      return;
+    }
+
     let open = p.eatProduction('OpenNodeTag', { path: 'openTag', noInterpolate: true }, props);
 
     p.eatMatchTrivia(_);
 
-    if (open.value.attributes.selfClosing) {
+    if (!open.value.attributes.selfClosing) {
       let token = !!get(['flags', 'token'], open);
 
       while (p.atExpression || !(p.match(/<\/[^/]/y) || p.done)) {
@@ -193,8 +203,7 @@ export const grammar = class CSTMLMiniparserGrammar {
   OpenNodeTag(p) {
     if (p.match(/['"]/y)) {
       p.eatProduction('NodeFlags', { path: 'flags' }, { token: true });
-      p.eatProduction('JSON:String', { path: 'literalValue' });
-      return;
+      return { attrs: { selfClosing: false } };
     }
 
     p.eat('<', PN, { path: 'openToken' });
@@ -237,14 +246,16 @@ export const grammar = class CSTMLMiniparserGrammar {
     let sc = p.eatMatch('/', PN, { path: 'selfClosingToken' });
     p.eat('>', PN, { path: 'closeToken' });
 
-    const selfClosing = !sc && (p.path.depth > 0 || p.span.type !== 'Bare');
+    const selfClosing = !!sc;
 
     return { attrs: { selfClosing } };
   }
 
-  CloseNodeTag(p) {
-    p.eat('</', PN, { path: 'openToken' });
-    p.eat('>', PN, { path: 'closeToken' });
+  CloseNodeTag(p, props) {
+    if (!props.empty) {
+      p.eat('</', PN, { path: 'openToken' });
+      p.eat('>', PN, { path: 'closeToken' });
+    }
   }
 
   Expression(p) {

package/lib/languages/spamex.js

@@ -123,6 +123,15 @@ export const grammar = class SpamexMiniparserGrammar {
   }
 
   TreeNodeMatcher(p) {
+    if (p.match(/['"/]/y)) {
+      do {
+        p.eatProduction('StringMatcher', { path: 'children[]' });
+        p.eatMatchTrivia(_);
+      } while (p.match(/['"/]/y));
+
+      return;
+    }
+
     if (p.match(/[a-zA-Z.#@]/y) || p.atExpression) {
       p.eatProduction('PropertyMatcher', { path: 'children[]', noInterpolate: true });
       return;
@@ -148,13 +157,6 @@ export const grammar = class SpamexMiniparserGrammar {
   }
 
   TreeNodeMatcherOpen(p) {
-    if (p.match(/['"/]/y)) {
-      p.eatProduction('CSTML:NodeFlags', { path: 'flags', token: true });
-      p.eatProduction('StringMatcher', { path: 'literalValue' });
-
-      return { attrs: { selfClosing: true } };
-    }
-
     p.eat('<', PN, { path: 'openToken' });
 
     if (!p.atExpression) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/boot",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Compile-time tools for bootstrapping BABLR VM",
   "engines": {
     "node": ">=12.0.0"
@@ -20,8 +20,8 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.10.0",
-    "@bablr/agast-vm-helpers": "0.10.0",
+    "@bablr/agast-helpers": "0.10.2",
+    "@bablr/agast-vm-helpers": "0.10.2",
     "@iter-tools/imm-stack": "1.2.0",
     "escape-string-regexp": "5.0.0",
     "iter-tools-es": "^7.0.2"