@peerbit/log 3.0.34-aa577a5 → 3.0.34-cccc078

package/dist/src/log-sorting.js

@@ -1,87 +1,105 @@
-import {} from "./entry.js";
-import { LamportClock as Clock } from "./clock.js";
-import { compare } from "uint8arrays";
-const First = (a, b) => a;
+import { Compare, IntegerCompare, Sort, SortDirection, } from "@peerbit/indexer-interface";
+export const ENTRY_SORT_SHAPE = {
+    hash: true,
+    meta: { gid: true, clock: true },
+};
 /**
  * Sort two entries as Last-Write-Wins (LWW).
  *
  * Last Write Wins is a conflict resolution strategy for sorting elements
  * where the element with a greater clock (latest) is chosen as the winner.
  *
- * @param {Entry} a First entry
- * @param {Entry} b Second entry
- * @returns {number} 1 if a is latest, -1 if b is latest
- */
-export const LastWriteWins = (a, b) => {
-    // Ultimate conflict resolution (take the first/left arg)
-    // Sort two entries by their clock id, if the same always take the first
-    const sortById = (a, b) => SortByClockId(a, b, First);
-    // Sort two entries by their clock time, if concurrent,
-    // determine sorting using provided conflict resolution function
-    const sortByEntryClocks = (a, b) => SortByClocks(a, b, sortById);
-    // Sort entries by clock time as the primary sort criteria
-    return sortByEntryClocks(a, b);
-};
-/**
- * Sort two entries by their hash.
- *
- * @param {Entry} a First entry
- * @param {Entry} b Second entry
- * @returns {number} 1 if a is latest, -1 if b is latest
  */
