jsql-neo 5.5.0 → 6.0.0

package/package.json

@@ -1,87 +1,87 @@
-{
-  "name": "jsql-neo",
-  "version": "5.5.0",
-  "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./index.d.ts",
-      "browser": "./wasm/browser.mjs",
-      "import": "./index.js",
-      "require": "./index.js",
-      "default": "./index.js"
-    },
-    "./cli": "./bin/jsql",
-    "./mysql2": "./lib/mysql_compat.js",
-    "./mysql": "./lib/mysql_compat.js",
-    "./wasm/browser.mjs": {
-      "types": "./wasm/browser.d.ts",
-      "default": "./wasm/browser.mjs"
-    },
-    "./wasm/browser.d.ts": "./wasm/browser.d.ts",
-    "./wasm/*": "./wasm/*",
-    "./lib/*.js": "./lib/*.js",
-    "./lib/*": "./lib/*.js",
-    "./package.json": "./package.json",
-    "./sqlite": "./lib/sqlite_compat.js"
-  },
-  "bin": {
-    "jsql": "./bin/jsql"
-  },
-  "files": [
-    "index.js",
-    "index.d.ts",
-    "lib/",
-    "bin/",
-    "wasm/",
-    "native/",
-    "nativesrc/",
-    "!nativesrc/**/target/",
-    "postinstall.js",
-    "test/",
-    "README.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "postinstall": "node postinstall.js",
-    "test": "node test/smoke.js && node test/sql-parser.test.js",
-    "test:parser": "node test/sql-parser.test.js",
-    "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/native.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",
-    "test:coverage": "c8 --all --include='lib/**' --exclude='lib/mysql_server.js' --exclude='lib/native_client.js' --exclude='lib/wasm_client.js' --exclude='lib/mysql_compat.js' --exclude='lib/nedb_compat.js' --exclude='lib/plugin.js' --reporter=text --reporter=lcov node test/coverage.js",
-    "test:orms": "node examples/orms/run-all.js"
-  },
-  "keywords": [
-    "database",
-    "sql",
-    "embedded",
-    "rust",
-    "wasm",
-    "json",
-    "javascript",
-    "jsql",
-    "nosql",
-    "rest-api",
-    "high-performance"
-  ],
-  "author": "Vexify",
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/vexify-org/JSQL-neo.git"
-  },
-  "bugs": "https://github.com/vexify-org/JSQL-neo/issues",
-  "homepage": "https://github.com/vexify-org/JSQL-neo#readme",
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "dependencies": {
-    "@vexify-org/yaggs": "^8.1.0"
-  },
-  "devDependencies": {
-    "c8": "^10.1.2"
-  }
-}
+{
+  "name": "jsql-neo",
+  "version": "6.0.0",
+  "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "browser": "./wasm/browser.mjs",
+      "import": "./index.js",
+      "require": "./index.js",
+      "default": "./index.js"
+    },
+    "./cli": "./bin/jsql",
+    "./mysql2": "./lib/mysql_compat.js",
+    "./mysql": "./lib/mysql_compat.js",
+    "./wasm/browser.mjs": {
+      "types": "./wasm/browser.d.ts",
+      "default": "./wasm/browser.mjs"
+    },
+    "./wasm/browser.d.ts": "./wasm/browser.d.ts",
+    "./wasm/*": "./wasm/*",
+    "./lib/*.js": "./lib/*.js",
+    "./lib/*": "./lib/*.js",
+    "./package.json": "./package.json",
+    "./sqlite": "./lib/sqlite_compat.js"
+  },
+  "bin": {
+    "jsql": "./bin/jsql"
+  },
+  "files": [
+    "index.js",
+    "index.d.ts",
+    "lib/",
+    "bin/",
+    "wasm/",
+    "native/",
+    "nativesrc/",
+    "!nativesrc/**/target/",
+    "postinstall.js",
+    "test/",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "postinstall": "node postinstall.js",
+    "test": "node test/smoke.js && node test/sql-parser.test.js && node test/query-opt.test.js",
+    "test:parser": "node test/sql-parser.test.js",
+    "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/native.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",
+    "test:coverage": "c8 --all --include='lib/**' --exclude='lib/mysql_server.js' --exclude='lib/native_client.js' --exclude='lib/wasm_client.js' --exclude='lib/mysql_compat.js' --exclude='lib/nedb_compat.js' --exclude='lib/plugin.js' --reporter=text --reporter=lcov node test/coverage.js",
+    "test:orms": "node examples/orms/run-all.js"
+  },
+  "keywords": [
+    "database",
+    "sql",
+    "embedded",
+    "rust",
+    "wasm",
+    "json",
+    "javascript",
+    "jsql",
+    "nosql",
+    "rest-api",
+    "high-performance"
+  ],
+  "author": "Vexify",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vexify-org/JSQL-neo.git"
+  },
+  "bugs": "https://github.com/vexify-org/JSQL-neo/issues",
+  "homepage": "https://github.com/vexify-org/JSQL-neo#readme",
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "dependencies": {
+    "@vexify-org/yaggs": "^8.1.0"
+  },
+  "devDependencies": {
+    "c8": "^10.1.2"
+  }
+}

