feature(madrun) init: convert to ESM

Author: coderaiser

.gitignore

@@ -7,4 +7,3 @@ npm-debug.log
 coverage
 
 yarn-error.log
-.putoutcache

.madrun.mjs

@@ -1,21 +1,27 @@
-import {run, cutEnv} from './lib/madrun.js';
+import {
+    run,
+    cutEnv,
+} from './lib/madrun.js';
+
+const NODE_OPTIONS = `'--loader mock-import --no-warnings'`;
 
 const env = {
     SUPERTAPE_PROGRESS_BAR_MIN: 20,
+    NODE_OPTIONS,
 };
 
 export default {
     'lint': () => 'putout .',
     'fresh:lint': () => run('lint', '--fresh'),
     'lint:fresh': () => run('lint', '--fresh'),
     'fix:lint': () => run('lint', '--fix'),
-    'test': () => [`tape 'test/**/*.js' '{lib,bin}/**/*.spec.{js,mjs}'`, env],
+    'test': () => [env, `tape 'test/**/*.js' '{lib,bin}/**/*.spec.{js,mjs}'`],
     'watch:test': async () => await run('watcher', await run('test')),
     'watch:tape': () => 'nodemon -w test -w lib --exec tape',
     'watch:lint': async () => await run('watcher', await run('lint')),
     'watcher': () => 'nodemon -w test -w lib -w bin --exec',
-    'coverage': async () => [`nyc ${await cutEnv('test')}`, env],
-    'report': () => 'nyc report --reporter=text-lcov | coveralls',
+    'coverage': async () => [`c8 ${await cutEnv('test')}`, env],
+    'report': () => 'c8 report --reporter=text-lcov | coveralls',
     'postpublish': () => 'npm i -g',
     'hello': () => {},
 };

.npmignore

@@ -1,5 +1,5 @@
 .*
-*.spec.js
+*.spec.*
 
 test
 fixture

.nycrc.json

@@ -6,8 +6,10 @@
     "all": true,
     "exclude": [
         ".*",
-        "**/*.spec.js",
-        "test"
+        "bin/madrun.mjs",
+        "**/*.spec.*",
+        "test",
+        "**/fixture"
     ],
     "branches": 100,
     "lines": 100,

bin/init.js renamed to bin/init.mjs

@@ -1,19 +1,20 @@
-'use strict';
-
-const {join} = require('path');
-const {
+import {join} from 'path';
+import {
     writeFile,
     access,
-} = require('fs/promises');
+} from 'fs/promises';
 
-const tryToCatch = require('try-to-catch');
-const montag = require('montag');
-const supported = require('../supported.json');
+import tryToCatch from 'try-to-catch';
+import montag from 'montag';
+import {createSimport} from 'simport';
 
 const {stringify} = JSON;
 const {keys} = Object;
 
