Allow nsTypes to always consider all enums (the actual fix for #927)

webpro-nl · Jan 27, 2025 · 881de38 · 881de38
1 parent 6954b6f
commit 881de38
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/packages/knip/fixtures/enum-members-enumerated/index.ts b/packages/knip/fixtures/enum-members-enumerated/index.ts
@@ -1,6 +1,8 @@
 import { Fruits } from './fruits';
 import { Direction } from './directions';
 
+console.log(Fruits.apple);
+
 Object.keys(Fruits);
 Object.values(Fruits);
 Object.entries(Fruits);

diff --git a/packages/knip/fixtures/tags/index.ts b/packages/knip/fixtures/tags/index.ts
@@ -2,8 +2,6 @@ import * as NS from './tags.js';
 import { MyClass, MyEnum } from './tags.js';
 import { ignored, notIgnored } from './unimported.js';
 
-const x: MyEnum = {};
-
 const xm = MyEnum.UsedUntagged;
 
 const y = new MyClass();
diff --git a/packages/knip/src/index.ts b/packages/knip/src/index.ts
@@ -473,6 +473,7 @@ export const main = async (unresolvedConfiguration: CommandLineOptions) => {
 
               if (isReferenced) {
                 if (report.enumMembers && exportedItem.type === 'enum') {
+                  if (!report.nsTypes && importsForExport.refs.has(identifier)) continue;
                   if (hasStrictlyEnumReferences(importsForExport, identifier)) continue;
 
                   for (const member of exportedItem.members) {

diff --git a/packages/knip/test/enum-members.test.ts b/packages/knip/test/enum-members.test.ts
@@ -35,11 +35,10 @@ test('Find unused enum members (isIncludeEntryExports)', async () => {
   assert.equal(Object.keys(issues.enumMembers['members.ts']).length, 2);
   assert(issues.enumMembers['members.ts']['MyEnum.B_Unused']);
   assert(issues.enumMembers['members.ts']['MyEnum.D_Key']);
-  assert(issues.enumMembers['index.ts']['EntryEnum.UnusedMemberInEntryEnum']);
 
   assert.deepEqual(counters, {
     ...baseCounters,
-    enumMembers: 3,
+    enumMembers: 2,
     processed: 2,
     total: 2,
   });

diff --git a/packages/knip/test/exports-special-characters.test.ts b/packages/knip/test/exports-special-characters.test.ts
@@ -25,6 +25,35 @@ test('Handle special characters in named exports and members', async () => {
   assert(issues.classMembers['exports.ts']['DollarMembers.$method']);
   assert(issues.classMembers['exports.ts']['DollarMembers.method$']);
 
+  assert.deepEqual(counters, {
+    ...baseCounters,
+    classMembers: 4,
+    exports: 4,
+    types: 1,
+    processed: 2,
+    total: 2,
+  });
+});
+
+test('Handle special characters in named exports and members (nsTypes)', async () => {
+  const { issues, counters } = await main({
+    ...baseArguments,
+    cwd,
+    includedIssueTypes: ['nsTypes'],
+  });
+
+  assert(issues.exports['exports.ts']['$dollar']);
+  assert(issues.exports['exports.ts']['dollar$']);
+  assert(issues.exports['exports.ts']['_underscore']);
+  assert(issues.exports['exports.ts']['$Dollar']);
+
+  assert(issues.types['exports.ts']['$DollarType']);
+
+  assert(issues.classMembers['exports.ts']['DollarMembers.$member']);
+  assert(issues.classMembers['exports.ts']['DollarMembers.member$']);
+  assert(issues.classMembers['exports.ts']['DollarMembers.$method']);
+  assert(issues.classMembers['exports.ts']['DollarMembers.method$']);
+
   assert(issues.enumMembers['exports.ts']['Characters.-']);
   assert(issues.enumMembers['exports.ts']['Characters.,']);
   assert(issues.enumMembers['exports.ts']['Characters.:']);