madrun 8.8.12 → 8.10.1

package/ChangeLog

@@ -1,3 +1,31 @@
+2022.01.14, v8.10.1
+
+fix:
+- (madrun) windows support
+
+2022.01.14, v8.10.0
+
+feature:
+- (madrun) get rid of simport
+- (package) @putout/formatter-json v2.0.0
+- (package) @putout/formatter-dump v3.0.2
+
+
+2022.01.12, v8.9.1
+
+feature:
+- (package) eslint-plugin-putout v13.0.0
+- (package) putout v24.0.0
+
+2021.12.21, v8.9.0
+
+feature:
+- (package) putout v23.0.0
+- (package) yargs-parser v21.0.0
+- (package) @putout/plugin-madrun v11.0.0
+- (package) eslint-plugin-putout v12.2.0
+
+
 2021.11.10, v8.8.12
 
 feature:

package/bin/init.mjs

@@ -1,3 +1,4 @@
+import {createRequire} from 'module';
 import {join} from 'path';
 import {
     writeFile,
@@ -6,13 +7,13 @@ import {
 
 import tryToCatch from 'try-to-catch';
 import montag from 'montag';
-import {createSimport} from 'simport';
+
+const require = createRequire(import.meta.url);
 
 const {stringify} = JSON;
 const {keys} = Object;
 
-const simport = createSimport(import.meta.url);
-const supported = await simport('../supported.json');
+const supported = require('../supported.json');
 
 export const createMadrun = async (cwd, info) => {
     let name = await findMadrun(cwd);
@@ -40,7 +41,7 @@ export const createMadrun = async (cwd, info) => {
 };
 
 export const patchPackage = async (name, info) => {
-    const {default: content} = await simport(name);
+    const {default: content} = await import(name);
     
     const updatedScripts = updatePackage(content);
     const prepared = preparePackage(info, updatedScripts);

package/bin/madrun.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import {createRequire} from 'module';
 import {
     dirname,
     basename,
@@ -8,12 +9,10 @@ import {
 import findUp from 'find-up';
 import tryToCatch from 'try-to-catch';
 import yargsParser from 'yargs-parser';
-import {createSimport} from 'simport';
 
 import {series} from '../lib/madrun.js';
 import check from '../lib/check.js';
-
-const simport = createSimport(import.meta.url);
+const require = createRequire(import.meta.url);
 
 const {exit} = process;
 const {
@@ -47,13 +46,13 @@ const {
 } = args;
 
 if (help) {
-    const {help} = await simport('../lib/help.js');
+    const {help} = require('../lib/help.js');
     console.log(help());
     process.exit();
 }
 
 if (version) {
-    const {version} = await simport('../package.json');
+    const {version} = require('../package.json');
     console.log(`v${version}`);
     process.exit();
 }
@@ -62,11 +61,11 @@ if (init) {
     const {
         createMadrun,
         patchPackage,
-    } = await simport('./init');
+    } = await import('./init.mjs');
     
     fix = true;
     
-    const [errorPackage, info] = await tryToCatch(simport, `${cwd}/package.json`);
+    const [errorPackage, info] = await tryToCatch(require, `${cwd}/package.json`);
     
     if (errorPackage)
         console.error(errorPackage);
@@ -130,8 +129,8 @@ function getOutput({cmd, cwd}) {
 }
 
 async function execute(cmd) {
-    const {execSync} = await simport('child_process');
-    const tryCatch = await simport('try-catch');
+    const {execSync} = await import('child_process');
+    const tryCatch = (await import('try-catch')).default;
     
     const [error] = tryCatch(execSync, cmd, {
         stdio: [0, 1, 2],
@@ -152,7 +151,8 @@ function getOptions(args) {
 }
 
 async function getScript() {
-    const supported = await simport('../supported.json');
+    const {pathToFileURL} = require('url');
+    const supported = require('../supported.json');
     const path = findUp.sync(supported);
     
     if (!path) {
@@ -160,7 +160,8 @@ async function getScript() {
         process.exit(1);
     }
     
-    const esm = await simport(path);
+    // always convert path to url on windows
+    const esm = await import(pathToFileURL(path));
     
     return [
         dirname(path),
@@ -170,14 +171,14 @@ async function getScript() {
 
 async function putoutMadrun(dir, {fix}) {
     const name = `${dir}/.madrun.js`;
-    const {runPutout} = await simport('../lib/fix');
+    const {runPutout} = await import('../lib/fix.mjs');
     const {
         readFile,
         writeFile,
     } = await import('fs/promises');
     
     const data = await readFile(name, 'utf8');
-    const {places, code} = runPutout(data);
+    const {places, code} = await runPutout(data);
     
     if (fix)
         await writeFile(name, code);

package/lib/fix.mjs

@@ -1,12 +1,13 @@
 import putout, {
     initReport,
 } from 'putout';
+
 import dumpFormatter from '@putout/formatter-dump';
 import madrun from '@putout/plugin-madrun';
 
 const report = initReport();
 
-export const runPutout = (data, options) => {
+export const runPutout = async (data, options) => {
     const {code, places} = putout(data, {
         ...options,
         plugins: [{
@@ -16,7 +17,7 @@ export const runPutout = (data, options) => {
     
     return {
         code,
-        places: report(dumpFormatter, {
+        places: await report(dumpFormatter, {
             name: '.madrun.js',
             places,
         }),

package/lib/madrun.js

@@ -3,7 +3,6 @@
 const keys = require('all-object-keys');
 const jessy = require('jessy');
 const findUp = require('find-up');
-const {createSimport} = require('simport');
 
 const wildcard = require('./wildcard');
 const check = require('./check');
@@ -12,15 +11,13 @@ const supported = require('../supported');
 const isStr = (a) => typeof a === 'string';
 const {isArray} = Array;
 
-const simport = createSimport(__filename);
-
 async function getScripts() {
     const path = findUp.sync(supported);
     
     if (!path)
         throw Error('.madrun.js is missing!');
     
-    return await simport(path);
+    return (await import(path)).default;
 }
 
 module.exports.cutEnv = async (names, opts = '', env, scripts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "madrun",
-  "version": "8.8.12",
+  "version": "8.10.1",
   "description": "CLI tool to run multiple npm-scripts in a madly comfortable way",
   "main": "lib/madrun.js",
   "type": "commonjs",
@@ -54,27 +54,27 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@putout/formatter-dump": "^2.0.1",
-    "@putout/plugin-madrun": "^10.0.0",
+    "@putout/formatter-dump": "^3.0.2",
+    "@putout/plugin-madrun": "^11.0.0",
     "all-object-keys": "^2.0.0",
     "find-up": "^5.0.0",
     "jessy": "^3.0.0",
     "mapsome": "^1.0.0",
     "montag": "^1.0.0",
     "once": "^1.4.0",
-    "putout": "^22.0.0",
-    "simport": "^1.0.3",
+    "putout": "^24.0.0",
     "try-catch": "^3.0.0",
     "try-to-catch": "^3.0.0",
-    "yargs-parser": "^20.0.0"
+    "yargs-parser": "^21.0.0"
   },
   "devDependencies": {
     "@cloudcmd/stub": "^3.1.0",
-    "@putout/formatter-json": "^1.0.2",
+    "@putout/formatter-json": "^2.0.0",
     "c8": "^7.3.5",
-    "eslint": "^8.0.0-beta.1",
+    "escover": "^1.1.6",
+    "eslint": "^8.0.0",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^11.0.0",
+    "eslint-plugin-putout": "^13.0.0",
     "mock-import": "^2.1.1",
     "mock-require": "^3.0.3",
     "nodemon": "^2.0.0",