-module.exports.createMadrun = async (cwd, info) => {
+const simport = createSimport(import.meta.url);
+const supported = await simport('../supported.json');
+
+export const createMadrun = async (cwd, info) => {
     let name = await findMadrun(cwd);
 
     if (!name) {
@@ -38,8 +39,8 @@ module.exports.createMadrun = async (cwd, info) => {
     return name;
 };
 
-module.exports.patchPackage = async (name, info) => {
-    const {default: content} = await import(name);
+export const patchPackage = async (name, info) => {
+    const {default: content} = await simport(name);
 
     const updatedScripts = updatePackage(content);
     const prepared = preparePackage(info, updatedScripts);

bin/init.spec.js renamed to bin/init.spec.mjs

@@ -1,27 +1,32 @@
-'use strict';
+import {join} from 'path';
 
-const {join} = require('path');
-
-const {
+import {
     test,
     stub,
-} = require('supertape');
+} from 'supertape';
 
-const montag = require('montag');
-const mockRequire = require('mock-require');
-const tryToCatch = require('try-to-catch');
+import montag from 'montag';
+import tryToCatch from 'try-to-catch';
+import {createCommons} from 'simport';
+import {createMockImport} from 'mock-import';
+
+const {__dirname} = createCommons(import.meta.url);
+const {
+    mockImport,
+    reImport,
+    stopAll,
+} = createMockImport(import.meta.url);
 
-const {reRequire} = mockRequire;
 const {stringify} = JSON;
 
 test('madrun: init: createMadrun: found', async (t) => {
     const access = stub();
 
-    mockRequire('fs/promises', {
+    mockImport('fs/promises', {
         access,
     });
 
-    const {createMadrun} = await reRequire('./init');
+    const {createMadrun} = await reImport('./init.mjs');
     const cwd = '/hello';
     const name = await createMadrun(cwd);
 
@@ -33,12 +38,12 @@ test('madrun: init: createMadrun: writeFile', async (t) => {
     const access = stub().throws(Error('xxx'));
     const writeFile = stub();
 
-    mockRequire('fs/promises', {
+    mockImport('fs/promises', {
         access,
         writeFile,
     });
 
-    const {createMadrun} = await reRequire('./init');
+    const {createMadrun} = await reImport('./init.mjs');
     const cwd = '/hello';
 
     await createMadrun(cwd, {
@@ -72,12 +77,12 @@ test('madrun: init: createMadrun: writeFile: no scripts', async (t) => {
     const access = stub().throws(Error('xxx'));
     const writeFile = stub();
 
-    mockRequire('fs/promises', {
+    mockImport('fs/promises', {
         access,
         writeFile,
     });
 
-    const {createMadrun} = await reRequire('./init');
+    const {createMadrun} = await reImport('./init.mjs');
     const cwd = '/hello';
 
     await createMadrun(cwd, {});
@@ -104,7 +109,7 @@ test('madrun: init: createMadrun: writeFile: no scripts', async (t) => {
 });
 
 test('madrun: init: patchPackage: import error', async (t) => {
-    const {patchPackage} = await reRequire('./init');
+    const {patchPackage} = await reImport('./init.mjs');
     const [error] = await tryToCatch(patchPackage, 'xxx');
 
     t.ok(error.message.includes(`Cannot find package 'xxx'`));
@@ -115,11 +120,11 @@ test('madrun: init: patchPackage: import error', async (t) => {
     const writeFile = stub();
     const madrunFile = join(__dirname, 'fixture', 'madrun.mjs');
 
-    mockRequire('fs/promises', {
+    mockImport('fs/promises', {
         writeFile,
     });
 
-    const {patchPackage} = await reRequire('./init');
+    const {patchPackage} = await reImport('./init.mjs');
     await patchPackage(madrunFile, {
         hello: 'world',
     });
@@ -131,6 +136,8 @@ test('madrun: init: patchPackage: import error', async (t) => {
         },
     }, null, 2) + '\n';
 
+    stopAll();
+    
     const expected = [
         './package.json',
         content,

bin/madrun.mjs

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
 
-import {dirname, basename} from 'path';
+import {
+    dirname,
+    basename,
+} from 'path';
 
 import findUp from 'find-up';
 import tryToCatch from 'try-to-catch';

help.json

@@ -1,6 +1,6 @@
 {
-    "--init                 ": "init scripts file madrun.js",
-    "--fix                  ": "fix scripts file madrun.js",
+    "--init                 ": "init scripts file",
+    "--fix                  ": "fix scripts file",
     "-h, --help             ": "display this help and exit",
     "-v, --version          ": "output version information and exit"
 }

lib/help.js

@@ -5,10 +5,13 @@ const help = require('../help');
 const {entries} = Object;
 
 module.exports.help = () => {
-    const result = [];
+    const result = [
+        'Usage: madrun [options] [script]',
+        'Options:',
+    ];
 
     for (const [name, description] of entries(help)) {
-        result.push(`${name} ${description}`);
+        result.push(`  ${name} ${description}`);
     }
 
     return result.join('\n');

package.json

@@ -76,6 +76,7 @@
     "eslint": "^7.3.1",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-putout": "^7.0.0",
+    "mock-import": "^1.0.5",
     "mock-require": "^3.0.3",
     "nodemon": "^2.0.0",
     "nyc": "^15.0.0",