jsql-neo 6.5.24 → 6.5.26

package/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2026 Vexify
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

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.24** — stable release · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
+> **v6.5.26** — 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)
@@ -20,8 +20,8 @@
 
 ![JSQL-NEO terminal demo](doc/demo.gif)
 
-A real `jsql tui` session: joins, NULL semantics, exact 64-bit integers, and
-savepoint rollback.
+A real `jsql tui` session (v6.5.25): 64-bit integer precision, joins, NULL semantics,
+and savepoint rollback — all in one in-memory engine, rendered on a dark background.
 
 [MP4 version](doc/demo.mp4) · [asciinema recording](doc/demo.cast)
 
@@ -227,5 +227,6 @@ Apache-2.0 License — contributions welcome!
 - **Issues:** [Open an issue](https://github.com/vexify-org/JSQL-neo/issues)
 - **PRs:** Fork → branch → PR — thank you!
 - **Contributing:** [CONTRIBUTING.md](CONTRIBUTING.md)
+- **Dev container:** [jsql-neo/devbox](https://github.com/jsql-neo/devbox) — reproducible dev environment (Docker/devcontainer)
 - **Code of Conduct:** [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md)
 - **Security:** [SECURITY.md](SECURITY.md) — please report vulnerabilities privately

package/bin/jsql

@@ -13,7 +13,7 @@ const { nag, setStarred, readConfig } = require('../lib/star-nag');
 
 // star 提示：任何异常都不该挡住命令本身
 // version / --version 只回版本号、star 本身就是干这件事的 —— 这些不提示，其余全部提示
-const NO_NAG_ARGS = new Set(['version', '--version', '-v', 'star']);
+const NO_NAG_ARGS = new Set(['version', '--version', '-v', 'star', 'update', 'uninstall', 'remove']);
 if (!process.env.JSQL_NO_STAR_NAG && !NO_NAG_ARGS.has(process.argv[2])) {
   try { nag(); } catch (e) { /* 提示失败与命令无关 */ }
 }
@@ -34,6 +34,122 @@ const manager = new ModuleManager();
 const RAW_ARGV = process.argv.slice(2);
 
 const _pkg = require('../package.json');
+
+// ── update / uninstall 命令的实现 ─────────────────────────────
+
+function updateOptions(sub) {
+  sub.option('check', { type: 'boolean', description: 'Only check for a newer version' });
+  sub.option('force', { type: 'boolean', description: 'Reinstall even if already up to date' });
+  sub.option('dry-run', { type: 'boolean', description: 'Print the install command without running it' });
+  sub.option('json', { type: 'boolean', description: 'Output as JSON' });
+}
+
+async function updateHandler(argv) {
+  const updater = require('../lib/updater');
+  try {
+    const result = await updater.runUpdate({
+      checkOnly: argv.check === true,
+      force: argv.force === true,
+      dryRun: argv['dry-run'] === true,
+    });
+    if (argv.json) console.log(JSON.stringify(result, null, 2));
+    else console.log(updater.formatResult(result));
+    if (!result.ok) process.exitCode = 1;
+  } catch (e) {
+    console.error(`Error: ${e.message}`);
+    process.exitCode = 1;
+  }
+}
+
+function uninstallOptions(sub) {
+  sub.option('yes', { alias: ['y'], type: 'boolean', description: 'Skip the confirmation prompt' });
+  sub.option('keep-data', { type: 'boolean', description: 'Keep user data (plugins/config/cache)' });
+  sub.option('global', { type: 'boolean', description: 'Only uninstall the global npm package' });
+  sub.option('all', { type: 'boolean', description: 'Remove user data and the global npm package' });
+  sub.option('dry-run', { type: 'boolean', description: 'Show what would be removed' });
+  sub.option('json', { type: 'boolean', description: 'Output as JSON' });
+}
+
+async function uninstallHandler(argv) {
+  const un = require('../lib/uninstaller');
+  const fail = (e) => { console.error(`Error: ${e.message}`); process.exitCode = 1; };
+  try {
+    const yes = argv.yes === true || argv.y === true;
+    const dryRun = argv['dry-run'] === true;
+    const doGlobal = argv.global === true || argv.all === true;
+    const keepData = argv['keep-data'] === true || (argv.global === true && argv.all !== true);
+    const doData = !keepData;
+
+    if (!doData && !doGlobal) {
+      console.log('Nothing to do (data kept, global package not requested).');
+      return;
+    }
+
+    const targets = doData ? un.inspectTargets() : [];
+    const existing = targets.filter((t) => t.exists);
+    const globalInstalled = doGlobal ? un.isGloballyInstalled() : false;
+
+    if (!dryRun) {
+      if (doData && existing.length === 0 && !doGlobal) {
+        console.log('No jsql user data found. Nothing to remove.');
+        return;
+      }
+      if (!yes) {
+        if (!process.stdin.isTTY) {
+          console.error('Refusing to delete user data without confirmation. Re-run with --yes (or --dry-run to preview).');
+          process.exitCode = 1;
+          return;
+        }
+        if (doData && existing.length) {
+          console.log('The following user data will be removed:');
+          for (const t of existing) console.log(`  - ${t.path}  (${t.label})`);
+        }
+        if (doGlobal) console.log('Will also run: npm uninstall -g ' + un.PKG_NAME);
+        const ok = await un.confirm('Proceed? [y/N] ');
+        if (!ok) {
+          console.log('Aborted. No changes were made.');
+          return;
+        }
+      }
+    }
+
+    const dataResult = doData ? un.removeData({ dryRun }) : { removed: [], skipped: [], failed: [] };
+    let globalResult = null;
+    if (doGlobal) {
+      if (dryRun) globalResult = { ok: true, dryRun: true, command: `npm uninstall -g ${un.PKG_NAME}`, error: null };
+      else if (!globalInstalled) globalResult = { ok: true, skipped: true, command: `npm uninstall -g ${un.PKG_NAME}`, error: null };
+      else globalResult = un.uninstallGlobal(false);
+    }
+
+    if (argv.json) {
+      console.log(JSON.stringify({ data: dataResult, global: globalResult, dryRun }, null, 2));
+    } else {
+      const verb = dryRun ? 'Would remove' : 'Removed';
+      if (dataResult.removed.length) {
+        console.log(`${verb} ${dataResult.removed.length} path(s):`);
+        for (const p of dataResult.removed) console.log(`  - ${p}`);
+      } else if (doData) {
+        console.log('No jsql user data to remove.');
+      }
+      for (const f of dataResult.failed) console.error(`Failed to remove ${f.path}: ${f.error}`);
+      if (doGlobal) {
+        if (globalResult.dryRun) console.log(`Would run: ${globalResult.command}`);
+        else if (globalResult.skipped) console.log('Global jsql-neo package is not installed; skipped npm uninstall.');
+        else if (globalResult.ok) console.log('Uninstalled global package (npm uninstall -g jsql-neo).');
+        else console.error(`Global uninstall failed: ${globalResult.error}`);
+      }
+      if (!doGlobal) {
+        console.log('To remove the package itself, run: npm uninstall -g jsql-neo');
+      }
+    }
+    if (dataResult.failed.length || (globalResult && !globalResult.ok && !globalResult.skipped)) {
+      process.exitCode = 1;
+    }
+  } catch (e) {
+    fail(e);
+  }
+}
+
 const cli = (yaggs || require('./yaggs-fallback').buildYaggsFallback(_pkg))({
   pkg: _pkg,
 })
@@ -412,6 +528,9 @@ const cli = (yaggs || require('./yaggs-fallback').buildYaggsFallback(_pkg))({
       fail(e);
     }
   })
+  .command('update', 'Update jsql-neo to the latest version', updateOptions, updateHandler)
+  .command('uninstall', 'Remove jsql user data and/or the global package', uninstallOptions, uninstallHandler)
+  .command('remove', 'Alias of uninstall', uninstallOptions, uninstallHandler)
   .command('version', 'Show version', null, () => {
     console.log(require('../package.json').version);
   })

package/index.js

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

package/lib/sql.js

@@ -8263,6 +8263,31 @@ function buildResultEnvelope(stmt, r, durationMs) {
       : (typeof out.affectedRows === 'number' ? out.affectedRows : 0);
   }
   if (out.warnings === undefined) out.warnings = [];
+  /*
+   * result.raw 的原始契约：与 columns / rows 指向**同一份**结果，只是对象形式。
+   *
+   * 证据在 lib/prepared.js 的 get()：raw 缺失时它会用 columns + rows[0]
+   * 现场拼出等价对象 —— 说明 raw 本就该是「columns × rows 的 zip」。
+   *
+   * 但 executeSelect 的多个分支直接把「投影前的源行」塞进 raw
+   * （rows: mapped, raw: rows）。于是聚合 / 计算列 / 无 FROM 查询里，
+   * raw 变成 undefined、{_virtual:true}，或是缺了计算列的源行对象
+   * （GROUP BY 还会泄露内部 _group）。见 issue #43。
+   *
+   * 与其逐个分支改，不如在统一出口兑现契约：只要结果是 SELECT 且有
+   * columns + rows，就从投影后的元组重建对象形式。非元组行保持原样。
+   */
+  if (t === 'select' && Array.isArray(out.columns) && Array.isArray(out.rows)) {
+    const cols = out.columns;
+    out.raw = out.rows.map((row, i) => {
+      if (!Array.isArray(row)) {
+        return (Array.isArray(out.raw) && out.raw[i] !== undefined) ? out.raw[i] : row;
+      }
+      const obj = {};
+      for (let j = 0; j < cols.length; j++) obj[cols[j]] = row[j];
+      return obj;
+    });
+  }
   if (out.durationMs === undefined) out.durationMs = durationMs;
   if (out.message === undefined) {
     out.message = t === 'select'

package/lib/uninstaller.js

@@ -0,0 +1,216 @@
+'use strict';
+/**
+ * jsql uninstall —— 清理 jsql-neo 的用户级数据（可选卸载全局包）。
+ *
+ * 红线：
+ *   - 只允许删除用户 home 目录下、且属于 jsql 的固定路径；
+ *   - 拒绝删除 home 本身、文件系统根、当前工作目录、包目录（仓库）及其祖先/子目录；
+ *   - 绝不静默删除：非 TTY 且没有 --yes 时直接拒绝；TTY 下要求交互确认。
+ *
+ * 覆盖的数据位置（与代码里的实际路径保持一致）：
+ *   ~/.jsql/                 插件注册表安装目录（lib/database.js / src/cli/plugin.js）
+ *   ~/.config/jsql/          模块配置 mod.config（lib/mod.js）
+ *   ~/.jsqlmr                star 提示状态（lib/star-nag.js）
+ *   ~/.cache/jsql/           可能的缓存（存在才删）
+ * 支持 JSQL_PLUGIN_DIR / JSQL_MOD_CONFIG / JSQL_MR_PATH / JSQL_CACHE_DIR 覆盖。
+ */
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const readline = require('readline');
+const { execFileSync, spawnSync } = require('child_process');
+
+const PKG_NAME = 'jsql-neo';
+
+function packageDir() {
+  return path.resolve(__dirname, '..');
+}
+
+function npmCommand() {
+  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
+
+function isInside(child, parent) {
+  const rel = path.relative(path.resolve(parent), path.resolve(child));
+  return rel === '' || (!!rel && !rel.startsWith('..') && !path.isAbsolute(rel));
+}
+
+/**
+ * 列出所有清理目标。
+ * @param {{keepData?: boolean}} [opts]
+ * @returns {Array<{path: string, kind: 'dir'|'file', label: string}>}
+ */
+function collectTargets(opts = {}) {
+  if (opts.keepData) return [];
+  const home = os.homedir();
+  const targets = [];
+  const add = (p, kind, label) => {
+    if (!p) return;
+    const resolved = path.resolve(p);
+    if (targets.some((t) => t.path === resolved)) return;
+    targets.push({ path: resolved, kind, label });
+  };
+
+  add(process.env.JSQL_PLUGIN_DIR || path.join(home, '.jsql'), 'dir', '插件/用户数据 (~/.jsql)');
+
+  if (process.env.JSQL_MOD_CONFIG) {
+    add(process.env.JSQL_MOD_CONFIG, 'file', '模块配置 (JSQL_MOD_CONFIG)');
+  } else {
+    add(path.join(home, '.config', 'jsql'), 'dir', '模块配置 (~/.config/jsql)');
+  }
+
+  add(process.env.JSQL_MR_PATH || path.join(home, '.jsqlmr'), 'file', 'star 状态 (~/.jsqlmr)');
+  add(process.env.JSQL_CACHE_DIR || path.join(home, '.cache', 'jsql'), 'dir', '缓存 (~/.cache/jsql)');
+
+  return targets;
+}
+
+/**
+ * 安全校验：任何目标都必须落在 home 下、且不能碰到仓库/工作目录。
+ * @throws {Error} 校验不通过
+ */
+function assertSafeTarget(target) {
+  const resolved = path.resolve(target.path || target);
+  const home = path.resolve(os.homedir());
+  const pkg = packageDir();
+  const cwd = path.resolve(process.cwd());
+  const root = path.parse(resolved).root;
+
+  if (resolved === root) {
+    throw new Error(`refusing to remove filesystem root: ${resolved}`);
+  }
+  if (resolved === home) {
+    throw new Error(`refusing to remove home directory: ${resolved}`);
+  }
+  if (!isInside(resolved, home)) {
+    throw new Error(`refusing to remove path outside home (${home}): ${resolved}`);
+  }
+  if (isInside(pkg, resolved) || isInside(resolved, pkg)) {
+    throw new Error(`refusing to remove path overlapping the jsql-neo package: ${resolved}`);
+  }
+  // 目标不能是当前工作目录的祖先（否则会连工作目录一起删掉）
+  if (isInside(cwd, resolved)) {
+    throw new Error(`refusing to remove an ancestor of the current working directory: ${resolved}`);
+  }
+  // 目标必须是 jsql 命名的目录/文件，杜绝误删
+  const base = path.basename(resolved).toLowerCase();
+  const looksLikeJsql = base === '.jsqlmr' || base.startsWith('jsql') || base === '.jsql';
+  const parentIsConfig = path.basename(path.dirname(resolved)) === '.config'
+    || path.basename(path.dirname(resolved)) === '.cache';
+  if (!looksLikeJsql && !parentIsConfig) {
+    throw new Error(`refusing to remove unexpected path: ${resolved}`);
+  }
+  return resolved;
+}
+
+/**
+ * 检查目标是否存在，并给出可删除列表（不实际删除）。
+ * @param {{keepData?: boolean}} [opts]
+ */
+function inspectTargets(opts = {}) {
+  return collectTargets(opts).map((t) => {
+    let exists = false;
+    let isSymlink = false;
+    try {
+      const st = fs.lstatSync(t.path);
+      exists = true;
+      isSymlink = st.isSymbolicLink();
+    } catch (_) { /* 不存在 */ }
+    return { ...t, exists, isSymlink };
+  });
+}
+
+/**
+ * 删除数据目标。
+ * @param {{keepData?: boolean, dryRun?: boolean}} [opts]
+ * @returns {{removed: string[], skipped: string[], failed: Array<{path: string, error: string}>}}
+ */
+function removeData(opts = {}) {
+  const result = { removed: [], skipped: [], failed: [] };
+  const targets = inspectTargets(opts);
+  for (const t of targets) {
+    if (!t.exists) {
+      result.skipped.push(t.path);
+      continue;
+    }
+    let safe;
+    try {
+      safe = assertSafeTarget(t);
+    } catch (e) {
+      result.failed.push({ path: t.path, error: e.message });
+      continue;
+    }
+    if (opts.dryRun) {
+      result.removed.push(safe);
+      continue;
+    }
+    try {
+      // 符号链接只删链接本身，绝不跟随
+      if (t.isSymlink) fs.unlinkSync(safe);
+      else fs.rmSync(safe, { recursive: true, force: true });
+      result.removed.push(safe);
+    } catch (e) {
+      result.failed.push({ path: safe, error: e.message });
+    }
+  }
+  return result;
+}
+
+/** 卸载全局 npm 包；失败时返回错误信息而不是抛异常 */
+function uninstallGlobal(dryRun) {
+  const args = ['uninstall', '-g', PKG_NAME];
+  const command = `${npmCommand()} ${args.join(' ')}`;
+  if (dryRun) return { ok: true, dryRun: true, command, error: null };
+
+  const r = spawnSync(npmCommand(), args, {
+    stdio: 'inherit',
+    timeout: 5 * 60 * 1000,
+  });
+  if (r.error) return { ok: false, command, error: r.error.message };
+  if (r.status !== 0) return { ok: false, command, error: `npm uninstall exited with code ${r.status}` };
+  return { ok: true, command, error: null };
+}
+
+/** 全局安装是否还存在（用 npm root -g 判断） */
+function isGloballyInstalled() {
+  try {
+    const root = execFileSync(npmCommand(), ['root', '-g'], {
+      encoding: 'utf8',
+      timeout: 15000,
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+    if (!root) return false;
+    return fs.existsSync(path.join(root, PKG_NAME, 'package.json'));
+  } catch (_) {
+    return false;
+  }
+}
+
+/** 交互确认；非 TTY 返回 false（调用方应要求 --yes） */
+function confirm(question) {
+  return new Promise((resolve) => {
+    if (!process.stdin.isTTY) {
+      resolve(false);
+      return;
+    }
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(/^y(es)?$/i.test(String(answer || '').trim()));
+    });
+  });
+}
+
+module.exports = {
+  PKG_NAME,
+  collectTargets,
+  assertSafeTarget,
+  inspectTargets,
+  removeData,
+  uninstallGlobal,
+  isGloballyInstalled,
+  confirm,
+  packageDir,
+  isInside,
+};