goldstein 2.5.1 → 3.0.0

package/ChangeLog

@@ -1,3 +1,21 @@
+2023.04.02, v3.0.0
+
+feature:
+- 3eeeab7 goldstein: add ability to simplify logical expressions during compilation
+- 7959e57 goldstein: add ability to compile import gs to js
+- c61e500 goldstein: improve compiler, disable bundling
+- 6cd279e goldstein: enable support of ifStatments with no round braces
+- 0ba6f9c major: goldstein: compile: use @putout/pinter instead of recast, parse: provide Babel AST
+
+2023.04.01, v2.6.0
+
+feature:
+- ccdb0f1 package: esbuild v0.17.14
+- ecf9023 package: eslint-plugin-putout v17.2.1
+- 15a95e5 package: typescript v5.0.3
+- 84a6049 package: putout v29.1.11
+- d4f22c6 package: check-dts v0.7.1
+
 2023.01.06, v2.5.1
 
 feature:

package/README.md

@@ -43,6 +43,32 @@ export {
 };
 ```
 
+Let's do a bit more!
+
+```gs
+const a = () => throw 'hello';
+
+if a > 2 {
+    log('hello');
+}
+
+fn hello() {
+    console.log('hello');
+}
+```
+
+Will give us:
+
+```js
+const a = () => {
+    throw 'hello';
+};
+
+if (a > 2) {
+    log('hello');
+}
+```
+
 ## API
 
 ### `compile(source)`
@@ -133,11 +159,11 @@ Is the same as:
 
 ```js
 function hello() {
-    if (!(text !== 'world')) {
+    if (text === 'world') {
         return '';
     }
     
-    return 'Hello ' + text;
+    return `Hello ${text}`;
 }
 ```
 
@@ -148,20 +174,20 @@ function hello() {
 Applies [`tryCatch`](https://github.com/coderaiser/try-catch):
 
 ```gs
-const [error, result] = try hello(1, 2, 3);
+const [error, result] = try hello('world');
 ```
 
 Is the same as:
 
 ```js
 import tryCatch from 'try-catch';
-const [error, result] = tryCatch(1, 2, 3);
+const [error, result] = tryCatch(hello, 'world');
 ```
 
 and
 
 ```gs
-const [error, result] = try await hello(1, 2, 3);
+const [error, result] = try await hello('world');
 ```
 
 Is the same as:
@@ -237,6 +263,25 @@ inc(5);
 6
 ```
 
+### `Import`
+
+When you import `.gs` files during compile step it will be replaced with `.js`:
+
+```gs
+// hello.js
+export const hello = () => 'world';
+
+// index.js
+import hello from './hello.gs';
+```
+
+Will be converted to:
+
+```js
+// index.js
+import hello from './hello.js';
+```
+
 ## 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/bin/gs.js

@@ -24,7 +24,7 @@ const outfile = compiledName.replace('~', '');
 
 esbuild.buildSync({
     entryPoints: [compiledName],
-    bundle: true,
+    bundle: false,
     write: true,
     outfile,
     mainFields: ['main'],

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "goldstein",
-  "version": "2.5.1",
+  "version": "3.0.0",
   "type": "module",
-  "commitType": "colon",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "JavaScript with no limits",
   "main": "./packages/goldstein/index.js",
@@ -26,27 +25,29 @@
     "fix:lint": "madrun fix:lint"
   },
   "dependencies": {
+    "@putout/printer": "^1.16.0",
     "acorn": "^8.7.1",
-    "esbuild": "^0.16.14",
-    "putout": "^28.5.0",
+    "esbuild": "^0.17.14",
+    "estree-to-babel": "^5.0.1",
+    "putout": "^29.1.11",
     "try-catch": "^3.0.1"
   },
   "license": "MIT",
   "devDependencies": {
     "@cloudcmd/stub": "^4.0.1",
     "c8": "^7.5.0",
-    "check-dts": "^0.6.3",
+    "check-dts": "^0.7.1",
     "escover": "^2.0.2",
     "eslint": "^8.0.0-beta.1",
     "eslint-plugin-n": "^15.2.4",
-    "eslint-plugin-putout": "^16.0.0",
+    "eslint-plugin-putout": "^17.2.1",
     "madrun": "^9.0.0",
     "mock-require": "^3.0.3",
     "montag": "^1.2.1",
     "nodemon": "^2.0.2",
     "runsome": "^1.0.0",
     "supertape": "^8.0.1",
-    "typescript": "^4.4.4",
+    "typescript": "^5.0.3",
     "zenload": "^2.0.0"
   },
   "engines": {

package/packages/goldstein/index.js

@@ -1,6 +1,6 @@
-import putout, {
-    print,
-} from 'putout';
+import {transform} from 'putout';
+
+import {print} from '@putout/printer';
 import {extendParser} from '../parser/index.js';
 import keywordFn from '../keyword-fn/index.js';
 import keywordGuard from '../keyword-guard/index.js';
@@ -10,6 +10,10 @@ import keywordThrow from '../keyword-throw/index.js';
 import stringInterpolation from '../string-interpolation/index.js';
 import keywordCurry from '../keyword-curry/index.js';
 import keywordFreeze from '../keyword-freeze/index.js';
+import keywordIf from '../keyword-if/index.js';
+import keywordImport from '../keyword-import/index.js';
+
+import estreeToBabel from 'estree-to-babel';
 
 export const parse = (source) => {
     const {parse} = extendParser([
@@ -20,21 +24,28 @@ export const parse = (source) => {
         keywordThrow,
         keywordCurry,
         keywordFreeze,
+        keywordIf,
+        keywordImport,
         stringInterpolation,
     ]);
     
-    return parse(source);
+    return estreeToBabel(parse(source));
 };
 
 export const compile = (source) => {
     const ast = parse(source);
-    const jsCode = print(ast);
-    const {code} = putout(jsCode, {
+    
+    transform(ast, source, {
         plugins: [
             'try-catch',
-            'declare-undefined-variables',
+            'declare',
+            'logical-expressions',
         ],
     });
     
-    return code;
+    return fixEmpty(print(ast));
+};
+
+const fixEmpty = (source) => {
+    return source.replace(';;', ';');
 };

package/packages/keyword-if/index.js

@@ -1,6 +1,4 @@
-import {
-    tokTypes as tt,
-} from '../operator/index.js';
+import {tokTypes as tt} from '../operator/index.js';
 
 export default function fn(Parser) {
     return class extends Parser {

package/packages/keyword-import/index.js

@@ -0,0 +1,34 @@
+import {tokTypes} from '../operator/index.js';
+
+const empty = [];
+
+export default function keywordImport(Parser) {
+    return class extends Parser {
+        parseImport(node) {
+            this.next();
+            
+            // import '...'
+            if (this.type === tokTypes.string) {
+                node.specifiers = empty;
+                node.source = this.parseExprAtom();
+            } else {
+                node.specifiers = this.parseImportSpecifiers();
+                this.expectContextual('from');
+                
+                node.source = this.type === tokTypes.string ? this.parseLiteral(this.value) : this.unexpected();
+            }
+            
+            const {raw, value} = node.source;
+            
+            if (value.endsWith('.gs')) {
+                node.source.raw = raw.replace('.gs', '.js');
+                node.source.value = value.replace(/\.gs$/, '.js');
+            }
+            
+            this.semicolon();
+            
+            return this.finishNode(node, 'ImportDeclaration');
+        }
+    };
+}
+

package/packages/keyword-throw/index.js

@@ -19,11 +19,13 @@ export default function keywordThrow(Parser) {
             const expression = this.parseExpression();
             
             assign(node, {
-                operator: 'throw',
-                argument: expression,
+                body: [{
+                    type: 'ThrowStatement',
+                    argument: expression,
+                }],
             });
             
-            return super.finishNode(node, 'UnaryExpression');
+            return super.finishNode(node, 'BlockStatement');
         }
     };
 }

package/packages/parser/index.js

@@ -15,4 +15,5 @@ export const extendParser = (keywords) => {
 const createParse = (parser) => (a) => parser.parse(a, {
     ecmaVersion: 'latest',
     sourceType: 'module',
+    locations: true,
 });