tjs-lang 0.6.43 → 0.6.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tjs-lang",
-  "version": "0.6.43",
+  "version": "0.6.45",
   "description": "Type-safe JavaScript dialect with runtime validation, sandboxed VM execution, and AI agent orchestration. Transpiles TypeScript to validated JS with fuel-metered execution for untrusted code.",
   "keywords": [
     "typescript",

package/src/cli/tjs.ts

@@ -20,7 +20,7 @@ import { emit } from './commands/emit'
 import { convert } from './commands/convert'
 import { test } from './commands/test'
 
-const VERSION = '0.6.43'
+const VERSION = '0.6.45'
 
 const HELP = `
 tjs - Typed JavaScript CLI

package/src/lang/emitters/dts.ts

@@ -453,6 +453,15 @@ function detectTypeDeclarations(source: string): Map<string, string> {
     result.set(m[1], m[2].trim())
   }
 
+  // Block with TS type body: Type Name { // TS: original type }
+  const tsBodyRe =
+    /^[ \t]*(?:export\s+)?Type\s+(\w+)\s*\{[^}]*\/\/\s*TS:\s*(.+?)(?:\n|\s*\})/gm
+  while ((m = tsBodyRe.exec(source)) !== null) {
+    if (!result.has(m[1])) {
+      result.set(m[1], `__ts__:${m[2].trim()}`) // prefix marks TS passthrough
+    }
+  }
+
   // Empty block: Type Name {} (no example — degraded type, emit as any)
   const emptyBlockRe = /^[ \t]*(?:export\s+)?Type\s+(\w+)\s*\{\s*\}/gm
   while ((m = emptyBlockRe.exec(source)) !== null) {
@@ -653,7 +662,11 @@ export function generateDTS(
     const isExported = hasAnyExport ? !!exportInfo?.exported : true
     if (!isExported) continue
 
-    if (exampleStr === '') {
+    if (exampleStr.startsWith('__ts__:')) {
+      // Preserved TS type body — emit verbatim as type alias
+      const tsBody = exampleStr.slice(7)
+      lines.push(`export type ${name} = ${tsBody};`)
+    } else if (exampleStr === '') {
       // Empty Type {} — degraded from TS type alias, emit as type = any
       lines.push(`export type ${name} = any;`)
     } else {

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

@@ -1262,9 +1262,11 @@ function transformTypeAliasToType(
 
   const example = typeToExample(node.type, undefined, warnings)
 
-  // 'any' and 'undefined' — skip declaration (undeclared = any in TJS)
+  // 'any' and 'undefined' — preserve original TS body for DTS round-tripping
   if (example === 'any' || example === 'undefined') {
-    return `Type ${typeName} {}`
+    const originalType = node.type.getText(sourceFile).trim()
+    // Include the TS type body so the DTS emitter can recover it
+    return `Type ${typeName} {\n  // TS: ${originalType}\n}`
   }
 
   // For simple primitive types, use short form

package/src/lang/emitters/js.ts

@@ -796,6 +796,7 @@ export function transpileToJS(
   const needsFunctionPredicate = /\bFunctionPredicate\(/.test(code)
   const needsEnum = /\bEnum\(/.test(code)
   const needsUnion = /\bUnion\(/.test(code)
+  const needsIsBounded = code.includes('IsBounded(')
   const needsSafeEval = preprocessed.tjsModes.tjsSafeEval
 
   const needsRuntime =
@@ -811,6 +812,7 @@ export function transpileToJS(
     needsFunctionPredicate ||
     needsEnum ||
     needsUnion ||
+    needsIsBounded ||
     needsSafeEval
 
   if (needsRuntime) {
@@ -838,7 +840,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 +855,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 +889,11 @@ export function transpileToJS(
         `function Union(d,...v){const vals=v.flat();return{description:d,check:x=>vals.includes(x),values:vals,__runtimeType:true}}`
       )
     }
+    if (needsIsBounded) {
+      inlineParts.push(
+        `function IsBounded(v){return typeof v==='number'&&isFinite(v)&&!isNaN(v)}`
+      )
+    }
 
     // Build preamble: inline functions are declared at module scope,
     // then __tjs either uses the shared runtime or references the inlined ones.
@@ -907,6 +914,7 @@ export function transpileToJS(
     if (needsFunctionPredicate) fallbackEntries.push('FunctionPredicate')
     if (needsEnum) fallbackEntries.push('Enum')
     if (needsUnion) fallbackEntries.push('Union')
+    if (needsIsBounded) fallbackEntries.push('IsBounded')
 
     const fallbackObj =
       fallbackEntries.length > 0

package/src/lang/runtime.ts

@@ -416,6 +416,16 @@ export function Is(a: unknown, b: unknown): boolean {
   // Identical references or primitives
   if (a === b) return true
 
+  // NaN === NaN (JS gets this wrong)
+  if (
+    typeof a === 'number' &&
+    typeof b === 'number' &&
+    isNaN(a as number) &&
+    isNaN(b as number)
+  ) {
+    return true
+  }
+
   // null and undefined are equal to each other (nullish equality)
   // This preserves the useful JS pattern: x == null checks for both
   if ((a === null || a === undefined) && (b === null || b === undefined)) {
@@ -511,6 +521,21 @@ export function TypeOf(value: unknown): string {
   if (value === null) return 'null'
   return typeof value
 }
+
+/**
+ * Check if a number is bounded (finite and not NaN).
+ * The question you're actually asking when you reach for isNaN or isFinite.
+ *
+ * IsBounded(42)        → true
+ * IsBounded(3.14)      → true
+ * IsBounded(NaN)       → false
+ * IsBounded(Infinity)  → false
+ * IsBounded(-Infinity) → false
+ * IsBounded('hello')   → false
+ */
+export function IsBounded(value: unknown): boolean {
+  return typeof value === 'number' && isFinite(value) && !isNaN(value)
+}
 export function Eq(a: unknown, b: unknown): boolean {
   // Unwrap boxed primitives
   if (a instanceof String || a instanceof Number || a instanceof Boolean) {
@@ -523,6 +548,16 @@ export function Eq(a: unknown, b: unknown): boolean {
   // Identical references or primitives
   if (a === b) return true
 
+  // NaN === NaN (JS gets this wrong)
+  if (
+    typeof a === 'number' &&
+    typeof b === 'number' &&
+    isNaN(a as number) &&
+    isNaN(b as number)
+  ) {
+    return true
+  }
+
   // null and undefined are equal to each other
   if ((a === null || a === undefined) && (b === null || b === undefined)) {
     return true
@@ -1329,6 +1364,8 @@ export function createRuntime() {
     NotEq,
     // Honest typeof (typeof with TjsEquals)
     TypeOf,
+    // Number utilities
+    IsBounded,
     tjsEquals,
     // Extensions
     registerExtension: instanceRegisterExtension,
@@ -1410,6 +1447,8 @@ export const runtime = {
   NotEq,
   // Honest typeof (used by typeof with TjsEquals)
   TypeOf,
+  // Number utilities
+  IsBounded,
 }
 
 /**