@stll/scan-engine 0.1.1 → 0.1.3

package/README.md

@@ -119,4 +119,16 @@ bun run build:wasm && bun run check:wasm --check
 ```
 
 Generated bindings in `generated/` are committed and ship in the package next
-to `dist/`.
+to `dist/`. CI requires them byte for byte, so `build:wasm` runs only on x86_64
+Linux with the Rust version in `rust-toolchain.toml`. On any other host (macOS,
+ARM64 Linux), run `bun run build:wasm:container`: it runs the same script in
+the official `linux/amd64` Rust image pinned by digest, through Docker or a
+compatible runtime such as OrbStack. Crates, the `wasm-bindgen` CLI and the
+build cache stay in Docker volumes, never in the host's `~/.cargo`. A cold run
+compiles `wasm-bindgen` under emulation and takes several minutes.
+
+Update crates with `bun run cargo:update --manifest-path
+packages/scan-engine/Cargo.toml <crate>` from the repository root, never with a
+bare `cargo update`: it keeps every new pin out of the release-age quarantine
+that CI enforces on `Cargo.lock`. `deny.toml` is the crate's `cargo deny`
+policy (licenses, bans, sources and advisories).

package/dist/review.d.ts

@@ -1,6 +1,5 @@
 import { CleanScanResult, PhysicalPageSize, RasterizedScanPage, ScanEngine, ScanEngineError, ScanOptions, ScanPageRotation } from "./types.js";
 import { Result } from "better-result";
-//#region src/review.d.ts
 type CleanedScan = Extract<CleanScanResult, {
   type: "cleaned";
 }>;
@@ -47,5 +46,4 @@ export type TargetPageBox = PhysicalPageSize & {
   rotation: ScanPageRotation;
 };
 export declare const targetPageBox: (pageSize: PhysicalPageSize, rotation: ScanPageRotation) => TargetPageBox;
-//#endregion
 export {};

package/dist/review.js

@@ -1,5 +1,5 @@
 import { Result, panic } from "better-result";
-//#region src/review.ts
+// src/review.ts
 const reviewPage = async ({ engine, pageId, page, options }) => {
 	const result = await engine.clean(page, options);
 	if (result.isErr()) return Result.err(result.error);
@@ -78,5 +78,4 @@ const targetPageBox = (pageSize, rotation) => ({
 	heightPoints: pageSize.heightPoints,
 	rotation
 });
-//#endregion
 export { applyAll, applyOne, createCleanScanReview, rejectOne, reviewPage, setPageReview, targetPageBox, undoCleanScanReview };

package/dist/scan-engine.d.ts

@@ -1,5 +1,4 @@
 import { RasterizedScanPage, ScanEngine, ScanOptions } from "./types.js";
-//#region src/worker-protocol.d.ts
 type SerializedWasmResult = {
   status: string;
   reason: string;
@@ -25,8 +24,6 @@ type WorkerResponse = {
   errorType: "runtime-trap" | "failure";
   message: string;
 };
-//#endregion
-//#region src/scan-engine.d.ts
 type WasmScanResult = {
   free: () => void;
   readonly status: string;
@@ -54,5 +51,4 @@ type WorkerEngineOptions = {
 };
 export declare const createScanEngine: (load?: WasmLoader, workerOptions?: WorkerEngineOptions) => ScanEngine;
 export declare const scanEngine: ScanEngine;
-//#endregion
 export {};

package/dist/scan-engine.js

@@ -3,7 +3,7 @@ import { Result } from "better-result";
 import { fetchWithTimeout } from "@stll/fetch";
 import { readBodyWithIdleDeadline } from "@stll/fetch/body-reader";
 import { clean_scan_rgba, initSync } from "../generated/scan_engine.js";
-//#region src/scan-engine.ts
+// src/scan-engine.ts
 const WASM_LOAD_TIMEOUT_MS = 1e4;
 const WORKER_REQUEST_TIMEOUT_MS = 1e4;
 const loadWasmBindings = async () => {
@@ -220,5 +220,4 @@ const createScanEngine = (load, workerOptions) => {
 	}) };
 };
 const scanEngine = createScanEngine();
-//#endregion
 export { createScanEngine, scanEngine };

package/dist/scan-engine.worker.js

@@ -1,7 +1,7 @@
 import { fetchWithTimeout } from "@stll/fetch";
 import { readBodyWithIdleDeadline } from "@stll/fetch/body-reader";
 import initWasm, { clean_scan_rgba } from "../generated/scan_engine.js";
-//#region src/scan-engine.worker.ts
+// src/scan-engine.worker.ts
 const WASM_LOAD_TIMEOUT_MS = 1e4;
 const post = (response, transfer = []) => {
 	Reflect.apply(postMessage, globalThis, [response, transfer]);
@@ -58,4 +58,3 @@ addEventListener("message", (event) => {
 		});
 	});
 });
-//#endregion

package/dist/types.d.ts

@@ -1,5 +1,4 @@
 import { Result } from "better-result";
-//#region src/types.d.ts
 export type ScanPageRotation = 0 | 90 | 180 | 270;
 export type PhysicalPageSize = {
   widthPoints: number;
@@ -69,5 +68,4 @@ export declare class ScanEngineError extends ScanEngineError_base<{
 export type ScanEngine = {
   clean: (page: RasterizedScanPage, options: ScanOptions) => Promise<Result<CleanScanResult, ScanEngineError>>;
 };
-//#endregion
 export {};

package/dist/types.js

@@ -1,5 +1,4 @@
 import { TaggedError } from "better-result";
-//#region src/types.ts
+// src/types.ts
 var ScanEngineError = class extends TaggedError("ScanEngineError") {};
-//#endregion
 export { ScanEngineError };

package/generated/scan_engine.d.ts

@@ -17,7 +17,7 @@ export class WasmScanResult {
 export function clean_scan_rgba(
   width: number,
   height: number,
-  pixels: Uint8Array,
+  pixels: Uint8Array | number[],
   dpi: number,
   output: string,
   content_crop: boolean,
@@ -44,21 +44,24 @@ export interface InitOutput {
   ) => void;
   readonly wasmscanresult_applied_quad: (a: number, b: number) => void;
   readonly wasmscanresult_content_box: (a: number, b: number) => void;
+  readonly wasmscanresult_height: (a: number) => number;
   readonly wasmscanresult_pixels: (a: number, b: number) => void;
   readonly wasmscanresult_reason: (a: number, b: number) => void;
-  readonly wasmscanresult_status: (a: number, b: number) => void;
-  readonly wasmscanresult_height: (a: number) => number;
   readonly wasmscanresult_skew_degrees: (a: number) => number;
+  readonly wasmscanresult_status: (a: number, b: number) => void;
   readonly wasmscanresult_width: (a: number) => number;
+  readonly __wbindgen_externrefs: WebAssembly.Table;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_export: (a: number, b: number) => number;
-  readonly __wbindgen_export2: (
+  readonly __wbindgen_export2: (a: number, b: number, c: number) => void;
+  readonly __wbindgen_export3: (
     a: number,
     b: number,
     c: number,
     d: number,
   ) => number;
-  readonly __wbindgen_export3: (a: number, b: number, c: number) => void;
+  readonly __wbindgen_export4: (a: number) => void;
+  readonly __wbindgen_start: () => void;
 }
 
 export type SyncInitInput = BufferSource | WebAssembly.Module;

package/generated/scan_engine.js

@@ -22,12 +22,12 @@ export class WasmScanResult {
    */
   get applied_quad() {
     try {
-      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16) >>> 0;
       wasm.wasmscanresult_applied_quad(retptr, this.__wbg_ptr);
       var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
       var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
       var v1 = getArrayF32FromWasm0(r0, r1).slice();
-      wasm.__wbindgen_export3(r0, r1 * 4, 4);
+      wasm.__wbindgen_export2(r0, r1 * 4, 4);
       return v1;
     } finally {
       wasm.__wbindgen_add_to_stack_pointer(16);
@@ -38,12 +38,12 @@ export class WasmScanResult {
    */
   get content_box() {
     try {
-      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16) >>> 0;
       wasm.wasmscanresult_content_box(retptr, this.__wbg_ptr);
       var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
       var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
       var v1 = getArrayU32FromWasm0(r0, r1).slice();
-      wasm.__wbindgen_export3(r0, r1 * 4, 4);
+      wasm.__wbindgen_export2(r0, r1 * 4, 4);
       return v1;
     } finally {
       wasm.__wbindgen_add_to_stack_pointer(16);
@@ -61,12 +61,12 @@ export class WasmScanResult {
    */
   get pixels() {
     try {
-      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16) >>> 0;
       wasm.wasmscanresult_pixels(retptr, this.__wbg_ptr);
       var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
       var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
       var v1 = getArrayU8FromWasm0(r0, r1).slice();
-      wasm.__wbindgen_export3(r0, r1 * 1, 1);
+      wasm.__wbindgen_export2(r0, r1 * 1, 1);
       return v1;
     } finally {
       wasm.__wbindgen_add_to_stack_pointer(16);
@@ -79,7 +79,7 @@ export class WasmScanResult {
     let deferred1_0;
     let deferred1_1;
     try {
-      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16) >>> 0;
       wasm.wasmscanresult_reason(retptr, this.__wbg_ptr);
       var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
       var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
@@ -88,7 +88,7 @@ export class WasmScanResult {
       return getStringFromWasm0(r0, r1);
     } finally {
       wasm.__wbindgen_add_to_stack_pointer(16);
-      wasm.__wbindgen_export3(deferred1_0, deferred1_1, 1);
+      wasm.__wbindgen_export2(deferred1_0, deferred1_1, 1);
     }
   }
   /**
@@ -105,7 +105,7 @@ export class WasmScanResult {
     let deferred1_0;
     let deferred1_1;
     try {
-      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16) >>> 0;
       wasm.wasmscanresult_status(retptr, this.__wbg_ptr);
       var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
       var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
@@ -114,7 +114,7 @@ export class WasmScanResult {
       return getStringFromWasm0(r0, r1);
     } finally {
       wasm.__wbindgen_add_to_stack_pointer(16);
-      wasm.__wbindgen_export3(deferred1_0, deferred1_1, 1);
+      wasm.__wbindgen_export2(deferred1_0, deferred1_1, 1);
     }
   }
   /**
@@ -131,7 +131,7 @@ if (Symbol.dispose)
 /**
  * @param {number} width
  * @param {number} height
- * @param {Uint8Array} pixels
+ * @param {Uint8Array | number[]} pixels
  * @param {number} dpi
  * @param {string} output
  * @param {boolean} content_crop
@@ -148,32 +148,48 @@ export function clean_scan_rgba(
   deskew,
 ) {
   try {
-    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-    const ptr0 = passArray8ToWasm0(pixels, wasm.__wbindgen_export);
-    const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(
-      output,
-      wasm.__wbindgen_export,
-      wasm.__wbindgen_export2,
-    );
-    const len1 = WASM_VECTOR_LEN;
+    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16) >>> 0;
+    const val3 = +width;
+    const val4 = +height;
+    const val5 = +dpi;
+    const val6 = +content_crop;
+    const val7 = +deskew;
+    let ptr0, len0, ptr1, len1;
+    try {
+      ptr0 = passArray8ToWasm0(pixels, wasm.__wbindgen_export);
+      len0 = WASM_VECTOR_LEN;
+      ptr1 = passStringToWasm0(
+        output,
+        wasm.__wbindgen_export,
+        wasm.__wbindgen_export3,
+      );
+      len1 = WASM_VECTOR_LEN;
+    } catch (e) {
+      if (ptr1) {
+        wasm.__wbindgen_export2(ptr1, len1 * 1, 1);
+      }
+      if (ptr0) {
+        wasm.__wbindgen_export2(ptr0, len0 * 1, 1);
+      }
+      throw e;
+    }
     wasm.clean_scan_rgba(
       retptr,
-      width,
-      height,
+      val3,
+      val4,
       ptr0,
       len0,
-      dpi,
+      val5,
       ptr1,
       len1,
-      content_crop,
-      deskew,
+      val6,
+      val7,
     );
     var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
     var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
     var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
     if (r2) {
-      throw takeObject(r1);
+      throw takeFromExternrefTable0(r1);
     }
     return WasmScanResult.__wrap(r0);
   } finally {
@@ -183,13 +199,21 @@ export function clean_scan_rgba(
 function __wbg_get_imports() {
   const import0 = {
     __proto__: null,
-    __wbg___wbindgen_throw_344f42d3211c4765: function (arg0, arg1) {
+    __wbg___wbindgen_throw_4c88d8bf264fd984: function (arg0, arg1) {
       throw new Error(getStringFromWasm0(arg0, arg1));
     },
-    __wbindgen_cast_0000000000000001: function (arg0, arg1) {
+    __wbindgen_generic_0000000000000001: function (arg0, arg1) {
       // Cast intrinsic for `Ref(String) -> Externref`.
       const ret = getStringFromWasm0(arg0, arg1);
-      return addHeapObject(ret);
+      return ret;
+    },
+    __wbindgen_init_externref_table: function () {
+      const table = wasm.__wbindgen_externrefs;
+      table.set(0, undefined);
+      table.set(1024, undefined);
+      table.set(1025, null);
+      table.set(1026, true);
+      table.set(1027, false);
     },
   };
   return {
@@ -203,21 +227,6 @@ const WasmScanResultFinalization =
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry((ptr) => wasm.__wbg_wasmscanresult_free(ptr, 1));
 
-function addHeapObject(obj) {
-  if (heap_next === heap.length) heap.push(heap.length + 1);
-  const idx = heap_next;
-  heap_next = heap[idx];
-
-  heap[idx] = obj;
-  return idx;
-}
-
-function dropObject(idx) {
-  if (idx < 1028) return;
-  heap[idx] = heap_next;
-  heap_next = idx;
-}
-
 function getArrayF32FromWasm0(ptr, len) {
   ptr = ptr >>> 0;
   return getFloat32ArrayMemory0().subarray(ptr / 4, ptr / 4 + len);
@@ -258,7 +267,8 @@ function getFloat32ArrayMemory0() {
 }
 
 function getStringFromWasm0(ptr, len) {
-  return decodeText(ptr >>> 0, len);
+  ptr = ptr >>> 0;
+  return decodeText(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 
 let cachedUint32ArrayMemory0 = null;
@@ -283,15 +293,6 @@ function getUint8ArrayMemory0() {
   return cachedUint8ArrayMemory0;
 }
 
-function getObject(idx) {
-  return heap[idx];
-}
-
-let heap = new Array(1024).fill(undefined);
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
 function passArray8ToWasm0(arg, malloc) {
   const ptr = malloc(arg.length * 1, 1) >>> 0;
   getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -338,32 +339,24 @@ function passStringToWasm0(arg, malloc, realloc) {
   return ptr;
 }
 
-function takeObject(idx) {
-  const ret = getObject(idx);
-  dropObject(idx);
-  return ret;
+function takeFromExternrefTable0(idx) {
+  const value = wasm.__wbindgen_externrefs.get(idx);
+  wasm.__wbindgen_export4(idx);
+  return value;
 }
 
-let cachedTextDecoder = new TextDecoder("utf-8", {
-  ignoreBOM: true,
-  fatal: true,
-});
+let cachedTextDecoder = new TextDecoder("utf-8", { ignoreBOM: true });
 cachedTextDecoder.decode();
 const MAX_SAFARI_DECODE_BYTES = 2146435072;
 let numBytesDecoded = 0;
-function decodeText(ptr, len) {
-  numBytesDecoded += len;
+function decodeText(bytes) {
+  numBytesDecoded += bytes.length;
   if (numBytesDecoded >= MAX_SAFARI_DECODE_BYTES) {
-    cachedTextDecoder = new TextDecoder("utf-8", {
-      ignoreBOM: true,
-      fatal: true,
-    });
+    cachedTextDecoder = new TextDecoder("utf-8", { ignoreBOM: true });
     cachedTextDecoder.decode();
-    numBytesDecoded = len;
+    numBytesDecoded = bytes.length;
   }
-  return cachedTextDecoder.decode(
-    getUint8ArrayMemory0().subarray(ptr, ptr + len),
-  );
+  return cachedTextDecoder.decode(bytes);
 }
 
 const cachedTextEncoder = new TextEncoder();
@@ -390,16 +383,23 @@ function __wbg_finalize_init(instance, module) {
   cachedFloat32ArrayMemory0 = null;
   cachedUint32ArrayMemory0 = null;
   cachedUint8ArrayMemory0 = null;
+  wasm.__wbindgen_start();
   return wasm;
 }
 
 async function __wbg_load(module, imports) {
   if (typeof Response === "function" && module instanceof Response) {
+    if (!module.ok) {
+      throw new Error(
+        `failed to fetch Wasm: ${module.status} ${module.statusText} fetching '${module.url}'`,
+      );
+    }
+
     if (typeof WebAssembly.instantiateStreaming === "function") {
       try {
         return await WebAssembly.instantiateStreaming(module, imports);
       } catch (e) {
-        const validResponse = module.ok && expectedResponseType(module.type);
+        const validResponse = expectedResponseType(module.type);
 
         if (
           validResponse &&
@@ -457,7 +457,18 @@ function initSync(module) {
   return __wbg_finalize_init(instance, module);
 }
 
+let __wbg_init_promise;
 async function __wbg_init(module_or_path) {
+  if (__wbg_init_promise === undefined) {
+    __wbg_init_promise = __wbg_init_once(module_or_path);
+    __wbg_init_promise.catch(() => {
+      __wbg_init_promise = undefined;
+    });
+  }
+  return __wbg_init_promise;
+}
+
+async function __wbg_init_once(module_or_path) {
   if (module_or_path !== undefined) {
     if (Object.getPrototypeOf(module_or_path) === Object.prototype) {
       ({ module_or_path } = module_or_path);

package/generated/scan_engine_bg.wasm.d.ts

@@ -15,18 +15,21 @@ export const clean_scan_rgba: (
 ) => void;
 export const wasmscanresult_applied_quad: (a: number, b: number) => void;
 export const wasmscanresult_content_box: (a: number, b: number) => void;
+export const wasmscanresult_height: (a: number) => number;
 export const wasmscanresult_pixels: (a: number, b: number) => void;
 export const wasmscanresult_reason: (a: number, b: number) => void;
-export const wasmscanresult_status: (a: number, b: number) => void;
-export const wasmscanresult_height: (a: number) => number;
 export const wasmscanresult_skew_degrees: (a: number) => number;
+export const wasmscanresult_status: (a: number, b: number) => void;
 export const wasmscanresult_width: (a: number) => number;
+export const __wbindgen_externrefs: WebAssembly.Table;
 export const __wbindgen_add_to_stack_pointer: (a: number) => number;
 export const __wbindgen_export: (a: number, b: number) => number;
-export const __wbindgen_export2: (
+export const __wbindgen_export2: (a: number, b: number, c: number) => void;
+export const __wbindgen_export3: (
   a: number,
   b: number,
   c: number,
   d: number,
 ) => number;
-export const __wbindgen_export3: (a: number, b: number, c: number) => void;
+export const __wbindgen_export4: (a: number) => void;
+export const __wbindgen_start: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/scan-engine",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Document scan cleanup engine (Rust, WebAssembly): deskew, content crop and binarization off the main thread, plus a per-page review state machine",
   "keywords": [
     "binarization",
@@ -56,6 +56,7 @@
     "lint:fix": "cd ../.. && bun --bun oxlint -c oxlint.config.ts --type-aware --fix packages/scan-engine",
     "format:rust": "cargo fmt",
     "build:wasm": "bash scripts/build-wasm.sh",
+    "build:wasm:container": "bash scripts/build-wasm-container.sh",
     "check:wasm": "bun --preload ../../scripts/offline-network-preload.ts scripts/check-wasm.ts",
     "generate:fixtures": "bun scripts/generate-fixtures.ts",
     "check:fixtures": "bun scripts/generate-fixtures.ts --check",
@@ -68,7 +69,7 @@
   "devDependencies": {
     "@stll/typescript-config": "0.0.0",
     "bun-types": "1.4.4",
-    "tsdown": "0.23.1"
+    "tsdown": "0.23.4"
   },
   "main": "./dist/scan-engine.js",
   "types": "./dist/scan-engine.d.ts"