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

package/lib/grammar.js

@@ -1,50 +1,122 @@
 /* @macrome
  * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#9ffcbbc77664d07e4bf9c4a31213ed360b26c007
+ * @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, _NotANumberDecs, _UndefinedDecs;
-import { re, spam as m } from '@bablr/boot';
-import { extendLanguage, o, eat, match } from '@bablr/helpers/grammar';
-import { CoveredBy, Node, InjectFrom } from '@bablr/helpers/decorators';
+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 * as productions from '@bablr/helpers/productions';
 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 getCooked = (escapeNode, span, ctx) => {
-  let cooked = JSON.getCooked(escapeNode, span, ctx);
-  if (cooked >= '\uD800' && cooked <= '\uDFFF') {
-    throw new Error('unpaired surrogates are invalid in CSTML JSON');
-  }
-  return cooked;
-};
-export const grammar = class BABLRVMInstructionGrammar extends (_JSON$grammar = JSON.grammar) {
+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, [[_NotANumberDecs, 2, "NotANumber"], [_UndefinedDecs, 2, "Undefined"]], [], 0, void 0, _JSON$grammar).e;
+    [_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;
   }
   constructor(...args) {
     super(...args);
     _initProto(this);
   }
-  *[(_NotANumberDecs = [CoveredBy('Expression'), Node], _UndefinedDecs = [CoveredBy('Expression'), Node], "Expression")](props) {
+  *[(_StringDecs = [CoveredBy('Expression'), Node], _NotANumberDecs = [CoveredBy('Expression'), Node], _UndefinedDecs = [CoveredBy('Expression'), Node], _InfinityDecs = [CoveredBy('Expression'), Node], "Expression")](props) {
     if (yield match('NaN')) {
       yield eat(m`<NotANumber />`);
     } else if (yield match('undefined')) {
       yield eat(m`<Undefined />`);
-    } else {
+    } else if (yield eatMatch(m`<Infinity /[+-]?Infinity/ />`)) {} else {
       yield* super.Expression(props);
     }
   }
+  *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 } />`);
+  }
+  *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 />`);
+  }
+  *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`);
+    }
+  }
+  *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);
+  }
   *NotANumber() {
     yield eat(m`sigilToken: <*Keyword 'NaN' />`);
   }
   *Undefined() {
     yield eat(m`sigilToken: <*Keyword 'undefined' />`);
   }
-};
+  *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');
+    }
+  }
+  *Infinity() {
+    yield eatMatch(m`signToken: <*Punctuator /[+-]/ />`, null, o({
+      bind: true
+    }));
+    yield eat(m`sigilToken: <*Keyword 'Infinity' />`);
+  }
+});

package/lib/grammar.macro.js

@@ -1,44 +1,136 @@
-import { re, spam as m } from '@bablr/boot';
-import { extendLanguage, o, eat, match } from '@bablr/helpers/grammar';
-import { CoveredBy, Node, InjectFrom } from '@bablr/helpers/decorators';
+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 * as productions from '@bablr/helpers/productions';
 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 getCooked = (escapeNode, span, ctx) => {
-  let cooked = JSON.getCooked(escapeNode, span, ctx);
-
-  if (cooked >= '\uD800' && cooked <= '\uDFFF') {
-    throw new Error('unpaired surrogates are invalid in CSTML JSON');
-  }
-
-  return cooked;
-};
-
-export const grammar = class BABLRVMInstructionGrammar extends JSON.grammar {
-  *Expression(props) {
-    if (yield match('NaN')) {
-      yield eat(m`<NotANumber />`);
-    } else if (yield match('undefined')) {
-      yield eat(m`<Undefined />`);
-    } else {
-      yield* super.Expression(props);
-    }
-  }
-
-  @CoveredBy('Expression')
-  @Node
-  *NotANumber() {
-    yield eat(m`sigilToken: <*Keyword 'NaN' />`);
-  }
-
-  @CoveredBy('Expression')
-  @Node
-  *Undefined() {
-    yield eat(m`sigilToken: <*Keyword 'undefined' />`);
-  }
-};
+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' />`);
+    }
+  },
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-cstml-json",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "A BABLR language for CSTML-style JSON",
   "engines": {
     "node": ">=12.0.0"
@@ -17,32 +17,37 @@
   "scripts": {
     "build": "macrome build",
     "watch": "macrome watch",
-    "clean": "macrome clean"
+    "clean": "macrome clean",
+    "test": "mocha"
   },
   "dependencies": {
-    "@babel/runtime": "^7.22.15",
-    "@bablr/agast-helpers": "0.7.1",
-    "@bablr/agast-vm-helpers": "0.7.1",
-    "@bablr/boot": "0.8.1",
-    "@bablr/helpers": "0.22.1",
-    "@bablr/language-en-json": "0.10.0"
+    "@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"
   },
   "devDependencies": {
+    "bablr": "^0.10.0",
     "@bablr/macrome": "^0.1.3",
     "@bablr/macrome-generator-bablr": "^0.3.2",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
+    "@qnighy/dedent": "0.1.1",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^8.47.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",
     "eslint-plugin-import": "^2.27.5",
+    "iter-tools-es": "^7.5.3",
+    "mocha": "10.4.0",
+    "expect": "29.7.0",
     "prettier": "^2.0.5"
   },
   "keywords": [
     "bablr-language",
     "grammar",
     "english",
-    "comment",
-    "c"
+    "json"
   ],
   "repository": "git@github.com:bablr-lang/language-en-cstml-json.git",
   "homepage": "https://github.com/bablr-lang/language-en-cstml-json",