@bablr/language-en-esnext 0.2.0 → 0.3.0

package/lib/es2016.js

@@ -1 +1,2 @@
 export * from '@bablr/language-en-es6';
+export { default } from '@bablr/language-en-es6';

package/lib/es2017.js

@@ -1 +1,2 @@
 export * from './es2016.js';
+export { default } from './es2016.js';

package/lib/es2018.js

@@ -1,66 +1,69 @@
-/* @macrome
- * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./es2018.macro.js#2a257f8c5cef6055c314c2fe5668662cee068d42
- * 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 _es2017$atrivialGramm;
-let _initProto, _ObjectDecs;
 import { spam as m } from '@bablr/boot';
-import { CoveredBy, Node } from '@bablr/helpers/decorators';
-import { o, eat, eatMatch } from '@bablr/helpers/grammar';
+import { eat, eatMatch } from '@bablr/helpers/grammar';
 import { triviaEnhancer } from '@bablr/helpers/trivia';
-import * as Comment from '@bablr/language-en-c-comments';
-import * as es2017 from './es2017.js';
-export const dependencies = {
-  Comment
-};
-export const defaultMatcher = m`.+: <_Expression />`;
-export { powerLevels, reservedWords, assignmentOperators, assignmentOperatorAlternatives, unaryPrefixOperators, unaryPrefixOperatorAlternatives, unaryPostfixOperators, unaryPostfixOperatorAlternatives, getBinaryOperatorAlternatives } from './es2017.js';
+import Space from '@bablr/language-en-blank-space';
+import Comment from '@bablr/language-en-c-comments';
+import Regex from '@bablr/language-en-es6/regex';
+import { List } from '@bablr/helpers/productions';
+
+import es2017 from './es2017.js';
+
+export const dependencies = { Comment, Space, Regex };
+
+export const defaultMatcher = m`_+: <_Expression />`;
+
+export {
+  powerLevels,
+  reservedWords,
+  assignmentOperators,
+  assignmentOperatorAlternatives,
+  unaryPrefixOperators,
+  unaryPrefixOperatorAlternatives,
+  unaryPostfixOperators,
+  unaryPostfixOperatorAlternatives,
+  getBinaryOperatorAlternatives,
+} from './es2017.js';
+
 export const canonicalURL = 'https://bablr.org/languages/universe/es6';
-export const atrivialGrammar = class ES2018Grammar extends (_es2017$atrivialGramm = es2017.atrivialGrammar) {
-  static {
-    [_initProto] = _applyDecs(this, [[_ObjectDecs, 2, "Object"], [Node, 2, "ObjectPattern"], [Node, 2, "SpreadElement"]], [], 0, void 0, _es2017$atrivialGramm).e;
-  }
-  constructor(...args) {
-    super(...args);
-    _initProto(this);
-  }
-  *[(_ObjectDecs = [CoveredBy('JSONExpression'), CoveredBy('Expression'), Node], "Object")]() {
-    yield eat(m`open: <*Punctuator '{' { balanced: '}' } />`);
-    yield eat(m`properties[]$: <__List />`, o({
-      element: m`<_ObjectMember />`,
-      separator: m`#separatorTokens[]: <*Punctuator ',' />`,
-      allowTrailingSeparator: true
-    }));
-    yield eat(m`close: <*Punctuator '}' { balancer: true } />`);
+
+const atrivial = class ES2018Grammar extends es2017.grammar.atrivial {
+  *Object() {
+    yield eat(m`openToken*: <* '{' />`);
+    yield* List({
+      element: m`properties[]: <_ObjectMember />`,
+      separator: m`#separatorTokens: <* ',' />`,
+      allowTrailingSeparator: true,
+    });
+    yield eat(m`closeToken*: <* '}' />`);
   }
+
   *ObjectMember() {
-    if (yield eatMatch(m`<SpreadElement '...' />`)) {} else {
+    if (yield eatMatch(m`<SpreadElement '...' />`)) {
+    } else {
       yield eat(m`<Property />`);
     }
   }
+
   *ObjectPattern() {
-    yield eat(m`openToken: <*Punctuator '{' { balanced: '}' } />`);
-    yield eat(m`params[]+$: <__List />`, o({
-      element: m`<PropertyPattern />`,
+    yield eat(m`openToken*: <* '{' />`);
+    yield* List({
+      element: m`params[]+$: <PropertyPattern />`,
       allowTrailingSeparator: true,
-      separator: m`#separatorTokens[]: <*Punctuator ',' />`
-    }));
+      separator: m`#separatorTokens: <* ',' />`,
+    });
     if (yield eatMatch(m`params[]+$: <SpreadElement '...' />`)) {
-      yield eatMatch(m`#separatorTokens[]: <*Punctuator ',' />`);
+      yield eatMatch(m`#separatorTokens: <* ',' />`);
     }
-    yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
-  }
-  *SpreadElement() {
-    yield eat(m`sigilToken: <*Punctuator '...' />`);
-    yield eat(m`value+$: <_Expression />`, o({
-      power: 32
-    }));
+    yield eat(m`closeToken*: <* '}' />`);
   }
 };
-export const grammar = triviaEnhancer({
-  triviaIsAllowed: s => s.span === 'Bare',
-  triviaMatcher: m`#: :Comment: <__Trivia /[ \n\r\t]|\/\/|\/\*/ />`
-}, atrivialGrammar);
+
+export const grammar = triviaEnhancer(
+  {
+    triviaIsAllowed: (s) => s.span === 'Bare',
+    triviaMatcher: m`#: <__Trivia /[ \n\r\t]|\/\/|\/\*/ />`,
+  },
+  atrivial,
+);
+
+export default { canonicalURL, dependencies, grammar, defaultMatcher };

