Resolve type errors

yorkie-team · Sep 8, 2024 · 3806420 · 3806420
1 parent 7048002
commit 3806420
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 80 deletions.
diff --git a/packages/sdk/src/document/change/context.ts b/packages/sdk/src/document/change/context.ts
@@ -159,7 +159,7 @@ export class ChangeContext<P extends Indexable = Indexable> {
 
     const reversePresence: Partial<P> = {};
     for (const key of this.reversePresenceKeys) {
-      reversePresence[key as keyof P] = this.previousPresence[key];
+      reversePresence[key as keyof P] = this.previousPresence[key as keyof P];
     }
     return reversePresence;
   }

diff --git a/packages/sdk/src/document/document.ts b/packages/sdk/src/document/document.ts
@@ -424,7 +424,7 @@ type Json = JsonScalar | JsonArray | JsonObject;
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 type JsonScalar = string | number | boolean | null;
-type JsonArray = Json[];
+type JsonArray = Array<Json>;
 type JsonObject = { [key: string]: Json | undefined };
 
 /**
@@ -445,14 +445,14 @@ export type DocumentKey = string;
 type OperationInfoOfElement<TElement> = TElement extends Text
   ? TextOperationInfo
   : TElement extends Counter
-  ? CounterOperationInfo
-  : TElement extends Tree
-  ? TreeOperationInfo
-  : TElement extends BaseArray<any>
-  ? ArrayOperationInfo
-  : TElement extends BaseObject<any>
-  ? ObjectOperationInfo
-  : OperationInfo;
+    ? CounterOperationInfo
+    : TElement extends Tree
+      ? TreeOperationInfo
+      : TElement extends BaseArray<any>
+        ? ArrayOperationInfo
+        : TElement extends BaseObject<any>
+          ? ObjectOperationInfo
+          : OperationInfo;
 
 /**
  * `OperationInfoOfInternal` represents the type of the operation info of the
@@ -473,49 +473,49 @@ type OperationInfoOfInternal<
 > = TDepth extends 0
   ? TElement
   : TKeyOrPath extends `${infer TFirst}.${infer TRest}`
-  ? TFirst extends keyof TElement
-    ? TElement[TFirst] extends BaseArray<unknown>
-      ? OperationInfoOfInternal<
-          TElement[TFirst],
-          number,
-          DecreasedDepthOf<TDepth>
-        >
-      : OperationInfoOfInternal<
-          TElement[TFirst],
-          TRest,
-          DecreasedDepthOf<TDepth>
-        >
-    : OperationInfo
-  : TKeyOrPath extends keyof TElement
-  ? TElement[TKeyOrPath] extends BaseArray<unknown>
-    ? ArrayOperationInfo
-    : OperationInfoOfElement<TElement[TKeyOrPath]>
-  : OperationInfo;
+    ? TFirst extends keyof TElement
+      ? TElement[TFirst] extends BaseArray<unknown>
+        ? OperationInfoOfInternal<
+            TElement[TFirst],
+            number,
+            DecreasedDepthOf<TDepth>
+          >
+        : OperationInfoOfInternal<
+            TElement[TFirst],
+            TRest,
+            DecreasedDepthOf<TDepth>
+          >
+      : OperationInfo
+    : TKeyOrPath extends keyof TElement
+      ? TElement[TKeyOrPath] extends BaseArray<unknown>
+        ? ArrayOperationInfo
+        : OperationInfoOfElement<TElement[TKeyOrPath]>
+      : OperationInfo;
 
 /**
  * `DecreasedDepthOf` represents the type of the decreased depth of the given depth.
  */
 type DecreasedDepthOf<Depth extends number = 0> = Depth extends 10
   ? 9
   : Depth extends 9
