@bablr/language-en-json 0.9.0 → 0.11.0

package/lib/grammar.js

@@ -1,19 +1,18 @@
 /* @macrome
  * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#ba23af5f0d351c04f7e57efff1bd6d2d74cbffe3
+ * @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, _NumberDecs, _InfinityDecs, _BooleanDecs, _NullDecs, _KeywordDecs, _PunctuatorDecs, _ListDecs, _AnyDecs, _AllDecs;
+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 { Node, CoveredBy, AllowEmpty, InjectFrom } from '@bablr/helpers/decorators';
+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';
-import { getEmbeddedObject } from '@bablr/agast-vm-helpers/deembed';
 export const dependencies = {
   Space
 };
@@ -31,53 +30,31 @@ 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 = parseInt(value, 16);
-    } else {
-      throw new Error();
-    }
-  }
-  return cooked.toString(10);
-};
-export const grammar = triviaEnhancer({
+export const grammar = basicTriviaEnhancer({
   triviaIsAllowed: s => s.span === 'Bare',
-  *eatMatchTrivia() {
-    if (yield match(re`/[ \n\r\t]/`)) {
-      yield eat(m`#: <*Space:Space />`);
-    }
-  }
+  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"], [Node, 2, "String"], [[AllowEmpty, Node], 2, "StringContent"], [Node, 2, "EscapeSequence"], [Node, 2, "EscapeCode"], [_NumberDecs, 2, "Number"], [Node, 2, "Integer"], [Node, 2, "UnsignedInteger"], [_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);
   }
-  *[(_ExpressionDecs = CoveredBy('Element'), _ArrayDecs = [CoveredBy('Expression'), Node], _ObjectDecs = [CoveredBy('Expression'), Node], _NumberDecs = [CoveredBy('Expression'), Node], _InfinityDecs = [CoveredBy('Expression'), Node], _BooleanDecs = [CoveredBy('Expression'), Node], _NullDecs = [CoveredBy('Expression'), Node], _KeywordDecs = [Node, InjectFrom(productions)], _PunctuatorDecs = [Node, InjectFrom(productions)], _ListDecs = [AllowEmpty, InjectFrom(productions)], _AnyDecs = InjectFrom(productions), _AllDecs = InjectFrom(productions), Symbol.for('@bablr/fragment'))]({
-    value
+  *[(_ExpressionDecs = CoveredBy('Element'), _ArrayDecs = [CoveredBy('Expression'), Node], _ObjectDecs = [CoveredBy('Expression'), Node], _StringDecs = [CoveredBy('Expression'), Node], _NumberDecs = [CoveredBy('Expression'), Node], _InfinityDecs = [CoveredBy('Expression'), Node], _BooleanDecs = [CoveredBy('Expression'), Node], _NullDecs = [CoveredBy('Expression'), Node], _KeywordDecs = [Literal, Node, InjectFrom(productions)], _PunctuatorDecs = [Literal, Node, InjectFrom(productions)], _ListDecs = [AllowEmpty, InjectFrom(productions)], _AnyDecs = InjectFrom(productions), _AllDecs = InjectFrom(productions), Symbol.for('@bablr/fragment'))]({
+    props: {
+      rootMatcher
+    }
   }) {
     // needed for the trivia plugin
-    yield eat(m`<${buildIdentifier(value.productionName)} />`);
+    yield eat(rootMatcher);
   }
   *Expression() {
-    yield eat(m`<Any />`, [m`<Array '[' />`, m`<Object '{' />`, m`<String /['"]/ />`, m`<Number /-?\d/ {span: 'Number'} />`, m`<Infinity 'Infinity' />`, m`<Null 'null' />`, m`<Boolean /true|false/ />`]);
+    yield eat(m`<_Any />`, [m`<Array '[' />`, m`<Object '{' />`, m`<String /['"]/ />`, m`<Number /\d|-[\d\g]/ {span: 'Number'} />`, m`<Infinity /-?Infinity/ />`, m`<Null 'null' />`, m`<Boolean /true|false/ />`]);
   }
   *Array() {
     yield eat(m`openToken: <*Punctuator '[' { balanced: ']' } />`);
-    yield eat(m`<List />`, o({
-      element: m`elements[]$: <Expression />`,
+    yield eat(m`<_List />`, o({
+      element: m`elements[]+$: <__Expression />`,
       separator: m`separatorTokens[]: <*Punctuator ',' />`,
       allowTrailingSeparator: false
     }));
@@ -89,7 +66,7 @@ export const grammar = triviaEnhancer({
     yield eatMatch(m`separatorTokens[]: []`);
     yield eatMatch(m`properties[]$: []`);
     while (sep && (yield match(re`/.|\g/s`))) {
-      let suppressGap = !!(yield match(m`<All />`, [m`key: <//>`, m`sigilToken: <*Punctuator ':' />`]));
+      let suppressGap = !!(yield match(m`<_All />`, [m`key: <//>`, m`sigilToken: <*Punctuator ':' />`]));
       yield eat(m`properties[]$: <Property />`, null, o({
         suppressGap
       }));
@@ -98,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_-]*/`);
+    yield eat(m`value+$: <__Expression />`);
   }
-  *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: {
@@ -137,22 +106,46 @@ 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' />`)) {
-      if (yield eatMatch(m`openToken: <*Punctuator '{' { balanced: '}' } />`)) {
-        yield eat(m`value$: <*UnsignedInteger />`);
+      if (yield eatMatch(m`openToken: <*Punctuator '{' { balanced: '}' } />`, null, o({
+        bind: true
+      }))) {
+        yield eat(m`value$: <*UnsignedHexInteger />`);
         yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
       } else {
-        yield eat(m`value$: <*UnsignedInteger /\d{4}/ />`);
+        yield eat(m`value$: <*UnsignedHexInteger /[\da-fA-F]{4}/ />`);
         yield eat(m`closeToken: null`);
       }
     }
@@ -162,13 +155,17 @@ export const grammar = triviaEnhancer({
       noDoubleZero: true,
       matchSign: '-'
     }));
