jsql-neo 6.3.5 → 6.3.10

package/lib/sqlite_compat.js

@@ -81,6 +81,7 @@ class Database {
   close() {
     if (!this.open) return;
     try {
+      // P3-12: close() 不等 worker 保存完——显式等待保存完成
       this._sync('close', []);
     } finally {
       this.open = false;
@@ -285,7 +286,7 @@ class Statement {
 
   run(...params) {
     const r = this._call('run', params.length > 0 ? params : undefined);
-    return r;
+    return { changes: r && r.affectedRows, lastInsertRowid: r && r.insertId, _stmt: this };
   }
 
   get(...params) {

package/lib/sqlite_worker.js

@@ -97,7 +97,8 @@ function cleanResult(r) {
     if (v instanceof Date) out[k] = v.toISOString();
     else if (v === undefined) out[k] = null;
     else if (typeof v === 'object' && v !== null && !Array.isArray(v)) {
-      // 仅保留可 JSON 化的值（防止 Table/内部对象循环引用）
+      // P3-14: 双次 stringify 检查可能导致某些值被错误地过滤
+      // 只检查一次 stringify 是否成功，然后保留原值
       try { JSON.stringify(v); out[k] = v; } catch (e) { out[k] = null; }
     } else out[k] = v;
   }
@@ -123,9 +124,14 @@ async function handleOp(op, args) {
     }
     case 'run': {
       const r = await executeStatement(args[0], args[1]);
+      // P3-13: 非 insert 操作不应回退到上次 insertId
+      const lastId = r && r.type === 'insert' ? Number(r.insertId || 0) : 0;
+      if (r && r.type === 'insert' && r.insertId !== undefined && r.insertId !== null) {
+        _lastInsertId = Number(r.insertId);
+      }
       result = {
         changes: r ? (r.affectedRows || 0) : 0,
-        lastInsertRowid: r && r.type === 'insert' ? Number(r.insertId || 0) : _lastInsertId,
+        lastInsertRowid: lastId,
       };
       break;
     }

package/lib/table.js

@@ -122,7 +122,7 @@ class Table {
         };
         this._softDelete = false;
         this._computedFields = {};
-        this._btreesDirty = false;
+
 
         this._primaryKey = null;
         this._pkIndex = null;
@@ -283,6 +283,13 @@ class Table {
                 }
                 if (def.check && data[field] !== undefined && !def.check(data[field], data)) throw createError('ER_CHECK_CONSTRAINT', this._name + '.' + field);
             }
+            // 主键唯一性检查（主键可能不在 _cachedUniqueFields 中）
+            if (this._primaryKey && data[this._primaryKey] !== undefined && data[this._primaryKey] !== null) {
+                const pkVal = data[this._primaryKey];
+                if (this._pkIndex && this._pkIndex.has(pkVal)) {
+                    throw createError('ER_DUP_ENTRY', String(pkVal), this._primaryKey);
+                }
+            }
             for (const fk of foreignKeys) {
                 if (data[fk.field] !== undefined && data[fk.field] !== null) {
                     const refTable = this._resolveTable(fk.table);
@@ -303,7 +310,11 @@ class Table {
             this._rows.push(Object.assign({}, data));
             if (this._pkIndex && this._primaryKey) {
                 const pkVal = data[this._primaryKey];
-                if (pkVal !== undefined && pkVal !== null) this._pkIndex.set(pkVal, rowIdx);
+                if (pkVal !== undefined && pkVal !== null) {
+                    // P1-1: insertMany 主键重复检查
+                    if (this._pkIndex.has(pkVal)) throw createError('ER_DUP_ENTRY', String(pkVal), this._primaryKey);
+                    this._pkIndex.set(pkVal, rowIdx);
+                }
             }
             for (const [field, tree] of Object.entries(this._btrees)) {
                 const val = data[field];
@@ -369,7 +380,6 @@ class Table {
             }
             return null;
         }
-        this._ensureBTrees();
         if (this._btrees[this._primaryKey]) {
             const indices = this._btrees[this._primaryKey].search(id);
             if (indices.length > 0) {
@@ -442,7 +452,6 @@ class Table {
         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;
@@ -539,7 +548,6 @@ class Table {
         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;
@@ -587,8 +595,28 @@ class Table {
     }
 
     removeSoft(query = {}) {
-        this._softDelete = true;
-        return this.remove(query);
+        if (!this._softDelete) throw createError('ER_NOT_SUPPORTED', 'Soft delete is not enabled');
+        const matched = this._applyFilterOptimized(this._getVisibleRows(), query);
+        let count = 0;
+        const now = new Date().toISOString();
+        for (const row of matched) {
+            const index = this._rows.indexOf(row);
+            if (index === -1) continue;
+            this._removeFromIndexes(index, row);
+            row._deleted = true;
+            row._deletedAt = now;
+            this._addToIndexes(index, row);
+            count++;
+        }
+        if (count > 0) {
+            this._dirty = true;
+            this._db._markDirty(this._name);
+            for (const hook of this._hooks.afterRemove) {
+                hook(query, count);
+            }
+            this._db._emitChange('remove', this._name, { query, count, soft: true });
+        }
+        return count;
     }
 
     _findRowIndex(id) {
@@ -628,6 +656,7 @@ class Table {
         }
         this._indexes = {};
         this._autoIncrement = 0;
+        // P1-13: truncate 不应重置软删除模式——保留原值
         this._dirty = true;
         this._db._markDirty(this._name);
         return count;
@@ -640,6 +669,10 @@ class Table {
     addColumn(field, definition) {
         if (this._schema[field]) throw createError('ER_DUP_FIELDNAME', field);
         this._schema[field] = definition;
+        // P1-14: 更新缓存字段列表，使新列的 unique/required 约束生效
+        if (!this._cachedSchemaFields.includes(field)) this._cachedSchemaFields.push(field);
+        if (definition.unique && !this._cachedUniqueFields.includes(field)) this._cachedUniqueFields.push(field);
+        if (definition.required && !this._cachedRequiredFields.includes(field)) this._cachedRequiredFields.push(field);
         if (definition.default !== undefined) {
             this._defaults[field] = definition.default;
             for (const row of this._rows) {
@@ -666,6 +699,15 @@ class Table {
             this._btrees[field] = new BTree(64, true);
             this._rebuildBTree(field);
         }
+        // P1-8: 添加主键列时设置 _primaryKey 并重建 pkIndex
+        if (definition.primaryKey) {
+            this._primaryKey = field;
+            if (this._pkIndex) this._pkIndex.clear();
+            for (let i = 0; i < this._rows.length; i++) {
+                const val = this._rows[i][field];
+                if (val !== undefined && val !== null) this._pkIndex.set(val, i);
+            }
+        }
         this._dirty = true;
         this._db._markDirty(this._name);
         return this;
@@ -684,7 +726,11 @@ class Table {
         for (const row of this._rows) {
             delete row[field];
         }
-        if (this._primaryKey === field) this._primaryKey = null;
+        // P1-8: 删除主键列时清空 pkIndex
+        if (this._primaryKey === field) {
+            this._primaryKey = null;
+            if (this._pkIndex) this._pkIndex.clear();
+        }
         if (this._autoIncrementField === field) this._autoIncrementField = null;
         this._dirty = true;
         this._db._markDirty(this._name);
@@ -703,6 +749,11 @@ class Table {
         if (this._btrees[oldName]) {
             this._btrees[newName] = this._btrees[oldName];
             delete this._btrees[oldName];
+            this._btrees[newName].clear();
+            for (let i = 0; i < this._rows.length; i++) {
+                const val = this._rows[i][newName];
+                if (val !== undefined && val !== null) this._btrees[newName].insert(val, i);
+            }
         }
         for (const row of this._rows) {
             row[newName] = row[oldName];
@@ -721,9 +772,13 @@ class Table {
         if (definition.default !== undefined) this._defaults[field] = definition.default;
         this._checkConstraints = this._checkConstraints.filter(c => c.field !== field);
         if (definition.check) this._checkConstraints.push({ field, fn: definition.check });
-        if (definition.primaryKey || definition.unique) {
-            if (!this._btrees[field]) this._btrees[field] = new BTree(64, true);
-            this._rebuildBTree(field);
+        if (definition.primaryKey !== undefined || definition.unique !== undefined) {
+            if (definition.primaryKey || definition.unique) {
+                if (!this._btrees[field]) this._btrees[field] = new BTree(64, true);
+                this._rebuildBTree(field);
+            } else {
+                delete this._btrees[field];
+            }
         }
         this._dirty = true;
         this._db._markDirty(this._name);
@@ -817,20 +872,6 @@ class Table {
         }
     }
 
-    _ensureBTrees() {
-        if (!this._btreesDirty) return;
-        this._btreesDirty = false;
-        for (const field of Object.keys(this._btrees)) {
-            this._btrees[field].clear();
-        }
-        for (let i = 0; i < this._rows.length; i++) {
-            const row = this._rows[i];
-            for (const [field, tree] of Object.entries(this._btrees)) {
-                const v = row[field];
-                if (v !== undefined && v !== null) tree.insert(v, i);
-            }
-        }
-    }
 
     _rebuildAllBTrees() {
         for (const field of Object.keys(this._btrees)) {
@@ -881,7 +922,6 @@ class Table {
     }
 
     _applyFilterOptimized(rows, query) {
-        this._ensureBTrees();
         for (const [field, condition] of Object.entries(query)) {
             if (field === '$or' || field === '$and' || field === '$not') continue;
             if (typeof condition !== 'object' || condition === null || Array.isArray(condition) || condition instanceof RegExp) {
@@ -940,6 +980,8 @@ class Table {
     _applyFilter(rows, query) {
         const result = [];
         for (let i = 0; i < rows.length; i++) {
+            // 软删除行不应出现在任何查询结果中
+            if (this._softDelete && rows[i]._deleted) continue;
             if (this._matchRow(rows[i], query)) {
                 result.push(rows[i]);
             }

package/lib/tui.js

@@ -13,7 +13,7 @@ const os = require('os');
 const Database = require('./database');
 const { executeSQL } = require('./sql');
 
-const HISTORY_FILE = path.join(os.homedir(), '.jsql-history');
+const HISTORY_FILE = path.join(os.homedir(), '.jsql-history.' + process.pid);
 const MAX_HISTORY = 500;
 
 /* ---------- ANSI helpers ---------- */

package/lib/wasm_client.js

@@ -664,6 +664,12 @@ class JSQL {
     await this._flush();
     const seq = this._seqIdByPk(table, id);
     if (seq === null) return null;
+    // 改主键 / UNIQUE 列前先查冲突。
+    // 此前直接调 jsql_update_by_id，导致
+    //   UPDATE t SET id = 1 WHERE id = 2   （t 已有 id=1）
+    // 静默产生两行同主键 —— 主键索引只留一个，索引与实际行数组不一致。
+    // MySQL / SQLite 都会报 UNIQUE constraint failed。
+    await this._assertNoKeyConflict(table, id, data, seq);
     const r = safeJsonParse(wasmBindings.jsql_update_by_id(table, BigInt(seq), JSON.stringify(data)));
     if (r && r.ok === false) throw new Error(r.error || 'update failed');
     this._emit('update', { table, id, data });
@@ -671,6 +677,35 @@ class JSQL {
     return r;
   }
 
+  /**
+   * 校验 UPDATE 后的主键 / UNIQUE 值不与其它行冲突。
+   * 逐行比对（未建索引也正确）；值未变化时跳过。
+   */
+  async _assertNoKeyConflict(table, id, data, selfSeq) {
+    const schema = this._schemas[table];
+    if (!schema) return;
+    const fields = Object.keys(schema).filter(f => schema[f] && (schema[f].primaryKey || schema[f].unique));
+    if (!fields.length) return;
+    let rows;
+    try {
+      rows = await this.find(table, {}, { limit: 1e9, offset: 0 });
+    } catch (_) {
+      return;   // 读不到就不拦，交给底层报错
+    }
+    for (const f of fields) {
+      if (!Object.prototype.hasOwnProperty.call(data, f)) continue;
+      const nv = data[f];
+      const self = rows.find(r => r && String(r.id) === String(id));
+      if (self && self[f] === nv) continue;             // 值没变
+      if (rows.some(r => r && r !== self && r[f] === nv)) {
+        const e = new Error(`Duplicate entry '${nv}' for key '${f}'`);
+        e.code = 'ER_DUP_ENTRY';
+        e.errno = 1062;
+        throw e;
+      }
+    }
+  }
+
   async removeById(table, id) {
     if (!this._runHooks('beforeDelete', [table, id])) return;
     await this._flush();

package/lib/web_ui.js

@@ -141,9 +141,17 @@ class WebUI {
     return fs.readdirSync(this.dataDir)
       .filter(f => f.endsWith('.json'))
       .map(f => {
-        let tables = 0;
-        try { tables = Object.keys(JSON.parse(fs.readFileSync(path.join(this.dataDir, f), 'utf8')).__schema__ || {}).length; } catch (_) {}
-        return { name: f.slice(0, -5), tables };
+        try {
+          const stat = fs.statSync(path.join(this.dataDir, f));
+          // 只读前 4KB：schema 头部包含 __schema__ 定义，尾部数据不需要
+          const fd = fs.openSync(path.join(this.dataDir, f), 'r');
+          const buf = Buffer.alloc(4096);
+          fs.readSync(fd, buf, 0, 4096, 0);
+          fs.closeSync(fd);
+          const match = buf.toString('utf8').match(/"__schema__"\s*:\s*\{([^}]*)\}/);
+          const tables = match ? (match[1].match(/"/g) || []).length / 2 : 0;
+          return { name: f.slice(0, -5), tables };
+        } catch (_) { return { name: f.slice(0, -5), tables: 0 }; }
       });
   }
 
@@ -188,12 +196,20 @@ class WebUI {
         res.writeHead(204, h);
         return res.end();
       }
-      if (this.authToken && url.pathname.startsWith('/api/')) {
-        const provided = req.headers.authorization || '';
-        const token = provided.startsWith('Bearer ') ? provided.slice(7) : '';
-        if (token !== this.authToken) {
+      // API 认证：必须设置 authToken（从环境变量或构造选项）。
+      // 仅当显式 noAuth: true 时允许无认证访问（仅本地开发用）。
+      if (url.pathname.startsWith('/api/')) {
+        if (!this.noAuth && !this.authToken) {
           res.writeHead(401, { 'Content-Type': 'application/json' });
-          return res.end(JSON.stringify({ ok: false, error: 'unauthorized' }));
+          return res.end(JSON.stringify({ ok: false, error: 'API auth not configured' }));
+        }
+        if (this.authToken) {
+          const provided = req.headers.authorization || '';
+          const token = provided.startsWith('Bearer ') ? provided.slice(7) : '';
+          if (token !== this.authToken) {
+            res.writeHead(401, { 'Content-Type': 'application/json' });
+            return res.end(JSON.stringify({ ok: false, error: 'unauthorized' }));
+          }
         }
       }
       if (url.pathname === '/api/databases' && req.method === 'GET') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.3.5",
+  "version": "6.3.10",
   "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
   "main": "index.js",
   "types": "index.d.ts",
@@ -51,10 +51,17 @@
     "test:btree": "node test/btree.test.js",
     "test:native": "node test/native.test.js",
     "test:regress": "node test/regress-5.1.0.js",
-    "test:all": "node test/smoke.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/native.test.js && node test/native-multi-instance.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/wasm.test.js && node test/coverage.js && node test/regress-5.1.0.js && node test/join.test.js && node test/btree.test.js && node test/dml-constraints.test.js",
+    "test:all": "node test/smoke.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/native.test.js && node test/native-multi-instance.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/wasm.test.js && node test/coverage.js && node test/regress-5.1.0.js && node test/join.test.js && node test/btree.test.js && node test/dml-constraints.test.js && node test/savepoint.test.js && node test/alter-table.test.js && node test/null-semantics.test.js && node test/identifier-keywords.test.js && node test/recursive-cte.test.js && node test/index-ddl.test.js",
     "test:coverage": "c8 --all --include='lib/**' --exclude='lib/web_ui.js' --reporter=text --reporter=lcov node test/coverage.js",
     "test:orms": "node examples/orms/run-all.js",
-    "test:dml": "node test/dml-constraints.test.js"
+    "test:dml": "node test/dml-constraints.test.js",
+    "test:cte": "node test/recursive-cte.test.js",
+    "test:index": "node test/index-ddl.test.js",
+    "test:mongo": "node test/mongo-group.test.js",
+    "test:savepoint": "node test/savepoint.test.js",
+    "test:alter": "node test/alter-table.test.js",
+    "test:ident": "node test/identifier-keywords.test.js",
+    "test:null": "node test/null-semantics.test.js"
   },
   "keywords": [
     "database",