-  ? 8
-  : Depth extends 8
-  ? 7
-  : Depth extends 7
-  ? 6
-  : Depth extends 6
-  ? 5
-  : Depth extends 5
-  ? 4
-  : Depth extends 4
-  ? 3
-  : Depth extends 3
-  ? 2
-  : Depth extends 2
-  ? 1
-  : Depth extends 1
-  ? 0
-  : -1;
+    ? 8
+    : Depth extends 8
+      ? 7
+      : Depth extends 7
+        ? 6
+        : Depth extends 6
+          ? 5
+          : Depth extends 5
+            ? 4
+            : Depth extends 4
+              ? 3
+              : Depth extends 3
+                ? 2
+                : Depth extends 2
+                  ? 1
+                  : Depth extends 1
+                    ? 0
+                    : -1;
 
 /**
  * `PathOfInternal` represents the type of the path of the given element.
@@ -527,29 +527,29 @@ type PathOfInternal<
 > = Depth extends 0
   ? Prefix
   : TElement extends Record<string, any>
-  ? {
-      [TKey in keyof TElement]: TElement[TKey] extends LeafElement
-        ? `${Prefix}${TKey & string}`
-        : TElement[TKey] extends BaseArray<infer TArrayElement>
-        ?
-            | `${Prefix}${TKey & string}`
-            | `${Prefix}${TKey & string}.${number}`
-            | PathOfInternal<
-                TArrayElement,
-                `${Prefix}${TKey & string}.${number}.`,
-                DecreasedDepthOf<Depth>
-              >
-        :
-            | `${Prefix}${TKey & string}`
-            | PathOfInternal<
-                TElement[TKey],
-                `${Prefix}${TKey & string}.`,
-                DecreasedDepthOf<Depth>
-              >;
-    }[keyof TElement]
-  : Prefix extends `${infer TRest}.`
-  ? TRest
-  : Prefix;
+    ? {
+        [TKey in keyof TElement]: TElement[TKey] extends LeafElement
+          ? `${Prefix}${TKey & string}`
+          : TElement[TKey] extends BaseArray<infer TArrayElement>
+            ?
+                | `${Prefix}${TKey & string}`
+                | `${Prefix}${TKey & string}.${number}`
+                | PathOfInternal<
+                    TArrayElement,
+                    `${Prefix}${TKey & string}.${number}.`,
+                    DecreasedDepthOf<Depth>
+                  >
+            :
+                | `${Prefix}${TKey & string}`
+                | PathOfInternal<
+                    TElement[TKey],
+                    `${Prefix}${TKey & string}.`,
+                    DecreasedDepthOf<Depth>
+                  >;
+      }[keyof TElement]
+    : Prefix extends `${infer TRest}.`
+      ? TRest
+      : Prefix;
 
 /**
  * `OperationInfoOf` represents the type of the operation info of the given

diff --git a/packages/sdk/src/document/json/tree.ts b/packages/sdk/src/document/json/tree.ts
@@ -86,10 +86,10 @@ function buildDescendants(
     let attrs;
 
     if (typeof attributes === 'object' && !isEmpty(attributes)) {
-      attributes = stringifyObjectValues(attributes);
+      const stringifiedAttributes = stringifyObjectValues(attributes);
       attrs = new RHT();
 
-      for (const [key, value] of Object.entries(attributes)) {
+      for (const [key, value] of Object.entries(stringifiedAttributes)) {
         attrs.set(key, value, ticket);
       }
     }
@@ -125,10 +125,10 @@ function createCRDTTreeNode(context: ChangeContext, content: TreeNode) {
     let attrs;
 
     if (typeof attributes === 'object' && !isEmpty(attributes)) {
-      attributes = stringifyObjectValues(attributes);
+      const stringifiedAttributes = stringifyObjectValues(attributes);
       attrs = new RHT();
 
-      for (const [key, value] of Object.entries(attributes)) {
+      for (const [key, value] of Object.entries(stringifiedAttributes)) {
         attrs.set(key, value, ticket);
       }
     }

diff --git a/packages/sdk/src/util/object.ts b/packages/sdk/src/util/object.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { Indexable } from '@yorkie-js-sdk/src/document/document';
+
 /**
  * `deepcopy` returns a deep copy of the given object.
  */
@@ -40,7 +42,7 @@ export const isEmpty = (object: object) => {
 /**
  * `stringifyObjectValues` makes values of attributes to JSON parsable string.
  */
-export const stringifyObjectValues = <A extends object>(
+export const stringifyObjectValues = <A extends Indexable>(
   attributes: A,
 ): Record<string, string> => {
   const attrs: Record<string, string> = {};
@@ -53,7 +55,7 @@ export const stringifyObjectValues = <A extends object>(
 /**
  `parseObjectValues` returns the JSON parsable string values to the origin states.
  */
-export const parseObjectValues = <A extends object>(
+export const parseObjectValues = <A extends Indexable>(
   attrs: Record<string, string>,
 ): A => {
   const attributes: Record<string, unknown> = {};

diff --git a/packages/sdk/test/integration/integration_helper.ts b/packages/sdk/test/integration/integration_helper.ts
@@ -13,12 +13,15 @@ export function toDocKey(title: string): string {
     .replace(/[^a-z0-9-]/g, '-');
 }
 
-export async function withTwoClientsAndDocuments<T>(
+export async function withTwoClientsAndDocuments<
+  T,
+  P extends Indexable = Indexable,
+>(
   callback: (
     c1: Client,
-    d1: Document<T>,
+    d1: Document<T, P>,
     c2: Client,
-    d2: Document<T>,
+    d2: Document<T, P>,
   ) => Promise<void>,
   title: string,
   syncMode: SyncMode = SyncMode.Manual,
@@ -29,8 +32,8 @@ export async function withTwoClientsAndDocuments<T>(
   await client2.activate();
 
   const docKey = `${toDocKey(title)}-${new Date().getTime()}`;
-  const doc1 = new yorkie.Document<T>(docKey);
-  const doc2 = new yorkie.Document<T>(docKey);
+  const doc1 = new yorkie.Document<T, P>(docKey);
+  const doc2 = new yorkie.Document<T, P>(docKey);
 
   await client1.attach(doc1, { syncMode });
   await client2.attach(doc2, { syncMode });