chore: wip

Author: chrisbbreuer

.gitignore

@@ -15,4 +15,5 @@ storage
 fixtures/generated
 bin/dtsx*
 /test/temp-output
-test/debug
+test/debug
+/test/fixtures/generated

src/extractor.ts

@@ -198,37 +198,37 @@ function extractFunctionDeclaration(node: ts.FunctionDeclaration, sourceCode: st
  * Build clean function signature for DTS output
  */
 function buildFunctionSignature(node: ts.FunctionDeclaration): string {
- const parts: string[] = []
+ let result = ''
 
  // Add modifiers
- if (hasExportModifier(node)) parts.push('export')
- parts.push('declare')
- if (node.asteriskToken) parts.push('function*')
- else parts.push('function')
+ if (hasExportModifier(node)) result += 'export '
+ result += 'declare '
+ if (node.asteriskToken) result += 'function* '
+ else result += 'function '
 
- // Add name
- if (node.name) parts.push(node.name.getText())
+ // Add name (no space before)
+ if (node.name) result += node.name.getText()
 
- // Add generics
+ // Add generics (no space before)
  if (node.typeParameters) {
  const generics = node.typeParameters.map(tp => tp.getText()).join(', ')
- parts.push(`<${generics}>`)
+ result += `<${generics}>`
  }
 
- // Add parameters
+ // Add parameters (no space before)
  const params = node.parameters.map(param => {
  const name = param.name.getText()
  const type = param.type?.getText() || 'any'
  const optional = param.questionToken ? '?' : ''
  return `${name}${optional}: ${type}`
  }).join(', ')
- parts.push(`(${params})`)
+ result += `(${params})`
 
- // Add return type
+ // Add return type (no space before colon)
  const returnType = node.type?.getText() || 'void'
- parts.push(`: ${returnType}`)
+ result += `: ${returnType}`
 
- return parts.join(' ') + ';'
+ return result + ';'
 }
 
 /**
@@ -271,18 +271,18 @@ function extractVariableStatement(node: ts.VariableStatement, sourceCode: string
  * Build clean variable declaration for DTS
  */
 function buildVariableDeclaration(name: string, type: string | undefined, kind: string, isExported: boolean): string {
- const parts: string[] = []
+ let result = ''
 
- if (isExported) parts.push('export')
- parts.push('declare')
- parts.push(kind)
- parts.push(name)
+ if (isExported) result += 'export '
+ result += 'declare '
+ result += kind + ' '
+ result += name
 
  if (type) {
- parts.push(`: ${type}`)
+ result += `: ${type}`
  }
 
- return parts.join(' ') + ';'
+ return result + ';'
 }
 
 /**
@@ -319,17 +319,17 @@ function extractInterfaceDeclaration(node: ts.InterfaceDeclaration, sourceCode:
  * Build clean interface declaration for DTS
  */
 function buildInterfaceDeclaration(node: ts.InterfaceDeclaration, isExported: boolean): string {
- const parts: string[] = []
+ let result = ''
 
- if (isExported) parts.push('export')
- parts.push('declare')
- parts.push('interface')
- parts.push(node.name.getText())
+ if (isExported) result += 'export '
+ result += 'declare '
+ result += 'interface '
+ result += node.name.getText()
 
- // Add generics
+ // Add generics (no space before)
  if (node.typeParameters) {
  const generics = node.typeParameters.map(tp => tp.getText()).join(', ')
- parts.push(`<${generics}>`)
+ result += `<${generics}>`
  }
 
  // Add extends
@@ -339,15 +339,15 @@ function buildInterfaceDeclaration(node: ts.InterfaceDeclaration, isExported: bo
  )
  if (extendsClause) {
  const types = extendsClause.types.map(type => type.getText()).join(', ')
- parts.push(`extends ${types}`)
+ result += ` extends ${types}`
  }
  }
 
  // Add body (simplified)
  const body = getInterfaceBody(node)
- parts.push(body)
+ result += ' ' + body
 
- return parts.join(' ')
+ return result
 }
 
 /**
@@ -406,22 +406,22 @@ function extractTypeAliasDeclaration(node: ts.TypeAliasDeclaration, sourceCode:
  * Build clean type declaration for DTS
  */
 function buildTypeDeclaration(node: ts.TypeAliasDeclaration, isExported: boolean): string {
- const parts: string[] = []
+ let result = ''
 
- if (isExported) parts.push('export')
- parts.push('type')
- parts.push(node.name.getText())
+ if (isExported) result += 'export '
+ result += 'type '
+ result += node.name.getText()
 
- // Add generics
+ // Add generics (no space before)
  if (node.typeParameters) {
  const generics = node.typeParameters.map(tp => tp.getText()).join(', ')
- parts.push(`<${generics}>`)
+ result += `<${generics}>`
  }
 
- parts.push('=')
- parts.push(node.type.getText())
+ result += ' = '
+ result += node.type.getText()
 
- return parts.join(' ')
+ return result
 }
 
 /**

src/processor.ts

@@ -214,22 +214,22 @@ export function processFunctionDeclaration(decl: Declaration): string {
  * Process variable declaration to DTS format
  */
 export function processVariableDeclaration(decl: Declaration): string {
- const parts: string[] = []
+ let result = ''
 
  // Add export if needed
  if (decl.isExported) {
- parts.push('export')
+ result += 'export '
  }
 
  // Add declare keyword
- parts.push('declare')
+ result += 'declare '
 
  // Add variable kind (const, let, var)
  const kind = decl.modifiers?.[0] || 'const'
- parts.push(kind)
+ result += kind + ' '
 
  // Add variable name
- parts.push(decl.name)
+ result += decl.name
 
  // Add type annotation
  let typeAnnotation = decl.typeAnnotation
@@ -245,15 +245,7 @@ export function processVariableDeclaration(decl: Declaration): string {
  typeAnnotation = 'any'
  }
 
- parts.push(':')
- parts.push(typeAnnotation)
-
- // Combine parts
- let result = parts.join(' ')
- result = result.replace(' : ', ': ')
-
- // Add semicolon
- result += ';'
+ result += `: ${typeAnnotation};`
 
  return result
 }
