@bablr/language-en-spamex 0.4.3 → 0.6.0

package/lib/grammar.macro.js

@@ -1,9 +1,10 @@
 import { i } from '@bablr/boot/shorthand.macro';
-import { Node, CoveredBy, InjectFrom } from '@bablr/helpers/decorators';
+import { Node, CoveredBy, InjectFrom, UnboundAttributes } from '@bablr/helpers/decorators';
 import * as productions from '@bablr/helpers/productions';
 import * as Regex from '@bablr/language-en-regex-vm-pattern';
 import * as CSTML from '@bablr/language-en-cstml';
 import * as Space from '@bablr/language-en-blank-space';
+import { notNull } from '@bablr/agast-helpers/tree';
 
 export const canonicalURL = 'https://bablr.org/languages/core/en/spamex';
 
@@ -14,77 +15,111 @@ const { eatMatchTrivia } = CSTML;
 export const grammar = class SpamexGrammar {
   @CoveredBy('Expression')
   *Matcher() {
-    yield i`eat(<Any> null [
-        <NodeMatcher '<'>
-        <CSTML:String /['"]/>
-        <Regex:Pattern '/'>
+    yield i`eat(<Any /> null [
+        <NodeMatcher '<' />
+        <CSTML:String /['"]/ />
+        <Regex:Pattern '/' />
       ])`;
   }
 
-  @CoveredBy('Matcher')
-  @CoveredBy('Expression')
   @Node
+  @CoveredBy('Matcher')
   *NodeMatcher() {
-    yield i`eat(<~*Punctuator '<' balancedSpan='Tag' balanced='>'> 'open')`;
-    yield i`eat(<CSTML:Flags>)`;
-    if (yield i`match(/[a-zA-Z]+:/)`) {
-      yield i`eat(<*CSTML:Identifier> 'language')`;
-      yield i`eat(<~*Punctuator ':'> 'namespaceOperator')`;
-      yield i`eat(<*CSTML:Identifier> 'type')`;
+    let open = yield i`eat(<OpenNodeMatcher /> 'open')`;
+
+    const selfClosing = notNull(open.get('selfClosingTagToken'));
+
+    if (selfClosing) {
+      yield i`eat([] 'children[]$')`;
+      yield i`eat(null 'close')`;
     } else {
-      yield i`eat(null 'language')`;
-      yield i`eat(null 'namespaceOperator')`;
-      yield i`eatMatch(<*CSTML:Identifier> 'type')`;
+      // TODO
+      yield* eatMatchTrivia();
+
+      yield i`eat(<CloseNodeMatcher /> 'close')`;
+    }
+  }
+
+  @Node
+  *OpenNodeMatcher() {
+    yield i`eat(<*Punctuator '<' balancedSpan='Tag' balanced='>' /> 'open')`;
+    yield i`eat(<CSTML:Flags /> 'flags')`;
+
+    if (yield i`eatMatch(<CSTML:TagType /[a-zA-Z'"\g]/ />)`) {
+      // continue
+    } else if (yield i`eatMatch(<*Punctuator /[ \t]+|?/ /> 'type$')`) {
+      // continue
     }
+
     let sp = yield* eatMatchTrivia();
 
-    if (sp && (yield i`eatMatch(<StringMatcher> 'intrinsicValue')`)) {
+    if (
+      sp &&
+      !(yield i`match(/\/$/)`) &&
+      (yield i`eatMatch(<StringMatcher /> 'intrinsicValue$')`)
+    ) {
       sp = yield* eatMatchTrivia();
     }
 
     while (sp && (yield i`match(/!?[a-zA-Z]/)`)) {
-      yield i`eat(<Attribute> 'attributes[]')`;
+      yield i`eat(<Attribute /> 'attributes[]')`;
       sp = yield* eatMatchTrivia();
     }
-    yield i`eat(<~*Punctuator '>' balancer> 'close')`;
+
+    yield i`eatMatch(<*Punctuator '/' /> 'selfClosingTagToken')`;
+    yield i`eat(<*Punctuator '>' balancer /> 'close')`;
+  }
+
+  @Node
+  @CoveredBy('Matcher')
+  *CloseNodeMatcher() {
+    yield i`eat(<*Punctuator '</' balanced='>' /> 'openToken')`;
+    yield i`eatMatch(<TagType />)`;
+    yield i`eat(<*Punctuator '>' balancer /> 'closeToken')`;
   }
 
   *Attributes() {
-    yield i`eatMatch(<List> null {
-        element: <Attribute>
+    yield i`eatMatch(<List /> null {
+        element: <Attribute />
         allowTrailingSeparator: false
       })`;
   }
 
   *Attribute() {
     if (yield i`match(/[a-zA-Z]+\s*=/)`) {
-      yield i`eat(<MappingAttribute>)`;
+      yield i`eat(<MappingAttribute />)`;
     } else {
-      yield i`eat(<BooleanAttribute>)`;
+      yield i`eat(<BooleanAttribute />)`;
     }
   }
 
-  @CoveredBy('Attribute')
+  @UnboundAttributes(['true'])
   @Node
+  @CoveredBy('Attribute')
   *BooleanAttribute() {
-    yield i`eat(<*CSTML:Identifier> 'key')`;
+    if (yield i`eatMatch(<*Punctuator '!' /> 'negateToken')`) {
+      yield i`bindAttribute('true' false)`;
+    } else {
+      yield i`bindAttribute('true' true)`;
+    }
+    yield i`eat(<*CSTML:Identifier /> 'key$')`;
   }
 
   @CoveredBy('Attribute')
   @Node
   *MappingAttribute() {
-    yield i`eat(<*CSTML:Identifier> 'key')`;
-    yield i`eat(<~*Punctuator '='> 'mapOperator')`;
-    yield i`eat(<CSTML:AttributeValue> 'value')`;
+    yield i`eat(<*CSTML:Identifier /> 'key$')`;
+    yield i`eat(<*Punctuator '=' /> 'mapOperator')`;
+    yield i`eat(<CSTML:AttributeValue /> 'value$')`;
   }
 
   @CoveredBy('Matcher')
   @CoveredBy('Expression')
   *StringMatcher() {
     if (yield i`match(/['"]/)`) {
-      yield i`eat(<CSTML:String>)`;
+      yield i`eat(<CSTML:String />)`;
     } else {
-      yield i`eat(<Regex:Pattern>)`;
+      yield i`eat(<Regex:Pattern />)`;
     }
   }
 
@@ -93,7 +128,7 @@ export const grammar = class SpamexGrammar {
   @CoveredBy('Expression')
   @Node
   *String() {
-    yield i`eat(<CSTML:String>)`;
+    yield i`eat(<CSTML:String />)`;
   }
 
   @CoveredBy('StringMatcher')
@@ -101,10 +136,10 @@ export const grammar = class SpamexGrammar {
   @CoveredBy('Expression')
   @Node
   *Regex() {
-    yield i`eat(<~*Punctuator '/' balanced='/'> 'open')`;
-    yield i`eat(<Regex:Alternatives> 'alternatives[]')`;
-    yield i`eat(<~*Punctuator '/' balancer> 'close')`;
-    yield i`eat(<Regex:Flags> 'flags')`;
+    yield i`eat(<*Punctuator '/' balanced='/' /> 'open')`;
+    yield i`eat(<Regex:Alternatives /> 'alternatives[]$')`;
+    yield i`eat(<*Punctuator '/' balancer /> 'close')`;
+    yield i`eat(<Regex:Flags /> 'flags$')`;
   }
 
   @InjectFrom(productions)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-spamex",
-  "version": "0.4.3",
+  "version": "0.6.0",
   "description": "A BABLR language for SPAM Expressions",
   "engines": {
     "node": ">=12.0.0"
@@ -22,18 +22,18 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.2",
-    "@bablr/agast-helpers": "0.3.2",
-    "@bablr/agast-vm-helpers": "0.3.2",
-    "@bablr/helpers": "0.18.1",
-    "@bablr/language-en-blank-space": "0.3.1",
-    "@bablr/language-en-cstml": "0.4.3",
-    "@bablr/language-en-regex-vm-pattern": "0.5.1"
+    "@bablr/agast-helpers": "^0.5.0",
+    "@bablr/agast-vm-helpers": "^0.5.0",
+    "@bablr/helpers": "^0.20.0",
+    "@bablr/language-en-blank-space": "^0.5.0",
+    "@bablr/language-en-cstml": "^0.6.0",
+    "@bablr/language-en-regex-vm-pattern": "^0.7.0"
   },
   "devDependencies": {
-    "@bablr/boot": "0.4.0",
+    "@bablr/boot": "^0.6.0",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
-    "@bablr/macrome": "0.1.3",
-    "@bablr/macrome-generator-bablr": "0.3.1",
+    "@bablr/macrome": "^0.1.3",
+    "@bablr/macrome-generator-bablr": "^0.3.2",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^7.32.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",