Include package.json#types and typings (resolves #607)

webpro-nl · May 4, 2024 · 296ab06 · 296ab06
1 parent ab8952b
commit 296ab06
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/packages/knip/fixtures/workspaces-dts/packages/client/client.d.ts b/packages/knip/fixtures/workspaces-dts/packages/client/client.d.ts
diff --git a/packages/knip/fixtures/workspaces-dts/packages/client/package.json b/packages/knip/fixtures/workspaces-dts/packages/client/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "type": "module",
+  "types": "client.d.ts",
   "dependencies": {
     "@workspaces-dts/shared": "*"
   }

diff --git a/packages/knip/fixtures/workspaces-dts/packages/server/package.json b/packages/knip/fixtures/workspaces-dts/packages/server/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "type": "module",
+  "typings": "server.d.ts",
   "dependencies": {
     "@workspaces-dts/shared": "*"
   }

diff --git a/packages/knip/fixtures/workspaces-dts/packages/server/server.d.ts b/packages/knip/fixtures/workspaces-dts/packages/server/server.d.ts
diff --git a/packages/knip/src/util/modules.ts b/packages/knip/src/util/modules.ts
@@ -44,7 +44,7 @@ export const getEntryPathFromManifest = (
   manifest: PackageJson,
   sharedGlobOptions: { cwd: string; workingDir: string; gitignore: boolean; ignore: string[] }
 ) => {
-  const { main, bin, exports } = manifest;
+  const { main, bin, exports, types, typings } = manifest;
 
   const entryPaths = new Set<string>();
 
@@ -59,6 +59,9 @@ export const getEntryPathFromManifest = (
     for (const item of getStringValues(exports)) entryPaths.add(item);
   }
 
+  if (typeof types === 'string') entryPaths.add(types);
+  if (typeof typings === 'string') entryPaths.add(typings);
+
   // Use glob, as we only want source files that:
   // - exist
   // - are not (generated) files that are .gitignore'd

diff --git a/packages/knip/test/workspaces-dts.test.ts b/packages/knip/test/workspaces-dts.test.ts
@@ -18,7 +18,7 @@ test('Find unused un-built exports across workspaces', async () => {
   assert.deepEqual(counters, {
     ...baseCounters,
     exports: 1,
-    processed: 6,
-    total: 6,
+    processed: 8,
+    total: 8,
   });
 });