@bablr/language-en-json 0.10.0 → 0.11.0

package/lib/grammar.js

@@ -1,16 +1,16 @@
 /* @macrome
  * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#4b2e4ce356a3a29eb03d3816de446f8e8e0adfa1
+ * @generatedfrom ./grammar.macro.js#dd06bed2bba53b9dde1ae7cf33f8696edb684bd6
  * 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, _ExpressionDecs, _ArrayDecs, _ObjectDecs, _StringDecs, _NumberDecs, _InfinityDecs, _BooleanDecs, _NullDecs, _KeywordDecs, _PunctuatorDecs, _ListDecs, _AnyDecs, _AllDecs;
 import { re, spam as m } from '@bablr/boot';
-import { triviaEnhancer } from '@bablr/helpers/trivia';
+import { basicTriviaEnhancer } from '@bablr/helpers/trivia';
 import * as productions from '@bablr/helpers/productions';
-import { o, eat, eatMatch, match, fail } from '@bablr/helpers/grammar';
-import { buildString, buildIdentifier } from '@bablr/helpers/builders';
+import { o, eat, eatMatch, match, fail, defineAttribute } from '@bablr/helpers/grammar';
+import { buildString } from '@bablr/helpers/builders';
 import { Node, CoveredBy, AllowEmpty, InjectFrom, Literal } from '@bablr/helpers/decorators';
 import * as Space from '@bablr/language-en-blank-space';
 export const dependencies = {
@@ -30,32 +30,12 @@ const escapables = new Map(Object.entries({
 function first(iter) {
   for (let value of iter) return value;
 }
-export const getCooked = (escapeNode, span, ctx) => {
-  let cooked;
-  const codeNode = escapeNode.get('code');
-  if (first(codeNode.children)?.value.flags.token) {
-    const match_ = ctx.sourceTextFor(codeNode);
-    cooked = escapables.get(match_) || match_;
-  } else {
-    const type = ctx.sourceTextFor(codeNode.get('typeToken'));
-    const value = ctx.sourceTextFor(codeNode.get('value'));
-    if (!span.startsWith('String')) {
-      throw new Error('not implemented');
-    }
-    if (type === 'u') {
-      cooked = String.fromCharCode(parseInt(value, 16));
-    } else {
-      throw new Error();
-    }
-  }
-  return cooked.toString(10);
-};
-export const grammar = triviaEnhancer({
+export const grammar = basicTriviaEnhancer({
   triviaIsAllowed: s => s.span === 'Bare',
-  triviaMatcher: m`#: <*Space:Space /[ \n\r\t]/ />`
+  triviaMatcher: m`#: :Space: <*Space /[ \n\r\t]/ />`
 }, class JSONGrammar {
   static {
-    [_initProto] = _applyDecs(this, [[_ExpressionDecs, 2, "Expression"], [_ArrayDecs, 2, "Array"], [_ObjectDecs, 2, "Object"], [Node, 2, "Property"], [Node, 2, "Identifier"], [_StringDecs, 2, "String"], [[AllowEmpty, Node], 2, "StringContent"], [Node, 2, "EscapeSequence"], [Node, 2, "EscapeCode"], [_NumberDecs, 2, "Number"], [Node, 2, "Integer"], [Node, 2, "UnsignedInteger"], [Node, 2, "UnsignedHexInteger"], [_InfinityDecs, 2, "Infinity"], [_BooleanDecs, 2, "Boolean"], [_NullDecs, 2, "Null"], [_KeywordDecs, 2, "Keyword"], [_PunctuatorDecs, 2, "Punctuator"], [_ListDecs, 2, "List"], [_AnyDecs, 2, "Any"], [_AllDecs, 2, "All"]], []).e;
+    [_initProto] = _applyDecs(this, [[_ExpressionDecs, 2, "Expression"], [_ArrayDecs, 2, "Array"], [_ObjectDecs, 2, "Object"], [Node, 2, "Property"], [_StringDecs, 2, "String"], [[AllowEmpty, Node], 2, "StringContent"], [Node, 2, "EscapeSequence"], [Node, 2, "EscapeCode"], [_NumberDecs, 2, "Number"], [Node, 2, "Integer"], [Node, 2, "UnsignedInteger"], [Node, 2, "UnsignedHexInteger"], [_InfinityDecs, 2, "Infinity"], [_BooleanDecs, 2, "Boolean"], [_NullDecs, 2, "Null"], [_KeywordDecs, 2, "Keyword"], [_PunctuatorDecs, 2, "Punctuator"], [_ListDecs, 2, "List"], [_AnyDecs, 2, "Any"], [_AllDecs, 2, "All"]], []).e;
   }
   constructor() {
     _initProto(this);
@@ -95,22 +75,14 @@ export const grammar = triviaEnhancer({
     yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
   }
   *Property() {
-    yield eat(m`key$: <*Identifier />`);
+    yield eat(m`key$: <String />`);
     yield eat(m`sigilToken: <*Punctuator ':' />`);
     yield eat(m`value+$: <__Expression />`);
   }
-  *Identifier() {
-    yield eat(re`/[a-zA-Z][a-zA-Z_-]*/`);
-  }
-  *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' } />`);
+  *String() {
+    yield 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 } />`);
+    yield eat(m`closeToken: <*Punctuator '"' { balancer: true } />`);
   }
   *StringContent({
     state: {
@@ -134,14 +106,36 @@ export const grammar = triviaEnhancer({
     }
     yield eat(m`sigilToken: <*Punctuator '\\' { openSpan: 'Escape' } />`);
     let match_;
+    let cooked;
     if (match_ = span === 'String:Single' ? yield match(re`/[\\/nrt0']/`) : yield match(re`/[\\/nrt0"]/`)) {
       const matchText = ctx.sourceTextFor(match_);
       yield eat(m`code: <*Keyword ${buildString(matchText)} { closeSpan: 'Escape' } />`);
+      cooked = escapables.get(matchText) || matchText;
     } else if (yield match('u')) {
-      yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
+      let codeNode = yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
+      if (codeNode && first(codeNode.children)?.value.flags.token) {
+        const match_ = ctx.sourceTextFor(codeNode);
+      } else {
+        const type = ctx.sourceTextFor(codeNode.get('typeToken'));
+        if (type) {
+          const value = ctx.sourceTextFor(codeNode.get('value'));
+          if (!span.startsWith('String')) {
+            throw new Error('not implemented');
+          }
+          if (type === 'u') {
+            cooked = String.fromCharCode(parseInt(value, 16));
+          } else {
+            throw new Error();
+          }
+        } else {
+          let value = ctx.sourceTextFor(codeNode);
+          cooked = escapables.get(value) || value;
+        }
+      }
     } else {
       yield fail();
     }
