goldstein 1.2.1 → 1.4.0

package/ChangeLog

@@ -1,3 +1,21 @@
+2022.06.22, v1.4.0
+
+feature:
+- goldstein: keyword safe: add support of VariableDeclaration
+
+
+2022.06.22, v1.3.0
+
+feature:
+- goldstein: add support of safe await
+
+
+2022.06.22, v1.2.2
+
+fix:
+- goldstein: cli: add mainFields
+
+
 2022.06.22, v1.2.1
 
 fix:

package/README.md

@@ -122,14 +122,27 @@ function hello() {
 Applies [`tryCatch`](https://github.com/coderaiser/try-catch):
 
 ```gs
-safe hello(1, 2, 3);
+const [error, result] = safe hello(1, 2, 3);
 ```
 
 Is the same as:
 
 ```js
 import tryCatch from 'try-catch';
-tryCatch(1, 2, 3);
+const [error, result] = tryCatch(1, 2, 3);
+```
+
+and
+
+```gs
+const [error, result] = safe await hello(1, 2, 3);
+```
+
+Is the same as:
+
+```js
+import tryToCatch from 'try-catch';
+const [error, result] = await tryToCatch(1, 2, 3);
 ```
 
 ## How to contribute?

package/bin/gs.js

@@ -1,4 +1,4 @@
-const [arg] = process.argv.slice(2);
+#!/usr/bin/env node
 import esbuild from 'esbuild';
 import {
     readFileSync,
@@ -7,6 +7,8 @@ import {
 } from 'fs';
 import {compile} from '../packages/goldstein/index.js';
 
+const [arg] = process.argv.slice(2);
+
 if (!arg) {
     console.log('gs <filename>');
     process.exit();
@@ -25,7 +27,7 @@ esbuild.buildSync({
     bundle: true,
     write: true,
     outfile,
-    platform: 'neutral',
+    mainFields: ['main'],
 });
 
 unlinkSync(compiledName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldstein",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "type": "module",
   "commitType": "colon",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
@@ -28,7 +28,8 @@
   "dependencies": {
     "acorn": "^8.7.1",
     "esbuild": "^0.14.47",
-    "putout": "^26.17.0"
+    "putout": "^26.17.0",
+    "try-catch": "^3.0.1"
   },
   "license": "MIT",
   "devDependencies": {

package/packages/keyword-safe/index.js

@@ -1,8 +1,14 @@
+import {types} from 'putout';
 import {
     addKeyword,
     TokenType,
 } from '../operator/index.js';
 
+const {
+    isCallExpression,
+    isAwaitExpression,
+} = types;
+
 // why not 'try'?
 // because acorn internals should be copied, and added tests.
 // there is no such thing as this.previous(), only this.next() 🤷‍
@@ -25,24 +31,50 @@ export default function newSpeak(Parser) {
             
             return super.parseStatement(context, topLevel, exports);
         }
+        parseExprAtom(refDestructuringErrors, forInit) {
+            if (this.type === keywordTypes.safe)
+                return this.parseSafe();
+            
+            return super.parseExprAtom(refDestructuringErrors, forInit);
+        }
         
         parseSafe() {
             this.next();
             
             const node = super.startNode();
-            const callExpression = this.parseExpression();
-            
-            node.expression = {
-                type: 'CallExpression',
-                callee: {
-                    type: 'Identifier',
-                    name: 'tryCatch',
-                },
-                arguments: [
-                    callExpression.callee,
-                    ...callExpression.arguments,
-                ],
-            };
+            const expression = this.parseExpression();
+            
+            if (isCallExpression(expression))
+                node.expression = {
+                    type: 'CallExpression',
+                    callee: {
+                        type: 'Identifier',
+                        name: 'tryCatch',
+                    },
+                    arguments: [
+                        expression.callee,
+                        ...expression.arguments,
+                    ],
+                };
+            
+            else if (isAwaitExpression(expression))
+                node.expression = {
+                    type: 'AwaitExpression',
+                    argument: {
+                        type: 'CallExpression',
+                        callee: {
+                            type: 'Identifier',
+                            name: 'tryToCatch',
+                        },
+                        arguments: [
+                            expression.argument.callee,
+                            ...expression.argument.arguments,
+                        ],
+                    },
+                };
+            
+            else
+                this.raise(this.start, `After 'safe' only 'await' and 'function call' can come`);
             
             return super.finishNode(node, 'ExpressionStatement');
         }