jsql-neo 3.4.1 → 3.4.3

package/lib/table.js

@@ -303,7 +303,39 @@ class Table {
 
     updateById(id, updates) {
         if (!this._primaryKey) throw createError('ER_PARSE_ERROR', 'Table has no primary key');
-        return this.update({ [this._primaryKey]: id }, updates);
+        for (const hook of this._hooks.beforeUpdate) {
+            updates = hook({ [this._primaryKey]: id }, { ...updates }) || updates;
+        }
+        updates = this._validateDataTypes(updates, true);
+        let rowIndex;
+        if (this._pkIndex) {
+            rowIndex = this._pkIndex.get(id);
+        } else {
+            this._ensureBTrees();
+            if (this._btrees[this._primaryKey]) {
+                const indices = this._btrees[this._primaryKey].search(id);
+                rowIndex = indices.length > 0 ? indices[0] : undefined;
+            } else {
+                rowIndex = this._rows.findIndex(r => r[this._primaryKey] === id);
+                if (rowIndex === -1) rowIndex = undefined;
+            }
+        }
+        if (rowIndex === undefined) return 0;
+        const row = this._rows[rowIndex];
+        if (row && row._deleted) return 0;
+        const oldData = { ...row };
+        const merged = { ...row, ...updates };
+        this._validateConstraints(merged, rowIndex);
+        this._removeFromIndexes(rowIndex, oldData);
+        Object.assign(row, updates);
+        this._addToIndexes(rowIndex, row);
+        this._dirty = true;
+        this._db._markDirty();
+        for (const hook of this._hooks.afterUpdate) {
+            hook({ [this._primaryKey]: id }, updates, 1);
+        }
+        this._db._emitChange('update', this._name, { query: { [this._primaryKey]: id }, updates, count: 1 });
+        return 1;
     }
 
     // ============================================================
@@ -353,7 +385,38 @@ class Table {
 
     removeById(id) {
         if (!this._primaryKey) throw createError('ER_PARSE_ERROR', 'Table has no primary key');
-        return this.remove({ [this._primaryKey]: id });
+        let rowIndex;
+        if (this._pkIndex) {
+            rowIndex = this._pkIndex.get(id);
+        } else {
+            this._ensureBTrees();
+            if (this._btrees[this._primaryKey]) {
+                const indices = this._btrees[this._primaryKey].search(id);
+                rowIndex = indices.length > 0 ? indices[0] : undefined;
+            } else {
+                rowIndex = this._rows.findIndex(r => r[this._primaryKey] === id);
+                if (rowIndex === -1) rowIndex = undefined;
+            }
+        }
+        if (rowIndex === undefined) return 0;
+        const row = this._rows[rowIndex];
+        if (!row || row._deleted) return 0;
+        this._cascadeForeignKeys(row);
+        if (this._softDelete) {
+            row._deleted = true;
+            row._deletedAt = Date.now();
+        } else {
+            this._removeFromIndexes(rowIndex, row);
+            this._rows.splice(rowIndex, 1);
+            this._adjustBTreeAfterRemove(rowIndex);
+        }
+        this._dirty = true;
+        this._db._markDirty();
+        for (const hook of this._hooks.afterRemove) {
+            hook({ [this._primaryKey]: id }, 1);
+        }
+        this._db._emitChange('remove', this._name, { query: { [this._primaryKey]: id }, count: 1 });
+        return 1;
     }
 
     removeSoft(query = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jsql-neo",
-    "version": "3.4.1",
+    "version": "3.4.3",
     "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
     "main": "index.js",
     "files": [

package/wasm/jsql_neo_wasm.d.ts

@@ -0,0 +1,20 @@
+/* tslint:disable */
+/* eslint-disable */
+
+export function jsql_count(table: string): string;
+
+export function jsql_create_table(name: string, schema_json: string): string;
+
+export function jsql_drop_table(name: string): string;
+
+export function jsql_find(table: string, filter_json: string, limit: number, offset: number): string;
+
+export function jsql_find_by_id(table: string, id: bigint): string;
+
+export function jsql_insert(table: string, data_json: string): string;
+
+export function jsql_insert_buf(table: string, data: Uint8Array): string;
+
+export function jsql_remove_by_id(table: string, id: bigint): string;
+
+export function jsql_update_by_id(table: string, id: bigint, data_json: string): string;

package/wasm/jsql_neo_wasm.js

@@ -0,0 +1,334 @@
+/* @ts-self-types="./jsql_neo_wasm.d.ts" */
+
+/**
+ * @param {string} table
+ * @returns {string}
+ */
+function jsql_count(table) {
+    let deferred2_0;
+    let deferred2_1;
+    try {
+        const ptr0 = passStringToWasm0(table, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_count(ptr0, len0);
+        deferred2_0 = ret[0];
+        deferred2_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
+    }
+}
+exports.jsql_count = jsql_count;
+
+/**
+ * @param {string} name
+ * @param {string} schema_json
+ * @returns {string}
+ */
+function jsql_create_table(name, schema_json) {
+    let deferred3_0;
+    let deferred3_1;
+    try {
+        const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(schema_json, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_create_table(ptr0, len0, ptr1, len1);
+        deferred3_0 = ret[0];
+        deferred3_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
+    }
+}
+exports.jsql_create_table = jsql_create_table;
+
+/**
+ * @param {string} name
+ * @returns {string}
+ */
+function jsql_drop_table(name) {
+    let deferred2_0;
+    let deferred2_1;
+    try {
+        const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_drop_table(ptr0, len0);
+        deferred2_0 = ret[0];
+        deferred2_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
+    }
+}
+exports.jsql_drop_table = jsql_drop_table;
+
+/**
+ * @param {string} table
+ * @param {string} filter_json
+ * @param {number} limit
+ * @param {number} offset
+ * @returns {string}
+ */
+function jsql_find(table, filter_json, limit, offset) {
+    let deferred3_0;
+    let deferred3_1;
+    try {
+        const ptr0 = passStringToWasm0(table, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(filter_json, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_find(ptr0, len0, ptr1, len1, limit, offset);
+        deferred3_0 = ret[0];
+        deferred3_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
+    }
+}
+exports.jsql_find = jsql_find;
+
+/**
+ * @param {string} table
+ * @param {bigint} id
+ * @returns {string}
+ */
+function jsql_find_by_id(table, id) {
+    let deferred2_0;
+    let deferred2_1;
+    try {
+        const ptr0 = passStringToWasm0(table, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_find_by_id(ptr0, len0, id);
+        deferred2_0 = ret[0];
+        deferred2_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
+    }
+}
+exports.jsql_find_by_id = jsql_find_by_id;
+
+/**
+ * @param {string} table
+ * @param {string} data_json
+ * @returns {string}
+ */
+function jsql_insert(table, data_json) {
+    let deferred3_0;
+    let deferred3_1;
+    try {
+        const ptr0 = passStringToWasm0(table, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(data_json, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_insert(ptr0, len0, ptr1, len1);
+        deferred3_0 = ret[0];
+        deferred3_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
+    }
+}
+exports.jsql_insert = jsql_insert;
+
+/**
+ * @param {string} table
+ * @param {Uint8Array} data
+ * @returns {string}
+ */
+function jsql_insert_buf(table, data) {
+    let deferred3_0;
+    let deferred3_1;
+    try {
+        const ptr0 = passStringToWasm0(table, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_insert_buf(ptr0, len0, ptr1, len1);
+        deferred3_0 = ret[0];
+        deferred3_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
+    }
+}
+exports.jsql_insert_buf = jsql_insert_buf;
+
+/**
+ * @param {string} table
+ * @param {bigint} id
+ * @returns {string}
+ */
+function jsql_remove_by_id(table, id) {
+    let deferred2_0;
+    let deferred2_1;
+    try {
+        const ptr0 = passStringToWasm0(table, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_remove_by_id(ptr0, len0, id);
+        deferred2_0 = ret[0];
+        deferred2_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
+    }
+}
+exports.jsql_remove_by_id = jsql_remove_by_id;
+
+/**
+ * @param {string} table
+ * @param {bigint} id
+ * @param {string} data_json
+ * @returns {string}
+ */
+function jsql_update_by_id(table, id, data_json) {
+    let deferred3_0;
+    let deferred3_1;
+    try {
+        const ptr0 = passStringToWasm0(table, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(data_json, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.jsql_update_by_id(ptr0, len0, id, ptr1, len1);
+        deferred3_0 = ret[0];
+        deferred3_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
+    }
+}
+exports.jsql_update_by_id = jsql_update_by_id;
+function __wbg_get_imports() {
+    const import0 = {
+        __proto__: null,
+        __wbg___wbindgen_string_get_b0ca35b86a603356: 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);
+        },
+        __wbg___wbindgen_throw_344f42d3211c4765: function(arg0, arg1) {
+            throw new Error(getStringFromWasm0(arg0, arg1));
+        },
+        __wbg_new_0_3da9e97f24fc69be: function() {
+            const ret = new Date();
+            return ret;
+        },
+        __wbg_toISOString_706fbe321055ee58: function(arg0) {
+            const ret = arg0.toISOString();
+            return ret;
+        },
+        __wbindgen_init_externref_table: function() {
+            const table = wasm.__wbindgen_externrefs;
+            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);
+        },
+    };
+    return {
+        __proto__: null,
+        "./jsql_neo_wasm_bg.js": import0,
+    };
+}
+
+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 getStringFromWasm0(ptr, len) {
+    return decodeText(ptr >>> 0, len);
+}
+
+let cachedUint8ArrayMemory0 = null;
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachedUint8ArrayMemory0;
+}
+
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8ArrayMemory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+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 = cachedTextEncoder.encodeInto(arg, view);
+
+        offset += ret.written;
+        ptr = realloc(ptr, len, offset, 1) >>> 0;
+    }
+
+    WASM_VECTOR_LEN = offset;
+    return ptr;
+}
+
+let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+cachedTextDecoder.decode();
+function decodeText(ptr, len) {
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
+}
+
+const cachedTextEncoder = new TextEncoder();
+
+if (!('encodeInto' in cachedTextEncoder)) {
+    cachedTextEncoder.encodeInto = function (arg, view) {
+        const buf = cachedTextEncoder.encode(arg);
+        view.set(buf);
+        return {
+            read: arg.length,
+            written: buf.length
+        };
+    };
+}
+
+let WASM_VECTOR_LEN = 0;
+
+const wasmPath = `${__dirname}/jsql_neo_wasm_bg.wasm`;
+const wasmBytes = require('fs').readFileSync(wasmPath);
+const wasmModule = new WebAssembly.Module(wasmBytes);
+let wasmInstance = new WebAssembly.Instance(wasmModule, __wbg_get_imports());
+let wasm = wasmInstance.exports;
+wasm.__wbindgen_start();

package/wasm/jsql_neo_wasm_bg.wasm.d.ts

@@ -0,0 +1,17 @@
+/* tslint:disable */
+/* eslint-disable */
+export const memory: WebAssembly.Memory;
+export const jsql_count: (a: number, b: number) => [number, number];
+export const jsql_create_table: (a: number, b: number, c: number, d: number) => [number, number];
+export const jsql_drop_table: (a: number, b: number) => [number, number];
+export const jsql_find: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number];
+export const jsql_find_by_id: (a: number, b: number, c: bigint) => [number, number];
+export const jsql_insert: (a: number, b: number, c: number, d: number) => [number, number];
+export const jsql_insert_buf: (a: number, b: number, c: number, d: number) => [number, number];
+export const jsql_remove_by_id: (a: number, b: number, c: bigint) => [number, number];
+export const jsql_update_by_id: (a: number, b: number, c: bigint, d: number, e: number) => [number, number];
+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_externrefs: WebAssembly.Table;
+export const __wbindgen_free: (a: number, b: number, c: number) => void;
+export const __wbindgen_start: () => void;

package/wasm/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "jsql-neo-wasm",
+  "description": "JSQL Neo WASM bindings",
+  "version": "0.1.0",
+  "files": [
+    "jsql_neo_wasm_bg.wasm",
+    "jsql_neo_wasm.js",
+    "jsql_neo_wasm.d.ts"
+  ],
+  "main": "jsql_neo_wasm.js",
+  "types": "jsql_neo_wasm.d.ts"
+}