putout 26.9.2 → 26.9.3

package/ChangeLog

@@ -1,3 +1,9 @@
+2022.05.31, v26.9.3
+
+feature:
+- (putout) cli: get rid of rawPlaces
+
+
 2022.05.31, v26.9.2
 
 feature:

package/lib/cli/index.js

@@ -20,8 +20,6 @@ const {
     defaultProcessors,
 } = require('@putout/engine-processor');
 
-const merge = require('../merge');
-
 const getFiles = require('./get-files');
 const {createCache} = require('@putout/cli-cache');
 const supportedFiles = require('./supported-files');
@@ -277,7 +275,7 @@ module.exports = async ({argv, halt, log, write, logError, readFile, writeFile})
         plugins,
     };
     
-    const {rawPlaces, exited} = await run({
+    const {places, exited} = await run({
         fix,
         exit,
         readFile,
@@ -301,13 +299,11 @@ module.exports = async ({argv, halt, log, write, logError, readFile, writeFile})
     if (exited)
         return;
     
-    const mergedPlaces = merge(...rawPlaces);
-    
     fileCache.reconcile();
     
     if (enableAll || disableAll) {
         const {ruler} = await simpleImport('@putout/cli-ruler');
-        await ruler({enableAll, disableAll, readFile, writeFile}, mergedPlaces);
+        await ruler({enableAll, disableAll, readFile, writeFile}, places);
     }
     
     if (fix && staged) {
@@ -319,7 +315,7 @@ module.exports = async ({argv, halt, log, write, logError, readFile, writeFile})
             return exit(STAGE);
     }
     
-    if (mergedPlaces.length)
+    if (places.length)
         return exit(PLACE);
     
     const exitCode = getExitCode(wasStop);

package/lib/cli/runner/runner.js

@@ -9,7 +9,7 @@ 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}) => {
     const processFile = initProcessFile(options);
     const {length} = names;
-    const rawPlaces = [];
+    const places = [];
     
     for (let index = 0; index < length; index++) {
         if (wasStop())
@@ -19,7 +19,7 @@ module.exports.run = async ({transform, plugins, noConfig, readFile, writeFile,
         const currentIndex = isStop() ? length - 1 : index;
         const name = names[index];
         
-        const {exited} = await runWorker({
+        const {exited, places: currentPlaces = []} = await runWorker({
             readFile,
             writeFile,
             exit,
@@ -31,7 +31,6 @@ module.exports.run = async ({transform, plugins, noConfig, readFile, writeFile,
             index: currentIndex,
             name,
             count: length,
-            rawPlaces,
             processFile,
             fileCache,
             raw,
@@ -43,9 +42,11 @@ module.exports.run = async ({transform, plugins, noConfig, readFile, writeFile,
             transform,
         });
         
+        places.push(...currentPlaces);
+        
         if (exited)
-            return {exited, rawPlaces};
+            return {exited, places};
     }
     
-    return {rawPlaces};
+    return {places};
 };

package/lib/cli/runner/worker.js

@@ -32,7 +32,7 @@ const createFormatterProxy = (options) => {
     });
 };
 
-module.exports = async ({readFile, report, writeFile, exit, raw, write, log, currentFormat, rulesdir, formatterOptions, noConfig, transform, plugins, index, fix, processFile, processorRunners, fileCache, rawPlaces, name, count}) => {
+module.exports = async ({readFile, report, writeFile, exit, raw, write, log, currentFormat, rulesdir, formatterOptions, noConfig, transform, plugins, index, fix, processFile, processorRunners, fileCache, name, count}) => {
     const resolvedName = resolve(name)
         .replace(/^\./, cwd);
     
@@ -48,7 +48,7 @@ module.exports = async ({readFile, report, writeFile, exit, raw, write, log, cur
         return exit(INVALID_CONFIG, configError);
     
     const {dir} = options;
-    const success = await runCache({
+    const [success, currentPlaces] = await runCache({
         options,
         fileCache,
         report,
@@ -59,11 +59,11 @@ module.exports = async ({readFile, report, writeFile, exit, raw, write, log, cur
         resolvedName,
         index,
         count,
-        rawPlaces,
     });
     
     if (success)
         return {
+            places: currentPlaces,
             success,
         };
     
@@ -109,17 +109,15 @@ module.exports = async ({readFile, report, writeFile, exit, raw, write, log, cur
     if (fixable)
         fileCache.setInfo(name, places, options);
     
-    rawPlaces.push(places);
-    
     return {
-        rawPlaces,
+        places,
         success: true,
     };
 };
 
-async function runCache({fileCache, report, write, formatterOptions, currentFormat, name, resolvedName, index, count, rawPlaces, options}) {
+async function runCache({fileCache, report, write, formatterOptions, currentFormat, name, resolvedName, index, count, options}) {
     if (!fileCache.canUseCache(name, options))
-        return false;
+        return [false, []];
     
     const places = fileCache.getPlaces(name);
     const formatterProxy = createFormatterProxy({
@@ -134,8 +132,7 @@ async function runCache({fileCache, report, write, formatterOptions, currentForm
     const line = await report(currentFormat, formatterProxy);
     
     write(line || '');
-    rawPlaces.push(places);
     
-    return true;
+    return [true, places];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "putout",
-  "version": "26.9.2",
+  "version": "26.9.3",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊 Pluggable and configurable code transformer with built-in eslint and babel plugins support of js, jsx typescript, flow files, markdown, yaml and json",