@putout/engine-parser 6.0.0 → 6.2.0

package/README.md

@@ -39,11 +39,23 @@ You can use brand new [`@putout/printer`](https://github.com/putoutjs/printer) w
 
 ```js
 const ast = parse(source, {
-    printer: '@putout/printer',
+    printer: 'putout',
 });
 
 const code = print(ast, {
-    printer: '@putout/printer',
+    printer: 'putout',
+});
+```
+
+When you need to pass options, use:
+
+```js
+const code = print(ast, {
+    printer: ['putout', {
+        format: {
+            indent: '    ',
+        },
+    }],
 });
 ```
 
@@ -78,11 +90,14 @@ You have two ways to benefit from source map generation:
 
 ```js
 const source = `const hello = 'world';`;
+
 const ast = parse(source, {
     sourceFileName: 'hello.js',
 });
 
-print(ast, {sourceMapName: 'hello.map'});
+print(ast, {
+    sourceMapName: 'hello.map',
+});
 // returns
 `const hello = 'world';
 {"version":3,"sources":["hello.js"],"names":[],"mappings":"AAAA...","file":"hello.map","sourcesContent":["const hello = 'world';"]}`;
@@ -101,11 +116,17 @@ const ast = babel.parse(source, {
     sourceFilename: 'hello.js',
 });
 
-generate(ast, {sourceMaps: true}, {
+generate(ast, {
+    sourceMaps: true,
+}, {
     'hello.js': source,
 });
+
 // returns
-({code, map});
+({
+    code,
+    map,
+});
 ```
 
 ## Example

package/lib/custom-parser.js

@@ -7,7 +7,6 @@ const esprima = require('./parsers/esprima');
 const tenko = require('./parsers/tenko');
 const hermes = require('./parsers/hermes');
 const secondChance = require('./second-chance');
-
 const isObject = (a) => typeof a === 'object';
 
 module.exports = (source, parser, {isTS, isFlow, isJSX}) => {
@@ -55,4 +54,3 @@ function customParse(source, {parser, isTS, isFlow, isJSX}) {
     
     return require(parser).parse(source);
 }
-

package/lib/generate.js

@@ -9,4 +9,3 @@ module.exports = (node, options, sourceMaps) => {
         ...options,
     }, sourceMaps);
 };
-

package/lib/parser.js

@@ -9,4 +9,3 @@ module.exports.print = print;
 module.exports.parse = parse;
 module.exports.generate = generate;
 module.exports.template = template;
-

package/lib/parsers/acorn.js

@@ -12,6 +12,7 @@ const initAcorn = once(() => {
 
 module.exports.parse = function acornParse(source) {
     const parser = initAcorn();
+    
     const options = {
         locations: true,
         comment: true,
@@ -30,4 +31,3 @@ module.exports.parse = function acornParse(source) {
         tokens: tokensToAvoidEsprima,
     };
 };
-

package/lib/parsers/babel/index.js

@@ -11,10 +11,8 @@ process.env.BABEL_TYPES_8_BREAKING = true;
 
 const plugins = require('./plugins');
 const options = require('./options');
-
 const moveOutDirectives = require('./move-out-directives');
-
-const getFlow = (a) => a.includes('// @flow');
+const getFlow = (a) => !a.indexOf('// @flow');
 const clean = (a) => a.filter(Boolean);
 const initBabel = once(() => require('@babel/parser'));
 const {assign} = Object;
@@ -24,6 +22,7 @@ const {assign} = Object;
 // babel, putout: sourceFilename
 module.exports.parse = function babelParse(source, {sourceFilename, isTS, isJSX = true, isFlow = getFlow(source)}) {
     const {parse} = initBabel();
+    
     const parserOptions = {
         sourceType: 'module',
         tokens: true,
@@ -43,7 +42,6 @@ module.exports.parse = function babelParse(source, {sourceFilename, isTS, isJSX
     });
     
     const ast = parse(source, parserOptions);
-    
     moveOutDirectives(ast);
     
     return ast;
@@ -55,16 +53,10 @@ function getBabelLangExts({isTS, isFlow, isJSX}) {
     ];
     
     if (isTS)
-        return langs.concat([
-            'typescript',
-        ]);
+        return langs.concat(['typescript']);
     
     if (isFlow)
-        return langs.concat([
-            'flow',
-            'flowComments',
-        ]);
+        return langs.concat(['flow', 'flowComments']);
     
     return langs;
 }
-

package/lib/parsers/babel/move-out-directives.js

@@ -18,12 +18,8 @@ module.exports = (ast) => {
     
     for (const directive of directives) {
         const {value} = directive.value;
-        
-        body.unshift(
-            ExpressionStatement(StringLiteral(value)),
-        );
+        body.unshift(ExpressionStatement(StringLiteral(value)));
     }
     
     return ast;
 };
-

package/lib/parsers/babel/options.js

@@ -5,4 +5,3 @@ module.exports = {
     allowUndeclaredExports: true,
     allowImportExportEverywhere: true,
 };
-

package/lib/parsers/babel/plugins.js

@@ -15,4 +15,3 @@ module.exports = [
     'throwExpressions',
     'recordAndTuple',
 ];
-

package/lib/parsers/espree.js

@@ -18,4 +18,3 @@ module.exports.parse = function espreeParse(source) {
         },
     });
 };
-

package/lib/parsers/esprima.js

@@ -14,4 +14,3 @@ module.exports.parse = function esprimaParse(source) {
         jsx: true,
     });
 };