-export const SortByEntryHash = (a, b) => {
-    // Ultimate conflict resolution (compare hashes)
-    const compareHash = (a, b) => a.hash < b.hash ? -1 : 1;
-    // Sort two entries by their clock id, if the same then compare hashes
-    const sortById = (a, b) => SortByClockId(a, b, compareHash);
-    // Sort two entries by their clock time, if concurrent,
-    // determine sorting using provided conflict resolution function
-    const sortByEntryClocks = (a, b) => SortByClocks(a, b, sortById);
-    // Sort entries by clock time as the primary sort criteria
-    return sortByEntryClocks(a, b);
+export const LastWriteWins = {
+    sort: [
+        // sort first by clock
+        new Sort({
+            key: ["meta", "clock", "timestamp", "wallTime"],
+            direction: SortDirection.ASC,
+        }),
+        // then by logical
+        new Sort({
+            key: ["meta", "clock", "timestamp", "logical"],
+            direction: SortDirection.ASC,
+        }),
+    ],
+    before: (entry) => [
+        new IntegerCompare({
+            key: ["meta", "clock", "timestamp", "wallTime"],
+            value: entry.meta.clock.timestamp.wallTime,
+            compare: Compare.Less,
+        }),
+    ],
+    after: (entry) => [
+        new IntegerCompare({
+            key: ["meta", "clock", "timestamp", "wallTime"],
+            value: entry.meta.clock.timestamp.wallTime,
+            compare: Compare.Greater,
+        }),
+    ],
 };
-/**
- * Sort two entries by their clock time.
- * @param {Entry} a First entry to compare
- * @param {Entry} b Second entry to compare
- * @param {function(a, b)} resolveConflict A function to call if entries are concurrent (happened at the same time). The function should take in two entries and return 1 if the first entry should be chosen and -1 if the second entry should be chosen.
- * @returns {number} 1 if a is greater, -1 if b is greater
- */
-export const SortByClocks = (a, b, resolveConflict) => {
-    // Compare the clocks
-    const diff = Clock.compare(a.meta.clock, b.meta.clock);
-    // If the clocks are concurrent, use the provided
-    // conflict resolution function to determine which comes first
-    return diff === 0 ? (resolveConflict || First)(a, b) : diff;
+export const FirstWriteWins = {
+    sort: [
+        new Sort({
+            key: ["meta", "clock", "timestamp", "wallTime"],
+            direction: SortDirection.DESC,
+        }),
+        // then by logical
+        new Sort({
+            key: ["meta", "clock", "timestamp", "logical"],
+            direction: SortDirection.DESC,
+        }),
+    ],
+    before: (entry) => [
+        new IntegerCompare({
+            key: ["meta", "clock", "timestamp", "wallTime"],
+            value: entry.meta.clock.timestamp.wallTime,
+            compare: Compare.Greater,
+        }),
+    ],
+    after: (entry) => [
+        new IntegerCompare({
+            key: ["meta", "clock", "timestamp", "wallTime"],
+            value: entry.meta.clock.timestamp.wallTime,
+            compare: Compare.Less,
+        }),
+    ],
 };
-/**
- * Sort two entries by their clock id.
- * @param {Entry} a First entry to compare
- * @param {Entry} b Second entry to compare
- * @param {function(a, b)} resolveConflict A function to call if the clocks ids are the same. The function should take in two entries and return 1 if the first entry should be chosen and -1 if the second entry should be chosen.
- * @returns {number} 1 if a is greater, -1 if b is greater
- */
-export const SortByClockId = (a, b, resolveConflict) => {
-    // Sort by ID if clocks are concurrent,
-    // take the entry with a "greater" clock id
-    const clockCompare = compare(a.meta.clock.id, b.meta.clock.id);
-    return clockCompare === 0 ? (resolveConflict || First)(a, b) : clockCompare;
+export const SortByEntryHash = {
+    sort: [
+        // sort first by clock
+        new Sort({
+            key: ["hash"],
+            direction: SortDirection.ASC,
+        }),
+    ],
+    before: (entry) => [
+        new IntegerCompare({
+            key: ["hash"],
+            value: entry.meta.clock.timestamp.wallTime,
+            compare: Compare.Less,
+        }),
+    ],
+    after: (entry) => [
+        new IntegerCompare({
+            key: ["hash"],
+            value: entry.meta.clock.timestamp.wallTime,
+            compare: Compare.Greater,
+        }),
+    ],
 };
-/**
- * A wrapper function to throw an error if the results of a passed function return zero
- * @param {function(a, b)} [tiebreaker] The tiebreaker function to validate.
- * @returns {function(a, b)} 1 if a is greater, -1 if b is greater
- * @throws {Error} if func ever returns 0
- */
-export const NoZeroes = (func) => {
-    const comparator = (a, b) => {
-        // Validate by calling the function
-        const result = func(a, b, (a, b) => -1);
-        if (result === 0) {
-            throw Error(`Your log's tiebreaker function, ${func.name}, has returned zero and therefore cannot be`);
+export const compare = (a, b, sortFn) => {
+    for (const sort of sortFn.sort) {
+        const aVal = sort.key.reduce((prev, curr) => prev[curr], a);
+        const bVal = sort.key.reduce((prev, curr) => prev[curr], b);
+        let multiplier = sort.direction === SortDirection.ASC ? 1 : -1;
+        if (aVal < bVal) {
+            return -1 * multiplier;
+        }
+        if (aVal > bVal) {
+            return 1 * multiplier;
         }
-        return result;
-    };
-    return comparator;
+    }
+    return 0;
 };
 //# sourceMappingURL=log-sorting.js.map

package/dist/src/log-sorting.js.map

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

package/dist/src/log.d.ts

@@ -1,29 +1,29 @@
-import { SignatureWithKey, type Identity, X25519Keypair } from "@peerbit/crypto";
 import { type AnyStore } from "@peerbit/any-store";
-import { EntryIndex } from "./entry-index.js";
-import * as Sorting from "./log-sorting.js";
-import { type EncryptionTemplateMaybeEncrypted, Entry, Payload, type CanAppend, EntryType } from "./entry.js";
+import { type Blocks } from "@peerbit/blocks-interface";
+import { type Identity, SignatureWithKey, X25519Keypair } from "@peerbit/crypto";
+import { type Indices } from "@peerbit/indexer-interface";
+import { type Keychain } from "@peerbit/keychain";
+import { type Change } from "./change.js";
 import { HLC, LamportClock, Timestamp } from "./clock.js";
 import { type Encoding } from "./encoding.js";
-import { type CacheUpdateOptions, HeadsIndex } from "./heads.js";
-import { Values } from "./values.js";
-import { type TrimOptions } from "./trim.js";
-import { type Change } from "./change.js";
+import { EntryIndex, type MaybeResolveOptions, type ResultsIterator, type ReturnTypeFromResolveOptions } from "./entry-index.js";
 import { type EntryWithRefs } from "./entry-with-refs.js";
-import { type Blocks } from "@peerbit/blocks-interface";
-import { type Keychain } from "@peerbit/keychain";
-export type LogEvents<T, R = undefined> = {
-    onChange?: (change: Change<T>, reference?: R) => void;
+import { type CanAppend, type EncryptionTemplateMaybeEncrypted, Entry, EntryType, Payload, ShallowEntry, type ShallowOrFullEntry } from "./entry.js";
+import * as Sorting from "./log-sorting.js";
+import { type TrimOptions } from "./trim.js";
+export type LogEvents<T> = {
+    onChange?: (change: Change<T>) => void;
     onGidRemoved?: (gids: string[]) => Promise<void> | void;
 };
 export type MemoryProperties = {
-    cache?: AnyStore;
+    storage?: AnyStore;
+    indexer?: Indices;
 };
 export type LogProperties<T> = {
     keychain?: Keychain;
     encoding?: Encoding<T>;
     clock?: LamportClock;
-    sortFn?: Sorting.ISortFunction;
+    sortFn?: Sorting.SortFn;
     trim?: TrimOptions;
     canAppend?: CanAppend<T>;
 };
@@ -34,7 +34,7 @@ export type AppendOptions<T> = {
         gidSeed?: Uint8Array;
         data?: Uint8Array;
         timestamp?: Timestamp;
-        next?: Entry<any>[];
+        next?: Entry<any>[] | ShallowEntry[];
     };
     identity?: Identity;
     signers?: ((data: Uint8Array) => Promise<SignatureWithKey> | SignatureWithKey)[];
@@ -47,25 +47,43 @@ export type AppendOptions<T> = {
     canAppend?: CanAppend<T>;
 };
 type OnChange<T> = (change: Change<T>, reference?: undefined) => void | Promise<void>;
+export type JoinableEntry = {
+    meta: {
+        clock: {
+            timestamp: Timestamp;
+        };
+        next: string[];
+        gid: string;
+        type: EntryType;
+    };
+    hash: string;
+};
+export declare const ENTRY_JOIN_SHAPE: {
+    readonly hash: true;
+    readonly meta: {
+        readonly type: true;
+        readonly next: true;
+        readonly gid: true;
+        readonly clock: true;
+    };
+};
 export declare class Log<T> {
     private _id;
-    private _sortFn;
     private _storage;
     private _hlc;
     private _identity;
     private _entryIndex;
-    private _headsIndex;
-    private _values;
-    private _nextsIndex;
     private _keychain?;
     private _encoding;
     private _trim;
-    private _entryCache;
     private _canAppend?;
     private _onChange?;
     private _closed;
-    private _memory?;
+    private _closeController;
+    private _loadedOnce;
+    private _indexer;
     private _joining;
+    private _sortFn;
     constructor(properties?: {
         id?: Uint8Array;
     });
@@ -79,14 +97,13 @@ export declare class Log<T> {
      * Returns the length of the log.
      */
     get length(): number;
-    get values(): Values<T>;
     get canAppend(): CanAppend<T> | undefined;
     /**
      * Checks if a entry is part of the log
      * @param {string} hash The hash of the entry
      * @returns {boolean}
      */
-    has(cid: string): boolean;
+    has(cid: string): Promise<boolean>;
     /**
      * Get all entries sorted. Don't use this method anywhere where performance matters
      */
@@ -94,9 +111,7 @@ export declare class Log<T> {
     /**
      * Returns the head index
      */
-    get headsIndex(): HeadsIndex<T>;
-    get memory(): AnyStore | undefined;
-    getHeads(): Promise<Entry<T>[]>;
+    getHeads<R extends MaybeResolveOptions = false>(resolve?: R): ResultsIterator<ReturnTypeFromResolveOptions<R, T>>;
     /**
      * Returns an array of Entry objects that reference entries which
      * are not in the log currently.
@@ -115,11 +130,10 @@ export declare class Log<T> {
     get hlc(): HLC;
     get identity(): Identity;
     get blocks(): Blocks;
-    get nextsIndex(): Map<string, Set<string>>;
     get entryIndex(): EntryIndex<T>;
     get keychain(): Keychain | undefined;
     get encoding(): Encoding<T>;
-    get sortFn(): Sorting.ISortFunction;
+    get sortFn(): Sorting.SortFn;
     get closed(): boolean;
     /**
      * Set the identity for the log
@@ -127,51 +141,53 @@ export declare class Log<T> {
      */
     setIdentity(identity: Identity): void;
     /**
-     * Find an entry.
+     * Get an entry.
      * @param {string} [hash] The hashes of the entry
      */
     get(hash: string, options?: {
         timeout?: number;
     }): Promise<Entry<T> | undefined>;
-    traverse(rootEntries: Entry<T>[], amount?: number, endHash?: string): Promise<{
-        [key: string]: Entry<T>;
-    }>;
+    /**
+     * Get a entry with shallow representation
+     * @param {string} [hash] The hashes of the entry
+     */
+    getShallow(hash: string, options?: {
+        timeout?: number;
+    }): Promise<ShallowEntry | undefined>;
     getReferenceSamples(from: Entry<T>, options?: {
         pointerCount?: number;
         memoryLimit?: number;
     }): Promise<Entry<T>[]>;
     /**
      * Append an entry to the log.
-     * @param {Entry} entry Entry to add
-     * @return {Log} New Log containing the appended value
+     * @param {T} data The data to be appended
+     * @param {AppendOptions} [options] The options for the append
+     * @returns {{ entry: Entry<T>; removed: ShallowEntry[] }} The appended entry and an array of removed entries
      */
     append(data: T, options?: AppendOptions<T>): Promise<{
         entry: Entry<T>;
-        removed: Entry<T>[];
+        removed: ShallowOrFullEntry<T>[];
     }>;
-    reset(entries: Entry<T>[]): Promise<void>;
-    remove(entry: Entry<T> | Entry<T>[], options?: {
+    reset(entries?: Entry<T>[]): Promise<void>;
+    remove(entry: ShallowOrFullEntry<T> | ShallowOrFullEntry<T>[], options?: {
         recursively?: boolean;
     }): Promise<Change<T>>;
-    iterator(options?: {
-        from?: "tail" | "head";
-        amount?: number;
-    }): IterableIterator<string>;
     trim(option?: TrimOptions | undefined): Promise<Entry<T>[] | undefined>;
-    /**
-     *
-     * @param entries
-     * @returns change
-     */
-    join(entriesOrLog: (string | Entry<T> | EntryWithRefs<T>)[] | Log<T>, options?: {
+    join(entriesOrLog: (string | Entry<T> | ShallowEntry | EntryWithRefs<T>)[] | Log<T> | ResultsIterator<Entry<any>>, options?: {
         verifySignatures?: boolean;
         trim?: TrimOptions;
         timeout?: number;
-    } & CacheUpdateOptions): Promise<void>;
-    private joinEntry;
+    }): Promise<void>;
+    /**
+     * Bottom up join of entries into the log
+     * @param entry
+     * @param options
+     * @returns
+     */
+    private joinRecursively;
     private processEntry;
-    deleteRecursively(from: Entry<any> | Entry<any>[], skipFirst?: boolean): Promise<Entry<T>[]>;
-    delete(entry: Entry<any>): Promise<void>;
+    deleteRecursively(from: ShallowOrFullEntry<T> | ShallowOrFullEntry<T>[], skipFirst?: boolean): Promise<ShallowEntry[]>;
+    delete(hash: string): Promise<ShallowEntry | undefined>;
     /**
      * Returns the log entries as a formatted string.
      * @returns {string}
@@ -181,15 +197,16 @@ export declare class Log<T> {
      *   └─three
      */
     toString(payloadMapper?: (payload: Payload<T>) => string): Promise<string>;
-    idle(): Promise<void>;
     close(): Promise<void>;
     drop(): Promise<void>;
     recover(): Promise<void>;
     load(opts?: {
         heads?: Entry<T>[];
         fetchEntryTimeout?: number;
-        reload: boolean;
+        reset?: boolean;
         ignoreMissing?: boolean;
+        timeout?: number;
+        reload?: boolean;
     }): Promise<void>;
     static fromEntry<T>(store: Blocks, identity: Identity, entryOrHash: string | string[] | Entry<T> | Entry<T>[], options?: {
         id?: Uint8Array;
@@ -201,7 +218,7 @@ export declare class Log<T> {
      * Finds entries that are the heads of this collection,
      * ie. entries that are not referenced by other entries.
      *
-     * @param {Array<Entry<T>>} entries Entries to search heads from
+     * @param {Array<Entry<T>>} entries - Entries to search heads from
      * @returns {Array<Entry<T>>}
      */
     static findHeads<T>(entries: Entry<T>[]): Entry<T>[];

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

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