feat: 🎸 cleanup block.upd method

Author: streamich

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

@@ -27,7 +27,7 @@ export const get =
         block: {
           id: snapshot.id,
           ts: snapshot.created,
-          data: {
+          snapshot: {
             blob: snapshot.blob,
             cur: snapshot.seq,
             ts: snapshot.created,

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

@@ -45,7 +45,6 @@ export const new_ =
           ts: res.snapshot.created,
         },
         patches: res.patches.map((patch) => ({
-          cur: patch.seq,
           ts: patch.created,
         })),
       };

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

@@ -1,5 +1,6 @@
+import {ResolveType} from 'json-joy/lib/json-type';
 import type {RouteDeps, Router, RouterBase} from '../../types';
-import {BlockCurRef, BlockIdRef, BlockPatchPartialRef, BlockPatchRef} from '../schema';
+import {BlockCurRef, BlockIdRef, BlockPatchPartialRef, BlockPatchPartialReturnRef} from '../schema';
 
 export const upd =
   ({t, services}: RouteDeps) =>
@@ -9,21 +10,14 @@ export const upd =
         title: 'Document ID',
         description: 'The ID of the document to apply the patch to.',
       }),
-      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(BlockPatchRef)).options({
+      t.prop('patches', t.Array(BlockPatchPartialReturnRef)).options({
         title: 'Latest patches',
         description: 'The list of patches that the client might have missed and should apply to the document.',
       }),
@@ -35,10 +29,13 @@ export const upd =
       description: 'Applies patches to an existing document and returns the latest concurrent changes.',
     });
 
-    return r.prop('block.upd', Func, async ({id, cur, patches}) => {
+    return r.prop('block.upd', Func, async ({id, patches}) => {
       const res = await services.blocks.edit(id, patches);
+      const patchesReturn: ResolveType<typeof BlockPatchPartialReturnRef>[] = res.patches.map(patch => ({
+        ts: patch.created,
+      }));
       return {
-        patches: res.patches,
+        patches: patchesReturn,
       };
     });
   };

src/__demos__/json-crdt-server/routes/block/schema.ts

@@ -27,10 +27,6 @@ export const BlockPatchPartialRef = t.Ref<typeof BlockPatchPartial>('BlockPatchP
 
 // prettier-ignore
 export const BlockPatchPartialReturn = t.Object(
-  t.prop('cur', BlockCurRef).options({
-    title: 'Patch Sequence Number',
-    description: 'The sequence number of the patch in the block. A monotonically increasing integer, starting from 0.',
-  }),
   t.prop('ts', t.num.options({format: 'u'})).options({
     title: 'Patch Creation Time',
     description: 'The time when the patch was created, in milliseconds since the Unix epoch.' +
@@ -82,7 +78,7 @@ export const BlockNew = t.Object(
 export const BlockNewRef = t.Ref<typeof BlockNew>('BlockNew');
 
 export const Block = BlockNew.extend(t.Object(
-  t.prop('data', BlockSnapshotRef),
+  t.prop('snapshot', BlockSnapshotRef),
   t.prop('tip', t.Array(BlockPatchRef)),
 ));
 export const BlockRef = t.Ref<typeof Block>('Block');