fix: ensure is assigned

Author: zxch3n

packages/core/src/core/mirror.ts

@@ -817,12 +817,10 @@ export class Mirror<S extends SchemaType> {
             this.registerContainerWithRegistry(container.id, fieldSchema);
 
             // Inject $cid for root maps into pending state immediately
-            if (fieldSchema && isLoroMapSchema(fieldSchema) && pendingState) {
+            if (pendingState && container.kind() === "Map") {
                 const rootObj = pendingState as Record<string, unknown>;
                 const child = rootObj[keyStr];
-                if (isObject(child)) {
-                    child[CID_KEY] = container.id;
-                }
+                this.stampCid(child, container.id);
             }
 
             // Apply direct changes to the container
@@ -870,13 +868,7 @@ export class Mirror<S extends SchemaType> {
                             value,
                         );
                         // Stamp $cid into the pendingState value for child maps
-                        if (
-                            schema &&
-                            isLoroMapSchema(schema) &&
-                            isObject(value)
-                        ) {
-                            value[CID_KEY] = inserted.id;
-                        }
+                        this.stampCid(value, inserted.id);
                     } else if (kind === "delete") {
                         map.delete(key as string);
                     } else {
@@ -974,13 +966,7 @@ export class Mirror<S extends SchemaType> {
                         this.registerContainer(newContainer.id, schema);
                         this.initializeContainer(newContainer, schema, value);
                         // Stamp $cid into pending state when replacing with a map container
-                        if (
-                            schema &&
-                            isLoroMapSchema(schema) &&
-                            isObject(value)
-                        ) {
-                            value[CID_KEY] = newContainer.id;
-                        }
+                        this.stampCid(value, newContainer.id);
                     } else {
                         throw new Error();
                     }
@@ -1407,8 +1393,8 @@ export class Mirror<S extends SchemaType> {
 
         this.initializeContainer(insertedContainer, schema, value);
         // Stamp $cid for child maps directly on the provided value (pending state)
-        if (schema && isLoroMapSchema(schema) && isObject(value)) {
-            value[CID_KEY] = insertedContainer.id;
+        if (insertedContainer.kind() === "Map") {
+            this.stampCid(value, insertedContainer.id);
         }
         return insertedContainer;
     }
@@ -1549,8 +1535,8 @@ export class Mirror<S extends SchemaType> {
 
         this.initializeContainer(insertedContainer, schema, value);
         // Stamp $cid for list item maps directly on the provided value (pending state)
-        if (schema && isLoroMapSchema(schema) && isObject(value)) {
-            value[CID_KEY] = insertedContainer.id;
+        if (insertedContainer.kind() === "Map") {
+            this.stampCid(value, insertedContainer.id);
         }
         return insertedContainer;
     }
@@ -1806,16 +1792,13 @@ export class Mirror<S extends SchemaType> {
         if (kind === "Map") {
             const m = c as LoroMap;
             const obj: JSONObject = {};
+            obj[CID_KEY] = String(c.id);
             for (const k of m.keys()) {
                 const v = m.get(k);
                 obj[k] = isContainer(v)
                     ? this.containerToStateJson(v)
                     : (v as JSONValue);
             }
-            const schema = this.getContainerSchema(c.id);
-            if (schema && isLoroMapSchema(schema)) {
-                obj[CID_KEY] = c.id;
-            }
             return obj;
         } else if (kind === "List" || kind === "MovableList") {
             const arr: JSONValue[] = [];
@@ -1945,6 +1928,11 @@ export class Mirror<S extends SchemaType> {
         });
     }
 
+    private stampCid(target: unknown, cid: ContainerID) {
+        if (!isObject(target)) return;
+        (target as Record<string, unknown>)[CID_KEY] = cid;
+    }
+
     private getSchemaForMapKey(
         schema:
             | LoroMapSchema<Record<string, SchemaType>>
@@ -2035,6 +2023,12 @@ export function toNormalizedJson(doc: LoroDoc) {
             return normalizeTreeNodes(v.toJSON()) as unknown as typeof v;
         }
 
+        if (isContainer(v) && v.kind() === "Map") {
+            const obj = (v as LoroMap).getShallowValue();
+            obj[CID_KEY] = v.id;
+            return obj;
+        }
+
         return v;
     });
 }

packages/core/tests/cid.test.ts

@@ -484,4 +484,29 @@ describe("$cid: state injection and write ignoring (always-on for LoroMap)", ()
         ]);
         expect(typeof st.tree[0].data[CID_KEY]).toBe("string");
     });
+
+    it("$cid is assigned to LoroMap inside LoroList even with schema", async () => {
+        const doc = new LoroDoc();
+        doc.getList("list").pushContainer(new LoroMap());
+        const m = new Mirror({
+            doc,
+            schema: schema({
+                list: schema.LoroList(
+                    schema.LoroMap({ title: schema.String() }),
+                ),
+            }),
+        });
+        console.log(m.getState());
+        const id = (m.getState() as any)["list"][0].$cid;
+        expect(typeof id === "string").toBeTruthy();
+    });
+
+    it("$cid is assigned to LoroMap inside LoroList even without schema", async () => {
+        const doc = new LoroDoc();
+        doc.getList("list").pushContainer(new LoroMap());
+        const m = new Mirror({ doc });
+        console.log(m.getState());
+        const id = (m.getState() as any)["list"][0].$cid;
+        expect(typeof id === "string").toBeTruthy();
+    });
 });

packages/core/tests/null-in-map-consistency.test.ts

@@ -38,7 +38,7 @@ describe("setState consistency with null fields in LoroMap", () => {
         });
 
         // Sanity: mirror picks up the null from doc (ignoring $cid, which is app-only)
-        expect(stripCid(mirror.getState())).toEqual(toNormalizedJson(doc));
+        expect(mirror.getState()).toEqual(toNormalizedJson(doc));
         console.log(JSON.stringify(doc.toJSON(), null, 2));
 
         // Update another field (unrelated) to force a diff run
@@ -50,7 +50,7 @@ describe("setState consistency with null fields in LoroMap", () => {
         }).not.toThrow();
 
         // State remains in sync with doc (ignoring $cid)
-        expect(stripCid(mirror.getState())).toEqual(toNormalizedJson(doc));
+        expect(mirror.getState()).toEqual(toNormalizedJson(doc));
         // And the original null is preserved
         expect((mirror.getState() as any).m.nested).toBeNull();
     });
@@ -83,7 +83,7 @@ describe("setState consistency with null fields in LoroMap", () => {
         expect(() => {
             mirror.setState((s) => s);
         }).not.toThrow();
-        expect(stripCid(mirror.getState())).toEqual(toNormalizedJson(doc));
+        expect(mirror.getState()).toEqual(toNormalizedJson(doc));
         expect((mirror.getState() as any).root.list[0].child).toBeNull();
     });
 });