goldstein 5.2.0 → 5.3.0

package/ChangeLog

@@ -1,3 +1,15 @@
+2024.05.06, v5.3.0
+
+feature:
+- 98f3048 goldstein: add ability to parse no async code with await
+- 45c7363 @putout/plugin-goldstein: eslint-plugin-putout v22.7.0
+- 3964832 @putout/plugin-goldstein: @putout/test v9.1.0
+- aa689c7 @putout/plugin-goldstein: eslint v9.2.0
+- 1399854 @putout/plugin-goldstein: c8 v9.1.0
+- a728422 goldstein: redlint v3.14.1
+- 6f03127 goldstein: eslint v9.2.0
+- 23c8eb3 goldstein: @putout/plugin-declare v4.0.0
+
 2024.02.20, v5.2.0
 
 feature:

package/README.md

@@ -100,10 +100,7 @@ By default, all keywords mentioned in the next section used, but you can limit t
 You can add any keywords, and even create your own:
 
 ```js
-import {
-    compile,
-    keywords,
-} from 'goldstein';
+import {compile, keywords} from 'goldstein';
 
 const source = `
     fn hello() {
@@ -185,10 +182,7 @@ parse(`
 You can make any modifications to **Goldstein AST** and then `print` back to **Goldstein**:
 
 ```js
-import {
-    parse,
-    print,
-} from 'goldstein';
+import {parse, print} from 'goldstein';
 
 const ast = parse(`const t = try f('hello')`);
 const source = print(ast);
@@ -302,7 +296,7 @@ Is the same as:
 ```js
 import tryToCatch from 'try-catch';
 
-const [error, result] = await tryToCatch(1, 2, 3);
+const [error, result] = await tryToCatch(hello, 'world');
 ```
 
 ### `should`
@@ -413,6 +407,22 @@ That absolutely fine, it will be converted to:
 function hello() {}
 ```
 
+### `asyn`-less `Function` with `await`
+
+```gs
+function hello() {
+    await world();
+}
+```
+
+In js:
+
+```js
+async function hello() {
+    await world();
+}
+```
+
 ## How to contribute?
 
 Clone the registry, create a new keyword with a prefix `keyword-`, then create directory `fixture` and put there two files with extensions `.js` and `.gs`. Half way done 🥳!

package/build/parser.cjs

@@ -1134,6 +1134,7 @@ pp$8.parseLabeledStatement = function(node, maybeName, expr, context) {
 };
 pp$8.parseExpressionStatement = function(node, expr) {
   node.expression = expr;
+  console.log(expr);
   this.semicolon();
   return this.finishNode(node, "ExpressionStatement");
 };
@@ -5948,15 +5949,18 @@ function createIfLet({ isParenL }) {
   const node = {
     loc: {},
     range: [],
-    body: [{
-      type: "VariableDeclaration",
-      kind: "let",
-      declarations: [{
-        type: "VariableDeclarator",
-        id: assignmentExpression.left,
-        init: assignmentExpression.right
-      }]
-    }, ifNode]
+    body: [
+      {
+        type: "VariableDeclaration",
+        kind: "let",
+        declarations: [{
+          type: "VariableDeclarator",
+          id: assignmentExpression.left,
+          init: assignmentExpression.right
+        }]
+      },
+      ifNode
+    ]
   };
   return this.finishNode(node, "BlockStatement");
 }
@@ -6109,6 +6113,35 @@ function createAppendNode(context, node) {
   return context.finishNode(node, "CallExpression");
 }
 
+// packages/keyword-no-async/index.js
+var { defineProperty } = Object;
+function fn4(Parser3) {
+  return class extends Parser3 {
+    parseFunction(node, statement, allowExpressionBody, isAsync, forInit) {
+      return super.parseFunction(node, statement, allowExpressionBody, true, forInit);
+    }
+    checkUnreserved({ start, end, name }) {
+      if (this.inGenerator && name === "yield")
+        this.raiseRecoverable(start, `Cannot use 'yield' as identifier inside a generator`);
+      if (this.inAsync && name === "await")
+        this.raiseRecoverable(start, `Cannot use 'await' as identifier inside an async function`);
+      if (this.currentThisScope().inClassFieldInit && name === "arguments")
+        this.raiseRecoverable(start, `Cannot use 'arguments' in class field initializer`);
+      if (this.inClassStaticBlock && (name === "arguments" || name === "await"))
+        this.raise(start, `Cannot use ${name} in class static initialization block`);
+      if (this.keywords.test(name))
+        this.raise(start, `Unexpected keyword '` + name + `'`);
+      if (this.options.ecmaVersion < 6 && this.input.slice(start, end).includes("\\"))
+        return;
+      const re = this.strict ? this.reservedWordsStrict : this.reservedWords;
+      if (re.test(name) && !this.inAsync && name === "await")
+        defineProperty(this, "inAsync", {
+          value: true
+        });
+    }
+  };
+}
+
 // packages/goldstein/parser.js
 var defaultKeywords = {
   keywordFn: fn,
@@ -6122,7 +6155,8 @@ var defaultKeywords = {
   keywordImport,
   keywordArrow: fn3,
   keywordAddArray,
-  stringInterpolation
+  stringInterpolation,
+  keywordNoAsync: fn4
 };
 var keywords2 = defaultKeywords;
 var parse3 = (source, options = {}, keywords3 = defaultKeywords) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldstein",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "JavaScript with no limits",
@@ -29,9 +29,10 @@
     "wisdom": "madrun wisdom"
   },
   "dependencies": {
-    "@putout/plugin-declare": "^3.0.0",
+    "@putout/plugin-declare": "^4.0.0",
     "@putout/plugin-logical-expressions": "^5.0.0",
     "@putout/plugin-try-catch": "^3.0.0",
+    "@putout/plugin-promises": "^14.1.0",
     "@putout/printer": "^8.0.1",
     "acorn": "^8.7.1",
     "esbuild": "^0.20.1",
@@ -45,17 +46,18 @@
   "devDependencies": {
     "@babel/core": "^8.0.0-alpha.5",
     "@cloudcmd/stub": "^4.0.1",
+    "@putout/plugin-goldstein": "./rules/goldstein",
     "@putout/test": "^9.0.1",
     "c8": "^9.1.0",
     "check-dts": "^0.7.1",
     "escover": "^4.0.1",
-    "eslint": "^8.48.0",
-    "eslint-plugin-n": "^16.0.1",
+    "eslint": "^9.2.0",
     "eslint-plugin-putout": "^22.0.0",
     "madrun": "^10.0.0",
     "mock-require": "^3.0.3",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1",
+    "redlint": "^3.14.1",
     "runsome": "^1.0.0",
     "supertape": "^10.1.0",
     "typescript": "^5.0.3"

package/packages/convert/index.js

@@ -5,10 +5,7 @@ import * as removeImportTry from './remove-import-try/index.js';
 import * as applyTry from './apply-try/index.js';
 import * as addArray from './add-array/index.js';
 import * as applyIfLet from './apply-if-let/index.js';
-import {
-    fixEmpty,
-    parse,
-} from '../goldstein/index.js';
+import {fixEmpty, parse} from '../goldstein/index.js';
 
 export const convert = (source) => {
     const ast = estreeToBabel(parse(source));

package/packages/goldstein/index.js

@@ -3,6 +3,7 @@ import {print} from '@putout/printer';
 import tryCatchPlugin from '@putout/plugin-try-catch';
 import declarePlugin from '@putout/plugin-declare';
 import logicalExpressionsPlugin from '@putout/plugin-logical-expressions';
+import promisesPlugin from '@putout/plugin-promises';
 import {parse} from './parser.js';
 
 export * from './parser.js';
@@ -19,6 +20,7 @@ export const compile = (source, options = {}) => {
             ['try-catch', tryCatchPlugin],
             ['declare', declarePlugin],
             ['logical-expressions', logicalExpressionsPlugin],
+            ['promises', promisesPlugin],
         ],
     });
     

package/packages/goldstein/parser.js

@@ -12,6 +12,7 @@ import keywordIf from '../keyword-if/index.js';
 import keywordImport from '../keyword-import/index.js';
 import keywordArrow from '../keyword-arrow/index.js';
 import keywordAddArray from '../keyword-add-array/index.js';
+import keywordNoAsync from '../keyword-no-async/index.js';
 
 const defaultKeywords = {
     keywordFn,
@@ -26,6 +27,7 @@ const defaultKeywords = {
     keywordArrow,
     keywordAddArray,
     stringInterpolation,
+    keywordNoAsync,
 };
 
 export const keywords = defaultKeywords;

package/packages/keyword-fn/index.js

@@ -1,7 +1,4 @@
-import {
-    addKeyword,
-    TokenType,
-} from '../operator/index.js';
+import {addKeyword, TokenType} from '../operator/index.js';
 
 export default function fn(Parser) {
     Parser.acorn.keywordTypes.fn = new TokenType('fn', {

package/packages/keyword-freeze/index.js

@@ -1,8 +1,5 @@
 import {types} from 'putout';
-import {
-    addKeyword,
-    TokenType,
-} from '../operator/index.js';
+import {addKeyword, TokenType} from '../operator/index.js';
 
 const {
     isObjectExpression,

package/packages/keyword-if/index.js

@@ -58,7 +58,8 @@ function createIfLet({isParenL}) {
                 id: assignmentExpression.left,
                 init: assignmentExpression.right,
             }],
-        }, ifNode],
+        },
+        ifNode],
     };
     
     return this.finishNode(node, 'BlockStatement');

package/packages/keyword-no-async/index.js

@@ -0,0 +1,36 @@
+const {defineProperty} = Object;
+
+export default function fn(Parser) {
+    return class extends Parser {
+        parseFunction(node, statement, allowExpressionBody, isAsync, forInit) {
+            return super.parseFunction(node, statement, allowExpressionBody, true, forInit);
+        }
+        
+        checkUnreserved({start, end, name}) {
+            if (this.inGenerator && name === 'yield')
+                this.raiseRecoverable(start, `Cannot use 'yield' as identifier inside a generator`);
+            
+            if (this.inAsync && name === 'await')
+                this.raiseRecoverable(start, `Cannot use 'await' as identifier inside an async function`);
+            
+            if (this.currentThisScope().inClassFieldInit && name === 'arguments')
+                this.raiseRecoverable(start, `Cannot use 'arguments' in class field initializer`);
+            
+            if (this.inClassStaticBlock && (name === 'arguments' || name === 'await'))
+                this.raise(start, `Cannot use ${name} in class static initialization block`);
+            
+            if (this.keywords.test(name))
+                this.raise(start, `Unexpected keyword '` + name + `'`);
+            
+            if (this.options.ecmaVersion < 6 && this.input.slice(start, end).includes('\\'))
+                return;
+            
+            const re = this.strict ? this.reservedWordsStrict : this.reservedWords;
+            
+            if (re.test(name) && !this.inAsync && name === 'await')
+                defineProperty(this, 'inAsync', {
+                    value: true,
+                });
+        }
+    };
+}

package/packages/keyword-try/index.js

@@ -1,11 +1,11 @@
 import {types} from 'putout';
+import {setGoldsteinTry} from '../types/try.js';
 import {
     BIND_LEXICAL,
     BIND_SIMPLE_CATCH,
     SCOPE_SIMPLE_CATCH,
     tokTypes as tt,
 } from '../operator/index.js';
-import {setGoldsteinTry} from '../types/try.js';
 
 const {
     isCallExpression,