package/lib/es2019.js

@@ -1 +1,2 @@
 export * from './es2018.js';
+export { default } from './es2018.js';

package/lib/es2020.js

@@ -1,43 +1,38 @@
-/* @macrome
- * @generatedby @bablr/macrome-generator-bablr
- * @generatedfrom ./es2020.macro.js#219556c33d9f9d0d57628a75f4098a53b669f2fb
- * 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 _es2019$atrivialGramm;
-let _initProto, _MemberExpressionDecs;
 import { re, spam as m } from '@bablr/boot';
-import { CoveredBy, Node, UndefinedAttributes } from '@bablr/helpers/decorators';
-import { o, defineAttribute, eat, eatMatch, match, fail } from '@bablr/helpers/grammar';
+import { o, eat, eatMatch, match, fail, eatHeld } from '@bablr/helpers/grammar';
 import { triviaEnhancer } from '@bablr/helpers/trivia';
-import * as Comment from '@bablr/language-en-c-comments';
-import * as es2019 from './es2019.js';
-export const dependencies = {
-  Comment
-};
-export const defaultMatcher = m`.+: <_Expression />`;
-export { powerLevels, reservedWords, assignmentOperators, assignmentOperatorAlternatives, unaryPrefixOperators, unaryPrefixOperatorAlternatives, unaryPostfixOperators, unaryPostfixOperatorAlternatives, getBinaryOperatorAlternatives } from './es2019.js';
+import Space from '@bablr/language-en-blank-space';
+import Comment from '@bablr/language-en-c-comments';
+import Regex from '@bablr/language-en-es6/regex';
+import es2019 from './es2019.js';
+import { printSource } from '@bablr/agast-helpers/tree';
+
+export const dependencies = { Comment, Space, Regex };
+
+export const defaultMatcher = m`_+: <_Expression />`;
+
+export {
+  powerLevels,
+  reservedWords,
+  assignmentOperators,
+  assignmentOperatorAlternatives,
+  unaryPrefixOperators,
+  unaryPrefixOperatorAlternatives,
+  unaryPostfixOperators,
+  unaryPostfixOperatorAlternatives,
+  getBinaryOperatorAlternatives,
+} from './es2019.js';
+
 export const canonicalURL = 'https://bablr.org/languages/universe/es6';
-export const atrivialGrammar = class ES2020Grammar extends (_es2019$atrivialGramm = es2019.atrivialGrammar) {
-  static {
-    [_initProto] = _applyDecs(this, [[_MemberExpressionDecs, 2, "MemberExpression"]], [], 0, void 0, _es2019$atrivialGramm).e;
-  }
-  constructor(...args) {
-    super(...args);
-    _initProto(this);
-  }
-  *[(_MemberExpressionDecs = [UndefinedAttributes(['power']), CoveredBy('Expression'), CoveredBy('LogicExpression'), Node], "LogicExpression")](args) {
+
+const atrivial = class ES2020Grammar extends es2019.grammar.atrivial {
+  *LogicExpression(args) {
     let {
-      props: {
-        power = 34
-      }
+      props: { power = 34 },
     } = args;
     let res;
     if (power >= 2) {
-      res = yield eatMatch(m`<MemberExpression /\g\?\./ />`, o({
-        power
-      }));
+      res = yield eatMatch(m`<MemberExpression /\?\./ />`, o({ power }));
       if (!res) {
         yield* super.LogicExpression(args);
       }
@@ -45,55 +40,51 @@ export const atrivialGrammar = class ES2020Grammar extends (_es2019$atrivialGram
       yield* super.LogicExpression(args);
     }
   }
-  *MemberExpression({
-    ctx
-  }) {
-    yield eat(m`object+$: <_Expression />`, o({
-      power: 2
-    }));
-    yield defineAttribute('power', 2);
+
+  *MemberExpression() {
+    yield eatHeld(m`object+$: <_Expression />`);
+
     let sigil = yield match(re`/\?\.|[[.]/`);
-    switch (ctx.sourceTextFor(sigil)) {
-      case '?.':
-        {
-          yield eat(m`dotToken: <*Punctuator '?.' />`);
-          if (yield eatMatch(m`openToken: <*Punctuator '[' { balanced: ']' } />`, o({}), o({
-            bind: true
-          }))) {
-            yield eat(m`property+$: <_Expression />`);
-            yield eat(m`closeToken: <*Punctuator ']' { balancer: true } />`);
-          } else {
-            yield eat(m`property+$: <_Expression />`, o({
-              power: 2
-            }));
-            yield eat(m`closeToken: null`);
-          }
-          break;
-        }
-      case '.':
-        {
-          yield eat(m`dotToken: <*Punctuator '.' />`);
-          yield eat(m`openToken: null`);
-          yield eat(m`property+$: <Identifier />`, o({
-            scoped: false
-          }));
-          yield eat(m`closeToken: null`);
-          break;
-        }
-      case '[':
-        {
-          yield eat(m`dotToken: null`);
-          yield eat(m`openToken: <*Punctuator '[' { balanced: ']' } />`);
+
+    switch (printSource(sigil)) {
+      case '?.': {
+        yield eat(m`dotToken*: <* '?.' />`);
+
+        if (yield eatMatch(m`openToken*: <* '[' />`)) {
           yield eat(m`property+$: <_Expression />`);
-          yield eat(m`closeToken: <*Punctuator ']' { balancer: true } />`);
-          break;
+          yield eat(m`closeToken*: <* ']' />`);
+        } else {
+          yield eat(m`property+$: <Identifier />`, o({ scoped: false }));
         }
+
+        break;
+      }
+
+      case '.': {
+        yield eat(m`dotToken*: <* '.' />`);
+        yield eat(m`property+$: <Identifier />`, o({ scoped: false }));
+        break;
+      }
+
+      case '[': {
+        yield eat(m`openToken*: <* '[' />`);
+        yield eat(m`property+$: <_Expression />`);
+        yield eat(m`closeToken*: <* ']' />`);
+        break;
+      }
+
       default:
         yield fail();
     }
   }
 };
-export const grammar = triviaEnhancer({
-  triviaIsAllowed: s => s.span === 'Bare',
-  triviaMatcher: m`#: :Comment: <__Trivia /[ \n\r\t]|\/\/|\/\*/ />`
-}, atrivialGrammar);
+
+export const grammar = triviaEnhancer(
+  {
+    triviaIsAllowed: (s) => s.span === 'Bare',
+    triviaMatcher: m`#: <__Trivia /[ \n\r\t]|\/\/|\/\*/ />`,
+  },
+  atrivial,
+);
+
+export default { canonicalURL, dependencies, grammar, defaultMatcher };

