goldstein 4.2.0 → 4.4.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.10.03, v4.4.0
+
+feature:
+- 02f16ef goldstein: add convert js to gs
+
+2023.10.03, v4.3.0
+
+feature:
+- 77cd780 goldstein: print: if
+
 2023.10.03, v4.2.0
 
 feature:

package/build/parser.cjs

@@ -5499,19 +5499,19 @@ function keywordTry(Parser3) {
             expression.callee,
             ...expression.arguments
           ],
-          goldstein: createGoldsteinNode({
+          goldstein: createGoldsteinTry({
             await: false,
             callee: expression.callee,
-            arguments: expression.arguments
+            args: expression.arguments
           })
         };
       else if (isAwaitExpression(expression))
         node.expression = {
           type: "AwaitExpression",
-          goldstein: createGoldsteinNode({
+          goldstein: createGoldsteinTry({
             await: true,
             callee: expression.argument.callee,
-            arguments: expression.argument.arguments
+            args: expression.argument.arguments
           }),
           argument: {
             type: "CallExpression",
@@ -5556,7 +5556,7 @@ function keywordTry(Parser3) {
     }
   };
 }
-function createGoldsteinNode(args) {
+function createGoldsteinTry(args) {
   return {
     type: "TryStatement",
     expression: true,
@@ -5564,7 +5564,7 @@ function createGoldsteinNode(args) {
     argument: {
       type: "CallExpression",
       callee: args.callee,
-      arguments: args.arguments
+      arguments: args.args
     }
   };
 }
@@ -5801,6 +5801,7 @@ function fn2(Parser3) {
         this.raise(this.start, `Use both parens ('(', ')') or none`);
       node.consequent = this.parseStatement("if");
       node.alternate = this.eat(types$1._else) ? this.parseStatement("if") : null;
+      node.goldsteinIf = true;
       return this.finishNode(node, "IfStatement");
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldstein",
-  "version": "4.2.0",
+  "version": "4.4.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "JavaScript with no limits",

package/packages/convert/apply-try/index.js

@@ -0,0 +1,23 @@
+import {createGoldsteinTry} from '../../keyword-try/index.js';
+
+export const report = () => `Use 'try' instead of 'tryCatch/tryToCatch'`;
+export const replace = () => ({
+    'tryCatch(__args)': createTry({
+        awaitType: false,
+    }),
+    'await tryToCatch(__args)': createTry({
+        awaitType: true,
+    }),
+});
+
+const createTry = ({awaitType}) => ({__args}, path) => {
+    const [callee, ...args] = __args;
+    
+    path.node.goldstein = createGoldsteinTry({
+        await: awaitType,
+        callee,
+        args,
+    });
+    
+    return path;
+};

package/packages/convert/index.js

@@ -0,0 +1,21 @@
+import estreeToBabel from 'estree-to-babel';
+import {transform} from 'putout';
+import {print} from '../printer/index.js';
+import * as applyTry from './apply-try/index.js';
+
+import {
+    fixEmpty,
+    parse,
+} from '../goldstein/index.js';
+export const convert = (source) => {
+    const ast = estreeToBabel(parse(source));
+    
+    transform(ast, source, {
+        plugins: [
+            ['apply-try', applyTry],
+        ],
+    });
+    
+    return fixEmpty(print(ast));
+};
+

package/packages/goldstein/index.js

@@ -1,10 +1,10 @@
 import {transform} from 'putout';
 import {print} from '@putout/printer';
-import {parse} from './parser.js';
 import estreeToBabel from 'estree-to-babel';
 import tryCatchPlugin from '@putout/plugin-try-catch';
 import declarePlugin from '@putout/plugin-declare';
 import logicalExpressionsPlugin from '@putout/plugin-logical-expressions';
+import {parse} from './parser.js';
 
 export * from './parser.js';
 export const compile = (source, options = {}) => {

package/packages/keyword-if/index.js

@@ -19,6 +19,8 @@ export default function fn(Parser) {
             node.consequent = this.parseStatement('if');
             node.alternate = this.eat(tt._else) ? this.parseStatement('if') : null;
             
+            node.goldsteinIf = true;
+            
             return this.finishNode(node, 'IfStatement');
         }
     };

package/packages/keyword-try/index.js

@@ -43,19 +43,19 @@ export default function keywordTry(Parser) {
                         expression.callee,
                         ...expression.arguments,
                     ],
-                    goldstein: createGoldsteinNode({
+                    goldstein: createGoldsteinTry({
                         await: false,
                         callee: expression.callee,
-                        arguments: expression.arguments,
+                        args: expression.arguments,
                     }),
                 };
             else if (isAwaitExpression(expression))
                 node.expression = {
                     type: 'AwaitExpression',
-                    goldstein: createGoldsteinNode({
+                    goldstein: createGoldsteinTry({
                         await: true,
                         callee: expression.argument.callee,
-                        arguments: expression.argument.arguments,
+                        args: expression.argument.arguments,
                     }),
                     argument: {
                         type: 'CallExpression',
@@ -110,7 +110,7 @@ export default function keywordTry(Parser) {
     };
 }
 
-function createGoldsteinNode(args) {
+export function createGoldsteinTry(args) {
     return {
         type: 'TryStatement',
         expression: true,
@@ -118,7 +118,7 @@ function createGoldsteinNode(args) {
         argument: {
             type: 'CallExpression',
             callee: args.callee,
-            arguments: args.arguments,
+            arguments: args.args,
         },
     };
 }

package/packages/printer/index.js

@@ -1,9 +1,9 @@
 import {print as printJS} from '@putout/printer';
-
+import {fixEmpty} from '../goldstein/index.js';
 import {AwaitExpression} from './visitors/await-expression.js';
 import {CallExpression} from './visitors/call-expression.js';
 import {TryStatement} from './visitors/try-statement.js';
-import {fixEmpty} from '../goldstein/index.js';
+import {IfStatement} from './visitors/if-statement.js';
 
 export const print = (ast) => {
     const code = printJS(ast, {
@@ -11,6 +11,7 @@ export const print = (ast) => {
             CallExpression,
             TryStatement,
             AwaitExpression,
+            IfStatement,
         },
     });
     

package/packages/printer/visitors/if-statement.js

@@ -0,0 +1,19 @@
+import {visitors as v} from '@putout/printer';
+
+export const IfStatement = (path, printer, semantics) => {
+    const {print} = printer;
+    const {node} = path;
+    
+    if (!node.goldsteinIf)
+        return v.IfStatement(path, printer, semantics);
+    
+    print('if ');
+    print('__test');
+    print(' ');
+    print('__consequent');
+    
+    if (node.alternate) {
+        print(' else ');
+        print('__alternate');
+    }
+};

package/packages/printer/visitors/try-statement.js

@@ -1,4 +1,5 @@
 import {visitors as v} from '@putout/printer';
+
 export const TryStatement = (path, printer, semantics) => {
     const {maybe, print} = printer;
     const {node} = path;