indexeddbshim 17.0.0 → 17.2.0

package/dist/node-UnicodeIdentifiers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-UnicodeIdentifiers.d.ts","sourceRoot":"","sources":["../src/node-UnicodeIdentifiers.js"],"names":[],"mappings":";AASA;;;;GAIG;AACH,sCAJW,OAAO,oBAAoB,EAAE,aAAa,wBAExC,OAAO,oBAAoB,EAAE,aAAa,GAAC,MAAM,CAW7D"}
+{"version":3,"file":"node-UnicodeIdentifiers.d.ts","sourceRoot":"","sources":["../src/node-UnicodeIdentifiers.js"],"names":[],"mappings":";AASA;;;;GAIG;AACH,sCAJW,OAAO,oBAAoB,EAAE,aAAa,wBAExC,OAAO,oBAAoB,EAAE,aAAa,GAAC,MAAM,CAe7D"}

package/dist/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAQA;;;;GAIG;AACH,sCAJW,OAAO,oBAAoB,EAAE,aAAa,wBAExC,OAAO,oBAAoB,EAAE,aAAa,GAAC,MAAM,CAI7D"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.js"],"names":[],"mappings":";AAQA;;;;GAIG;AACH,sCAJW,OAAO,oBAAoB,EAAE,aAAa,wBAExC,OAAO,oBAAoB,EAAE,aAAa,GAAC,MAAM,CAQ7D"}

package/dist/nodeSQLiteDatabase.d.ts

@@ -0,0 +1,65 @@
+export default SQLiteDatabase;
+export type SQLProfileCallback = (sql: string, duration: number) => void;
+export type SQLTraceCallback = ((sql: string) => void) | undefined;
+/**
+ * @typedef {(sql: string, duration: number) => void} SQLProfileCallback
+ */
+/**
+ * @typedef {((sql: string) => void)|undefined} SQLTraceCallback
+ */
+/**
+ * @param {string} name
+ * @param {{busyTimeout?: number, trace?: (sql: string) => void, profile?: SQLProfileCallback}} [opts]
+ * @returns {void}
+ */
+declare function SQLiteDatabase(name: string, opts?: {
+    busyTimeout?: number;
+    trace?: (sql: string) => void;
+    profile?: SQLProfileCallback;
+}): void;
+declare class SQLiteDatabase {
+    /**
+     * @typedef {(sql: string, duration: number) => void} SQLProfileCallback
+     */
+    /**
+     * @typedef {((sql: string) => void)|undefined} SQLTraceCallback
+     */
+    /**
+     * @param {string} name
+     * @param {{busyTimeout?: number, trace?: (sql: string) => void, profile?: SQLProfileCallback}} [opts]
+     * @returns {void}
+     */
+    constructor(name: string, opts?: {
+        busyTimeout?: number;
+        trace?: (sql: string) => void;
+        profile?: SQLProfileCallback;
+    });
+    _db: any;
+    /**
+     * @param {{sql: string, args: unknown[]}[]} queries
+     * @param {boolean} readOnly
+     * @param {(err: Error|null, results?: SQLiteResult[]) => void} callback
+     * @returns {void}
+     */
+    exec(queries: {
+        sql: string;
+        args: unknown[];
+    }[], readOnly: boolean, callback: (err: Error | null, results?: SQLiteResult[]) => void): void;
+}
+/**
+ *
+ */
+declare class SQLiteResult {
+    /**
+     * @param {Error|null|undefined} error
+     * @param {number|undefined} [insertId]
+     * @param {number} [rowsAffected]
+     * @param {object[]} [rows]
+     */
+    constructor(error: Error | null | undefined, insertId?: number | undefined, rowsAffected?: number, rows?: object[]);
+    error: Error | null | undefined;
+    insertId: number | undefined;
+    rowsAffected: number | undefined;
+    rows: object[] | undefined;
+}
+//# sourceMappingURL=nodeSQLiteDatabase.d.ts.map