-

package/lib/parsers/hermes.js

@@ -1,11 +1,11 @@
 'use strict';
 
 const once = require('once');
-
 const initHermes = once(() => require('hermes-parser'));
 
 module.exports.parse = function hermesParse(source) {
     const parser = initHermes();
+    
     const options = {
         babel: true,
         allowReturnOutsideFunction: true,
@@ -18,4 +18,3 @@ module.exports.parse = function hermesParse(source) {
     
     return result;
 };
-

package/lib/parsers/tenko.js

@@ -5,6 +5,7 @@ const initTenko = once(() => require('tenko'));
 
 module.exports.parse = (source) => {
     const {Tenko} = initTenko();
+    
     const {ast} = Tenko(source, {
         goalMode: 'module',
         allowGlobalReturn: true,
@@ -13,4 +14,3 @@ module.exports.parse = (source) => {
     
     return ast;
 };
-

package/lib/print.js

@@ -3,16 +3,20 @@
 const recast = require('@putout/recast');
 const putoutPrinter = require('@putout/printer');
 const generate = require('@babel/generator').default;
+
 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,
-        printer = 'recast',
-    } = options;
+    const {sourceMapName} = options;
+    
+    const [printer = 'recast', printerOptions] = maybeArray(options.printer);
     
     if (printer === 'recast') {
         const printOptions = {
@@ -21,8 +25,8 @@ module.exports = (ast, options = {}) => {
             wrapColumn: Infinity,
             ...options,
         };
-        const printed = recast.print(ast, printOptions);
         
+        const printed = recast.print(ast, printOptions);
         const {map} = printed;
         const code = fixStrictMode(printed.code);
         
@@ -35,7 +39,7 @@ module.exports = (ast, options = {}) => {
     if (printer === 'babel')
         return babelPrint(ast);
     
-    return putoutPrinter.print(ast);
+    return putoutPrinter.print(ast, printerOptions);
 };
 
 function babelPrint(ast) {

package/lib/second-chance.js

@@ -15,4 +15,3 @@ module.exports = (fn, source, a, b) => {
     
     throw errorA;
 };
-

package/lib/template.js

@@ -2,7 +2,6 @@
 
 const template = require('@babel/template').default;
 const memo = require('nano-memoize');
-
 const plugins = require('./parsers/babel/plugins');
 const options = require('./parsers/babel/options');
 
@@ -59,4 +58,3 @@ module.exports.ast.fresh = (value, options) => {
     
     return result.expression || result;
 };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-parser",
-  "version": "6.0.0",
+  "version": "6.2.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout parser",