Use better type for move patch operation

kontent-ai · Apr 16, 2024 · 073f3b0 · 073f3b0
1 parent 7b6eb50
commit 073f3b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/modules/sync/diff/combinators.ts b/src/modules/sync/diff/combinators.ts
@@ -94,7 +94,9 @@ export const makeArrayHandler = <Entity>(
             {
               op: "move" as const,
               path: `/codename:${getCodename(targetOnOtherIndex)}`,
-              [sourceValue[i - 1] ? "after" : "before"]: { codename: neighbourCodename },
+              ...sourceValue[i - 1]
+                ? { after: { codename: neighbourCodename } }
+                : { before: { codename: neighbourCodename } },
             },
           ],
           ...createUpdateOps(v, targetOnOtherIndex)

diff --git a/src/modules/sync/types/diffModel.ts b/src/modules/sync/types/diffModel.ts
@@ -35,9 +35,10 @@ export type PatchOperation =
     value: unknown;
     oldValue: unknown;
   }>
-  | Readonly<{
-    op: "move";
-    path: string;
-    before?: { codename: string };
-    after?: { codename: string };
-  }>;
+  | (
+    & Readonly<{
+      op: "move";
+      path: string;
+    }>
+    & ({ readonly before: { readonly codename: string } } | { readonly after: { readonly codename: string } })
+  );