@putout/engine-parser 11.3.0 → 12.0.0

package/README.md

@@ -73,33 +73,6 @@ create node without `memoization`.
 
 Extract `expression` node from `ExpressionStatement`.
 
-### Sourcemaps
-
-You have two ways to benefit from source map generation:
-
-- using `Recast` print;
-- using `Babel` generator;
-
-#### Generate sourcemaps using Recast
-
-```js
-const source = `const hello = 'world';`;
-
-const ast = parse(source, {
-    printer: 'recast',
-    sourceFileName: 'hello.js',
-});
-
-print(ast, {
-    printer: 'recast',
-    sourceMapName: 'hello.map',
-});
-
-// returns
-`const hello = 'world';
-{"version":3,"sources":["hello.js"],"names":[],"mappings":"AAAA...","file":"hello.map","sourcesContent":["const hello = 'world';"]}`;
-```
-
 #### Generate sourcemaps using Babel
 
 To generate sourcemap using babel generator, you should use babel parser before.
@@ -107,9 +80,9 @@ This is low level transformation, because `Babel` doesn't preserve any formattin
 
 ```js
 const {generate} = require('@putout/engine-parser');
-const babel = require('@putout/engine-parser/babel');
+const {parse} = require('@putout/engine-parser/babel');
 
-const ast = babel.parse(source, {
+const ast = parse(source, {
     sourceFilename: 'hello.js',
 });
 

package/lib/parse.js

@@ -1,9 +1,7 @@
 'use strict';
 
-const recast = require('recast');
 const toBabel = require('estree-to-babel');
 const customParser = require('./custom-parser');
-const moveOutDirectives = require('./recast/move-out-directives');
 
 module.exports = (source, options) => {
     const {
@@ -12,7 +10,6 @@ module.exports = (source, options) => {
         isTS,
         isFlow,
         isJSX,
-        sourceFileName,
     } = options || {};
     
     const cookedParser = getParser({
@@ -21,19 +18,12 @@ module.exports = (source, options) => {
         isTS,
         isFlow,
         isJSX,
-        sourceFileName,
     });
     
-    if (printer !== 'recast')
-        return cookedParser.parse(source);
-    
-    return recast.parse(source, {
-        sourceFileName,
-        parser: cookedParser,
-    });
+    return cookedParser.parse(source);
 };
 
-const getParser = ({parser = 'babel', isTS, isFlow, isJSX, printer}) => ({
+const getParser = ({parser = 'babel', isTS, isFlow, isJSX}) => ({
     parse(source) {
         const ast = toBabel(customParser(source, parser, {
             isTS,
@@ -41,9 +31,6 @@ const getParser = ({parser = 'babel', isTS, isFlow, isJSX, printer}) => ({
             isJSX,
         }));
         
-        if (printer === 'recast')
-            moveOutDirectives(ast);
-        
         return ast;
     },
 });

package/lib/parsers/acorn.js

@@ -4,15 +4,15 @@ const once = require('once');
 
 const initAcorn = once(() => {
     const {Parser} = require('acorn');
-    const jsx = require('acorn-jsx');
+    
     const stage3 = require('acorn-stage3');
+    const typescript = require('acorn-typescript').default;
     
-    return Parser.extend(stage3, jsx());
+    return Parser.extend(typescript(), stage3);
 });
 
 module.exports.parse = function acornParse(source) {
     const parser = initAcorn();
-    
     const options = {
         locations: true,
         comment: true,
@@ -21,6 +21,7 @@ module.exports.parse = function acornParse(source) {
         allowAwaitOutsideFunction: true,
         allowReturnOutsideFunction: true,
         allowImportExportEverywhere: true,
+        preserveParens: true,
     };
     
     const tokensToAvoidEsprima = Array.from(parser.tokenizer(source, options));

package/lib/parsers/babel/index.js

@@ -7,16 +7,13 @@ const options = require('./options');
 const getFlow = (a) => !a.indexOf('// @flow');
 const clean = (a) => a.filter(Boolean);
 const initBabel = once(() => require('@putout/babel'));
-const {assign} = Object;
 
-// There is a difference in options naming for babel and recast
-// recast -> sourceFileName
-// babel, putout: sourceFilename
-module.exports.parse = function babelParse(source, {sourceFilename, isTS, isJSX = true, isFlow = getFlow(source), isRecovery}) {
+module.exports.parse = function babelParse(source, {sourceFileName, isTS, isJSX = true, isFlow = getFlow(source), isRecovery}) {
     const {parse} = initBabel();
     const parserOptions = {
+        sourceFileName,
         sourceType: 'module',
-        tokens: true,
+        tokens: false,
         ...options,
         errorRecovery: isRecovery,
         plugins: clean([
@@ -29,10 +26,6 @@ module.exports.parse = function babelParse(source, {sourceFilename, isTS, isJSX
         ]),
     };
     
-    sourceFilename && assign(parserOptions, {
-        sourceFilename,
-    });
-    
     return parse(source, parserOptions);
 };
 
@@ -41,11 +34,8 @@ function getBabelLangExts({isTS, isFlow, isJSX}) {
         isJSX && 'jsx',
     ];
     
-    if (isTS)
+    if (isTS || isFlow)
         return langs.concat(['typescript']);
     
-    if (isFlow)
-        return langs.concat(['flow', 'flowComments']);
-    
     return langs;
 }

package/lib/print.js

@@ -1,44 +1,15 @@
 'use strict';
 
-const recast = require('recast');
 const putoutPrinter = require('@putout/printer');
 const {generate} = require('@putout/babel');
 
-const {stringify} = JSON;
 const {isArray} = Array;
 
 const maybeArray = (a) => isArray(a) ? a : [a, {}];
 
-const btoa = (a) => Buffer
-    .from(a, 'binary')
-    .toString('base64');
-
-const addSourceMap = (sourceMapName, {code, map}) => !sourceMapName ? code : `${code}\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,${btoa(stringify(map))}\n`;
-const fixStrictMode = (a) => a.replace(`\n\n\n'use strict'`, `\n\n'use strict'`);
-
 module.exports = (ast, options = {}) => {
-    const {sourceMapName} = options;
     const [printer = 'putout', printerOptions] = maybeArray(options.printer);
     
-    if (printer === 'recast') {
-        const printOptions = {
-            quote: 'single',
-            objectCurlySpacing: false,
-            wrapColumn: Infinity,
-            ...options,
-            ...printerOptions,
-        };
-        
-        const printed = recast.print(ast, printOptions);
-        const {map} = printed;
-        const code = fixStrictMode(printed.code);
-        
-        return addSourceMap(sourceMapName, {
-            code,
-            map,
-        });
-    }
-    
     if (printer === 'babel')
         return babelPrint(ast);
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-parser",
-  "version": "11.3.0",
+  "version": "12.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout parser",
@@ -38,7 +38,6 @@
     "estree-to-babel": "^10.0.0",
     "nano-memoize": "^3.0.11",
     "once": "^1.4.0",
-    "recast": "^0.23.9",
     "try-catch": "^3.0.0"
   },
   "keywords": [
@@ -47,12 +46,12 @@
   ],
   "devDependencies": {
     "acorn": "^8.1.1",
-    "acorn-jsx": "^5.0.2",
     "acorn-stage3": "^4.0.0",
+    "acorn-typescript": "^1.4.13",
     "c8": "^10.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^23.0.0",
+    "eslint-plugin-putout": "^24.0.0",
     "espree": "^10.0.0",
     "esprima": "^4.0.1",
     "hermes-parser": "^0.26.0",

package/lib/recast/move-out-directives.js

@@ -1,30 +0,0 @@
-'use strict';
-
-const {types} = require('@putout/babel');
-const {
-    StringLiteral,
-    ExpressionStatement,
-} = types;
-
-const {assign} = Object;
-
-module.exports = (ast) => {
-    const {body, directives} = ast.program;
-    
-    if (!directives.length)
-        return ast;
-    
-    ast.program.directives = [];
-    
-    for (const directive of directives) {
-        const {leadingComments} = directive;
-        const {value} = directive.value;
-        const expression = assign(ExpressionStatement(StringLiteral(value)), {
-            leadingComments,
-        });
-        
-        body.unshift(expression);
-    }
-    
-    return ast;
-};