feature: @putout/cli-staged: get rid of mock-require

Author: coderaiser

packages/cli-staged/lib/staged.js

@@ -1,15 +1,15 @@
 'use strict';
 
 const {join} = require('node:path');
-const {spawnSync} = require('node:child_process');
+const {spawnSync: _spawnSync} = require('node:child_process');
+
+const _porcelain = require('@putout/git-status-porcelain');
 
-const porcelain = require('@putout/git-status-porcelain');
-const once = require('once');
 const fullstore = require('fullstore');
 
 const namesStore = fullstore([]);
 
-const findGit = once(async ({findUp}) => {
+const findGit = async ({findUp}) => {
     const type = 'directory';
     const gitDir = await findUp('.git', {
         type,
@@ -19,11 +19,17 @@ const findGit = once(async ({findUp}) => {
         throw Error('not git repository');
 
     return gitDir.replace(/\.git$/, '');
-});
+};
 
 const joinDir = (a) => (b) => join(a, b);
 
-module.exports.get = async function get({findUp, isSupported}) {
+module.exports.get = async function get(overrides = {}) {
+    const {
+        findUp,
+        isSupported,
+        porcelain = _porcelain,
+    } = overrides;
+    
     const dir = await findGit({
         findUp,
     });
@@ -39,7 +45,13 @@ module.exports.get = async function get({findUp, isSupported}) {
     return names.map(joinDir(dir));
 };
 
-module.exports.set = async function set({findUp}) {
+module.exports.set = async function set(overrides = {}) {
+    const {
+        findUp,
+        porcelain = _porcelain,
+        spawnSync = _spawnSync,
+    } = overrides;
+    
     const dir = await findGit({
         findUp,
     });
@@ -58,12 +70,14 @@ module.exports.set = async function set({findUp}) {
     }
 
     if (namesToAdd.length)
-        add(namesToAdd.map(joinDir(dir)));
+        add(namesToAdd.map(joinDir(dir)), {
+            spawnSync,
+        });
 
     return staged;
 };
 
-function add(names) {
+function add(names, {spawnSync}) {
     spawnSync('git', [
         'add',
         ...names,

packages/cli-staged/lib/staged.spec.js

@@ -2,22 +2,16 @@
 
 const tryToCatch = require('try-to-catch');
 const {test, stub} = require('supertape');
-const mockRequire = require('mock-require');
-
-const {reRequire, stopAll} = mockRequire;
+const {get, set} = require('./staged');
 
 test('putout: cli: staged', async (t) => {
     const findUp = stub().returns('.');
 
-    const {get} = reRequire('./staged');
-    
     await get({
         findUp,
         isSupported: Boolean,
     });
 
-    stopAll();
-    
     const type = 'directory';
 
     const args = ['.git', {
@@ -34,16 +28,11 @@ test('putout: cli: staged: set: porcelain', async (t) => {
 
     const porcelain = stub().returns(['packages/putout/lib/cli/index.js']);
 
-    mockRequire('@putout/git-status-porcelain', porcelain);
-    
-    const {set} = reRequire('./staged');
-    
     await set({
         findUp,
+        porcelain,
     });
 
-    stopAll();
-    
     const expected = [{
         unstaged: true,
     }];
@@ -58,17 +47,12 @@ test('putout: cli: staged: get: statusMatrix', async (t) => {
 
     const porcelain = stub().returns(['packages/putout/lib/cli/index.js']);
 
-    mockRequire('@putout/git-status-porcelain', porcelain);
-    
-    const {get} = reRequire('./staged');
-    
     await get({
         findUp,
         isSupported: Boolean,
+        porcelain,
     });
 
-    stopAll();
-    
     const expected = {
         added: true,
         modified: true,
@@ -85,16 +69,12 @@ test('putout: cli: staged: get: statusMatrix: result', async (t) => {
 
     const porcelain = stub().returns(['packages/putout/lib/cli/index.js']);
 
-    mockRequire('@putout/git-status-porcelain', porcelain);
-    const {get} = reRequire('./staged');
-    
     const names = await get({
         findUp,
         isSupported: Boolean,
+        porcelain,
     });
 
-    stopAll();
-    
     const expected = [
         '/putout/packages/putout/lib/cli/index.js',
     ];
@@ -109,16 +89,11 @@ test('putout: cli: staged: set: findUp', async (t) => {
 
     const porcelain = stub().returns(['packages/putout/lib/cli/index.js']);
 
-    mockRequire('@putout/git-status-porcelain', porcelain);
-    
-    const {set} = reRequire('./staged');
-    
     await set({
         findUp,
+        porcelain,
     });
 
-    stopAll();
-    
     const type = 'directory';
 
     t.calledWith(findUp, ['.git', {
@@ -131,27 +106,10 @@ test('putout: cli: staged: set: findUp: not found', async (t) => {
     const dir = '';
     const findUp = stub().returns(dir);
 
-    const statusMatrix = stub().returns([
-        [
-            'packages/putout/lib/cli/index.js',
-            1,
-            2,
-            2,
-        ],
-    ]);
-    
-    mockRequire('isomorphic-git', {
-        statusMatrix,
-    });
-    
-    const {set} = reRequire('./staged');
-    
     await tryToCatch(set, {
         findUp,
     });
 
-    stopAll();
-    
     const type = 'directory';
 
     t.calledWith(findUp, ['.git', {
@@ -179,24 +137,18 @@ test('putout: cli: staged: add', async (t) => {
 
     const spawnSync = stub();
 
-    mockRequire('node:child_process', {
-        spawnSync,
-    });
-    mockRequire('@putout/git-status-porcelain', porcelain);
-    
-    const {get, set} = reRequire('./staged');
-    
     await get({
         findUp,
         isSupported: Boolean,
+        porcelain,
     });
 
     await set({
         findUp,
+        spawnSync,
+        porcelain,
     });
 
-    stopAll();
-    
     const filepath = 'packages/putout/lib/cli/index.js';
 
     const args = ['git', [
@@ -228,24 +180,18 @@ test('putout: cli: staged: no files', async (t) => {
     const spawnSync = stub();
     const isSupported = stub().returns(false);
 
-    mockRequire('node:child_process', {
-        spawnSync,
-    });
-    mockRequire('@putout/git-status-porcelain', porcelain);
-    
-    const {get, set} = reRequire('./staged');
-    
     await get({
         findUp,
         isSupported,
+        porcelain,
     });
 
     await set({
         findUp,
+        spawnSync,
+        porcelain,
     });
 
-    stopAll();
-    
     t.notCalled(spawnSync);
     t.end();
 });

packages/cli-staged/package.json

@@ -36,13 +36,11 @@
     "gitignore"
   ],
   "devDependencies": {
-    "@putout/eslint-flat": "^3.0.0",
     "c8": "^10.0.0",
     "eslint": "^10.0.0-alpha.0",
     "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-putout": "^29.0.0",
     "madrun": "^11.0.0",
-    "mock-require": "^3.0.3",
     "nodemon": "^3.0.1",
     "putout": "*",
     "supertape": "^11.0.3"