-    let fs = yield eatMatch(m`fractionalSeparatorToken: <*Punctuator '.' />`);
+    let fs = yield eatMatch(m`fractionalSeparatorToken: <*Punctuator '.' />`, null, o({
+      bind: true
+    }));
     if (fs) {
-      yield eat(m`fractionalPart$: <Integer />`);
+      yield eat(m`fractionalPart$: <*UnsignedInteger />`);
     } else {
       yield eat(m`fractionalPart$: null`);
     }
-    let es = yield eatMatch(m`exponentSeparatorToken: <*Punctuator /[eE]/ />`);
+    let es = yield eatMatch(m`exponentSeparatorToken: <*Punctuator /[eE]/ />`, null, o({
+      bind: true
+    }));
     if (es) {
       yield eat(m`exponentPart$: <Integer />`, {
         matchSign: /[+-]/
@@ -178,14 +175,15 @@ export const grammar = triviaEnhancer({
     }
   }
   *Integer({
-    value: props
-  }) {
-    const {
+    props: {
       matchSign = null,
       noDoubleZero = false
-    } = props ? getEmbeddedObject(props) : {};
+    }
+  }) {
     if (matchSign) {
-      yield eatMatch(m`signToken: <*Punctuator ${buildString(matchSign)} />`);
+      yield eatMatch(m`signToken: <*Punctuator ${buildString(matchSign)} />`, null, o({
+        bind: true
+      }));
     } else {
       yield eat(m`signToken: null`);
     }
@@ -194,19 +192,23 @@ export const grammar = triviaEnhancer({
     }));
   }
   *UnsignedInteger({
-    value: props,
+    props: {
+      noDoubleZero = false
+    },
     ctx
   }) {
-    const {
-      noDoubleZero = false
-    } = props || {};
     let firstDigit = ctx.sourceTextFor(yield eat(re`/\d/`));
     if (!noDoubleZero || firstDigit.value !== '0') {
       yield eatMatch(re`/\d+/`);
     }
   }
+  *UnsignedHexInteger() {
+    yield eatMatch(re`/[\da-fA-F]+/`);
+  }
   *Infinity() {
-    yield eatMatch(m`signToken: <*Punctuator '-' />`);
+    yield eatMatch(m`signToken: <*Punctuator '-' />`, null, o({
+      bind: true
+    }));
     yield eat(m`sigilToken: <*Keyword 'Infinity' />`);
   }
   *Boolean() {
@@ -220,15 +222,4 @@ export const grammar = triviaEnhancer({
   *List() {}
   *Any() {}
   *All() {}
-});
-export const YJSON = self => {
-  return {
-    dependencies: {
-      ...dependencies,
-      Y: self
-    },
-    canonicalURL,
-    getCooked,
-    grammar
-  };
-};
+});

