quiverdb 0.9.11 → 0.9.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quiverdb",
-  "version": "0.9.11",
+  "version": "0.9.13",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -31,4 +31,4 @@
     "@biomejs/biome": "^2.4.6",
     "@types/bun": "latest"
   }
-}
+}

package/src/database.ts

@@ -88,9 +88,9 @@ export class Database {
   declare deleteElement: (collection: string, id: number) => void;
 
   // --- Reads (implemented in read.ts) ---
-  declare readScalarIntegers: (collection: string, attribute: string) => number[];
-  declare readScalarFloats: (collection: string, attribute: string) => number[];
-  declare readScalarStrings: (collection: string, attribute: string) => string[];
+  declare readScalarIntegers: (collection: string, attribute: string) => (number | null)[];
+  declare readScalarFloats: (collection: string, attribute: string) => (number | null)[];
+  declare readScalarStrings: (collection: string, attribute: string) => (string | null)[];
   declare readScalarIntegerById: (
     collection: string,
     attribute: string,

package/src/loader.ts

@@ -62,8 +62,8 @@ const crudSymbols = {
 } as const;
 
 const readSymbols = {
-  quiver_database_read_scalar_integers: { args: [P, BUF, BUF, P, P], returns: I32 },
-  quiver_database_read_scalar_floats: { args: [P, BUF, BUF, P, P], returns: I32 },
+  quiver_database_read_scalar_integers: { args: [P, BUF, BUF, P, P, P], returns: I32 },
+  quiver_database_read_scalar_floats: { args: [P, BUF, BUF, P, P, P], returns: I32 },
   quiver_database_read_scalar_strings: { args: [P, BUF, BUF, P, P], returns: I32 },
   quiver_database_read_scalar_integer_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
   quiver_database_read_scalar_float_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
@@ -123,7 +123,10 @@ const timeSeriesSymbols = {
     returns: I32,
   },
   quiver_database_read_time_series_row: { args: [P, BUF, BUF, BUF, BUF, P, P, P], returns: I32 },
-  quiver_database_upsert_time_series_row: { args: [P, BUF, BUF, I64, P, P, P, USIZE], returns: I32 },
+  quiver_database_upsert_time_series_row: {
+    args: [P, BUF, BUF, I64, P, P, P, USIZE],
+    returns: I32,
+  },
   quiver_database_update_time_series_group: {
     args: [P, BUF, BUF, I64, P, P, P, P, USIZE, USIZE],
     returns: I32,
@@ -144,6 +147,7 @@ const csvSymbols = {
 const freeSymbols = {
   quiver_database_free_integer_array: { args: [P], returns: I32 },
   quiver_database_free_float_array: { args: [P], returns: I32 },
+  quiver_database_free_mask: { args: [P], returns: I32 },
   quiver_database_free_string_array: { args: [P, USIZE], returns: I32 },
   quiver_database_free_string: { args: [P], returns: I32 },
   quiver_database_free_integer_vectors: { args: [P, P, USIZE], returns: I32 },

package/src/lua-runner.ts

@@ -6,11 +6,9 @@ import { getSymbols } from "./loader.ts";
 
 export class LuaRunner {
   private _ptr: NativePointer;
-  private _db: Database;
   private _closed = false;
 
   constructor(db: Database) {
-    this._db = db;
     const lib = getSymbols();
     const outRunner = allocPtrOut();
     check(lib.quiver_lua_runner_new(db._handle, outRunner.buf));

package/src/read.ts

@@ -1,3 +1,4 @@
+import { CString, type Pointer, toArrayBuffer } from "bun:ffi";
 import { Database } from "./database.ts";
 import { check } from "./errors.ts";
 import {
@@ -21,11 +22,12 @@ Database.prototype.readScalarIntegers = function (
   this: Database,
   collection: string,
   attribute: string,
-): number[] {
+): (number | null)[] {
   const lib = getSymbols();
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
   const outValues = allocPtrOut();
+  const outMask = allocPtrOut();
   const outCount = allocUint64Out();
   check(
     lib.quiver_database_read_scalar_integers(
@@ -33,14 +35,20 @@ Database.prototype.readScalarIntegers = function (
       collBuf.buf,
       attrBuf.buf,
       outValues.buf,
+      outMask.buf,
       outCount.buf,
     ),
   );
   const count = readUint64Out(outCount);
   if (count === 0) return [];
   const arrPtr = readPtrOut(outValues);
-  const result = decodeInt64Array(arrPtr, count);
+  const maskPtr = readPtrOut(outMask);
+  const vals = decodeInt64Array(arrPtr, count);
+  // mask[i] === 0 means SQL NULL; gate to null (never Number(placeholder)).
+  const mask = new Uint8Array(toArrayBuffer(maskPtr as Pointer, 0, count));
+  const result = vals.map((v, i) => (mask[i] ? v : null));
   lib.quiver_database_free_integer_array(arrPtr);
+  lib.quiver_database_free_mask(maskPtr);
   return result;
 };
 
@@ -48,11 +56,12 @@ Database.prototype.readScalarFloats = function (
   this: Database,
   collection: string,
   attribute: string,
-): number[] {
+): (number | null)[] {
   const lib = getSymbols();
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
   const outValues = allocPtrOut();
+  const outMask = allocPtrOut();
   const outCount = allocUint64Out();
   check(
     lib.quiver_database_read_scalar_floats(
@@ -60,14 +69,19 @@ Database.prototype.readScalarFloats = function (
       collBuf.buf,
       attrBuf.buf,
       outValues.buf,
+      outMask.buf,
       outCount.buf,
     ),
   );
   const count = readUint64Out(outCount);
   if (count === 0) return [];
   const arrPtr = readPtrOut(outValues);
-  const result = decodeFloat64Array(arrPtr, count);
+  const maskPtr = readPtrOut(outMask);
+  const vals = decodeFloat64Array(arrPtr, count);
+  const mask = new Uint8Array(toArrayBuffer(maskPtr as Pointer, 0, count));
+  const result = vals.map((v, i) => (mask[i] ? v : null));
   lib.quiver_database_free_float_array(arrPtr);
+  lib.quiver_database_free_mask(maskPtr);
   return result;
 };
 
@@ -75,7 +89,7 @@ Database.prototype.readScalarStrings = function (
   this: Database,
   collection: string,
   attribute: string,
-): string[] {
+): (string | null)[] {
   const lib = getSymbols();
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
@@ -93,7 +107,11 @@ Database.prototype.readScalarStrings = function (
   const count = readUint64Out(outCount);
   if (count === 0) return [];
   const arrPtr = readPtrOut(outValues);
-  const result = decodeStringArray(arrPtr, count);
+  // A NULL string is a NULL char* entry: decode the (null-guarded) pointer array and map
+  // NULL -> null (decodeStringArray would construct "" from a NULL pointer instead).
+  const result = decodePtrArray(arrPtr, count).map((p) =>
+    p === null ? null : new CString(p).toString(),
+  );
   lib.quiver_database_free_string_array(arrPtr, BigInt(count));
   return result;
 };