package/dist/nodeSQLiteDatabase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nodeSQLiteDatabase.d.ts","sourceRoot":"","sources":["../src/nodeSQLiteDatabase.js"],"names":[],"mappings":";iCAyBa,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI;+BAIvC,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,GAAC,SAAS;AAL9C;;GAEG;AAEH;;GAEG;AAEH;;;;GAIG;AACH,sCAJW,MAAM,SACN;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,kBAAkB,CAAA;CAAC,GACjF,IAAI,CAkEhB;;IA7ED;;OAEG;IAEH;;OAEG;IAEH;;;;OAIG;IACH,kBAJW,MAAM,SACN;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAAC,EAmE7F;IA9CG,SA6CE;IAyBN;;;;;OAKG;IACH,cALW;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,EAAE,CAAA;KAAC,EAAE,YAChC,OAAO,YACP,CAAC,GAAG,EAAE,KAAK,GAAC,IAAI,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,GACjD,IAAI,CA0ChB;;AAzKD;;GAEG;AACH;IACI;;;;;OAKG;IACH,mBALW,KAAK,GAAC,IAAI,GAAC,SAAS,aACpB,MAAM,GAAC,SAAS,iBAChB,MAAM,SACN,MAAM,EAAE,EAOlB;IAJG,gCAAkB;IAClB,6BAAwB;IACxB,iCAAgC;IAChC,2BAAgB;CAEvB"}

package/dist/nodeWebSQL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeWebSQL.d.ts","sourceRoot":"","sources":["../src/nodeWebSQL.js"],"names":[],"mappings":";AAwBA,iHAAiE"}
+{"version":3,"file":"nodeWebSQL.d.ts","sourceRoot":"","sources":["../src/nodeWebSQL.js"],"names":[],"mappings":";AAsBA,iHAAiE"}

package/dist/util.d.ts

@@ -172,4 +172,9 @@ export function convertToSequenceDOMString(val: AnyValue): string | string[];
  * @returns {v is null|undefined}
  */
 export function isNullish(v: AnyValue): v is null | undefined;
