jsql-neo 6.5.25 → 6.5.28

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.25** — stable release · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
+> **v6.5.28** — 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)
@@ -171,6 +171,31 @@ await db.start();
 
 ---
 
+## Query results
+
+`db.query()` / `executeSQL()` return **one result in three shapes**:
+
+```js
+const r = await db.query('SELECT city, COUNT(*) AS c FROM users GROUP BY city');
+r.columns   // ['city', 'c']
+r.rows      // [['LA', 1], ['NY', 2]]
+r.raw       // [{ city: 'LA', c: 1 }, { city: 'NY', c: 2 }]
+```
+
+`raw` is the object form of `rows`: its keys are exactly `columns`, and that
+includes computed, aggregate and scalar-subquery columns. It is **not** the
+pre-projection source row. For SELECT results `raw.length === rows.length`
+always holds; non-SELECT statements may omit `raw`.
+
+To check which native addon this installation is actually using:
+
+- `jsql native status` — tag/version match (`0` = OK, `1` = mismatch or unverified)
+- `jsql native verify` — re-hashes the `.node` on disk against the checksum recorded
+  at install time, so a swapped or corrupted binary is caught too. `--json` prints
+  a structured result for CI. States: `OK` / `MISMATCH` / `CORRUPT` / `MISSING` /
+  `UNVERIFIED` / `UNREADABLE`.
+- `jsql native refresh` — re-fetches a checksum-verified addon
+
 ## ✨ XQL 集成
 
 用 [XQL](https://github.com/vexify-org/XQL) 查询 JSQL 表：把 SQL 直接接到文档上，

package/bin/jsql

@@ -531,6 +531,38 @@ const cli = (yaggs || require('./yaggs-fallback').buildYaggsFallback(_pkg))({
   .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('native', 'Inspect or refresh the Rust native addon', (sub) => {
+    sub.option('json', { type: 'boolean', description: 'Machine-readable output (verify only)' });
+  }, async (argv) => {
+    const action = argv._[0] || 'status';
+    const pi = require('../postinstall.js');
+    if (action === 'verify') {
+      // 内容级：重算 .node 的 SHA256 与安装记录比对，status 只看 tag 发现不了替换/损坏
+      const r = pi.verifyNative();
+      if (argv.json) {
+        console.log(JSON.stringify(r, null, 2));
+      } else {
+        console.log(`[jsql-neo] VERIFY : ${r.state}`);
+        console.log(`[jsql-neo] tag    : ${r.installedTag || 'unknown'}  (expect ${r.expectedTag})`);
+        console.log(`[jsql-neo] sha256 : ${r.actualSha256 || 'n/a'}`);
+        if (r.state !== 'OK') console.log('[jsql-neo] refresh with: jsql native refresh');
+      }
+      process.exitCode = r.state === 'OK' ? 0 : 1;
+      return;
+    }
+    if (action === 'status') {
+      // 0 = 当前 .node 与包版本匹配；1 = 错配 / 未记录（可直接当 CI 门禁）
+      process.exitCode = pi.nativeStatus();
+      return;
+    }
+    if (action === 'refresh') {
+      await pi.ensureNativeNode();
+      process.exitCode = pi.nativeStatus();
+      return;
+    }
+    console.error(`Unknown native action: ${action}. Usage: jsql native <status|refresh|verify>`);
+    process.exitCode = 1;
+  })
   .command('version', 'Show version', null, () => {
     console.log(require('../package.json').version);
   })

package/index.d.ts

@@ -272,9 +272,16 @@ declare namespace JSQLNeo {
     ok: boolean;
     type: string;
     table?: string | null;
+    /** 投影列名；rows[i][j] 与 columns[j] 一一对应。 */
     columns?: string[];
+    /** 投影后的二维数组形式。 */
     rows?: unknown[][];
-    raw?: unknown[];
+    /**
+     * 与 rows 指向**同一份结果**的对象形式：raw[i] 的键恰好是 columns，
+     * 值取自 rows[i]。聚合 / 计算列 / 标量子查询都包含在内（issue #43）。
+     * 非 SELECT 语句可能没有此字段。
+     */
+    raw?: Array<Record<string, unknown>>;
     affectedRows?: number;
     insertId?: number | null;
     ids?: unknown[];

package/index.js

@@ -1,5 +1,5 @@
 /**
- * JSQL-NEO v6.5.25 — Rust-Powered Embedded Database (WASM + HTTP)
+ * JSQL-NEO v6.5.28 — Rust-Powered Embedded Database (WASM + HTTP)
  *
  * @example
  * const jsql = require('jsql-neo');
@@ -153,6 +153,10 @@ module.exports = {
     SQL: sql,
     executeSQL: sql.executeSQL,
     parseSQL: sql.parseSQL,
+    // Issue #46：index.d.ts 早就声明了这三个顶层导出，index.js 却一直没给
+    applyParams: sql.applyParams,
+    escapeValue: sql.escapeValue,
+    escapeId: sql.escapeId,
     // AST 访问与改写（5.5.0+）
     AST: sql.AST,
     walk: sql.walk,

package/lib/database.js

@@ -1837,7 +1837,11 @@ class Database {
 
     _resolveId(table, id) {
         const pk = this._pkOf(table);
-        if (pk) return table._rows.find(r => r[pk] === id) || null;
+        if (pk) {
+            // Issue #44：主键查询值按列类型归一（'5' → 5），与索引/insert 保持一致
+            const key = typeof table._coerceQueryValue === 'function' ? table._coerceQueryValue(pk, id) : id;
+            return table._rows.find(r => r[pk] === key || r[pk] === id) || null;
+        }
         // 无主键表：id 是行对象（可能是 find() 返回的浅拷贝）时，用内容匹配代替引用比较。
         // 做法：逐行比对所有字段值是否相等；是数字时当 1-based 行号。
         if (id && typeof id === 'object') {

package/lib/mongo_server.js

@@ -430,9 +430,16 @@ class MongoServer {
         for (const d of docs) {
           const doc2 = { ...d };
           // 检查 _id 唯一性
+          // Issue #44：索引查找是严格相等的，空结果不能直接当「不存在」——
+          // 查询值与已存值的类型不一致时会漏判。这里再加一道按 schema 归一的直接扫描。
           if (doc2._id !== undefined) {
             const existing = await engine.find(coll, { _id: doc2._id });
             if (existing.length > 0) continue; // 跳过重复 _id
+            const table = typeof engine._ensureTable === 'function' ? engine._ensureTable(coll) : null;
+            if (table && Array.isArray(table._rows) && typeof table._coerceQueryValue === 'function') {
+              const idKey = table._coerceQueryValue('_id', doc2._id);
+              if (table._rows.some((r) => r && !r._deleted && r._id === idKey)) continue;
+            }
           }
           await engine.insert(coll, doc2);
           ids.push(doc2._id);
@@ -568,10 +575,13 @@ class MongoServer {
               for (const [k, dir] of sortKeys) {
                 const av = a[k]; const bv = b[k];
                 if (av === bv) continue;
-                if (av == null) return 1;
-                if (bv == null) return -1;
+                const desc = Number(dir) < 0;
+                // Issue #47：NULL 的位置随排序方向走（升序在前、降序在后），
+                // 与 MongoDB 一致；此前固定返回 1/-1，升序时 null 恒排最后。
+                if (av == null) return desc ? 1 : -1;
+                if (bv == null) return desc ? -1 : 1;
                 const cmp = av < bv ? -1 : 1;
-                return Number(dir) < 0 ? -cmp : cmp;
+                return desc ? -cmp : cmp;
               }
               return 0;
             });
@@ -643,8 +653,14 @@ class MongoServer {
                         const sum = grow.reduce((s, r) => s + (Number(r[field]) || 0), 0);
                         doc[k] = (doc[k] || 0) + sum;
                       } else if (v.$avg !== undefined) {
-                        const vals = grow.map(r => Number(r[field]) || 0);
-                        doc[k] = vals.reduce((a, b) => a + b, 0) / vals.length;
+                        // Issue #45：null/undefined 不计入分子的同时也不计入分母；
+                        // 全空组返回 null（MongoDB 语义），而不是 0。
+                        const vals = grow
+                          .map(r => r[field])
+                          .filter(x => x !== null && x !== undefined)
+                          .map(Number)
+                          .filter(x => !Number.isNaN(x));
+                        doc[k] = vals.length ? vals.reduce((a, b) => a + b, 0) / vals.length : null;
                       } else if (v.$min !== undefined) {
                         const vals = grow.map(r => r[field]).filter(v => v != null);
                         let best = null;

package/lib/mysql_compat.js

@@ -20,7 +20,7 @@ function toResultPacket(r, table, rowsAsArray) {
     const fields = columns.map(name => {
       let type = 253; // VAR_STRING
       const val = rawRows[0] ? rawRows[0][columns.indexOf(name)] : null;
-      if (typeof val === 'number') type = 8; // LONGLONG
+      if (typeof val === 'number') type = Number.isInteger(val) ? 8 : 5; // LONGLONG / DOUBLE（Issue #48：浮点列曾被误报为 8）
       else if (typeof val === 'boolean') type = 1; // TINY
       else if (val instanceof Date) type = 12; // DATETIME
       else if (Buffer.isBuffer(val)) type = 252; // BLOB

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'
@@ -8312,6 +8337,57 @@ function finalizeBigInts(value, seen) {
   return value;
 }
 
+/**
+ * SQLResult 专用的 BigInt 收尾 —— 保留语义，去掉 20 万次递归和 Set.add。
+ *
+ * 通用 finalizeBigInts 会对 rows（10 万个数组）+ raw（10 万个对象）逐个
+ * 深递归，每进一个对象就 seen.add 一次。node --prof 显示光
+ * SetPrototypeAdd 就占 18 ticks（约 14% JS），加上 finalizeBigInts 自身
+ * 共 ~23% JS ticks，整体 33% 时间花在 GC 上。
+ *
+ * 而结果的形状是规则的：rows 是二维数组，raw 是对象数组，元素绝大多数是
+ * number / string / null —— 根本不可能是 BigInt。用紧凑循环只做 typeof
+ * 检查，遇到嵌套对象才退回通用实现。语义与深递归等价，但不再给每个
+ * 标量行建 Set 条目。
+ */
+function finalizeResultBigInts(r) {
+  if (!r || typeof r !== 'object' || Array.isArray(r)) return finalizeBigInts(r);
+
+  if (Array.isArray(r.rows)) {
+    const rows = r.rows;
+    for (let i = 0; i < rows.length; i++) {
+      const row = rows[i];
+      if (!Array.isArray(row)) { rows[i] = finalizeBigInts(row); continue; }
+      for (let j = 0; j < row.length; j++) {
+        const v = row[j];
+        if (typeof v === 'bigint') row[j] = v.toString();
+        else if (v && typeof v === 'object') row[j] = finalizeBigInts(v);
+      }
+    }
+  }
+
+  if (Array.isArray(r.raw)) {
+    const raw = r.raw;
+    for (let i = 0; i < raw.length; i++) {
+      const obj = raw[i];
+      if (!obj || typeof obj !== 'object' || Array.isArray(obj)) continue;
+      for (const k of Object.keys(obj)) {
+        const v = obj[k];
+        if (typeof v === 'bigint') obj[k] = v.toString();
+        else if (v && typeof v === 'object') obj[k] = finalizeBigInts(v);
+      }
+    }
+  }
+
+  // 其余字段（columns / insertId / ids / columnTypes / 元数据）都很小，
+  // 走通用实现，保证不漏掉任何可能含 BigInt 的位置。
+  for (const k of Object.keys(r)) {
+    if (k === 'rows' || k === 'raw') continue;
+    r[k] = finalizeBigInts(r[k]);
+  }
+  return r;
+}
+
 async function executeSQL(engine, sql, paramsOrOpts, opts = {}) {
   // 参数守卫：engine 必须是引擎对象，sql 必须是字符串。误用时报清晰错误，
   // 而不是在后续像 `reading 'length'` 那样抛出令人费解的 TypeError。
@@ -8385,7 +8461,7 @@ async function executeSQL(engine, sql, paramsOrOpts, opts = {}) {
     let r = await executor.execute(stmt);
     const durationMs = Number(process.hrtime.bigint() - t0) / 1e6;
     r = buildResultEnvelope(stmt, r, Math.round(durationMs * 1000) / 1000);
-    r = finalizeBigInts(r);
+    r = finalizeResultBigInts(r);
     if (r && r.columns && r.columnTypes === undefined) {
       r.columnTypes = await inferColumnTypes(engine, stmt, r);
     }

package/lib/table.js

@@ -456,24 +456,25 @@ class Table {
 
     findById(id) {
         if (!this._primaryKey) throw createError('ER_PARSE_ERROR', 'Table has no primary key');
+        // Issue #44：字符串主键查询值先按列类型归一，否则索引静默未命中
+        const key = this._coerceQueryValue(this._primaryKey, id);
         // Hash 索引 O(1)
         if (this._pkIndex) {
-            const rowIndex = this._pkIndex.get(id);
+            const rowIndex = this._pkIndex.get(key);
             if (rowIndex !== undefined) {
                 const row = this._rows[rowIndex];
                 if (row && !row._deleted) return { ...row };
             }
-            return null;
-        }
-        if (this._btrees[this._primaryKey]) {
-            const indices = this._btrees[this._primaryKey].search(id);
+        } else if (this._btrees[this._primaryKey]) {
+            const indices = this._btrees[this._primaryKey].search(key);
             if (indices.length > 0) {
                 const row = this._rows[indices[0]];
                 if (row && !row._deleted) return { ...row };
             }
-            return null;
         }
-        return this.findOne({ [this._primaryKey]: id });
+        // 索引未命中不等于不存在：回落主键列全表匹配（类型差异 / 索引未覆盖的行）
+        const row = this._rows.find(r => r && !r._deleted && r[this._primaryKey] === key);
+        return row ? { ...row } : null;
     }
 
     findAll() {
@@ -533,24 +534,25 @@ class Table {
             updates = hook({ [this._primaryKey]: id }, { ...updates }) || updates;
         }
         updates = this._validateDataTypes(updates, true);
+        const pkKey = this._coerceQueryValue(this._primaryKey, id);
         let rowIndex;
         if (this._pkIndex) {
-            rowIndex = this._pkIndex.get(id);
-        } else {
-            if (this._btrees[this._primaryKey]) {
-                const indices = this._btrees[this._primaryKey].search(id);
-                rowIndex = indices.length > 0 ? indices[0] : undefined;
-            } else {
-                rowIndex = this._rows.findIndex(r => r[this._primaryKey] === id);
-                if (rowIndex === -1) rowIndex = undefined;
-            }
+            rowIndex = this._pkIndex.get(pkKey);
+        } else if (this._btrees[this._primaryKey]) {
+            const indices = this._btrees[this._primaryKey].search(pkKey);
+            rowIndex = indices.length > 0 ? indices[0] : undefined;
+        }
+        if (rowIndex === undefined) {
+            // Issue #44：索引未命中时回落全表匹配
+            const found = this._rows.findIndex(r => r && !r._deleted && r[this._primaryKey] === pkKey);
+            if (found !== -1) rowIndex = found;
         }
         if (rowIndex === undefined) return 0;
         const row = this._rows[rowIndex];
         if (row && row._deleted) return 0;
         // P1-3：主键被更新时传播到外键引用（CASCADE / SET NULL / RESTRICT）
-        if (updates[this._primaryKey] !== undefined && updates[this._primaryKey] !== id) {
-            this._propagatePKUpdate(id, updates[this._primaryKey]);
+        if (updates[this._primaryKey] !== undefined && updates[this._primaryKey] !== pkKey) {
+            this._propagatePKUpdate(pkKey, updates[this._primaryKey]);
         }
         const oldData = { ...row };
         const merged = { ...row, ...updates };
@@ -633,17 +635,19 @@ class Table {
 
     removeById(id) {
         if (!this._primaryKey) throw createError('ER_PARSE_ERROR', 'Table has no primary key');
+        // Issue #44：同 findById，先按列类型归一查询值
+        const pkKey = this._coerceQueryValue(this._primaryKey, id);
         let rowIndex;
         if (this._pkIndex) {
-            rowIndex = this._pkIndex.get(id);
-        } else {
-            if (this._btrees[this._primaryKey]) {
-                const indices = this._btrees[this._primaryKey].search(id);
-                rowIndex = indices.length > 0 ? indices[0] : undefined;
-            } else {
-                rowIndex = this._rows.findIndex(r => r[this._primaryKey] === id);
-                if (rowIndex === -1) rowIndex = undefined;
-            }
+            rowIndex = this._pkIndex.get(pkKey);
+        } else if (this._btrees[this._primaryKey]) {
+            const indices = this._btrees[this._primaryKey].search(pkKey);
+            rowIndex = indices.length > 0 ? indices[0] : undefined;
+        }
+        if (rowIndex === undefined) {
+            // Issue #44：索引未命中时回落全表匹配
+            const found = this._rows.findIndex(r => r && !r._deleted && r[this._primaryKey] === pkKey);
+            if (found !== -1) rowIndex = found;
         }
         if (rowIndex === undefined) return 0;
         const row = this._rows[rowIndex];
@@ -1037,32 +1041,129 @@ class Table {
         return end > 0 ? pattern.slice(0, end) : null;
     }
 
-    _applyFilterOptimized(rows, query) {
+    /**
+     * Issue #44：按列声明类型归一查询值。
+     *
+     * 索引（B-Tree / hash）命中用的是严格 ===，所以字符串 '5' 永远搜不到
+     * INT 列里的数字 5，表现为「静默返回空」；SQL 的 WHERE 路径早就在
+     * 解析阶段强转过了，文档 API 这条路径没有。
+     *
+     * 归一结果与 insert 时 _validateDataTypes 的产物一致（整数 → number/BigInt、
+     * 浮点 → number、布尔 → boolean、字符串列 → string）。无法归一的值原样返回。
+     */
+    _coerceQueryValue(field, value) {
+        const def = this._schema && this._schema[field];
+        if (!def || typeof def === 'string' || value === null || value === undefined) return value;
+        const t = String(def.type || '').toLowerCase();
+        if (t === 'integer' || t === 'int' || t === 'bigint') {
+            if (typeof value === 'bigint') {
+                return (value >= SAFE_INT_MIN && value <= SAFE_INT_MAX) ? Number(value) : value;
+            }
+            if (typeof value === 'number') return value;
+            if (typeof value === 'string' && DECIMAL_INT_RE.test(value.trim())) {
+                try { return normalizeInteger(value.trim(), t); } catch (_) { return value; }
+            }
+            return value;
+        }
+        if (t === 'float' || t === 'double' || t === 'number' || t === 'real') {
+            if (typeof value === 'number') return value;
+            if (typeof value === 'string' && value.trim() !== '' && !Number.isNaN(Number(value))) return Number(value);
+            return value;
+        }
+        if (t === 'boolean' || t === 'bool') {
+            if (typeof value === 'boolean') return value;
+            if (value === 0 || value === 1) return !!value;
+            if (typeof value === 'string' && ['true', 'false', '1', '0'].includes(value.toLowerCase())) {
+                return value.toLowerCase() === 'true' || value === '1';
+            }
+            return value;
+        }
+        if (t === 'string' || t === 'text' || t === 'varchar' || t === 'char') {
+            if (typeof value === 'string') return value;
+            if (typeof value === 'number' || typeof value === 'boolean' || value instanceof Date) return String(value);
+            return value;
+        }
+        return value;
+    }
+
+    /** 按 schema 归一 query 中的等值 / $eq / $in / 范围值（Issue #44）。 */
+    _coerceQuery(query) {
+        let out = null;
+        const set = (field, value) => {
+            if (!out) out = { ...query };
+            out[field] = value;
+        };
         for (const [field, condition] of Object.entries(query)) {
+            if (field === '$or' || field === '$and') {
+                if (Array.isArray(condition)) {
+                    const subs = condition.map(c => (c && typeof c === 'object' && !Array.isArray(c)) ? this._coerceQuery(c) : c);
+                    if (subs.some((s, i) => s !== condition[i])) set(field, subs);
+                }
+                continue;
+            }
+            if (field === '$not' || field[0] === '$' || !this._schema[field]) continue;
+            const next = this._coerceCondition(field, condition);
+            if (next !== condition) set(field, next);
+        }
+        return out || query;
+    }
+
+    _coerceCondition(field, condition) {
+        if (condition === null || typeof condition !== 'object' || condition instanceof RegExp) {
+            return this._coerceQueryValue(field, condition);
+        }
+        if (Array.isArray(condition)) {
+            const next = condition.map(v => this._coerceQueryValue(field, v));
+            return next.some((v, i) => v !== condition[i]) ? next : condition;
+        }
+        const keys = Object.keys(condition);
+        if (keys.length === 0 || !keys.every(k => k[0] === '$')) return condition;
+        let copy = null;
+        for (const [op, val] of Object.entries(condition)) {
+            let next = val;
+            if (op === '$eq' || op === '$ne' || op === '$gt' || op === '$gte' || op === '$lt' || op === '$lte') {
+                next = this._coerceQueryValue(field, val);
+            } else if ((op === '$in' || op === '$nin' || op === '$between') && Array.isArray(val)) {
+                next = val.map(v => this._coerceQueryValue(field, v));
+            }
+            if (next !== val) {
+                if (!copy) copy = { ...condition };
+                copy[op] = next;
+            }
+        }
+        return copy || condition;
+    }
+
+    _applyFilterOptimized(rows, query) {
+        // Issue #44：索引查找前先把查询值归一成列声明类型，避免 '5' 查不到 5
+        const q = this._coerceQuery(query);
+        for (const [field, condition] of Object.entries(q)) {
             if (field === '$or' || field === '$and' || field === '$not') continue;
             if (typeof condition !== 'object' || condition === null || Array.isArray(condition) || condition instanceof RegExp) {
                 if (this._btrees[field]) {
                     const indices = this._btrees[field].search(condition);
-                    if (indices.length === 0) return [];
-                    return this._applyFilter(this._rowsFromIndices(indices), query);
+                    // #44：索引未命中时回落全表过滤——索引键是严格相等的，
+                    // 类型/形态不一致的行会被漏掉，不能直接断言「没有数据」。
+                    if (indices.length === 0) return this._applyFilter(rows, q);
+                    return this._applyFilter(this._rowsFromIndices(indices), q);
                 }
                 if (this._indexes[field] && this._indexes[field].has(condition)) {
-                    return this._applyFilter(this._rowsFromIndices(this._indexes[field].get(condition)), query);
+                    return this._applyFilter(this._rowsFromIndices(this._indexes[field].get(condition)), q);
                 }
-                if (this._indexes[field]) return [];
+                if (this._indexes[field]) return this._applyFilter(rows, q);
             }
             if (condition && typeof condition === 'object') {
                 if (this._btrees[field] && Array.isArray(condition.$in) && condition.$in.length > 0) {
                     const indices = this._btrees[field].searchMany(condition.$in);
-                    if (indices.length === 0) return [];
-                    return this._applyFilter(this._rowsFromIndices(indices), query);
+                    if (indices.length === 0) return this._applyFilter(rows, q);
+                    return this._applyFilter(this._rowsFromIndices(indices), q);
                 }
                 if (this._btrees[field] && typeof condition.$like === 'string') {
                     const prefix = this._likePrefix(condition.$like);
                     if (prefix) {
                         const indices = this._btrees[field].prefix(prefix);
-                        if (indices.length === 0) return [];
-                        return this._applyFilter(this._rowsFromIndices(indices), query);
+                        if (indices.length === 0) return this._applyFilter(rows, q);
+                        return this._applyFilter(this._rowsFromIndices(indices), q);
                     }
                 }
                 if (this._btrees[field] && (condition.$gt !== undefined || condition.$gte !== undefined ||
@@ -1086,11 +1187,11 @@ class Table {
                     } else {
                         indices = exclusiveMax ? this._btrees[field].lessThan(max) : this._btrees[field].lessThanEqual(max);
                     }
-                    return this._applyFilter(this._rowsFromIndices(indices), query);
+                    return this._applyFilter(this._rowsFromIndices(indices), q);
                 }
             }
         }
-        return this._applyFilter(rows, query);
+        return this._applyFilter(rows, q);
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.5.25",
+  "version": "6.5.28",
   "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",
@@ -50,12 +50,12 @@
   "scripts": {
     "postinstall": "node postinstall.js",
     "build:native": "node scripts/build-native.js",
-    "test": "node test/smoke.js && node test/native.test.js && node test/json-functions.test.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/query-opt.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/dml-constraints.test.js && node test/star-nag.test.js && node test/plugin-xql.test.js && node test/bug-regression-2.test.js && node test/issue-34-35-36.test.js && node test/issue-g4.test.js && node test/issue-38.test.js && node test/issue-39.test.js && node test/issue-40.test.js",
+    "test": "node test/smoke.js && node test/result-raw.test.js && node test/native-install.test.js && node test/native-cli.test.js && node test/finalize-bigint.test.js && node test/native.test.js && node test/json-functions.test.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/query-opt.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/dml-constraints.test.js && node test/star-nag.test.js && node test/plugin-xql.test.js && node test/bug-regression-2.test.js && node test/issue-34-35-36.test.js && node test/issue-g4.test.js && node test/issue-38.test.js && node test/issue-39.test.js && node test/issue-40.test.js && node test/issue-44.test.js && node test/issue-45.test.js && node test/issue-46.test.js && node test/issue-47.test.js && node test/issue-48.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/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/issue-34-35-36.test.js && node test/sql-semantics.test.js && node test/extra-coverage.test.js && node test/filter-compile.test.js && node test/recursive-cte.test.js && node test/index-ddl.test.js && node test/mongo-group.test.js && node test/multiprotocol.test.js && node test/issue-g4.test.js && node test/issue-38.test.js && node test/issue-39.test.js && node test/issue-40.test.js",
+    "test:all": "node test/smoke.js && node test/result-raw.test.js && node test/native-install.test.js && node test/native-cli.test.js && node test/finalize-bigint.test.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/issue-34-35-36.test.js && node test/sql-semantics.test.js && node test/extra-coverage.test.js && node test/filter-compile.test.js && node test/recursive-cte.test.js && node test/index-ddl.test.js && node test/mongo-group.test.js && node test/multiprotocol.test.js && node test/issue-g4.test.js && node test/issue-38.test.js && node test/issue-39.test.js && node test/issue-40.test.js && node test/issue-44.test.js && node test/issue-45.test.js && node test/issue-46.test.js && node test/issue-47.test.js && node test/issue-48.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",