tjs-lang 0.7.8 → 0.8.0

package/demo/src/ts-examples.ts

@@ -423,14 +423,14 @@ console.log('(2 + 3) * 4 =', calc.add(2).add(3).multiply(4).getResult())
     description:
       'Complete example showing the TS -> TJS -> JS value proposition',
     group: 'advanced',
-    code: `/**
- * THE FULL PICTURE
- *
- * TypeScript promises type safety.
- * TJS delivers it at RUNTIME.
- *
- * This is what "TS keeps its promise" means.
- */
+    code: `/*#
+## The Full Picture
+
+TypeScript promises type safety.
+TJS delivers it at RUNTIME.
+
+This is what "TS keeps its promise" means.
+*/
 
 // Define your types with standard TypeScript syntax
 interface Product {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tjs-lang",
-  "version": "0.7.8",
+  "version": "0.8.0",
   "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",
@@ -53,6 +53,10 @@
       "types": "./dist/src/batteries/index.d.ts",
       "default": "./dist/tjs-batteries.js"
     },
+    "./linalg": {
+      "bun": "./src/linalg/index.tjs",
+      "default": "./dist/tjs-linalg.js"
+    },
     "./src": "./src/index.ts",
     "./editors/monaco": "./editors/monaco/ajs-monarch.js",
     "./editors/codemirror": "./editors/codemirror/ajs-language.js",
@@ -131,8 +135,8 @@
     "functions:build": "cd functions && npm run build",
     "functions:deploy": "cd functions && npm run deploy",
     "functions:serve": "cd functions && npm run serve",
-    "deploy:hosting": "firebase deploy --only hosting",
-    "deploy": "npm run build:demo && npm run functions:deploy && firebase deploy --only hosting",
+    "deploy:hosting": "bun run build:demo && firebase deploy --only hosting",
+    "deploy": "bun run build:demo && bun run functions:deploy && firebase deploy --only hosting",
     "start": "bun run build:demo && bun run dev"
   },
   "dependencies": {

package/src/lang/docs.test.ts

@@ -157,6 +157,154 @@ function second(x: 0): 0 { return x }
     })
   })
 
