@reearth/ezu 0.2.0 → 0.3.0

package/nodejs/ezu.js

@@ -112,18 +112,50 @@ class Renderer {
         wasm.__wbg_renderer_free(ptr, 0);
     }
     /**
-     * Number of brushes currently registered.
-     * @returns {number}
+     * Bind raw tile bytes under a `sources.<name>` entry from the style.
+     * The renderer dispatches on the source's declared `type`:
+     *
+     * - `mvt` / `pmtiles` → decode MVT layers eagerly; layers are bound
+     *   as `tile.<layer>` when [`render_tile`] runs.
+     * - `dem` → store the raw raster-DEM bytes per `(dx, dy)` neighbour
+     *   offset. The centre tile is `coord: [0, 0]` (default). Decoding
+     *   and 3×3 stitching happen at render time once the tile id is known.
+     *
+     * `opts` is a JS object: `{ coord?: [dx, dy] }`. Throws
+     * `UnknownSource` if `name` doesn't match any entry in the style's
+     * `sources` block, `MvtDecode` if MVT bytes don't parse, and
+     * `DemDecode` for non-image DEM bytes (the decode itself runs at
+     * render time, but obvious cases are caught here).
+     * @param {string} name
+     * @param {Uint8Array} bytes
+     * @param {object | null} [opts]
      */
-    brushCount() {
-        const ret = wasm.renderer_brushCount(this.__wbg_ptr);
-        return ret >>> 0;
+    bindSource(name, bytes, opts) {
+        const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc_command_export, wasm.__wbindgen_realloc_command_export);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passArray8ToWasm0(bytes, wasm.__wbindgen_malloc_command_export);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.renderer_bindSource(this.__wbg_ptr, ptr0, len0, ptr1, len1, isLikeNone(opts) ? 0 : addToExternrefTable0(opts));
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
+        }
+    }
+    /**
+     * Names of every source with at least one pending binding.
+     * Order matches the style's `sources` declaration order.
+     * @returns {string[]}
+     */
+    boundSources() {
+        const ret = wasm.renderer_boundSources(this.__wbg_ptr);
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free_command_export(ret[0], ret[1] * 4, 4);
+        return v1;
     }
     /**
-     * Drop every registered brush.
+     * Drop every pending source binding. Call between tile renders.
      */
