@peerbit/indexer-sqlite3 1.0.6 → 1.0.7-a3e5123

package/dist/peerbit/sqlite3.mjs

@@ -26,9 +26,9 @@
 /*
  ** This code was built from sqlite3 version...
  **
- ** SQLITE_VERSION "3.46.0"
- ** SQLITE_VERSION_NUMBER 3046000
- ** SQLITE_SOURCE_ID "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e"
+ ** SQLITE_VERSION "3.46.1"
+ ** SQLITE_VERSION_NUMBER 3046001
+ ** SQLITE_SOURCE_ID "2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33"
  **
  ** Using the Emscripten SDK version 3.1.30.
  */
@@ -10689,11 +10689,11 @@ var sqlite3InitModule = (() => {
 
       globalThis.sqlite3ApiBootstrap.initializers.push(function (sqlite3) {
         sqlite3.version = {
-          libVersion: '3.46.0',
-          libVersionNumber: 3046000,
+          libVersion: '3.46.1',
+          libVersionNumber: 3046001,
           sourceId:
-            '2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e',
-          downloadVersion: 3460000,
+            '2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33',
+          downloadVersion: 3460100,
         };
       });
 
@@ -12644,6 +12644,7 @@ var sqlite3InitModule = (() => {
               'SQLITE_ACCESS_EXISTS',
               'SQLITE_ACCESS_READWRITE',
               'SQLITE_BUSY',
+              'SQLITE_CANTOPEN',
               'SQLITE_ERROR',
               'SQLITE_IOERR',
               'SQLITE_IOERR_ACCESS',
@@ -12688,7 +12689,11 @@ var sqlite3InitModule = (() => {
               Atomics.store(state.sabOPView, state.opIds.whichOp, opNdx);
               Atomics.notify(state.sabOPView, state.opIds.whichOp);
               const t = performance.now();
-              Atomics.wait(state.sabOPView, state.opIds.rc, -1);
+              while (
+                'not-equal' !==
+                Atomics.wait(state.sabOPView, state.opIds.rc, -1)
+              ) {}
+
               const rc = Atomics.load(state.sabOPView, state.opIds.rc);
               metrics[op].wait += performance.now() - t;
               if (rc && state.asyncS11nExceptions) {
@@ -12870,8 +12875,12 @@ var sqlite3InitModule = (() => {
 
             const ioSyncWrappers = {
               xCheckReservedLock: function (pFile, pOut) {
-                const f = __openFiles[pFile];
-                wasm.poke(pOut, f.lockType ? 1 : 0, 'i32');
+                if (1) {
+                  wasm.poke(pOut, 0, 'i32');
+                } else {
+                  const f = __openFiles[pFile];
+                  wasm.poke(pOut, f.lockType ? 1 : 0, 'i32');
+                }
                 return 0;
               },
               xClose: function (pFile) {

package/dist/peerbit/sqlite3.worker.min.js

@@ -5551,9 +5551,6 @@ var PROTOTYPE_DEPENDENCY_HANDLER_OFFSET = PROTOTYPE_DESERIALIZATION_HANDLER_OFFS
 var PROTOTYPE_SCHEMA_OFFSET = PROTOTYPE_DESERIALIZATION_HANDLER_OFFSET + PROTOTYPE_POLLUTION_CONTEXT_RANGE * 2;
 var MAX_ARRAY_SIZE_ALLOCATION = 1024 * 1024;
 
-// ../../crypto/dist/src/utils.js
-var import_libsodium_wrappers = __toESM(require_libsodium_wrappers(), 1);
-
 // ../../../../node_modules/multiformats/dist/src/bytes.js
 var empty = new Uint8Array(0);
 function coerce(o) {
@@ -5729,10 +5726,11 @@ var Decoder = class {
   constructor(name, prefix, baseDecode) {
     this.name = name;
     this.prefix = prefix;
-    if (prefix.codePointAt(0) === void 0) {
+    const prefixCodePoint = prefix.codePointAt(0);
+    if (prefixCodePoint === void 0) {
       throw new Error("Invalid prefix character");
     }
-    this.prefixCodePoint = prefix.codePointAt(0);
+    this.prefixCodePoint = prefixCodePoint;
     this.baseDecode = baseDecode;
   }
   decode(text) {
@@ -5821,6 +5819,7 @@ var base58flickr = baseX({
 });
 
 // ../../crypto/dist/src/utils.js
+var import_libsodium_wrappers = __toESM(require_libsodium_wrappers(), 1);
 var fromBase64 = (base64) => {
   return import_libsodium_wrappers.default.from_base64(base64, import_libsodium_wrappers.default.base64_variants.ORIGINAL);
 };
@@ -14354,10 +14353,10 @@ var sqlite3InitModule = (() => {
       });
       globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite32) {
         sqlite32.version = {
-          libVersion: "3.46.0",
-          libVersionNumber: 3046e3,
-          sourceId: "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e",
-          downloadVersion: 346e4
+          libVersion: "3.46.1",
+          libVersionNumber: 3046001,
+          sourceId: "2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33",
+          downloadVersion: 3460100
         };
       });
       globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite32) {
@@ -16018,6 +16017,7 @@ var sqlite3InitModule = (() => {
               "SQLITE_ACCESS_EXISTS",
               "SQLITE_ACCESS_READWRITE",
               "SQLITE_BUSY",
+              "SQLITE_CANTOPEN",
               "SQLITE_ERROR",
               "SQLITE_IOERR",
               "SQLITE_IOERR_ACCESS",
@@ -16059,7 +16059,8 @@ var sqlite3InitModule = (() => {
               Atomics.store(state.sabOPView, state.opIds.whichOp, opNdx);
               Atomics.notify(state.sabOPView, state.opIds.whichOp);
               const t = performance.now();
-              Atomics.wait(state.sabOPView, state.opIds.rc, -1);
+              while ("not-equal" !== Atomics.wait(state.sabOPView, state.opIds.rc, -1)) {
+              }
               const rc = Atomics.load(state.sabOPView, state.opIds.rc);
               metrics[op].wait += performance.now() - t;
               if (rc && state.asyncS11nExceptions) {
@@ -16217,8 +16218,12 @@ var sqlite3InitModule = (() => {
             const mTimeEnd = () => metrics[opTimer.op].time += performance.now() - opTimer.start;
             const ioSyncWrappers = {
               xCheckReservedLock: function(pFile, pOut) {
-                const f = __openFiles[pFile];
-                wasm.poke(pOut, f.lockType ? 1 : 0, "i32");
+                if (1) {
+                  wasm.poke(pOut, 0, "i32");
+                } else {
+                  const f = __openFiles[pFile];
+                  wasm.poke(pOut, f.lockType ? 1 : 0, "i32");
+                }
                 return 0;
               },
               xClose: function(pFile) {
@@ -17804,6 +17809,16 @@ var sqlite3_worker1_promiser_default = sqlite3Worker1Promiser.v2;
 var sqlite3Worker1Promiser2 = self.sqlite3Worker1Promiser;
 var sqlite_wasm_default = sqlite3_bundler_friendly_default;
 
+// ../../../../node_modules/uuid/dist/esm-browser/stringify.js
+var byteToHex = [];
+for (i = 0; i < 256; ++i) {
+  byteToHex.push((i + 256).toString(16).slice(1));
+}
+var i;
+function unsafeStringify(arr, offset = 0) {
+  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+}
+
 // ../../../../node_modules/uuid/dist/esm-browser/rng.js
 var getRandomValues;
 var rnds8 = new Uint8Array(16);
@@ -17817,15 +17832,6 @@ function rng() {
   return getRandomValues(rnds8);
 }
 
-// ../../../../node_modules/uuid/dist/esm-browser/stringify.js
-var byteToHex = [];
-for (let i = 0; i < 256; ++i) {
-  byteToHex.push((i + 256).toString(16).slice(1));
-}
-function unsafeStringify(arr, offset = 0) {
-  return byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]];
-}
-
 // ../../../../node_modules/uuid/dist/esm-browser/native.js
 var randomUUID = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
 var native_default = {
@@ -17838,12 +17844,12 @@ function v4(options, buf, offset) {
     return native_default.randomUUID();
   }
   options = options || {};
-  const rnds = options.random || (options.rng || rng)();
+  var rnds = options.random || (options.rng || rng)();
   rnds[6] = rnds[6] & 15 | 64;
   rnds[8] = rnds[8] & 63 | 128;
   if (buf) {
     offset = offset || 0;
-    for (let i = 0; i < 16; ++i) {
+    for (var i = 0; i < 16; ++i) {
       buf[offset + i] = rnds[i];
     }
     return buf;
@@ -17863,12 +17869,13 @@ var Statement = class {
     return this;
   }
   async finalize() {
-    if (await this.statement.finalize() > 0) {
+    const out = await this.statement.finalize();
+    if (out != null && out > 0) {
       throw new Error("Error finalizing statement");
     }
   }
   get(values) {
-    if (values) {
+    if (values && values?.length > 0) {
       this.statement.bind(values);
     }
     let step = this.statement.step();
@@ -17942,10 +17949,15 @@ var create = async (directory) => {
       return sqliteDb.exec(sql);
     },
     open,
-    prepare: (sql, id) => {
+    prepare: async (sql, id) => {
       if (id == null) {
         id = v4_default();
       }
+      let prev = statements.get(id);
+      if (prev) {
+        await prev.reset();
+        return prev;
+      }
       const statement = sqliteDb.prepare(sql);
       const wrappedStatement = new Statement(statement, id);
       statements.set(id, wrappedStatement);

package/dist/src/engine.d.ts

@@ -1,8 +1,8 @@
 import { type AbstractType } from "@dao-xyz/borsh";
-import type { CloseIteratorRequest, CollectNextRequest, Index, IndexEngineInitProperties, IndexedResult, IndexedResults, SearchRequest, Shape } from "@peerbit/indexer-interface";
+import type { Index, IndexEngineInitProperties, IndexedResult, Shape } from "@peerbit/indexer-interface";
 import * as types from "@peerbit/indexer-interface";
 import { type Table } from "./schema.js";
-import type { Database, Statement } from "./types.js";
+import type { Database } from "./types.js";
 export declare class SQLLiteIndex<T extends Record<string, any>> implements Index<T, any> {
     readonly properties: {
         scope: string[];
@@ -13,9 +13,6 @@ export declare class SQLLiteIndex<T extends Record<string, any>> implements Inde
     };
     primaryKeyArr: string[];
     primaryKeyString: string;
-    putStatement: Map<string, Statement>;
-    replaceStatement: Map<string, Statement>;
-    resolveChildrenStatement: Map<string, Statement>;
     private scopeString?;
     private _rootTables;
     private _tables;
@@ -35,12 +32,7 @@ export declare class SQLLiteIndex<T extends Record<string, any>> implements Inde
     get tables(): Map<string, Table>;
     get rootTables(): Table[];
     get cursor(): Map<string, {
-        kept: number;
-        fetch: (amount: number) => Promise<{
-            results: IndexedResult[];
-            kept: number;
-        }>;
-        fetchStatement: Statement;
+        fetch: (amount: number) => Promise<IndexedResult[]>;
         timeout: ReturnType<typeof setTimeout>;
     }>;
     init(properties: IndexEngineInitProperties<T, any>): this;
@@ -53,17 +45,15 @@ export declare class SQLLiteIndex<T extends Record<string, any>> implements Inde
         shape: Shape;
     }): Promise<IndexedResult<T> | undefined>;
     put(value: T, _id?: any): Promise<void>;
-    query(request: SearchRequest, options?: {
-        shape: Shape;
-    }): Promise<IndexedResults<T>>;
-    next(query: CollectNextRequest): Promise<IndexedResults<T>>;
-    close(query: CloseIteratorRequest): void | Promise<void>;
+    iterate<S extends Shape | undefined>(request?: types.IterateOptions, options?: {
+        shape?: S;
+        reference?: boolean;
+    }): types.IndexIterator<T, S>;
     private clearupIterator;
     getSize(): Promise<number>;
-    del(query: types.DeleteRequest): Promise<types.IdKey[]>;
-    sum(query: types.SumRequest): Promise<number | bigint>;
-    count(request: types.CountRequest): Promise<number>;
-    getPending(cursorId: string): number | undefined;
+    del(query: types.DeleteOptions): Promise<types.IdKey[]>;
+    sum(query: types.SumOptions): Promise<number | bigint>;
+    count(request?: types.CountOptions): Promise<number>;
     get cursorCount(): number;
 }
 export declare class SQLiteIndices implements types.Indices {

package/dist/src/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../src/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../src/engine.ts"],"names":[],"mappings":"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"}

package/dist/src/engine.js

@@ -7,13 +7,13 @@ convertSumRequestToQuery, escapeColumnName, generateSelectQuery, getInlineTableF
 const escapePathToSQLName = (path) => {
     return path.map((x) => x.replace(/[^a-zA-Z0-9]/g, "_"));
 };
+const putStatementKey = (table) => table.name + "_put";
+const replaceStatementKey = (table) => table.name + "_replicate";
+const resolveChildrenStatement = (table) => table.name + "_resolve_children";
 export class SQLLiteIndex {
     properties;
     primaryKeyArr;
     primaryKeyString;
-    putStatement;
-    replaceStatement;
-    resolveChildrenStatement;
     scopeString;
     _rootTables;
     _tables;
@@ -76,9 +76,6 @@ export class SQLLiteIndex {
             throw new Error("Not initialized");
         }
         await this.properties.start?.();
-        this.putStatement = new Map();
-        this.replaceStatement = new Map();
-        this.resolveChildrenStatement = new Map();
         this._tables = new Map();
         this._cursor = new Map();
         const tables = getSQLTable(this.properties.schema, this.scopeString ? [this.scopeString] : [], getInlineTableFieldName(this.primaryKeyArr), // TODO fix this, should be array
@@ -103,10 +100,10 @@ export class SQLLiteIndex {
             let sqlPut = `insert into ${table.name}  (${table.fields.map((field) => escapeColumnName(field.name)).join(", ")}) VALUES (${table.fields.map((_x) => "?").join(", ")}) RETURNING ${table.primary};`;
             // insert or replace with id already defined
             let sqlReplace = `insert or replace into ${table.name} (${table.fields.map((field) => escapeColumnName(field.name)).join(", ")}) VALUES (${table.fields.map((_x) => "?").join(", ")});`;
-            this.putStatement.set(table.name, await this.properties.db.prepare(sqlPut));
-            this.replaceStatement.set(table.name, await this.properties.db.prepare(sqlReplace));
+            await this.properties.db.prepare(sqlPut, putStatementKey(table));
+            await this.properties.db.prepare(sqlReplace, replaceStatementKey(table));
             if (table.parent) {
-                this.resolveChildrenStatement.set(table.name, await this.properties.db.prepare(selectChildren(table)));
+                await this.properties.db.prepare(selectChildren(table), resolveChildrenStatement(table));
             }
         }
         this.closed = false;
@@ -116,18 +113,6 @@ export class SQLLiteIndex {
             // TODO this should never be true, but if we remove this statement the tests faiL for browser tests?
             return;
         }
-        for (const [_k, v] of this.putStatement) {
-            await v.finalize?.();
-        }
-        for (const [_k, v] of this.replaceStatement) {
-            await v.finalize?.();
-        }
-        for (const [_k, v] of this.resolveChildrenStatement) {
-            await v.finalize?.();
-        }
-        this.putStatement.clear();
-        this.replaceStatement.clear();
-        this.resolveChildrenStatement.clear();
     }
     async stop() {
         if (this.closed) {
@@ -154,7 +139,7 @@ export class SQLLiteIndex {
         }
     }
     async resolveDependencies(parentId, table) {
-        const stmt = this.resolveChildrenStatement.get(table.name);
+        const stmt = this.properties.db.statements.get(resolveChildrenStatement(table));
         const results = await stmt.all([parentId]);
         await stmt.reset?.();
         return results;
@@ -163,9 +148,8 @@ export class SQLLiteIndex {
         for (const table of this._rootTables) {
             const { join: joinMap, selects } = selectAllFieldsFromTable(table, options?.shape);
             const sql = `${generateSelectQuery(table, selects)} ${buildJoin(joinMap, true)} where ${this.primaryKeyString} = ? `;
-            const stmt = await this.properties.db.prepare(sql);
+            const stmt = await this.properties.db.prepare(sql, sql);
             const rows = await stmt.get([id.key]);
-            await stmt.finalize?.();
             if (!rows) {
                 continue;
             }
@@ -181,88 +165,123 @@ export class SQLLiteIndex {
         return insert(async (values, table) => {
             const preId = values[table.primaryIndex];
             if (preId != null) {
-                const statement = this.replaceStatement.get(table.name);
+                const statement = this.properties.db.statements.get(replaceStatementKey(table));
                 await statement.run(values.map((x) => (typeof x === "boolean" ? (x ? 1 : 0) : x)));
                 await statement.reset?.();
                 return preId;
             }
             else {
-                const statement = this.putStatement.get(table.name);
+                const statement = this.properties.db.statements.get(putStatementKey(table));
                 const out = await statement.get(values.map((x) => (typeof x === "boolean" ? (x ? 1 : 0) : x)));
                 await statement.reset?.();
                 // TODO types
+                if (out == null) {
+                    return undefined;
+                }
                 return out[table.primary];
             }
         }, value, this.tables, resolveTable(this.scopeString ? [this.scopeString] : [], this.tables, classOfValue, true), getSchema(classOfValue).fields, (_fn) => {
             throw new Error("Unexpected");
         });
     }
-    async query(request, options) {
+    iterate(request, options) {
         // create a sql statement where the offset and the limit id dynamic and can be updated
         // TODO don't use offset but sort and limit 'next' calls by the last value of the sort
-        let sqlFetch = convertSearchRequestToQuery(request, this.tables, this._rootTables, options?.shape);
-        const stmt = await this.properties.db.prepare(sqlFetch);
+        let { sql: sqlFetch, bindable } = convertSearchRequestToQuery(request, this.tables, this._rootTables, options?.shape);
         /* 	const totalCountKey = "count"; */
         /* const sqlTotalCount = convertCountRequestToQuery(new types.CountRequest({ query: request.query }), this.tables, this.tables.get(this.rootTableName)!)
         const countStmt = await this.properties.db.prepare(sqlTotalCount); */
         let offset = 0;
-        let first = false;
+        let once = false;
+        let requestId = uuid();
+        let hasMore = true;
+        let stmt;
+        let kept = undefined;
+        /* let totalCount: undefined | number = undefined; */
         const fetch = async (amount) => {
-            if (!first) {
-                stmt.reset?.();
+            kept = undefined;
+            if (!once) {
+                stmt = await this.properties.db.prepare(sqlFetch, sqlFetch);
+                // stmt.reset?.(); // TODO dont invoke reset if not needed
                 /* countStmt.reset?.(); */
                 // Bump timeout timer
                 clearTimeout(iterator.timeout);
-                iterator.timeout = setTimeout(() => this.clearupIterator(request.idString), this.iteratorTimeout);
+                iterator.timeout = setTimeout(() => this.clearupIterator(requestId), this.iteratorTimeout);
             }
-            first = true;
+            once = true;
             const offsetStart = offset;
             const allResults = await stmt.all([
+                ...bindable,
                 amount,
                 offsetStart,
             ]);
             let results = await Promise.all(allResults.map(async (row) => {
-                let selectedTable = this._rootTables.find((table /* row["table_name"] === table.name, */) => row[getTablePrefixedField(table, this.primaryKeyString)] != null);
+                let selectedTable = this._rootTables.find((table /* row["table_name"] === table.name, */) => row[getTablePrefixedField(table, this.primaryKeyString)] !=
+                    null);
                 const value = await resolveInstanceFromValue(row, this.tables, selectedTable, this.resolveDependencies.bind(this), true, options?.shape);
                 return {
                     value,
                     id: types.toId(row[getTablePrefixedField(selectedTable, this.primaryKeyString)]),
                 };
             }));
-            offset += amount;
-            if (results.length > 0) {
-                const totalCount = await this.count(new types.CountRequest({ query: request.query })); /*  (await countStmt.get())[totalCountKey] as number; */
+            offset += results.length;
+            /* if (results.length > 0) {
+                totalCount =
+                    totalCount ??
+                    (await this.count(
+                        request,
+                    ));
                 iterator.kept = totalCount - results.length - offsetStart;
-            }
-            else {
+            } else {
                 iterator.kept = 0;
-            }
-            if (iterator.kept === 0) {
-                await this.clearupIterator(request.idString);
+            } */
+            if (results.length < amount) {
+                hasMore = false;
+                await this.clearupIterator(requestId);
                 clearTimeout(iterator.timeout);
             }
-            return { results, kept: iterator.kept };
+            return results;
         };
         const iterator = {
-            kept: 0,
             fetch,
-            fetchStatement: stmt,
             /* countStatement: countStmt, */
-            timeout: setTimeout(() => this.clearupIterator(request.idString), this.iteratorTimeout),
+            timeout: setTimeout(() => this.clearupIterator(requestId), this.iteratorTimeout),
+        };
+        this.cursor.set(requestId, iterator);
+        let totalCount = undefined;
+        /* 			return fetch(request.fetch); */
+        return {
+            all: async () => {
+                const results = [];
+                while (true) {
+                    const res = await fetch(100);
+                    results.push(...res);
+                    if (res.length === 0) {
+                        break;
+                    }
+                }
+                return results;
+            },
+            close: () => {
+                hasMore = false;
+                kept = 0;
+                this.clearupIterator(requestId);
+            },
+            next: (amount) => fetch(amount),
+            pending: async () => {
+                if (!hasMore) {
+                    return 0;
+                }
+                if (kept != null) {
+                    return kept;
+                }
+                totalCount = totalCount ?? (await this.count(request));
+                kept = totalCount - offset;
+                hasMore = kept > 0;
+                return kept;
+            },
+            done: () => (once ? !hasMore : undefined),
         };
-        this.cursor.set(request.idString, iterator);
-        return fetch(request.fetch);
-    }
-    next(query) {
-        const cache = this.cursor.get(query.idString);
-        if (!cache) {
-            throw new Error("No cursor found with id: " + query.idString);
-        }
-        // reuse statement
-        return cache.fetch(query.amount);
-    }
-    close(query) {
-        return this.clearupIterator(query.idString);
     }
     async clearupIterator(id) {
         const cache = this._cursor.get(id);
@@ -271,7 +290,7 @@ export class SQLLiteIndex {
         }
         clearTimeout(cache.timeout);
         /* cache.countStatement.finalize?.(); */
-        await cache.fetchStatement.finalize?.();
+        // 	await cache.fetchStatement.finalize?.();
         this._cursor.delete(id);
     }
     async getSize() {
@@ -282,7 +301,7 @@ export class SQLLiteIndex {
         const result = await stmt.get()
         stmt.finalize?.();
         return result.total as number */
-        return this.count(new types.CountRequest({ query: {} }));
+        return this.count();
     }
     async del(query) {
         let ret = [];
@@ -290,9 +309,9 @@ export class SQLLiteIndex {
         let lastError = undefined;
         for (const table of this._rootTables) {
             try {
-                const stmt = await this.properties.db.prepare(convertDeleteRequestToQuery(query, this.tables, table));
-                const results = await stmt.all([]);
-                await stmt.finalize?.();
+                const { sql, bindable } = convertDeleteRequestToQuery(query, this.tables, table);
+                const stmt = await this.properties.db.prepare(sql, sql);
+                const results = await stmt.all(bindable);
                 // TODO types
                 for (const result of results) {
                     ret.push(types.toId(result[table.primary]));
@@ -320,19 +339,22 @@ export class SQLLiteIndex {
         for (const table of this._rootTables) {
             try {
                 if (table.fields.find((x) => x.name === inlinedName) == null) {
-                    lastError = new MissingFieldError("Missing field: " + query.key.join("."));
+                    lastError = new MissingFieldError("Missing field: " +
+                        (Array.isArray(query.key) ? query.key : [query.key]).join("."));
                     continue;
                 }
-                const stmt = await this.properties.db.prepare(convertSumRequestToQuery(query, this.tables, table));
-                const result = await stmt.get();
-                await stmt.finalize?.();
-                if (ret == null) {
-                    ret = result.sum;
-                }
-                else {
-                    ret += result.sum;
+                const { sql, bindable } = convertSumRequestToQuery(query, this.tables, table);
+                const stmt = await this.properties.db.prepare(sql, sql);
+                const result = await stmt.get(bindable);
+                if (result != null) {
+                    if (ret == null) {
+                        ret = result.sum;
+                    }
+                    else {
+                        ret += result.sum;
+                    }
+                    once = true;
                 }
-                once = true;
             }
             catch (error) {
                 if (error instanceof MissingFieldError) {
@@ -353,11 +375,13 @@ export class SQLLiteIndex {
         let lastError = undefined;
         for (const table of this._rootTables) {
             try {
-                const stmt = await this.properties.db.prepare(convertCountRequestToQuery(request, this.tables, table));
-                const result = await stmt.get();
-                await stmt.finalize?.();
-                ret += Number(result.count);
-                once = true;
+                const { sql, bindable } = convertCountRequestToQuery(request, this.tables, table);
+                const stmt = await this.properties.db.prepare(sql, sql);
+                const result = await stmt.get(bindable);
+                if (result != null) {
+                    ret += Number(result.count);
+                    once = true;
+                }
             }
             catch (error) {
                 if (error instanceof MissingFieldError) {
@@ -372,13 +396,6 @@ export class SQLLiteIndex {
         }
         return ret;
     }
-    getPending(cursorId) {
-        const cursor = this.cursor.get(cursorId);
-        if (!cursor) {
-            return;
-        }
-        return cursor.kept;
-    }
     get cursorCount() {
         return this.cursor.size;
     }