putout 34.10.0 → 34.11.0

package/ChangeLog

@@ -1,3 +1,9 @@
+2024.01.17, v34.11.0
+
+feature:
+- 27b2f7bda putout: add trace support
+- 286e90e7b @putout/plugin-promise: convert-new-promise-to-async: exclude resolve inside event listener'
+
 2024.01.16, v34.10.0
 
 fix:

package/bin/putout.mjs

@@ -1,22 +1,33 @@
 #!/usr/bin/env node
 
+import {
+    parentPort,
+    workerData,
+} from 'node:worker_threads';
+import process from 'node:process';
 import {
     readFile,
     writeFile,
 } from 'node:fs/promises';
-import process from 'node:process';
+import {createTrace} from './trace.mjs';
 import cli from '../lib/cli/index.js';
 
 const {stdout} = process;
 const write = stdout.write.bind(stdout);
 const logError = console.error;
 
-await cli({
+const trace = createTrace(parentPort);
+
+export default await cli({
     write,
     halt: process.exit,
-    argv: process.argv.slice(2),
+    argv: [
+        ...process.argv.slice(2),
+        ...(workerData || []).slice(2),
+    ],
     log: console.log,
     logError,
     readFile,
     writeFile,
+    trace,
 });

package/bin/trace.mjs

@@ -0,0 +1,3 @@
+export const createTrace = (parentPort) => (event, data) => {
+    parentPort?.postMessage([event, data]);
+};

package/bin/tracer.mjs

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+import {Worker} from 'node:worker_threads';
+import keyPress from '@putout/cli-keypress';
+import progressBar from '@putout/formatter-progress-bar';
+import process from 'node:process';
+
+const slave = new URL('./putout.mjs', import.meta.url);
+
+const worker = new Worker(slave, {
+    workerData: process.argv,
+    stdin: true,
+});
+
+const {isStop} = keyPress();
+
+worker.on('message', ([event, data]) => {
+    let end = false;
+    
+    if (event !== 'progress')
+        return;
+    
+    if (isStop())
+        data.index = data.count - 1;
+    
+    if (data.index === data.count - 1)
+        end = true;
+    
+    process.stdout.write(progressBar(data));
+    
+    if (end)
+        process.exit();
+});

package/lib/cli/index.js

@@ -45,6 +45,7 @@ const {
     INTERACTIVE_CANCELED,
 } = require('./exit-codes');
 
+const noop = () => {};
 const {keys} = Object;
 const {isSupported} = supportedFiles;
 const getFormatter = nanomemoize(require('./formatter/formatter').getFormatter);
@@ -60,7 +61,9 @@ const getExitCode = (wasStop) => wasStop() ? WAS_STOP : OK;
 const isStr = (a) => typeof a === 'string';
 const {isArray} = Array;
 
-module.exports = async ({argv, halt, log, write, logError, readFile, writeFile}) => {
+module.exports = async ({argv, halt, log, write, logError, readFile, writeFile, trace = noop}) => {
+    trace('start');
+    
     const {isStop} = keyPress();
     const wasStop = fullstore();
     
@@ -193,7 +196,6 @@ module.exports = async ({argv, halt, log, write, logError, readFile, writeFile})
     
     if (isStr(args.match)) {
         const {match} = await simpleImport('@putout/cli-match');
-        
         const {code, message} = await match({
             pattern: args.match,
             cwd,
@@ -312,6 +314,7 @@ module.exports = async ({argv, halt, log, write, logError, readFile, writeFile})
     };
     
     const {places, exited} = await run({
+        trace,
         fix,
         exit,
         readFile,

package/lib/cli/report.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {isArray} = Array;
+const noop = () => {};
 
 module.exports = () => {
     let filesCount = 0;
@@ -14,6 +15,7 @@ module.exports = () => {
             places,
             index = 0,
             count = 1,
+            trace = noop,
             formatterOptions = {},
         } = options;
         
@@ -25,6 +27,18 @@ module.exports = () => {
         
         errorsCount += places.length;
         
+        trace('progress', {
+            rule,
+            name,
+            options: formatterOptions,
+            source,
+            places,
+            index,
+            count,
+            filesCount,
+            errorsCount,
+        });
+        
         return await formatter({
             rule,
             name,

package/lib/cli/runner/{lint.js → reader.js}

@@ -7,7 +7,7 @@ const parseError = require('../parse-error.js');
 const {simpleImport} = require('../simple-import');
 const ignores = require('../../ignores.js');
 
-module.exports.lint = async ({raw, log, dir, resolvedName, options, readFile, fix, processFile, processorRunners}) => {
+module.exports.runReader = async ({raw, log, dir, resolvedName, options, readFile, fix, processFile, processorRunners}) => {
     let isProcessed = true;
     let places = [];
     let rawSource = '';

package/lib/cli/runner/runner.js

@@ -1,12 +1,12 @@
 'use strict';
 
-const runWorker = require('./worker.js');
+const {runWriter} = require('./writer.js');
 const initProcessFile = require('../process-file.js');
 const Report = require('../report.js');
 
 const report = Report();
 
-module.exports.run = async ({transform, plugins, noConfig, readFile, writeFile, exit, isStop, wasStop, names, write, log, rulesdir, fix, processorRunners, fileCache, currentFormat, formatterOptions, options, raw}) => {
+module.exports.run = async ({transform, plugins, noConfig, readFile, writeFile, exit, isStop, wasStop, names, write, log, rulesdir, fix, processorRunners, fileCache, currentFormat, formatterOptions, options, raw, trace}) => {
     const processFile = initProcessFile(options);
     const {length} = names;
     const places = [];
@@ -16,10 +16,11 @@ module.exports.run = async ({transform, plugins, noConfig, readFile, writeFile,
             break;
         
         wasStop(isStop());
+        
         const currentIndex = isStop() ? length - 1 : index;
         const name = names[index];
         
-        const {exited, places: currentPlaces = []} = await runWorker({
+        const {exited, places: currentPlaces = []} = await runWriter({
             readFile,
             writeFile,
             exit,
@@ -40,6 +41,7 @@ module.exports.run = async ({transform, plugins, noConfig, readFile, writeFile,
             noConfig,
             plugins,
             transform,
+            trace,
         });
         
         places.push(...currentPlaces);

package/lib/cli/runner/{worker.js → writer.js}

@@ -7,7 +7,7 @@ const {readFileSync} = require('fs');
 const tryCatch = require('try-catch');
 const getOptions = require('../get-options.js');
 const {INVALID_CONFIG, NO_PROCESSORS} = require('../exit-codes.js');
-const {lint} = require('./lint.js');
+const {runReader} = require('./reader.js');
 
 const isParser = (rule) => rule.startsWith('parser');
 const isParsingError = ({rule}) => isParser(rule);
@@ -26,9 +26,8 @@ const createFormatterProxy = (options) => {
     });
 };
 
-module.exports = async ({readFile, report, writeFile, exit, raw, write, log, currentFormat, rulesdir, formatterOptions, noConfig, transform, plugins, index, fix, processFile, processorRunners, fileCache, name, count}) => {
+module.exports.runWriter = async ({readFile, report, writeFile, exit, raw, write, log, currentFormat, rulesdir, formatterOptions, noConfig, transform, plugins, index, fix, processFile, processorRunners, fileCache, name, count, trace}) => {
     const resolvedName = resolve(name).replace(/^\./, cwd);
-    
     const [configError, options] = tryCatch(getOptions, {
         name: resolvedName,
         rulesdir,
@@ -40,9 +39,8 @@ module.exports = async ({readFile, report, writeFile, exit, raw, write, log, cur
     if (configError)
         return exit(INVALID_CONFIG, configError);
     
-    const {dir} = options;
-    
     const success = await runCache({
+        trace,
         options,
         fileCache,
         report,
@@ -60,12 +58,14 @@ module.exports = async ({readFile, report, writeFile, exit, raw, write, log, cur
             success,
         };
     
+    const {dir} = options;
+    
     const {
         places,
         isProcessed,
         rawSource,
         processedSource,
-    } = await lint({
+    } = await runReader({
         raw,
         dir,
         fix,
@@ -84,6 +84,7 @@ module.exports = async ({readFile, report, writeFile, exit, raw, write, log, cur
         places,
         index,
         count,
+        trace,
     });
     
     write(line || '');
@@ -107,7 +108,7 @@ module.exports = async ({readFile, report, writeFile, exit, raw, write, log, cur
     };
 };
 
-async function runCache({fileCache, report, write, formatterOptions, currentFormat, name, resolvedName, index, count, options}) {
+async function runCache({fileCache, report, write, formatterOptions, currentFormat, name, resolvedName, index, count, options, trace}) {
     if (!fileCache.canUseCache(name, options))
         return false;
     
@@ -118,6 +119,7 @@ async function runCache({fileCache, report, write, formatterOptions, currentForm
         places,
         index,
         count,
+        trace,
     });
     
     const line = await report(currentFormat, formatterProxy);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "putout",
-  "version": "34.10.0",
+  "version": "34.11.0",
   "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",
@@ -26,7 +26,8 @@
     "./ignores": "./lib/ignores.js"
   },
   "bin": {
-    "putout": "bin/putout.mjs"
+    "putout": "bin/putout.mjs",
+    "trace": "bin/tracer.mjs"
   },
   "repository": {
     "type": "git",
@@ -34,16 +35,16 @@
   },
   "scripts": {
     "wisdom": "madrun wisdom",
-    "test:raw": "madrun test:raw",
     "test": "madrun test",
+    "test:raw": "madrun test:raw",
     "watch:test": "madrun watch:test",
     "lint": "madrun lint",
+    "trace": "madrun trace",
     "fresh:lint": "madrun fresh:lint",
     "fix:lint": "madrun fix:lint",
     "fix:lint:fresh": "madrun fix:lint:fresh",
     "lint:progress": "madrun lint:progress",
     "lint:fresh": "madrun lint:fresh",
-    "coverage:raw": "madrun coverage:raw",
     "coverage": "madrun coverage",
     "report": "madrun report"
   },