-    clearBrushes() {
-        wasm.renderer_clearBrushes(this.__wbg_ptr);
+    clearSources() {
+        wasm.renderer_clearSources(this.__wbg_ptr);
     }
     /**
      * Build a renderer from a style JSON document.
@@ -141,157 +173,31 @@ class Renderer {
         return this;
     }
     /**
-     * Register a `.myb` brush under `name` so a `brush-file` node with
-     * `src: "@name"` (via the style's `assets` map) resolves to it.
-     * Re-registering the same name replaces the previous entry.
-     * @param {string} name
-     * @param {string} myb_json
-     */
-    registerBrush(name, myb_json) {
-        const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc_command_export, wasm.__wbindgen_realloc_command_export);
-        const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passStringToWasm0(myb_json, wasm.__wbindgen_malloc_command_export, wasm.__wbindgen_realloc_command_export);
-        const len1 = WASM_VECTOR_LEN;
-        const ret = wasm.renderer_registerBrush(this.__wbg_ptr, ptr0, len0, ptr1, len1);
-        if (ret[1]) {
-            throw takeFromExternrefTable0(ret[0]);
-        }
-    }
-    /**
-     * Render a single tile to PNG bytes using the style's `tile-size` / `pad`.
-     * Pass `null` for `mvtBytes` to get a paper-only tile.
+     * Render a single tile using whatever sources are currently bound.
      *
-     * Optional `options`: `{ png: { compression: 'fast' | 'default' | 'best' } }`.
-     * @param {Uint8Array | null | undefined} mvt_bytes
-     * @param {number} z
-     * @param {number} x
-     * @param {number} y
-     * @param {object | null} [options]
-     * @returns {Uint8Array}
-     */
-    render(mvt_bytes, z, x, y, options) {
-        var ptr0 = isLikeNone(mvt_bytes) ? 0 : passArray8ToWasm0(mvt_bytes, wasm.__wbindgen_malloc_command_export);
-        var len0 = WASM_VECTOR_LEN;
-        const ret = wasm.renderer_render(this.__wbg_ptr, ptr0, len0, z, x, y, isLikeNone(options) ? 0 : addToExternrefTable0(options));
-        if (ret[3]) {
-            throw takeFromExternrefTable0(ret[2]);
-        }
-        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free_command_export(ret[0], ret[1] * 1, 1);
-        return v2;
-    }
-    /**
-     * Like `render` but with `tile_size` / `pad` overridden — useful for
-     * hi-DPI / preview rendering without mutating the style.
-     * @param {Uint8Array | null | undefined} mvt_bytes
-     * @param {number} z
-     * @param {number} x
-     * @param {number} y
-     * @param {number} tile_size
-     * @param {number} pad
-     * @param {object | null} [options]
-     * @returns {Uint8Array}
-     */
-    renderAt(mvt_bytes, z, x, y, tile_size, pad, options) {
-        var ptr0 = isLikeNone(mvt_bytes) ? 0 : passArray8ToWasm0(mvt_bytes, wasm.__wbindgen_malloc_command_export);
-        var len0 = WASM_VECTOR_LEN;
-        const ret = wasm.renderer_renderAt(this.__wbg_ptr, ptr0, len0, z, x, y, tile_size, pad, isLikeNone(options) ? 0 : addToExternrefTable0(options));
-        if (ret[3]) {
-            throw takeFromExternrefTable0(ret[2]);
-        }
-        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free_command_export(ret[0], ret[1] * 1, 1);
-        return v2;
-    }
-    /**
-     * Render a single tile to straight RGBA8 bytes (`tile_w * tile_h * 4`).
-     * @param {Uint8Array | null | undefined} mvt_bytes
-     * @param {number} z
-     * @param {number} x
-     * @param {number} y
-     * @returns {Uint8Array}
-     */
-    renderRgba(mvt_bytes, z, x, y) {
-        var ptr0 = isLikeNone(mvt_bytes) ? 0 : passArray8ToWasm0(mvt_bytes, wasm.__wbindgen_malloc_command_export);
-        var len0 = WASM_VECTOR_LEN;
-        const ret = wasm.renderer_renderRgba(this.__wbg_ptr, ptr0, len0, z, x, y);
-        if (ret[3]) {
-            throw takeFromExternrefTable0(ret[2]);
-        }
-        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free_command_export(ret[0], ret[1] * 1, 1);
-        return v2;
-    }
-    /**
-     * Like `renderRgba` but with `tile_size` / `pad` overridden.
-     * @param {Uint8Array | null | undefined} mvt_bytes
-     * @param {number} z
-     * @param {number} x
-     * @param {number} y
-     * @param {number} tile_size
-     * @param {number} pad
-     * @returns {Uint8Array}
-     */
-    renderRgbaAt(mvt_bytes, z, x, y, tile_size, pad) {
-        var ptr0 = isLikeNone(mvt_bytes) ? 0 : passArray8ToWasm0(mvt_bytes, wasm.__wbindgen_malloc_command_export);
-        var len0 = WASM_VECTOR_LEN;
-        const ret = wasm.renderer_renderRgbaAt(this.__wbg_ptr, ptr0, len0, z, x, y, tile_size, pad);
-        if (ret[3]) {
-            throw takeFromExternrefTable0(ret[2]);
-        }
-        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free_command_export(ret[0], ret[1] * 1, 1);
-        return v2;
-    }
-    /**
-     * Render a single tile to lossless WebP bytes. Smaller than PNG
-     * for the same painterly content and decoded natively by every
-     * modern browser. WebP is lossless-only via the pure-Rust
-     * `image-webp` codec; for lossy WebP, see the
-     * `OffscreenCanvas.convertToBlob` recipe in the crate README.
-     * @param {Uint8Array | null | undefined} mvt_bytes
-     * @param {number} z
-     * @param {number} x
-     * @param {number} y
-     * @param {object | null} [options]
-     * @returns {Uint8Array}
-     */
-    renderWebp(mvt_bytes, z, x, y, options) {
-        var ptr0 = isLikeNone(mvt_bytes) ? 0 : passArray8ToWasm0(mvt_bytes, wasm.__wbindgen_malloc_command_export);
-        var len0 = WASM_VECTOR_LEN;
-        const ret = wasm.renderer_renderWebp(this.__wbg_ptr, ptr0, len0, z, x, y, isLikeNone(options) ? 0 : addToExternrefTable0(options));
-        if (ret[3]) {
-            throw takeFromExternrefTable0(ret[2]);
-        }
-        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free_command_export(ret[0], ret[1] * 1, 1);
-        return v2;
-    }
-    /**
-     * Like `renderWebp` but with `tile_size` / `pad` overridden.
-     * @param {Uint8Array | null | undefined} mvt_bytes
+     * `opts` (JS object, all fields optional):
+     * - `format`: `"png"` (default) / `"webp"` / `"rgba"`
+     * - `tileSize`, `pad`: override the style's canvas size for this
+     *   call (hi-DPI / preview)
+     * - `png`: `{ compression?: "fast" | "default" | "best" }`
      * @param {number} z
      * @param {number} x
      * @param {number} y
-     * @param {number} tile_size
-     * @param {number} pad
-     * @param {object | null} [options]
+     * @param {object | null} [opts]
      * @returns {Uint8Array}
      */
