feature: @putout/cli-cache: find-node-modules using escalade

Author: coderaiser

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

@@ -1,24 +1,22 @@
 import {join} from 'node:path';
 import {mkdir as _mkdir} from 'node:fs/promises';
 import process from 'node:process';
-import _escalade from 'escalade';
+import {findNodeModules} from './find-node-modules.mjs';
 
 const {cwd: _cwd} = process;
 
-const includesName = (directory) => (dir, names) => {
-    return names.includes(directory) && join(dir, directory);
-};
-
 export default async function findCacheDir(overrides = {}) {
     const {
         name,
         cwd = _cwd,
-        escalade = _escalade,
         mkdir = _mkdir,
         directory = 'node_modules',
     } = overrides;
-    const input = join(cwd(), 'package.json');
-    const path = await escalade(input, includesName(directory));
+    
+    const path = await findNodeModules({
+        cwd,
+        directory,
+    });
 
     if (!path)
         return path;

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

@@ -0,0 +1,21 @@
+import {join} from 'node:path';
+import process from 'node:process';
+import _escalade from 'escalade';
+
+const includesName = (directory) => (dir, names) => {
+    return names.includes(directory) && join(dir, directory);
+};
+
+const {cwd: _cwd} = process;
+
+export async function findNodeModules(overrides = {}) {
+    const {
+        escalade = _escalade,
+        cwd = _cwd,
+        directory = 'node_modules',
+    } = overrides;
+    
+    const input = join(cwd(), 'package.json');
+    
+    return await escalade(input, includesName(directory));
+}

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

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

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

@@ -1,8 +1,8 @@
 'use strict';
 
 const {test, stub} = require('supertape');
-
-const {stopAll, reRequire} = require('mock-require');
+const mockRequire = require('mock-require');
+const {stopAll, reRequire} = mockRequire;
 
 test('putout: cli: cache files: is changed: isNodeModulesChanged: cannot find', async (t) => {
     const fileCache = {
@@ -11,13 +11,17 @@ test('putout: cli: cache files: is changed: isNodeModulesChanged: cannot find',
         reconcile: stub(),
     };
 
-    const findUp = stub();
+    const simpleImport = stub().resolves({
+        findNodeModules: stub(),
+    });
+    
+    mockRequire('./simple-import', {
+        simpleImport,
+    });
 
     const {isNodeModulesChanged} = reRequire('./is-changed');
 
-    const result = await isNodeModulesChanged(fileCache, {
-        findUp,
-    });
+    const result = await isNodeModulesChanged(fileCache);
 
     stopAll();
 
@@ -96,6 +100,13 @@ test('putout: cli: cache files: is changed', async (t) => {
     };
 
     const findUp = stub();
+    const simpleImport = stub().resolves({
+        findNodeModules: stub(),
+    });
+    
+    mockRequire('./simple-import', {
+        simpleImport,
+    });
 
     const isChanged = reRequire('./is-changed');
 

packages/cli-cache/lib/simple-import.js

@@ -1,3 +1,7 @@
 'use strict';
 
-module.exports.simpleImport = async (url) => (await import(url)).default;
+module.exports.simpleImport = async (url) => {
+    const data = await import(url);
+    
+    return data.default || data;
+};