Revise the codes

yorkie-team · Oct 23, 2024 · ae0e42e · ae0e42e
1 parent 8a2eceb
commit ae0e42e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/sdk/src/client/client.ts b/packages/sdk/src/client/client.ts
@@ -296,8 +296,8 @@ export class Client {
   public attach<T, P extends Indexable>(
     doc: Document<T, P>,
     options: {
-      initialPresence?: P;
       initialRoot?: T;
+      initialPresence?: P;
       syncMode?: SyncMode;
     } = {},
   ): Promise<Document<T, P>> {
@@ -369,11 +369,12 @@ export class Client {
 
           const crdtObject = doc.getRootObject();
           if (options.initialRoot) {
+            const initialRoot = options.initialRoot;
             doc.update((root) => {
-              for (const [k, v] of Object.entries(options.initialRoot!)) {
-                if (!crdtObject.get(k)) {
-                  // TODO(raararaara): Need a way to accurately infer the type of `k` for indexing.
-                  (root as Record<string, unknown>)[k] = v;
+              for (const [k, v] of Object.entries<T>(initialRoot)) {
+                if (!crdtObject.has(k)) {
+                  const key = k as keyof T;
+                  root[key] = v as any;
                 }
               }
             });

diff --git a/packages/sdk/test/integration/document_test.ts b/packages/sdk/test/integration/document_test.ts
@@ -1259,20 +1259,20 @@ describe('Document', function () {
             `${task.name}-${name}-${new Date().getTime()}`,
           );
 
-          type docType = {
+          type DocType = {
             tree?: Tree;
             text?: Text;
             counter?: Counter;
             null?: null;
             boolean?: boolean;
             number?: number;
             long?: Long;
-            object?: Object;
+            object?: { k: string };
             array?: Array<JSONElement>;
             bytes?: Uint8Array;
             // date: Date;
           };
-          const doc = new yorkie.Document<docType>(docKey);
+          const doc = new yorkie.Document<DocType>(docKey);
 
           await c1.attach(doc, {
             initialRoot: {