wasm-bindgen-lite 0.2.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-bindgen-lite",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "CLI tool to build Rust crates into minimal, SIMD-optimized WASM packages with JS loaders",
   "repository": {

package/src/cli/config.js

@@ -19,6 +19,7 @@ const DEFAULT_CONFIG = {
       node: true,
       browser: true,
       inline: true,
+      types: true,
     },
     custom: null, // path to custom JS file to include and re-export
   },
@@ -63,13 +64,14 @@ function readCrateName(crateDir) {
 }
 
 function normalizeEmit(value) {
-  if (!value) return { node: true, browser: true, inline: true }
+  if (!value) return { node: true, browser: true, inline: true, types: true }
   if (Array.isArray(value)) {
     const set = new Set(value)
     return {
       node: set.has('node'),
       browser: set.has('browser'),
       inline: set.has('inline'),
+      types: set.has('types') || !set.has('no-types'), // default to true if not specified
     }
   }
   if (typeof value === 'object') {
@@ -77,9 +79,10 @@ function normalizeEmit(value) {
       node: value.node !== false,
       browser: value.browser !== false,
       inline: value.inline !== false,
+      types: value.types !== false,
     }
   }
-  return { node: true, browser: true, inline: true }
+  return { node: true, browser: true, inline: true, types: true }
 }
 
 function normalizeWasmOpt(input) {

package/src/cli/emit.js

@@ -1,4 +1,4 @@
-import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'
+import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'node:fs'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -112,51 +112,55 @@ export function createCore({ exportsList, autoInit, stream }) {
   b.line('}')
   b.blank()
 
-  b.line('function scalarSize(type) {')
-  b.indent(() => {
-    b.line('switch (type) {')
-    b.line('  case "f64": return 8;')
-    b.line('  case "f32":')
-    b.line('  case "i32":')
-    b.line('  case "u32": return 4;')
-    b.line('  case "i16":')
-    b.line('  case "u16": return 2;')
-    b.line('  case "i8":')
-    b.line('  case "u8": return 1;')
-    b.line('  case "u32_array":')
-    b.line('  case "i32_array":')
-    b.line('  case "f32_array": return 1024 * 1024;')
-    b.line('  default: return 0;')
+  const needsDecoders = wrappersIR.some((w) => w.returnType !== 'bytes')
+
+  if (needsDecoders) {
+    b.line('function scalarSize(type) {')
+    b.indent(() => {
+      b.line('switch (type) {')
+      b.line('  case "f64": return 8;')
+      b.line('  case "f32":')
+      b.line('  case "i32":')
+      b.line('  case "u32": return 4;')
+      b.line('  case "i16":')
+      b.line('  case "u16": return 2;')
+      b.line('  case "i8":')
+      b.line('  case "u8": return 1;')
+      b.line('  case "u32_array":')
+      b.line('  case "i32_array":')
+      b.line('  case "f32_array": return 1024 * 1024;')
+      b.line('  default: return 0;')
+      b.line('}')
+    })
     b.line('}')
-  })
-  b.line('}')
-  b.blank()
+    b.blank()
 
-  b.line('function decodeReturn(view, type) {')
-  b.indent(() => {
-    b.line('switch (type) {')
-    b.line('  case "f32": return view.getFloat32(0, true);')
-    b.line('  case "f64": return view.getFloat64(0, true);')
-    b.line('  case "i32": return view.getInt32(0, true);')
-    b.line('  case "u32": return view.getUint32(0, true);')
-    b.line('  case "i16": return view.getInt16(0, true);')
-    b.line('  case "u16": return view.getUint16(0, true);')
-    b.line('  case "i8": return view.getInt8(0);')
-    b.line('  case "u8": return view.getUint8(0);')
-    b.line(
-      '  case "u32_array": return new Uint32Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));'
-    )
-    b.line(
-      '  case "i32_array": return new Int32Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));'
-    )
-    b.line(
-      '  case "f32_array": return new Float32Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));'
-    )
-    b.line('  default: return null;')
+    b.line('function decodeReturn(view, type) {')
+    b.indent(() => {
+      b.line('switch (type) {')
+      b.line('  case "f32": return view.getFloat32(0, true);')
+      b.line('  case "f64": return view.getFloat64(0, true);')
+      b.line('  case "i32": return view.getInt32(0, true);')
+      b.line('  case "u32": return view.getUint32(0, true);')
+      b.line('  case "i16": return view.getInt16(0, true);')
+      b.line('  case "u16": return view.getUint16(0, true);')
+      b.line('  case "i8": return view.getInt8(0);')
+      b.line('  case "u8": return view.getUint8(0);')
+      b.line(
+        '  case "u32_array": return new Uint32Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));'
+      )
+      b.line(
+        '  case "i32_array": return new Int32Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));'
+      )
+      b.line(
+        '  case "f32_array": return new Float32Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));'
+      )
+      b.line('  default: return null;')
+      b.line('}')
+    })
     b.line('}')
-  })
-  b.line('}')
-  b.blank()
+    b.blank()
+  }
 
   b.line('function callWasm(abi, input, outLen, reuse) {')
   b.indent(() => {
@@ -363,6 +367,62 @@ export function createCore({ exportsList, autoInit, stream }) {
   return b.toString()
 }
 
+export function createCoreTypes({ exportsList, autoInit, stream }) {
+  const needsEnsure = autoInit === 'lazy'
+  const wrappersIR = buildWrapperIR(exportsList)
+  const b = code()
+
+  b.line('export type WasmInput = Uint8Array | ArrayBufferView | ArrayBuffer;')
+  b.blank()
+
+  b.line('export function setInstance(instance: WebAssembly.Instance): void;')
+  b.line('export function wasmExports(): WebAssembly.Exports;')
+  b.line('export function memoryU8(): Uint8Array;')
+  b.line('export function alloc(len: number): number;')
+  b.line('export function free(ptr: number, len: number): void;')
+  b.blank()
+
+  wrappersIR.forEach((w) => {
+    let tsRetType
+    switch (w.returnType) {
+      case 'f32':
+      case 'f64':
+      case 'i32':
+      case 'u32':
+      case 'i16':
+      case 'u16':
+      case 'i8':
+      case 'u8':
+        tsRetType = 'number'
+        break
+      case 'u32_array':
+        tsRetType = 'Uint32Array'
+        break
+      case 'i32_array':
+        tsRetType = 'Int32Array'
+        break
+      case 'f32_array':
+        tsRetType = 'Float32Array'
+        break
+      case 'bytes':
+      default:
+        tsRetType = 'Uint8Array'
+    }
+
+    const ret = needsEnsure ? `Promise<${tsRetType}>` : tsRetType
+    b.line(`export function ${w.fnName}(input: WasmInput): ${ret};`)
+  })
+
+  if (stream?.enable) {
+    b.blank()
+    b.line(
+      'export function createTransformStream(fnName?: string): TransformStream<WasmInput, Uint8Array>;'
+    )
+  }
+
+  return b.toString()
+}
+
 export function code() {
   const lines = []
   let indent = 0
@@ -388,6 +448,12 @@ export function code() {
   return api
 }
 
+export function createLoaderTypes({ exportFrom }) {
+  return `export function init(imports?: WebAssembly.Imports): Promise<void>;
+export * from "${exportFrom}";
+`
+}
+
 export function createLoader({ exportFrom, autoInit, getBytesSrc }) {
   const eager =
     autoInit === 'eager'
@@ -497,11 +563,13 @@ function writeInlineModules({
 }
 
 export function emitRuntime({
+  crateDir,
   outDir,
   artifactBaseName,
   emitNode,
   emitBrowser,
   emitInline,
+  emitTypes,
   wasmPaths,
   exportsList,
   autoInit,
@@ -512,16 +580,38 @@ export function emitRuntime({
   mkdirSync(outDir, { recursive: true })
 
   if (customJs) {
-    const customJsContent = readFileSync(join(process.cwd(), customJs), 'utf8')
+    const customJsContent = readFileSync(join(crateDir, customJs), 'utf8')
     writeFileSync(join(outDir, 'custom.js'), customJsContent)
+
+    if (emitTypes) {
+      const customTsPath = customJs.replace(/\.js$/, '.d.ts')
+      if (existsSync(join(crateDir, customTsPath))) {
+        writeFileSync(
+          join(outDir, 'custom.d.ts'),
+          readFileSync(join(crateDir, customTsPath), 'utf8')
+        )
+      }
+    }
   }
 
   writeFileSync(
     join(outDir, 'core.js'),
     createCore({ exportsList, autoInit, stream })
   )
+  if (emitTypes) {
+    writeFileSync(
+      join(outDir, 'core.d.ts'),
+      createCoreTypes({ exportsList, autoInit, stream })
+    )
+  }
   writeFileSync(join(outDir, 'util.js'), readFileSync(UTIL_PATH, 'utf8'))
 
+  const loaderTypes = emitTypes
+    ? createLoaderTypes({
+        exportFrom: customJs ? './custom.js' : './core.js',
+      })
+    : null
+
   if (emitBrowser) {
     writeFileSync(
       join(outDir, 'browser.js'),
@@ -532,6 +622,7 @@ export function emitRuntime({
         wasmDelivery,
       })
     )
+    if (emitTypes) writeFileSync(join(outDir, 'browser.d.ts'), loaderTypes)
   }
 
   if (emitNode) {
@@ -539,6 +630,7 @@ export function emitRuntime({
       join(outDir, 'node.js'),
       createNodeLoader({ name: artifactBaseName, autoInit, customJs })
     )
+    if (emitTypes) writeFileSync(join(outDir, 'node.d.ts'), loaderTypes)
   }
 
   if (emitInline && wasmPaths.baselinePath) {
@@ -546,10 +638,13 @@ export function emitRuntime({
       join(outDir, 'browser-inline.js'),
       createInlineLoader({ name: artifactBaseName, autoInit, customJs })
     )
+    if (emitTypes)
+      writeFileSync(join(outDir, 'browser-inline.d.ts'), loaderTypes)
     writeFileSync(
       join(outDir, 'node-inline.js'),
       createInlineLoader({ name: artifactBaseName, autoInit, customJs })
     )
+    if (emitTypes) writeFileSync(join(outDir, 'node-inline.d.ts'), loaderTypes)
     writeInlineModules({
       outDir,
       artifactBaseName,

package/src/cli/index.js

@@ -19,11 +19,13 @@ export async function runBuild(cliOpts) {
   })
 
   emitRuntime({
+    crateDir: cfg.crateDir,
     outDir: cfg.outDir,
     artifactBaseName: cfg.artifactBaseName,
     emitNode: cfg.js.emit.node,
     emitBrowser: cfg.js.emit.browser,
     emitInline: cfg.inline && cfg.js.emit.inline,
+    emitTypes: cfg.js.emit.types,
     wasmPaths,
     exportsList: cfg.exports,
     autoInit: cfg.autoInit,

package/src/cli/pkg.js

@@ -11,6 +11,9 @@ export function updatePackageJson({ crateDir, outDir, js, inline }) {
   if (!pkg.exports) pkg.exports = {}
 
   const mainExports = {}
+  if (js.emit.types) {
+    mainExports.types = `${relOutDir}/node.d.ts`
+  }
   if (js.emit.browser) {
     mainExports.browser = `${relOutDir}/browser.js`
   }
@@ -25,6 +28,9 @@ export function updatePackageJson({ crateDir, outDir, js, inline }) {
 
   if (inline && js.emit.inline) {
     const inlineExports = {}
+    if (js.emit.types) {
+      inlineExports.types = `${relOutDir}/node-inline.d.ts`
+    }
     if (js.emit.browser) {
       inlineExports.browser = `${relOutDir}/browser-inline.js`
     }
@@ -38,9 +44,16 @@ export function updatePackageJson({ crateDir, outDir, js, inline }) {
     }
   }
 
-  // Also update main/module/types if they are missing?
-  // For now let's just focus on exports as it's the modern way.
+  if (js.emit.types) {
+    pkg.types = `${relOutDir}/node.d.ts`
+  }
+  if (js.emit.node) {
+    pkg.main = `${relOutDir}/node.js`
+  }
+  if (js.emit.browser) {
+    pkg.module = `${relOutDir}/browser.js`
+  }
 
   writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
-  console.log('Updated package.json exports')
+  console.log('Updated package.json exports and fields')
 }