putout 31.7.0 → 31.8.1

package/ChangeLog

@@ -1,3 +1,19 @@
+2023.08.31, v31.8.1
+
+feature:
+- c8319fbc9 package: @putout/plugin-for-of v3.0.0
+- 969cd067f @putout/plugin-for-of: for-each: report
+- 83fa6b0de @putout/plugin-nodejs: declare: process: improve Deno support
+
+2023.08.29, v31.8.0
+
+feature:
+- 182b6aaf7 @putout/engine-loader: re-structure
+- 3ded6f846 putout: putoutAsync: simplify
+- 06c131ab6 @putout/engine-loader: import: shorten
+- d79e746e8 scripts: generate-schema: add
+- 57d3261e4 @putout/plugin-minify: convert to ESM
+
 2023.08.28, v31.7.0
 
 feature:

package/bin/putout.mjs

@@ -4,6 +4,7 @@ import {
     readFile,
     writeFile,
 } from 'node:fs/promises';
+import process from 'node:process';
 import cli from '../lib/cli/index.js';
 
 const {stdout} = process;

package/lib/cli/get-options.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('process');
 const {join, dirname} = require('path');
 
 const buildPlugins = require('./build-plugins');

package/lib/cli/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('process');
 const tryToCatch = require('try-to-catch');
 
 const yargsParser = require('yargs-parser');

package/lib/loader.mjs

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import putout from './putout.js';
 import ignores from './ignores.js';
 import parseOptions from './parse-options/index.js';

package/lib/parse-options/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('process');
 const {homedir} = require('os');
 const {readdirSync} = require('fs');
 