+/**
+ * @param {() => void} fn
+ * @returns {void}
+ */
+export function runContinuationSafely(fn: () => void): void;
 //# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.js"],"names":[],"mappings":"sBAKa,MAAM;;uBAofN,GAAG;AA1chB;;;;GAIG;AACH,2CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,4CAHW,MAAM,GACJ,MAAM,CAUlB;AAuBD;;;;GAIG;AACH,qDAJW,MAAM,GAEJ,MAAM,CAoClB;AAmBD;;;;GAIG;AACH,uDAHW,MAAM,GACJ,MAAM,CAkClB;AAED;;;GAGG;AACH,6CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,6CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,sDAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;;GAIG;AACH,mCAHW,MAAM,GACJ,MAAM,CAKlB;AAzID;;;GAGG;AACH,8BAHW,MAAM,GACJ,MAAM,CAIlB;AAqID;;GAEG;AAGH;;;;;GAKG;AACH,gCAJW,QAAQ,QACR,QAAQ,GACN,OAAO,CAInB;AAED;;;;GAIG;AACH,2BAHW,QAAQ,GACN,GAAG,IAAI,MAAM,CAIzB;AAED;;;;GAIG;AACH,4BAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;GAIG;AACH,4BAHW,MAAM,GACJ,OAAO,CAKnB;AAED;;;;GAIG;AACH,8BAHW,MAAM,GACJ,OAAO,CAKnB;AAED;;;;GAIG;AACH,4BAHW,MAAM,GACJ,OAAO,CAKnB;AAED;;;;GAIG;AACH,8BAHW,QAAQ,GACN,OAAO,CAOnB;AAED;;;;GAIG;AACH,gCAHW,QAAQ,GACN,OAAO,CAOnB;AAED;;;;;GAKG;AACH,0CAJW,MAAM,SACN,MAAM,EAAE,GACN,IAAI,CAkBhB;AAED;;;;;GAKG;AACH,kDAJW,MAAM,SACN,MAAM,EAAE,GACN,IAAI,CAchB;AAED;;;;;;;GAOG;AACH,8CANW,MAAM,GAAG;IACnB,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,aACO,MAAM,EAAE,GACN,IAAI,CA2BhB;AAED;;;;;;;;GAQG;AACH,8CAPW,MAAM,SACN,MAAM,GAAC,MAAM,EAAE,WACf,IAAI,GAAC;IACf,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,GACS,IAAI,CA8BhB;AAgCD;;;;GAIG;AACH,wCAHW,MAAM,GAAC,MAAM,EAAE,GACb,OAAO,CAWnB;AAED;;;;;GAKG;AACH,qCALW,MAAM,QACN,oBAAoB,GAAC,eAAe,GAElC,MAAM,CAyBlB;AAED;;GAEG;AAEH;;;;GAIG;AACH,sCAJW,QAAQ,gBACR,OAAO,GACL,MAAM,CAIlB;AAWD;;;;GAIG;AACH,gDAHW,QAAQ,GACN,MAAM,GAAC,MAAM,EAAE,CAW3B;AAED;;;GAGG;AACH,6BAHW,QAAQ,GACN,CAAC,IAAI,IAAI,GAAC,SAAS,CAI/B"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.js"],"names":[],"mappings":"sBAKa,MAAM;;uBA6fN,GAAG;AAndhB;;;;GAIG;AACH,2CAHW,MAAM,GACJ,MAAM,CASlB;AAED;;;GAGG;AACH,4CAHW,MAAM,GACJ,MAAM,CAclB;AAuBD;;;;GAIG;AACH,qDAJW,MAAM,GAEJ,MAAM,CAoClB;AAmBD;;;;GAIG;AACH,uDAHW,MAAM,GACJ,MAAM,CAkClB;AAED;;;GAGG;AACH,6CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,6CAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;GAGG;AACH,sDAHW,MAAM,GACJ,MAAM,CAIlB;AAED;;;;GAIG;AACH,mCAHW,MAAM,GACJ,MAAM,CAKlB;AAzID;;;GAGG;AACH,8BAHW,MAAM,GACJ,MAAM,CAIlB;AAqID;;GAEG;AAGH;;;;;GAKG;AACH,gCAJW,QAAQ,QACR,QAAQ,GACN,OAAO,CAInB;AAED;;;;GAIG;AACH,2BAHW,QAAQ,GACN,GAAG,IAAI,MAAM,CAIzB;AAED;;;;GAIG;AACH,4BAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;GAIG;AACH,4BAHW,MAAM,GACJ,OAAO,CAKnB;AAED;;;;GAIG;AACH,8BAHW,MAAM,GACJ,OAAO,CAKnB;AAED;;;;GAIG;AACH,4BAHW,MAAM,GACJ,OAAO,CAKnB;AAED;;;;GAIG;AACH,8BAHW,QAAQ,GACN,OAAO,CAOnB;AAED;;;;GAIG;AACH,gCAHW,QAAQ,GACN,OAAO,CAOnB;AAED;;;;;GAKG;AACH,0CAJW,MAAM,SACN,MAAM,EAAE,GACN,IAAI,CAkBhB;AAED;;;;;GAKG;AACH,kDAJW,MAAM,SACN,MAAM,EAAE,GACN,IAAI,CAchB;AAED;;;;;;;GAOG;AACH,8CANW,MAAM,GAAG;IACnB,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,aACO,MAAM,EAAE,GACN,IAAI,CA2BhB;AAED;;;;;;;;GAQG;AACH,8CAPW,MAAM,SACN,MAAM,GAAC,MAAM,EAAE,WACf,IAAI,GAAC;IACf,CAAK,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,GACS,IAAI,CA8BhB;AAgCD;;;;GAIG;AACH,wCAHW,MAAM,GAAC,MAAM,EAAE,GACb,OAAO,CAWnB;AAED;;;;;GAKG;AACH,qCALW,MAAM,QACN,oBAAoB,GAAC,eAAe,GAElC,MAAM,CAyBlB;AAED;;GAEG;AAEH;;;;GAIG;AACH,sCAJW,QAAQ,gBACR,OAAO,GACL,MAAM,CAIlB;AAWD;;;;GAIG;AACH,gDAHW,QAAQ,GACN,MAAM,GAAC,MAAM,EAAE,CAW3B;AAED;;;GAGG;AACH,6BAHW,QAAQ,GACN,CAAC,IAAI,IAAI,GAAC,SAAS,CAI/B;AA6BD;;;GAGG;AACH,0CAHW,MAAM,IAAI,GACR,IAAI,CAmBhB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "indexeddbshim",
