load loro storage

Author: SandroMaglione

apps/client/src/lib/hooks/use-food.ts

@@ -1,12 +1,16 @@
-import { hookQuery, useDexieQuery } from "@local/client-lib";
+import { Service, useDexieQuery } from "@local/client-lib";
 import { SnapshotSchema } from "@local/schema";
 import { RuntimeClient } from "../runtime-client";
 
 export const useFood = ({ workspaceId }: { workspaceId: string }) => {
   return useDexieQuery(
     () =>
       RuntimeClient.runPromise(
-        hookQuery((doc) => doc.getList("food"), { workspaceId })
+        Service.LoroStorage.use(({ query }) =>
+          query((doc) => doc.getList("food"), {
+            workspaceId,
+          })
+        )
       ),
     SnapshotSchema.fields.food.value
   );

packages/client-lib/src/hook-query.ts

@@ -1,12 +1,10 @@
-import { hookQuery } from "./hook-query";
 import { RuntimeLayer } from "./runtime-layer";
 import * as Service from "./services";
 import * as SyncWorker from "./sync-worker";
 import { useActionEffect } from "./use-action-effect";
 import { useDexieQuery } from "./use-dexie-query";
 
 export {
-  hookQuery,
   RuntimeLayer,
   Service,
   SyncWorker,

packages/client-lib/src/main.ts

@@ -1,4 +1,4 @@
-import { VERSION, type LoroSchema } from "@local/schema";
+import { SnapshotSchema, type LoroSchema } from "@local/schema";
 import { Effect } from "effect";
 import { LoroDoc } from "loro-crdt";
 import { TempWorkspace } from "./temp-workspace";
@@ -20,8 +20,7 @@ export class LoroStorage extends Effect.Service<LoroStorage>()("LoroStorage", {
         { concurrency: "unbounded" }
       ).pipe(
         Effect.map(({ workspace, tempWorkspace }) => {
-          const doc = new LoroDoc<LoroSchema>();
-          doc.getMap("metadata").set("version", VERSION);
+          const doc = SnapshotSchema.EmptyDoc();
 
           if (workspace !== undefined) {
             doc.import(workspace.snapshot);
@@ -35,6 +34,11 @@ export class LoroStorage extends Effect.Service<LoroStorage>()("LoroStorage", {
         })
       );
 
-    return { load };
+    const query = <A>(
+      extract: (doc: LoroDoc<LoroSchema>) => A,
+      { workspaceId }: { workspaceId: string }
+    ) => load({ workspaceId }).pipe(Effect.map(({ doc }) => extract(doc)));
+
+    return { load, query } as const;
   }),
 }) {}

packages/client-lib/src/services/loro-storage.ts

@@ -24,6 +24,8 @@ export class Migration extends Effect.Service<Migration>()("Migration", {
                   workspace.snapshot
                 );
 
+                yield* Effect.log(doc.toJSON());
+
                 const newDoc = yield* Schema.decode(LoroDocMigration)(doc).pipe(
                   Effect.catchTag(
                     "ParseError",

packages/client-lib/src/services/migration.ts

@@ -9,7 +9,7 @@ const CurrentSchema = VersioningSchema[VERSION];
 const Metadata = Schema.Struct({ version: Schema.Number });
 
 export type LoroSchema = {
-  metadata: LoroMap<typeof Metadata.Encoded>;
+  metadata: LoroMap<Partial<typeof Metadata.Encoded>>;
   food: LoroList<LoroMap<typeof CurrentSchema.fields.food.value.Encoded>>;
   meal: LoroList<LoroMap<typeof CurrentSchema.fields.meal.value.Encoded>>;
 };