goldstein 3.2.3 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldstein",
-  "version": "3.2.3",
+  "version": "3.3.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "JavaScript with no limits",
@@ -29,27 +29,27 @@
     "wisdom": "madrun wisdom"
   },
   "dependencies": {
-    "@putout/printer": "^1.16.0",
+    "@putout/printer": "^2.61.0",
     "acorn": "^8.7.1",
-    "esbuild": "^0.17.14",
+    "esbuild": "^0.18.11",
     "esbuild-node-builtins": "^0.1.0",
-    "estree-to-babel": "^5.0.1",
-    "putout": "^29.1.11",
+    "estree-to-babel": "^6.0.0",
+    "putout": "^30.2.0",
     "try-catch": "^3.0.1"
   },
   "license": "MIT",
   "devDependencies": {
     "@cloudcmd/stub": "^4.0.1",
-    "c8": "^7.5.0",
+    "c8": "^8.0.0",
     "check-dts": "^0.7.1",
-    "escover": "^2.0.2",
+    "escover": "^3.4.0",
     "eslint": "^8.0.0-beta.1",
-    "eslint-plugin-n": "^15.2.4",
-    "eslint-plugin-putout": "^17.2.1",
+    "eslint-plugin-n": "^16.0.1",
+    "eslint-plugin-putout": "^18.0.0",
     "madrun": "^9.0.0",
     "mock-require": "^3.0.3",
     "montag": "^1.2.1",
-    "nodemon": "^2.0.2",
+    "nodemon": "^3.0.1",
     "runsome": "^1.0.0",
     "supertape": "^8.0.1",
     "typescript": "^5.0.3",

package/packages/goldstein/index.js

@@ -4,9 +4,8 @@ import {parse} from './parser.js';
 import estreeToBabel from 'estree-to-babel';
 
 export * from './parser.js';
-
 export const compile = (source, options = {}) => {
-    const ast = estreeToBabel(parse(source));
+    const ast = estreeToBabel(parse(source, options));
     
     transform(ast, source, {
         rules: {
@@ -19,12 +18,9 @@ export const compile = (source, options = {}) => {
         ],
     });
     
-    const {keywords} = options;
-    
-    return fixEmpty(print(ast, {keywords}));
+    return fixEmpty(print(ast));
 };
 
-const fixEmpty = (source) => {
-    return source.replace(';;', ';');
+export const fixEmpty = (source) => {
+    return source.replace(/;(\s+)?;/g, ';');
 };
-

package/packages/goldstein/parser.js

@@ -27,7 +27,11 @@ const defaultKeywords = {
 
 export const keywords = defaultKeywords;
 
-export const parse = (source, options, keywords = defaultKeywords) => {
-    const {parse} = extendParser(Object.values(keywords));
+export const parse = (source, options = {}, keywords = defaultKeywords) => {
+    const {parse} = extendParser(Object.values({
+        ...options.keywords,
+        ...keywords,
+    }));
+    
     return parse(source);
 };

package/packages/keyword-arrow/index.js

@@ -1,6 +1,4 @@
-import {
-    tokTypes as tt,
-} from 'acorn';
+import {tokTypes as tt} from 'acorn';
 
 export default function fn(Parser) {
     return class extends Parser {
@@ -12,7 +10,6 @@ export default function fn(Parser) {
                 node = this.startNode();
             
             node.body = [];
-            
             // optionally parse arrow
             this.eat(tt.arrow);
             this.expect(tt.braceL);

package/packages/keyword-curry/index.js

@@ -13,6 +13,7 @@ export default function keywordCurry(Parser) {
             
             return super.parseSubscript(base, startPos, startLoc, noCalls, maybeAsyncArrow, optionalChained, forInit);
         }
+        
         parseCurry(base, startPos, startLoc) {
             const node = this.startNodeAt(startPos, startLoc);
             const isParenL = this.eat(tt.parenL);

package/packages/keyword-fn/index.js

@@ -14,6 +14,7 @@ export default function fn(Parser) {
             
             return super.parse();
         }
+        
         parseStatement(context, topLevel, exports) {
             if (this.type === Parser.acorn.keywordTypes.fn) {
                 this.type = Parser.acorn.keywordTypes.function;
@@ -21,6 +22,7 @@ export default function fn(Parser) {
             
             return super.parseStatement(context, topLevel, exports);
         }
+        
         shouldParseExportStatement() {
             if (this.type === Parser.acorn.keywordTypes.fn) {
                 return true;

package/packages/keyword-freeze/index.js

@@ -11,6 +11,7 @@ const {
 
 export default function keywordFreeze(Parser) {
     const {keywordTypes} = Parser.acorn;
+    
     keywordTypes.freeze = new TokenType('freeze', {
         keyword: 'freeze',
     });
@@ -20,6 +21,7 @@ export default function keywordFreeze(Parser) {
             this.keywords = addKeyword('freeze', this.keywords);
             return super.parse();
         }
+        
         parseStatement(context, topLevel, exports) {
             if (this.type === keywordTypes.freeze) {
                 return this.parseFreeze();
@@ -43,12 +45,9 @@ export default function keywordFreeze(Parser) {
                             type: 'Identifier',
                             name: 'freeze',
                         },
-                        arguments: [
-                            expression,
-                        ],
+                        arguments: [expression],
                     },
                 };
-            
             else
                 this.raise(this.start, `After 'freeze' only objects and arrays can come`);
             

package/packages/keyword-guard/index.js

@@ -6,6 +6,7 @@ import {
 
 export default function newSpeak(Parser) {
     const {keywordTypes} = Parser.acorn;
+    
     keywordTypes.guard = new TokenType('guard', {
         keyword: 'guard',
     });
@@ -15,6 +16,7 @@ export default function newSpeak(Parser) {
             this.keywords = addKeyword('guard', this.keywords);
             return super.parse();
         }
+        
         parseStatement(context, topLevel, exports) {
             if (this.type === keywordTypes.guard) {
                 return this.parseGuard();

package/packages/keyword-should/index.js

@@ -12,6 +12,7 @@ const {
 
 export default function newSpeak(Parser) {
     const {keywordTypes} = Parser.acorn;
+    
     keywordTypes.should = new TokenType('should', {
         keyword: 'should',
     });
@@ -21,6 +22,7 @@ export default function newSpeak(Parser) {
             this.keywords = addKeyword('should', this.keywords);
             return super.parse();
         }
+        
         parseStatement(context, topLevel, exports) {
             if (this.type === keywordTypes.should) {
                 return this.parseShould();
@@ -61,7 +63,6 @@ export default function newSpeak(Parser) {
                         },
                     },
                 };
-            
             else if (isAwaitExpression(expression))
                 node.expression = {
                     type: 'TryStatement',
@@ -80,7 +81,6 @@ export default function newSpeak(Parser) {
                         },
                     },
                 };
-            
             else
                 this.raise(this.start, `After 'should' only 'await' and 'function call' can come`);
             

package/packages/keyword-try/index.js

@@ -44,7 +44,6 @@ export default function newSpeak(Parser) {
                         ...expression.arguments,
                     ],
                 };
-            
             else if (isAwaitExpression(expression))
                 node.expression = {
                     type: 'AwaitExpression',
@@ -60,12 +59,12 @@ export default function newSpeak(Parser) {
                         ],
                     },
                 };
-            
             else
                 this.raise(this.start, `After 'try' only '{', 'await' and 'function call' can come`);
             
             return super.finishNode(node, 'ExpressionStatement');
         }
+        
         parseUglyTry(node) {
             node.block = this.parseBlock();
             node.handler = null;

package/packages/operator/index.js

@@ -1,6 +1,5 @@
 export * from 'acorn';
 export * from './scopeflags.js';
-
 export function addKeyword(keyword, keywords) {
     const str = keywords
         .toString()
@@ -9,3 +8,4 @@ export function addKeyword(keyword, keywords) {
     
     return RegExp(str);
 }
+

package/packages/operator/scopeflags.js

@@ -1,6 +1,5 @@
 // Each scope gets a bitset that may contain these flags
-export const
-    SCOPE_TOP = 1,
+export const SCOPE_TOP = 1,
     SCOPE_FUNCTION = 2,
     SCOPE_ASYNC = 4,
     SCOPE_GENERATOR = 8,
@@ -12,8 +11,7 @@ export const
     SCOPE_VAR = SCOPE_TOP | SCOPE_FUNCTION | SCOPE_CLASS_STATIC_BLOCK;
 
 // Used in checkLVal* and declareName to determine the type of a binding
-export const
-    BIND_NONE = 0, // Not a binding
+export const BIND_NONE = 0, // Not a binding
     BIND_VAR = 1, // Var-style binding
     BIND_LEXICAL = 2, // Let- or const-style binding
     BIND_FUNCTION = 3, // Function declaration

package/packages/parser/index.js

@@ -1,9 +1,7 @@
 import {Parser} from 'acorn';
 
 export const extendParser = (keywords) => {
-    const parser = Parser.extend(
-        ...keywords,
-    );
+    const parser = Parser.extend(...keywords);
     
     const parse = createParse(parser);
     
@@ -17,6 +15,7 @@ const createParse = (parser) => (source) => {
         ecmaVersion: 'latest',
         sourceType: 'module',
         locations: true,
+        comment: true,
     };
     
     const result = parser.parse(source, options);

package/packages/string-interpolation/index.js

@@ -1,4 +1,5 @@
 import {template} from 'putout';
+
 const isString = (a) => typeof a === 'string';
 const {assign} = Object;
 
@@ -19,7 +20,6 @@ export default function stringInterpolation(Parser) {
                 if (char === '(') {
                     // keep count of parenthesis
                     parenthesis++;
-                    
                     // check if previous token was "/" (only if literal is not opened yet)
                     const prev = index - 1;
                     
@@ -28,7 +28,6 @@ export default function stringInterpolation(Parser) {
                         out[prev] = '$';
                         // set current char to "{"
                         char = '{';
-                        
                         // set literalOpened to true
                         literalOpened = true;
                         // match TemplateLiteral instead of StringLiteral
@@ -37,9 +36,8 @@ export default function stringInterpolation(Parser) {
                 } else if (char === ')') {
                     parenthesis--;
                     
-                    if (parenthesis === 0 && literalOpened) {
+                    if (!parenthesis && literalOpened) {
                         char = '}';
-                        
                         // reset literalOpened to false
                         literalOpened = false;
                     }
@@ -52,7 +50,7 @@ export default function stringInterpolation(Parser) {
                 const node = this.startNode();
                 this.next();
                 
-                const {quasis, expressions} = template.ast('`' + out.join('') + '`');
+                const {quasis, expressions} = template.ast(`\`${out.join('')}\``);
                 
                 assign(node, {
                     quasis,