@bablr/language-en-spamex 0.11.0 → 0.11.2

package/lib/grammar.js

@@ -1,5 +1,5 @@
 import { re, spam as m } from '@bablr/boot';
-import { o, eat, eatMatch, fail, match, defineAttribute } from '@bablr/helpers/grammar';
+import { eat, eatMatch, fail, match, defineAttribute } from '@bablr/helpers/grammar';
 import Regex from '@bablr/language-en-regex-vm-pattern';
 import { default as CSTML, eatMatchTrivia } from '@bablr/language-en-cstml';
 import JSON from '@bablr/language-en-cstml-json';
@@ -99,7 +99,16 @@ export const grammar = class SpamexGrammar {
   }
 
   *TreeNodeMatcher() {
-    if (yield eatMatch(m`children[]*: <PropertyMatcher /[a-zA-Z.#@\g]/ />`)) {
+    if (yield match(re`/['"/]/`)) {
+      do {
+        yield eat(m`children[]$: <_StringMatcher />`);
+        yield* eatMatchTrivia();
+      } while (yield match(re`/['"/]/`));
+
+      return;
+    }
+
+    if (yield eatMatch(m`children[]$: <PropertyMatcher /[a-zA-Z.#@\g]/ />`)) {
       return;
     }
 
@@ -118,30 +127,23 @@ export const grammar = class SpamexGrammar {
   }
 
   *TreeNodeMatcherOpen() {
-    if (yield match(re`/['"/]/`)) {
-      yield eat(m`flags*: :CSTML: <NodeFlags />`, o({ token: true }));
-      yield eat(m`literalValue*: <_StringMatcher />`);
-
-      yield defineAttribute('selfClosing', true);
-      return;
-    }
-
     yield eat(m`openToken*: <* '<' />`);
     yield eat(m`flags*: :CSTML: <NodeFlags />`);
     let type = yield eatMatch(m`type*: <* /__?/ />`);
 
     let isMultiFragment = type && printSource(type.node) === '__';
 
-    if (
-      !isMultiFragment &&
-      (yield eatMatch(m`name$: :CSTML: <Identifier /[a-zA-Z\u{80}-\u{10ffff}\u0060\g]/ />`))
-    ) {
+    if (yield eatMatch(m`name$: :CSTML: <Identifier /[a-zA-Z\u{80}-\u{10ffff}\u0060\g]/ />`)) {
       // continue
     }
 
     let sp = yield* eatMatchTrivia();
 
-    if (sp && !(yield match(re`/\/$/`)) && (yield eatMatch(m`literalValue$: <_StringMatcher />`))) {
+    if (
+      sp &&
+      !(yield match('/>')) &&
+      (yield eatMatch(m`literalValue$: <_StringMatcher /['"/]/ />`))
+    ) {
       sp = yield* eatMatchTrivia();
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-spamex",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "A BABLR language for SPAM Expressions",
   "engines": {
     "node": ">=12.0.0"
@@ -18,14 +18,14 @@
     "test": "mocha"
   },
   "dependencies": {
-    "@bablr/agast-helpers": "0.10.0",
-    "@bablr/agast-vm-helpers": "0.10.0",
-    "@bablr/boot": "0.11.0",
-    "@bablr/helpers": "0.25.0",
-    "@bablr/language-en-blank-space": "0.10.0",
-    "@bablr/language-en-cstml": "0.12.0",
-    "@bablr/language-en-cstml-json": "0.5.0",
-    "@bablr/language-en-regex-vm-pattern": "0.12.0"
+    "@bablr/agast-helpers": "0.10.2",
+    "@bablr/agast-vm-helpers": "0.10.2",
+    "@bablr/boot": "0.11.1",
+    "@bablr/helpers": "0.25.1",
+    "@bablr/language-en-blank-space": "0.10.1",
+    "@bablr/language-en-cstml": "0.12.1",
+    "@bablr/language-en-cstml-json": "0.5.1",
+    "@bablr/language-en-regex-vm-pattern": "0.12.2"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",