fix(crdt-yjs): fix types

pluv-io · Feb 11, 2024 · 1376df8 · 1376df8
1 parent c0ecc67
commit 1376df8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/packages/crdt-yjs/src/array/CrdtYjsArray.ts b/packages/crdt-yjs/src/array/CrdtYjsArray.ts
@@ -20,7 +20,7 @@ export class CrdtYjsArray<T extends unknown> extends AbstractCrdtType<
 
         this.initialValue = initialValue;
         this.value = new YArray<InferYjsType<T>>();
-        this.push(...initialValue.slice());
+        this.push(...value);
     }
 
     public get length(): number {

diff --git a/packages/crdt-yjs/src/constants.ts b/packages/crdt-yjs/src/constants.ts
diff --git a/packages/crdt-yjs/src/map/CrdtYjsMap.ts b/packages/crdt-yjs/src/map/CrdtYjsMap.ts
@@ -5,14 +5,14 @@ import { toYjsValue } from "../shared";
 import type { InferYjsJson, InferYjsType } from "../types";
 
 export class CrdtYjsMap<T extends unknown> extends AbstractCrdtType<
-    YMap<T>,
+    YMap<InferYjsType<T>>,
     Record<string, InferYjsJson<T>>
 > {
     public initialValue: readonly (readonly [
         key: string,
         value: InferYjsType<T>,
     ])[];
-    public value: YMap<T>;
+    public value: YMap<InferYjsType<T>>;
 
     constructor(value: readonly (readonly [key: string, value: T])[] = []) {
         super();

diff --git a/packages/crdt-yjs/src/object/CrdtYjsObject.ts b/packages/crdt-yjs/src/object/CrdtYjsObject.ts
@@ -13,13 +13,10 @@ export class CrdtYjsObject<
     constructor(value: T = {} as T) {
         super();
 
-        this.initialValue = Object.entries(value).map(
-            ([k, v]) =>
-                [k, toYjsValue(v)] as readonly [
-                    key: string,
-                    value: InferYjsType<T[keyof T]>,
-                ],
-        );
+        this.initialValue = Object.entries(value).map(([k, v]) => [
+            k,
+            toYjsValue(v),
+        ]);
         this.value = new YMap(this.initialValue);
     }
 

diff --git a/packages/crdt-yjs/src/xmlElement/CrdtYjsXmlElement.ts b/packages/crdt-yjs/src/xmlElement/CrdtYjsXmlElement.ts
@@ -18,7 +18,7 @@ export class CrdtYjsXmlElement extends AbstractCrdtType<YXmlElement, string> {
         this.initialValue = children.map((item) => item.value);
         this.name = name;
         this.value = new YXmlElement(name);
-        this.value.push(this.initialValue.slice());
+        this.push(...children);
     }
 
     public get length(): number {

diff --git a/packages/crdt-yjs/src/xmlFragment/CrdtYjsXmlFragment.ts b/packages/crdt-yjs/src/xmlFragment/CrdtYjsXmlFragment.ts
@@ -14,7 +14,7 @@ export class CrdtYjsXmlFragment extends AbstractCrdtType<YXmlFragment, string> {
 
         this.initialValue = children.map((item) => item.value);
         this.value = new YXmlFragment();
-        this.value.push(this.initialValue.slice());
+        this.push(...children);
     }
 
     public get length(): number {