chore: wip

Author: chrisbbreuer

src/processor.ts

@@ -110,9 +110,14 @@ export function processDeclarations(
  }
  }
 
- // Check which imports are needed for interfaces and types (only exported ones)
+ // Check which imports are needed for interfaces and types (including non-exported ones that are referenced by exported items)
  for (const iface of interfaces) {
- if (iface.isExported) {
+ // Include interface if it's exported OR if it's referenced by exported functions
+ const isReferencedByExports = functions.some(func =>
+ func.isExported && func.text.includes(iface.name)
+ )
+
+ if (iface.isExported || isReferencedByExports) {
  for (const imp of imports) {
  const importMatch = imp.text.match(/import\s+(?:type\s+)?\{?\s*([^}]+)\s*\}?\s+from/)
  if (importMatch) {
@@ -176,7 +181,7 @@ export function processDeclarations(
  }
  }
 
- // Create filtered imports based on actually used items
+  // Create filtered imports based on actually used items
  const processedImports: string[] = []
  for (const imp of imports) {
  const importMatch = imp.text.match(/import\s+(?:type\s+)?\{?\s*([^}]+)\s*\}?\s+from\s+['"]([^'"]+)['"]/)
@@ -189,11 +194,12 @@ export function processDeclarations(
 
  if (usedItems.length > 0) {
  const source = importMatch[2]
- const hasTypeImports = usedItems.some(item => item.startsWith('type '))
- const hasValueImports = usedItems.some(item => !item.startsWith('type '))
+
+ // Check if original import was type-only
+ const isOriginalTypeOnly = imp.text.includes('import type')
 
  let importStatement = 'import '
- if (hasTypeImports && !hasValueImports) {
+ if (isOriginalTypeOnly) {
  importStatement += 'type '
  }
  importStatement += `{ ${usedItems.join(', ')} } from '${source}';`

test/fixtures/output/example/0005.d.ts

@@ -1,4 +1,4 @@
-import { ProcessingState } from './types';
+import type { ProcessingState } from './types';
 export declare function extract(filePath: string): Promise<string>;
 export declare function extractDtsTypes(sourceCode: string): string;
 export declare function isFunctionType(type: string): boolean;

test/fixtures/output/example/0006.d.ts

@@ -1,4 +1,4 @@
-import type { type Collection } from '@stacksjs/collections';
+import { type Collection } from '@stacksjs/collections';
 export declare const quotes: Collection<string[]>;
 export {
  align,

test/fixtures/output/example/0007.d.ts

@@ -1,6 +1,6 @@
-import { CAOptions, CertificateOptions, GenerateCertReturn, TlsOption } from './types';
 import { forge, tls } from 'node-forge';
 import { os } from 'node:os';
+import type { CAOptions, CertificateOptions, GenerateCertReturn, TlsOption } from './types';
 export declare function generateRandomSerial(verbose?: boolean): string;
 export declare function calculateValidityDates(options: {
  validityDays?: number

test/fixtures/output/example/0008.d.ts

@@ -1,6 +1,6 @@
-import { CertDetails } from './types';
 import { os } from 'node:os';
 import { pki } from 'node-forge';
+import type { CertDetails } from './types';
 export declare function isCertValidForDomain(certPemOrPath: string, domain: string): boolean;
 export declare function readCertFromFile(certPath: string): string;
 export declare function parseCertDetails(certPemOrPath: string): CertDetails;

test/fixtures/output/example/0009.d.ts

@@ -1,4 +1,4 @@
-import { Config } from './types';
+import type { Config } from './types';
 export declare function loadConfig<T>({
  name,
  cwd,