redlint 3.5.0 → 3.6.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.12.26, v3.6.0
+
+feature:
+- 3adb918 redlint: add support of async rules
+
+2023.12.22, v3.5.1
+
+fix:
+- 0f9aa9c redlint: args
+
 2023.12.22, v3.5.0
 
 feature:

package/bin/redlint.js

@@ -21,23 +21,24 @@ import {lint} from '../lib/lint/lint.js';
 import {pack} from '../lib/pack/pack.js';
 import {extract} from '../lib/extract/extract.js';
 import {debug} from '../lib/debug.js';
+import {logo} from '../lib/help/logo.js';
 import {version} from '../lib/cli/version.js';
 import {
-    SCAN,
-    SCAN_DEBUG,
-    FIX,
-    FIX_DEBUG,
-    PACK,
-    PACK_DEBUG,
-    EXTRACT,
-    EXTRACT_DEBUG,
-    GENERATE,
-    GENERATE_SIMPLE,
-    HELP,
-    VERSION,
-    DEBUG,
-    BACK,
-    EXIT,
+    isScan,
+    isScanDebug,
+    isFix,
+    isFixDebug,
+    isPack,
+    isPackDebug,
+    isExtract,
+    isExtractDebug,
+    isGenerate,
+    isGenerateSimple,
+    isHelp,
+    isVersion,
+    isDebug,
+    isBack,
+    isExit,
 } from '../lib/menu.js';
 
 const {log} = console;
