@bablr/language-en-cstml-json 0.5.5 → 0.6.1

package/lib/grammar.js

@@ -1,26 +1,23 @@
-import { spam as m, re } from '@bablr/boot';
-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 { m, eat, eatMatch, match, fail, startSpan, endSpan, o } from '@bablr/helpers/grammar';
+import { default as JSON } from '@bablr/language-en-json';
 import { printSource } from '@bablr/agast-helpers/tree';
-
-export const canonicalURL = 'https://bablr.org/languages/core/en/cstml-json';
-
-export const defaultMatcher = m`<_Expression />`;
+import { freezeClass } from '@bablr/agast-helpers/object';
 
 export function* eatMatchTrivia() {
   let trivia = null;
-  while (yield match(re`/[ \t\r\n]/`)) {
+  while (yield match(m`/[ \t\r\n]/`)) {
     trivia = yield eat(m`#: :Space: <_Blank />`);
   }
   return trivia;
 }
 
-export const grammar = class CSTMLJSONGrammar extends JSON.grammar {
+export default class CSTMLJSON extends JSON {
+  static canonicalURL = 'https://bablr.org/languages/core/en/cstml-json';
+
   *Expression(props) {
-    if (yield match('NaN')) {
+    if (yield match(m`'NaN'`)) {
       yield eat(m`<NotANumber />`);
-    } else if (yield match('undefined')) {
+    } else if (yield match(m`'undefined'`)) {
       yield eat(m`<Undefined />`);
     } else if (yield eatMatch(m`<Infinity /[+-]?Infinity/ />`)) {
     } else {
@@ -29,7 +26,7 @@ export const grammar = class CSTMLJSONGrammar extends JSON.grammar {
   }
 
   *String() {
-    let q = yield match(re`/['"]/`);
+    let q = yield match(m`/['"]/`);
 
     if (!q) yield fail();
 
@@ -44,7 +41,7 @@ export const grammar = class CSTMLJSONGrammar extends JSON.grammar {
   }
 
   *Property() {
-    if (yield match(re`/['"]/`)) {
+    if (yield match(m`/['"]/`)) {
       yield eatMatch(m`key$: <String />`);
     } else {
       yield eatMatch(m`key$: <Identifier />`);
@@ -57,16 +54,26 @@ export const grammar = class CSTMLJSONGrammar extends JSON.grammar {
   }
 
   *Identifier() {
-    yield eat(m`content*: <*IdentifierContent />`);
+    let q;
+    q = yield eatMatch(m`openToken*: <* '\u0060' />`);
+
+    yield eat(m`content*: <*IdentifierContent />`, o({ quoted: !!q }));
+    if (q) {
+      yield eat(m`closeToken*: <* '\u0060' />`);
+    }
   }
 
-  *IdentifierContent() {
+  *IdentifierContent({ props: { quoted = false } }) {
     let lit, esc;
     do {
-      if ((esc = yield match('\\'))) {
+      if ((esc = yield match(m`'\\'`))) {
         esc = yield eatMatch(m`@: <EscapeSequence />`);
       } else {
-        lit = yield eatMatch(re`/[a-zA-Z\u{80}-\u{10ffff}][a-zA-Z0-9_\u{80}-\u{10ffff}-]*/`);
+        if (!quoted) {
+          lit = yield eatMatch(m`/[a-zA-Z\u{80}-\u{10ffff}][a-zA-Z0-9_\u{80}-\u{10ffff}-]*/`);
+        } else {
+          lit = yield eatMatch(m`/[^\u0060\\\r\n]+/`);
+        }
       }
     } while (lit || esc);
   }
@@ -84,7 +91,7 @@ export const grammar = class CSTMLJSONGrammar extends JSON.grammar {
 
     let s = args.getState();
 
-    let { cooked } = s.node.value.attributes;
+    let { cooked } = s.getNode().value.attributes;
 
     if (cooked >= '\uD800' && cooked <= '\uDFFF') {
       throw new Error('unpaired surrogates are invalid in CSTML JSON');
@@ -95,6 +102,6 @@ export const grammar = class CSTMLJSONGrammar extends JSON.grammar {
     yield eatMatch(m`signToken*: <* /[+-]/ />`);
     yield eat(m`sigilToken*: <*Keyword 'Infinity' />`);
   }
-};
+}
 
-export default { canonicalURL, dependencies, grammar, defaultMatcher };
+freezeClass(CSTMLJSON);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-cstml-json",
-  "version": "0.5.5",
+  "version": "0.6.1",
   "description": "A BABLR language for CSTML-style JSON",
   "engines": {
     "node": ">=12.0.0"
@@ -18,21 +18,19 @@
     "test": "mocha"
   },
   "dependencies": {
-    "@bablr/agast-helpers": "0.10.10",
-    "@bablr/agast-vm-helpers": "0.10.5",
-    "@bablr/boot": "0.11.4",
-    "@bablr/helpers": "0.25.5",
-    "@bablr/language-en-json": "0.13.4"
+    "@bablr/agast-helpers": "0.11.4",
+    "@bablr/agast-vm-helpers": "0.11.4",
+    "@bablr/helpers": "0.26.5",
+    "@bablr/language-en-json": "0.14.1"
   },
   "devDependencies": {
-    "bablr": "^0.11.11",
-    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
+    "bablr": "^0.12.3",
+    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#23b94fb3bdfdbc3ac7ed9cb58d7979d8f07dce2b",
     "@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"