-  "version": "17.0.0",
+  "version": "17.2.0",
   "type": "module",
   "author": "Parashuram <code@nparashuram.com>",
   "contributors": [
@@ -156,17 +156,18 @@
     "node": "^22.18.0 || >= 24.11.0"
   },
   "dependencies": {
+    "@node-static/node-static": "^0.9.0",
+    "better-sqlite3": "^13.0.3",
     "canvas": "^3.2.3",
     "eventtargeter": "0.9.0",
-    "sync-promise-expanded": "^1.0.0",
-    "typeson": "10.0.0",
-    "typeson-registry": "13.0.0",
+    "sync-promise-expanded": "^2.0.0",
+    "typeson": "10.2.0",
+    "typeson-registry": "13.1.0",
     "websql-configurable": "^3.0.3"
   },
   "devDependencies": {
     "@babel/core": "^8.0.1",
     "@babel/preset-env": "^8.0.2",
-    "@brettz9/node-static": "^0.1.1",
     "@es-joy/json-file-reporter": "^1.5.0",
     "@rollup/plugin-babel": "^7.1.0",
     "@rollup/plugin-commonjs": "^29.0.3",
@@ -174,36 +175,37 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^1.0.0",
-    "@types/node": "^26.1.2",
+    "@types/better-sqlite3": "^9.6.0",
+    "@types/node": "^26.2.0",
     "@types/websql": "^0.0.30",
     "@unicode/unicode-17.0.0": "^1.6.17",
     "babel-plugin-add-module-exports": "1.0.4",
-    "bson": "^7.3.1",
+    "bson": "^7.3.2",
     "builtin-modules": "^5.3.0",
     "c8": "^12.0.0",
     "chai": "6.2.2",
     "chokidar-cli": "^3.0.0",
     "colors": "1.4.0",
     "copyfiles": "^2.4.1",
-    "core-js-bundle": "^3.49.0",
+    "core-js-bundle": "^3.50.0",
     "coveradge": "^0.8.2",
     "cyclonejs": "1.1.4",
     "delay-cli": "^3.0.0",
-    "eslint": "^10.8.0",
-    "eslint-config-ash-nazg": "^41.0.0",
-    "globals": "^17.8.0",
+    "eslint": "^10.8.1",
+    "eslint-config-ash-nazg": "^42.5.0",
+    "globals": "^17.11.0",
     "is-date-object": "1.1.0",
     "isomorphic-fetch": "^3.0.0",
-    "jsdom": "^30.0.0",
-    "license-badger": "^0.22.1",
+    "jsdom": "^30.0.1",
+    "license-badger": "^0.23.0",
     "local-xmlhttprequest": "2.0.0",
-    "mocha": "^11.7.6",
+    "mocha": "^11.8.0",
     "mocha-badge-generator": "^0.11.0",
     "mocha-multi-reporters": "^1.5.1",
     "npm-run-all": "^4.1.5",
     "open-cli": "^9.0.0",
     "rimraf": "^6.1.3",
-    "rollup": "^4.62.3",
+    "rollup": "^4.62.4",
     "rollup-plugin-filesize": "^10.0.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "sinon": "^22.1.0",
@@ -211,14 +213,16 @@
     "sourcemap-transformer": "git+https://github.com/brettz9/sourcemap-transformer.git",
     "typescript": "^6.0.3",
     "w3c-blob": "0.0.1",
-    "ws": "^8.21.1"
+    "ws": "^8.21.3"
   },
   "allowScripts": {
     "es5-ext@0.10.64": true,
     "fsevents@2.3.3": true,
     "sqlite3@5.1.7": true,
     "canvas@3.2.3": true,
-    "core-js-bundle@3.49.0": true,
-    "unrs-resolver@1.12.2": true
+    "unrs-resolver@1.12.2": true,
+    "better-sqlite3@13.0.3": true,
+    "core-js-bundle@3.50.0": true,
+    "is-hidden-file@1.1.2": true
   }
 }

package/src/CFG.js

@@ -42,6 +42,7 @@
  *   sqlBusyTimeout: number,
  *   sqlTrace: () => void,
  *   sqlProfile: () => void,
+ *   escapeNULForSQLiteStatements: boolean,
  *   createIndexes: boolean
  * }} ConfigValues
  */
@@ -215,6 +216,8 @@ const CFG = /** @type {ConfigValues} */ ({});
     'sqlBusyTimeout', // Defaults to 1000
     'sqlTrace', // Callback not used by default
     'sqlProfile', // Callback not used by default