-    renderWebpAt(mvt_bytes, z, x, y, tile_size, pad, options) {
-        var ptr0 = isLikeNone(mvt_bytes) ? 0 : passArray8ToWasm0(mvt_bytes, wasm.__wbindgen_malloc_command_export);
-        var len0 = WASM_VECTOR_LEN;
-        const ret = wasm.renderer_renderWebpAt(this.__wbg_ptr, ptr0, len0, z, x, y, tile_size, pad, isLikeNone(options) ? 0 : addToExternrefTable0(options));
+    renderTile(z, x, y, opts) {
+        const ret = wasm.renderer_renderTile(this.__wbg_ptr, z, x, y, isLikeNone(opts) ? 0 : addToExternrefTable0(opts));
         if (ret[3]) {
             throw takeFromExternrefTable0(ret[2]);
         }
-        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free_command_export(ret[0], ret[1] * 1, 1);
-        return v2;
+        return v1;
     }
     /**
      * Replace the active style. Returns the new node count. Invalidates
-     * the intermediate cache.
+     * the intermediate cache and drops any pending source bindings.
      * @param {string} style_json
      * @returns {number}
      */
@@ -312,17 +218,6 @@ class Renderer {
         const ret = wasm.renderer_tileSize(this.__wbg_ptr);
         return ret >>> 0;
     }
-    /**
-     * Remove a brush by name. Returns `true` if the brush existed.
-     * @param {string} name
-     * @returns {boolean}
-     */
-    unregisterBrush(name) {
-        const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc_command_export, wasm.__wbindgen_realloc_command_export);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.renderer_unregisterBrush(this.__wbg_ptr, ptr0, len0);
-        return ret !== 0;
-    }
 }
 if (Symbol.dispose) Renderer.prototype[Symbol.dispose] = Renderer.prototype.free;
 exports.Renderer = Renderer;