package/lib/parse-options/parse-sep.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {platform} = process;
+const {platform} = require('process');
 
 module.exports = (a) => {
     a = wild(a);

package/lib/putout.js

@@ -14,12 +14,6 @@ const {
 
 const {cutShebang, mergeShebang} = require('./shebang');
 
-const {
-    putoutAsync,
-    transformAsync,
-    findPlacesAsync,
-} = require('./putout-async');
-
 const isString = (a) => typeof a === 'string';
 
 const defaultOpts = (opts = {}) => {
@@ -29,6 +23,7 @@ const defaultOpts = (opts = {}) => {
         fix = true,
         fixCount = 2,
         loadPlugins = loader.loadPlugins,
+        loadPluginsAsync = loader.loadPluginsAsync,
         runPlugins = runner.runPlugins,
     } = opts;
     
@@ -39,6 +34,7 @@ const defaultOpts = (opts = {}) => {
         fix,
         fixCount,
         loadPlugins,
+        loadPluginsAsync,
         runPlugins,
     };
 };
@@ -89,8 +85,52 @@ module.exports = (source, opts) => {
     };
 };
 
-module.exports.putoutAsync = putoutAsync;
-module.exports.findPlacesAsync = findPlacesAsync;
+module.exports.putoutAsync = async (source, opts) => {
+    check(source);
+    opts = defaultOpts(opts);
+    
+    const {
+        parser,
+        isTS,
+        isFlow,
+        isJSX,
+        sourceFileName,
+        sourceMapName,
+        printer,
+    } = opts;
+    
+    const [clearSource, shebang] = cutShebang(source);
+    
+    const ast = parse(clearSource, {
+        sourceFileName,
+        parser,
+        isTS,
+        isFlow,
+        isJSX,
+        printer,
+    });
+    
+    const places = await transformAsync(ast, source, opts);
+    
+    if (!opts.fix)
+        return {
+            code: source,
+            places,
+        };
+    
+    const printed = print(ast, {
+        sourceMapName,
+        printer,
+    });
+    
+    const code = mergeShebang(shebang, printed);
+    
+    return {
+        code,
+        places,
+    };
+};
+
 module.exports.transformAsync = transformAsync;
 module.exports.findPlaces = (ast, source, opts) => {
     return transform(ast, source, {
@@ -98,6 +138,44 @@ module.exports.findPlaces = (ast, source, opts) => {
         fix: false,
     });
 };
+module.exports.findPlacesAsync = async (ast, source, opts) => {
+    return await transformAsync(ast, source, {
+        ...opts,
+        fix: false,
+    });
+};
+
+async function transformAsync(ast, source, opts) {
+    opts = defaultOpts(opts);
+    
+    const {
+        plugins: pluginNames,
+        cache,
+        rules,
+        fix,
+        fixCount,
+        loadPluginsAsync,
+        runPlugins,
+    } = opts;
+    
+    const [, shebang] = cutShebang(source);
+    
+    const plugins = await loadPluginsAsync({
+        pluginNames,
+        cache,
+        rules,
+    });
+    
+    const places = runPlugins({
+        ast,
+        shebang,
+        fix,
+        fixCount,
+        plugins,
+    });
+    
+    return places;
+}
 
 // why we pass 'source' to 'transform()'?
 // because we need to calculate position in a right way

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "putout",
-  "version": "31.7.0",
+  "version": "31.8.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊 Pluggable and configurable code transformer with built-in ESLint, Babel and support of js, jsx, typescript, flow, markdown, yaml and json",
@@ -100,7 +100,7 @@
     "@putout/plugin-eslint": "^5.0.0",
     "@putout/plugin-extract-object-properties": "^9.0.0",
     "@putout/plugin-extract-sequence-expressions": "^3.0.0",
-    "@putout/plugin-for-of": "^2.0.0",
+    "@putout/plugin-for-of": "^3.0.0",
     "@putout/plugin-github": "^7.0.0",
     "@putout/plugin-gitignore": "^3.0.0",
     "@putout/plugin-logical-expressions": "^4.0.0",

package/lib/putout-async.js

@@ -1,160 +0,0 @@
-'use strict';
-
-const {traverse, types} = require('@putout/babel');
-
-const loader = require('@putout/engine-loader');
-const runner = require('@putout/engine-runner');
-
-const {
-    parse,
-    print,
-    generate,
-    template,
-} = require('@putout/engine-parser');
-
-const {cutShebang, mergeShebang} = require('./shebang');
-
-const isString = (a) => typeof a === 'string';
-
-const defaultOpts = (opts = {}) => {
-    const {
-        parser = 'babel',
-        printer = opts.printer || 'putout',
-        fix = true,
-        fixCount = 2,
-        loadPlugins = loader.loadPlugins,
-        loadPluginsAsync = loader.loadPluginsAsync,
-        runPlugins = runner.runPlugins,
-    } = opts;
-    
-    return {
-        ...opts,
-        parser,
-        printer,
-        fix,
-        fixCount,
-        loadPlugins,
-        loadPluginsAsync,
-        runPlugins,
-    };
-};
-
-module.exports.putoutAsync = async (source, opts) => {
-    check(source);
-    opts = defaultOpts(opts);
-    
-    const {
-        parser,
-        isTS,
-        isFlow,
-        isJSX,
-        sourceFileName,
-        sourceMapName,
-        printer,
-    } = opts;
-    
-    const [clearSource, shebang] = cutShebang(source);
-    
-    const ast = parse(clearSource, {
-        sourceFileName,
-        parser,
-        isTS,
-        isFlow,
-        isJSX,
-        printer,
-    });
-    
-    const places = await transformAsync(ast, source, opts);
-    
-    if (!opts.fix)
-        return {
-            code: source,
-            places,
-        };
-    
-    const printed = print(ast, {
-        sourceMapName,
-        printer,
-    });
-    
-    const code = mergeShebang(shebang, printed);
-    
-    return {
-        code,
-        places,
-    };
-};
-
-module.exports.findPlacesAsync = async (ast, source, opts) => {
-    return await transformAsync(ast, source, {
-        ...opts,
-        fix: false,
-    });
-};
-
-// why we pass 'source' to 'transform()'?
-// because we need to calculate position in a right way
-// and determine is shebang is exists
-//
-// 25     return {¬
-// 26         line: shebang ? line + 1 : line,¬
-// 27         column,¬
-// 28     };¬
-//
-module.exports.transformAsync = transformAsync;
-async function transformAsync(ast, source, opts) {
-    opts = defaultOpts(opts);
-    
-    const {
-        plugins: pluginNames,
-        cache,
-        rules,
-        fix,
-        fixCount,
-        loadPluginsAsync,
-        runPlugins,
-    } = opts;
-    
-    const [, shebang] = cutShebang(source);
-    
-    const plugins = await loadPluginsAsync({
-        pluginNames,
-        cache,
-        rules,
-    });
-    
-    const places = runPlugins({
-        ast,
-        shebang,
-        fix,
-        fixCount,
-        plugins,
-    });
-    
-    return places;
-}
-
-module.exports.parse = parse;
-module.exports.print = print;
-module.exports.traverse = traverse;
-module.exports.types = types;
-module.exports.template = template;
-module.exports.generate = generate;
-module.exports.initReport = require('./cli/report');
-
-module.exports.operator = {
-    ...require('@putout/operate'),
-    ...require('@putout/compare'),
-    ...require('@putout/traverse'),
-    ...require('@putout/operator-declare'),
-    ...require('@putout/operator-regexp'),
-    ...require('@putout/operator-add-args'),
-};
-
-module.exports.ignores = require('./ignores');
-module.exports.codeframe = require('./codeframe');
-
-function check(source) {
-    if (!isString(source))
-        throw Error(`☝️ Looks like 'source' has type '${typeof source}', expected: 'string'`);
-}