madrun 9.0.8 → 9.2.0

package/ChangeLog

@@ -1,3 +1,15 @@
+2023.05.01, v9.2.0
+
+feature:
+- a702e01 madrun: use built-in madrun
+- 77560c6 package: eslint-plugin-putout v17.5.1
+- 928768c package: @putout/plugin-madrun v15.0.0
+
+2023.03.07, v9.1.0
+
+feature:
+- 0b32623 madrun: add ability to select script to run
+
 2023.03.06, v9.0.8
 
 feature:

package/README.md

@@ -1,5 +1,7 @@
 # 🏎 Madrun [![License][LicenseIMGURL]][LicenseURL] [![NPM version][NPMIMGURL]][NPMURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Coverage Status][CoverageIMGURL]][CoverageURL]
 
+![image](https://user-images.githubusercontent.com/1573141/223524904-4175548f-1e30-4745-bf2e-c2f4ea39fef5.png)
+
 [NPMURL]: https://npmjs.org/package/madrun "npm"
 [NPMIMGURL]: https://img.shields.io/npm/v/madrun.svg?style=flat
 [BuildStatusURL]: https://github.com/coderaiser/madrun/actions?query=workflow%3A%22Node+CI%22 "Build Status"
@@ -147,7 +149,10 @@ export default {
     'lint:env': () => ['putout .', {
         CI: 1,
     }],
-    'env:lint': () => [env, 'putout .'],
+    'env:lint': () => [
+        env,
+        'putout .',
+    ],
     'lint:no-env': async () => await cutEnv('lint:env'),
 };
 ```

package/bin/init.mjs

@@ -4,7 +4,6 @@ import {
     writeFile,
     access,
 } from 'fs/promises';
-
 import tryToCatch from 'try-to-catch';
 import montag from 'montag';
 
@@ -21,7 +20,7 @@ export const createMadrun = async (cwd, info) => {
     if (!name) {
         const {scripts = {}} = info;
         
-        const madrun = montag `
+        const madrun = montag`
             'use strict';
             
             const {
@@ -82,4 +81,3 @@ async function findMadrun(cwd) {
     
     return '';
 }
-

package/bin/madrun-completion.js

@@ -10,4 +10,3 @@ const read = fs.createReadStream(filename);
 const write = process.stdout;
 
 read.pipe(write);
-

package/bin/madrun.mjs

@@ -1,24 +1,25 @@
 #!/usr/bin/env node
-
 import {createRequire} from 'module';
 import {
     dirname,
     basename,
 } from 'path';
-
 import findUp from 'find-up';
 import tryToCatch from 'try-to-catch';
 import yargsParser from 'yargs-parser';
-
 import {series} from '../lib/madrun.js';
 import check from '../lib/check.js';
+import {choose} from '../lib/choose.mjs';
+
 const require = createRequire(import.meta.url);
 
 const {exit} = process;
+
 const {
     MADRUN_PWD,
     MADRUN_NAME,
 } = process.env;
+
 const cwd = process.cwd();
 
 const args = yargsParser(process.argv.slice(2), {
@@ -48,13 +49,13 @@ const {
 if (help) {
     const {help} = require('../lib/help.js');
     console.log(help());
-    process.exit();
+    exit();
 }
 
 if (version) {
     const {version} = require('../package.json');
     console.log(`v${version}`);
-    process.exit();
+    exit();
 }
 
 if (init) {
@@ -77,45 +78,52 @@ if (init) {
         console.error(error);
 }
 
-const names = args._;
+let names = args._;
 const options = getOptions(args['--']);
-const [dir, script] = await getScript();
+const [dir, scripts] = await getScript();
 
-const problems = check(script);
+const problems = check(scripts);
 
 if (problems) {
-    const result = await putoutMadrun(dir, {fix});
+    const result = await putoutMadrun(dir, {
+        fix,
+    });
     
     if (fix) {
-        process.exit();
+        exit();
     } else {
         console.log(result);
-        process.exit(1);
+        exit(1);
     }
 }
 
 if (init)
-    process.exit();
+    exit();
 
 if (problems) {
     await execute(`echo '${problems}'`);
-    process.exit(1);
+    exit(1);
 }
 
 if (!names.length) {
-    console.log(Object.keys(script).join('\n'));
-    exit();
+    names = await choose(scripts);
 }
 
+if (!names.length)
+    exit();
+
 const env = {};
-const [e, cmd] = await tryToCatch(series, names, options, env, script);
+const [e, cmd] = await tryToCatch(series, names, options, env, scripts);
 
 if (e) {
     console.error(e.message);
-    process.exit(1);
+    exit(1);
 }
 
-console.log(getOutput({cmd, cwd}));
+console.log(getOutput({
+    cmd,
+    cwd,
+}));
 await execute(cmd);
 
 function getOutput({cmd, cwd}) {
@@ -172,17 +180,20 @@ async function getScript() {
 async function putoutMadrun(dir, {fix}) {
     const name = `${dir}/.madrun.js`;
     const {runPutout} = await import('../lib/fix.mjs');
+    
     const {
         readFile,
         writeFile,
     } = await import('fs/promises');
     
     const data = await readFile(name, 'utf8');
-    const {places, code} = await runPutout(data);
+    const {
+        places,
+        code,
+    } = await runPutout(data);
     
     if (fix)
         await writeFile(name, code);
     
     return places;
 }
-

package/lib/check.js

@@ -25,4 +25,3 @@ function getNames(scripts) {
     
     return result;
 }
-

package/lib/choose.mjs

@@ -0,0 +1,37 @@
+import enquirer from 'enquirer';
+import actions from 'enquirer/lib/combos.js';
+import tryToCatch from 'try-to-catch';
+
+const {MultiSelect} = enquirer;
+
+const custom = {
+    h: 'left',
+    j: 'down',
+    k: 'up',
+    l: 'right',
+    enter: 'i',
+};
+
+actions.keys = {
+    ...actions.keys,
+    ...custom,
+};
+
+export const choose = async (scripts) => {
+    const prompt = new MultiSelect({
+        message: 'Run:',
+        onSubmit() {
+            this.enable(this.focused);
+        },
+        choices: Object.keys(scripts),
+    });
+    
+    const answer = await run(prompt);
+    
+    return answer || [];
+};
+
+async function run(prompt) {
+    const [, answer] = await tryToCatch(prompt.run.bind(prompt));
+    return answer;
+}

package/lib/fix.mjs

@@ -1,18 +1,20 @@
 import putout, {
     initReport,
 } from 'putout';
-
 import dumpFormatter from '@putout/formatter-dump';
-import madrun from '@putout/plugin-madrun';
 
 const report = initReport();
 
 export const runPutout = async (data, options) => {
-    const {code, places} = putout(data, {
+    const {
+        code,
+        places,
+    } = putout(data, {
+        printer: 'putout',
         ...options,
-        plugins: [{
-            madrun,
-        }],
+        plugins: [
+            'madrun',
+        ],
     });
     
     return {

package/lib/help.js

@@ -16,4 +16,3 @@ module.exports.help = () => {
     
     return result.join('\n');
 };
-

package/lib/madrun.js

@@ -8,7 +8,7 @@ const findUp = require('find-up');
 const wildcard = require('./wildcard');
 const check = require('./check');
 const supported = require('../supported');
-
+const maybeArray = (a) => isArray(a) ? a : [a];
 const isStr = (a) => typeof a === 'string';
 const {isArray} = Array;
 
@@ -22,12 +22,11 @@ async function getScripts() {
 }
 
 module.exports.cutEnv = async (names, opts = '', env, scripts) => {
-    if (isStr(names))
-        names = [names];
-    
+    names = maybeArray(names);
     scripts = scripts || await getScripts();
     
     const isParallel = false;
+    
     const commands = await run(names, opts, scripts, {
         env,
         cutEnv: true,
@@ -53,12 +52,11 @@ module.exports.run = async (name, opts = '', env, scripts) => {
 module.exports.series = series;
 
 async function series(names, opts = '', env, scripts) {
-    if (isStr(names))
-        names = [names];
-    
+    names = maybeArray(names);
     scripts = scripts || await getScripts();
     
     const isParallel = false;
+    
     const commands = await run(names, opts, scripts, {
         env,
         isParallel,
@@ -71,12 +69,14 @@ async function series(names, opts = '', env, scripts) {
 
 module.exports.parallel = async (names, opts = '', env, scripts) => {
     scripts = scripts || await getScripts();
-    
-    if (isStr(names))
-        names = [names];
+    names = maybeArray(names);
     
     const isParallel = true;
-    const commands = await run(names, opts, scripts, {env, isParallel});
+    
+    const commands = await run(names, opts, scripts, {
+        env,
+        isParallel,
+    });
     
     return joinByType(commands, {
         isParallel,
@@ -140,8 +140,13 @@ const parse = async (name, {scripts, opts, env, isParallel, cutEnv}) => {
         
         const fn = jessy(key, scripts);
         
-        const {line, lineEnv} = await runScriptFn(fn);
+        const {
+            line,
+            lineEnv,
+        } = await runScriptFn(fn);
+        
         const cmd = addOpts(line, opts);
+        
         const cmdEnv = addEnv(cmd, {
             ...cutEnv ? {} : lineEnv,
             ...env,
@@ -195,4 +200,3 @@ async function addPrePost(cmd, key, scripts) {
     
     return cmd;
 }
-

package/lib/validate.js

@@ -12,4 +12,3 @@ module.exports = (runners) => {
     
     return null;
 };
-

package/lib/wildcard.js

@@ -1,11 +1,10 @@
 'use strict';
 
 module.exports = (str) => {
-    const wildcard = '^' + str/* search from start of line */
+    const wildcard = '^' + str
         .replace('.', '\\.')
         .replace('*', '.*')
-        .replace('?', '.?') + '$'; /* search to end of line */
+        .replace('?', '.?') + '$';
     
     return RegExp(wildcard);
 };
-

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "madrun",
-  "version": "9.0.8",
+  "version": "9.2.0",
   "description": "CLI tool to run multiple npm-scripts in a madly comfortable way",
   "main": "lib/madrun.js",
   "type": "commonjs",
-  "commitType": "colon",
   "scripts": {
     "lint": "madrun lint",
     "fresh:lint": "madrun fresh:lint",
@@ -56,8 +55,8 @@
   },
   "dependencies": {
     "@putout/formatter-dump": "^4.0.0",
-    "@putout/plugin-madrun": "^14.0.0",
     "all-object-keys": "^2.0.0",
+    "enquirer": "^2.3.6",
     "find-up": "^5.0.0",
     "jessy": "^3.0.0",
     "mapsome": "^1.0.0",
@@ -74,7 +73,7 @@
     "escover": "^2.0.1",
     "eslint": "^8.0.0",
     "eslint-plugin-n": "^15.2.4",
-    "eslint-plugin-putout": "^16.0.0",
+    "eslint-plugin-putout": "^17.5.1",
     "mock-import": "^3.0.0",
     "mock-require": "^3.0.3",
     "nodemon": "^2.0.0",