refactoring

Author: SandroMaglione

apps/client/src/routes/index.tsx

@@ -39,7 +39,7 @@ function HomeComponent() {
       ))}
 
       <div>
-        <button type="button" onClick={() => joinWorkspace(undefined)}>
+        <button type="button" onClick={joinWorkspace}>
           Create workspace
         </button>
       </div>

apps/client/src/workers/sync.ts

@@ -1,8 +1,6 @@
 import { WorkerRunner } from "@effect/platform";
 import { BrowserWorkerRunner } from "@effect/platform-browser";
-import type { LoroSchema } from "@local/schema";
 import { Effect, Layer } from "effect";
-import { LoroDoc } from "loro-crdt";
 import { RuntimeClient } from "../lib/runtime-client";
 import { Sync } from "../lib/services/sync";
 import { TempWorkspace } from "../lib/services/temp-workspace";
@@ -28,10 +26,6 @@ const WorkerLive = WorkerRunner.layerSerialized(WorkerMessage, {
       });
 
       if (tempUpdates !== undefined) {
-        const docI = new LoroDoc<LoroSchema>();
-        docI.import(tempUpdates.snapshot);
-        yield* Effect.log("Doc", docI.toJSON());
-
         yield* push({
           workspaceId: workspace.workspaceId,
           snapshot: tempUpdates.snapshot,
@@ -44,7 +38,9 @@ const WorkerLive = WorkerRunner.layerSerialized(WorkerMessage, {
       }
 
       return true;
-    }).pipe(Effect.mapError(() => "Bootstrap error")),
+    }).pipe(
+      Effect.mapError((error) => `Bootstrap error: ${JSON.stringify(error)}`)
+    ),
 }).pipe(Layer.provide(BrowserWorkerRunner.layer));
 
 RuntimeClient.runFork(WorkerRunner.launch(WorkerLive));

apps/server/src/middleware/version-check.ts

@@ -29,8 +29,7 @@ export const VersionCheckLive = Layer.effect(
 
       yield* Effect.log("Checking doc", doc.toJSON());
 
-      const metadata = doc.getMap("metadata");
-      const currentVersion = metadata.get("version");
+      const currentVersion = doc.getMap("metadata").get("version");
 
       yield* Effect.log("Current version", currentVersion);
 

packages/schema/src/main.ts

@@ -2,11 +2,14 @@ import { ParseResult, Schema } from "effect";
 import { LoroDoc, LoroList, LoroMap } from "loro-crdt";
 import { ActivitySchema, ActivityV1, type ActivityV2 } from "./schema";
 
+/** 👇 Versioning management */
+
 const Version = [1, 2, 3] as const;
 export type Version = (typeof Version)[number];
-
 export const VERSION = 3 satisfies Version;
 
+/** 👆 Versioning management */
+
 const AnyLoroDocSchema = Schema.instanceOf(LoroDoc);
 
 export const Metadata = Schema.Struct({ version: Schema.Number });
@@ -25,28 +28,20 @@ export class SnapshotSchema extends Schema.Class<SnapshotSchema>(
 }) {
   static readonly EmptyDoc = () => {
     const doc = new LoroDoc<LoroSchema>();
-
-    const metadata = doc.getMap("metadata");
-    metadata.set("version", VERSION);
-
+    doc.getMap("metadata").set("version", VERSION);
     doc.getList("activity");
-
     return doc;
   };
 }
 
 const migrations = {
   1: (doc) => {
-    const metadata = doc.getMap("metadata");
-    metadata.set("version", VERSION);
-
+    doc.getMap("metadata").set("version", VERSION);
     doc.getList("activity");
-
     return doc;
   },
   2: (doc) => {
-    const metadata = doc.getMap("metadata");
-    metadata.set("version", 2);
+    doc.getMap("metadata").set("version", 2);
 
     const activity = doc.getList("activity");
     for (let i = 0; i < activity.length; i++) {
@@ -61,9 +56,8 @@ const migrations = {
 
     return doc;
   },
-  "3": (doc) => {
-    const metadata = doc.getMap("metadata");
-    metadata.set("version", 3);
+  3: (doc) => {
+    doc.getMap("metadata").set("version", 3);
 
     const activity = doc.getList("activity");
     for (let i = 0; i < activity.length; i++) {
@@ -85,8 +79,7 @@ export const LoroDocMigration = AnyLoroDocSchema.pipe(
     decode: (from, _, ast) => {
       const doc = new LoroDoc();
       doc.import(from.export({ mode: "snapshot" }));
-      const metadata = doc.getMap("metadata");
-      const currentVersion = metadata.get("version");
+      const currentVersion = doc.getMap("metadata").get("version");
 
       if (typeof currentVersion === "number") {
         Version.forEach((version) => {