package/lib/grammar.macro.js

@@ -1,11 +1,10 @@
 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 { Node, CoveredBy, AllowEmpty, InjectFrom } from '@bablr/helpers/decorators';
+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';
-import { getEmbeddedObject } from '@bablr/agast-vm-helpers/deembed';
 
 export const dependencies = { Space };
 
@@ -26,55 +25,25 @@ 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 = parseInt(value, 16);
-    } else {
-      throw new Error();
-    }
-  }
-
-  return cooked.toString(10);
-};
-
-export const grammar = triviaEnhancer(
+export const grammar = basicTriviaEnhancer(
   {
     triviaIsAllowed: (s) => s.span === 'Bare',
-    *eatMatchTrivia() {
-      if (yield match(re`/[ \n\r\t]/`)) {
-        yield eat(m`#: <*Space:Space />`);
-      }
-    },
+    triviaMatcher: m`#: :Space: <*Space /[ \n\r\t]/ />`,
   },
   class JSONGrammar {
-    *[Symbol.for('@bablr/fragment')]({ value }) {
+    *[Symbol.for('@bablr/fragment')]({ props: { rootMatcher } }) {
       // needed for the trivia plugin
-      yield eat(m`<${buildIdentifier(value.productionName)} />`);
+      yield eat(rootMatcher);
     }
 
     @CoveredBy('Element')
     *Expression() {
-      yield eat(m`<Any />`, [
+      yield eat(m`<_Any />`, [
         m`<Array '[' />`,
         m`<Object '{' />`,
         m`<String /['"]/ />`,
-        m`<Number /-?\d/ {span: 'Number'} />`,
-        m`<Infinity 'Infinity' />`,
+        m`<Number /\d|-[\d\g]/ {span: 'Number'} />`,
+        m`<Infinity /-?Infinity/ />`,
         m`<Null 'null' />`,
         m`<Boolean /true|false/ />`,
       ]);
@@ -85,9 +54,9 @@ export const grammar = triviaEnhancer(
     *Array() {
       yield eat(m`openToken: <*Punctuator '[' { balanced: ']' } />`);
       yield eat(
-        m`<List />`,
+        m`<_List />`,
         o({
-          element: m`elements[]$: <Expression />`,
+          element: m`elements[]+$: <__Expression />`,
           separator: m`separatorTokens[]: <*Punctuator ',' />`,
           allowTrailingSeparator: false,
         }),
@@ -105,7 +74,7 @@ export const grammar = triviaEnhancer(
       yield eatMatch(m`properties[]$: []`);
 
       while (sep && (yield match(re`/.|\g/s`))) {
-        let suppressGap = !!(yield match(m`<All />`, [
+        let suppressGap = !!(yield match(m`<_All />`, [
           m`key: <//>`,
           m`sigilToken: <*Punctuator ':' />`,
         ]));
@@ -117,33 +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_-]*/`);
+      yield eat(m`value+$: <__Expression />`);
     }
 
+    @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
@@ -168,6 +123,7 @@ export const grammar = triviaEnhancer(
       yield eat(m`sigilToken: <*Punctuator '\\' { openSpan: 'Escape' } />`);
 
       let match_;
+      let cooked;
 
       if (
         (match_ =
@@ -175,21 +131,54 @@ 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
     *EscapeCode() {
       if (yield eatMatch(m`typeToken: <*Keyword 'u' />`)) {
-        if (yield eatMatch(m`openToken: <*Punctuator '{' { balanced: '}' } />`)) {
-          yield eat(m`value$: <*UnsignedInteger />`);
+        if (
+          yield eatMatch(
+            m`openToken: <*Punctuator '{' { balanced: '}' } />`,
+            null,
+            o({ bind: true }),
+          )
+        ) {
+          yield eat(m`value$: <*UnsignedHexInteger />`);
           yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
         } else {
-          yield eat(m`value$: <*UnsignedInteger /\d{4}/ />`);
+          yield eat(m`value$: <*UnsignedHexInteger /[\da-fA-F]{4}/ />`);
           yield eat(m`closeToken: null`);
         }
       }
@@ -200,15 +189,23 @@ export const grammar = triviaEnhancer(
     *Number() {
       yield eat(m`wholePart$: <Integer />`, o({ noDoubleZero: true, matchSign: '-' }));
 
-      let fs = yield eatMatch(m`fractionalSeparatorToken: <*Punctuator '.' />`);
+      let fs = yield eatMatch(
+        m`fractionalSeparatorToken: <*Punctuator '.' />`,
+        null,
+        o({ bind: true }),
+      );
 
       if (fs) {
-        yield eat(m`fractionalPart$: <Integer />`);
+        yield eat(m`fractionalPart$: <*UnsignedInteger />`);
       } else {
         yield eat(m`fractionalPart$: null`);
       }
 
-      let es = yield eatMatch(m`exponentSeparatorToken: <*Punctuator /[eE]/ />`);
+      let es = yield eatMatch(
+        m`exponentSeparatorToken: <*Punctuator /[eE]/ />`,
+        null,
+        o({ bind: true }),
+      );
 
       if (es) {
         yield eat(m`exponentPart$: <Integer />`, { matchSign: /[+-]/ });
@@ -218,11 +215,13 @@ export const grammar = triviaEnhancer(
     }
 
     @Node
-    *Integer({ value: props }) {
-      const { matchSign = null, noDoubleZero = false } = props ? getEmbeddedObject(props) : {};
-
+    *Integer({ props: { matchSign = null, noDoubleZero = false } }) {
       if (matchSign) {
-        yield eatMatch(m`signToken: <*Punctuator ${buildString(matchSign)} />`);
+        yield eatMatch(
+          m`signToken: <*Punctuator ${buildString(matchSign)} />`,
+          null,
+          o({ bind: true }),
+        );
       } else {
         yield eat(m`signToken: null`);
       }
@@ -231,9 +230,7 @@ export const grammar = triviaEnhancer(
     }
 
     @Node
-    *UnsignedInteger({ value: props, ctx }) {
-      const { noDoubleZero = false } = props || {};
-
+    *UnsignedInteger({ props: { noDoubleZero = false }, ctx }) {
       let firstDigit = ctx.sourceTextFor(yield eat(re`/\d/`));
 
       if (!noDoubleZero || firstDigit.value !== '0') {
@@ -241,10 +238,15 @@ export const grammar = triviaEnhancer(
       }
     }
 
+    @Node
+    *UnsignedHexInteger() {
+      yield eatMatch(re`/[\da-fA-F]+/`);
+    }
+
     @CoveredBy('Expression')
     @Node
     *Infinity() {
-      yield eatMatch(m`signToken: <*Punctuator '-' />`);
+      yield eatMatch(m`signToken: <*Punctuator '-' />`, null, o({ bind: true }));
       yield eat(m`sigilToken: <*Keyword 'Infinity' />`);
     }
 
@@ -260,10 +262,12 @@ export const grammar = triviaEnhancer(
       yield eat(m`sigilToken: <*Keyword 'null' />`);
     }
 
+    @Literal
     @Node
     @InjectFrom(productions)
     *Keyword() {}
 
+    @Literal
     @Node
     @InjectFrom(productions)
     *Punctuator() {}
@@ -279,15 +283,3 @@ export const grammar = triviaEnhancer(
     *All() {}
   },
 );
-
-export const YJSON = (self) => {
-  return {
-    dependencies: {
-      ...dependencies,
-      Y: self,
-    },
-    canonicalURL,
-    getCooked,
-    grammar,
-  };
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-json",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "A BABLR language for JSON",
   "engines": {
     "node": ">=12.0.0"
@@ -21,19 +21,19 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@bablr/agast-helpers": "0.6.0",
-    "@bablr/agast-vm-helpers": "0.6.0",
-    "@bablr/boot": "0.7.0",
-    "@bablr/helpers": "0.21.1",
-    "@bablr/language-en-blank-space": "0.6.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",
-    "bablr": "^0.6.0",
+    "bablr": "^0.7.0",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^7.32.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",