chore: 🤖 cleanup update method

Author: streamich

src/__demos__/json-crdt-server/routes/block/methods/upd.ts

@@ -1,32 +1,29 @@
 import type {RouteDeps, Router, RouterBase} from '../../types';
-import type {BlockId, BlockPatch} from '../schema';
+import {BlockCurRef, BlockIdRef, BlockPatchPartialRef, BlockPatchRef} from '../schema';
 
 export const upd =
   ({t, services}: RouteDeps) =>
   <R extends RouterBase>(r: Router<R>) => {
-    const PatchType = t.Ref<typeof BlockPatch>('BlockPatch');
-
     const Request = t.Object(
-      t.prop('id', t.Ref<typeof BlockId>('BlockId')).options({
+      t.prop('id', BlockIdRef).options({
         title: 'Document ID',
         description: 'The ID of the document to apply the patch to.',
       }),
-      // This can be inferred from the "seq" of the first patch:
-      // t.prop('seq', t.Ref<typeof BlockSeq>('BlockSeq')).options({
-      //   title: 'Last known sequence number',
-      //   description:
-      //     'The last known sequence number of the document. ' +
-      //     'If the document has changed since this sequence number, ' +
-      //     'the response will contain all the necessary patches for the client to catch up.',
-      // }),
-      t.prop('patches', t.Array(PatchType)).options({
+      t.prop('cur', BlockCurRef).options({
+        title: 'Last known sequence number',
+        description:
+          'The last known sequence number of the document. ' +
+          'If the document has changed since this sequence number, ' +
+          'the response will contain all the necessary patches for the client to catch up.',
+      }),
+      t.prop('patches', t.Array(BlockPatchPartialRef)).options({
         title: 'Patches',
         description: 'The patches to apply to the document.',
       }),
     );
 
     const Response = t.Object(
-      t.prop('patches', t.Array(PatchType)).options({
+      t.prop('patches', t.Array(BlockPatchRef)).options({
         title: 'Latest patches',
         description: 'The list of patches that the client might have missed and should apply to the document.',
       }),
@@ -38,7 +35,7 @@ export const upd =
       description: 'Applies patches to an existing document and returns the latest concurrent changes.',
     });
 
-    return r.prop('block.upd', Func, async ({id, patches}) => {
+    return r.prop('block.upd', Func, async ({id, cur, patches}) => {
       const res = await services.blocks.edit(id, patches);
       return {
         patches: res.patches,

src/__demos__/json-crdt-server/services/blocks/BlocksServices.ts

@@ -122,15 +122,22 @@ export class BlocksServices {
     return {patches, model};
   }
 
-  public async edit(id: string, patches: StorePatch[]) {
+  public async edit(id: string, patches: Pick<StorePatch, 'blob'>[]) {
     this.maybeGc();
     if (!Array.isArray(patches)) throw RpcError.validation('patches must be an array');
     if (!patches.length) throw RpcError.validation('patches must not be empty');
-    const seq = patches[0].seq;
-    const {store} = this;
     validatePatches(patches);
-    const {snapshot} = await store.edit(id, patches);
-    this.__emitUpd(id, patches);
+    const {store} = this;
+    const seq = (await store.seq(id)) ?? -1;
+    const fullPatches: StorePatch[] = [];
+    const now = Date.now();
+    for (let i = 0; i < patches.length; i++) {
+      const seqNum = seq + i;
+      const patch = patches[i];
+      fullPatches.push({seq: seqNum, created: now, blob: patch.blob});
+    }
+    const {snapshot} = await store.edit(id, fullPatches);
+    this.__emitUpd(id, fullPatches);
     const expectedBlockSeq = seq + patches.length - 1;
     const hadConcurrentEdits = snapshot.seq !== expectedBlockSeq;
     let patchesBack: StorePatch[] = [];