+  describe('JSDoc-style doc blocks', () => {
+    it('extracts /** */ blocks and strips leading asterisks', () => {
+      const source = `
+/**
+ * # Title
+ *
+ * Body line 1
+ * Body line 2
+ */
+`
+      const result = generateDocs(source)
+
+      expect(result.items).toHaveLength(1)
+      const doc = result.items[0] as any
+      expect(doc.type).toBe('doc')
+      expect(doc.content).toBe('# Title\n\nBody line 1\nBody line 2')
+    })
+
+    it('handles single-line JSDoc', () => {
+      const source = `/** A short note. */`
+      const result = generateDocs(source)
+
+      const doc = result.items[0] as any
+      expect(doc.type).toBe('doc')
+      expect(doc.content).toBe('A short note.')
+    })
+
+    it('preserves markdown lists and tables', () => {
+      const source = `
+/**
+ * ## Options
+ *
+ * | Flag | Meaning |
+ * |------|---------|
+ * | \`-v\` | verbose |
+ *
+ * - first
+ * - second
+ */
+`
+      const result = generateDocs(source)
+
+      const doc = result.items[0] as any
+      expect(doc.content).toContain('## Options')
+      expect(doc.content).toContain('| Flag | Meaning |')
+      expect(doc.content).toContain('- first')
+    })
+
+    it('leaves @param / @returns as plain markdown', () => {
+      const source = `
+/**
+ * Square the input.
+ *
+ * @param x - the input
+ * @returns the squared value
+ */
+function square(x: 0): 0 { return x * x }
+`
+      const result = generateDocs(source)
+
+      const doc = result.items[0] as any
+      expect(doc.content).toContain('@param x - the input')
+      expect(doc.content).toContain('@returns the squared value')
+    })
+
+    it('skips JSDoc inside function bodies', () => {
+      const source = `
+function outer() {
+  /**
+   * Should not be extracted — inside a body.
+   */
+  return 1
+}
+`
+      const result = generateDocs(source)
+
+      // Only the function itself, no doc item
+      const docs = result.items.filter((i) => i.type === 'doc')
+      expect(docs).toHaveLength(0)
+    })
+
+    it('skips empty JSDoc blocks', () => {
+      const source = `
+/**
+ *
+ */
+function f() {}
+`
+      const result = generateDocs(source)
+
+      const docs = result.items.filter((i) => i.type === 'doc')
+      expect(docs).toHaveLength(0)
+    })
+
+    it('does not treat /* ... */ as a doc comment', () => {
+      const source = `
+/* just a regular block comment */
+function f() {}
+`
+      const result = generateDocs(source)
+
+      const docs = result.items.filter((i) => i.type === 'doc')
+      expect(docs).toHaveLength(0)
+    })
+
+    it('interleaves JSDoc with functions in document order', () => {
+      const source = `
+/**
+ * # First
+ */
+function first(x: 0): 0 { return x }
+
+/**
+ * # Second
+ */
+function second(x: 0): 0 { return x }
+`
+      const result = generateDocs(source)
+
+      expect(result.items).toHaveLength(4)
+      expect(result.items[0].type).toBe('doc')
+      expect((result.items[0] as any).content).toContain('# First')
+      expect(result.items[1].type).toBe('function')
+      expect(result.items[2].type).toBe('doc')
+      expect((result.items[2] as any).content).toContain('# Second')
+      expect(result.items[3].type).toBe('function')
+    })
+
+    it('coexists with /*# blocks in the same file', () => {
+      const source = `
+/*#
+## TJS-native
+*/
+
+/**
+ * ## JSDoc-native
+ */
+function f(x: 0): 0 { return x }
+`
+      const result = generateDocs(source)
+
+      const docs = result.items.filter((i) => i.type === 'doc') as any[]
+      expect(docs).toHaveLength(2)
+      expect(docs[0].content).toContain('TJS-native')
+      expect(docs[1].content).toContain('JSDoc-native')
+    })
+  })
+
   describe('markdown output', () => {
     it('renders doc blocks as plain markdown', () => {
       const source = `

package/src/lang/docs.ts

@@ -120,6 +120,34 @@ export type DocItem =
       members: string[] // constructor / method signatures, no bodies
     }
 
+// Dedent a block of text by the smallest leading-whitespace indent
+// found across non-empty lines.
+function dedent(content: string): string {
+  const lines = content.split('\n')
+  const minIndent = lines
+    .filter((line) => line.trim().length > 0)
+    .reduce((min, line) => {
+      const indent = line.match(/^(\s*)/)?.[1].length || 0
+      return Math.min(min, indent)
+    }, Infinity)
+  if (minIndent === 0 || minIndent === Infinity) return content
+  return lines.map((line) => line.slice(minIndent)).join('\n')
+}
+
+// Strip the leading ` * ` from each line of a JSDoc comment body.
+// The first line (between `/**` and the first newline) is left alone —
+// content can appear there directly. Empty `*`-only lines become blank.
+function stripJSDocAsterisks(content: string): string {
+  const lines = content.split('\n')
+  return lines
+    .map((line, i) => {
+      if (i === 0) return line
+      // Remove optional leading whitespace, then `*`, then optional single space
+      return line.replace(/^[ \t]*\*[ \t]?/, '')
+    })
+    .join('\n')
+}
+
 /**
  * Generate documentation from TJS source
  *
@@ -137,8 +165,12 @@ export function generateDocs(source: string): DocResult {
   // shown in `/*# ... */` doc blocks as real declarations.
   const isInComment = computeInComment(source)
 
-  // Find all doc blocks, functions, and classes; sort by position
+  // Find all doc blocks, functions, and classes; sort by position.
+  // Two doc-block flavors are recognized:
+  //   /*# ... */   — TJS native: content is markdown verbatim
+  //   /** ... */   — JSDoc: each line's leading ` * ` is stripped, then markdown
   const docPattern = /\/\*#([\s\S]*?)\*\//g
+  const jsdocPattern = /\/\*\*([\s\S]*?)\*\//g
   // Match the START of a function declaration. Params (which can contain
   // nested parens like `fn = (x) => x`) are captured by balanced-paren
   // scanning below, NOT by this regex.
@@ -155,24 +187,26 @@ export function generateDocs(source: string): DocResult {
       continue
     }
 
-    // Dedent content
-    let content = match[1]
-    const lines = content.split('\n')
-    const minIndent = lines
-      .filter((line) => line.trim().length > 0)
-      .reduce((min, line) => {
-        const indent = line.match(/^(\s*)/)?.[1].length || 0
-        return Math.min(min, indent)
-      }, Infinity)
-
-    if (minIndent > 0 && minIndent < Infinity) {
-      content = lines.map((line) => line.slice(minIndent)).join('\n')
-    }
+    const content = dedent(match[1]).trim()
+    if (!content) continue
+
+    matches.push({
+      type: 'doc',
+      index: match.index,
+      data: content,
+    })
+  }
+
+  while ((match = jsdocPattern.exec(source)) !== null) {
+    if (braceDepthAt[match.index] !== 0) continue
+
+    const content = dedent(stripJSDocAsterisks(match[1])).trim()
+    if (!content) continue
 
     matches.push({
       type: 'doc',
       index: match.index,
-      data: content.trim(),
+      data: content,
     })
   }
 

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

@@ -1,10 +1,14 @@
 /**
  * TJS WASM Bootstrap Generation
  *
- * Compiles inline WASM blocks and generates JavaScript bootstrap code.
+ * Compiles the file's WASM blocks into a single WebAssembly.Module with
+ * one exported function per block, then emits JavaScript that compiles
+ * and instantiates the module once at startup. This is the foundation
+ * for cross-file wasm composition (see wasm-library-plan.md, Phase 3) —
+ * once everything's in one module, intra-module calls cost nothing.
  */
 
-import { compileToWasm } from '../wasm'
+import { compileBlocksToModule } from '../wasm'
 import type { WasmBlock } from '../parser'
 
 export function generateWasmBootstrap(blocks: WasmBlock[]): {
@@ -16,75 +20,61 @@ export function generateWasmBootstrap(blocks: WasmBlock[]): {
     byteLength?: number
   }[]
 } {
-  const results: {
-    id: string
-    success: boolean
-    error?: string
-    byteLength?: number
-  }[] = []
-  const compiledBlocks: {
-    id: string
-    base64: string
-    captures: string[]
-    needsMemory: boolean
-    wat: string
-  }[] = []
+  const compiled = compileBlocksToModule(blocks)
 
-  for (const block of blocks) {
-    const result = compileToWasm(block)
-    if (result.success) {
-      // Convert bytes to base64 for embedding
-      const base64 = btoa(String.fromCharCode(...result.bytes))
-      compiledBlocks.push({
-        id: block.id,
-        base64,
-        captures: block.captures,
-        needsMemory: result.needsMemory ?? false,
-        wat: result.wat ?? '',
-      })
-      results.push({
-        id: block.id,
-        success: true,
-        byteLength: result.bytes.length,
-      })
-    } else {
-      results.push({
-        id: block.id,
-        success: false,
-        error: result.error,
-      })
+  // Map per-block status to the public result shape (preserves input order)
+  const exportById = new Map(compiled.exports.map((e) => [e.id, e]))
+  const results = compiled.results.map((r) => {
+    if (!r.success) {
+      return { id: r.id, success: false, error: r.error }
     }
-  }
+    const exp = exportById.get(r.id)!
+    return {
+      id: r.id,
+      success: true,
+      byteLength: compiled.bytes.length,
+      // Per-export byte length isn't meaningful in the consolidated module;
+      // we report the total module size for every successful block.
+      _exportName: exp.exportName,
+    }
+  })
 
-  if (compiledBlocks.length === 0) {
+  if (compiled.exports.length === 0) {
     return { code: '', results }
   }
 
-  // Generate WAT comments for each block
-  const watComments = compiledBlocks
-    .map((b) => {
-      const watLines = b.wat.split('\n').map((line) => ` * ${line}`)
-      return `/**\n * WASM: ${b.id}\n${watLines.join('\n')}\n */`
+  // WAT comment block — one section per included function
+  const watComments = compiled.exports
+    .map((e) => {
+      const watLines = e.wat.split('\n').map((line) => ` * ${line}`)
+      return `/**\n * WASM: ${e.id} (export: ${e.exportName})\n${watLines.join(
+        '\n'
+      )}\n */`
     })
     .join('\n')
 
-  // Generate self-contained bootstrap code
-  // This runs immediately and sets up globalThis.__tjs_wasm_N functions
-  const blockData = compiledBlocks
+  // Per-export metadata embedded in the bootstrap.
+  //   id   = original block id (becomes globalThis[id])
+  //   n    = export name in the composed module (instance.exports[n])
+  //   c    = capture annotations for type-aware wrapping
+  //   m    = whether this export uses memory (must be true if any other
+  //          export uses it, since memory is shared at module level)
+  const exportData = compiled.exports
     .map(
-      (b) =>
-        `{id:${JSON.stringify(b.id)},b64:${JSON.stringify(
-          b.base64
-        )},c:${JSON.stringify(b.captures)},m:${b.needsMemory}}`
+      (e) =>
+        `{id:${JSON.stringify(e.id)},n:${JSON.stringify(
+          e.exportName
+        )},c:${JSON.stringify(e.captures)},m:${e.needsMemory}}`
     )
     .join(',')
 
-  // Check if any block needs memory (shared across all blocks)
-  const anyNeedsMemory = compiledBlocks.some((b) => b.needsMemory)
+  const moduleBase64 = btoa(String.fromCharCode(...compiled.bytes))
+  const anyNeedsMemory = compiled.needsMemory
 
   const code = `${watComments}
 ;(async()=>{
-const __wasmBlocks=[${blockData}];
+const __wasmExports=[${exportData}];
+const __wasmModuleB64=${JSON.stringify(moduleBase64)};
 const __b64ToBytes=s=>{const b=atob(s),a=new Uint8Array(b.length);for(let i=0;i<b.length;i++)a[i]=b.charCodeAt(i);return a};
 const __parseType=c=>{const m=c.match(/^(\\w+)\\s*:\\s*(\\w+)$/);if(!m)return{n:c,t:'f64',a:false};const[,n,ts]=m;const at={Float32Array:'f32',Float64Array:'f64',Int32Array:'i32',Uint8Array:'i32'};if(at[ts])return{n,t:'i32',a:true,at:ts};return{n,t:'f64',a:false}};
 ${
@@ -94,30 +84,32 @@ let __woff=0;
 globalThis.wasmBuffer=function(Ctor,len){const bytes=len*Ctor.BYTES_PER_ELEMENT;const align=Math.max(Ctor.BYTES_PER_ELEMENT,16);__woff=(__woff+align-1)&~(align-1);const arr=new Ctor(__wasmMem.buffer,__woff,len);__woff+=bytes;return arr};`
     : ''
 }
-for(const{id,b64,c,m}of __wasmBlocks){
-  const bytes=__b64ToBytes(b64);
+const __wasmInst=await WebAssembly.instantiate(await WebAssembly.compile(__b64ToBytes(__wasmModuleB64)),${
+    anyNeedsMemory ? '{env:{memory:__wasmMem}}' : '{}'
+  });
+for(const{id,n,c,m}of __wasmExports){
+  const compute=__wasmInst.exports[n];
   const params=c.map(__parseType);
   const hasArrays=params.some(p=>p.a);
-  const mem=m?__wasmMem:null;
-  const imp=mem?{env:{memory:mem}}:{};
-  const inst=await WebAssembly.instantiate(await WebAssembly.compile(bytes),imp);
-  const compute=inst.exports.compute;
   if(!hasArrays){globalThis[id]=compute;continue}
   globalThis[id]=function(...args){
-    const mv=new Uint8Array(mem.buffer);let off=__woff;const ptrs=[];
+    const mv=new Uint8Array(__wasmMem.buffer);let off=__woff;const ptrs=[];
     for(let i=0;i<params.length;i++){const p=params[i],a=args[i];
       if(p.a&&a?.buffer){
-        if(a.buffer===mem.buffer){ptrs.push(a.byteOffset)}
+        if(a.buffer===__wasmMem.buffer){ptrs.push(a.byteOffset)}
         else{const ab=new Uint8Array(a.buffer,a.byteOffset,a.byteLength);off=(off+15)&~15;mv.set(ab,off);ptrs.push(off);off+=ab.length}
       } else ptrs.push(a)}
     const r=compute(...ptrs);off=__woff;
     for(let i=0;i<params.length;i++){const p=params[i],a=args[i];
       if(p.a&&a?.buffer){
-        if(a.buffer===mem.buffer) continue;
+        if(a.buffer===__wasmMem.buffer) continue;
         const ab=new Uint8Array(a.buffer,a.byteOffset,a.byteLength);off=(off+15)&~15;ab.set(mv.slice(off,off+ab.length));off+=ab.length}}
     return r};
 }})();
 `.trim()
 
-  return { code, results }
+  // Strip the temporary _exportName field before returning to caller.
+  const publicResults = results.map(({ _exportName: _, ...rest }) => rest)
+
+  return { code, results: publicResults }
 }

package/src/lang/emitters/js.ts

@@ -101,6 +101,15 @@ export interface TJSTranspileOptions {
    * Used when tests depend on imported modules.
    */
   resolvedImports?: Record<string, string>
+  /**
+   * Optional ModuleLoader for cross-file `wasm function` composition (Phase 3
+   * of the wasm-library plan). When provided, `import { dot } from
+   * 'tjs-lang/linalg'`-style imports are resolved at transpile time and any
+   * matching `wasm function` declarations are composed into this file's
+   * consolidated WebAssembly.Module. When omitted, imports are preserved
+   * verbatim (default behavior — runtime resolves them).
+   */
+  moduleLoader?: any
 }
 
 /** Result of running tests at transpile time */
@@ -631,13 +640,19 @@ export function transpileToJS(
   } = parse(cleanSource, {
     filename,
     colonShorthand: true,
+    moduleLoader: options.moduleLoader,
   })
 
   // Find ALL functions in the program
   const functions = findAllFunctions(program)
 
   // Preprocess source (handles TJS syntax transformations)
-  const preprocessed = preprocess(cleanSource)
+  // Pass through the moduleLoader so Phase 3 cross-file wasm composition
+  // sees imported `wasm function` declarations.
+  const preprocessed = preprocess(cleanSource, {
+    moduleLoader: options.moduleLoader,
+    filename,
+  })
 
   // Apply the same source-level equality transforms to extracted test/mock
   // bodies so they observe the module's TJS semantics (e.g. structural ==).

package/src/lang/features.test.ts

@@ -1524,9 +1524,10 @@ function double(x: 0, y: 0) {
     expect(result.wasmCompiled?.[0].success).toBe(true)
     expect(result.wasmCompiled?.[0].byteLength).toBeGreaterThan(0)
 
-    // Output should contain base64-encoded WASM
-    expect(result.code).toContain('__wasmBlocks')
-    expect(result.code).toContain('b64:')
+    // Output should contain base64-encoded WASM. After Phase 0.5 consolidation
+    // the emitter ships one module per file and a per-export metadata table.
+    expect(result.code).toContain('__wasmExports')
+    expect(result.code).toContain('__wasmModuleB64')
 
     // Execute with async function to allow WASM instantiation
     const fn = new Function(

package/src/lang/index.ts

@@ -74,6 +74,15 @@ export {
   type FunctionTypeInfo,
   type ParamTypeInfo,
 } from './docs'
+export {
+  ModuleLoader,
+  inMemoryFileSystem,
+  type ModuleLoaderOptions,
+  type FileSystem,
+  type LoadedModule,
+  type ImportEntry,
+  type ExportEntry,
+} from './module-loader'
 export {
   extractTests,
   assertFunction,