Include members for default-exported enums/classes

Author: webpro

packages/knip/fixtures/exports-default-interface/index.ts

@@ -4,8 +4,10 @@ import Default_MyInterface from './interface';
 
 const i: Default_MyInterface = { id: 0 };
 const e: Default_MyEnum = 0;
+const m: Default_MyEnum.id = 0;
 const t: Default_MyType = {};
 
 i;
 e;
+m;
 t;

packages/knip/fixtures/re-exports-with-decorator/entry.ts

@@ -2,4 +2,5 @@ import { NS } from './barrel.js';
 import { MyDecorated } from './barrel.js';
 
 NS;
+NS.KEY;
 MyDecorated;

packages/knip/src/typescript/ast-helpers.ts

@@ -1,11 +1,13 @@
 import ts from 'typescript';
+import { FIX_FLAGS } from '../constants.js';
+import type { Fix } from '../types/exports.js';
 import { SymbolType } from '../types/issues.js';
 
-export function isGetOrSetAccessorDeclaration(node: ts.Node): node is ts.AccessorDeclaration {
+function isGetOrSetAccessorDeclaration(node: ts.Node): node is ts.AccessorDeclaration {
   return node.kind === ts.SyntaxKind.SetAccessor || node.kind === ts.SyntaxKind.GetAccessor;
 }
 
-export function isPrivateMember(
+function isPrivateMember(
   node: ts.MethodDeclaration | ts.PropertyDeclaration | ts.SetAccessorDeclaration | ts.GetAccessorDeclaration
 ): boolean {
   return node.modifiers?.some(modifier => modifier.kind === ts.SyntaxKind.PrivateKeyword) ?? false;
@@ -60,6 +62,31 @@ export const getNodeType = (node: ts.Node): SymbolType => {
   return SymbolType.UNKNOWN;
 };
 
+export const isNonPrivatePropertyOrMethodDeclaration = (
+  member: ts.ClassElement
+): member is ts.MethodDeclaration | ts.PropertyDeclaration =>
+  (ts.isPropertyDeclaration(member) || ts.isMethodDeclaration(member) || isGetOrSetAccessorDeclaration(member)) &&
+  !isPrivateMember(member);
+
+export const getClassMember = (member: ts.MethodDeclaration | ts.PropertyDeclaration, isFixTypes: boolean) => ({
+  node: member,
+  identifier: member.name.getText(),
+  // Naive, but [does.the.job()]
+  pos: member.name.getStart() + (ts.isComputedPropertyName(member.name) ? 1 : 0),
+  type: SymbolType.MEMBER,
+  fix: isFixTypes ? ([member.getStart(), member.getEnd(), FIX_FLAGS.NONE] as Fix) : undefined,
+});
+
+export const getEnumMember = (member: ts.EnumMember, isFixTypes: boolean) => ({
+  node: member,
+  identifier: stripQuotes(member.name.getText()),
+  pos: member.name.getStart(),
+  type: SymbolType.MEMBER,
+  fix: isFixTypes
+    ? ([member.getStart(), member.getEnd(), FIX_FLAGS.OBJECT_BINDING | FIX_FLAGS.WITH_NEWLINE] as Fix)
+    : undefined,
+});
+
 export function stripQuotes(name: string) {
   const length = name.length;
   if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && isQuoteOrBacktick(name.charCodeAt(0))) {

packages/knip/src/typescript/visitors/exports/exportAssignment.ts

@@ -1,11 +1,16 @@
 import ts from 'typescript';
 import { FIX_FLAGS } from '../../../constants.js';
 import type { Fix } from '../../../types/exports.js';
-import { getNodeType } from '../../ast-helpers.js';
+import {
+  getClassMember,
+  getEnumMember,
+  getNodeType,
+  isNonPrivatePropertyOrMethodDeclaration,
+} from '../../ast-helpers.js';
 import { isModule } from '../helpers.js';
 import { exportVisitor as visit } from '../index.js';
 
-export default visit(isModule, (node, { isFixExports }) => {
+export default visit(isModule, (node, { isFixExports, isReportClassMembers, isFixTypes }) => {
   if (ts.isExportAssignment(node)) {
     // Patterns:
     // export default 1;
@@ -15,6 +20,24 @@ export default visit(isModule, (node, { isFixExports }) => {
     // @ts-expect-error We need the symbol in `addExport`
     const symbol = node.getSourceFile().locals?.get(node.expression.escapedText);
     const type = getNodeType(symbol?.valueDeclaration);
+
+    if (symbol?.valueDeclaration) {
+      const decl = symbol.valueDeclaration;
+      if (ts.isEnumDeclaration(decl)) {
+        const members = decl.members.map(member => getEnumMember(member, isFixExports));
+        return { node, symbol, identifier: 'default', type, pos, fix, members };
+      }
+
+      if (ts.isClassDeclaration(decl)) {
+        const members = isReportClassMembers
+          ? decl.members
+              .filter(isNonPrivatePropertyOrMethodDeclaration)
+              .map(member => getClassMember(member, isFixTypes))
+          : [];
+        return { node, symbol, identifier: 'default', type, pos, fix, members };
+      }
+    }
+
     return { node, symbol, identifier: 'default', type, pos, fix };
   }
 });

packages/knip/src/typescript/visitors/exports/exportKeyword.ts

@@ -4,11 +4,11 @@ import type { Fix } from '../../../types/exports.js';
 import { SymbolType } from '../../../types/issues.js';
 import { compact } from '../../../util/array.js';
 import {
+  getClassMember,
   getDefaultKeywordNode,
+  getEnumMember,
   getExportKeywordNode,
-  isGetOrSetAccessorDeclaration,
-  isPrivateMember,
-  stripQuotes,
+  isNonPrivatePropertyOrMethodDeclaration,
 } from '../../ast-helpers.js';
 import { isModule } from '../helpers.js';
 import { exportVisitor as visit } from '../index.js';
@@ -87,22 +87,7 @@ export default visit(isModule, (node, { isFixExports, isFixTypes, isReportClassM
       const pos = (node.name ?? node).getStart();
       const fix = getFix(exportKeyword, defaultKeyword);
       const members = isReportClassMembers
-        ? node.members
-            .filter(
-              (member): member is ts.MethodDeclaration | ts.PropertyDeclaration =>
-                (ts.isPropertyDeclaration(member) ||
-                  ts.isMethodDeclaration(member) ||
-                  isGetOrSetAccessorDeclaration(member)) &&
-                !isPrivateMember(member)
-            )
-            .map(member => ({
-              node: member,
-              identifier: member.name.getText(),
-              // Naive, but [does.the.job()]
-              pos: member.name.getStart() + (ts.isComputedPropertyName(member.name) ? 1 : 0),
-              type: SymbolType.MEMBER,
-              fix: isFixTypes ? ([member.getStart(), member.getEnd(), FIX_FLAGS.NONE] as Fix) : undefined,
-            }))
+        ? node.members.filter(isNonPrivatePropertyOrMethodDeclaration).map(member => getClassMember(member, isFixTypes))
         : [];
 
       return { node, identifier, type: SymbolType.CLASS, pos, members, fix };
@@ -126,16 +111,7 @@ export default visit(isModule, (node, { isFixExports, isFixTypes, isReportClassM
       const identifier = node.name.getText();
       const pos = node.name.getStart();
       const fix = getTypeFix(exportKeyword);
-      const members = node.members.map(member => ({
-        node: member,
-        identifier: stripQuotes(member.name.getText()),
-        pos: member.name.getStart(),
-        type: SymbolType.MEMBER,
-        fix: isFixTypes
-          ? ([member.getStart(), member.getEnd(), FIX_FLAGS.OBJECT_BINDING | FIX_FLAGS.WITH_NEWLINE] as Fix)
-          : undefined,
-      }));
-
+      const members = node.members.map(member => getEnumMember(member, isFixExports));
       return { node, identifier, type: SymbolType.ENUM, pos, members, fix };
     }
   }