@fireproof/core 0.17.1 → 0.17.2

package/dist/node/fireproof.d.ts

@@ -17,13 +17,16 @@ type ClockHead = ClockLink[];
 type DocFragment = Uint8Array | string | number | boolean | null | AnyLink | DocFragment[] | {
     [key: string]: DocFragment;
 };
-type DocRecord = Record<string, DocFragment>;
-type Doc<T extends DocRecord = {}> = DocBase & DocBody<T>;
+type DocRecord<T> = {
+    [K in keyof T]: DocFragment;
+};
+type DocFiles = Record<string, DocFileMeta | File>;
 type DocBase = {
     _id?: string;
     _files?: DocFiles;
     _publicFiles?: DocFiles;
 };
+type Doc<T extends DocRecord<T> = {}> = DocBase & T;
 type DocFileMeta = {
     type: string;
     size: number;
@@ -32,12 +35,6 @@ type DocFileMeta = {
     url?: string;
     file?: () => Promise<File>;
 };
-type DocFiles = Record<string, DocFileMeta | File>;
-type DocBody<T extends DocRecord = {}> = {
-    _id?: string;
-} & {
-    [K in Exclude<keyof T, keyof DocBase>]: DocFragment;
-} & T;
 type DocUpdate = {
     key: string;
     value?: Record<string, any>;
@@ -54,7 +51,7 @@ type IndexUpdate = {
     value?: DocFragment;
     del?: boolean;
 };
-type IndexRow<T extends DocRecord = {}> = {
+type IndexRow<T extends DocRecord<T> = {}> = {
     id: string;
     key: IndexKey;
     row?: DocFragment;
@@ -95,12 +92,12 @@ type AnyDecodedBlock = {
     value: any;
 };
 type EmitFn = (k: DocFragment, v?: DocFragment) => void;
-type MapFn = <T extends DocRecord = {}>(doc: Doc<T>, emit: EmitFn) => DocFragment | void;
+type MapFn = <T extends DocRecord<T> = {}>(doc: Doc<T>, emit: EmitFn) => DocFragment | void;
 type ChangesOptions = {
     dirty?: boolean;
     limit?: number;
 };
-type ChangesResponse<T extends DocRecord = {}> = {
+type ChangesResponse<T extends DocRecord<T> = {}> = {
     clock: ClockHead;
     rows: {
         key: string;
@@ -121,7 +118,7 @@ declare class IndexTree {
     root: ProllyNode | null;
 }
 interface ProllyNode extends ProllyNode$1 {
-    getAllEntries<T extends DocRecord = {}>(): PromiseLike<{
+    getAllEntries<T extends DocRecord<T> = {}>(): PromiseLike<{
         [x: string]: any;
         result: IndexRow<T>[];
     }>;
@@ -129,10 +126,10 @@ interface ProllyNode extends ProllyNode$1 {
         [x: string]: any;
         result: IndexKey[];
     }>;
-    range<T extends DocRecord = {}>(a: IndexKey, b: IndexKey): Promise<{
+    range<T extends DocRecord<T> = {}>(a: IndexKey, b: IndexKey): Promise<{
         result: IndexRow<T>[];
     }>;
-    get<T extends DocRecord = {}>(key: string): Promise<{
+    get<T extends DocRecord<T> = {}>(key: string): Promise<{
         result: IndexRow<T>[];
     }>;
     bulk(bulk: IndexUpdate[]): PromiseLike<{
@@ -159,8 +156,8 @@ declare class Index {
     initError: Error | null;
     ready: Promise<void>;
     constructor(crdt: CRDT, name: string, mapFn?: MapFn, meta?: IdxMeta);
-    applyMapFn<T extends Record<string, any> = {}>(name: string, mapFn?: MapFn, meta?: IdxMeta): void;
-    query<T extends DocRecord = {}>(opts?: QueryOpts): Promise<{
+    applyMapFn<T extends DocRecord<T> = {}>(name: string, mapFn?: MapFn, meta?: IdxMeta): void;
+    query<T extends DocRecord<T> = {}>(opts?: QueryOpts): Promise<{
         rows: IndexRow<T>[];
     }>;
     _resetIndex(): void;
@@ -263,18 +260,18 @@ declare class Database {
     _writeQueue: WriteQueue;
     blockstore: EncryptedBlockstore;
     constructor(name?: string, opts?: ConfigOpts);
-    get<T extends DocRecord = {}>(id: string): Promise<Doc<T>>;
-    put<T extends DocRecord = {}>(doc: Doc<T>): Promise<DbResponse>;
+    get<T extends DocRecord<T> = {}>(id: string): Promise<Doc<T>>;
+    put<T extends DocRecord<T> = {}>(doc: Doc<T>): Promise<DbResponse>;
     del(id: string): Promise<DbResponse>;
-    changes<T extends DocRecord = {}>(since?: ClockHead, opts?: ChangesOptions): Promise<ChangesResponse<T>>;
-    allDocs<T extends DocRecord = {}>(): Promise<{
+    changes<T extends DocRecord<T> = {}>(since?: ClockHead, opts?: ChangesOptions): Promise<ChangesResponse<T>>;
+    allDocs<T extends DocRecord<T> = {}>(): Promise<{
         rows: {
             key: string;
             value: Doc<T>;
         }[];
         clock: ClockHead;
     }>;
-    allDocuments<T extends DocRecord = {}>(): Promise<{
+    allDocuments<T extends DocRecord<T> = {}>(): Promise<{
         rows: {
             key: string;
             value: Doc<T>;
@@ -282,17 +279,17 @@ declare class Database {
         clock: ClockHead;
     }>;
     subscribe(listener: ListenerFn | NoUpdateListenerFn, updates?: boolean): () => void;
-    query<T extends DocRecord = {}>(field: string | MapFn, opts?: QueryOpts): Promise<{
+    query<T extends DocRecord<T> = {}>(field: string | MapFn, opts?: QueryOpts): Promise<{
         rows: IndexRow<T>[];
     }>;
     compact(): Promise<void>;
     _notify(updates: DocUpdate[]): Promise<void>;
     _no_update_notify(): Promise<void>;
 }
-type UpdateListenerFn = <T extends DocRecord = {}>(docs: Doc<T>[]) => Promise<void> | void;
+type UpdateListenerFn = <T extends DocRecord<T>>(docs: Doc<T>[]) => Promise<void> | void;
 type NoUpdateListenerFn = () => Promise<void> | void;
 type ListenerFn = UpdateListenerFn | NoUpdateListenerFn;
 declare function fireproof(name: string, opts?: ConfigOpts): Database;
 
-export { type AnyBlock, type AnyDecodedBlock, type AnyLink, type CRDTMeta, type ChangesOptions, type ChangesResponse, type ClockHead, type ClockLink, type ConfigOpts, Database, type DbResponse, type Doc, type DocBase, type DocBody, type DocFileMeta, type DocFiles, type DocFragment, type DocRecord, type DocUpdate, type DocValue, type IdxMeta, type IdxMetaMap, type IndexKey, type IndexRow, type IndexUpdate, type MapFn, type QueryOpts, fireproof };
+export { type AnyBlock, type AnyDecodedBlock, type AnyLink, type CRDTMeta, type ChangesOptions, type ChangesResponse, type ClockHead, type ClockLink, type ConfigOpts, Database, type DbResponse, type Doc, type DocBase, type DocFileMeta, type DocFiles, type DocFragment, type DocRecord, type DocUpdate, type DocValue, type IdxMeta, type IdxMetaMap, type IndexKey, type IndexRow, type IndexUpdate, type MapFn, type QueryOpts, fireproof };
 declare module '@fireproof/core'

package/dist/node/fireproof.global.js

@@ -10218,8 +10218,7 @@ You can use close({ resize: true }) to resize header`);
     }
     async _commitInternal(t, done, opts = { noLoader: false, compact: false }) {
       await this.ready;
-      const header = done;
-      const fp = this.makeCarHeader(header, this.carLog, !!opts.compact);
+      const fp = this.makeCarHeader(done, this.carLog, !!opts.compact);
       let roots = await this.prepareRoots(fp, t);
       const { cid, bytes } = await this.prepareCarFile(roots[0], t, !!opts.public);
       await this.carStore.save({ cid, bytes });
@@ -10250,10 +10249,9 @@ You can use close({ resize: true }) to resize header`);
     }
     async updateCarLog(cid, fp, compact) {
       if (compact) {
-        const fpCar = fp;
-        const previousCompactCid = this.carLog[this.carLog.length - 1];
-        fpCar.compact.map((c) => c.toString()).forEach(this.seenCompacted.add, this.seenCompacted);
-        this.carLog = [...uniqueCids([cid, ...this.carLog], this.seenCompacted)];
+        const previousCompactCid = fp.compact[fp.compact.length - 1];
+        fp.compact.map((c) => c.toString()).forEach(this.seenCompacted.add, this.seenCompacted);
+        this.carLog = [...uniqueCids([...this.carLog, ...fp.cars, cid], this.seenCompacted)];
         void this.removeCidsForCompact(previousCompactCid);
       } else {
         this.carLog.unshift(cid);
@@ -10267,13 +10265,14 @@ You can use close({ resize: true }) to resize header`);
         await this.carStore.remove(cid2);
       }
     }
-    async flushCars() {
-      await this.ready;
-      for (const cid of this.carLog) {
-        const dbMeta = { car: cid, key: this.key || null };
-        await this.remoteWAL.enqueue(dbMeta, { public: false });
-      }
-    }
+    // async flushCars() {
+    //   await this.ready
+    //   // for each cid in car log, make a dbMeta
+    //   for (const cid of this.carLog) {
+    //     const dbMeta = { car: cid, key: this.key || null } as DbMeta
+    //     await this.remoteWAL!.enqueue(dbMeta, { public: false })
+    //   }
+    // }
     async *entries() {
       await this.ready;
       for (const [, block] of this.getBlockCache) {
@@ -28481,8 +28480,10 @@ ${key.data.toString("base64")}
 
   // src/crdt-helpers.ts
   function time(tag2) {
+    console.time(tag2);
   }
   function timeEnd(tag2) {
+    console.timeEnd(tag2);
   }
   async function applyBulkUpdateToCrdt(tblocks, head, updates) {
     let result = null;
@@ -29249,7 +29250,7 @@ ${key.data.toString("base64")}
             }
           } else {
             if (!mapFn) {
-              mapFn = makeMapFnFromName(name7);
+              mapFn = (doc) => doc[name7] ?? void 0;
             }
             if (this.mapFnString) {
               if (this.mapFnString !== mapFn.toString())
@@ -29390,9 +29391,6 @@ ${key.data.toString("base64")}
       });
     }
   };
-  function makeMapFnFromName(name7) {
-    return (doc) => doc[name7] ?? void 0;
-  }
 
   // src/apply-head-queue.ts
   function applyHeadQueue(worker) {