+    // Defaults to true except in Node builds where we can preserve literal NUL with better-sqlite3
+    'escapeNULForSQLiteStatements',
 
     'createIndexes'
 ]).forEach((prop) => {

package/src/DOMException.js

@@ -368,22 +368,22 @@ try {
 const createDOMException = useNativeDOMException
     // eslint-disable-next-line @stylistic/operator-linebreak -- Need JSDoc
     ? /**
-     * @param {string} name
-     * @param {string} message
-     * @param {ErrorLike} [error]
-     * @returns {DOMException}
-     */
+       * @param {string} name
+       * @param {string} message
+       * @param {ErrorLike} [error]
+       * @returns {DOMException}
+       */
     function (name, message, error) {
         logError(name, message, error);
         return createNativeDOMException(name, message);
     }
     // eslint-disable-next-line @stylistic/operator-linebreak -- Need JSDoc
     : /**
-    * @param {string} name
-    * @param {string} message
-    * @param {ErrorLike} [error]
-    * @returns {Error}
-    */
+       * @param {string} name
+       * @param {string} message
+       * @param {ErrorLike} [error]
+       * @returns {Error}
+       */
     function (name, message, error) {
         logError(name, message, error);
         return createNonNativeDOMException(name, message);

package/src/IDBCursor.js

@@ -46,6 +46,9 @@ import CFG from './CFG.js';
  *   __unique: boolean,
  *   __sqlDirection: "DESC"|"ASC",
  *   __matchedKeys: {[key: string]: true},
+ *   __continuationKey: import('./Key.js').Key|undefined,
+ *   __continuationPrimaryKey: import('./Key.js').Key|undefined,
+ *   __multiEntryExhausted: boolean,
  *   __invalidateCache: () => void
  * }} IDBCursorFull
  */
@@ -117,6 +120,9 @@ IDBCursor.__super = function IDBCursor (query, direction, store, source, keyColu
     this.__valueDecoder = this.__keyOnly ? Key : Sca;
     this.__count = count;
     this.__prefetchedIndex = -1;
+    this.__continuationKey = undefined;
+    this.__continuationPrimaryKey = undefined;
+    this.__multiEntryExhausted = false;
     this.__multiEntryIndex = this.__indexSource
         ? 'multiEntry' in source && source.multiEntry
         : false;
@@ -270,77 +276,107 @@ const leftBracketRegex = /\[/gu;
  * @param {SQLTransaction} tx
  * @param {KeySuccess} success
  * @param {FindError} error
- * @param {Integer|undefined} recordsToLoad
+ * @param {Integer} [recordsToLoad]
  * @this {IDBCursorFull}
  * @returns {void}
  */
-IDBCursor.prototype.__findMultiEntry = function (key, primaryKey, tx, success, error, recordsToLoad) {
+IDBCursor.prototype.__findMultiEntry = function (key, primaryKey, tx, success, error, recordsToLoad = 1) {
     const me = this;
 
-    if (me.__prefetchedData && me.__prefetchedData.length === me.__prefetchedIndex) {
-        if (CFG.DEBUG) { console.log('Reached end of multiEntry cursor'); }
+    if (me.__multiEntryExhausted) {
+        if (CFG.DEBUG) { console.log('[multiEntry] Reached end of multiEntry cursor (already exhausted)'); }
         success(undefined, undefined, undefined);
         return;
     }
 
     const quotedKeyColumnName = util.sqlQuote(me.__keyColumnName);
-    const sql = ['SELECT * FROM', util.escapeStoreNameForSQL(me.__store.__currentName)];
-    /** @type {string[]} */
-    const sqlValues = [];
-    sql.push('WHERE', quotedKeyColumnName, 'NOT NULL');
-    if (me.__range && (me.__range.lower !== undefined && Array.isArray(me.__range.upper))) {
-        if (me.__range.upper.indexOf(me.__range.lower) === 0) {
-            sql.push('AND', quotedKeyColumnName, "LIKE ? ESCAPE '^'");
-            sqlValues.push(
-                '%' + util.sqlLIKEEscape(
-                    /** @type {string} */ (me.__range.__lowerCached).slice(0, -1)
-                ) + '%'
-            );
-        }
-    }
+    const quotedKey = util.sqlQuote('key');
 
     // Determine the ORDER BY direction based on the cursor.
     const direction = me.__sqlDirection;
     const op = direction === 'ASC' ? '>' : '<';
-    const quotedKey = util.sqlQuote('key');
 
-    if (primaryKey !== undefined) {
-        sql.push('AND', quotedKey, op + '= ?');
-        // Key.convertValueToKey(primaryKey); // Already checked by `continuePrimaryKey`
-        sqlValues.push(/** @type {string} */ (Key.encode(primaryKey)));
-    }
-    if (key !== undefined) {
-        sql.push('AND', quotedKeyColumnName, op + '= ?');
-        // Key.convertValueToKey(key); // Already checked by `continue` or `continuePrimaryKey`
-        sqlValues.push(/** @type {string} */ (Key.encode(key)));
-    } else if (me.__key !== undefined) {
-        sql.push('AND', quotedKeyColumnName, op + ' ?');
-        // Key.convertValueToKey(me.__key); // Already checked when entered
-        sqlValues.push(/** @type {string} */ (Key.encode(me.__key)));
-    }
-
-    if (!me.__count) {
-        // 1. Sort by key
-        sql.push('ORDER BY', quotedKeyColumnName, direction);
+    /**
+     * Runs (and, if a batch of underlying rows produces no matching
+     * multi-entry values, repeatedly re-runs) the query for the next batch
+     * of underlying rows, advancing `me.__continuationKey`/
+     * `me.__continuationPrimaryKey` (tracking the last *physical* row
+     * scanned) each time, until either some matches are found or the
+     * underlying table is exhausted.
+     * @returns {void}
+     */
+    function runQuery () {
+        const sql = ['SELECT * FROM', util.escapeStoreNameForSQL(me.__store.__currentName)];
+        /** @type {string[]} */
+        const sqlValues = [];
+        sql.push('WHERE', quotedKeyColumnName, 'NOT NULL');
+        if (me.__range && (me.__range.lower !== undefined && Array.isArray(me.__range.upper))) {
+            if (me.__range.upper.indexOf(me.__range.lower) === 0) {
+                sql.push('AND', quotedKeyColumnName, "LIKE ? ESCAPE '^'");
+                sqlValues.push(
+                    '%' + util.sqlLIKEEscape(
+                        /** @type {string} */ (me.__range.__lowerCached).slice(0, -1)
+                    ) + '%'
+                );
+            }
+        }
 
-        // 2. Sort by primaryKey (if defined and not unique)
-        if (!me.__unique && me.__keyColumnName !== 'key') { // Avoid adding 'key' twice
-            sql.push(',', util.sqlQuote('key'), direction);
+        if (primaryKey !== undefined) {
+            sql.push('AND', quotedKey, op + '= ?');
+            // Key.convertValueToKey(primaryKey); // Already checked by `continuePrimaryKey`
+            sqlValues.push(/** @type {string} */ (Key.encode(primaryKey)));
+        }
+        if (key !== undefined) {
+            sql.push('AND', quotedKeyColumnName, op + '= ?');
+            // Key.convertValueToKey(key); // Already checked by `continue` or `continuePrimaryKey`
+            sqlValues.push(/** @type {string} */ (Key.encode(key)));
+        } else if (me.__continuationKey !== undefined) {
+            // Resume from the last underlying (physical) row we scanned, not
+            // from the last *matching* multi-entry value (which lives in a
+            // different key-space than the raw index column and cannot be
+            // reliably compared against it, e.g. for array index keys).
+            sql.push(
+                'AND (', quotedKeyColumnName, op, '?',
+                'OR (', quotedKeyColumnName, '= ?', 'AND', quotedKey, op, '?))'
+            );
+            const encodedContinuationKey = /** @type {string} */ (
+                Key.encode(me.__continuationKey, true)
+            );
+            sqlValues.push(
+                encodedContinuationKey,
+                encodedContinuationKey,
+                /** @type {string} */ (Key.encode(me.__continuationPrimaryKey))
+            );
         }
 
-        // 3. Sort by position (if defined)
+        if (!me.__count) {
+            // 1. Sort by key
+            sql.push('ORDER BY', quotedKeyColumnName, direction);
 
-        if (!me.__unique && me.__indexSource) {
-            // 4. Sort by object store position (if defined and not unique)
-            sql.push(',', util.sqlQuote(me.__valueColumnName), direction);
+            // 2. Sort by primaryKey (if defined and not unique)
+            if (!me.__unique && me.__keyColumnName !== 'key') { // Avoid adding 'key' twice
+                sql.push(',', util.sqlQuote('key'), direction);
+            }
+
+            // 3. Sort by position (if defined)
+
+            if (!me.__unique && me.__indexSource) {
+                // 4. Sort by object store position (if defined and not unique)
+                sql.push(',', util.sqlQuote(me.__valueColumnName), direction);
+            }
+            sql.push('LIMIT', String(recordsToLoad));
         }
-        sql.push('LIMIT', String(recordsToLoad));
-    }
-    const sqlStr = sql.join(' ');
-    if (CFG.DEBUG) { console.log(sqlStr, sqlValues); }
+        const sqlStr = sql.join(' ');
+        if (CFG.DEBUG) { console.log('[multiEntry] query', sqlStr, sqlValues); }
+
+        tx.executeSql(sqlStr, sqlValues, function (tx, data) {
+            if (data.rows.length === 0) {
+                me.__multiEntryExhausted = true;
+                if (CFG.DEBUG) { console.log('[multiEntry] Reached end of multiEntry cursor (no more rows)'); }
+                success(undefined, undefined, undefined);
+                return;
+            }
 
-    tx.executeSql(sqlStr, sqlValues, function (tx, data) {
-        if (data.rows.length > 0) {
             if (me.__count) { // Avoid caching and other processing below
                 let ct = 0;
                 for (let i = 0; i < data.rows.length; i++) {
@@ -352,6 +388,17 @@ IDBCursor.prototype.__findMultiEntry = function (key, primaryKey, tx, success, e
                 success(undefined, ct, undefined);
                 return;
             }
+
+            // Track how far we've physically scanned, regardless of whether
+            // this batch produced any matches, so the next batch (if any)
+            // resumes after this one instead of re-scanning or stopping early.
+            const lastRawRow = data.rows.item(data.rows.length - 1);
+            me.__continuationKey = Key.decode(lastRawRow[me.__keyColumnName], true);
+            me.__continuationPrimaryKey = Key.decode(lastRawRow.key);
+            if (data.rows.length < recordsToLoad) {
+                me.__multiEntryExhausted = true;
+            }
+
             const rows = [];
             for (let i = 0; i < data.rows.length; i++) {
                 const rowItem = data.rows.item(i);
@@ -373,6 +420,18 @@ IDBCursor.prototype.__findMultiEntry = function (key, primaryKey, tx, success, e
                     rows.push(clone);
                 }
             }
+
+            if (rows.length === 0) {
+                if (me.__multiEntryExhausted) {
+                    if (CFG.DEBUG) { console.log('[multiEntry] Reached end of multiEntry cursor (last batch had no matches)'); }
+                    success(undefined, undefined, undefined);
+                    return;
+                }
+                if (CFG.DEBUG) { console.log('[multiEntry] batch had no matches; fetching next batch'); }
+                runQuery();
+                return;
+            }
+
             const reverse = me.direction.indexOf('prev') === 0;
             rows.sort(function (a, b) {
                 if (a.matchingKey.replaceAll(leftBracketRegex, 'z') < b.matchingKey.replaceAll(leftBracketRegex, 'z')) {
@@ -390,37 +449,28 @@ IDBCursor.prototype.__findMultiEntry = function (key, primaryKey, tx, success, e
                 return 0;
             });
 
-            if (rows.length > 1) {
-                me.__prefetchedIndex = 0;
-                me.__prefetchedData = {
-                    data: rows,
-                    length: rows.length,
-                    /**
-                     * @param {Integer} index
-                     * @returns {RowItemNonNull}
-                     */
-                    item (index) {
-                        return this.data[index];
-                    }
-                };
-                if (CFG.DEBUG) { console.log('Preloaded ' + me.__prefetchedData.length + ' records for multiEntry cursor'); }
-                me.__decode(rows[0], success);
-            } else if (rows.length === 1) {
-                if (CFG.DEBUG) { console.log('Reached end of multiEntry cursor'); }
-                me.__decode(rows[0], success);
-            } else {
-                if (CFG.DEBUG) { console.log('Reached end of multiEntry cursor'); }
-                success(undefined, undefined, undefined);
-            }
-        } else {
-            if (CFG.DEBUG) { console.log('Reached end of multiEntry cursor'); }
-            success(undefined, undefined, undefined);
-        }
-    }, function (tx, err) {
-        if (CFG.DEBUG) { console.log('Could not execute Cursor.continue', sqlStr, sqlValues); }
-        error(err);
-        return false;
-    });
+            me.__prefetchedIndex = 0;
+            me.__prefetchedData = {
+                data: rows,
+                length: rows.length,
+                /**
+                 * @param {Integer} index
+                 * @returns {RowItemNonNull}
+                 */
+                item (index) {
+                    return this.data[index];
+                }
+            };
+            if (CFG.DEBUG) { console.log('[multiEntry] Preloaded ' + me.__prefetchedData.length + ' records for multiEntry cursor'); }
+            me.__decode(rows[0], success);
+        }, function (tx, err) {
+            if (CFG.DEBUG) { console.log('[multiEntry] Could not execute Cursor.continue', sqlStr, sqlValues); }
+            error(err);
+            return false;
+        });
+    }
+
+    runQuery();
 };
 
 /**
@@ -432,19 +482,19 @@ IDBCursor.prototype.__findMultiEntry = function (key, primaryKey, tx, success, e
  */
 
 /**
-* @callback SuccessArg
-* @param {StructuredCloneValue} value
-* @param {import('./IDBRequest.js').IDBRequestFull} req
-* @returns {void}
-*/
+ * @callback SuccessArg
+ * @param {StructuredCloneValue} value
+ * @param {import('./IDBRequest.js').IDBRequestFull} req
+ * @returns {void}
+ */
 
 /**
-* @callback SuccessCallback
-* @param {IndexedDBKey} key
-* @param {StructuredCloneValue} value
-* @param {IndexedDBKey} primaryKey
-* @returns {void}
-*/
+ * @callback SuccessCallback
+ * @param {IndexedDBKey} key
+ * @param {StructuredCloneValue} value
+ * @param {IndexedDBKey} primaryKey
+ * @returns {void}
+ */
 
 /**
  * Creates an "onsuccess" callback.
@@ -472,11 +522,11 @@ IDBCursor.prototype.__onsuccess = function (success) {
 
 /**
  * @typedef {{
-*   matchingKey: string,
-*   key: string,
-*   [k: string]: string
-* }} RowItemNonNull
-*/
+ *   matchingKey: string,
+ *   key: string,
+ *   [k: string]: string
+ * }} RowItemNonNull
+ */
 
 /**
  *
@@ -540,6 +590,7 @@ IDBCursor.prototype.__sourceOrEffectiveObjStoreDeleted = function () {
 IDBCursor.prototype.__invalidateCache = function () {
     // @ts-expect-error Why is this not being found?
     this.__prefetchedData = null;
+    this.__multiEntryExhausted = false;
 };
 
 /**
@@ -599,9 +650,8 @@ IDBCursor.prototype.__continueFinish = function (key, primaryKey, advanceState)
                     me.__advanceCount--;
                     me.__key = k;
                     me.__continue(undefined, true);
-                    /** @type {() => void} */ (
-                        executeNextRequest
-                    )(); // We don't call success yet but do need to advance the transaction queue
+                    // We don't call success yet but do need to advance the transaction queue
+                    util.runContinuationSafely(/** @type {() => void} */ (executeNextRequest));
                     return;
                 }
                 me.__advanceCount = undefined;
@@ -627,12 +677,12 @@ IDBCursor.prototype.__continueFinish = function (key, primaryKey, advanceState)
                             return;
                         }
                         // @ts-expect-error Todo: Our bug to fix
-                        cursorContinue(tx, args, success, error);
+                        util.runContinuationSafely(() => cursorContinue(tx, args, success, error));
                     }
                     if (me.__unique && !me.__multiEntryIndex &&
                         encKey === Key.encode(me.key, me.__multiEntryIndex)) {
                         // @ts-expect-error Todo: Our bug to fix
-                        cursorContinue(tx, args, success, error);
+                        util.runContinuationSafely(() => cursorContinue(tx, args, success, error));
                         return;
                     }
                     checkKey();