@bablr/language-en-json 0.9.0 → 0.10.0

package/lib/grammar.js

@@ -1,19 +1,18 @@
 /* @macrome
  * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./grammar.macro.js#ba23af5f0d351c04f7e57efff1bd6d2d74cbffe3
+ * @generatedfrom ./grammar.macro.js#4b2e4ce356a3a29eb03d3816de446f8e8e0adfa1
  * 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 * 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 { 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
 };
@@ -44,7 +43,7 @@ export const getCooked = (escapeNode, span, ctx) => {
       throw new Error('not implemented');
     }
     if (type === 'u') {
-      cooked = parseInt(value, 16);
+      cooked = String.fromCharCode(parseInt(value, 16));
     } else {
       throw new Error();
     }
@@ -53,31 +52,29 @@ export const getCooked = (escapeNode, span, ctx) => {
 };
 export const grammar = triviaEnhancer({
   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"], [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;
   }
   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 +86,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
       }));
@@ -100,7 +97,7 @@ export const grammar = triviaEnhancer({
   *Property() {
     yield eat(m`key$: <*Identifier />`);
     yield eat(m`sigilToken: <*Punctuator ':' />`);
-    yield eat(m`value$: <Expression />`);
+    yield eat(m`value+$: <__Expression />`);
   }
   *Identifier() {
     yield eat(re`/[a-zA-Z][a-zA-Z_-]*/`);
@@ -148,11 +145,13 @@ export const grammar = triviaEnhancer({
   }
   *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 +161,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 +181,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 +198,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 +228,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

@@ -3,9 +3,8 @@ import { triviaEnhancer } 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 { 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 };
 
@@ -43,7 +42,7 @@ export const getCooked = (escapeNode, span, ctx) => {
     }
 
     if (type === 'u') {
-      cooked = parseInt(value, 16);
+      cooked = String.fromCharCode(parseInt(value, 16));
     } else {
       throw new Error();
     }
@@ -55,26 +54,22 @@ export const getCooked = (escapeNode, span, ctx) => {
 export const grammar = triviaEnhancer(
   {
     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 +80,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 +100,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 ':' />`,
         ]));
@@ -119,7 +114,7 @@ export const grammar = triviaEnhancer(
     *Property() {
       yield eat(m`key$: <*Identifier />`);
       yield eat(m`sigilToken: <*Punctuator ':' />`);
-      yield eat(m`value$: <Expression />`);
+      yield eat(m`value+$: <__Expression />`);
     }
 
     @Node
@@ -127,6 +122,7 @@ export const grammar = triviaEnhancer(
       yield eat(re`/[a-zA-Z][a-zA-Z_-]*/`);
     }
 
+    @CoveredBy('Expression')
     @Node
     *String({ ctx }) {
       let q = yield match(re`/['"]/`);
@@ -185,11 +181,17 @@ export const grammar = triviaEnhancer(
     @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 +202,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 +228,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 +243,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 +251,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 +275,12 @@ export const grammar = triviaEnhancer(
       yield eat(m`sigilToken: <*Keyword 'null' />`);
     }
 
+    @Literal
     @Node
     @InjectFrom(productions)
     *Keyword() {}
 
+    @Literal
     @Node
     @InjectFrom(productions)
     *Punctuator() {}
@@ -279,15 +296,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.10.0",
   "description": "A BABLR language for JSON",
   "engines": {
     "node": ">=12.0.0"
@@ -21,11 +21,11 @@
   },
   "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.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",
     "@babel/runtime": "^7.22.15"
   },
   "devDependencies": {
@@ -33,7 +33,7 @@
     "@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",