@bablr/language-en-cstml-json 0.4.0 → 0.5.0

package/lib/grammar.js

@@ -1,122 +1,100 @@
-/* @macrome
- * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#a9659e5fbbb99478498fa677705cdb98fb38dd6c
- * 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";
-var _JSON$grammar;
-let _initProto, _StringDecs, _NotANumberDecs, _UndefinedDecs, _InfinityDecs;
 import { spam as m, re } from '@bablr/boot';
-import { o, eat, eatMatch, match, fail } from '@bablr/helpers/grammar';
-import { CoveredBy, Node } from '@bablr/helpers/decorators';
-import * as JSON from '@bablr/language-en-json';
+import { o, eat, eatMatch, match, fail, startSpan, endSpan } from '@bablr/helpers/grammar';
+import { default as JSON, dependencies } from '@bablr/language-en-json';
 import { buildString } from '@bablr/helpers/builders';
-import { basicTriviaEnhancer } from '@bablr/helpers/trivia';
+import { printSource } from '@bablr/agast-helpers/tree';
+
 export const canonicalURL = 'https://bablr.org/languages/core/en/cstml-json';
-export const {
-  dependencies
-} = JSON;
+
 export const defaultMatcher = m`<_Expression />`;
-export const grammar = basicTriviaEnhancer({
-  triviaIsAllowed: s => s.span === 'Bare',
-  triviaMatcher: m`#: :Space: <__Blank /[ \n\r\t]/ />`
-}, class CSTMLJSONGrammar extends (_JSON$grammar = JSON.grammar) {
-  static {
-    [_initProto] = _applyDecs(this, [[_StringDecs, 2, "String"], [Node, 2, "Property"], [Node, 2, "Identifier"], [Node, 2, "IdentifierContent"], [_NotANumberDecs, 2, "NotANumber"], [_UndefinedDecs, 2, "Undefined"], [Node, 2, "EscapeSequence"], [_InfinityDecs, 2, "Infinity"]], [], 0, void 0, _JSON$grammar).e;
+
+export function* eatMatchTrivia() {
+  let trivia = null;
+  while (yield match(re`/[ \t\r\n]/`)) {
+    trivia = yield eat(m`#: :Space: <_Blank />`);
   }
-  constructor(...args) {
-    super(...args);
-    _initProto(this);
-  }
-  *[(_StringDecs = [CoveredBy('Expression'), Node], _NotANumberDecs = [CoveredBy('Expression'), Node], _UndefinedDecs = [CoveredBy('Expression'), Node], _InfinityDecs = [CoveredBy('Expression'), Node], "Expression")](props) {
+  return trivia;
+}
+
+export const grammar = class CSTMLJSONGrammar extends JSON.grammar {
+  *Expression(props) {
     if (yield match('NaN')) {
       yield eat(m`<NotANumber />`);
     } else if (yield match('undefined')) {
       yield eat(m`<Undefined />`);
-    } else if (yield eatMatch(m`<Infinity /[+-]?Infinity/ />`)) {} else {
+    } else if (yield eatMatch(m`<Infinity /[+-]?Infinity/ />`)) {
+    } else {
       yield* super.Expression(props);
     }
   }
-  *String({
-    ctx
-  }) {
+
+  *String() {
     let q = yield match(re`/['"]/`);
+
     if (!q) yield fail();
-    const q_ = ctx.sourceTextFor(q);
-    yield q_ === "'" ? eat(m`openToken: <*Punctuator "'" { balanced: "'", balancedSpan: 'String:Single' } />`) : eat(m`openToken: <*Punctuator '"' { balanced: '"', balancedSpan: 'String:Double' } />`);
+
+    const q_ = printSource(q);
+
+    yield q_ === "'" ? eat(m`openToken*: <* "'" />`) : eat(m`openToken*: <* '"' />`);
+    let span = q_ === "'" ? 'String:Single' : 'String:Double';
+    yield startSpan(span, q_);
     yield eat(m`content$: <*StringContent />`);
-    yield q_ === "'" ? eat(m`closeToken: <*Punctuator "'" { balancer: true } />`) : eat(m`closeToken: <*Punctuator '"' { balancer: true } />`);
+    yield endSpan();
+    yield q_ === "'" ? eat(m`closeToken*: <* "'" />`) : eat(m`closeToken*: <* '"' />`);
   }
+
   *Property() {
     if (yield match(re`/['"]/`)) {
       yield eatMatch(m`key$: <String />`);
     } else {
       yield eatMatch(m`key$: <Identifier />`);
     }
-    yield eat(m`sigilToken: <*Punctuator ':' />`);
+
+    yield* eatMatchTrivia();
+    yield eat(m`sigilToken*: <* ':' />`);
+    yield* eatMatchTrivia();
     yield eat(m`value+$: <_Expression />`);
   }
-  *Identifier({
-    ctx
-  }) {
-    let q;
-    let pn = ctx.sourceTextFor(yield match(re`/["']/`));
-    if (pn) {
-      q = yield eatMatch(m`openToken: <*Punctuator ${buildString(pn)} { balanced: ${buildString(pn)} } />`, o({}), o({
-        bind: true
-      }));
-    } else {
-      q = yield eat(m`openToken: null`);
-    }
-    yield eat(m`content: <*IdentifierContent { span: 'Identifier' } />`, o({
-      quoted: !!q
-    }));
-    if (q) {
-      yield eat(m`closeToken: <*Punctuator ${buildString(pn)} { balancer: true } />`, o({}), o({
-        bind: true
-      }));
-    } else {
-      yield eat(m`closeToken: null`);
-    }
+
+  *Identifier() {
+    yield eat(m`content*: <*IdentifierContent />`);
   }
-  *IdentifierContent({
-    props: {
-      quoted = false
-    }
-  }) {
+
+  *IdentifierContent() {
     let lit, esc;
     do {
-      if (esc = yield match('\\')) {
+      if ((esc = yield match('\\'))) {
         esc = yield eatMatch(m`@: <EscapeSequence />`);
       } else {
-        if (!quoted) {
-          lit = yield eatMatch(re`/[a-zA-Z\u{80}-\u{10ffff}][a-zA-Z0-9_\u{80}-\u{10ffff}-]*/`);
-        } else {
-          lit = yield eatMatch(re`/[^\u0060\r\n]+/`);
-        }
+        lit = yield eatMatch(re`/[a-zA-Z\u{80}-\u{10ffff}][a-zA-Z0-9_\u{80}-\u{10ffff}-]*/`);
       }
     } while (lit || esc);
   }
+
   *NotANumber() {
-    yield eat(m`sigilToken: <*Keyword 'NaN' />`);
+    yield eat(m`sigilToken*: <*Keyword 'NaN' />`);
   }
+
   *Undefined() {
-    yield eat(m`sigilToken: <*Keyword 'undefined' />`);
+    yield eat(m`sigilToken*: <*Keyword 'undefined' />`);
   }
+
   *EscapeSequence(args) {
     yield* super.EscapeSequence(args);
-    let {
-      cooked
-    } = args.s.node.attributes;
+
+    let s = args.getState();
+
+    let { cooked } = s.node.value.attributes;
+
     if (cooked >= '\uD800' && cooked <= '\uDFFF') {
       throw new Error('unpaired surrogates are invalid in CSTML JSON');
     }
   }
+
   *Infinity() {
-    yield eatMatch(m`signToken: <*Punctuator /[+-]/ />`, null, o({
-      bind: true
-    }));
-    yield eat(m`sigilToken: <*Keyword 'Infinity' />`);
+    yield eatMatch(m`signToken*: <* /[+-]/ />`);
+    yield eat(m`sigilToken*: <*Keyword 'Infinity' />`);
   }
-});
+};
+
+export default { canonicalURL, dependencies, grammar, defaultMatcher };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-cstml-json",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "A BABLR language for CSTML-style JSON",
   "engines": {
     "node": ">=12.0.0"
@@ -15,23 +15,17 @@
   ],
   "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-json": "0.12.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-json": "0.13.0"
   },
   "devDependencies": {
-    "bablr": "^0.10.0",
-    "@bablr/macrome": "^0.1.3",
-    "@bablr/macrome-generator-bablr": "^0.3.2",
+    "bablr": "^0.11.0",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
     "@qnighy/dedent": "0.1.1",
     "enhanced-resolve": "^5.12.0",
@@ -49,7 +43,10 @@
     "english",
     "json"
   ],
-  "repository": "git@github.com:bablr-lang/language-en-cstml-json.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/bablr-lang/language-en-cstml-json.git"
+  },
   "homepage": "https://github.com/bablr-lang/language-en-cstml-json",
   "author": "Conrad Buck <conartist6@gmail.com>",
   "license": "MIT"

package/lib/grammar.macro.js

@@ -1,136 +0,0 @@
-import { spam as m, re } from '@bablr/boot';
-import { o, eat, eatMatch, match, fail } from '@bablr/helpers/grammar';
-import { CoveredBy, Node } from '@bablr/helpers/decorators';
-import * as JSON from '@bablr/language-en-json';
-import { buildString } from '@bablr/helpers/builders';
-import { basicTriviaEnhancer } from '@bablr/helpers/trivia';
-
-export const canonicalURL = 'https://bablr.org/languages/core/en/cstml-json';
-
-export const { dependencies } = JSON;
-
-export const defaultMatcher = m`<_Expression />`;
-
-export const grammar = basicTriviaEnhancer(
-  {
-    triviaIsAllowed: (s) => s.span === 'Bare',
-    triviaMatcher: m`#: :Space: <__Blank /[ \n\r\t]/ />`,
-  },
-
-  class CSTMLJSONGrammar extends JSON.grammar {
-    *Expression(props) {
-      if (yield match('NaN')) {
-        yield eat(m`<NotANumber />`);
-      } else if (yield match('undefined')) {
-        yield eat(m`<Undefined />`);
-      } else if (yield eatMatch(m`<Infinity /[+-]?Infinity/ />`)) {
-      } else {
-        yield* super.Expression(props);
-      }
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *String({ ctx }) {
-      let q = yield match(re`/['"]/`);
-
-      if (!q) yield fail();
-
-      const q_ = ctx.sourceTextFor(q);
-
-      yield q_ === "'"
-        ? eat(m`openToken: <*Punctuator "'" { balanced: "'", balancedSpan: 'String:Single' } />`)
-        : eat(m`openToken: <*Punctuator '"' { balanced: '"', balancedSpan: 'String:Double' } />`);
-
-      yield eat(m`content$: <*StringContent />`);
-
-      yield q_ === "'"
-        ? eat(m`closeToken: <*Punctuator "'" { balancer: true } />`)
-        : eat(m`closeToken: <*Punctuator '"' { balancer: true } />`);
-    }
-
-    @Node
-    *Property() {
-      if (yield match(re`/['"]/`)) {
-        yield eatMatch(m`key$: <String />`);
-      } else {
-        yield eatMatch(m`key$: <Identifier />`);
-      }
-      yield eat(m`sigilToken: <*Punctuator ':' />`);
-      yield eat(m`value+$: <_Expression />`);
-    }
-
-    @Node
-    *Identifier({ ctx }) {
-      let q;
-      let pn = ctx.sourceTextFor(yield match(re`/["']/`));
-
-      if (pn) {
-        q = yield eatMatch(
-          m`openToken: <*Punctuator ${buildString(pn)} { balanced: ${buildString(pn)} } />`,
-          o({}),
-          o({ bind: true }),
-        );
-      } else {
-        q = yield eat(m`openToken: null`);
-      }
-
-      yield eat(m`content: <*IdentifierContent { span: 'Identifier' } />`, o({ quoted: !!q }));
-      if (q) {
-        yield eat(
-          m`closeToken: <*Punctuator ${buildString(pn)} { balancer: true } />`,
-          o({}),
-          o({ bind: true }),
-        );
-      } else {
-        yield eat(m`closeToken: null`);
-      }
-    }
-
-    @Node
-    *IdentifierContent({ props: { quoted = false } }) {
-      let lit, esc;
-      do {
-        if ((esc = yield match('\\'))) {
-          esc = yield eatMatch(m`@: <EscapeSequence />`);
-        } else {
-          if (!quoted) {
-            lit = yield eatMatch(re`/[a-zA-Z\u{80}-\u{10ffff}][a-zA-Z0-9_\u{80}-\u{10ffff}-]*/`);
-          } else {
-            lit = yield eatMatch(re`/[^\u0060\r\n]+/`);
-          }
-        }
-      } while (lit || esc);
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *NotANumber() {
-      yield eat(m`sigilToken: <*Keyword 'NaN' />`);
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *Undefined() {
-      yield eat(m`sigilToken: <*Keyword 'undefined' />`);
-    }
-
-    @Node
-    *EscapeSequence(args) {
-      yield* super.EscapeSequence(args);
-
-      let { cooked } = args.s.node.attributes;
-
-      if (cooked >= '\uD800' && cooked <= '\uDFFF') {
-        throw new Error('unpaired surrogates are invalid in CSTML JSON');
-      }
-    }
-
-    @CoveredBy('Expression')
-    @Node
-    *Infinity() {
-      yield eatMatch(m`signToken: <*Punctuator /[+-]/ />`, null, o({ bind: true }));
-      yield eat(m`sigilToken: <*Keyword 'Infinity' />`);
-    }
-  },
-);