tjs-lang 0.6.45 → 0.7.4

package/src/lang/docs.test.ts

@@ -12,11 +12,11 @@ describe('generateDocs', () => {
   describe('basic output', () => {
     it('extracts function signatures in document order', () => {
       const source = `
-function first(x: 5) -> 10 {
+function first(x: 5): 10 {
   return x * 2
 }
 
-function second(a: '', b: 0) -> '' {
+function second(a: '', b: 0): '' {
   return a + b
 }
 `
@@ -56,12 +56,12 @@ More docs here.
 /*#
 # First Section
 */
-function first(x: 0) -> 0 { return x }
+function first(x: 0): 0 { return x }
 
 /*#
 # Second Section
 */
-function second(x: 0) -> 0 { return x }
+function second(x: 0): 0 { return x }
 `
       const result = generateDocs(source)
 
@@ -77,14 +77,14 @@ function second(x: 0) -> 0 { return x }
 
   describe('function signatures', () => {
     it('captures full signature with params and return type', () => {
-      const source = `function greet(name: 'World') -> '' { return name }`
+      const source = `function greet(name: 'World'): '' { return name }`
       const result = generateDocs(source)
 
       const func = result.items[0] as any
       expect(func.type).toBe('function')
       expect(func.signature).toContain('greet')
       expect(func.signature).toContain("name: 'World'")
-      expect(func.signature).toContain("-> ''")
+      expect(func.signature).toContain(": ''")
     })
 
     it('captures optional params with defaults', () => {
@@ -173,11 +173,11 @@ This is documentation.
     })
 
     it('renders function signatures as code blocks', () => {
-      const source = `function double(x: 5) -> 10 { return x * 2 }`
+      const source = `function double(x: 5): 10 { return x * 2 }`
       const result = generateDocs(source)
 
       expect(result.markdown).toContain('```tjs')
-      expect(result.markdown).toContain('function double(x: 5) -> 10')
+      expect(result.markdown).toContain('function double(x: 5): 10')
       expect(result.markdown).toContain('```')
     })
 
@@ -186,11 +186,11 @@ This is documentation.
 /*#
 Intro
 */
-function first(x: 0) -> 0 { return x }
+function first(x: 0): 0 { return x }
 /*#
 Middle
 */
-function second(x: 0) -> 0 { return x }
+function second(x: 0): 0 { return x }
 `
       const result = generateDocs(source)
 
@@ -208,11 +208,11 @@ function second(x: 0) -> 0 { return x }
 A collection of math functions.
 */
 
-function double(x: 5) -> 10 {
+function double(x: 5): 10 {
   return x * 2
 }
 
-function triple(x: 3) -> 9 {
+function triple(x: 3): 9 {
   return x * 3
 }
 
@@ -275,13 +275,13 @@ These functions are pure.
     it('handles mixed TJS and TypeScript in same file', () => {
       const source = `
 function tsFunc(x: number): number { return x }
-function tjsFunc(x: 0) -> 0 { return x }
+function tjsFunc(x: 0): 0 { return x }
 `
       const result = generateDocs(source)
 
       expect(result.items).toHaveLength(2)
       expect((result.items[0] as any).signature).toContain(': number')
-      expect((result.items[1] as any).signature).toContain('-> 0')
+      expect((result.items[1] as any).signature).toContain(': 0')
     })
   })
 })
@@ -299,7 +299,7 @@ describe('generateDocsMarkdown', () => {
   })
 
   it('renders function with type metadata', () => {
-    const source = `function greet(name: 'World') -> '' { return name }`
+    const source = `function greet(name: 'World'): '' { return name }`
     const types = {
       greet: {
         params: {
@@ -313,7 +313,7 @@ describe('generateDocsMarkdown', () => {
 
     expect(result).toContain('## greet')
     expect(result).toContain('```tjs')
-    expect(result).toContain("function greet(name: 'World') -> ''")
+    expect(result).toContain("function greet(name: 'World'): ''")
     expect(result).toContain('**Parameters:**')
     expect(result).toContain('`name`: string')
     expect(result).toContain('(e.g. `"World"`)')
@@ -341,13 +341,13 @@ describe('generateDocsMarkdown', () => {
   it('works without type metadata', () => {
     const source = `
 /*# Intro */
-function foo(x: 0) -> 0 { return x }
+function foo(x: 0): 0 { return x }
 `
     const result = generateDocsMarkdown(source, undefined)
 
     expect(result).toContain('Intro')
     expect(result).toContain('## foo')
-    expect(result).toContain('function foo(x: 0) -> 0')
+    expect(result).toContain('function foo(x: 0): 0')
     // No params/returns since no type metadata
     expect(result).not.toContain('**Parameters:**')
   })
@@ -355,9 +355,9 @@ function foo(x: 0) -> 0 { return x }
   it('preserves document order with interleaved docs and functions', () => {
     const source = `
 /*# Section 1 */
-function first(x: 0) -> 0 { return x }
+function first(x: 0): 0 { return x }
 /*# Section 2 */
-function second(x: 0) -> 0 { return x }
+function second(x: 0): 0 { return x }
 /*# Conclusion */
 `
     const types = {
@@ -409,14 +409,14 @@ function greet(name: string): string {
     const source = `
 /*# Module header */
 
-function first(x: 0) -> 0 {
+function first(x: 0): 0 {
   /*# Comment inside first - should be ignored */
   return x
 }
 
 /*# Between first and second */
 
-function second(y: '') -> '' {
+function second(y: ''): '' {
   /*# Comment inside second - should be ignored */
   return y
 }

package/src/lang/docs.ts

@@ -67,10 +67,10 @@ export function generateDocs(source: string): DocResult {
 
   // Find all doc blocks and functions, sort by position
   const docPattern = /\/\*#([\s\S]*?)\*\//g
-  // Match both TJS (-> returnType) and TypeScript (: returnType) function syntax
+  // Match TJS function syntax with return type annotations (:, :?, :!)
   // Return type can be quoted string with spaces (e.g. 'Hello, World!')
   const funcPattern =
-    /function\s+(\w+)\s*\(([^)]*)\)\s*(?:(-[>?!])\s*('[^']*'|"[^"]*"|[^\s{]+)|:\s*(\w+))?\s*\{/g
+    /function\s+(\w+)\s*\(([^)]*)\)\s*(?:(:[?!]?)\s*('[^']*'|"[^"]*"|[^\s{]+))?\s*\{/g
 
   type Match = { type: 'doc' | 'function'; index: number; data: any }
   const matches: Match[] = []
@@ -107,14 +107,11 @@ export function generateDocs(source: string): DocResult {
     const name = match[1]
     const params = match[2]
     const returnMarker = match[3] || ''
-    const tjsReturnType = match[4] || ''
-    const tsReturnType = match[5] || ''
+    const returnType = match[4] || ''
 
     let signature = `function ${name}(${params})`
-    if (returnMarker) {
-      signature += ` ${returnMarker} ${tjsReturnType}`
-    } else if (tsReturnType) {
-      signature += `: ${tsReturnType}`
+    if (returnMarker && returnType) {
+      signature += `${returnMarker} ${returnType}`
     }
 
     matches.push({

package/src/lang/emitters/dts.test.ts

@@ -101,7 +101,7 @@ describe('typeDescriptorToTS', () => {
 describe('generateDTS', () => {
   it('should generate declarations for exported functions', () => {
     const source = `
-export function greet(name: 'Alice') -> '' {
+export function greet(name: 'Alice'): '' {
   return \`Hello, \${name}!\`
 }
 `
@@ -115,7 +115,7 @@ export function greet(name: 'Alice') -> '' {
 
   it('should handle optional parameters', () => {
     const source = `
-export function greet(name = 'world') -> '' {
+export function greet(name = 'world'): '' {
   return \`Hello, \${name}!\`
 }
 `
@@ -127,7 +127,7 @@ export function greet(name = 'world') -> '' {
 
   it('should handle multiple parameters and return types', () => {
     const source = `
-export function add(a: 0, b: 0) -> 0 {
+export function add(a: 0, b: 0): 0 {
   return a + b
 }
 `
@@ -141,11 +141,11 @@ export function add(a: 0, b: 0) -> 0 {
 
   it('should skip non-exported functions when exports exist', () => {
     const source = `
-function helper(x: '') -> '' {
+function helper(x: ''): '' {
   return x.toUpperCase()
 }
 
-export function greet(name: 'Alice') -> '' {
+export function greet(name: 'Alice'): '' {
   return helper(name)
 }
 `
@@ -158,7 +158,7 @@ export function greet(name: 'Alice') -> '' {
 
   it('should treat all functions as exported when no exports exist', () => {
     const source = `
-function add(a: 0, b: 0) -> 0 {
+function add(a: 0, b: 0): 0 {
   return a + b
 }
 `
@@ -170,7 +170,7 @@ function add(a: 0, b: 0) -> 0 {
 
   it('should handle object parameter shapes', () => {
     const source = `
-export function createUser(user: { name: '', age: 0 }) -> { id: 0, name: '' } {
+export function createUser(user: { name: '', age: 0 }): { id: 0, name: '' } {
   return { id: 1, name: user.name }
 }
 `
@@ -183,7 +183,7 @@ export function createUser(user: { name: '', age: 0 }) -> { id: 0, name: '' } {
 
   it('should handle nullable parameters', () => {
     const source = `
-export function find(id: 0 | null) -> '' {
+export function find(id: 0 | null): '' {
   return id ? 'found' : 'not found'
 }
 `
@@ -213,7 +213,7 @@ export function area(w: 0.0, h: 0.0) {
   it('should include JSDoc from TDoc comments', () => {
     const source = `
 /*# Greet a person by name */
-function greet(name: 'Alice') -> '' {
+function greet(name: 'Alice'): '' {
   return \`Hello, \${name}!\`
 }
 `
@@ -225,7 +225,7 @@ function greet(name: 'Alice') -> '' {
 
   it('should wrap in module declaration when moduleName is given', () => {
     const source = `
-export function add(a: 0, b: 0) -> 0 {
+export function add(a: 0, b: 0): 0 {
   return a + b
 }
 `
@@ -239,7 +239,7 @@ export function add(a: 0, b: 0) -> 0 {
 
   it('should handle array return types', () => {
     const source = `
-export function getNames(count: 0) -> [''] {
+export function getNames(count: 0): [''] {
   return Array(count).fill('test')
 }
 `
@@ -393,7 +393,7 @@ describe('generateDTS — Type declarations', () => {
     const source = `
 export Type Name = 'World'
 
-export function greet(name: Name) -> '' {
+export function greet(name: Name): '' {
   return \`Hello, \${name}!\`
 }
 `
@@ -614,7 +614,7 @@ export class Point {
   }
 }
 
-export function greet(name: '') -> '' {
+export function greet(name: ''): '' {
   return \`Hello, \${name}!\`
 }
 `

package/src/lang/emitters/from-ts.ts

@@ -15,7 +15,7 @@
  * }
  *
  * // Output TJS:
- * function greet(name: '', age = 0) -> '' {
+ * function greet(name: '', age = 0): '' {
  *   return `Hello, ${name}!`
  * }
  *
@@ -122,8 +122,15 @@ interface TypeResolutionContext {
   visited?: Set<string>
   /** Type parameter constraints and defaults from enclosing generic function/class */
   typeParams?: Map<string, { constraint?: ts.TypeNode; default?: ts.TypeNode }>
+  /** Cache resolved type alias/interface results to avoid redundant traversals */
+  resolvedCache?: Map<string, TypeInfo>
+  /** Current resolution depth — bail to 'any' when too deep */
+  depth?: number
 }
 
+/** Maximum type resolution depth before degrading to 'any' */
+const MAX_TYPE_DEPTH = 20
+
 /**
  * DOM interface types — not constructible but common in TS signatures.
  * Map to {} (opaque object) so params stay annotated and required
@@ -646,6 +653,13 @@ function typeToInfo(
 ): TypeInfo {
   if (!type) return { kind: 'any' }
 
+  // Bail on deeply nested type resolution to prevent exponential traversal
+  const depth = ctx?.depth ?? 0
+  if (depth > MAX_TYPE_DEPTH) return { kind: 'any' }
+  // Increment depth for recursive calls (mutating ctx would be wrong since
+  // sibling types share the same ctx; spread creates a child scope)
+  ctx = ctx ? { ...ctx, depth: depth + 1 } : undefined
+
   switch (type.kind) {
     case ts.SyntaxKind.StringKeyword:
       return { kind: 'string' }
@@ -802,17 +816,27 @@ function typeToInfo(
 
       // Resolve type aliases
       if (ctx?.typeAliases?.has(typeName)) {
+        // Check cache first
+        if (ctx.resolvedCache?.has(typeName)) {
+          return ctx.resolvedCache.get(typeName)!
+        }
         const visited = ctx.visited ?? new Set<string>()
         if (visited.has(typeName)) {
           return { kind: 'any' } // Circular reference
         }
         visited.add(typeName)
         const resolvedType = ctx.typeAliases.get(typeName)!
-        return typeToInfo(resolvedType, { ...ctx, visited })
+        const result = typeToInfo(resolvedType, { ...ctx, visited })
+        ctx.resolvedCache?.set(typeName, result)
+        return result
       }
 
       // Resolve interfaces
       if (ctx?.interfaces?.has(typeName)) {
+        // Check cache first
+        if (ctx.resolvedCache?.has(typeName)) {
+          return ctx.resolvedCache.get(typeName)!
+        }
         const visited = ctx.visited ?? new Set<string>()
         if (visited.has(typeName)) {
           return { kind: 'any' } // Circular reference
@@ -851,7 +875,9 @@ function typeToInfo(
             shape[propName] = typeToInfo(member.type, { ...ctx, visited })
           }
         }
-        return { kind: 'object', shape }
+        const result = { kind: 'object' as const, shape }
+        ctx.resolvedCache?.set(typeName, result)
+        return result
       }
 
       // Check type parameter constraints/defaults from enclosing context
@@ -1476,14 +1502,14 @@ function transformFunctionToTJS(
   const returnExample = node.type
     ? typeToExample(node.type, undefined, warnings, resolveCtx)
     : ''
-  // Use -! to skip signature tests - TS types are compile-time only,
+  // Use :! to skip signature tests - TS types are compile-time only,
   // the example values won't necessarily match runtime behavior
   const returnAnnotation =
     returnExample &&
     returnExample !== 'undefined' &&
     returnExample !== 'any' &&
     !returnExample.startsWith('new ') // new Set(), new Map() etc. aren't valid TJS literals
-      ? ` -! ${returnExample}`
+      ? `:! ${returnExample}`
       : ''
 
   // Track degraded return type
@@ -1596,7 +1622,7 @@ function emitOverloadGroup(
       : ''
     const returnAnnotation =
       returnExample && returnExample !== 'undefined' && returnExample !== 'any'
-        ? ` -! ${returnExample}`
+        ? `:! ${returnExample}`
         : ''
 
     const { line } = sourceFile.getLineAndCharacterOfPosition(
@@ -1723,12 +1749,12 @@ function transformClassToTJS(
       const returnExample = member.type
         ? typeToExample(member.type, undefined, warnings, resolveCtx)
         : ''
-      // Use -! to skip signature tests for TS-transpiled code
+      // Use :! to skip signature tests for TS-transpiled code
       const returnAnnotation =
         returnExample &&
         returnExample !== 'undefined' &&
         returnExample !== 'any'
-          ? ` -! ${returnExample}`
+          ? `:! ${returnExample}`
           : ''
 
       let body = '{ }'
@@ -1769,7 +1795,7 @@ function transformClassToTJS(
         returnExample !== 'undefined' &&
         returnExample !== 'any' &&
         !returnExample.startsWith('new ')
-          ? ` -> ${returnExample}`
+          ? `: ${returnExample}`
           : ''
 
       let body = '{ }'
@@ -2406,6 +2432,7 @@ export function fromTS(
     interfaces,
     sourceFile,
     warnings,
+    resolvedCache: new Map(),
   }
 
   // Pre-scan: detect function overload groups