jsql-neo 6.5.3 → 6.5.5

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, **and the browser**.
 
-> **v6.5.3** — stable release · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
+> **v6.5.5** — stable release · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
 
 ![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)

package/bin/jsql

@@ -201,40 +201,40 @@ const cli = yaggs({ pkg: require('../package.json') })
     if (argv.reset) sn.setStarred(false);
     const c = sn.readConfig();
     if (c.starred) {
-      console.log('Already confirmed starred (config: ' + sn.configPath() + ')');
-      console.log('Run with --reset to re-check.');
+      console.log(`Already confirmed starred 已确认过: ${sn.configPath()}`);
+      console.log('Run with --reset to re-check · 用 --reset 重新检查');
       return;
     }
-    console.log('Opening browser to confirm your star…');
+    console.log('Opening browser to confirm your star… 正在打开浏览器确认');
     const nonceUrl = sn.startOauthCheck();     // 打开浏览器 + 后台轮询写回 ~/.jsqlmr
     if (!process.stdout.isTTY) console.log('  ' + nonceUrl);
-    console.log('After you authorize, this config is updated: ' + sn.configPath());
-    console.log('Waiting for authorization (up to 3 minutes)…');
+    console.log(`Authorization updates this config 授权后写入配置: ${sn.configPath()}`);
+    console.log('Waiting for authorization (up to 3 minutes)… 等待授权（最多 3 分钟）…');
     // startOauthCheck 的定时器是 unref 的，命令必须自己前台等，否则接不到结果
     const res = sn.waitForResult(nonceUrl, 180000);
     const status = res && res.status;
     if (status === 'starred') {
       sn.setStarred(true);
-      console.log(`Confirmed: ${res.login} has starred ${res.repo}. Thanks!`);
+      console.log(`Confirmed: ${res.login} starred ${res.repo} — thanks! 已确认，谢谢！`);
       return;
     }
     if (status === 'not-starred') {
-      console.log(`Authorization finished, but ${res.login} has not starred ${res.repo} yet.`);
-      console.log(`Star it at ${sn.URL} then run \`jsql star\` again.`);
+      console.log(`Not starred yet 还没 star: ${res.login} has not starred ${res.repo}`);
+      console.log(`Star it at ${sn.URL}, then run \`jsql star\` again · 点星后重跑 \`jsql star\``);
       return;
     }
     if (status === 'denied' || status === 'error') {
-      // 这不是「没 star」，是授权本身没走通（code 过期、链接被重复打开、被拒绝）。
-      // 老实现这里会把 login/repo 打印成 undefined，并让用户去 star —— 误导。
-      console.log(`Authorization ${status === 'denied' ? 'was declined' : 'failed'}: ${res.error || 'unknown reason'}`);
-      console.log('The link is single-use. Run `jsql star` again to get a fresh one.');
+      // 这不是「没 star」，是授权本身没走通（code 过期、链接被重复打开、被拒绝）
+      const why = status === 'denied' ? 'declined 被拒绝' : 'failed 失败';
+      console.log(`Authorization ${why}: ${res.error || 'unknown reason'}`);
+      console.log('The link is single-use — run `jsql star` again · 链接一次性，请重跑 `jsql star`');
       return;
     }
     if (status === 'expired') {
-      console.log('The link expired. Run `jsql star` again to retry.');
+      console.log('The link expired 链接已过期 — run `jsql star` again · 请重跑');
       return;
     }
