@bablr/language-en-spamex 0.10.0 → 0.11.1

package/lib/grammar.js

@@ -1,152 +1,170 @@
-/* @macrome
- * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#a1e4c7ce2291d9dedc71da4cea2bc1891dbd39ae
- * This file is autogenerated. Please do not edit it directly.
- * When editing run `npx macrome watch` then change the file this is generated from.
- */
-import _applyDecs from "@babel/runtime/helpers/applyDecs2305";
-let _initProto, _MatcherDecs, _GapNodeMatcherDecs, _ArrayNodeMatcherDecs, _NullNodeMatcherDecs, _PropertyMatcherDecs, _BasicNodeMatcherDecs, _CloseNodeMatcherDecs, _StringMatcherDecs, _StringDecs, _RegexDecs, _ListDecs, _PunctuatorDecs, _AnyDecs;
 import { re, spam as m } from '@bablr/boot';
-import { Node, CoveredBy, InjectFrom, Literal } from '@bablr/helpers/decorators';
-import * as productions from '@bablr/helpers/productions';
-import { o, eat, eatMatch, match, fail } from '@bablr/helpers/grammar';
-import * as Regex from '@bablr/language-en-regex-vm-pattern';
-import * as CSTML from '@bablr/language-en-cstml';
-import * as JSON from '@bablr/language-en-cstml-json';
-import * as Space from '@bablr/language-en-blank-space';
+import { o, 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';
+import Space from '@bablr/language-en-blank-space';
 import { buildString } from '@bablr/helpers/builders';
+import { printSource } from '@bablr/agast-helpers/tree';
+
 export const canonicalURL = 'https://bablr.org/languages/core/en/spamex';
-export const dependencies = {
-  Regex,
-  CSTML,
-  JSON,
-  Space
-};
+
+export const dependencies = { Regex, CSTML, JSON, Space };
+
 export const defaultMatcher = m`<_Matcher />`;
-const {
-  eatMatchTrivia
-} = CSTML;
+
 export const grammar = class SpamexGrammar {
-  static {
-    [_initProto] = _applyDecs(this, [[_MatcherDecs, 2, "Matcher"], [_GapNodeMatcherDecs, 2, "GapNodeMatcher"], [_ArrayNodeMatcherDecs, 2, "ArrayNodeMatcher"], [_NullNodeMatcherDecs, 2, "NullNodeMatcher"], [_PropertyMatcherDecs, 2, "PropertyMatcher"], [Node, 2, "ReferenceMatcher"], [Node, 2, "BindingMatcher"], [_BasicNodeMatcherDecs, 2, "BasicNodeMatcher"], [Node, 2, "OpenNodeMatcher"], [_CloseNodeMatcherDecs, 2, "CloseNodeMatcher"], [_StringMatcherDecs, 2, "StringMatcher"], [_StringDecs, 2, "String"], [_RegexDecs, 2, "Regex"], [_ListDecs, 2, "List"], [_PunctuatorDecs, 2, "Punctuator"], [_AnyDecs, 2, "Any"]], []).e;
-  }
   constructor() {
-    _initProto(this);
+    this.attributes = new Map(
+      Object.entries({
+        TreeNodeMatcherOpen: { selfClosing: undefined },
+      }),
+    );
+  }
+
+  *Matcher() {
+    yield eat(m`<BoundNodeMatcher />`);
+  }
+
+  *BoundNodeMatcher() {
+    while (yield eatMatch(m`bindingMatchers[]: <BindingMatcher ':' />`));
+
+    yield eat(m`nodeMatcher: <_NodeMatcher />`);
   }
-  *[(_MatcherDecs = CoveredBy('Expression'), _GapNodeMatcherDecs = [Node, CoveredBy('NodeMatcher')], _ArrayNodeMatcherDecs = [Node, CoveredBy('NodeMatcher')], _NullNodeMatcherDecs = [Node, CoveredBy('NodeMatcher')], _PropertyMatcherDecs = [Node, CoveredBy('Matcher')], _BasicNodeMatcherDecs = [Node, CoveredBy('NodeMatcher')], _CloseNodeMatcherDecs = [Node, CoveredBy('Matcher')], _StringMatcherDecs = [CoveredBy('Matcher'), CoveredBy('Expression')], _StringDecs = [CoveredBy('StringMatcher'), CoveredBy('Matcher'), CoveredBy('Expression'), Node], _RegexDecs = [CoveredBy('StringMatcher'), CoveredBy('Matcher'), CoveredBy('Expression'), Node], _ListDecs = InjectFrom(productions), _PunctuatorDecs = [Literal, Node, InjectFrom(productions)], _AnyDecs = InjectFrom(productions), "Matcher")]() {
-    yield eat(m`<__Any />`, [m`<PropertyMatcher /[a-zA-Z.@#<]/ />`, m`<_StringMatcher /[/'"]/ />`]);
+
+  *PropertyMatcher() {
+    yield eatMatch(m`refMatcher$: <ReferenceMatcher />`);
+    yield* eatMatchTrivia();
+    yield eat(m`valueMatcher$: <BoundNodeMatcher />`);
   }
+
   *NodeMatcher() {
-    yield eat(m`<__Any />`, [m`<GapNodeMatcher '<//>' />`, m`<BasicNodeMatcher '<' />`, m`<ArrayNodeMatcher '[' />`, m`<NullNodeMatcher 'null' />`]);
+    let chrs = yield match(re`/:|\<\/\/?\>|\<|null|['"/]/`);
+    switch (printSource(chrs)) {
+      case '<//>':
+        yield eat(m`<GapNodeMatcher />`);
+        break;
+      case '</>':
+        yield fail();
+        break;
+      case '<':
+      case '"':
+      case "'":
+      case '/':
+        yield eat(m`<TreeNodeMatcher />`);
+        break;
+      case 'null':
+        yield eat(m`<NullNodeMatcher />`);
+        break;
+      default:
+        yield eat(m`<TreeNodeMatcher />`);
+        break;
+    }
   }
+
   *GapNodeMatcher() {
-    yield eat(m`sigilToken: <*Punctuator '<//>' />`);
-  }
-  *ArrayNodeMatcher() {
-    yield eat(m`sigilToken: <*Punctuator '[]' />`);
+    yield eat(m`sigilToken*: <* '<//>' />`);
   }
+
   *NullNodeMatcher() {
-    yield eat(m`sigilToken: <*Punctuator 'null' />`);
+    yield eat(m`sigilToken*: <* 'null' />`);
   }
-  *PropertyMatcher() {
-    yield eatMatch(m`refMatcher: <ReferenceMatcher />`);
-    yield* eatMatchTrivia();
-    yield eatMatch(m`bindingMatcher: <BindingMatcher />`);
-    yield* eatMatchTrivia();
-    yield eat(m`nodeMatcher: <_NodeMatcher />`);
-  }
-  *ReferenceMatcher({
-    ctx
-  }) {
+
+  *ReferenceMatcher() {
     let type;
-    if (type = yield match(re`/[.#@]/`)) {
-      yield eat(m`type: <*Punctuator ${buildString(ctx.sourceTextFor(type))} />`);
+    if ((type = yield match(re`/\.\.|[.#@]/`))) {
+      yield eat(m`type*: <* ${buildString(printSource(type))} />`);
     }
-    if (!type || ctx.sourceTextFor(type) === '#') {
+
+    if (!type || printSource(type) === '#') {
       if (type) {
-        yield eatMatch(m`name$: :CSTML: <Identifier />`, o({}), o({
-          bind: true
-        }));
+        yield eatMatch(m`name$: :CSTML: <Identifier />`);
       } else {
-        yield eat(m`type: null`);
         yield eat(m`name$: :CSTML: <Identifier />`);
       }
     } else {
-      yield eat(m`name$: null`, o({}), o({
-        bind: true
-      }));
-    }
-    if (yield eatMatch(m`openIndexToken: <*Punctuator '[' { balanced: ']' } />`)) {
-      yield* eatMatchTrivia();
-      yield eatMatch(m`closeIndexToken: <*Punctuator ']' { balancer: true } />`);
-    } else {
-      yield eatMatch(m`closeIndexToken: null`);
+      yield eat(m`name$: null`);
     }
+
     yield* eatMatchTrivia();
-    yield eatMatch(m`flags: :CSTML: <ReferenceFlags />`);
+    yield eatMatch(m`flags*: :CSTML: <ReferenceFlags />`);
     yield* eatMatchTrivia();
-    yield eat(m`sigilToken: <*Punctuator ':' />`);
+    yield eat(m`sigilToken*: <* ':' />`);
   }
+
   *BindingMatcher() {
-    yield eat(m`sigilToken: <*Punctuator ':' />`);
+    yield eat(m`bindingMatcher*: :CSTML: <BindingTag />`);
     yield* eatMatchTrivia();
-    yield eat(m`languagePath: :CSTML: <IdentifierPath />`);
-    yield* eatMatchTrivia();
-    yield eat(m`sigilToken: <*Punctuator ':' />`);
+    yield eat(m`valueMatcher+$: <_ />`);
   }
-  *BasicNodeMatcher() {
-    let open = yield eat(m`open: <OpenNodeMatcher />`);
-    const selfClosing = open.get('selfClosingToken');
+
+  *TreeNodeMatcher() {
+    if (yield eatMatch(m`children[]*: <PropertyMatcher /[a-zA-Z.#@\g]/ />`)) {
+      return;
+    }
+
+    let open = yield eat(m`open*: <TreeNodeMatcherOpen />`);
+
+    const { selfClosing } = open.node.value.attributes;
+
     if (selfClosing) {
-      yield eat(m`children[]$: []`);
-      yield eat(m`close: null`);
+      yield eat(m`close*: null`);
     } else {
       // TODO
       yield* eatMatchTrivia();
-      yield eat(m`close: <CloseNodeMatcher />`);
+
+      yield eat(m`close*: <TreeNodeMatcherClose />`);
     }
   }
-  *OpenNodeMatcher() {
-    yield eat(m`openToken: <*Punctuator '<' { balancedSpan: 'Tag', balanced: '>' } />`);
-    let flags = yield eat(m`flags: :CSTML: <NodeFlags />`);
-    if (yield eatMatch(m`type$: :CSTML: <Identifier /[a-zA-Z\u{80}-\u{10ffff}\u0060\g]/ />`)) {
+
+  *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 (yield eatMatch(m`name$: :CSTML: <Identifier /[a-zA-Z\u{80}-\u{10ffff}\u0060\g]/ />`)) {
       // continue
-    } else if (!flags.get('fragmentToken')) {
-      if (yield eatMatch(m`type$: <*Punctuator '?' />`)) {
-        // continue
-      } else {
-        yield fail();
-      }
     }
+
     let sp = yield* eatMatchTrivia();
+
     if (sp && !(yield match(re`/\/$/`)) && (yield eatMatch(m`literalValue$: <_StringMatcher />`))) {
       sp = yield* eatMatchTrivia();
     }
+
     while (sp && (yield match('{'))) {
-      yield eat(m`attributes: :JSON: <Object />`);
+      yield eat(m`attributes$: :JSON: <Object />`);
       sp = yield* eatMatchTrivia();
     }
-    yield eatMatch(m`selfClosingToken: <*Punctuator '/' />`);
-    yield eat(m`closeToken: <*Punctuator '>' { balancer: true } />`);
-  }
-  *CloseNodeMatcher() {
-    yield eat(m`openToken: <*Punctuator '</' { balanced: '>' } />`);
-    yield eat(m`closeToken: <*Punctuator '>' { balancer: true } />`);
-  }
+
+    let sc = yield eatMatch(m`selfClosingToken*: <* '/' />`);
+
+    yield defineAttribute('selfClosing', !!sc);
+    yield eat(m`closeToken*: <* '>' />`);
+  }
+
+  *TreeNodeMatcherClose() {
+    yield eat(m`openToken*: <* '</' />`);
+    yield eat(m`closeToken*: <* '>' />`);
+  }
+
   *StringMatcher() {
     if (yield match(re`/['"]/`)) {
-      yield eat(m`<String />`);
+      yield eat(m`:JSON: <String />`);
     } else {
-      yield eat(m`<Regex />`);
+      yield eat(m`:Regex: <Pattern />`);
     }
   }
-  *String() {
-    yield eat(m`:JSON: <__String />`);
-  }
-  *Regex() {
-    yield eat(m`:Regex: <__Pattern />`);
-  }
-  List() {}
-  Punctuator() {}
-  Any() {}
-};
+};
+
+export default { canonicalURL, dependencies, grammar, defaultMatcher };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-spamex",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "A BABLR language for SPAM Expressions",
   "engines": {
     "node": ">=12.0.0"
@@ -15,26 +15,20 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build": "macrome build",
-    "watch": "macrome watch",
-    "clean": "macrome clean",
     "test": "mocha"
   },
   "dependencies": {
-    "@babel/runtime": "7.28.2",
-    "@bablr/agast-helpers": "0.9.0",
-    "@bablr/agast-vm-helpers": "0.9.0",
-    "@bablr/boot": "0.10.0",
-    "@bablr/helpers": "0.24.0",
-    "@bablr/language-en-blank-space": "0.9.0",
-    "@bablr/language-en-cstml": "0.11.0",
-    "@bablr/language-en-cstml-json": "0.4.0",
-    "@bablr/language-en-regex-vm-pattern": "0.11.0"
+    "@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.1"
   },
   "devDependencies": {
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
-    "@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",
@@ -49,7 +43,10 @@
     "english",
     "spamex"
   ],
-  "repository": "git@github.com:bablr-lang/language-en-spamex.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/bablr-lang/language-en-spamex.git"
+  },
   "homepage": "https://github.com/bablr-lang/language-en-spamex",
   "author": "Conrad Buck <conartist6@gmail.com>",
   "license": "MIT"

package/lib/grammar.macro.js

@@ -1,193 +0,0 @@
-import { re, spam as m } from '@bablr/boot';
-import { Node, CoveredBy, InjectFrom, Literal } from '@bablr/helpers/decorators';
-import * as productions from '@bablr/helpers/productions';
-import { o, eat, eatMatch, match, fail } from '@bablr/helpers/grammar';
-import * as Regex from '@bablr/language-en-regex-vm-pattern';
-import * as CSTML from '@bablr/language-en-cstml';
-import * as JSON from '@bablr/language-en-cstml-json';
-import * as Space from '@bablr/language-en-blank-space';
-import { buildString } from '@bablr/helpers/builders';
-
-export const canonicalURL = 'https://bablr.org/languages/core/en/spamex';
-
-export const dependencies = { Regex, CSTML, JSON, Space };
-
-export const defaultMatcher = m`<_Matcher />`;
-
-const { eatMatchTrivia } = CSTML;
-
-export const grammar = class SpamexGrammar {
-  @CoveredBy('Expression')
-  *Matcher() {
-    yield eat(m`<__Any />`, [m`<PropertyMatcher /[a-zA-Z.@#<]/ />`, m`<_StringMatcher /[/'"]/ />`]);
-  }
-
-  *NodeMatcher() {
-    yield eat(m`<__Any />`, [
-      m`<GapNodeMatcher '<//>' />`,
-      m`<BasicNodeMatcher '<' />`,
-      m`<ArrayNodeMatcher '[' />`,
-      m`<NullNodeMatcher 'null' />`,
-    ]);
-  }
-
-  @Node
-  @CoveredBy('NodeMatcher')
-  *GapNodeMatcher() {
-    yield eat(m`sigilToken: <*Punctuator '<//>' />`);
-  }
-
-  @Node
-  @CoveredBy('NodeMatcher')
-  *ArrayNodeMatcher() {
-    yield eat(m`sigilToken: <*Punctuator '[]' />`);
-  }
-
-  @Node
-  @CoveredBy('NodeMatcher')
-  *NullNodeMatcher() {
-    yield eat(m`sigilToken: <*Punctuator 'null' />`);
-  }
-
-  @Node
-  @CoveredBy('Matcher')
-  *PropertyMatcher() {
-    yield eatMatch(m`refMatcher: <ReferenceMatcher />`);
-    yield* eatMatchTrivia();
-    yield eatMatch(m`bindingMatcher: <BindingMatcher />`);
-    yield* eatMatchTrivia();
-    yield eat(m`nodeMatcher: <_NodeMatcher />`);
-  }
-
-  @Node
-  *ReferenceMatcher({ ctx }) {
-    let type;
-    if ((type = yield match(re`/[.#@]/`))) {
-      yield eat(m`type: <*Punctuator ${buildString(ctx.sourceTextFor(type))} />`);
-    }
-
-    if (!type || ctx.sourceTextFor(type) === '#') {
-      if (type) {
-        yield eatMatch(m`name$: :CSTML: <Identifier />`, o({}), o({ bind: true }));
-      } else {
-        yield eat(m`type: null`);
-        yield eat(m`name$: :CSTML: <Identifier />`);
-      }
-    } else {
-      yield eat(m`name$: null`, o({}), o({ bind: true }));
-    }
-
-    if (yield eatMatch(m`openIndexToken: <*Punctuator '[' { balanced: ']' } />`)) {
-      yield* eatMatchTrivia();
-      yield eatMatch(m`closeIndexToken: <*Punctuator ']' { balancer: true } />`);
-    } else {
-      yield eatMatch(m`closeIndexToken: null`);
-    }
-
-    yield* eatMatchTrivia();
-    yield eatMatch(m`flags: :CSTML: <ReferenceFlags />`);
-    yield* eatMatchTrivia();
-    yield eat(m`sigilToken: <*Punctuator ':' />`);
-  }
-
-  @Node
-  *BindingMatcher() {
-    yield eat(m`sigilToken: <*Punctuator ':' />`);
-    yield* eatMatchTrivia();
-    yield eat(m`languagePath: :CSTML: <IdentifierPath />`);
-    yield* eatMatchTrivia();
-    yield eat(m`sigilToken: <*Punctuator ':' />`);
-  }
-
-  @Node
-  @CoveredBy('NodeMatcher')
-  *BasicNodeMatcher() {
-    let open = yield eat(m`open: <OpenNodeMatcher />`);
-
-    const selfClosing = open.get('selfClosingToken');
-
-    if (selfClosing) {
-      yield eat(m`children[]$: []`);
-      yield eat(m`close: null`);
-    } else {
-      // TODO
-      yield* eatMatchTrivia();
-
-      yield eat(m`close: <CloseNodeMatcher />`);
-    }
-  }
-
-  @Node
-  *OpenNodeMatcher() {
-    yield eat(m`openToken: <*Punctuator '<' { balancedSpan: 'Tag', balanced: '>' } />`);
-    let flags = yield eat(m`flags: :CSTML: <NodeFlags />`);
-
-    if (yield eatMatch(m`type$: :CSTML: <Identifier /[a-zA-Z\u{80}-\u{10ffff}\u0060\g]/ />`)) {
-      // continue
-    } else if (!flags.get('fragmentToken')) {
-      if (yield eatMatch(m`type$: <*Punctuator '?' />`)) {
-        // continue
-      } else {
-        yield fail();
-      }
-    }
-
-    let sp = yield* eatMatchTrivia();
-
-    if (sp && !(yield match(re`/\/$/`)) && (yield eatMatch(m`literalValue$: <_StringMatcher />`))) {
-      sp = yield* eatMatchTrivia();
-    }
-
-    while (sp && (yield match('{'))) {
-      yield eat(m`attributes: :JSON: <Object />`);
-      sp = yield* eatMatchTrivia();
-    }
-
-    yield eatMatch(m`selfClosingToken: <*Punctuator '/' />`);
-    yield eat(m`closeToken: <*Punctuator '>' { balancer: true } />`);
-  }
-
-  @Node
-  @CoveredBy('Matcher')
-  *CloseNodeMatcher() {
-    yield eat(m`openToken: <*Punctuator '</' { balanced: '>' } />`);
-    yield eat(m`closeToken: <*Punctuator '>' { balancer: true } />`);
-  }
-
-  @CoveredBy('Matcher')
-  @CoveredBy('Expression')
-  *StringMatcher() {
-    if (yield match(re`/['"]/`)) {
-      yield eat(m`<String />`);
-    } else {
-      yield eat(m`<Regex />`);
-    }
-  }
-
-  @CoveredBy('StringMatcher')
-  @CoveredBy('Matcher')
-  @CoveredBy('Expression')
-  @Node
-  *String() {
-    yield eat(m`:JSON: <__String />`);
-  }
-
-  @CoveredBy('StringMatcher')
-  @CoveredBy('Matcher')
-  @CoveredBy('Expression')
-  @Node
-  *Regex() {
-    yield eat(m`:Regex: <__Pattern />`);
-  }
-
-  @InjectFrom(productions)
-  List() {}
-
-  @Literal
-  @Node
-  @InjectFrom(productions)
-  Punctuator() {}
-
-  @InjectFrom(productions)
-  Any() {}
-};