package/postinstall.js

@@ -1,159 +1,159 @@
-const { execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const http = require('http');
-const https = require('https');
-
-const ROOT = __dirname;
-const pkg = JSON.parse(fs.readFileSync(path.join(ROOT, 'package.json'), 'utf8'));
-
-// Server CLI binary (bin/jsql-neo-server)
-const BIN_NAME = process.platform === 'win32' ? 'jsql-neo-server.exe' : 'jsql-neo-server';
-const BP = path.join(ROOT, 'bin', BIN_NAME);
-
-// Native N-API module (native/jsql-neo-native.node)
-const NATIVE_PATH = path.join(ROOT, 'native', 'jsql-neo-native.node');
-
-// GitHub 加速代理前缀；把原始 github 链接直接拼在后面即可
-const GHPROXY = 'https://gh-proxy.com/';
-const TAG = `v${pkg.version}`;
-
-// 从 repository 字段提取 owner/repo，例如 vexify-org/JSQL-neo
-const REPO = (pkg.repository && pkg.repository.url)
-  ? pkg.repository.url.replace(/\.git$/, '').replace(/^.*github\.com\//i, '')
-  : 'vexify-org/JSQL-neo';
-
-// 与 .github/workflows/build-native.yml 中发布的资产命名保持一致
-function nativeTargetSuffix(platform = process.platform, arch = process.arch) {
-  const p = platform === 'win32' ? 'win32' : platform === 'darwin' ? 'darwin' : 'linux';
-  const a = arch === 'x64' ? 'x64' : arch === 'arm64' ? 'arm64' : arch;
-  if (p === 'linux') return `${p}-${a}-gnu`;
-  if (p === 'darwin') return `${p}-${a}`;
-  return `${p}-${a}-msvc`;
-}
-
-function download(url, dest) {
-  return new Promise((resolve, reject) => {
-    const mod = url.startsWith('https:') ? https : http;
-    const req = mod.get(url, (res) => {
-      if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-        res.resume();
-        download(res.headers.location, dest).then(resolve, reject);
-        return;
-      }
-      if (res.statusCode !== 200) {
-        res.resume();
-        reject(new Error(`HTTP ${res.statusCode} for ${url}`));
-        return;
-      }
-      fs.mkdirSync(path.dirname(dest), { recursive: true });
-      const ws = fs.createWriteStream(dest);
-      ws.on('error', reject);
-      res.pipe(ws);
-      res.on('end', () => ws.end(() => resolve()));
-    });
-    req.on('error', reject);
-  });
-}
-
-function buildNativeFromSource() {
-  const crate = path.join(ROOT, 'nativesrc', 'jsql-neo-native');
-  if (!fs.existsSync(path.join(crate, 'Cargo.toml'))) return;
-  console.log('[jsql-neo] building native module from source...');
-  try {
-    execSync('cargo build --release', { cwd: crate, stdio: 'inherit' });
-    const rel = path.join(crate, 'target', 'release');
-    const src = process.platform === 'win32'
-      ? path.join(rel, 'jsql_neo_native.dll')
-      : process.platform === 'darwin'
-        ? path.join(rel, 'libjsql_neo_native.dylib')
-        : path.join(rel, 'libjsql_neo_native.so');
-    if (fs.existsSync(src)) {
-      fs.mkdirSync(path.dirname(NATIVE_PATH), { recursive: true });
-      fs.copyFileSync(src, NATIVE_PATH);
-      fs.chmodSync(NATIVE_PATH, 0o755);
-      console.log(`[jsql-neo] native module built: native/jsql-neo-native.node`);
-    }
-  } catch (e) {
-    console.warn('[jsql-neo] native build failed:', e.message);
-  }
-}
-
-// 尝试加载 native 模块；能成功 require 才算「可用」，否则视为不可用
-function tryLoadNative() {
-  if (!fs.existsSync(NATIVE_PATH)) return false;
-  try {
-    require(NATIVE_PATH);
-    fs.chmodSync(NATIVE_PATH, 0o755);
-    return true;
-  } catch (e) {
-    console.warn(`[jsql-neo] existing native module cannot be loaded (${e.code || e.message}), will re-acquire.`);
-    try { fs.unlinkSync(NATIVE_PATH); } catch (_) { /* ignore */ }
-    return false;
-  }
-}
-
-async function downloadAndVerify() {
-  const asset = `jsql-neo-native.${nativeTargetSuffix()}.node`;
-  const url = `${GHPROXY}https://github.com/${REPO}/releases/download/${TAG}/${asset}`;
-  console.log(`[jsql-neo] downloading native module: ${url}`);
-  try {
-    await download(url, NATIVE_PATH);
-    if (!tryLoadNative()) {
-      console.warn('[jsql-neo] downloaded module also invalid, removed.');
-      return false;
-    }
-    console.log('[jsql-neo] native module downloaded: native/jsql-neo-native.node');
-    return true;
-  } catch (e) {
-    console.warn('[jsql-neo] download failed, falling back to source build:', e.message);
-    return false;
-  }
-}
-
-async function ensureNativeNode() {
-  // 已存在且能加载 → 直接用；否则删掉并从 gh-proxy.com 下载，找不到才回退源码编译
-  if (tryLoadNative()) {
-    console.log('[jsql-neo] native module ready: native/jsql-neo-native.node');
-    return;
-  }
-  if (await downloadAndVerify()) return;
-  buildNativeFromSource();
-}
-
-function ensureServerBinary() {
-  if (fs.existsSync(BP)) {
-    fs.chmodSync(BP, 0o755);
-    console.log(`[jsql-neo] binary ready: ${BP}`);
-    return;
-  }
-
-  // Build from source
-  const serverDir = path.join(ROOT, '..', 'jsql-neo-server');
-  if (fs.existsSync(path.join(serverDir, 'Cargo.toml'))) {
-    console.log('[jsql-neo] building Rust server from source...');
-    try {
-      execSync('cargo build --release', { cwd: serverDir, stdio: 'inherit' });
-      const src = path.join(serverDir, 'target', 'release', BIN_NAME);
-      if (fs.existsSync(src)) {
-        fs.mkdirSync(path.join(ROOT, 'bin'), { recursive: true });
-        fs.copyFileSync(src, BP);
-        fs.chmodSync(BP, 0o755);
-        console.log(`[jsql-neo] binary built: ${BP}`);
-        return;
-      }
-    } catch (e) {
-      console.warn('[jsql-neo] cargo build failed:', e.message);
-    }
-  }
-
-  console.warn(`[jsql-neo] server binary not found at ${BP}`);
-  console.warn('[jsql-neo] install Rust from https://rustup.rs and run: npm run build');
-}
-
-async function main() {
-  await ensureNativeNode();
-  ensureServerBinary();
-}
-
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const http = require('http');
+const https = require('https');
+
+const ROOT = __dirname;
+const pkg = JSON.parse(fs.readFileSync(path.join(ROOT, 'package.json'), 'utf8'));
+
+// Server CLI binary (bin/jsql-neo-server)
+const BIN_NAME = process.platform === 'win32' ? 'jsql-neo-server.exe' : 'jsql-neo-server';
+const BP = path.join(ROOT, 'bin', BIN_NAME);
+
+// Native N-API module (native/jsql-neo-native.node)
+const NATIVE_PATH = path.join(ROOT, 'native', 'jsql-neo-native.node');
+
+// GitHub 加速代理前缀；把原始 github 链接直接拼在后面即可
+const GHPROXY = 'https://gh-proxy.com/';
+const TAG = `v${pkg.version}`;
+
+// 从 repository 字段提取 owner/repo，例如 vexify-org/JSQL-neo
+const REPO = (pkg.repository && pkg.repository.url)
+  ? pkg.repository.url.replace(/\.git$/, '').replace(/^.*github\.com\//i, '')
+  : 'vexify-org/JSQL-neo';
+
+// 与 .github/workflows/build-native.yml 中发布的资产命名保持一致
+function nativeTargetSuffix(platform = process.platform, arch = process.arch) {
+  const p = platform === 'win32' ? 'win32' : platform === 'darwin' ? 'darwin' : 'linux';
+  const a = arch === 'x64' ? 'x64' : arch === 'arm64' ? 'arm64' : arch;
+  if (p === 'linux') return `${p}-${a}-gnu`;
+  if (p === 'darwin') return `${p}-${a}`;
+  return `${p}-${a}-msvc`;
+}
+
+function download(url, dest) {
+  return new Promise((resolve, reject) => {
+    const mod = url.startsWith('https:') ? https : http;
+    const req = mod.get(url, (res) => {
+      if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+        res.resume();
+        download(res.headers.location, dest).then(resolve, reject);
+        return;
+      }
+      if (res.statusCode !== 200) {
+        res.resume();
+        reject(new Error(`HTTP ${res.statusCode} for ${url}`));
+        return;
+      }
+      fs.mkdirSync(path.dirname(dest), { recursive: true });
+      const ws = fs.createWriteStream(dest);
+      ws.on('error', reject);
+      res.pipe(ws);
+      res.on('end', () => ws.end(() => resolve()));
+    });
+    req.on('error', reject);
+  });
+}
+
+function buildNativeFromSource() {
+  const crate = path.join(ROOT, 'nativesrc', 'jsql-neo-native');
+  if (!fs.existsSync(path.join(crate, 'Cargo.toml'))) return;
+  console.log('[jsql-neo] building native module from source...');
+  try {
+    execSync('cargo build --release', { cwd: crate, stdio: 'inherit' });
+    const rel = path.join(crate, 'target', 'release');
+    const src = process.platform === 'win32'
+      ? path.join(rel, 'jsql_neo_native.dll')
+      : process.platform === 'darwin'
+        ? path.join(rel, 'libjsql_neo_native.dylib')
+        : path.join(rel, 'libjsql_neo_native.so');
+    if (fs.existsSync(src)) {
+      fs.mkdirSync(path.dirname(NATIVE_PATH), { recursive: true });
+      fs.copyFileSync(src, NATIVE_PATH);
+      fs.chmodSync(NATIVE_PATH, 0o755);
+      console.log(`[jsql-neo] native module built: native/jsql-neo-native.node`);
+    }
+  } catch (e) {
+    console.warn('[jsql-neo] native build failed:', e.message);
+  }
+}
+
+// 尝试加载 native 模块；能成功 require 才算「可用」，否则视为不可用
+function tryLoadNative() {
+  if (!fs.existsSync(NATIVE_PATH)) return false;
+  try {
+    require(NATIVE_PATH);
+    fs.chmodSync(NATIVE_PATH, 0o755);
+    return true;
+  } catch (e) {
+    console.warn(`[jsql-neo] existing native module cannot be loaded (${e.code || e.message}), will re-acquire.`);
+    try { fs.unlinkSync(NATIVE_PATH); } catch (_) { /* ignore */ }
+    return false;
+  }
+}
+
+async function downloadAndVerify() {
+  const asset = `jsql-neo-native.${nativeTargetSuffix()}.node`;
+  const url = `${GHPROXY}https://github.com/${REPO}/releases/download/${TAG}/${asset}`;
+  console.log(`[jsql-neo] downloading native module: ${url}`);
+  try {
+    await download(url, NATIVE_PATH);
+    if (!tryLoadNative()) {
+      console.warn('[jsql-neo] downloaded module also invalid, removed.');
+      return false;
+    }
+    console.log('[jsql-neo] native module downloaded: native/jsql-neo-native.node');
+    return true;
+  } catch (e) {
+    console.warn('[jsql-neo] download failed, falling back to source build:', e.message);
+    return false;
+  }
+}
+
+async function ensureNativeNode() {
+  // 已存在且能加载 → 直接用；否则删掉并从 gh-proxy.com 下载，找不到才回退源码编译
+  if (tryLoadNative()) {
+    console.log('[jsql-neo] native module ready: native/jsql-neo-native.node');
+    return;
+  }
+  if (await downloadAndVerify()) return;
+  buildNativeFromSource();
+}
+
+function ensureServerBinary() {
+  if (fs.existsSync(BP)) {
+    fs.chmodSync(BP, 0o755);
+    console.log(`[jsql-neo] binary ready: ${BP}`);
+    return;
+  }
+
+  // Build from source
+  const serverDir = path.join(ROOT, '..', 'jsql-neo-server');
+  if (fs.existsSync(path.join(serverDir, 'Cargo.toml'))) {
+    console.log('[jsql-neo] building Rust server from source...');
+    try {
+      execSync('cargo build --release', { cwd: serverDir, stdio: 'inherit' });
+      const src = path.join(serverDir, 'target', 'release', BIN_NAME);
+      if (fs.existsSync(src)) {
+        fs.mkdirSync(path.join(ROOT, 'bin'), { recursive: true });
+        fs.copyFileSync(src, BP);
+        fs.chmodSync(BP, 0o755);
+        console.log(`[jsql-neo] binary built: ${BP}`);
+        return;
+      }
+    } catch (e) {
+      console.warn('[jsql-neo] cargo build failed:', e.message);
+    }
+  }
+
+  console.warn(`[jsql-neo] server binary not found at ${BP}`);
+  console.warn('[jsql-neo] install Rust from https://rustup.rs and run: npm run build');
+}
+
+async function main() {
+  await ensureNativeNode();
+  ensureServerBinary();
+}
+
 main();