package/lib/grammar.js

@@ -1 +1,2 @@
 export * from './es2020.js';
+export { default } from './es2020.js';

package/lib/regex.js

@@ -1 +1 @@
-export * from '@bablr/language-en-es6/regex';
+export { default } from '@bablr/language-en-es6/regex';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bablr/language-en-esnext",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "A BABLR language tracking the most current approved EcmaScript specification",
   "engines": {
     "node": ">=12.0.0"
@@ -15,27 +15,22 @@
     "lib/**/*.js"
   ],
   "scripts": {
-    "build": "macrome build",
-    "watch": "macrome watch",
-    "clean": "macrome clean",
     "test": "mocha test/*.test.js"
   },
   "sideEffects": false,
   "dependencies": {
-    "@babel/runtime": "7.24.6",
-    "@bablr/agast-vm-helpers": "0.9.0",
-    "@bablr/boot": "0.10.0",
-    "@bablr/helpers": "0.24.0",
-    "@bablr/language-en-c-comments": "0.9.0",
-    "@bablr/language-en-es6": "0.2.0"
+    "@bablr/agast-vm-helpers": "0.10.0",
+    "@bablr/boot": "0.11.0",
+    "@bablr/helpers": "0.25.0",
+    "@bablr/language-en-blank-space": "0.10.0",
+    "@bablr/language-en-c-comments": "0.10.0",
+    "@bablr/language-en-es6": "0.3.0"
   },
   "devDependencies": {
-    "@bablr/agast-helpers": "^0.9.0",
+    "@bablr/agast-helpers": "^0.10.0",
     "@bablr/eslint-config-base": "github:bablr-lang/eslint-config-base#49f5952efed27f94ee9b94340eb1563c440bf64e",
-    "@bablr/macrome": "0.1.3",
-    "@bablr/macrome-generator-bablr": "0.3.2",
     "@qnighy/dedent": "0.1.1",
-    "bablr": "0.10.0",
+    "bablr": "^0.11.0",
     "enhanced-resolve": "^5.12.0",
     "eslint": "^7.32.0",
     "eslint-import-resolver-enhanced-resolve": "^1.0.5",
@@ -55,7 +50,10 @@
     "js",
     "es"
   ],
