chore: wip

Author: chrisbbreuer

fixtures/output/example-0001.d.ts

@@ -2,9 +2,9 @@ import type { BunPlugin } from 'bun'
 import type { DtsGenerationConfig, DtsGenerationOption } from '@stacksjs/dtsx'
 import type { BunPlugin } from 'bun';
 /**
-* Example of const declaration
-*/
-export declare const conf: conf;
+ * Example of const declaration
+ */
+export declare const conf: { [key: string]: string };
 export declare const someObject: {
   someString: 'Stacks';
   someNumber: 1000;
@@ -13,11 +13,11 @@ export declare const someObject: {
   someFunction: (...args: any[]) => void;
   anotherOne: (...args: any[]) => string;
   someArray: Array<1 | 2 | 3>;
-  someNestedArray: Array<1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10>;
-  someNestedArray2: Array<1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 'dummy value'>;
-  someNestedArray3: Array<1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 'dummy value', [11, 12, 13]'>;
-  someOtherNestedArray: Array<'some text', 2, console.log, () => console.log('hello world'), helloWorld'>;
-  someComplexArray: Array<Object>;
+  someNestedArray: Array<Array<1 | 2 | 3> | Array<4 | 5 | 6 | 7 | 8 | 9 | 10>>;
+  someNestedArray2: Array<Array<1 | 2 | 3> | Array<4 | 5 | 6 | 7 | 8 | 9 | 10> | 'dummy value'>;
+  someNestedArray3: Array<Array<1 | 2 | 3> | Array<4 | 5 | 6 | 7 | 8 | 9 | 10> | 'dummy value', [11, 12, 13]'>;
+  someOtherNestedArray: Array<Array<'some text', 2, console.log, () => console.log('hello world'), helloWorld'>>;
+  someComplexArray: Array<Array<Object>>;
   someObject: {
     key: 'value';
   };
@@ -35,49 +35,49 @@ export declare const someObject: {
   someInlineCall3: (...args: any[]) => void;
 };
 /**
-* Example of interface declaration
-* with another comment in an extra line
-*/
+ * Example of interface declaration
+ * with another comment in an extra line
+ */
 export declare interface User {
   id: number;
   name: string;
   email: string;
 }
 /**
-* Example of type declaration
-*
-* with multiple lines of comments, including an empty line
-*/
+ * Example of type declaration
+ *
+ * with multiple lines of comments, including an empty line
+ */
 export declare interface ResponseData {
   success: boolean;
   data: User[];
 }
 /**
-* Example of function declaration
-*
-*
-* with multiple empty lines, including an empty lines
-*/
+ * Example of function declaration
+ *
+ *
+ * with multiple empty lines, including an empty lines
+ */
 export declare function fetchUsers(): Promise<ResponseData>;
 export declare interface ApiResponse<T> {
   status: number;
   message: string;
   data: T;
 }
 /**
-* Example of another const declaration
-*
-* with multiple empty lines, including being poorly formatted
-*/
-declare const settings: settings;
+ * Example of another const declaration
+ *
+ * with multiple empty lines, including being poorly formatted
+ */
+declare const settings: { [key: string]: any };
 export declare interface Product {
   id: number;
   name: string;
   price: number;
 }
 /**
-* Example of function declaration
-*/
+ * Example of function declaration
+ */
 export declare function getProduct(id: number): Promise<ApiResponse<Product>>;
 export declare interface AuthResponse {
   token: string;
@@ -95,7 +95,7 @@ declare interface Options<T> {
   defaultConfig: T;
 }
 export declare async function loadConfig<T extends Record<string, unknown>>(): void;
-declare const dtsConfig: dtsConfig;
+declare const dtsConfig: DtsGenerationConfig;
 export { generate, dtsConfig }
 export declare type { DtsGenerationOption }
 export { config } from './config'
@@ -104,4 +104,5 @@ export * from './generate'
 export * from './types'
 export * from './utils'
 
-export default export default dts;;
+export default 
+export default dts;

src/extract.ts

@@ -61,6 +61,7 @@ interface TypeAnnotation {
 }
 
 function getTypeAnnotation(declaration: string): TypeAnnotation {
+  // eslint-disable-next-line regexp/no-super-linear-backtracking
   const match = declaration.match(/:\s*(\{[^=]+\}|\[[^\]]+\]|[^=]+?)\s*=/)
   return {
     raw: match?.[1]?.trim() ?? null,
@@ -376,46 +377,79 @@ function inferArrayType(value: string): string {
   if (elements.length === 0)
     return 'never[]'
 
-  const elementTypes = elements.map(element => inferElementType(element.trim()))
-
-  // Check if we have nested arrays
-  if (elements.some(el => el.trim().startsWith('['))) {
-    // Preserve array nesting structure
-    return `Array<${elementTypes.join(' | ').replace(/'+$/, '')}>`
-  }
-
-  const uniqueTypes = [...new Set(elementTypes)]
-  return `Array<${uniqueTypes.join(' | ')}>`
+  // Use processNestedArray to handle the array structure
+  const processedType = processNestedArray(elements)
+  return `Array<${processedType}>`
 }
 
 /**
  * Infer element type from a single array element
  */
 export function inferElementType(element: string): string {
-  if (element.trim().startsWith('[')) {
-    const nested = inferArrayType(element)
-    return nested
-  }
+  const trimmed = element.trim()
 
-  if (element.trim().startsWith('{'))
-    return formatObjectType(parseObjectLiteral(element))
+  // Handle string literals
+  if (trimmed.startsWith('\'') || trimmed.startsWith('"')) {
+    const cleanValue = trimmed.slice(1, -1).replace(/'+$/, '')
+    return `'${cleanValue}'`
+  }
 
-  if (element.trim().startsWith('\'') || element.trim().startsWith('"'))
-    return `'${element.slice(1, -1).replace(/'+$/, '')}'`
+  // Handle numbers
+  if (!Number.isNaN(Number(trimmed))) {
+    return trimmed
+  }
 
-  if (!Number.isNaN(Number(element.trim())))
-    return element.trim()
+  // Handle objects
+  if (trimmed.startsWith('{')) {
+    return formatObjectType(parseObjectLiteral(trimmed))
+  }
 
-  if (element.trim() === 'console.log')
+  // Handle known function references
+  if (trimmed === 'console.log' || trimmed.endsWith('.log')) {
     return '(...args: any[]) => void'
+  }
 
-  if (element.includes('=>'))
+  // Handle arrow functions
+  if (trimmed.includes('=>')) {
     return '(...args: any[]) => void'
+  }
+
+  // Handle function calls
+  if (trimmed.includes('(') && trimmed.includes(')')) {
+    return 'unknown'
+  }
 
-  if (element.includes('.'))
+  // Handle references to global objects
+  if (trimmed.includes('.')) {
     return 'unknown'
+  }
+
+  // Default case
+  return 'unknown'
+}
+
+/**
+ * Process nested array structures
+ */
+export function processNestedArray(elements: string[]): string {
+  const processedTypes = elements.map((element) => {
+    const trimmed = element.trim()
+
+    // Handle nested arrays
+    if (trimmed.startsWith('[')) {
+      const nestedContent = extractNestedContent(trimmed, '[', ']')
+      if (nestedContent) {
+        const nestedElements = splitArrayElements(nestedContent)
+        return `Array<${processNestedArray(nestedElements)}>`
+      }
+      return 'never'
+    }
+
+    return inferElementType(trimmed)
+  })
 
-  return 'any'
+  const uniqueTypes = [...new Set(processedTypes.filter(type => type !== 'never'))]
+  return uniqueTypes.join(' | ')
 }
 
 /**
@@ -491,7 +525,7 @@ export function splitArrayElements(content: string): string[] {
   if (current.trim())
     elements.push(current.trim())
 
-  return elements
+  return elements.filter(Boolean)
 }
 
 /**
@@ -654,10 +688,10 @@ export function isCommentLine(line: string): boolean {
 
 function processCommentLine(line: string, state: ProcessingState): void {
   const indentedLine = line.startsWith('*')
-    ? `  ${line}` // Add indentation for content lines
+    ? ` ${line}` // Add indentation for content lines
     : line.startsWith('/**') || line.startsWith('*/')
       ? line // Keep delimiters at original indentation
-      : `  ${line}` // Add indentation for other lines
+      : ` ${line}` // Add indentation for other lines
 
   if (line.startsWith('/**'))
     state.lastCommentBlock = ''