jsql-neo 5.3.1 → 5.4.0

package/README.md

@@ -3,7 +3,7 @@
 > **One engine to rule them all** — a Rust-powered embedded database that speaks your language:
 > MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser. **And it fits in one npm package.**
 
-> **v5.3.1** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo)
+> **v5.4.0** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo)
 
 ![Engines](https://img.shields.io/badge/engines-Native%20%7C%20WASM%20%7C%20Pure%20JS-7ee787)
 ![MySQL](https://img.shields.io/badge/protocol-MySQL%20compatible-1f6feb)
@@ -232,7 +232,7 @@ npm install && npm run build                 # option 3: from source
 Verify:
 
 ```bash
-node -e "console.log(require('jsql-neo/package.json').version)"   # 5.3.1
+node -e "console.log(require('jsql-neo/package.json').version)"   # 5.4.0
 ```
 
 ### 30-second demo
@@ -1273,7 +1273,7 @@ jsql mod --engine wasm        # switch engine (restart required)
 
 ```bash
 $ jsql version
-jsql-neo v5.3.1
+jsql-neo v5.4.0
 engine: native (napi) | wasm | js
 node: v22.0.0  platform: linux x64
 ```
@@ -1294,7 +1294,7 @@ jsql tui --memory -q                      # memory mode, quiet
 jsql tui --prompt 'db> ' --no-color
 ```
 
-The status bar shows: `db=<name> dialect=<d> mode=<tui|batch> ver=5.3.1`.
+The status bar shows: `db=<name> dialect=<d> mode=<tui|batch> ver=5.4.0`.
 
 ### Keyboard shortcuts
 
@@ -1710,7 +1710,7 @@ Conventions: feature branch + PR; tests for new SQL/commands; Conventional Commi
 
 ## License
 
-MIT License — see the Chinese edition [License 许可证](#license-许可证) for the full text.
+Apache License 2.0 — see the Chinese edition [License 许可证](#license-许可证) for the full text.
 
 ---
 
@@ -3858,7 +3858,7 @@ Data dir: /root/.jsql-neo/data
 
 ```bash
 $ jsql version
-jsql-neo v5.3.1
+jsql-neo v5.4.0
 engine: native (napi) | wasm | js
 node: v22.0.0
 platform: linux x64
@@ -4724,37 +4724,218 @@ npm run typecheck
 
 ## License 许可证
 
-JSQL-NEO 采用 **MIT License**。
-
+JSQL-NEO 采用 **Apache License 2.0**，完整许可文本见根目录 [LICENSE](LICENSE) 文件。
+
+```
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 ```
-MIT License
-
-Copyright (c) 2026 vexify-org
-
-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.
 ```
 
 ---
 
 *JSQL-NEO — One engine to rule them all. MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser.*
 
-*文档版本：v5.3.1 · 最后更新：2026-08-12*
+*文档版本：v5.4.0 · 最后更新：2026-08-12*
 
 ---
 
@@ -6524,7 +6705,7 @@ Usage: jsql version
 
 输出版本与环境信息：
 
-  jsql-neo v5.3.1
+  jsql-neo v5.4.0
   engine: native (napi) | wasm | js
   node: v22.0.0
   platform: linux x64
@@ -6788,6 +6969,32 @@ new TUIShell({
 
 ## 附录 N：版本历史 CHANGELOG
 
+### v5.4.0 (2026-08-30)
+
+**新增**
+- WASM 事务支持：`jsql_begin_tx` / `jsql_commit_tx` / `jsql_rollback_tx` 绑定，
+  WASM 客户端 `beginTransaction()` / `commit()` / `rollback()` 与原生一致
+- 主键感知 by-id CRUD 与整串简写 schema（`createTable(name, 'id integer primary key auto_increment, ...')`）
+- `test/wasm.test.js`（20 项）纳入 `test:all`
+
+**变更**
+- 版本号升至 5.4.0（package.json / Cargo.toml / Mongo `buildInfo` / README 同步）
+- 移除构建产物与死代码：`nativesrc/*/target/`（1155 个文件）、`bin/jsql-neo-server`（ELF）、
+  根级 `database.js`/`btree.js` 副本、`lib/compress_pool.js`/`lib/compress_worker.js`
+
+### v5.2.0-beta.1 (2026-08-17)
+
+**新增**
+- 主键感知的 by-id CRUD：`findById` / `findByIds` / `updateById(s)` / `removeById(s)`
+  在表存在主键时按主键值解析（字符串主键如 `findById('config', 'a')` 直接可用）
+- 非自增主键表 `insert` 返回主键值；`NativeJSQL` 新增
+  `beginTransaction()` / `commit()` / `rollback()` 事务别名
+- 原生 / WASM 客户端新增 9 个回归测试
+
+**变更**
+- 版本号重新基线 5.2.0-beta.1（package.json / Mongo `buildInfo` / README 同步）
+- 开源许可统一为 **Apache License 2.0**（README 同步，与 package.json 声明一致）
+
 ### v5.3.1 (2026-08-12)
 
 **修复**
@@ -7154,7 +7361,7 @@ CI（GitHub Actions）矩阵：`node 20/22` × `linux/macos/windows` × `native/
 
 *JSQL-NEO — One engine to rule them all. MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser.*
 
-*文档版本：v5.3.1 · 共 19 个附录 · 最后更新：2026-08-12*
+*文档版本：v5.4.0 · 共 19 个附录 · 最后更新：2026-08-12*
 
 ---
 
@@ -7761,4 +7968,4 @@ npm test
 
 *JSQL-NEO — One engine to rule them all. MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser.*
 
-*文档版本：v5.3.1 · 附录 A–Z · 全文 6000+ 行 · 最后更新：2026-08-12*
+*文档版本：v5.4.0 · 附录 A–Z · 全文 6000+ 行 · 最后更新：2026-08-12*

package/lib/mongo_server.js

@@ -322,7 +322,7 @@ class MongoServer {
           localTime: new Date(), logicalSessionTimeoutMinutes: 30, connectionId: 1,
         };
       case 'ping': return { ok: 1 };
-      case 'buildInfo': return { ok: 1, version: '5.3.1-jsql-neo', gitVersion: 'jsql-neo', versionArray: [5, 3, 1, 0] };
+      case 'buildInfo': return { ok: 1, version: '5.4.0-jsql-neo', gitVersion: 'jsql-neo', versionArray: [5, 4, 0, 0] };
       case 'getParameter': return { ok: 1 };
       case 'endSessions': return { ok: 1 };
       case 'listDatabases':

package/lib/native_client.js

@@ -30,14 +30,52 @@ const NATIVE_TYPE_MAP = {
   int: 'integer',
 };
 
+function parseShorthandSchema(str) {
+  const def = { type: str };
+  const strip = (re) => {
+    const next = def.type.replace(re, '').trim();
+    def.type = next || def.type;
+  };
+  if (/\bprimary\s+key\b/i.test(def.type)) { def.primaryKey = true; strip(/\bprimary\s+key\b/gi); }
+  if (/\bauto_?increment\b/i.test(def.type)) { def.autoIncrement = true; strip(/\bauto_?increment\b/gi); }
+  if (/\bnot\s+null\b/i.test(def.type)) { def.required = true; strip(/\bnot\s+null\b/gi); }
+  if (/\bunique\b/i.test(def.type)) { def.unique = true; strip(/\bunique\b/gi); }
+  if (/\bdefault\s+(\S+)/i.test(def.type)) {
+    const m = def.type.match(/\bdefault\s+(\S+)/i);
+    def.default = m[1].replace(/^['"]|['"]$/g, '');
+    strip(/\bdefault\s+\S+/gi);
+  }
+  return def;
+}
+
+function parseSchemaString(str) {
+  const out = {};
+  for (const seg of str.split(',')) {
+    const trimmed = seg.trim();
+    if (!trimmed) continue;
+    const parts = trimmed.split(/\s+/);
+    const name = parts.shift();
+    const def = parseShorthandSchema(parts.join(' ').toLowerCase().trim());
+    if (def.type.length === 0) def.type = 'string';
+    out[name] = def;
+  }
+  return out;
+}
+
 function mapNativeSchema(schema) {
+  if (typeof schema === 'string') schema = parseSchemaString(schema);
   const mapped = {};
   for (const [field, def] of Object.entries(schema || {})) {
     if (typeof def === 'string') {
-      mapped[field] = { type: NATIVE_TYPE_MAP[def.toLowerCase()] || def.toLowerCase() };
+      const parsed = parseShorthandSchema(def.toLowerCase().trim());
+      if (parsed.type.length === 0) parsed.type = 'string';
+      mapped[field] = { ...parsed, type: NATIVE_TYPE_MAP[parsed.type] || parsed.type };
     } else if (def && typeof def === 'object') {
       const t = (def.type || 'string').toLowerCase();
-      mapped[field] = { ...def, type: NATIVE_TYPE_MAP[t] || t };
+      const out = { ...def, type: NATIVE_TYPE_MAP[t] || t };
+      if (out.primary_key !== undefined && out.primaryKey === undefined) { out.primaryKey = out.primary_key; delete out.primary_key; }
+      if (out.auto_increment !== undefined && out.autoIncrement === undefined) { out.autoIncrement = out.auto_increment; delete out.auto_increment; }
+      mapped[field] = out;
     } else {
       mapped[field] = { type: 'string' };
     }
@@ -46,25 +84,46 @@ function mapNativeSchema(schema) {
 }
 
 function restoreRow(row, schema) {
-  if (!schema || typeof row !== 'object' || row === null) return row;
-  const out = {};
-  for (const [field, def] of Object.entries(row)) {
-    if (field === 'fields' && typeof row[field] === 'object' && row[field] !== null) {
-      out[field] = restoreRow(row[field], schema);
-      continue;
+  if (typeof row !== 'object' || row === null) return row;
+  let src = row;
+  if (row.fields && typeof row.fields === 'object' && row.fields !== null) {
+    src = { ...row.fields };
+    if (row.id !== undefined) {
+      const pkCols = [];
+      if (schema) {
+        for (const [k, def] of Object.entries(schema)) {
+          if (def && typeof def === 'object' && def.autoIncrement) continue;
+          const isPk = typeof def === 'string'
+            ? /\bprimary\s+key\b/i.test(def)
+            : !!(def && (def.primaryKey || def.primary_key));
+          if (isPk) pkCols.push(k);
+        }
+      } else if (src.id === undefined) {
+        pkCols.push('id');
+      }
+      for (const c of pkCols) {
+        const v = src[c];
+        if (v === undefined || v === null || v === 0 || v === '' || v === false) src[c] = row.id;
+      }
     }
+    if (row.created_at !== undefined) src.created_at = row.created_at;
+    if (row.updated_at !== undefined) src.updated_at = row.updated_at;
+  }
+  if (!schema) return src;
+  const out = {};
+  for (const [field, value] of Object.entries(src)) {
     const colDef = schema[field];
     let t = null;
     if (typeof colDef === 'string') t = colDef.toLowerCase();
     else if (colDef && typeof colDef === 'object' && colDef.type) t = String(colDef.type).toLowerCase();
-    if (['json', 'array', 'object'].includes(t) && typeof row[field] === 'string') {
-      try { out[field] = JSON.parse(row[field]); } catch (e) { out[field] = row[field]; }
-    } else if ((t === 'integer' || t === 'int' || t === 'bigint') && typeof row[field] === 'string' && /^-?\d+$/.test(row[field])) {
-      out[field] = Number(row[field]);
-    } else if ((t === 'float' || t === 'double' || t === 'number') && typeof row[field] === 'string' && !Number.isNaN(Number(row[field]))) {
-      out[field] = Number(row[field]);
+    if (['json', 'array', 'object'].includes(t) && typeof value === 'string') {
+      try { out[field] = JSON.parse(value); } catch (e) { out[field] = value; }
+    } else if ((t === 'integer' || t === 'int' || t === 'bigint') && typeof value === 'string' && /^-?\d+$/.test(value)) {
+      out[field] = Number(value);
+    } else if ((t === 'float' || t === 'double' || t === 'number') && typeof value === 'string' && !Number.isNaN(Number(value))) {
+      out[field] = Number(value);
     } else {
-      out[field] = row[field];
+      out[field] = value;
     }
   }
   return out;
@@ -154,6 +213,7 @@ class JSQL {
     this._opFlushInterval = opts.opFlushInterval || 50;
     this._tableNames = new Set();
     this._schemas = {};
+    this._txId = undefined;
     this._autoPlugins = opts.modules !== false;
 
     // 持久化模式: 'memory' | 'hybrid' | 'disk'
@@ -313,6 +373,62 @@ class JSQL {
     }
   }
 
+  _pkOf(table) {
+    const schema = this._schemas[table];
+    if (!schema) return null;
+    for (const [k, def] of Object.entries(schema)) {
+      const isPk = (typeof def === 'string' && /\bprimary\s+key\b/i.test(def))
+        || !!(def && typeof def === 'object' && (def.primaryKey || def.primary_key));
+      if (isPk) return k;
+    }
+    return null;
+  }
+
+  _pkAutoIncrement(table) {
+    const schema = this._schemas[table];
+    const pk = this._pkOf(table);
+    if (!pk || !schema) return false;
+    const def = schema[pk];
+    if (typeof def === 'string') return /\bauto_?increment\b/i.test(def);
+    return !!(def && def.autoIncrement);
+  }
+
+  _coercePkId(table, id) {
+    const schema = this._schemas[table];
+    const pk = this._pkOf(table);
+    if (!schema || !pk) return id;
+    const def = schema[pk];
+    let t = null;
+    if (typeof def === 'string') t = def.toLowerCase();
+    else if (def && typeof def === 'object' && def.type) t = String(def.type).toLowerCase();
+    if (['integer', 'int', 'bigint'].includes(t)) return Number(id);
+    return id;
+  }
+
+  _findRawById(table, id) {
+    const pk = this._pkOf(table);
+    if (pk) {
+      const filter = {};
+      filter[pk] = this._coercePkId(table, id);
+      const r = safeParse(native.jsqlFind(table, JSON.stringify(filter), 1, 0));
+      if (r && r.error) return r;
+      return Array.isArray(r) && r.length > 0 ? r[0] : null;
+    }
+    return safeParse(native.jsqlFindById(table, Number(id)));
+  }
+
+  _seqIdByPk(table, id) {
+    const pk = this._pkOf(table);
+    if (pk) {
+      const filter = {};
+      filter[pk] = this._coercePkId(table, id);
+      const r = safeParse(native.jsqlFind(table, JSON.stringify(filter), 1, 0));
+      if (Array.isArray(r) && r.length > 0) return r[0].id;
+      return null;
+    }
+    return Number(id);
+  }
+
   async _insertBatch(table, rows) {
     const schema = this._schemas[table];
     if (schema) {
@@ -328,6 +444,15 @@ class JSQL {
     const bin = encodeBatch(rows);
     const r = safeParse(native.jsqlInsertBuf(table, bin));
     if (r && r.error) throw new Error(r.error);
+    if (r && Array.isArray(r) && !this._pkAutoIncrement(table)) {
+      const pk = this._pkOf(table);
+      if (pk) {
+        return r.map((seq, i) => {
+          const row = rows[i];
+          return (row && row[pk] !== undefined && row[pk] !== null) ? row[pk] : seq;
+        });
+      }
+    }
     return r;
   }
 
@@ -419,7 +544,7 @@ class JSQL {
     const r = safeParse(native.jsqlCreateTable(name, JSON.stringify(mapNativeSchema(schema))));
     if (r && r.ok === false) throw new Error(r.error || 'create table failed');
     this._tableNames.add(name);
-    this._schemas[name] = schema;
+    this._schemas[name] = typeof schema === 'string' ? mapNativeSchema(schema) : schema;
     this._emit('createTable', { name, schema });
     this._runHooks('afterCreateTable', [name, schema]);
     return r;
@@ -440,7 +565,7 @@ class JSQL {
   findById(table, id) {
     this._flushOpsNow();
     if (!this._runHooks('beforeFind', [table, { id }])) return null;
-    const raw = safeParse(native.jsqlFindById(table, Number(id)));
+    const raw = this._findRawById(table, id);
     if (raw && raw.error) throw new Error(raw.error);
     this._runHooks('afterFind', [table, { id }, raw]);
     const schema = this._schemas[table];
@@ -451,8 +576,12 @@ class JSQL {
   findByIds(table, ids) {
     this._flushOpsNow();
     if (!this._runHooks('beforeFind', [table, { ids }])) return null;
-    const resultStr = native.jsqlFindByIds(table, JSON.stringify(ids));
-    const r = safeParse(resultStr);
+    let r;
+    if (this._pkOf(table)) {
+      r = ids.map(id => this._findRawById(table, id)).filter(x => x !== null && !(x && x.error));
+    } else {
+      r = safeParse(native.jsqlFindByIds(table, JSON.stringify(ids)));
+    }
     if (r && r.error) throw new Error(r.error);
     this._runHooks('afterFind', [table, { ids }, r]);
     const schema = this._schemas[table];
@@ -487,7 +616,11 @@ class JSQL {
   }
 
   updateByIds(table, entries) {
-    const pairs = entries.map(([id, data]) => [Number(id), data]);
+    const pairs = [];
+    for (const [id, data] of entries) {
+      const seq = this._seqIdByPk(table, id);
+      if (seq !== null) pairs.push([seq, data]);
+    }
     if (!this._runHooks('beforeUpdate', [table, pairs])) return;
     if (!this._opBuffer.update[table]) this._opBuffer.update[table] = [];
     this._opBuffer.update[table].push(...pairs);
@@ -497,21 +630,28 @@ class JSQL {
   removeByIds(table, ids) {
     if (!this._runHooks('beforeDelete', [table, ids])) return;
     if (!this._opBuffer.remove[table]) this._opBuffer.remove[table] = new Set();
-    for (const id of ids) this._opBuffer.remove[table].add(Number(id));
+    for (const id of ids) {
+      const seq = this._seqIdByPk(table, id);
+      if (seq !== null) this._opBuffer.remove[table].add(seq);
+    }
     this._scheduleOpFlush();
   }
 
   updateById(table, id, data) {
     if (!this._runHooks('beforeUpdate', [table, id, data])) return;
+    const seq = this._seqIdByPk(table, id);
+    if (seq === null) return;
     if (!this._opBuffer.update[table]) this._opBuffer.update[table] = [];
-    this._opBuffer.update[table].push([Number(id), data]);
+    this._opBuffer.update[table].push([seq, data]);
     this._scheduleOpFlush();
   }
 
   removeById(table, id) {
     if (!this._runHooks('beforeDelete', [table, id])) return;
+    const seq = this._seqIdByPk(table, id);
+    if (seq === null) return;
     if (!this._opBuffer.remove[table]) this._opBuffer.remove[table] = new Set();
-    this._opBuffer.remove[table].add(Number(id));
+    this._opBuffer.remove[table].add(seq);
     this._scheduleOpFlush();
   }
 
@@ -543,9 +683,28 @@ class JSQL {
     this._flushOpsNow();
     const r = safeParse(native.jsqlBeginTx());
     if (r && r.ok === false) throw new Error(r.error || 'begin transaction failed');
+    this._txId = r.txId;
     return r.txId;
   }
 
+  async beginTransaction() {
+    return this.beginTx();
+  }
+
+  async commit() {
+    if (this._txId === undefined) return true;
+    const r = await this.commitTx(this._txId);
+    this._txId = undefined;
+    return r;
+  }
+
+  async rollback() {
+    if (this._txId === undefined) return true;
+    const r = await this.rollbackTx(this._txId);
+    this._txId = undefined;
+    return r;
+  }
+
   async commitTx(txId) {
     const r = safeParse(native.jsqlCommitTx(String(txId)));
     if (r && r.ok === false) throw new Error(r.error || 'commit transaction failed');