@@ -340,6 +235,20 @@ exports.simdEnabled = simdEnabled;
 function __wbg_get_imports() {
     const import0 = {
         __proto__: null,
+        __wbg___wbindgen_is_null_2042690d351e14f0: function(arg0) {
+            const ret = arg0 === null;
+            return ret;
+        },
+        __wbg___wbindgen_is_undefined_35bb9f4c7fd651d5: function(arg0) {
+            const ret = arg0 === undefined;
+            return ret;
+        },
+        __wbg___wbindgen_number_get_f73a1244370fcc2c: function(arg0, arg1) {
+            const obj = arg1;
+            const ret = typeof(obj) === 'number' ? obj : undefined;
+            getDataViewMemory0().setFloat64(arg0 + 8 * 1, isLikeNone(ret) ? 0 : ret, true);
+            getDataViewMemory0().setInt32(arg0 + 4 * 0, !isLikeNone(ret), true);
+        },
         __wbg___wbindgen_string_get_d109740c0d18f4d7: function(arg0, arg1) {
             const obj = arg1;
             const ret = typeof(obj) === 'string' ? obj : undefined;
@@ -366,6 +275,10 @@ function __wbg_get_imports() {
                 wasm.__wbindgen_free_command_export(deferred0_0, deferred0_1, 1);
             }
         },
+        __wbg_get_98fdf51d029a75eb: function(arg0, arg1) {
+            const ret = arg0[arg1 >>> 0];
+            return ret;
+        },
         __wbg_get_dcf82ab8aad1a593: function() { return handleError(function (arg0, arg1) {
             const ret = Reflect.get(arg0, arg1);
             return ret;
@@ -380,6 +293,14 @@ function __wbg_get_imports() {
             const ret = result;
             return ret;
         },
+        __wbg_isArray_94898ed3aad6947b: function(arg0) {
+            const ret = Array.isArray(arg0);
+            return ret;
+        },
+        __wbg_length_2591a0f4f659a55c: function(arg0) {
+            const ret = arg0.length;
+            return ret;
+        },
         __wbg_new_02d162bc6cf02f60: function() {
             const ret = new Object();
             return ret;

package/nodejs/ezu_bg.wasm.d.ts

@@ -11,19 +11,13 @@ export const logsink_len: (a: number) => number;
 export const logsink_new: (a: number, b: number) => [number, number, number];
 export const logsink_onEvent: (a: number, b: number) => void;
 export const logsink_setCapacity: (a: number, b: number) => void;
-export const renderer_brushCount: (a: number) => number;
-export const renderer_clearBrushes: (a: number) => void;
+export const renderer_bindSource: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number];
+export const renderer_boundSources: (a: number) => [number, number];
+export const renderer_clearSources: (a: number) => void;
 export const renderer_new: (a: number, b: number) => [number, number, number];
-export const renderer_registerBrush: (a: number, b: number, c: number, d: number, e: number) => [number, number];
-export const renderer_render: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number, number, number];
-export const renderer_renderAt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => [number, number, number, number];
-export const renderer_renderRgba: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number, number, number];
-export const renderer_renderRgbaAt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => [number, number, number, number];
-export const renderer_renderWebp: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number, number, number];
-export const renderer_renderWebpAt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => [number, number, number, number];
+export const renderer_renderTile: (a: number, b: number, c: number, d: number, e: number) => [number, number, number, number];
 export const renderer_setStyle: (a: number, b: number, c: number) => [number, number, number];
 export const renderer_tileSize: (a: number) => number;
-export const renderer_unregisterBrush: (a: number, b: number, c: number) => number;
 export const simdEnabled: () => number;
 export const __wbindgen_malloc_command_export: (a: number, b: number) => number;
 export const __wbindgen_realloc_command_export: (a: number, b: number, c: number, d: number) => number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/ezu",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Painterly map renderer — WebAssembly bindings",
   "license": "MIT OR Apache-2.0",
   "repository": {
@@ -8,7 +8,14 @@
     "url": "https://github.com/reearth/ezu"
   },
   "homepage": "https://github.com/reearth/ezu",
-  "keywords": ["map", "renderer", "wasm", "webassembly", "mvt", "painterly"],
+  "keywords": [
+    "map",
+    "renderer",
+    "wasm",
+    "webassembly",
+    "mvt",
+    "painterly"
+  ],
   "type": "module",
   "packageManager": "npm@11.15.0",
   "scripts": {

package/web/ezu.d.ts

@@ -58,64 +58,50 @@ export class Renderer {
     free(): void;
     [Symbol.dispose](): void;
     /**
-     * Number of brushes currently registered.
-     */
-    brushCount(): number;
-    /**
-     * Drop every registered brush.
-     */
-    clearBrushes(): void;
-    /**
-     * Build a renderer from a style JSON document.
-     */
-    constructor(style_json: string);
-    /**
-     * Register a `.myb` brush under `name` so a `brush-file` node with
-     * `src: "@name"` (via the style's `assets` map) resolves to it.
-     * Re-registering the same name replaces the previous entry.
-     */
-    registerBrush(name: string, myb_json: string): void;
-    /**
-     * Render a single tile to PNG bytes using the style's `tile-size` / `pad`.
-     * Pass `null` for `mvtBytes` to get a paper-only tile.
+     * Bind raw tile bytes under a `sources.<name>` entry from the style.
+     * The renderer dispatches on the source's declared `type`:
      *
-     * Optional `options`: `{ png: { compression: 'fast' | 'default' | 'best' } }`.
-     */
-    render(mvt_bytes: Uint8Array | null | undefined, z: number, x: number, y: number, options?: object | null): Uint8Array;
-    /**
-     * Like `render` but with `tile_size` / `pad` overridden — useful for
-     * hi-DPI / preview rendering without mutating the style.
+     * - `mvt` / `pmtiles` → decode MVT layers eagerly; layers are bound
+     *   as `tile.<layer>` when [`render_tile`] runs.
+     * - `dem` → store the raw raster-DEM bytes per `(dx, dy)` neighbour
+     *   offset. The centre tile is `coord: [0, 0]` (default). Decoding
+     *   and 3×3 stitching happen at render time once the tile id is known.
+     *
+     * `opts` is a JS object: `{ coord?: [dx, dy] }`. Throws
+     * `UnknownSource` if `name` doesn't match any entry in the style's
+     * `sources` block, `MvtDecode` if MVT bytes don't parse, and
+     * `DemDecode` for non-image DEM bytes (the decode itself runs at
+     * render time, but obvious cases are caught here).
      */
-    renderAt(mvt_bytes: Uint8Array | null | undefined, z: number, x: number, y: number, tile_size: number, pad: number, options?: object | null): Uint8Array;
+    bindSource(name: string, bytes: Uint8Array, opts?: object | null): void;
     /**
-     * Render a single tile to straight RGBA8 bytes (`tile_w * tile_h * 4`).
+     * Names of every source with at least one pending binding.
+     * Order matches the style's `sources` declaration order.
      */
-    renderRgba(mvt_bytes: Uint8Array | null | undefined, z: number, x: number, y: number): Uint8Array;
+    boundSources(): string[];
     /**
-     * Like `renderRgba` but with `tile_size` / `pad` overridden.
+     * Drop every pending source binding. Call between tile renders.
      */
-    renderRgbaAt(mvt_bytes: Uint8Array | null | undefined, z: number, x: number, y: number, tile_size: number, pad: number): Uint8Array;
+    clearSources(): void;
     /**
-     * Render a single tile to lossless WebP bytes. Smaller than PNG
-     * for the same painterly content and decoded natively by every
-     * modern browser. WebP is lossless-only via the pure-Rust
-     * `image-webp` codec; for lossy WebP, see the
-     * `OffscreenCanvas.convertToBlob` recipe in the crate README.
+     * Build a renderer from a style JSON document.
      */
-    renderWebp(mvt_bytes: Uint8Array | null | undefined, z: number, x: number, y: number, options?: object | null): Uint8Array;
+    constructor(style_json: string);
     /**
-     * Like `renderWebp` but with `tile_size` / `pad` overridden.
+     * Render a single tile using whatever sources are currently bound.
+     *
+     * `opts` (JS object, all fields optional):
+     * - `format`: `"png"` (default) / `"webp"` / `"rgba"`
+     * - `tileSize`, `pad`: override the style's canvas size for this
+     *   call (hi-DPI / preview)
+     * - `png`: `{ compression?: "fast" | "default" | "best" }`
      */
-    renderWebpAt(mvt_bytes: Uint8Array | null | undefined, z: number, x: number, y: number, tile_size: number, pad: number, options?: object | null): Uint8Array;
+    renderTile(z: number, x: number, y: number, opts?: object | null): Uint8Array;
     /**
      * Replace the active style. Returns the new node count. Invalidates
-     * the intermediate cache.
+     * the intermediate cache and drops any pending source bindings.
      */
     setStyle(style_json: string): number;
-    /**
-     * Remove a brush by name. Returns `true` if the brush existed.
-     */
-    unregisterBrush(name: string): boolean;
     /**
      * `tile-size` declared by the current style.
      */
@@ -142,19 +128,13 @@ export interface InitOutput {
     readonly logsink_new: (a: number, b: number) => [number, number, number];
     readonly logsink_onEvent: (a: number, b: number) => void;
     readonly logsink_setCapacity: (a: number, b: number) => void;
-    readonly renderer_brushCount: (a: number) => number;
-    readonly renderer_clearBrushes: (a: number) => void;
+    readonly renderer_bindSource: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number];
+    readonly renderer_boundSources: (a: number) => [number, number];
+    readonly renderer_clearSources: (a: number) => void;
     readonly renderer_new: (a: number, b: number) => [number, number, number];
-    readonly renderer_registerBrush: (a: number, b: number, c: number, d: number, e: number) => [number, number];
-    readonly renderer_render: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number, number, number];
-    readonly renderer_renderAt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => [number, number, number, number];
-    readonly renderer_renderRgba: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number, number, number];
-    readonly renderer_renderRgbaAt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => [number, number, number, number];
-    readonly renderer_renderWebp: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number, number, number];
-    readonly renderer_renderWebpAt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => [number, number, number, number];
+    readonly renderer_renderTile: (a: number, b: number, c: number, d: number, e: number) => [number, number, number, number];
     readonly renderer_setStyle: (a: number, b: number, c: number) => [number, number, number];
     readonly renderer_tileSize: (a: number) => number;
-    readonly renderer_unregisterBrush: (a: number, b: number, c: number) => number;
     readonly simdEnabled: () => number;
     readonly __wbindgen_malloc_command_export: (a: number, b: number) => number;
     readonly __wbindgen_realloc_command_export: (a: number, b: number, c: number, d: number) => number;