tjs-lang 0.6.44 → 0.7.3

package/src/lang/emitters/js-tests.ts

@@ -105,7 +105,7 @@ function typeMatches(
     }
   }
 
-  // Primitive types - check type only (used by -? runtime validation)
+  // Primitive types - check type only (used by :? runtime validation)
   if (typeof pattern === 'number') {
     if (typeof actual === 'number') return { matches: true }
     return {
@@ -451,6 +451,10 @@ interface SignatureTestInfo {
   defaults?: Record<string, unknown>
   line: number
   isAsync?: boolean
+  /** For class method tests: the class name */
+  className?: string
+  /** For class method tests: args to pass to the first constructor */
+  constructorArgs?: unknown[]
 }
 
 /**
@@ -464,10 +468,10 @@ export function extractSignatureTestInfos(
   // Strip comments to avoid matching functions inside doc comments/code examples
   const sourceWithoutComments = stripComments(originalSource)
 
-  // Match function declarations with return type marker (-> or -?)
-  // Skip -! which means "don't test"
-  // Pattern: [async] function name(params) -> returnExample {
-  const funcRegex = /(async\s+)?function\s+(\w+)\s*\(([^)]*)\)\s*(-[>?])\s*/g
+  // Match function declarations with return type marker (: or :?)
+  // Skip :! which means "don't test"
+  // Pattern: [async] function name(params): returnExample {
+  const funcRegex = /(async\s+)?function\s+(\w+)\s*\(([^)]*)\)\s*(:[?!]?)\s*/g
 
   let match
   while ((match = funcRegex.exec(sourceWithoutComments)) !== null) {
@@ -481,8 +485,8 @@ export function extractSignatureTestInfos(
       .slice(0, match.index)
       .split('\n').length
 
-    // -! means skip test
-    if (returnMarker === '-!') continue
+    // :! means skip test
+    if (returnMarker === ':!') continue
 
     // Extract return example - handle nested braces/brackets
     const afterMarker = sourceWithoutComments.slice(
@@ -516,6 +520,100 @@ export function extractSignatureTestInfos(
     }
   }
 
+  // Extract class method signature tests
+  // Find class declarations and their first constructor's params,
+  // then find methods with return type markers (: or :?)
+  const classRegex = /class\s+(\w+)(?:\s+extends\s+\w+)?\s*\{/g
+  let classMatch
+  while ((classMatch = classRegex.exec(sourceWithoutComments)) !== null) {
+    const className = classMatch[1]
+    const classBodyStart = classMatch.index + classMatch[0].length
+
+    // Find the matching closing brace for the class body
+    let braceDepth = 1
+    let classBodyEnd = classBodyStart
+    for (let i = classBodyStart; i < sourceWithoutComments.length; i++) {
+      if (sourceWithoutComments[i] === '{') braceDepth++
+      else if (sourceWithoutComments[i] === '}') {
+        braceDepth--
+        if (braceDepth === 0) {
+          classBodyEnd = i
+          break
+        }
+      }
+    }
+    const classBody = sourceWithoutComments.slice(classBodyStart, classBodyEnd)
+
+    // Find the first constructor's params
+    const ctorRegex = /constructor\s*\(([^)]*)\)/
+    const ctorMatch = ctorRegex.exec(classBody)
+    if (!ctorMatch) continue
+
+    const ctorParamsStr = ctorMatch[1]
+    const ctorParamExamples = extractParamExamples(ctorParamsStr)
+    if (ctorParamsStr.trim() && ctorParamExamples.length === 0) continue
+
+    let ctorArgs: unknown[]
+    try {
+      ctorArgs = ctorParamExamples.map((p) => new Function(`return ${p}`)())
+    } catch {
+      continue
+    }
+
+    // Find methods with return type markers inside the class body
+    const methodRegex = /(async\s+)?(\w+)\s*\(([^)]*)\)\s*(:[?!]?)\s*/g
+    let methodMatch
+    while ((methodMatch = methodRegex.exec(classBody)) !== null) {
+      const methodName = methodMatch[2]
+      // Skip constructors and special names
+      if (methodName === 'constructor') continue
+
+      const isAsync = !!methodMatch[1]
+      const paramsStr = methodMatch[3]
+      const returnMarker = methodMatch[4]
+
+      if (returnMarker === ':!') continue
+
+      // Calculate line number from position in original source
+      const methodPosInSource = classBodyStart + methodMatch.index
+      const lineNumber = sourceWithoutComments
+        .slice(0, methodPosInSource)
+        .split('\n').length
+
+      const afterMarker = classBody.slice(
+        methodMatch.index + methodMatch[0].length
+      )
+      const returnExample = extractReturnExampleFromSource(afterMarker)
+      if (!returnExample) continue
+
+      const paramExamples = extractParamExamples(paramsStr)
+      if (paramsStr.trim() && paramExamples.length === 0) continue
+
+      try {
+        const parsed = parseReturnExample(returnExample)
+        if (!parsed) continue
+
+        const args = paramExamples.map((p) => new Function(`return ${p}`)())
+
+        infos.push({
+          funcName: methodName,
+          args,
+          expected: parsed.pattern,
+          defaults:
+            Object.keys(parsed.defaults).length > 0
+              ? parsed.defaults
+              : undefined,
+          line: lineNumber,
+          isAsync,
+          className,
+          constructorArgs: ctorArgs,
+        })
+      } catch {
+        // Skip if parsing fails
+      }
+    }
+  }
+
   return infos
 }
 
@@ -586,13 +684,23 @@ export function runAllTests(
 
   // Build signature test execution code
   const sigTestBodies = syncSigTestInfos
-    .map(
-      (info, i) => `
-    // Signature test ${i}: ${info.funcName}
+    .map((info, i) => {
+      const testLabel = info.className
+        ? `${info.className}.${info.funcName}`
+        : info.funcName
+      const callExpr = info.className
+        ? `new ${info.className}(${(info.constructorArgs || [])
+            .map((a) => JSON.stringify(a))
+            .join(', ')}).${info.funcName}(${info.args
+            .map((a) => JSON.stringify(a))
+            .join(', ')})`
+        : `${info.funcName}(${info.args
+            .map((a) => JSON.stringify(a))
+            .join(', ')})`
+      return `
+    // Signature test ${i}: ${testLabel}
     try {
-      let __actual = ${info.funcName}(${info.args
-        .map((a) => JSON.stringify(a))
-        .join(', ')});
+      let __actual = ${callExpr};
       const __expected = ${JSON.stringify(info.expected)};${
         info.defaults
           ? `
@@ -603,15 +711,13 @@ export function runAllTests(
       if (__deepEqual(__actual, __expected)) {
         __sigTestResults.push({ idx: ${i}, passed: true });
       } else {
-        __sigTestResults.push({ idx: ${i}, passed: false, error: 'Expected ' + __format(__expected) + ' at \\'${
-        info.funcName
-      }\\', got ' + __format(__actual) });
+        __sigTestResults.push({ idx: ${i}, passed: false, error: 'Expected ' + __format(__expected) + ' at \\'${testLabel}\\', got ' + __format(__actual) });
       }
     } catch (e) {
       __sigTestResults.push({ idx: ${i}, passed: false, error: e.message || String(e) });
     }
   `
-    )
+    })
     .join('\n')
 
   // Install real TJS runtime for test execution
@@ -747,8 +853,11 @@ export function runAllTests(
         !r.passed &&
         r.error &&
         /is not defined$/.test(r.error)
+      const label = info.className
+        ? `${info.className}.${info.funcName}`
+        : info.funcName
       results.push({
-        description: `${info.funcName} signature example`,
+        description: `${label} signature example`,
         passed: isImportError ? true : r.passed,
         error: isImportError ? undefined : r.error,
         isSignatureTest: true,
@@ -771,8 +880,11 @@ export function runAllTests(
       })
     }
     for (const info of syncSigTestInfos) {
+      const label = info.className
+        ? `${info.className}.${info.funcName}`
+        : info.funcName
       results.push({
-        description: `${info.funcName} signature example`,
+        description: `${label} signature example`,
         passed: isUnresolvedRef,
         error: isUnresolvedRef
           ? undefined
@@ -785,8 +897,11 @@ export function runAllTests(
 
   // Add skipped results for async signature tests
   for (const info of asyncSigTestInfos) {
+    const label = info.className
+      ? `${info.className}.${info.funcName}`
+      : info.funcName
     results.push({
-      description: `${info.funcName} signature example`,
+      description: `${label} signature example`,
       passed: true,
       isSignatureTest: true,
       line: info.line,
@@ -971,14 +1086,14 @@ function evalArrayExpression(node: any): unknown[] {
 }
 
 /**
- * Extract and run signature tests for ALL functions with -> return types
+ * Extract and run signature tests for ALL functions with return type annotations
  * Parses the original source to find function signatures
  *
  * Current limitations (future work):
  * - Only tests top-level `function` declarations (not arrow functions yet)
  * - Nested functions (inside other functions/blocks) are not excluded yet
  *   and will fail if tested since they're not in global scope
- * - Arrow functions like `Foo = (x: 5) -> 10 => {}` not yet supported
+ * - Arrow functions like `Foo = (x: 5): 10 => {}` not yet supported
  */
 function runAllSignatureTests(
   originalSource: string,
@@ -990,10 +1105,10 @@ function runAllSignatureTests(
   // Strip comments to avoid matching functions inside doc comments/code examples
   const sourceWithoutComments = stripComments(originalSource)
 
-  // Match function declarations with return type marker (-> or -?)
-  // Skip -! which means "don't test"
-  // Pattern: function name(params) -> returnExample {
-  const funcRegex = /function\s+(\w+)\s*\(([^)]*)\)\s*(-[>?])\s*/g
+  // Match function declarations with return type marker (: or :?)
+  // Skip :! which means "don't test"
+  // Pattern: function name(params): returnExample {
+  const funcRegex = /function\s+(\w+)\s*\(([^)]*)\)\s*(:[?!]?)\s*/g
 
   let match
   while ((match = funcRegex.exec(sourceWithoutComments)) !== null) {
@@ -1006,8 +1121,8 @@ function runAllSignatureTests(
       .slice(0, match.index)
       .split('\n').length
 
-    // -! means skip test
-    if (returnMarker === '-!') continue
+    // :! means skip test
+    if (returnMarker === ':!') continue
 
     // Extract return example - handle nested braces/brackets
     // Use stripped source since match.index is from that

package/src/lang/emitters/js.ts

@@ -5,7 +5,7 @@
  * Unlike the AST emitter (for AgentJS), this outputs executable JS code.
  *
  * Input:
- *   function greet(name: 'world') -> '' {
+ *   function greet(name: 'world'): '' {
  *     return `Hello, ${name}!`
  *   }
  *
@@ -392,14 +392,13 @@ function generateInlineValidationCode(
 
     if (lines.length === 0) return null
 
-    // Push stack first, then validate — callStack includes current function
-    // finally block ensures popStack on all exit paths
+    // pushStack is a no-op unless callStacks/debug is enabled at runtime.
+    // No try/finally needed — the ring buffer tolerates missed popStack.
     lines.unshift(`__tjs.pushStack('${stackEntry}');`)
-    lines.unshift(`try {`)
 
     return {
       preamble: lines.join('\n  '),
-      suffix: '} finally { __tjs.popStack(); }',
+      suffix: '__tjs.popStack();',
     }
   }
 
@@ -436,14 +435,13 @@ function generateInlineValidationCode(
 
   if (lines.length === 0) return null
 
-  // Push stack first, then validate — callStack includes current function
-  // finally block ensures popStack on all exit paths
+  // pushStack is a no-op unless callStacks/debug is enabled at runtime.
+  // No try/finally needed — the ring buffer tolerates missed popStack.
   lines.unshift(`__tjs.pushStack('${stackEntry}');`)
-  lines.unshift(`try {`)
 
   return {
     preamble: lines.join('\n  '),
-    suffix: '} finally { __tjs.popStack(); }',
+    suffix: '__tjs.popStack();',
   }
 }
 
@@ -495,11 +493,11 @@ function extractFunctionReturnType(
   source: string,
   funcName: string
 ): string | null {
-  // Match: function funcName(params) -> returnExample {
-  // or: function funcName(params) -? returnExample {
-  // or: function funcName(params) -! returnExample {
+  // Match: function funcName(params): returnExample {
+  // or: function funcName(params):? returnExample {
+  // or: function funcName(params):! returnExample {
   const regex = new RegExp(
-    `function\\s+${funcName}\\s*\\([^)]*\\)\\s*(-[>?!])\\s*`,
+    `function\\s+${funcName}\\s*\\([^)]*\\)\\s*(:[?!]?)\\s*`,
     'g'
   )
   const match = regex.exec(source)
@@ -511,15 +509,14 @@ function extractFunctionReturnType(
 
 /**
  * Extract return safety marker for a specific function from source
- * Returns 'safe' for -?, 'unsafe' for -!, undefined for -> or no marker
+ * Returns 'safe' for :?, 'unsafe' for :!, undefined for : or no marker
  */
 function extractFunctionReturnSafety(
   source: string,
   funcName: string
 ): 'safe' | 'unsafe' | undefined {
-  // Match: function funcName(params) -X where X is >, ?, or !
   const regex = new RegExp(
-    `function\\s+${funcName}\\s*\\([^)]*\\)\\s*-([>?!])`,
+    `function\\s+${funcName}\\s*\\([^)]*\\)\\s*:([?!]?)`,
     'g'
   )
   const match = regex.exec(source)
@@ -528,7 +525,7 @@ function extractFunctionReturnSafety(
   const marker = match[1]
   if (marker === '?') return 'safe'
   if (marker === '!') return 'unsafe'
-  return undefined // -> is the default, no special safety flag
+  return undefined // : is the default, no special safety flag
 }
 
 /**
@@ -586,7 +583,7 @@ export function transpileToJS(
   // Extract test/mock blocks before parsing (they're not valid JS)
   const { code: cleanSource, tests, mocks, testRunner } = extractTests(source)
 
-  // Parse the cleaned source (handles TJS syntax like x: 'type' and -> ReturnType)
+  // Parse the cleaned source (handles TJS syntax like x: 'type' and : ReturnType)
   const {
     ast: program,
     originalSource,
@@ -747,11 +744,12 @@ export function transpileToJS(
           position: func.body.start + 1,
           text: `\n  ${validation.preamble}\n`,
         })
-        // Insert suffix (popStack) right before the closing brace
-        insertions.push({
-          position: func.body.end - 1,
-          text: `\n  ${validation.suffix}\n`,
-        })
+        if (validation.suffix) {
+          insertions.push({
+            position: func.body.end - 1,
+            text: `\n  ${validation.suffix}\n`,
+          })
+        }
       }
     }
   }
@@ -796,6 +794,7 @@ export function transpileToJS(
   const needsFunctionPredicate = /\bFunctionPredicate\(/.test(code)
   const needsEnum = /\bEnum\(/.test(code)
   const needsUnion = /\bUnion\(/.test(code)
+  const needsBang = code.includes('__tjs.bang(')
   const needsSafeEval = preprocessed.tjsModes.tjsSafeEval
 
   const needsRuntime =
@@ -811,6 +810,7 @@ export function transpileToJS(
     needsFunctionPredicate ||
     needsEnum ||
     needsUnion ||
+    needsBang ||
     needsSafeEval
 
   if (needsRuntime) {
@@ -838,7 +838,7 @@ export function transpileToJS(
     // Eq/NotEq (honest equality)
     if (needsEq) {
       inlineParts.push(
-        `function Eq(a,b){if(a instanceof String||a instanceof Number||a instanceof Boolean)a=a.valueOf();if(b instanceof String||b instanceof Number||b instanceof Boolean)b=b.valueOf();if(a===b)return true;if((a===null||a===undefined)&&(b===null||b===undefined))return true;return false}`
+        `function Eq(a,b){if(a instanceof String||a instanceof Number||a instanceof Boolean)a=a.valueOf();if(b instanceof String||b instanceof Number||b instanceof Boolean)b=b.valueOf();if(a===b)return true;if(typeof a==='number'&&typeof b==='number'&&isNaN(a)&&isNaN(b))return true;if((a===null||a===undefined)&&(b===null||b===undefined))return true;return false}`
       )
     }
     if (needsNotEq) {
@@ -853,7 +853,7 @@ export function transpileToJS(
     // Is/IsNot (structural equality)
     if (needsIs) {
       inlineParts.push(
-        `const tjsEquals=Symbol.for('tjs.equals');function Is(a,b){if(a!=null&&typeof a==='object'&&typeof a[tjsEquals]==='function')return a[tjsEquals](b);if(b!=null&&typeof b==='object'&&typeof b[tjsEquals]==='function')return b[tjsEquals](a);if(a!=null&&typeof a==='object'&&typeof a.Equals==='function')return a.Equals(b);if(b!=null&&typeof b==='object'&&typeof b.Equals==='function')return b.Equals(a);if(a instanceof String||a instanceof Number||a instanceof Boolean)a=a.valueOf();if(b instanceof String||b instanceof Number||b instanceof Boolean)b=b.valueOf();if(a===b)return true;if((a==null)&&(b==null))return true;if(a==null||b==null)return false;if(typeof a!==typeof b)return false;if(typeof a!=='object')return false;if(a instanceof Set&&b instanceof Set){if(a.size!==b.size)return false;for(const v of a)if(!b.has(v))return false;return true}if(a instanceof Map&&b instanceof Map){if(a.size!==b.size)return false;for(const[k,v]of a)if(!b.has(k)||!Is(v,b.get(k)))return false;return true}if(a instanceof Date&&b instanceof Date)return a.getTime()===b.getTime();if(a instanceof RegExp&&b instanceof RegExp)return a.toString()===b.toString();if(Array.isArray(a)&&Array.isArray(b)){if(a.length!==b.length)return false;return a.every((v,i)=>Is(v,b[i]))}if(Array.isArray(a)!==Array.isArray(b))return false;const ka=Object.keys(a),kb=Object.keys(b);if(ka.length!==kb.length)return false;return ka.every(k=>Is(a[k],b[k]))}`
+        `const tjsEquals=Symbol.for('tjs.equals');function Is(a,b){if(a!=null&&typeof a==='object'&&typeof a[tjsEquals]==='function')return a[tjsEquals](b);if(b!=null&&typeof b==='object'&&typeof b[tjsEquals]==='function')return b[tjsEquals](a);if(a!=null&&typeof a==='object'&&typeof a.Equals==='function')return a.Equals(b);if(b!=null&&typeof b==='object'&&typeof b.Equals==='function')return b.Equals(a);if(a instanceof String||a instanceof Number||a instanceof Boolean)a=a.valueOf();if(b instanceof String||b instanceof Number||b instanceof Boolean)b=b.valueOf();if(a===b)return true;if(typeof a==='number'&&typeof b==='number'&&isNaN(a)&&isNaN(b))return true;if((a==null)&&(b==null))return true;if(a==null||b==null)return false;if(typeof a!==typeof b)return false;if(typeof a!=='object')return false;if(a instanceof Set&&b instanceof Set){if(a.size!==b.size)return false;for(const v of a)if(!b.has(v))return false;return true}if(a instanceof Map&&b instanceof Map){if(a.size!==b.size)return false;for(const[k,v]of a)if(!b.has(k)||!Is(v,b.get(k)))return false;return true}if(a instanceof Date&&b instanceof Date)return a.getTime()===b.getTime();if(a instanceof RegExp&&b instanceof RegExp)return a.toString()===b.toString();if(Array.isArray(a)&&Array.isArray(b)){if(a.length!==b.length)return false;return a.every((v,i)=>Is(v,b[i]))}if(Array.isArray(a)!==Array.isArray(b))return false;const ka=Object.keys(a),kb=Object.keys(b);if(ka.length!==kb.length)return false;return ka.every(k=>Is(a[k],b[k]))}`
       )
     }
     if (needsIsNot) {
@@ -887,6 +887,20 @@ export function transpileToJS(
         `function Union(d,...v){const vals=v.flat();return{description:d,check:x=>vals.includes(x),values:vals,__runtimeType:true}}`
       )
     }
+    // Bang access (!.) — asserted non-null member access
+    if (needsBang) {
+      // bang depends on typeError and isMonadicError — ensure they're inlined
+      if (!needsTypeError) {
+        inlineParts.push(
+          `class MonadicError extends Error{constructor(m,p,e,a,c){super(m);this.name='MonadicError';this.path=p;this.expected=e;this.actual=a;this.callStack=c}}`,
+          `function typeError(p,e,v){const a=v===null?'null':typeof v;const err=new MonadicError('Expected '+e+" for '"+p+"', got "+a,p,e,a);const c=globalThis.__tjs?.getConfig?.();if(c?.logTypeErrors)console.error('[TJS TypeError] '+err.message);if(c?.throwTypeErrors)throw err;return err}`,
+          `function isMonadicError(v){return v instanceof Error&&v.name==='MonadicError'&&'path' in v}`
+        )
+      }
+      inlineParts.push(
+        `function bang(o,p){if(o===null||o===undefined)return typeError('bang.'+p,'non-null',o);if(isMonadicError(o))return o;return o[p]}`
+      )
+    }
 
     // Build preamble: inline functions are declared at module scope,
     // then __tjs either uses the shared runtime or references the inlined ones.
@@ -907,6 +921,13 @@ export function transpileToJS(
     if (needsFunctionPredicate) fallbackEntries.push('FunctionPredicate')
     if (needsEnum) fallbackEntries.push('Enum')
     if (needsUnion) fallbackEntries.push('Union')
+    if (needsBang) {
+      fallbackEntries.push('bang')
+      // Ensure typeError/isMonadicError are in fallback even if not otherwise needed
+      if (!needsTypeError) {
+        fallbackEntries.push('typeError', 'isMonadicError')
+      }
+    }
 
     const fallbackObj =
       fallbackEntries.length > 0
@@ -1044,7 +1065,7 @@ interface SafetyOptions {
   unsafe?: boolean
   /** Function marked with (?) - always validate inputs */
   safe?: boolean
-  /** Return type safety: 'safe' (-?) or 'unsafe' (-!) */
+  /** Return type safety: 'safe' (:?) or 'unsafe' (:!) */
   returnSafety?: 'safe' | 'unsafe'
 }
 
@@ -1106,9 +1127,9 @@ function generateTypeMetadata(
     }
     // Add return safety flags
     if (safety.returnSafety === 'safe') {
-      metadata.safeReturn = true // -? forces output validation
+      metadata.safeReturn = true // :? forces output validation
     } else if (safety.returnSafety === 'unsafe') {
-      metadata.unsafeReturn = true // -! skips output validation
+      metadata.unsafeReturn = true // :! skips output validation
     }
   }