-  "repository": "git@github.com:bablr-lang/language-en-esnext.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/bablr-lang/language-en-esnext.git"
+  },
   "homepage": "https://github.com/bablr-lang/language-en-esnext",
   "author": "Conrad Buck <conartist6@gmail.com>",
   "license": "MIT"

package/lib/es2018.macro.js

@@ -1,80 +0,0 @@
-import { spam as m } from '@bablr/boot';
-import { CoveredBy, Node } from '@bablr/helpers/decorators';
-import { o, eat, eatMatch } from '@bablr/helpers/grammar';
-import { triviaEnhancer } from '@bablr/helpers/trivia';
-import * as Comment from '@bablr/language-en-c-comments';
-import * as es2017 from './es2017.js';
-
-export const dependencies = { Comment };
-
-export const defaultMatcher = m`.+: <_Expression />`;
-
-export {
-  powerLevels,
-  reservedWords,
-  assignmentOperators,
-  assignmentOperatorAlternatives,
-  unaryPrefixOperators,
-  unaryPrefixOperatorAlternatives,
-  unaryPostfixOperators,
-  unaryPostfixOperatorAlternatives,
-  getBinaryOperatorAlternatives,
-} from './es2017.js';
-
-export const canonicalURL = 'https://bablr.org/languages/universe/es6';
-
-export const atrivialGrammar = class ES2018Grammar extends es2017.atrivialGrammar {
-  @CoveredBy('JSONExpression')
-  @CoveredBy('Expression')
-  @Node
-  *Object() {
-    yield eat(m`open: <*Punctuator '{' { balanced: '}' } />`);
-    yield eat(
-      m`properties[]$: <__List />`,
-      o({
-        element: m`<_ObjectMember />`,
-        separator: m`#separatorTokens[]: <*Punctuator ',' />`,
-        allowTrailingSeparator: true,
-      }),
-    );
-    yield eat(m`close: <*Punctuator '}' { balancer: true } />`);
-  }
-
-  *ObjectMember() {
-    if (yield eatMatch(m`<SpreadElement '...' />`)) {
-    } else {
-      yield eat(m`<Property />`);
-    }
-  }
-
-  @Node
-  *ObjectPattern() {
-    yield eat(m`openToken: <*Punctuator '{' { balanced: '}' } />`);
-    yield eat(
-      m`params[]+$: <__List />`,
-      o({
-        element: m`<PropertyPattern />`,
-        allowTrailingSeparator: true,
-        separator: m`#separatorTokens[]: <*Punctuator ',' />`,
-      }),
-    );
-    if (yield eatMatch(m`params[]+$: <SpreadElement '...' />`)) {
-      yield eatMatch(m`#separatorTokens[]: <*Punctuator ',' />`);
-    }
-    yield eat(m`closeToken: <*Punctuator '}' { balancer: true } />`);
-  }
-
-  @Node
-  *SpreadElement() {
-    yield eat(m`sigilToken: <*Punctuator '...' />`);
-    yield eat(m`value+$: <_Expression />`, o({ power: 32 }));
-  }
-};
-
-export const grammar = triviaEnhancer(
-  {
-    triviaIsAllowed: (s) => s.span === 'Bare',
-    triviaMatcher: m`#: :Comment: <__Trivia /[ \n\r\t]|\/\/|\/\*/ />`,
-  },
-  atrivialGrammar,
-);

