diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..2212ddc --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,21 @@ +name: Cargo Check +on: + push: + branches: + - main + pull_request: +jobs: + check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - name: Run fmt + run: cargo fmt -- --check + - name: Run clippy + run: cargo clippy + - name: Run check + run: cargo check diff --git a/Cargo.toml b/Cargo.toml index 3af3466..3e79e4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,8 @@ readme = "README.md" homepage = "https://github.com/cityjson/cjseq" repository = "https://github.com/cityjson/cjseq" +[lib] +crate-type = ["cdylib", "rlib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -19,4 +21,15 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" # serde_derive = "1.0" +# WASM dependencies +wasm-bindgen = { version = "0.2", features = ["serde-serialize"] } +serde-wasm-bindgen = "0.6" +[dependencies.web-sys] +version = "0.3" +features = ["console"] + +# WASM-specific dependencies +[target.'cfg(target_arch = "wasm32")'.dependencies] +console_error_panic_hook = "0.1" +getrandom = { version = "0.2", features = ["js"] } diff --git a/README.md b/README.md index 7d54405..95c8320 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ ## Usage -`cjseq` takes input from either a file or the standard input (stdin, if no file path is given as argument), and it always outputs the results to the standard output (stdout). +`cjseq` takes input from either a file or the standard input (stdin, if no file path is given as argument), and it always outputs the results to the standard output (stdout). The output can be a CityJSON object or a CityJSONSeq stream. ### Convert CityJSON to CityJSONSeq @@ -70,3 +70,17 @@ cat ./data/*.city.jsonl | cjseq collect > hugefile.city.json 1. the input CityJSON/Seq must be v1.1 or v2.0 (v1.0 will panic). 2. the input JSON must be CityJSON schema-valid, use [cjval](https://github.com/cityjson/cjval) to validate. + +## WASM bindings + +`cjseq` can be used in JavaScript/TypeScript applications via WASM bindings. + +```sh +cargo install wasm-pack +``` + +Build the WASM bindings: + +```sh +wasm-pack build --release --target web --out-dir js +``` diff --git a/js/.gitignore b/js/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/js/LICENSE b/js/LICENSE new file mode 100644 index 0000000..d8e1c18 --- /dev/null +++ b/js/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Hugo Ledoux + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/js/README.md b/js/README.md new file mode 100644 index 0000000..7d54405 --- /dev/null +++ b/js/README.md @@ -0,0 +1,72 @@ + +# cjseq + +[![crates.io](https://img.shields.io/crates/v/cjseq.svg)](https://crates.io/crates/cjseq) + +`cjseq` is a Rust libray+binary for creating, processing, and modifying [CityJSONSeq](https://cityjson.org/cityjsonseq) files, as well as converting to/from [CityJSON](https://cityjson.org). + +## Installation + +### Installing the binary + +1. Install the [Rust compiler](https://www.rust-lang.org/learn/get-started) +2. Run `cargo install cjseq` +3. Then a binary called `cjseq` is installed system-wide + +### Installing the library + +1. Install the [Rust compiler](https://www.rust-lang.org/learn/get-started) +2. Run `cargo install cjseq` + +### Compiling the project + +1. Install the [Rust compiler](https://www.rust-lang.org/learn/get-started) +2. Clone the repository: `git clone https://github.com/cityjson/cjseq.git` +3. Build the project: `cargo build --release` +4. Run the program: `./target/release/cjseq --help` + +## Usage + +`cjseq` takes input from either a file or the standard input (stdin, if no file path is given as argument), and it always outputs the results to the standard output (stdout). +The output can be a CityJSON object or a CityJSONSeq stream. + +### Convert CityJSON to CityJSONSeq + +Convert a CityJSON file to a CityJSONSeq stream: + +```sh +cjseq cat myfile.city.json > myfile.city.jsonl +``` + +Alternatively, to use stdin: + +```sh +cat myfile.city.json | cjseq cat +``` + +### Convert CityJSONSeq to CityJSON + +Convert a CityJSONSeq stream to a CityJSON file: + +```sh +cat ./data/3dbag_b2.city.jsonl | cjseq collect > 3dbag_b2.city.json +``` + +```sh +cjseq collect ./data/3dbag_b2.city.jsonl > 3dbag_b2.city.json +``` + +[Globbing](https://en.wikipedia.org/wiki/Glob_(programming)) works for the `collect` command: + +```sh +cat ./data/*.city.jsonl | cjseq collect > hugefile.city.json +``` + +### Filter CityJSONSeq + +`cat myfile.city.jsonl | cjseq filter --bbox 85007 446179 85168 446290 > mysubset.city.jsonl` + +## Input constraints + + 1. the input CityJSON/Seq must be v1.1 or v2.0 (v1.0 will panic). + 2. the input JSON must be CityJSON schema-valid, use [cjval](https://github.com/cityjson/cjval) to validate. diff --git a/js/cjseq.d.ts b/js/cjseq.d.ts new file mode 100644 index 0000000..9fc3aed --- /dev/null +++ b/js/cjseq.d.ts @@ -0,0 +1,62 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Initialize the WASM module with panic hook for better error messages + */ +export function main(): void; +/** + * Convert a base CityJSON metadata and array of CityJSONFeatures into a complete CityJSON object + * + * # Arguments + * * `base_cj` - The base CityJSON metadata object (typically first line of CityJSONSeq) + * * `features` - Array of CityJSONFeature objects + * + * # Returns + * * `Result` - Complete CityJSON object or error + * + * # Example + * ```javascript + * import init, { cjseqToCj } from './cjseq.js'; + * + * await init(); + * const result = cjseqToCj(baseCityJSON, featuresArray); + * ``` + */ +export function cjseqToCj(base_cj: any, features: any): any; + +export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module; + +export interface InitOutput { + readonly memory: WebAssembly.Memory; + readonly cjseqToCj: (a: any, b: any) => [number, number, number]; + readonly main: () => void; + readonly __wbindgen_malloc: (a: number, b: number) => number; + readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; + readonly __wbindgen_exn_store: (a: number) => void; + readonly __externref_table_alloc: () => number; + readonly __wbindgen_export_4: WebAssembly.Table; + readonly __wbindgen_free: (a: number, b: number, c: number) => void; + readonly __externref_table_dealloc: (a: number) => void; + readonly __wbindgen_start: () => void; +} + +export type SyncInitInput = BufferSource | WebAssembly.Module; +/** +* Instantiates the given `module`, which can either be bytes or +* a precompiled `WebAssembly.Module`. +* +* @param {{ module: SyncInitInput }} module - Passing `SyncInitInput` directly is deprecated. +* +* @returns {InitOutput} +*/ +export function initSync(module: { module: SyncInitInput } | SyncInitInput): InitOutput; + +/** +* If `module_or_path` is {RequestInfo} or {URL}, makes a request and +* for everything else, calls `WebAssembly.instantiate` directly. +* +* @param {{ module_or_path: InitInput | Promise }} module_or_path - Passing `InitInput` directly is deprecated. +* +* @returns {Promise} +*/ +export default function __wbg_init (module_or_path?: { module_or_path: InitInput | Promise } | InitInput | Promise): Promise; diff --git a/js/cjseq.js b/js/cjseq.js new file mode 100644 index 0000000..102d334 --- /dev/null +++ b/js/cjseq.js @@ -0,0 +1,574 @@ +let wasm; + +let WASM_VECTOR_LEN = 0; + +let cachedUint8ArrayMemory0 = null; + +function getUint8ArrayMemory0() { + if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) { + cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer); + } + return cachedUint8ArrayMemory0; +} + +const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } ); + +const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' + ? function (arg, view) { + return cachedTextEncoder.encodeInto(arg, view); +} + : function (arg, view) { + const buf = cachedTextEncoder.encode(arg); + view.set(buf); + return { + read: arg.length, + written: buf.length + }; +}); + +function passStringToWasm0(arg, malloc, realloc) { + + if (realloc === undefined) { + const buf = cachedTextEncoder.encode(arg); + const ptr = malloc(buf.length, 1) >>> 0; + getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf); + WASM_VECTOR_LEN = buf.length; + return ptr; + } + + let len = arg.length; + let ptr = malloc(len, 1) >>> 0; + + const mem = getUint8ArrayMemory0(); + + let offset = 0; + + for (; offset < len; offset++) { + const code = arg.charCodeAt(offset); + if (code > 0x7F) break; + mem[ptr + offset] = code; + } + + if (offset !== len) { + if (offset !== 0) { + arg = arg.slice(offset); + } + ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0; + const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len); + const ret = encodeString(arg, view); + + offset += ret.written; + ptr = realloc(ptr, len, offset, 1) >>> 0; + } + + WASM_VECTOR_LEN = offset; + return ptr; +} + +let cachedDataViewMemory0 = null; + +function getDataViewMemory0() { + if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) { + cachedDataViewMemory0 = new DataView(wasm.memory.buffer); + } + return cachedDataViewMemory0; +} + +function addToExternrefTable0(obj) { + const idx = wasm.__externref_table_alloc(); + wasm.__wbindgen_export_4.set(idx, obj); + return idx; +} + +function handleError(f, args) { + try { + return f.apply(this, args); + } catch (e) { + const idx = addToExternrefTable0(e); + wasm.__wbindgen_exn_store(idx); + } +} + +const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } ); + +if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); }; + +function getStringFromWasm0(ptr, len) { + ptr = ptr >>> 0; + return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len)); +} + +function isLikeNone(x) { + return x === undefined || x === null; +} + +function debugString(val) { + // primitive types + const type = typeof val; + if (type == 'number' || type == 'boolean' || val == null) { + return `${val}`; + } + if (type == 'string') { + return `"${val}"`; + } + if (type == 'symbol') { + const description = val.description; + if (description == null) { + return 'Symbol'; + } else { + return `Symbol(${description})`; + } + } + if (type == 'function') { + const name = val.name; + if (typeof name == 'string' && name.length > 0) { + return `Function(${name})`; + } else { + return 'Function'; + } + } + // objects + if (Array.isArray(val)) { + const length = val.length; + let debug = '['; + if (length > 0) { + debug += debugString(val[0]); + } + for(let i = 1; i < length; i++) { + debug += ', ' + debugString(val[i]); + } + debug += ']'; + return debug; + } + // Test for built-in + const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val)); + let className; + if (builtInMatches && builtInMatches.length > 1) { + className = builtInMatches[1]; + } else { + // Failed to match the standard '[object ClassName]' + return toString.call(val); + } + if (className == 'Object') { + // we're a user defined class or Object + // JSON.stringify avoids problems with cycles, and is generally much + // easier than looping through ownProperties of `val`. + try { + return 'Object(' + JSON.stringify(val) + ')'; + } catch (_) { + return 'Object'; + } + } + // errors + if (val instanceof Error) { + return `${val.name}: ${val.message}\n${val.stack}`; + } + // TODO we could test for more things here, like `Set`s and `Map`s. + return className; +} +/** + * Initialize the WASM module with panic hook for better error messages + */ +export function main() { + wasm.main(); +} + +function takeFromExternrefTable0(idx) { + const value = wasm.__wbindgen_export_4.get(idx); + wasm.__externref_table_dealloc(idx); + return value; +} +/** + * Convert a base CityJSON metadata and array of CityJSONFeatures into a complete CityJSON object + * + * # Arguments + * * `base_cj` - The base CityJSON metadata object (typically first line of CityJSONSeq) + * * `features` - Array of CityJSONFeature objects + * + * # Returns + * * `Result` - Complete CityJSON object or error + * + * # Example + * ```javascript + * import init, { cjseqToCj } from './cjseq.js'; + * + * await init(); + * const result = cjseqToCj(baseCityJSON, featuresArray); + * ``` + * @param {any} base_cj + * @param {any} features + * @returns {any} + */ +export function cjseqToCj(base_cj, features) { + const ret = wasm.cjseqToCj(base_cj, features); + if (ret[2]) { + throw takeFromExternrefTable0(ret[1]); + } + return takeFromExternrefTable0(ret[0]); +} + +async function __wbg_load(module, imports) { + if (typeof Response === 'function' && module instanceof Response) { + if (typeof WebAssembly.instantiateStreaming === 'function') { + try { + return await WebAssembly.instantiateStreaming(module, imports); + + } catch (e) { + if (module.headers.get('Content-Type') != 'application/wasm') { + console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e); + + } else { + throw e; + } + } + } + + const bytes = await module.arrayBuffer(); + return await WebAssembly.instantiate(bytes, imports); + + } else { + const instance = await WebAssembly.instantiate(module, imports); + + if (instance instanceof WebAssembly.Instance) { + return { instance, module }; + + } else { + return instance; + } + } +} + +function __wbg_get_imports() { + const imports = {}; + imports.wbg = {}; + imports.wbg.__wbg_String_8f0eb39a4a4c2f66 = function(arg0, arg1) { + const ret = String(arg1); + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }; + imports.wbg.__wbg_buffer_609cc3eee51ed158 = function(arg0) { + const ret = arg0.buffer; + return ret; + }; + imports.wbg.__wbg_call_672a4d21634d4a24 = function() { return handleError(function (arg0, arg1) { + const ret = arg0.call(arg1); + return ret; + }, arguments) }; + imports.wbg.__wbg_done_769e5ede4b31c67b = function(arg0) { + const ret = arg0.done; + return ret; + }; + imports.wbg.__wbg_entries_3265d4158b33e5dc = function(arg0) { + const ret = Object.entries(arg0); + return ret; + }; + imports.wbg.__wbg_error_524f506f44df1645 = function(arg0) { + console.error(arg0); + }; + imports.wbg.__wbg_error_7534b8e9a36f1ab4 = function(arg0, arg1) { + let deferred0_0; + let deferred0_1; + try { + deferred0_0 = arg0; + deferred0_1 = arg1; + console.error(getStringFromWasm0(arg0, arg1)); + } finally { + wasm.__wbindgen_free(deferred0_0, deferred0_1, 1); + } + }; + imports.wbg.__wbg_get_67b2ba62fc30de12 = function() { return handleError(function (arg0, arg1) { + const ret = Reflect.get(arg0, arg1); + return ret; + }, arguments) }; + imports.wbg.__wbg_get_b9b93047fe3cf45b = function(arg0, arg1) { + const ret = arg0[arg1 >>> 0]; + return ret; + }; + imports.wbg.__wbg_getwithrefkey_1dc361bd10053bfe = function(arg0, arg1) { + const ret = arg0[arg1]; + return ret; + }; + imports.wbg.__wbg_instanceof_ArrayBuffer_e14585432e3737fc = function(arg0) { + let result; + try { + result = arg0 instanceof ArrayBuffer; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }; + imports.wbg.__wbg_instanceof_Map_f3469ce2244d2430 = function(arg0) { + let result; + try { + result = arg0 instanceof Map; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }; + imports.wbg.__wbg_instanceof_Uint8Array_17156bcf118086a9 = function(arg0) { + let result; + try { + result = arg0 instanceof Uint8Array; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }; + imports.wbg.__wbg_isArray_a1eab7e0d067391b = function(arg0) { + const ret = Array.isArray(arg0); + return ret; + }; + imports.wbg.__wbg_isSafeInteger_343e2beeeece1bb0 = function(arg0) { + const ret = Number.isSafeInteger(arg0); + return ret; + }; + imports.wbg.__wbg_iterator_9a24c88df860dc65 = function() { + const ret = Symbol.iterator; + return ret; + }; + imports.wbg.__wbg_length_a446193dc22c12f8 = function(arg0) { + const ret = arg0.length; + return ret; + }; + imports.wbg.__wbg_length_e2d2a49132c1b256 = function(arg0) { + const ret = arg0.length; + return ret; + }; + imports.wbg.__wbg_new_405e22f390576ce2 = function() { + const ret = new Object(); + return ret; + }; + imports.wbg.__wbg_new_5e0be73521bc8c17 = function() { + const ret = new Map(); + return ret; + }; + imports.wbg.__wbg_new_78feb108b6472713 = function() { + const ret = new Array(); + return ret; + }; + imports.wbg.__wbg_new_8a6f238a6ece86ea = function() { + const ret = new Error(); + return ret; + }; + imports.wbg.__wbg_new_a12002a7f91c75be = function(arg0) { + const ret = new Uint8Array(arg0); + return ret; + }; + imports.wbg.__wbg_next_25feadfc0913fea9 = function(arg0) { + const ret = arg0.next; + return ret; + }; + imports.wbg.__wbg_next_6574e1a8a62d1055 = function() { return handleError(function (arg0) { + const ret = arg0.next(); + return ret; + }, arguments) }; + imports.wbg.__wbg_set_37837023f3d740e8 = function(arg0, arg1, arg2) { + arg0[arg1 >>> 0] = arg2; + }; + imports.wbg.__wbg_set_3f1d0b984ed272ed = function(arg0, arg1, arg2) { + arg0[arg1] = arg2; + }; + imports.wbg.__wbg_set_65595bdd868b3009 = function(arg0, arg1, arg2) { + arg0.set(arg1, arg2 >>> 0); + }; + imports.wbg.__wbg_set_8fc6bf8a5b1071d1 = function(arg0, arg1, arg2) { + const ret = arg0.set(arg1, arg2); + return ret; + }; + imports.wbg.__wbg_stack_0ed75d68575b0f3c = function(arg0, arg1) { + const ret = arg1.stack; + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }; + imports.wbg.__wbg_value_cd1ffa7b1ab794f1 = function(arg0) { + const ret = arg0.value; + return ret; + }; + imports.wbg.__wbindgen_as_number = function(arg0) { + const ret = +arg0; + return ret; + }; + imports.wbg.__wbindgen_bigint_from_i64 = function(arg0) { + const ret = arg0; + return ret; + }; + imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) { + const ret = BigInt.asUintN(64, arg0); + return ret; + }; + imports.wbg.__wbindgen_bigint_get_as_i64 = function(arg0, arg1) { + const v = arg1; + const ret = typeof(v) === 'bigint' ? v : undefined; + getDataViewMemory0().setBigInt64(arg0 + 8 * 1, isLikeNone(ret) ? BigInt(0) : ret, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, !isLikeNone(ret), true); + }; + imports.wbg.__wbindgen_boolean_get = function(arg0) { + const v = arg0; + const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2; + return ret; + }; + imports.wbg.__wbindgen_debug_string = function(arg0, arg1) { + const ret = debugString(arg1); + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }; + imports.wbg.__wbindgen_error_new = function(arg0, arg1) { + const ret = new Error(getStringFromWasm0(arg0, arg1)); + return ret; + }; + imports.wbg.__wbindgen_in = function(arg0, arg1) { + const ret = arg0 in arg1; + return ret; + }; + imports.wbg.__wbindgen_init_externref_table = function() { + const table = wasm.__wbindgen_export_4; + const offset = table.grow(4); + table.set(0, undefined); + table.set(offset + 0, undefined); + table.set(offset + 1, null); + table.set(offset + 2, true); + table.set(offset + 3, false); + ; + }; + imports.wbg.__wbindgen_is_bigint = function(arg0) { + const ret = typeof(arg0) === 'bigint'; + return ret; + }; + imports.wbg.__wbindgen_is_function = function(arg0) { + const ret = typeof(arg0) === 'function'; + return ret; + }; + imports.wbg.__wbindgen_is_object = function(arg0) { + const val = arg0; + const ret = typeof(val) === 'object' && val !== null; + return ret; + }; + imports.wbg.__wbindgen_is_string = function(arg0) { + const ret = typeof(arg0) === 'string'; + return ret; + }; + imports.wbg.__wbindgen_is_undefined = function(arg0) { + const ret = arg0 === undefined; + return ret; + }; + imports.wbg.__wbindgen_jsval_eq = function(arg0, arg1) { + const ret = arg0 === arg1; + return ret; + }; + imports.wbg.__wbindgen_jsval_loose_eq = function(arg0, arg1) { + const ret = arg0 == arg1; + return ret; + }; + imports.wbg.__wbindgen_memory = function() { + const ret = wasm.memory; + return ret; + }; + imports.wbg.__wbindgen_number_get = 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); + }; + imports.wbg.__wbindgen_number_new = function(arg0) { + const ret = arg0; + return ret; + }; + imports.wbg.__wbindgen_string_get = function(arg0, arg1) { + const obj = arg1; + const ret = typeof(obj) === 'string' ? obj : undefined; + var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); + }; + imports.wbg.__wbindgen_string_new = function(arg0, arg1) { + const ret = getStringFromWasm0(arg0, arg1); + return ret; + }; + imports.wbg.__wbindgen_throw = function(arg0, arg1) { + throw new Error(getStringFromWasm0(arg0, arg1)); + }; + + return imports; +} + +function __wbg_init_memory(imports, memory) { + +} + +function __wbg_finalize_init(instance, module) { + wasm = instance.exports; + __wbg_init.__wbindgen_wasm_module = module; + cachedDataViewMemory0 = null; + cachedUint8ArrayMemory0 = null; + + + wasm.__wbindgen_start(); + return wasm; +} + +function initSync(module) { + if (wasm !== undefined) return wasm; + + + if (typeof module !== 'undefined') { + if (Object.getPrototypeOf(module) === Object.prototype) { + ({module} = module) + } else { + console.warn('using deprecated parameters for `initSync()`; pass a single object instead') + } + } + + const imports = __wbg_get_imports(); + + __wbg_init_memory(imports); + + if (!(module instanceof WebAssembly.Module)) { + module = new WebAssembly.Module(module); + } + + const instance = new WebAssembly.Instance(module, imports); + + return __wbg_finalize_init(instance, module); +} + +async function __wbg_init(module_or_path) { + if (wasm !== undefined) return wasm; + + + if (typeof module_or_path !== 'undefined') { + if (Object.getPrototypeOf(module_or_path) === Object.prototype) { + ({module_or_path} = module_or_path) + } else { + console.warn('using deprecated parameters for the initialization function; pass a single object instead') + } + } + + if (typeof module_or_path === 'undefined') { + module_or_path = new URL('cjseq_bg.wasm', import.meta.url); + } + const imports = __wbg_get_imports(); + + if (typeof module_or_path === 'string' || (typeof Request === 'function' && module_or_path instanceof Request) || (typeof URL === 'function' && module_or_path instanceof URL)) { + module_or_path = fetch(module_or_path); + } + + __wbg_init_memory(imports); + + const { instance, module } = await __wbg_load(await module_or_path, imports); + + return __wbg_finalize_init(instance, module); +} + +export { initSync }; +export default __wbg_init; diff --git a/js/cjseq_bg.wasm b/js/cjseq_bg.wasm new file mode 100644 index 0000000..b91350d Binary files /dev/null and b/js/cjseq_bg.wasm differ diff --git a/js/cjseq_bg.wasm.d.ts b/js/cjseq_bg.wasm.d.ts new file mode 100644 index 0000000..2417877 --- /dev/null +++ b/js/cjseq_bg.wasm.d.ts @@ -0,0 +1,13 @@ +/* tslint:disable */ +/* eslint-disable */ +export const memory: WebAssembly.Memory; +export const cjseqToCj: (a: any, b: any) => [number, number, number]; +export const main: () => void; +export const __wbindgen_malloc: (a: number, b: number) => number; +export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; +export const __wbindgen_exn_store: (a: number) => void; +export const __externref_table_alloc: () => number; +export const __wbindgen_export_4: WebAssembly.Table; +export const __wbindgen_free: (a: number, b: number, c: number) => void; +export const __externref_table_dealloc: (a: number) => void; +export const __wbindgen_start: () => void; diff --git a/js/package.json b/js/package.json new file mode 100644 index 0000000..2517199 --- /dev/null +++ b/js/package.json @@ -0,0 +1,28 @@ +{ + "name": "@cityjson/cjseq", + "type": "module", + "collaborators": [ + "Hugo Ledoux " + ], + "description": "Create+process+modify+convert CityJSONSeq ", + "version": "0.0.1", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/cityjson/cjseq" + }, + "files": [ + "cjseq_bg.wasm", + "cjseq.js", + "cjseq.d.ts" + ], + "main": "cjseq.js", + "homepage": "https://github.com/cityjson/cjseq", + "types": "cjseq.d.ts", + "sideEffects": [ + "./snippets/*" + ], + "publishConfig": { + "access": "public" + } +} \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index 5796d24..03d0bb8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1221,3 +1221,25 @@ impl Appearance { }; } } + +/// Collects a base CityJSON metadata and a vector of CityJSONFeatures +/// into a complete CityJSON object +pub fn cjseq_to_cj(mut base_cj: CityJSON, features: Vec) -> CityJSON { + for mut feature in features { + base_cj.add_cjfeature(&mut feature); + } + + base_cj.remove_duplicate_vertices(); + base_cj.update_transform(); + base_cj.update_geographicalextent(); + + base_cj +} + +// WASM bindings module +#[cfg(target_arch = "wasm32")] +pub mod wasm; + +// Re-export WASM functions for convenience +#[cfg(target_arch = "wasm32")] +pub use wasm::*; diff --git a/src/wasm.rs b/src/wasm.rs new file mode 100644 index 0000000..ddbea96 --- /dev/null +++ b/src/wasm.rs @@ -0,0 +1,66 @@ +//! WASM bindings for CityJSONSeq operations +//! +//! This module provides WebAssembly bindings for the cjseq library, +//! allowing JavaScript/TypeScript applications to process CityJSONSeq +//! files directly in the browser or Node.js. + +use crate::{cjseq_to_cj, CityJSON, CityJSONFeature}; +use serde_wasm_bindgen::{from_value, to_value}; +use wasm_bindgen::prelude::*; + +/// Initialize the WASM module with panic hook for better error messages +#[wasm_bindgen(start)] +pub fn main() { + console_error_panic_hook::set_once(); +} + +/// Convert a base CityJSON metadata and array of CityJSONFeatures into a complete CityJSON object +/// +/// # Arguments +/// * `base_cj` - The base CityJSON metadata object (typically first line of CityJSONSeq) +/// * `features` - Array of CityJSONFeature objects +/// +/// # Returns +/// * `Result` - Complete CityJSON object or error +/// +/// # Example +/// ```javascript +/// import init, { cjseqToCj } from './cjseq.js'; +/// +/// await init(); +/// const result = cjseqToCj(baseCityJSON, featuresArray); +/// ``` +#[wasm_bindgen(js_name = cjseqToCj)] +pub fn cjseq_to_cj_wasm(base_cj: JsValue, features: JsValue) -> Result { + let base_cj: CityJSON = match from_value(base_cj) { + Ok(cj) => cj, + Err(e) => { + web_sys::console::error_1(&format!("failed to deserialize base_cj: {}", e).into()); + return Err(JsValue::from_str(&format!( + "failed to parse base_cj: {}", + e + ))); + } + }; + + let features: Vec = match from_value(features) { + Ok(f) => f, + Err(e) => { + web_sys::console::error_1(&format!("failed to deserialize features: {}", e).into()); + return Err(JsValue::from_str(&format!( + "failed to parse features: {}", + e + ))); + } + }; + + let cj = cjseq_to_cj(base_cj, features); + + match to_value(&cj) { + Ok(js_val) => Ok(js_val), + Err(e) => { + web_sys::console::error_1(&format!("failed to serialize cj: {}", e).into()); + Err(JsValue::from_str(&format!("failed to serialize cj: {}", e))) + } + } +}