cojson 0.3.7 → 0.4.0

package/src/coValues/coMap.ts

@@ -2,25 +2,22 @@ import { JsonObject, JsonValue } from "../jsonValue.js";
 import { AgentID, TransactionID } from "../ids.js";
 import { CoID, CoValue, isCoValue } from "../coValue.js";
 import { CoValueCore, accountOrAgentIDfromSessionID } from "../coValueCore.js";
-import { AccountID } from "../account.js";
-import { Group } from "../group.js";
+import { AccountID } from "./account.js";
 import { parseJSON } from "../jsonStringify.js";
+import { Group } from "./group.js";
 
-type MapOp<K extends string, V extends JsonValue | CoValue | undefined> = {
+type MapOp<K extends string, V extends JsonValue | undefined> = {
     txID: TransactionID;
     madeAt: number;
     changeIdx: number;
 } & MapOpPayload<K, V>;
 // TODO: add after TransactionID[] for conflicts/ordering
 
-export type MapOpPayload<
-    K extends string,
-    V extends JsonValue | CoValue | undefined
-> =
+export type MapOpPayload<K extends string, V extends JsonValue | undefined> =
     | {
           op: "set";
           key: K;
-          value: V extends CoValue ? CoID<V> : Exclude<V, CoValue>;
+          value: V;
       }
     | {
           op: "del";
@@ -28,8 +25,10 @@ export type MapOpPayload<
       };
 
 export class CoMapView<
-    Shape extends { [key: string]: JsonValue | CoValue | undefined },
-    Meta extends JsonObject | null = null
+    Shape extends { [key: string]: JsonValue | undefined } = {
+        [key: string]: JsonValue | undefined;
+    },
+    Meta extends JsonObject | null = JsonObject | null
 > implements CoValue
 {
     /** @category 6. Meta */
@@ -48,16 +47,17 @@ export class CoMapView<
     readonly _shape!: Shape;
 
     /** @internal */
-    constructor(core: CoValueCore) {
+    constructor(
+        core: CoValueCore,
+        options?: { ignorePrivateTransactions: true }
+    ) {
         this.id = core.id as CoID<this>;
         this.core = core;
         this.ops = {};
 
-        for (const {
-            txID,
-            changes,
-            madeAt,
-        } of core.getValidSortedTransactions()) {
+        for (const { txID, changes, madeAt } of core.getValidSortedTransactions(
+            options
+        )) {
             for (const [changeIdx, changeUntyped] of parseJSON(
                 changes
             ).entries()) {
@@ -121,13 +121,11 @@ export class CoMapView<
      * Get all keys currently in the map.
      *
      * @category 1. Reading */
-    keys(): (keyof Shape & string)[] {
-        const keys = Object.keys(this.ops) as (keyof Shape & string)[];
+    keys<K extends (keyof Shape & string) = (keyof Shape & string)>(): K[] {
+        const keys = Object.keys(this.ops) as K[];
 
         if (this.atTimeFilter) {
-            return keys.filter((key) => {
-                this.timeFilteredOps(key)?.length;
-            });
+            return keys.filter((key) => this.timeFilteredOps(key)?.length);
         } else {
             return keys;
         }
@@ -138,13 +136,7 @@ export class CoMapView<
      *
      * @category 1. Reading
      **/
-    get<K extends keyof Shape & string>(
-        key: K
-    ):
-        | (Shape[K] extends CoValue
-              ? CoID<Shape[K]>
-              : Exclude<Shape[K], CoValue>)
-        | undefined {
+    get<K extends keyof Shape & string>(key: K): Shape[K] | undefined {
         const ops = this.timeFilteredOps(key);
         if (!ops) {
             return undefined;
@@ -164,14 +156,10 @@ export class CoMapView<
 
     /** @category 1. Reading */
     asObject(): {
-        [K in keyof Shape & string]: Shape[K] extends CoValue
-            ? CoID<Shape[K]>
-            : Exclude<Shape[K], CoValue>;
+        [K in keyof Shape & string]: Shape[K];
     } {
         const object: Partial<{
-            [K in keyof Shape & string]: Shape[K] extends CoValue
-                ? CoID<Shape[K]>
-                : Exclude<Shape[K], CoValue>;
+            [K in keyof Shape & string]: Shape[K];
         }> = {};
 
         for (const key of this.keys()) {
@@ -182,17 +170,13 @@ export class CoMapView<
         }
 
         return object as {
-            [K in keyof Shape & string]: Shape[K] extends CoValue
-                ? CoID<Shape[K]>
-                : Exclude<Shape[K], CoValue>;
+            [K in keyof Shape & string]: Shape[K];
         };
     }
 
     /** @category 1. Reading */
     toJSON(): {
-        [K in keyof Shape & string]: Shape[K] extends CoValue
-            ? CoID<Shape[K]>
-            : Exclude<Shape[K], CoValue>;
+        [K in keyof Shape & string]: Shape[K];
     } {
         return this.asObject();
     }
@@ -206,9 +190,7 @@ export class CoMapView<
               by: AccountID | AgentID;
               tx: TransactionID;
               at: Date;
-              value?: Shape[K] extends CoValue
-                  ? CoID<Shape[K]>
-                  : Exclude<Shape[K], CoValue>;
+              value?: Shape[K];
           }
         | undefined {
         const ops = this.timeFilteredOps(key);
@@ -238,9 +220,7 @@ export class CoMapView<
               by: AccountID | AgentID;
               tx: TransactionID;
               at: Date;
-              value?: Shape[K] extends CoValue
-                  ? CoID<Shape[K]>
-                  : Exclude<Shape[K], CoValue>;
+              value?: Shape[K];
           }
         | undefined {
         const ops = this.timeFilteredOps(key);
@@ -272,14 +252,14 @@ export class CoMapView<
 
 /** A collaborative map with precise shape `Shape` and optional static metadata `Meta` */
 export class CoMap<
-        Shape extends { [key: string]: JsonValue | CoValue | undefined },
-        Meta extends JsonObject | null = null
+        Shape extends { [key: string]: JsonValue | undefined } = {
+            [key: string]: JsonValue | undefined;
+        },
+        Meta extends JsonObject | null = JsonObject | null
     >
     extends CoMapView<Shape, Meta>
     implements CoValue
 {
-
-
     /** Returns a new version of this CoMap with a new value for the given key.
      *
      * If `privacy` is `"private"` **(default)**, both `key` and `value` are encrypted in the transaction, only readable by other members of the group this `CoMap` belongs to. Not even sync servers can see the content in plaintext.
@@ -290,14 +270,12 @@ export class CoMap<
      **/
     set<K extends keyof Shape & string>(
         key: K,
-        value: Shape[K] extends CoValue ? Shape[K] | CoID<Shape[K]> : Shape[K],
+        value: Shape[K],
         privacy?: "private" | "trusting"
     ): this;
     set(
         kv: {
-            [K in keyof Shape & string]?: Shape[K] extends CoValue
-                ? Shape[K] | CoID<Shape[K]>
-                : Shape[K];
+            [K in keyof Shape & string]?: Shape[K];
         },
         privacy?: "private" | "trusting"
     ): this;
@@ -305,19 +283,11 @@ export class CoMap<
         ...args:
             | [
                   {
-                      [K in keyof Shape & string]?: Shape[K] extends CoValue
-                          ? Shape[K] | CoID<Shape[K]>
-                          : Shape[K];
+                      [K in keyof Shape & string]?: Shape[K];
                   },
                   ("private" | "trusting")?
               ]
-            | [
-                  K,
-                  Shape[K] extends CoValue
-                      ? Shape[K] | CoID<Shape[K]>
-                      : Shape[K],
-                  ("private" | "trusting")?
-              ]
+            | [K, Shape[K], ("private" | "trusting")?]
     ): this {
         if (typeof args[0] === "string") {
             const [key, value, privacy = "private"] = args;
@@ -387,7 +357,9 @@ export class CoMap<
     mutate(mutator: (mutable: MutableCoMap<Shape, Meta>) => void): this {
         const mutable = new MutableCoMap<Shape, Meta>(this.core);
         mutator(mutable);
-        return new CoMap(this.core) as this;
+        return new (this.constructor as new (core: CoValueCore) => this)(
+            this.core
+        );
     }
 
     /** @deprecated Use `mutate` instead. */
@@ -397,8 +369,10 @@ export class CoMap<
 }
 
 export class MutableCoMap<
-        Shape extends { [key: string]: JsonValue | CoValue | undefined },
-        Meta extends JsonObject | null = null
+        Shape extends { [key: string]: JsonValue | undefined } = {
+            [key: string]: JsonValue | undefined;
+        },
+        Meta extends JsonObject | null = JsonObject | null
     >
     extends CoMapView<Shape, Meta>
     implements CoValue
@@ -413,7 +387,7 @@ export class MutableCoMap<
      */
     set<K extends keyof Shape & string>(
         key: K,
-        value: Shape[K] extends CoValue ? Shape[K] | CoID<Shape[K]> : Shape[K],
+        value: Shape[K],
         privacy: "private" | "trusting" = "private"
     ): void {
         // eslint-disable-next-line @typescript-eslint/ban-types

package/src/coValues/coStream.ts

@@ -1,10 +1,10 @@
 import { JsonObject, JsonValue } from "../jsonValue.js";
 import { CoValue, CoID, isCoValue } from "../coValue.js";
 import { CoValueCore, accountOrAgentIDfromSessionID } from "../coValueCore.js";
-import { Group } from "../group.js";
+import { Group } from "./group.js";
 import { AgentID, SessionID, TransactionID } from "../ids.js";
 import { base64URLtoBytes, bytesToBase64url } from "../base64url.js";
-import { AccountID } from "../account.js";
+import { AccountID } from "./account.js";
 import { parseJSON } from "../jsonStringify.js";
 
 export type BinaryStreamInfo = {
@@ -33,15 +33,15 @@ export type BinaryStreamItem =
     | BinaryStreamChunk
     | BinaryStreamEnd;
 
-export type CoStreamItem<Item extends JsonValue | CoValue> = {
-    value: Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>;
+export type CoStreamItem<Item extends JsonValue> = {
+    value: Item;
     tx: TransactionID;
     madeAt: number;
 };
 
 export class CoStreamView<
-    Item extends JsonValue | CoValue,
-    Meta extends JsonObject | null = null
+    Item extends JsonValue = JsonValue,
+    Meta extends JsonObject | null = JsonObject | null
 > implements CoValue
 {
     id: CoID<this>;
@@ -82,9 +82,7 @@ export class CoStreamView<
             changes,
         } of this.core.getValidSortedTransactions()) {
             for (const changeUntyped of parseJSON(changes)) {
-                const change = changeUntyped as Item extends CoValue
-                    ? CoID<Item>
-                    : Exclude<Item, CoValue>;
+                const change = changeUntyped as Item;
                 let entries = this.items[txID.sessionID];
                 if (!entries) {
                     entries = [];
@@ -96,7 +94,7 @@ export class CoStreamView<
     }
 
     getSingleStream():
-        | (Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>)[]
+        | (Item)[]
         | undefined {
         if (Object.keys(this.items).length === 0) {
             return undefined;
@@ -125,7 +123,7 @@ export class CoStreamView<
               by: AccountID | AgentID;
               tx: TransactionID;
               at: Date;
-              value: Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>;
+              value: Item;
           }
         | undefined {
         const items = this.items[sessionID];
@@ -147,7 +145,7 @@ export class CoStreamView<
               by: AccountID | AgentID;
               tx: TransactionID;
               at: Date;
-              value: Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>;
+              value: Item;
           }
         | undefined {
         const items = this.items[sessionID];
@@ -163,7 +161,7 @@ export class CoStreamView<
                 by: accountOrAgentIDfromSessionID(sessionID),
                 tx: item.tx,
                 at: new Date(item.madeAt),
-                value: item.value,
+                value: item.value as Item,
             };
         }
     }
@@ -173,7 +171,7 @@ export class CoStreamView<
               by: AccountID | AgentID;
               tx: TransactionID;
               at: Date;
-              value: Item extends CoValue ? CoID<Item> : Exclude<Item, CoValue>;
+              value: Item;
           }
         | undefined {
         let latestItem:
@@ -181,9 +179,7 @@ export class CoStreamView<
                   by: AccountID | AgentID;
                   tx: TransactionID;
                   at: Date;
-                  value: Item extends CoValue
-                      ? CoID<Item>
-                      : Exclude<Item, CoValue>;
+                  value: Item;
               }
             | undefined;
 
@@ -226,9 +222,7 @@ export class CoStreamView<
     }
 
     toJSON(): {
-        [key: SessionID]: (Item extends CoValue
-            ? CoID<Item>
-            : Exclude<Item, CoValue>)[];
+        [key: SessionID]: (Item )[];
     } {
         return Object.fromEntries(
             Object.entries(this.items).map(([sessionID, items]) => [
@@ -246,14 +240,14 @@ export class CoStreamView<
 }
 
 export class CoStream<
-        Item extends JsonValue | CoValue,
-        Meta extends JsonObject | null = null
+        Item extends JsonValue = JsonValue,
+        Meta extends JsonObject | null = JsonObject | null
     >
     extends CoStreamView<Item, Meta>
     implements CoValue
 {
     push(
-        item: Item extends CoValue ? Item | CoID<Item> : Item,
+        item: Item,
         privacy: "private" | "trusting" = "private"
     ): this {
         this.core.makeTransaction([isCoValue(item) ? item.id : item], privacy);
@@ -273,14 +267,14 @@ export class CoStream<
 }
 
 export class MutableCoStream<
-        Item extends JsonValue | CoValue,
-        Meta extends JsonObject | null = null
+        Item extends JsonValue,
+        Meta extends JsonObject | null = JsonObject | null
     >
     extends CoStreamView<Item, Meta>
     implements CoValue
 {
     push(
-        item: Item extends CoValue ? Item | CoID<Item> : Item,
+        item: Item,
         privacy: "private" | "trusting" = "private"
     ) {
         this.core.makeTransaction([isCoValue(item) ? item.id : item], privacy);