+    yield defineAttribute('cooked', cooked);
   }
   *EscapeCode() {
     if (yield eatMatch(m`typeToken: <*Keyword 'u' />`)) {

package/lib/grammar.macro.js

@@ -1,8 +1,8 @@
 import { re, spam as m } from '@bablr/boot';
-import { triviaEnhancer } from '@bablr/helpers/trivia';
+import { basicTriviaEnhancer } from '@bablr/helpers/trivia';
 import * as productions from '@bablr/helpers/productions';
-import { o, eat, eatMatch, match, fail } from '@bablr/helpers/grammar';
-import { buildString, buildIdentifier } from '@bablr/helpers/builders';
+import { o, eat, eatMatch, match, fail, defineAttribute } from '@bablr/helpers/grammar';
+import { buildString } from '@bablr/helpers/builders';
 import { Node, CoveredBy, AllowEmpty, InjectFrom, Literal } from '@bablr/helpers/decorators';
 import * as Space from '@bablr/language-en-blank-space';
 
@@ -25,36 +25,10 @@ function first(iter) {
   for (let value of iter) return value;
 }
 
-export const getCooked = (escapeNode, span, ctx) => {
-  let cooked;
-  const codeNode = escapeNode.get('code');
-
-  if (first(codeNode.children)?.value.flags.token) {
-    const match_ = ctx.sourceTextFor(codeNode);
-
-    cooked = escapables.get(match_) || match_;
-  } else {
-    const type = ctx.sourceTextFor(codeNode.get('typeToken'));
-    const value = ctx.sourceTextFor(codeNode.get('value'));
-
-    if (!span.startsWith('String')) {
-      throw new Error('not implemented');
-    }
-
-    if (type === 'u') {
-      cooked = String.fromCharCode(parseInt(value, 16));
-    } else {
-      throw new Error();
-    }
-  }
-
-  return cooked.toString(10);
-};
-
-export const grammar = triviaEnhancer(
+export const grammar = basicTriviaEnhancer(
   {
     triviaIsAllowed: (s) => s.span === 'Bare',
-    triviaMatcher: m`#: <*Space:Space /[ \n\r\t]/ />`,
+    triviaMatcher: m`#: :Space: <*Space /[ \n\r\t]/ />`,
   },
   class JSONGrammar {
     *[Symbol.for('@bablr/fragment')]({ props: { rootMatcher } }) {
@@ -112,34 +86,19 @@ export const grammar = triviaEnhancer(
 
     @Node
     *Property() {
-      yield eat(m`key$: <*Identifier />`);
+      yield eat(m`key$: <String />`);
       yield eat(m`sigilToken: <*Punctuator ':' />`);
       yield eat(m`value+$: <__Expression />`);
     }
 
-    @Node
-    *Identifier() {
-      yield eat(re`/[a-zA-Z][a-zA-Z_-]*/`);
-    }
-
     @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' } />`);
+    *String() {
+      yield 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 } />`);
+      yield eat(m`closeToken: <*Punctuator '"' { balancer: true } />`);
     }
 
     @AllowEmpty
@@ -164,6 +123,7 @@ export const grammar = triviaEnhancer(
       yield eat(m`sigilToken: <*Punctuator '\\' { openSpan: 'Escape' } />`);
 
       let match_;
+      let cooked;
 
       if (
         (match_ =
@@ -171,11 +131,38 @@ export const grammar = triviaEnhancer(
       ) {
         const matchText = ctx.sourceTextFor(match_);
         yield eat(m`code: <*Keyword ${buildString(matchText)} { closeSpan: 'Escape' } />`);
+
+        cooked = escapables.get(matchText) || matchText;
       } else if (yield match('u')) {
-        yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
+        let codeNode = yield eat(m`code: <EscapeCode { closeSpan: 'Escape' } />`);
+
+        if (codeNode && first(codeNode.children)?.value.flags.token) {
+          const match_ = ctx.sourceTextFor(codeNode);
+        } else {
+          const type = ctx.sourceTextFor(codeNode.get('typeToken'));
+
+          if (type) {
+            const value = ctx.sourceTextFor(codeNode.get('value'));
+
+            if (!span.startsWith('String')) {
+              throw new Error('not implemented');
+            }
+
+            if (type === 'u') {
+              cooked = String.fromCharCode(parseInt(value, 16));
+            } else {
+              throw new Error();
+            }
+          } else {
+            let value = ctx.sourceTextFor(codeNode);
+            cooked = escapables.get(value) || value;
+          }
+        }
       } else {
         yield fail();
       }
+
+      yield defineAttribute('cooked', cooked);
     }
 
     @Node

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-json",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "A BABLR language for JSON",
   "engines": {
     "node": ">=12.0.0"
@@ -21,15 +21,15 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@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-blank-space": "0.7.0",
+    "@bablr/agast-helpers": "0.8.0",
+    "@bablr/agast-vm-helpers": "0.8.0",
+    "@bablr/boot": "0.9.0",
+    "@bablr/helpers": "0.23.0",
+    "@bablr/language-en-blank-space": "0.8.0",
     "@babel/runtime": "^7.22.15"
   },
   "devDependencies": {
-    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
+    "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#c97bfa4b3663f8378e9b3e42bb5a41e685406cf9",
     "@bablr/macrome": "^0.1.3",
     "@bablr/macrome-generator-bablr": "^0.3.2",
     "@qnighy/dedent": "0.1.1",