feature: @putout/cli-cache: get rid of find-up

Author: coderaiser

packages/cli-cache/.eslintrc.json

@@ -6,6 +6,5 @@
     "plugins": [
         "n",
         "putout"
-    ],
-    "ignorePatterns": ["**/fixture"]
+    ]
 }

packages/cli-cache/lib/cache.js

@@ -84,7 +84,7 @@ const createCache = async (overrides = {}) => {
         }),
     });
 
-    const {findUp} = await import('find-up');
+    const {findUp} = await import('./find-up.mjs');
 
     if (await isChanged(fileCache, {findUp}))
         await tryToCatch(unlink, name);

packages/cli-cache/lib/find-cache-dir.mjs

@@ -1,22 +1,16 @@
 import {join} from 'node:path';
 import {mkdir as _mkdir} from 'node:fs/promises';
-import process from 'node:process';
-import {findNodeModules} from './find-node-modules.mjs';
-
-const {cwd: _cwd} = process;
+import {findUp as _findUp} from './find-up.mjs';
 
 export default async function findCacheDir(overrides = {}) {
     const {
         name,
-        cwd = _cwd,
+        findUp = _findUp,
         mkdir = _mkdir,
         directory = 'node_modules',
     } = overrides;
 
-    const path = await findNodeModules({
-        cwd,
-        directory,
-    });
+    const path = await findUp(directory);
 
     if (!path)
         return path;

packages/cli-cache/lib/find-node-modules.mjs

@@ -0,0 +1,20 @@
+import {join} from 'node:path';
+import process from 'node:process';
+import escalade from 'escalade';
+
+const {isArray} = Array;
+const maybeArray = (a) => isArray(a) ? a : [a];
+
+const includesName = (name) => (dir, names) => {
+    for (const currentName of maybeArray(name)) {
+        if (names.includes(currentName))
+            return join(dir, currentName);
+    }
+    
+    return '';
+};
+
+export const findUp = async (name, {cwd = process.cwd()} = {}) => {
+    return await escalade(cwd, includesName(name));
+};
+

packages/cli-cache/lib/find-up.mjs

@@ -1,10 +1,10 @@
 'use strict';
 
-const {simpleImport} = require('./simple-import');
-
 module.exports = async (fileCache, {findUp}) => {
     const result = await Promise.all([
-        isNodeModulesChanged(fileCache),
+        isNodeModulesChanged(fileCache, {
+            findUp,
+        }),
         isEslintChanged(fileCache, {
             findUp,
         }),
@@ -18,9 +18,8 @@ module.exports = async (fileCache, {findUp}) => {
 module.exports.isNodeModulesChanged = isNodeModulesChanged;
 module.exports.isEslintChanged = isEslintChanged;
 
-async function isNodeModulesChanged(fileCache) {
-    const {findNodeModules} = await simpleImport('./find-node-modules.mjs');
-    const packagePath = await findNodeModules();
+async function isNodeModulesChanged(fileCache, {findUp}) {
+    const packagePath = await findUp('node_modules');
 
     if (!packagePath)
         return false;

packages/cli-cache/lib/is-changed.js

@@ -11,17 +11,12 @@ test('putout: cli: cache files: is changed: isNodeModulesChanged: cannot find',
         reconcile: stub(),
     };
 
-    const simpleImport = stub().resolves({
-        findNodeModules: stub(),
-    });
-    
-    mockRequire('./simple-import', {
-        simpleImport,
-    });
-    
     const {isNodeModulesChanged} = reRequire('./is-changed');
+    const findUp = stub();
 
-    const result = await isNodeModulesChanged(fileCache);
+    const result = await isNodeModulesChanged(fileCache, {
+        findUp,
+    });
 
     stopAll();
 

packages/cli-cache/lib/is-changed.spec.js

@@ -27,7 +27,6 @@
     "escalade": "^3.2.0",
     "file-entry-cache": "^10.0.2",
     "find-cache-dir": "^5.0.0",
-    "find-up": "^7.0.0",
     "imurmurhash": "^0.1.4",
     "json-stable-stringify-without-jsonify": "^1.0.1",
     "try-catch": "^3.0.1",