redlint 3.2.0 → 3.3.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.12.21, v3.3.0
+
+feature:
+- a5fdd8b redlint: move out run
+
+2023.12.20, v3.2.1
+
+fix:
+- 9bb40b8 redlint: help: = -> -
+
 2023.12.20, v3.2.0
 
 feature:

package/bin/redlint.js

@@ -11,13 +11,13 @@ import stripAnsi from 'strip-ansi';
 import formatterCodeFrame from '@putout/formatter-codeframe';
 import formatterDump from '@putout/formatter-dump';
 import ora from 'ora';
-import {help} from '../lib/help.js';
+import {help} from '../lib/help/help.js';
 import {choose} from '../lib/choose.js';
 import {buildTree} from '../lib/redlint.js';
 import {convertToSimple} from '../lib/simple.js';
-import {masterLint} from '../lib/master.js';
+import {masterLint} from '../lib/lint/master.js';
 import {masterPack} from '../lib/pack/master.js';
-import {lint} from '../lib/lint.js';
+import {lint} from '../lib/lint/lint.js';
 import {pack} from '../lib/pack/pack.js';
 import {debug} from '../lib/debug.js';
 
@@ -122,7 +122,7 @@ async function uiLoop(arg) {
     
     if (arg === 'scan:debug') {
         const places = lint(filesystem, {
-            fix: true,
+            fix: false,
         });
         
         const result = await formatterCodeFrame({
@@ -139,6 +139,25 @@ async function uiLoop(arg) {
         process.exit(1);
     }
     
+    if (arg === 'fix:debug') {
+        const places = lint(filesystem, {
+            fix: true,
+        });
+        
+        const result = await formatterCodeFrame({
+            name: '.filesystem.json',
+            source: filesystem,
+            places,
+            index: 0,
+            count: places.length,
+            filesCount: 1,
+            errorsCount: places.length,
+        });
+        
+        process.stdout.write(result);
+        process.exit();
+    }
+    
     if (arg === 'fix') {
         await masterLint(filesystem, {
             fix: true,

package/lib/choose.js

@@ -1,4 +1,4 @@
-import {logo} from './logo.js';
+import {logo} from './help/logo.js';
 import process from 'node:process';
 import {choose as chooseDialog} from '@putout/cli-choose';
 
@@ -11,6 +11,7 @@ export const choose = async () => {
         'scan',
         'fix',
         'pack',
+        'extract',
         'generate',
         'generate:simple',
         'help',

package/lib/debug.js

@@ -3,6 +3,7 @@ import {choose as chooseDialog} from '@putout/cli-choose';
 export const debug = async () => {
     const command = await chooseDialog('Debug:', [
         'scan:debug',
+        'fix:debug',
         'pack:debug',
         'back',
         'exit',

package/lib/extract/extract.js

@@ -0,0 +1,43 @@
+import {
+    parse,
+    transform,
+    print,
+} from 'putout';
+import {createProgress} from '@putout/engine-runner/progress';
+import * as pluginFilesystem from '@putout/plugin-filesystem';
+import {
+    branch as originalBranch,
+    merge as originalMerge,
+} from '@putout/processor-filesystem';
+
+const [, readAllFiles] = pluginFilesystem.rules['read-all-files'];
+const [, replaceCwd] = pluginFilesystem.rules['replace-cwd'];
+
+export const extract = (from, filesystem, {
+    progress = createProgress(),
+    branch = originalBranch,
+    merge = originalMerge,
+} = {}) => {
+    const [{source}] = branch(filesystem);
+    const ast = parse(source);
+    
+    transform(ast, filesystem, {
+        fix: true,
+        fixCount: 1,
+        progress,
+        rules: {
+            'replace-cwd': ['on', {
+                from,
+                to: '/',
+            }],
+        },
+        plugins: [
+            ['read-all-files', readAllFiles],
+            ['replace-cwd', replaceCwd],
+        ],
+    });
+    
+    const code = print(ast);
+    
+    return merge(filesystem, [code]);
+};

package/lib/extract/master.js

@@ -0,0 +1,29 @@
+import {run} from '../run.js';
+import {
+    setStart,
+    setEnd,
+    setPush,
+    setFail,
+    setSuccess,
+} from '../spinner.js';
+
+export function masterExtract(cwd, filesystem, {
+    start = setStart,
+    end = setEnd,
+    push = setPush,
+    fail = setFail,
+    success = setSuccess,
+} = {}) {
+    const slave = new URL('./slave.js', import.meta.url);
+    const fix = true;
+    
+    return run(cwd, filesystem, {
+        fix,
+        start,
+        end,
+        push,
+        fail,
+        success,
+        slave,
+    });
+}

package/lib/extract/slave.js

@@ -0,0 +1,33 @@
+import {
+    parentPort,
+    workerData,
+} from 'node:worker_threads';
+import {pack} from './pack.js';
+import {createProgress} from '@putout/engine-runner/progress';
+
+const {filesystem, cwd} = workerData;
+const progress = createProgress();
+
+progress.on('start', ({rule}) => {
+    parentPort.postMessage(['rule:start', rule]);
+});
+
+progress.on('push', ({rule}) => {
+    parentPort.postMessage(['rule:push', rule]);
+});
+
+progress.on('end', ({rule}) => {
+    parentPort.postMessage(['rule:end', rule]);
+});
+
+progress.on('file', ({rule, i, n}) => {
+    parentPort.postMessage(['file', {
+        i,
+        n,
+        rule,
+    }]);
+});
+
+parentPort.postMessage(['end', pack(cwd, filesystem, {
+    progress,
+})]);

package/lib/{help.js → help/help.js}

@@ -18,6 +18,6 @@ export const help = ({header = true}) => {
   generate          - generate .filesystem.json file and exit
   generate:simple   - generate simple .filesystem.json file and exit
   version           - show version and exit
-  debug             = run commands without workers
+  debug             - run commands without workers
 `);
 };

package/lib/lint/master.js

@@ -0,0 +1,28 @@
+import {run} from '../run.js';
+import {
+    setStart,
+    setEnd,
+    setPush,
+    setFail,
+    setSuccess,
+} from '../spinner.js';
+
+export function masterLint(filesystem, {fix, test, start = setStart, end = setEnd, push = setPush, fail = setFail, success = setSuccess}) {
+    const slave = new URL('./slave.js', import.meta.url);
+    const workerData = {
+        filesystem,
+        fix,
+    };
+    
+    return run({
+        workerData,
+        fix,
+        start,
+        end,
+        push,
+        fail,
+        success,
+        test,
+        slave,
+    });
+}

package/lib/{slave.js → lint/slave.js}

@@ -6,7 +6,6 @@ import {lint} from './lint.js';
 import {createProgress} from '@putout/engine-runner/progress';
 
 const {fix, filesystem} = workerData;
-
 const progress = createProgress();
 
 progress.on('start', ({rule}) => {
@@ -21,6 +20,14 @@ progress.on('end', ({rule}) => {
     parentPort.postMessage(['rule:end', rule]);
 });
 
+progress.on('file', ({rule, i, n}) => {
+    parentPort.postMessage(['file', {
+        rule,
+        i,
+        n,
+    }]);
+});
+
 parentPort.postMessage(['end', lint(filesystem, {
     fix,
     progress,

package/lib/pack/master.js

@@ -1,7 +1,12 @@
-import {Worker} from 'node:worker_threads';
-import ora from 'ora';
-import chalk from 'chalk';
-import fullstore from 'fullstore';
+import {run} from '../run.js';
+import {
+    setStart,
+    setEnd,
+    setPush,
+    setFail,
+    setSuccess,
+    setSuffixText,
+} from '../spinner.js';
 
 export function masterPack(cwd, filesystem, {
     start = setStart,
@@ -9,128 +14,23 @@ export function masterPack(cwd, filesystem, {
     push = setPush,
     fail = setFail,
     success = setSuccess,
+    suffix = setSuffixText,
 } = {}) {
-    return run(cwd, filesystem, {
+    const slave = new URL('./slave.js', import.meta.url);
+    const workerData = {
+        cwd,
+        filesystem,
+    };
+    
+    return run({
+        fix: true,
         start,
         end,
         push,
         fail,
         success,
-    });
-}
-
-function setStart(rule, store) {
-    const spinner = ora(rule).start();
-    
-    spinner.suffixText = '';
-    
-    store({
-        rule,
-        count: 0,
-        spinner,
-    });
-}
-
-function setPush(store) {
-    const {
-        rule,
-        count,
-        spinner,
-    } = store();
-    
-    store({
-        rule,
-        count: count + 1,
-        spinner,
-    });
-}
-
-function setFail(store) {
-    const {
-        rule,
-        count,
-        spinner,
-    } = store();
-    
-    spinner.suffixText = chalk.red(count);
-    spinner.fail();
-    
-    store({
-        rule,
-        count,
-        spinner,
-    });
-}
-
-function setSuccess(store) {
-    const {spinner} = store();
-    
-    spinner.succeed();
-    spinner.suffixText = '';
-    
-    store({
-        ...store(),
-        spinner: null,
-    });
-}
-
-function setEnd(data, resolve) {
-    resolve(data);
-}
-
-function run(cwd, filesystem, {start, end, fail, success}) {
-    return new Promise((resolve, reject) => {
-        const worker = new Worker(new URL('./slave.js', import.meta.url), {
-            workerData: {
-                cwd,
-                filesystem,
-            },
-        });
-        
-        const store = fullstore({});
-        
-        worker.on('message', ([event, data]) => {
-            if (event === 'end') {
-                end(data, resolve);
-                return;
-            }
-            
-            if (event === 'rule:start') {
-                start(data, store);
-                return;
-            }
-            
-            const {
-                rule,
-                count,
-                spinner,
-            } = store();
-            
-            if (!spinner)
-                return;
-            
-            store({
-                rule,
-                count,
-                spinner,
-            });
-            
-            const endFail = count && event === 'rule:end';
-            const endSuccess = !count && event === 'rule:end';
-            
-            if (endFail) {
-                fail(store);
-                return;
-            }
-            
-            if (endSuccess) {
-                success(store);
-                return;
-            }
-        });
-        worker.on('error', reject);
-        worker.on('exit', (code) => {
-            reject(Error(`Worker stopped with exit code ${code}`));
-        });
+        slave,
+        workerData,
+        suffix,
     });
 }

package/lib/pack/pack.js

@@ -6,14 +6,18 @@ import {
 import {createProgress} from '@putout/engine-runner/progress';
 import * as pluginFilesystem from '@putout/plugin-filesystem';
 import {
-    branch,
-    merge,
+    branch as originalBranch,
+    merge as originalMerge,
 } from '@putout/processor-filesystem';
 
 const [, readAllFiles] = pluginFilesystem.rules['read-all-files'];
 const [, replaceCwd] = pluginFilesystem.rules['replace-cwd'];
 
-export const pack = (from, filesystem, {progress = createProgress()} = {}) => {
+export const pack = (from, filesystem, {
+    progress = createProgress(),
+    branch = originalBranch,
+    merge = originalMerge,
+} = {}) => {
     const [{source}] = branch(filesystem);
     const ast = parse(source);
     

package/lib/pack/slave.js

@@ -20,6 +20,14 @@ progress.on('end', ({rule}) => {
     parentPort.postMessage(['rule:end', rule]);
 });
 
+progress.on('file', ({rule, i, n}) => {
+    parentPort.postMessage(['file', {
+        i,
+        n,
+        rule,
+    }]);
+});
+
 parentPort.postMessage(['end', pack(cwd, filesystem, {
     progress,
 })]);

package/lib/{master.js → run.js}

@@ -1,85 +1,10 @@
 import {Worker} from 'node:worker_threads';
-import ora from 'ora';
-import chalk from 'chalk';
 import fullstore from 'fullstore';
 
-export function masterLint(filesystem, {fix, start = setStart, end = setEnd, push = setPush, fail = setFail, success = setSuccess}) {
-    return run(filesystem, {
-        fix,
-        start,
-        end,
-        push,
-        fail,
-        success,
-    });
-}
-
-function setStart(rule, store) {
-    const spinner = ora(rule).start();
-    
-    spinner.suffixText = '';
-    
-    store({
-        rule,
-        count: 0,
-        spinner,
-    });
-}
-
-function setPush(store) {
-    const {
-        rule,
-        count,
-        spinner,
-    } = store();
-    
-    store({
-        rule,
-        count: count + 1,
-        spinner,
-    });
-}
-
-function setFail(store) {
-    const {
-        rule,
-        count,
-        spinner,
-    } = store();
-    
-    spinner.suffixText = chalk.red(count);
-    spinner.fail();
-    
-    store({
-        rule,
-        count,
-        spinner,
-    });
-}
-
-function setSuccess(store) {
-    const {spinner} = store();
-    
-    spinner.succeed();
-    spinner.suffixText = '';
-    
-    store({
-        ...store(),
-        spinner: null,
-    });
-}
-
-function setEnd(data, resolve) {
-    resolve(data);
-}
-
-function run(filesystem, {fix, start, end, push, fail, success}) {
+export function run({workerData, slave, push, fix, start, end, fail, success, suffix}) {
     return new Promise((resolve, reject) => {
-        const worker = new Worker(new URL('./slave.js', import.meta.url), {
-            workerData: {
-                filesystem,
-                fix,
-            },
+        const worker = new Worker(slave, {
+            workerData,
         });
         
         const store = fullstore({});
@@ -95,6 +20,11 @@ function run(filesystem, {fix, start, end, push, fail, success}) {
                 return;
             }
             
+            if (event === 'file') {
+                suffix(store, data);
+                return;
+            }
+            
             const {
                 rule,
                 count,

package/lib/spinner.js

@@ -0,0 +1,67 @@
+import ora from 'ora';
+import chalk from 'chalk';
+
+export function setStart(rule, store) {
+    const spinner = ora(rule).start();
+    
+    spinner.suffixText = '';
+    
+    store({
+        rule,
+        count: 0,
+        spinner,
+    });
+}
+
+export function setPush(store) {
+    const {
+        rule,
+        count,
+        spinner,
+    } = store();
+    
+    store({
+        rule,
+        count: count + 1,
+        spinner,
+    });
+}
+
+export function setFail(store) {
+    const {
+        rule,
+        count,
+        spinner,
+    } = store();
+    
+    spinner.suffixText = chalk.red(count);
+    spinner.fail();
+    
+    store({
+        rule,
+        count,
+        spinner,
+    });
+}
+
+export function setSuffixText(store, {percent}) {
+    const {spinner} = store();
+    
+    spinner.suffixText = percent;
+}
+
+export function setSuccess(store) {
+    const {spinner} = store();
+    
+    spinner.succeed();
+    spinner.suffixText = '';
+    
+    store({
+        ...store(),
+        spinner: null,
+    });
+}
+
+export function setEnd(data, resolve) {
+    resolve(data);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redlint",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Lint Filesystem with 🐊Putout",
@@ -34,6 +34,7 @@
     "@putout/engine-runner": "^20.1.0",
     "@putout/formatter-codeframe": "^6.0.0",
     "@putout/formatter-dump": "^4.0.1",
+    "@putout/operator-json": "^1.3.0",
     "@putout/plugin-filesystem": "^3.6.0",
     "@putout/processor-filesystem": "^3.0.0",
     "chalk": "^5.3.0",