@@ -52,6 +53,12 @@ await uiLoop(arg);
 
 async function uiLoop(arg) {
     if (!arg) {
+        if (header) {
+            console.log('Lint your files according to 🐊Putout rules.\n');
+            process.stdout.write(logo);
+            console.log('');
+        }
+        
         arg = await choose();
         
         if (!arg)
@@ -60,24 +67,24 @@ async function uiLoop(arg) {
         header = false;
     }
     
-    if (arg === DEBUG) {
+    if (isDebug(arg)) {
         arg = await debug();
         
-        if (arg === BACK)
+        if (isBack(arg))
             return await uiLoop();
     }
     
-    if (arg === EXIT)
+    if (isExit(arg))
         process.exit();
     
-    if (arg === VERSION)
+    if (isVersion(arg))
         return version({
             log,
             exit,
             readFile,
         });
     
-    if (arg === HELP) {
+    if (isHelp(arg)) {
         help({
             header,
         });
@@ -91,14 +98,14 @@ async function uiLoop(arg) {
     
     spinner.succeed();
     
-    if (arg === GENERATE_SIMPLE) {
+    if (isGenerateSimple(arg)) {
         await writeFile('.filesystem.json', lintJSON(stringify(convertToSimple(result))));
         process.exit(0);
     }
     
     const filesystem = lintJSON(stringify(result));
     
-    if (arg === SCAN) {
+    if (isScan(arg)) {
         const places = await masterLint(filesystem, {
             fix: false,
         });
@@ -122,7 +129,7 @@ async function uiLoop(arg) {
         process.exit(1);
     }
     
-    if (arg === PACK) {
+    if (isPack(arg)) {
         const result = await masterPack(CWD, filesystem);
         await writeFile(join(CWD, 'filesystem.red'), result);
         const spinner = ora(`pack 'filesystem.red'`).start();
@@ -131,7 +138,7 @@ async function uiLoop(arg) {
         process.exit();
     }
     
-    if (arg === EXTRACT) {
+    if (isExtract(arg)) {
         const filesystem = await readFile(join(CWD, 'filesystem.red'), 'utf8');
         await masterExtract(CWD, filesystem);
         const spinner = ora(`extract 'filesystem.red'`).start();
@@ -140,7 +147,7 @@ async function uiLoop(arg) {
         process.exit();
     }
     
-    if (arg === EXTRACT_DEBUG) {
+    if (isExtractDebug(arg)) {
         const filesystem = await readFile(join(CWD, 'filesystem.red'), 'utf8');
         await extract(CWD, filesystem);
         const spinner = ora(`extract 'filesystem.red'`).start();
@@ -149,7 +156,7 @@ async function uiLoop(arg) {
         process.exit();
     }
     
-    if (arg === PACK_DEBUG) {
+    if (isPackDebug(arg)) {
         const result = pack(CWD, filesystem);
         await writeFile(join(CWD, 'filesystem.red'), result);
         
@@ -157,8 +164,8 @@ async function uiLoop(arg) {
         process.exit();
     }
     
-    if (arg === SCAN_DEBUG) {
-        const places = lint(filesystem, {
+    if (isScanDebug(arg)) {
+        const places = await lint(filesystem, {
             fix: false,
         });
         
@@ -176,7 +183,7 @@ async function uiLoop(arg) {
         process.exit(1);
     }
     
-    if (arg === FIX_DEBUG) {
+    if (isFixDebug(arg)) {
         const places = lint(filesystem, {
             fix: true,
         });
@@ -195,7 +202,7 @@ async function uiLoop(arg) {
         process.exit();
     }
     
-    if (arg === FIX) {
+    if (isFix(arg)) {
         await masterLint(filesystem, {
             fix: true,
         });
@@ -203,7 +210,7 @@ async function uiLoop(arg) {
         process.exit();
     }
     
-    if (arg === GENERATE)
+    if (isGenerate(arg))
         await writeFile('.filesystem.json', filesystem);
     
     done(`generate '.filesystem.json'`);

package/lib/choose.js

@@ -1,5 +1,3 @@
-import {logo} from './help/logo.js';
-import process from 'node:process';
 import {choose as chooseDialog} from '@putout/cli-choose';
 import {
     SCAN,
@@ -15,10 +13,6 @@ import {
 } from './menu.js';
 
 export const choose = async () => {
-    console.log('Lint your files according to 🐊Putout rules.\n');
-    process.stdout.write(logo);
-    console.log('');
-    
     const command = await chooseDialog('Command:', [
         SCAN,
         FIX,

package/lib/cli/version.js

@@ -1,7 +1,7 @@
 const {parse} = JSON;
 
 export const version = async ({log, exit, readFile}) => {
-    const packagePath = new URL('../package.json', import.meta.url);
+    const packagePath = new URL('../../package.json', import.meta.url);
     const packageData = await readFile(packagePath);
     const {version} = parse(packageData);
     

package/lib/lint/lint.js

@@ -1,5 +1,5 @@
 import {
-    transform,
+    transformAsync,
     parse,
 } from 'putout';
 import parseOptions from 'putout/parse-options';
@@ -9,15 +9,14 @@ import {
     merge,
 } from '@putout/processor-filesystem';
 
-export const lint = (filesystem, {fix, progress = createProgress()} = {}) => {
+export const lint = async (filesystem, {fix, progress = createProgress()} = {}) => {
     const [{source}] = branch(filesystem);
     const options = parseOptions({
         name: '.filesystem.json',
     });
     
     const ast = parse(source);
-    
-    const places = transform(ast, source, {
+    const places = await transformAsync(ast, source, {
         fix,
         fixCount: 1,
         ...options,

package/lib/lint/slave.js

@@ -28,7 +28,7 @@ progress.on('file', ({rule, i, n}) => {
     }]);
 });
 
-parentPort.postMessage(['end', lint(filesystem, {
+parentPort.postMessage(['end', await lint(filesystem, {
     fix,
     progress,
 })]);

package/lib/menu.js

@@ -1,7 +1,7 @@
 export const SCAN = '✅ scan';
 export const SCAN_DEBUG = '✅ scan: debug';
-export const FIX = '❌ fix';
-export const FIX_DEBUG = '❌ fix: debug';
+export const FIX = '🔨 fix';
+export const FIX_DEBUG = '🔨 fix: debug';
 export const PACK = '🔬 pack';
 export const PACK_DEBUG = '🔬 pack';
 export const EXTRACT = '🔭 extract';
@@ -13,3 +13,19 @@ export const VERSION = '⁋ version';
 export const DEBUG = '📿 debug';
 export const BACK = '🔙 back';
 export const EXIT = '🚪 exit';
+
+export const isScan = (a) => a === SCAN || a === 'scan';
+export const isScanDebug = (a) => a === SCAN_DEBUG || a === 'scan:debug';
+export const isFix = (a) => a === FIX || a === 'fix';
+export const isFixDebug = (a) => a === FIX_DEBUG || a === 'fix:debug';
+export const isPack = (a) => a === PACK || a === 'debug';
+export const isPackDebug = (a) => a === PACK_DEBUG || a === 'pack:debug';
+export const isExtract = (a) => a === EXTRACT || a === 'extract';
+export const isExtractDebug = (a) => a === EXTRACT_DEBUG || a === 'extract:debug';
+export const isGenerate = (a) => a === GENERATE || a === 'generate';
+export const isGenerateSimple = (a) => a === GENERATE_SIMPLE || a === 'generate:simple';
+export const isHelp = (a) => a === HELP || a === 'help';
+export const isVersion = (a) => a === VERSION || a === 'version';
+export const isDebug = (a) => a === DEBUG || a === 'debug';
+export const isBack = (a) => a === BACK || a === 'back';
+export const isExit = (a) => a === EXIT || a === 'exit';

package/lib/pack/slave.js

@@ -3,7 +3,6 @@ import {
     workerData,
 } from 'node:worker_threads';
 import {createProgress} from '@putout/engine-runner/progress';
-
 import {pack} from './pack.js';
 
 const {filesystem, cwd} = workerData;

package/lib/run.js

@@ -1,7 +1,7 @@
 import {Worker} from 'node:worker_threads';
 import fullstore from 'fullstore';
 
-export function run({test,workerData, slave, push, fix, start, end, fail, success, suffix}) {
+export function run({test, workerData, slave, push, fix, start, end, fail, success, suffix}) {
     return new Promise((resolve, reject) => {
         const worker = new Worker(slave, {
             workerData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redlint",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Lint Filesystem with 🐊Putout",