@loro-dev/flock 1.0.0 → 1.1.0

package/src/index.ts

@@ -470,9 +470,8 @@ function normalizeImportDecision(
     return { accept: true };
   }
   if ("accept" in decision) {
-    const typed = decision as ImportAccept | ImportSkip;
-    if (typed.accept === false) {
-      return { accept: false, reason: typed.reason ?? "rejected" };
+    if (!decision.accept) {
+      return { accept: false, reason: decision.reason ?? "rejected" };
     }
     return { accept: true };
   }
@@ -572,15 +571,25 @@ export class Flock {
       this.putWithMetaInternal(key, value, options.metadata, options.now);
       return;
     }
-    await transform(
+    const workingPayload = clonePayload(basePayload);
+    const transformed = await transform(
       { key: key.slice(), now: options.now },
-      clonePayload(basePayload),
+      workingPayload,
     );
-    const finalValue = basePayload.data;
+    const finalPayload = mergePayload(
+      basePayload,
+      transformed ?? workingPayload,
+    );
+    const finalValue = finalPayload.data;
     if (finalValue === undefined) {
       throw new TypeError("putWithMeta requires a data value");
     }
-    this.putWithMetaInternal(key, finalValue, basePayload.metadata, options.now);
+    this.putWithMetaInternal(
+      key,
+      finalValue,
+      finalPayload.metadata,
+      options.now,
+    );
   }
 
   put(key: KeyPart[], value: Value, now?: number): void {
@@ -629,8 +638,12 @@ export class Flock {
     for (const [key, record] of Object.entries(base)) {
       const context = buildContext(key, record);
       const basePayload = createExportPayload(record);
-      const transformed = await transform(context, clonePayload(basePayload));
-      const finalPayload = mergePayload(basePayload, transformed);
+      const workingPayload = clonePayload(basePayload);
+      const transformed = await transform(context, workingPayload);
+      const finalPayload = mergePayload(
+        basePayload,
+        transformed ?? workingPayload,
+      );
       result[key] = buildRecord(record.c, finalPayload);
     }
     return result;