package/lib/es2020.macro.js

@@ -1,101 +0,0 @@
-import { re, spam as m } from '@bablr/boot';
-import { CoveredBy, Node, UndefinedAttributes } from '@bablr/helpers/decorators';
-import { o, defineAttribute, eat, eatMatch, match, fail } from '@bablr/helpers/grammar';
-import { triviaEnhancer } from '@bablr/helpers/trivia';
-import * as Comment from '@bablr/language-en-c-comments';
-import * as es2019 from './es2019.js';
-
-export const dependencies = { Comment };
-
-export const defaultMatcher = m`.+: <_Expression />`;
-
-export {
-  powerLevels,
-  reservedWords,
-  assignmentOperators,
-  assignmentOperatorAlternatives,
-  unaryPrefixOperators,
-  unaryPrefixOperatorAlternatives,
-  unaryPostfixOperators,
-  unaryPostfixOperatorAlternatives,
-  getBinaryOperatorAlternatives,
-} from './es2019.js';
-
-export const canonicalURL = 'https://bablr.org/languages/universe/es6';
-
-export const atrivialGrammar = class ES2020Grammar extends es2019.atrivialGrammar {
-  *LogicExpression(args) {
-    let {
-      props: { power = 34 },
-    } = args;
-    let res;
-    if (power >= 2) {
-      res = yield eatMatch(m`<MemberExpression /\g\?\./ />`, o({ power }));
-      if (!res) {
-        yield* super.LogicExpression(args);
-      }
-    } else {
-      yield* super.LogicExpression(args);
-    }
-  }
-
-  @UndefinedAttributes(['power'])
-  @CoveredBy('Expression')
-  @CoveredBy('LogicExpression')
-  @Node
-  *MemberExpression({ ctx }) {
-    yield eat(m`object+$: <_Expression />`, o({ power: 2 }));
-    yield defineAttribute('power', 2);
-
-    let sigil = yield match(re`/\?\.|[[.]/`);
-
-    switch (ctx.sourceTextFor(sigil)) {
-      case '?.': {
-        yield eat(m`dotToken: <*Punctuator '?.' />`);
-
-        if (
-          yield eatMatch(
-            m`openToken: <*Punctuator '[' { balanced: ']' } />`,
-            o({}),
-            o({ bind: true }),
-          )
-        ) {
-          yield eat(m`property+$: <_Expression />`);
-          yield eat(m`closeToken: <*Punctuator ']' { balancer: true } />`);
-        } else {
-          yield eat(m`property+$: <_Expression />`, o({ power: 2 }));
-          yield eat(m`closeToken: null`);
-        }
-
-        break;
-      }
-
-      case '.': {
-        yield eat(m`dotToken: <*Punctuator '.' />`);
-        yield eat(m`openToken: null`);
-        yield eat(m`property+$: <Identifier />`, o({ scoped: false }));
-        yield eat(m`closeToken: null`);
-        break;
-      }
-
-      case '[': {
-        yield eat(m`dotToken: null`);
-        yield eat(m`openToken: <*Punctuator '[' { balanced: ']' } />`);
-        yield eat(m`property+$: <_Expression />`);
-        yield eat(m`closeToken: <*Punctuator ']' { balancer: true } />`);
-        break;
-      }
-
-      default:
-        yield fail();
-    }
-  }
-};
-
-export const grammar = triviaEnhancer(
-  {
-    triviaIsAllowed: (s) => s.span === 'Bare',
-    triviaMatcher: m`#: :Comment: <__Trivia /[ \n\r\t]|\/\/|\/\*/ />`,
-  },
-  atrivialGrammar,
-);