Merge node and node-test-runner plugins

Author: webpro

packages/knip/src/plugins/index.ts

@@ -38,7 +38,6 @@ import { default as msw } from './msw/index.js';
 import { default as nest } from './nest/index.js';
 import { default as netlify } from './netlify/index.js';
 import { default as next } from './next/index.js';
-import { default as nodeTestRunner } from './node-test-runner/index.js';
 import { default as node } from './node/index.js';
 import { default as nodemon } from './nodemon/index.js';
 import { default as npmPackageJsonLint } from './npm-package-json-lint/index.js';
@@ -133,7 +132,6 @@ export const Plugins = {
   netlify,
   next,
   node,
-  'node-test-runner': nodeTestRunner,
   nodemon,
   'npm-package-json-lint': npmPackageJsonLint,
   nuxt,

packages/knip/src/plugins/node-test-runner/index.ts

@@ -1,13 +1,37 @@
-import type { Plugin } from '../../types/config.js';
+import type { IsPluginEnabled, Plugin, ResolveEntryPaths } from '../../types/config.js';
+import type { PackageJson } from '../../types/package-json.js';
+import { toEntry } from '../../util/input.js';
 
 const title = 'Node.js';
 
+const isEnabled: IsPluginEnabled = () => true;
+
+const config = ['package.json'];
+
+const packageJsonPath = (id: PackageJson) => id;
+
+const resolveEntryPaths: ResolveEntryPaths<PackageJson> = localConfig => {
+  const scripts = localConfig.scripts;
+
+  const entry = ['server.js'];
+
+  if (scripts && Object.keys(scripts).some(script => /(?<=^|\s)node\s(.*)--test/.test(scripts[script]))) {
+    entry.push(...['**/*{.,-,_}test.?(c|m)js', '**/test-*.?(c|m)js', '**/test.?(c|m)js', '**/test/**/*.?(c|m)js']);
+  }
+
+  return entry.map(toEntry);
+};
+
 const args = {
   positional: true,
   nodeImportArgs: true,
 };
 
 export default {
   title,
+  isEnabled,
+  packageJsonPath,
+  config,
+  resolveEntryPaths,
   args,
 } satisfies Plugin;

packages/knip/src/plugins/node/index.ts

@@ -53,7 +53,6 @@ export const pluginsSchema = z.object({
   netlify: pluginSchema,
   next: pluginSchema,
   node: pluginSchema,
-  'node-test-runner': pluginSchema,
   nodemon: pluginSchema,
   'npm-package-json-lint': pluginSchema,
   nuxt: pluginSchema,

packages/knip/src/schema/plugins.ts

@@ -40,7 +40,6 @@ export type PluginName =
   | 'netlify'
   | 'next'
   | 'node'
-  | 'node-test-runner'
   | 'nodemon'
   | 'npm-package-json-lint'
   | 'nuxt'
@@ -134,7 +133,6 @@ export const pluginNames = [
   'netlify',
   'next',
   'node',
-  'node-test-runner',
   'nodemon',
   'npm-package-json-lint',
   'nuxt',

packages/knip/src/types/PluginNames.ts

@@ -125,7 +125,7 @@ export type Resolve = (options: PluginOptions) => Promise<Input[]> | Input[];
 export interface Plugin {
   title: string;
   args?: Args;
-  packageJsonPath?: string | ((manifest: PackageJson) => string);
+  packageJsonPath?: string | ((manifest: PackageJson) => unknown);
   enablers?: IgnorePatterns | string;
   isEnabled?: IsPluginEnabled;
   isRootOnly?: boolean;