feature: @putout/cli-cache: find node_modules instead of package.json

Author: coderaiser

packages/cli-cache/.madrun.mjs

@@ -1,7 +1,7 @@
 import {run} from 'madrun';
 
 export default {
-    'test': () => `tape 'lib/*.spec.js'`,
+    'test': () => `tape 'lib/*.spec.*'`,
     'watch:test': async () => `nodemon -w lib -x ${await run('test')}`,
     'lint': () => `putout .`,
     'fresh:lint': () => run('lint', '--fresh'),

packages/cli-cache/.npmignore

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

packages/cli-cache/lib/cache.js

@@ -30,7 +30,17 @@ const defaultCache = {
     canUseCache: returns(false),
 };
 
-const createCache = async ({cache, fresh, version, again, createFromFile = _createFromFile, unlink = _unlink, findCachePath = _findCachePath}) => {
+const createCache = async (overrides = {}) => {
+    const {
+        cache,
+        fresh,
+        version,
+        again,
+        createFromFile = _createFromFile,
+        unlink = _unlink,
+        findCachePath = _findCachePath,
+    } = overrides;
+    
     const name = await findCachePath();
 
     if (fresh)
@@ -146,10 +156,10 @@ const createGetOptionsCache = ({version}) => (options) => {
 };
 
 async function _findCachePath() {
-    const findCacheDir = await simpleImport('find-cache-dir');
+    const findCacheDir = await simpleImport('./find-cache-dir.mjs');
+    
     const cacheDir = await findCacheDir({
         name: 'putout',
-        create: true,
     });
 
     if (cacheDir)

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

@@ -0,0 +1,33 @@
+import {join} from 'node:path';
+import {mkdir as _mkdir} from 'node:fs/promises';
+import process from 'node:process';
+import _escalade from 'escalade';
+
+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));
+    
+    if (!path)
+        return path;
+    
+    const cacheDir = join(path, '.cache', name);
+    
+    await mkdir(cacheDir, {
+        recursive: true,
+    });
+    
+    return cacheDir;
+}

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

@@ -0,0 +1,12 @@
+import {test} from 'supertape';
+import findCacheDir from './find-cache-dir.mjs';
+
+test('putout: cli-cache: find-cache-dir', async (t) => {
+    const dir = await findCacheDir({
+        name: 'putout',
+        directory: 'abc',
+    });
+    
+    t.notOk(dir);
+    t.end();
+});

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

@@ -1,7 +1,5 @@
 'use strict';
 
-const {dirname, join} = require('node:path');
-
 module.exports = async (fileCache, {findUp}) => {
     const result = await Promise.all([
         isNodeModulesChanged(fileCache, {
@@ -21,14 +19,12 @@ module.exports.isNodeModulesChanged = isNodeModulesChanged;
 module.exports.isEslintChanged = isEslintChanged;
 
 async function isNodeModulesChanged(fileCache, {findUp}) {
-    const packagePath = await findUp('package.json');
+    const packagePath = await findUp('node_modules');
 
     if (!packagePath)
         return false;
 
-    const name = join(dirname(packagePath), 'node_modules');
-    
-    return isChanged(name, fileCache);
+    return isChanged(packagePath, fileCache);
 }
 
 // https://eslint.org/docs/user-guide/configuring#configuration-file-formats
@@ -40,6 +36,9 @@ async function isEslintChanged(fileCache, {findUp}) {
         '.eslintrc.yaml',
         '.eslintrc.yml',
         '.eslint.config.js',
+        '.eslint.config.mjs',
+        '.eslint.config.cjs',
+        '.eslint.config.ts',
     ]);
 
     if (!name)

packages/cli-cache/package.json

@@ -24,6 +24,7 @@
     "report": "madrun report"
   },
   "dependencies": {
+    "escalade": "^3.2.0",
     "file-entry-cache": "^10.0.2",
     "find-cache-dir": "^5.0.0",
     "find-up": "^7.0.0",