Add wireit to schema.json, improve consistency

packages/knip/fixtures/plugins/wireit/apps/example-configuration/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "@fixtures/wireit-apps-example-configuration",
+  "version": "1.0.0",
+  "scripts": {
+    "build": "wireit",
+    "bundle": "wireit"
+  },
+  "wireit": {
+    "build": {
+      "command": "tsc",
+      "files": [
+        "src/**/*.ts",
+        "tsconfig.json"
+      ],
+      "output": [
+        "lib/**"
+      ]
+    },
+    "bundle": {
+      "command": "rollup -c",
+      "dependencies": [
+        "build"
+      ],
+      "files": [
+        "rollup.config.json"
+      ],
+      "output": [
+        "dist/bundle.js"
+      ]
+    }
+  }
+}

packages/knip/fixtures/plugins/wireit/apps/example-configuration/rollup.config.json

@@ -0,0 +1 @@
+{}

packages/knip/fixtures/plugins/wireit/apps/example-configuration/tsconfig.json

@@ -0,0 +1 @@
+{}

packages/knip/fixtures/plugins/wireit/apps/missing/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@fixtures/wireit-apps-missing",
-  "version": "*"
+  "version": "1.0.0"
 }

packages/knip/fixtures/plugins/wireit/apps/withcommands/package.json → packages/knip/fixtures/plugins/wireit/package.json

@@ -1,10 +1,16 @@
 {
-  "name": "@fixtures/wireit-apps-withcommands",
-  "version": "*",
+  "name": "@fixtures/wireit",
+  "version": "1.0.0",
+  "workspaces": [
+    "apps/*"
+  ],
   "scripts": {
     "build": "wireit",
     "dev": "wireit"
   },
+  "devDependencies": {
+    "wireit": "*"
+  },
   "wireit": {
     "build": {
       "command": "tsc"

packages/knip/schema.json

@@ -425,6 +425,10 @@
         "webpack": {
           "title": "Webpack plugin configuration (https://github.com/webpro/knip/blob/main/src/plugins/webpack/README.md)",
           "$ref": "#/definitions/plugin"
+        },
+        "wireit": {
+          "title": "Wireit plugin configuration (https://github.com/webpro/knip/blob/main/src/plugins/wireit/README.md)",
+          "$ref": "#/definitions/plugin"
         }
       }
     },

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

@@ -32,11 +32,9 @@ const findWireItDependencies: GenericPluginCallback = async (_configFilePath, op
   const localConfig = manifest[PACKAGE_JSON_PATH] as WireitConfig;
   if (!localConfig) return [];
 
-  const scriptArray = Object.values(localConfig)
-    .map(({ command: script }) => script!)
-    .filter(script => script !== undefined);
+  const scripts = Object.values(localConfig).flatMap(({ command: script }) => (script ? [script] : []));
 
-  const scriptDependencies = getDependenciesFromScripts(scriptArray, { cwd, manifest });
+  const scriptDependencies = getDependenciesFromScripts(scripts, { cwd, manifest });
 
   return scriptDependencies;
 };

packages/knip/test/plugins/wireit.test.ts

@@ -1,36 +1,53 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
+import { main } from '../../src/index.js';
 import * as wireit from '../../src/plugins/wireit/index.js';
 import { resolve, join } from '../../src/util/path.js';
+import baseArguments from '../helpers/baseArguments.js';
+import baseCounters from '../helpers/baseCounters.js';
 import { getManifest, pluginConfig as config } from '../helpers/index.js';
 
-const wireitPath = resolve('fixtures/plugins/wireit');
-
-async function loadWireitConfig(pathSuffix: string): Promise<string[]> {
-  const cwd = join(wireitPath, pathSuffix);
-  const manifestFilePath = join(cwd, 'package.json');
-  const manifest = getManifest(cwd);
-
-  return wireit.findDependencies(manifestFilePath, {
-    manifest,
-    config,
-    cwd,
-    isProduction: false,
-    enabledPlugins: [],
-  });
-}
+const cwd = resolve('fixtures/plugins/wireit');
+const options = { cwd, config, isProduction: false, enabledPlugins: [] };
 
 test('Find no dependencies when the wireit configuration is missing', async () => {
-  const dependencies = await loadWireitConfig('apps/missing');
+  const dir = join(cwd, 'apps/missing');
+  const configFilePath = join(dir, 'package.json');
+  const manifest = getManifest(dir);
+  const dependencies = await wireit.findDependencies(configFilePath, { ...options, manifest, cwd: dir });
   assert.deepEqual(dependencies, []);
 });
 
 test('Find dependencies when the wireit configuration has commands', async () => {
-  const dependencies = await loadWireitConfig('apps/withcommands');
+  const configFilePath = join(cwd, 'package.json');
+  const manifest = getManifest(cwd);
+  const dependencies = await wireit.findDependencies(configFilePath, { ...options, manifest });
   assert.deepEqual(dependencies, ['bin:tsc']);
 });
 
 test('Find dependencies in the example wireit configuration', async () => {
-  const dependencies = await loadWireitConfig('apps/exampleconfiguration');
+  const dir = join(cwd, 'apps/example-configuration');
+  const configFilePath = join(dir, 'package.json');
+  const manifest = getManifest(dir);
+  const dependencies = await wireit.findDependencies(configFilePath, { ...options, manifest, cwd: dir });
   assert.deepEqual(dependencies, ['bin:tsc', 'bin:rollup']);
 });
+
+test('Find dependencies in wireit configuration', async () => {
+  const { issues, counters } = await main({
+    ...baseArguments,
+    cwd,
+  });
+
+  assert(issues.binaries['package.json']['tsc']);
+  assert(issues.binaries['apps/example-configuration/package.json']['rollup']);
+  assert(issues.binaries['apps/example-configuration/package.json']['tsc']);
+
+  assert.deepEqual(counters, {
+    ...baseCounters,
+    binaries: 3,
+    devDependencies: 0,
+    processed: 0,
+    total: 0,
+  });
+});