@@ -275,7 +267,7 @@ export function processInterfaceDeclaration(decl: Declaration): string {
  // Add interface name
  result += decl.name
 
- // Add generics if present
+ // Add generics if present (no space before)
  if (decl.generics) {
  result += decl.generics
  }
@@ -327,7 +319,7 @@ export function processTypeDeclaration(decl: Declaration): string {
  // Fallback to simple format
  result += 'type ' + decl.name
  if (decl.generics) {
- result += decl.generics
+ result += decl.generics // No space before generics
  }
  result += ' = any'
  }

test-generate.ts

@@ -1,16 +1,43 @@
 import { generate } from './src/generator'
 import { join } from 'node:path'
 
-const config = {
- entrypoints: [join(__dirname, 'test/fixtures/input/example/0003.ts')],
- outdir: join(__dirname, 'test/fixtures/generated'),
- clean: false,
- tsconfigPath: join(__dirname, 'tsconfig.json'),
- outputStructure: 'flat' as const,
-}
+// Test all examples
+const examples = ['0001', '0002', '0003', '0004', '0005', '0006', '0007', '0008', '0009', '0010', '0011']
+
+for (const example of examples) {
+ console.log(`\n🔍 Testing example ${example}...`)
+
+ const config = {
+ entrypoints: [join(__dirname, `test/fixtures/input/example/${example}.ts`)],
+ outdir: join(__dirname, 'test/fixtures/generated'),
+ clean: false,
+ tsconfigPath: join(__dirname, 'tsconfig.json'),
+ outputStructure: 'flat' as const,
+ }
 
-console.log('Generating with config:', config)
+ await generate(config)
 
-await generate(config)
+ // Read generated and expected content
+ const generatedPath = join(__dirname, 'test/fixtures/generated', `${example}.d.ts`)
+ const expectedPath = join(__dirname, 'test/fixtures/output/example', `${example}.d.ts`)
+
+ try {
+ const generatedContent = await Bun.file(generatedPath).text()
+ const expectedContent = await Bun.file(expectedPath).text()
+
+ if (generatedContent === expectedContent) {
+ console.log(`✅ ${example}: MATCH`)
+ } else {
+ console.log(`❌ ${example}: MISMATCH`)
+ console.log(`Generated (${generatedContent.length} chars):`)
+ console.log(generatedContent)
+ console.log(`\nExpected (${expectedContent.length} chars):`)
+ console.log(expectedContent)
+ console.log('\n' + '='.repeat(80))
+ }
+ } catch (error) {
+ console.log(`❌ ${example}: ERROR - ${error instanceof Error ? error.message : String(error)}`)
+ }
+}
 
-console.log('Generation complete')
+console.log('All examples tested!')

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

@@ -1,6 +1,6 @@
 import type { PluginBuilder } from 'bun';
 import type { UnimportOptions } from 'unimport';
-export declare function autoImports (options: Partial<UnimportOptions & { dts: string }>) : AutoImportsPlugin;
+export declare function autoImports(options: Partial<UnimportOptions & { dts: string }>): AutoImportsPlugin;
 declare interface AutoImportsPlugin {
  name: string
  setup: (builder: PluginBuilder) => Promise<void>