-    console.log('Timed out. Run `jsql star` again to retry.');
+    console.log('Timed out 已超时 — run `jsql star` again · 请重跑');
   })
   .command('bench', 'Insert + query benchmark against a data directory', (sub) => {
     sub.option('n', { type: 'number', description: 'Number of rows (default 10000)' });

package/index.js

@@ -1,5 +1,5 @@
 /**
- * JSQL-NEO v6.5.3 — Rust-Powered Embedded Database (WASM + HTTP)
+ * JSQL-NEO v6.5.5 — Rust-Powered Embedded Database (WASM + HTTP)
  *
  * @example
  * const jsql = require('jsql-neo');

package/lib/star-nag.js

@@ -208,7 +208,7 @@ function nag(opts = {}) {
   }
 
   out.write(`\n  If JSQL-NEO saved you time, a star helps others find it: ${URL}\n`);
-  out.write(`  Run \`jsql star\` to confirm and stop seeing this (or set JSQL_NO_STAR_NAG=1 to hide)\n\n`);
+  out.write(`  如果帮到了你，点个 star；运行 \`jsql star\` 确认 · JSQL_NO_STAR_NAG=1 关闭提示\n\n`);
 
   // 只记录「有没有 star」，不再写 lastNagAt —— 没有节流，写它没有意义。
   return true;

package/lib/wasm_client.js

@@ -725,24 +725,59 @@ class JSQL {
   /**
    * 校验 UPDATE 后的主键 / UNIQUE 值不与其它行冲突。
    * 逐行比对（未建索引也正确）；值未变化时跳过。
+   *
+   * 6.5.5 性能修复（对齐 native_client.js 的 6.4.8 修复，那次漏了 wasm 侧）：
+   *   旧写法无条件 `this.find(table, {}, {limit: 1e9})` 把整张表导出成 JSON，
+   *   再逐字段 find/some。updateById 于是在 10 万行的表上要 ~590ms/次 ——
+   *   比读整张表还贵，而它本来只需要定位一行。
+   *     UPDATE t SET age = 30 WHERE id = 1   ← age 不是键，不可能冲突，却付了全表钱
+   *
+   * 新逻辑（性能从 O(表行数) 降回 O(1)）：
+   *   1. 只筛出 pk + unique 列，且**确实出现在 updateData 里**的（touched）；
+   *      一个都没碰 → 直接 return，整张表一个字都不读；
+   *   2. 先用主键把**自己那一行**取回来（一条走 pk 的 find，limit 1，O(1)）。
+   *      所有 touched 列的新值都和现值相同 → 值没变，同样直接 return
+   *      （幂等更新不误报，也不再触发全表扫描）；
+   *   3. 真的动了键，才退化成整表扫描逐字段比对（正确性优先）。
    */
   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;
+    // 只在**确实要改主键 / UNIQUE 列**时才做冲突检查。
+    const touched = fields.filter(f => Object.prototype.hasOwnProperty.call(data, f));
+    if (!touched.length) return;
+
+    // 自己那一行：走主键的 find(limit 1)，不整表导出。
+    let self = null;
+    try {
+      const pk = this._pkOf(table);
+      if (pk) {
+        const one = await this.find(table, { [pk]: this._coercePkId(table, id) }, { limit: 1, offset: 0 });
+        self = Array.isArray(one) ? (one[0] || null) : null;
+      }
+    } catch (_) {
+      self = null;   // 取不到就走下面的全量比对
+    }
+    // 所有 touched 列的值都没变 → 幂等更新，不可能产生新冲突，无需扫表。
+    if (self && touched.every(f => self[f] === data[f])) return;
+
     let rows;
     try {
       rows = await this.find(table, {}, { limit: 1e9, offset: 0 });
     } catch (_) {
       return;   // 读不到就不拦，交给底层报错
     }
+    if (!Array.isArray(rows)) return;
+    // 把自己那一行找出来并从比对中排除。注意：self 来自上一次 find，
+    // 与 rows 里的对象不是同一个引用，所以必须按 id 重新定位，不能直接 r !== self。
+    const selfRow = self || rows.find(r => r && String(r.id) === String(id)) || null;
     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)) {
+      if (selfRow && selfRow[f] === nv) continue;       // 值没变
+      if (rows.some(r => r && r !== selfRow && r[f] === nv)) {
         const e = new Error(`Duplicate entry '${nv}' for key '${f}'`);
         e.code = 'ER_DUP_ENTRY';
         e.errno = 1062;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jsql-neo",
-  "version": "6.5.3",
-  "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
+  "version": "6.5.5",
+  "description": "JSQL-NEO \u2014 Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
   "main": "index.js",
   "types": "index.d.ts",
   "exports": {
@@ -97,4 +97,4 @@
   "devDependencies": {
     "c8": "^10.1.2"
   }
-}
+}

package/test/star-nag.test.js

@@ -89,13 +89,13 @@ async function main() {
   console.log('\n--- 假 result.php 驱动真实 CLI ---');
   const cases = [
     ['done + starred', { state: 'done', result: { starred: true, login: 'octocat', repo: 'vexify-org/JSQL-neo' } },
-      'Confirmed: octocat has starred vexify-org/JSQL-neo. Thanks!'],
+      'Confirmed: octocat starred vexify-org/JSQL-neo'],
     ['done + 未 star', { state: 'done', result: { starred: false, login: 'octocat', repo: 'vexify-org/JSQL-neo' } },
-      'Authorization finished, but octocat has not starred vexify-org/JSQL-neo yet.'],
+      'Not starred yet 还没 star: octocat has not starred vexify-org/JSQL-neo'],
     ['denied', { state: 'denied', result: { error: 'access_denied' } },
-      'Authorization was declined: access_denied'],
+      'Authorization declined 被拒绝: access_denied'],
     ['error（code 过期/复用）', { state: 'error', result: { error: 'The code passed is incorrect or expired.' } },
-      'Authorization failed: The code passed is incorrect or expired.'],
+      'Authorization failed 失败: The code passed is incorrect or expired.'],
   ];
   for (const [name, resp, expect] of cases) {
     scenario = resp; pollsLeft = 0; after = null;
@@ -111,8 +111,8 @@ async function main() {
     pollsLeft = 2;
     after = { state: 'done', result: { starred: true, login: 'octocat', repo: 'vexify-org/JSQL-neo' } };
     const out = await runCli(path.join(mrDir, 'slow'));
-    ok('等完 pending 后正确确认', out.includes('Confirmed: octocat has starred vexify-org/JSQL-neo. Thanks!'), out.trim().slice(0, 200));
-    ok('全程没有误判成完成', !/Authorization finished/.test(out), out.trim().slice(0, 200));
+    ok('等完 pending 后正确确认', out.includes('Confirmed: octocat starred vexify-org/JSQL-neo'), out.trim().slice(0, 200));
+    ok('全程没有误判成完成', !/Not starred yet/.test(out), out.trim().slice(0, 200));
     ok('全程没有 undefined', !/undefined/.test(out), out.trim().slice(0, 200));
   }