@fireproof/core 0.20.5 → 0.21.0-dev-preview-2

package/react/img-file.js

@@ -1,49 +1,84 @@
-import React, { useState, useEffect } from "react";
+import { LRUMap } from "@adviser/cement";
+import React, { useState, useEffect, useRef, useMemo } from "react";
+const objectUrlCache = new LRUMap();
 function isFile(obj) {
     return "type" in obj && "size" in obj && "stream" in obj && typeof obj.stream === "function";
 }
 function isFileMeta(obj) {
     return "type" in obj && "size" in obj && "file" in obj && typeof obj.file === "function";
 }
+function getCacheKey(fileObj) {
+    return `${fileObj.name}-${fileObj.size}-${fileObj.lastModified}`;
+}
+function getObjectUrl(fileObj) {
+    const cacheKey = getCacheKey(fileObj);
+    if (!objectUrlCache.has(cacheKey)) {
+        objectUrlCache.set(cacheKey, URL.createObjectURL(fileObj));
+    }
+    return objectUrlCache.get(cacheKey);
+}
+async function loadFile({ fileData, fileObjRef, cleanupRef, setImgDataUrl, }) {
+    let fileObj = null;
+    let fileType = "";
+    if (fileData) {
+        switch (true) {
+            case isFile(fileData):
+                fileObj = fileData;
+                fileType = fileData.type;
+                break;
+            case isFileMeta(fileData):
+                fileType = fileData.type;
+                fileObj = typeof fileData.file === "function" ? await fileData.file() : null;
+                break;
+        }
+    }
+    if (fileObjRef.current !== fileObj && cleanupRef.current) {
+        cleanupRef.current();
+        cleanupRef.current = null;
+    }
+    if (fileObj && /image/.test(fileType)) {
+        if (fileObjRef.current !== fileObj) {
+            const src = getObjectUrl(fileObj);
+            setImgDataUrl(src);
+            fileObjRef.current = fileObj;
+            cleanupRef.current = () => {
+                const cacheKey = getCacheKey(fileObj);
+                if (objectUrlCache.has(cacheKey)) {
+                    URL.revokeObjectURL(objectUrlCache.get(cacheKey));
+                    objectUrlCache.delete(cacheKey);
+                }
+            };
+            return cleanupRef.current;
+        }
+        return cleanupRef.current;
+    }
+    return null;
+}
 export function ImgFile({ file, meta, ...imgProps }) {
     const [imgDataUrl, setImgDataUrl] = useState("");
-    const fileData = file || meta;
+    const fileObjRef = useRef(null);
+    const cleanupRef = useRef(null);
+    const fileData = useMemo(() => {
+        return file || meta;
+    }, [file, meta]);
     useEffect(() => {
         if (!fileData)
             return;
-        const loadFile = async () => {
-            let fileObj = null;
-            let fileType = "";
-            switch (true) {
-                case isFile(fileData):
-                    fileObj = fileData;
-                    fileType = fileData.type;
-                    break;
-                case isFileMeta(fileData):
-                    fileType = fileData.type;
-                    fileObj = (await fileData.file?.()) || null;
-                    break;
-            }
-            if (fileObj && /image/.test(fileType)) {
-                const src = URL.createObjectURL(fileObj);
-                setImgDataUrl(src);
-                return () => URL.revokeObjectURL(src);
-            }
-        };
         let isMounted = true;
-        let cleanup;
-        loadFile().then((result) => {
+        loadFile({ fileData, fileObjRef, cleanupRef, setImgDataUrl }).then(function handleResult(result) {
             if (isMounted) {
-                cleanup = result;
+                cleanupRef.current = result;
             }
             else if (result) {
                 result();
             }
         });
-        return () => {
+        return function cleanupEffect() {
             isMounted = false;
-            if (cleanup)
-                cleanup();
+            if (cleanupRef.current) {
+                cleanupRef.current();
+                cleanupRef.current = null;
+            }
         };
     }, [fileData]);
     return imgDataUrl

package/react/img-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"img-file.js","sourceRoot":"","sources":["../../../../src/react/img-file.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAqB,MAAM,OAAO,CAAC;AAetE,SAAS,MAAM,CAAC,GAAa;IAC3B,OAAO,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,CAAC;AAC/F,CAAC;AAGD,SAAS,UAAU,CAAC,GAAa;IAC/B,OAAO,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAgB;IAC/D,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAGjD,MAAM,QAAQ,GAAG,IAAI,IAAI,IAAI,CAAC;IAE9B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;YAC1B,IAAI,OAAO,GAAgB,IAAI,CAAC;YAChC,IAAI,QAAQ,GAAG,EAAE,CAAC;YAElB,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,MAAM,CAAC,QAAQ,CAAC;oBACnB,OAAO,GAAG,QAAQ,CAAC;oBACnB,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;oBACzB,MAAM;gBACR,KAAK,UAAU,CAAC,QAAQ,CAAC;oBACvB,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;oBACzB,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;oBAC5C,MAAM;YACV,CAAC;YAED,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAEtC,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBACzC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEnB,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,OAAiC,CAAC;QAEtC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACzB,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,GAAG,MAAM,CAAC;YACnB,CAAC;iBAAM,IAAI,MAAM,EAAE,CAAC;gBAClB,MAAM,EAAE,CAAC;YACX,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,SAAS,GAAG,KAAK,CAAC;YAClB,IAAI,OAAO;gBAAE,OAAO,EAAE,CAAC;QACzB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,OAAO,UAAU;QACf,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE;YACzB,GAAG,EAAE,UAAU;YACf,GAAG,QAAQ;SACZ,CAAC;QACJ,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"img-file.js","sourceRoot":"","sources":["../../../../src/react/img-file.ts"],"names":[],"mappings":"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"}

package/react/use-live-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-live-query.d.ts","sourceRoot":"","sources":["../../../../src/react/use-live-query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAa,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACjH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAKlD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,IACtB,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,YAAY,GAAG,MAAM,EAAE,CAAC,SAAS,WAAW,GAAG,CAAC,EACzG,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,EACxB,UAAU,EACV,cAAa,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAO,KACpC,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CA2B5B"}
+{"version":3,"file":"use-live-query.d.ts","sourceRoot":"","sources":["../../../../src/react/use-live-query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAa,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACjH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAKlD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,IACtB,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,YAAY,GAAG,MAAM,EAAE,CAAC,SAAS,WAAW,GAAG,CAAC,EACzG,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,EACxB,UAAU,EACV,cAAa,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAO,KACpC,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAwB5B"}

package/react/use-live-query.js

@@ -9,10 +9,7 @@ export function createUseLiveQuery(database) {
         const mapFnString = useMemo(() => mapFn.toString(), [mapFn]);
         const refreshRows = useCallback(async () => {
             const res = await database.query(mapFn, query);
-            setResult({
-                docs: res.rows.map((r) => r.doc).filter((r) => !!r),
-                rows: res.rows,
-            });
+            setResult(res);
         }, [database, mapFnString, queryString]);
         useEffect(() => {
             refreshRows();

package/react/use-live-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-live-query.js","sourceRoot":"","sources":["../../../../src/react/use-live-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAOlE,MAAM,UAAU,kBAAkB,CAAC,QAAkB;IACnD,OAAO,SAAS,YAAY,CAC1B,KAAwB,EACxB,KAAK,GAAG,EAAE,EACV,cAAmC,EAAE;QAErC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAA2B;YAC7D,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAqB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACzE,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7D,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YACzC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAU,KAAK,EAAE,KAAK,CAAC,CAAC;YACxD,SAAS,CAAC;gBACR,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAqB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtE,IAAI,EAAE,GAAG,CAAC,IAAI;aACf,CAAC,CAAC;QACL,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QAEzC,SAAS,CAAC,GAAG,EAAE;YACb,WAAW,EAAE,CAAC;YACd,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACpD,OAAO,GAAG,EAAE;gBACV,WAAW,EAAE,CAAC;YAChB,CAAC,CAAC;QACJ,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;QAE5B,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"use-live-query.js","sourceRoot":"","sources":["../../../../src/react/use-live-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAOlE,MAAM,UAAU,kBAAkB,CAAC,QAAkB;IACnD,OAAO,SAAS,YAAY,CAC1B,KAAwB,EACxB,KAAK,GAAG,EAAE,EACV,cAAmC,EAAE;QAErC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAA2B;YAC7D,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAqB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACzE,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7D,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YACzC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAU,KAAK,EAAE,KAAK,CAAC,CAAC;YACxD,SAAS,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QAEzC,SAAS,CAAC,GAAG,EAAE;YACb,WAAW,EAAE,CAAC;YACd,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACpD,OAAO,GAAG,EAAE;gBACV,WAAW,EAAE,CAAC;YAChB,CAAC,CAAC;QACJ,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;QAE5B,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}

package/tests/fireproof/charwise-boolean.test.ts

@@ -0,0 +1,67 @@
+import { describe, it, expect } from "vitest";
+// @ts-expect-error "charwise" has no types
+import charwise from "charwise";
+import { encodeKey } from "../../src/indexer-helpers.js";
+
+describe("charwise boolean handling", () => {
+  it("should encode and decode boolean values correctly", () => {
+    // Test true
+    const trueEncoded = charwise.encode(true);
+    expect(charwise.decode(trueEncoded)).toBe(true);
+
+    // Test false
+    const falseEncoded = charwise.encode(false);
+    expect(charwise.decode(falseEncoded)).toBe(false);
+  });
+
+  it("should differentiate between boolean values", () => {
+    const trueEncoded = charwise.encode(true);
+    const falseEncoded = charwise.encode(false);
+
+    // Ensure encoded values are different
+    expect(trueEncoded).not.toBe(falseEncoded);
+
+    // Test ordering
+    const orderedArray = [falseEncoded, trueEncoded].sort();
+
+    // In most collation systems, false should come before true
+    expect(orderedArray[0]).toBe(falseEncoded);
+    expect(orderedArray[1]).toBe(trueEncoded);
+  });
+
+  it("should differentiate boolean false from other values", () => {
+    const falseEncoded = charwise.encode(false);
+    const nullEncoded = charwise.encode(null);
+    const undefinedEncoded = charwise.encode(undefined);
+    const zeroEncoded = charwise.encode(0);
+    const emptyStringEncoded = charwise.encode("");
+
+    // Ensure false is different from other "falsy" values
+    expect(falseEncoded).not.toBe(nullEncoded);
+    expect(falseEncoded).not.toBe(undefinedEncoded);
+    expect(falseEncoded).not.toBe(zeroEncoded);
+    expect(falseEncoded).not.toBe(emptyStringEncoded);
+  });
+
+  it("should handle comparison of encoded boolean values", () => {
+    // Test with the charwise.encode directly
+    const falseEncoded = charwise.encode(false);
+    const trueEncoded = charwise.encode(true);
+
+    // Test with Fireproof's encodeKey function
+    const falseFireproofEncoded = encodeKey(false);
+    const trueFireproofEncoded = encodeKey(true);
+
+    // Check if Fireproof's encoding matches charwise directly
+    expect(falseFireproofEncoded).toBe(falseEncoded);
+    expect(trueFireproofEncoded).toBe(trueEncoded);
+
+    // Test exact matching
+    const falseTest = charwise.encode(false);
+    expect(falseTest).toBe(falseEncoded);
+
+    // Test if equality comparison works after encoding/decoding
+    expect(charwise.decode(falseEncoded)).toBe(false);
+    expect(charwise.decode(falseEncoded) === false).toBe(true);
+  });
+});

package/tests/fireproof/crdt.test.ts

@@ -356,7 +356,7 @@ describe("Compact a named CRDT with writes", function () {
 
 describe("CRDT with an index", function () {
   let crdt: CRDT;
-  let idx: Index<number, CRDTTestType>;
+  let idx: Index<CRDTTestType, number>;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await crdt.close();
@@ -378,7 +378,7 @@ describe("CRDT with an index", function () {
       { id: "ace", value: { points: 11 } },
       { id: "king", value: { points: 10 } },
     ]);
-    idx = await index<number, CRDTTestType>(crdt, "points");
+    idx = await index<CRDTTestType, number>(crdt, "points");
   });
   it("should query the data", async () => {
     const got = await idx.query({ range: [9, 12] });
@@ -387,7 +387,7 @@ describe("CRDT with an index", function () {
     expect(got.rows[0].key).toBe(10);
   });
   it("should register the index", async () => {
-    const rIdx = await index<number, CRDTTestType>(crdt, "points");
+    const rIdx = await index<CRDTTestType, number>(crdt, "points");
     expect(rIdx).toBeTruthy();
     expect(rIdx.name).toBe("points");
     const got = await rIdx.query({ range: [9, 12] });

package/tests/fireproof/deleted-docs-handling.test.ts

@@ -0,0 +1,112 @@
+import { describe, it, beforeEach, afterEach, expect } from "vitest";
+import { Database, fireproof } from "@fireproof/core";
+
+describe("allDocs deleted document handling", () => {
+  let db: Database;
+
+  beforeEach(async () => {
+    db = await fireproof("test-deleted-docs");
+
+    // Create a mix of regular and deleted documents
+    await db.put({ _id: "doc1", value: "one" });
+    await db.put({ _id: "doc2", value: "two" });
+    await db.put({ _id: "doc3", value: "three" });
+
+    // Create deleted documents
+    await db.put({ _id: "deleted1", value: "deleted-one", _deleted: true });
+    await db.put({ _id: "deleted2", value: "deleted-two", _deleted: true });
+  });
+
+  afterEach(async () => {
+    await db.destroy();
+  });
+
+  it("should exclude deleted documents by default (currently failing)", async () => {
+    const result = await db.allDocs();
+
+    // This test will fail because allDocs() currently returns deleted documents
+    expect(result.rows.length).toBe(3); // Only non-deleted docs should be returned
+
+    const ids = result.rows.map((row) => row.key);
+    expect(ids).toContain("doc1");
+    expect(ids).toContain("doc2");
+    expect(ids).toContain("doc3");
+    expect(ids).not.toContain("deleted1");
+    expect(ids).not.toContain("deleted2");
+  });
+
+  it("should include deleted documents when includeDeleted is true (new feature)", async () => {
+    // This test will fail because the includeDeleted option doesn't exist yet
+    const result = await db.allDocs({ includeDeleted: true });
+
+    expect(result.rows.length).toBe(5); // All docs
+
+    const ids = result.rows.map((row) => row.key);
+    expect(ids).toContain("doc1");
+    expect(ids).toContain("doc2");
+    expect(ids).toContain("doc3");
+    expect(ids).toContain("deleted1");
+    expect(ids).toContain("deleted2");
+  });
+
+  it("handles empty databases correctly", async () => {
+    // Create a new empty database
+    const emptyDb = await fireproof("test-empty-db");
+
+    // Test with default options
+    const defaultResult = await emptyDb.allDocs();
+    expect(defaultResult.rows.length).toBe(0);
+
+    // Test with includeDeleted option
+    const includeDeletedResult = await emptyDb.allDocs({ includeDeleted: true });
+    expect(includeDeletedResult.rows.length).toBe(0);
+
+    await emptyDb.destroy();
+  });
+
+  it("handles database with only deleted documents", async () => {
+    // Create a database with only deleted documents
+    const deletedOnlyDb = await fireproof("test-deleted-only-db");
+
+    // Add only deleted documents
+    await deletedOnlyDb.put({ _id: "deleted1", value: "deleted-one", _deleted: true });
+    await deletedOnlyDb.put({ _id: "deleted2", value: "deleted-two", _deleted: true });
+
+    // By default, should return empty result
+    const defaultResult = await deletedOnlyDb.allDocs();
+    expect(defaultResult.rows.length).toBe(0); // This will fail with current implementation
+
+    // With includeDeleted, should return all deleted docs
+    const includeDeletedResult = await deletedOnlyDb.allDocs({ includeDeleted: true });
+    expect(includeDeletedResult.rows.length).toBe(2);
+
+    await deletedOnlyDb.destroy();
+  });
+
+  it("respects limit option while excluding deleted documents", async () => {
+    // Test with limit option
+    const limitResult = await db.allDocs({ limit: 2 });
+
+    expect(limitResult.rows.length).toBe(2);
+
+    // All returned documents should be non-deleted
+    const docs = await Promise.all(limitResult.rows.map((row) => db.get(row.key)));
+    docs.forEach((doc) => {
+      expect(doc._deleted).not.toBe(true);
+    });
+  });
+
+  it("respects limit option while including deleted documents", async () => {
+    // Test with limit and includeDeleted options
+    const result = await db.allDocs({ limit: 3, includeDeleted: true });
+
+    expect(result.rows.length).toBe(3);
+
+    // Can include both deleted and non-deleted documents
+    const ids = result.rows.map((row) => row.key);
+
+    // We don't test specific IDs here because the order depends on implementation
+    // Just verify that the limit is respected
+    expect(ids.length).toBe(3);
+  });
+});

package/tests/fireproof/fireproof.test.ts

@@ -39,7 +39,7 @@ describe("dreamcode", function () {
   }
   let ok: DocResponse;
   let doc: DocWithId<Doc>;
-  let result: IndexRows<string, Doc>;
+  let result: IndexRows<Doc, string>;
   let db: Database;
   const sthis = ensureSuperThis();
   afterEach(async () => {
@@ -67,7 +67,7 @@ describe("dreamcode", function () {
     expect(result.rows[0].key).toBe("fireproof");
   });
   it("should query with function", async () => {
-    const result = await db.query<boolean, Doc>((doc) => doc.dream);
+    const result = await db.query<Doc, boolean>((doc) => doc.dream);
     expect(result).toBeTruthy();
     expect(result.rows).toBeTruthy();
     expect(result.rows.length).toBe(1);
@@ -82,7 +82,7 @@ describe("public API", function () {
   let db: Database;
   let ok: DocResponse;
   let doc: DocWithId<Doc>;
-  let query: IndexRows<string, Doc>;
+  let query: IndexRows<Doc, string>;
   const sthis = ensureSuperThis();
 
   afterEach(async () => {
@@ -96,7 +96,7 @@ describe("public API", function () {
     // index = index(db, 'test-index', (doc) => doc.foo)
     ok = await db.put({ _id: "test", foo: "bar" });
     doc = await db.get("test");
-    query = await db.query<string, Doc>((doc) => doc.foo);
+    query = await db.query<Doc, string>((doc) => doc.foo);
   });
   it("should be a ledger instance", function () {
     expect(db).toBeTruthy();
@@ -199,7 +199,7 @@ describe("basic ledger", function () {
   it("can define an index", async () => {
     const ok = await db.put({ _id: "test", foo: "bar" });
     expect(ok).toBeTruthy();
-    const idx = index<string, { foo: string }>(db, "test-index", (doc) => doc.foo);
+    const idx = index<{ foo: string }, string>(db, "test-index", (doc) => doc.foo);
     const result = await idx.query();
     expect(result).toBeTruthy();
     expect(result.rows).toBeTruthy();
@@ -223,10 +223,10 @@ describe("basic ledger", function () {
       baz: string;
     }
     await db.put<TestDoc>({ _id: "test", foo: "bar", baz: "qux" });
-    const query1 = await db.query<string, TestDoc>((doc) => {
+    const query1 = await db.query<TestDoc, string>((doc) => {
       return doc.foo;
     });
-    const query2 = await db.query<string, TestDoc>((doc) => {
+    const query2 = await db.query<TestDoc, string>((doc) => {
       return doc.baz;
     });
     expect(query1).toBeTruthy();
@@ -550,7 +550,7 @@ describe("Reopening a ledger with indexes", function () {
     foo: string;
   }
   let db: Database;
-  let idx: Index<string, Doc>;
+  let idx: Index<Doc, string>;
   let didMap: boolean;
   let mapFn: MapFn<Doc>;
   const sthis = ensureSuperThis();
@@ -570,13 +570,13 @@ describe("Reopening a ledger with indexes", function () {
       didMap = true;
       return doc.foo;
     };
-    idx = index<string, Doc>(db, "foo", mapFn);
+    idx = index<Doc, string>(db, "foo", mapFn);
   });
 
   it("should persist data", async () => {
     const doc = await db.get<Doc>("test");
     expect(doc.foo).toBe("bar");
-    const idx2 = index<string, Doc>(db, "foo");
+    const idx2 = index<Doc, string>(db, "foo");
     expect(idx2).toBe(idx);
     const result = await idx2.query();
     expect(result).toBeTruthy();

package/tests/fireproof/hello.test.ts

@@ -24,7 +24,7 @@ describe("hello public API", () => {
   beforeEach(async () => {
     await sthis.start();
     db = fireproof("test-public-api");
-    index<string, TestDoc>(db, "test-index", (doc) => doc.foo);
+    index<TestDoc, string>(db, "test-index", (doc) => doc.foo);
     ok = await db.put({ _id: "test", foo: "bar" });
     doc = await db.get("test");
   });

package/tests/fireproof/indexer.test.ts

@@ -23,7 +23,7 @@ interface TestType {
 
 describe("basic Index", () => {
   let db: Database;
-  let indexer: Index<string, TestType>;
+  let indexer: Index<TestType, string>;
   let didMap: boolean;
   const sthis = ensureSuperThis();
   afterEach(async () => {
@@ -38,7 +38,7 @@ describe("basic Index", () => {
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "hello", (doc) => {
+    indexer = new Index<TestType, string>(sthis, db.ledger.crdt, "hello", (doc) => {
       didMap = true;
       return doc.title;
     });
@@ -111,7 +111,7 @@ describe("basic Index", () => {
 
 describe("Index query with compound key", function () {
   let db: Database;
-  let indexer: Index<[string, number], TestType>;
+  let indexer: Index<TestType, [string, number]>;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
@@ -126,7 +126,7 @@ describe("Index query with compound key", function () {
     await db.put({ title: "creative", score: 2 });
     await db.put({ title: "creative", score: 20 });
     await db.put({ title: "bazillas", score: 3 });
-    indexer = new Index<[string, number], TestType>(sthis, db.ledger.crdt, "hello", (doc) => {
+    indexer = new Index<TestType, [string, number]>(sthis, db.ledger.crdt, "hello", (doc) => {
       return [doc.title, doc.score];
     });
     await indexer.ready();
@@ -141,7 +141,7 @@ describe("Index query with compound key", function () {
 
 describe("basic Index with map fun", function () {
   let db: Database;
-  let indexer: Index<string, TestType>;
+  let indexer: Index<TestType, string>;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
@@ -155,7 +155,7 @@ describe("basic Index with map fun", function () {
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "hello", (doc, map) => {
+    indexer = new Index<TestType, string>(sthis, db.ledger.crdt, "hello", (doc, map) => {
       map(doc.title);
     });
     await indexer.ready();
@@ -171,7 +171,7 @@ describe("basic Index with map fun", function () {
 
 describe("basic Index with map fun with value", function () {
   let db: Database;
-  let indexer: Index<string, TestType, number>;
+  let indexer: Index<TestType, string, number>;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
@@ -183,7 +183,7 @@ describe("basic Index with map fun with value", function () {
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType, number>(sthis, db.ledger.crdt, "hello", (doc, map) => {
+    indexer = new Index<TestType, string, number>(sthis, db.ledger.crdt, "hello", (doc, map) => {
       map(doc.title, doc.title.length);
     });
   });
@@ -209,7 +209,7 @@ describe("basic Index with map fun with value", function () {
 
 describe("Index query with map and compound key", function () {
   let db: Database;
-  let indexer: Index<[string, number], TestType>;
+  let indexer: Index<TestType, [string, number]>;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
@@ -224,7 +224,7 @@ describe("Index query with map and compound key", function () {
     await db.put({ title: "creative", score: 2 });
     await db.put({ title: "creative", score: 20 });
     await db.put({ title: "bazillas", score: 3 });
-    indexer = new Index<[string, number], TestType>(sthis, db.ledger.crdt, "hello", (doc, emit) => {
+    indexer = new Index<TestType, [string, number]>(sthis, db.ledger.crdt, "hello", (doc, emit) => {
       emit([doc.title, doc.score]);
     });
     await indexer.ready();
@@ -239,7 +239,7 @@ describe("Index query with map and compound key", function () {
 
 describe("basic Index with string fun", function () {
   let db: Database;
-  let indexer: Index<string, TestType>;
+  let indexer: Index<TestType, string>;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
@@ -253,7 +253,7 @@ describe("basic Index with string fun", function () {
     await db.put({ title: "amazing" });
     await db.put({ title: "creative" });
     await db.put({ title: "bazillas" });
-    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "title");
+    indexer = new Index<TestType, string>(sthis, db.ledger.crdt, "title");
     await indexer.ready();
   });
   it("should get results", async () => {
@@ -271,7 +271,7 @@ describe("basic Index with string fun", function () {
 
 describe("basic Index with string fun and numeric keys", function () {
   let db: Database;
-  let indexer: Index<string, TestType>;
+  let indexer: Index<TestType, string>;
   const sthis = ensureSuperThis();
   afterEach(async () => {
     await db.close();
@@ -286,7 +286,7 @@ describe("basic Index with string fun and numeric keys", function () {
     await db.put({ points: 1 });
     await db.put({ points: 2 });
     await db.put({ points: 3 });
-    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "points");
+    indexer = new Index<TestType, string>(sthis, db.ledger.crdt, "points");
     await indexer.ready();
   });
   it("should get results", async () => {
@@ -308,10 +308,10 @@ describe("basic Index upon cold start", function () {
     score?: number;
   }
   let crdt: CRDT;
-  let indexer: Index<string, TestType>;
+  let indexer: Index<TestType>;
   let didMap: number;
   let mapFn: (doc: TestType) => string;
-  let result: IndexRows<string, TestType>;
+  let result: IndexRows<TestType>;
   const sthis = ensureSuperThis();
   let dbOpts: LedgerOpts;
   // result, mapFn;
@@ -346,7 +346,7 @@ describe("basic Index upon cold start", function () {
       didMap++;
       return doc.title;
     };
-    indexer = await index<string, TestType>(crdt, "hello", mapFn);
+    indexer = await index<TestType>(crdt, "hello", mapFn);
     logger.Debug().Msg("post index beforeEach");
     await indexer.ready();
     logger.Debug().Msg("post indexer.ready beforeEach");
@@ -371,7 +371,7 @@ describe("basic Index upon cold start", function () {
     const { result, head } = await crdt2.changes();
     expect(result).toBeTruthy();
     await crdt2.ready();
-    const indexer2 = await index<string, TestType>(crdt2, "hello", mapFn);
+    const indexer2 = await index<TestType>(crdt2, "hello", mapFn);
     await indexer2.ready();
     const result2 = await indexer2.query();
     expect(indexer2.indexHead).toEqual(head);
@@ -407,7 +407,7 @@ describe("basic Index upon cold start", function () {
   });
   it("should ignore meta when map function definiton changes", async () => {
     const crdt2 = new CRDTImpl(sthis, dbOpts);
-    const result = await index<string, TestType>(crdt2, "hello", (doc) => doc.title.split("").reverse().join("")).query();
+    const result = await index<TestType>(crdt2, "hello", (doc) => doc.title.split("").reverse().join("")).query();
     expect(result.rows.length).toEqual(3);
     expect(result.rows[0].key).toEqual("evitaerc"); // creative
   });
@@ -415,7 +415,7 @@ describe("basic Index upon cold start", function () {
 
 describe("basic Index with no data", function () {
   let db: Database;
-  let indexer: Index<string, TestType>;
+  let indexer: Index<TestType>;
   let didMap: boolean;
   const sthis = ensureSuperThis();
   afterEach(async () => {
@@ -427,7 +427,7 @@ describe("basic Index with no data", function () {
   beforeEach(async () => {
     await sthis.start();
     db = fireproof("test-indexer");
-    indexer = new Index<string, TestType>(sthis, db.ledger.crdt, "hello", (doc) => {
+    indexer = new Index<TestType>(sthis, db.ledger.crdt, "hello", (doc) => {
       didMap = true;
       return doc.title;
     });