Make array snapshots not be quick arrays

gadget-inc · Nov 7, 2023 · 0c2d2d0 · 0c2d2d0
1 parent e7c370b
commit 0c2d2d0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/spec/array.spec.ts b/spec/array.spec.ts
@@ -2,8 +2,8 @@ import { types } from "../src";
 
 test("can create an array of simple types", () => {
   const arrayType = types.array(types.string);
-  expect(Array.from(arrayType.createReadOnly())).toEqual([]);
-  expect(Array.from(arrayType.createReadOnly(["a", "b"]))).toEqual(["a", "b"]);
+  expect(arrayType.createReadOnly().toJSON()).toEqual([]);
+  expect(arrayType.createReadOnly(["a", "b"]).toJSON()).toEqual(["a", "b"]);
 });
 
 test("can create an array of complex types", () => {
@@ -14,8 +14,8 @@ test("can create an array of complex types", () => {
 
   const arrayType = types.array(inventoryType);
 
-  expect(Array.from(arrayType.createReadOnly())).toEqual([]);
-  expect(Array.from(arrayType.createReadOnly([{ itemName: "A", amount: 10 }, { itemName: "B" }]))).toEqual([
+  expect(arrayType.createReadOnly().toJSON()).toEqual([]);
+  expect(arrayType.createReadOnly([{ itemName: "A", amount: 10 }, { itemName: "B" }]).toJSON()).toEqual([
     expect.objectContaining({ itemName: "A", amount: 10 }),
     expect.objectContaining({ itemName: "B", amount: 0 }),
   ]);

diff --git a/spec/class-model.spec.ts b/spec/class-model.spec.ts
@@ -518,8 +518,8 @@ describe("class models", () => {
   describe("class models with array/map/complex properties", () => {
     test("should default to empty arrays/maps when createReadOnly with undefined values", () => {
       const instance = NestedComplex.createReadOnly({});
-      expect(Array.from(instance.stringArray)).toEqual([]);
-      expect(Object.fromEntries(Object.entries(instance.numberMap))).toEqual({});
+      expect(instance.stringArray.toJSON()).toEqual([]);
+      expect(instance.numberMap.toJSON()).toEqual({});
     });
   });
 

diff --git a/src/array.ts b/src/array.ts
@@ -1,6 +1,7 @@
 import { isStateTreeNode, types } from "mobx-state-tree";
 import { BaseType } from "./base";
 import { ensureRegistered } from "./class-model";
+import { getSnapshot } from "./snapshot";
 import { $env, $parent, $readOnly, $type } from "./symbols";
 import type { IAnyStateTreeNode, IAnyType, IArrayType, IMSTArray, IStateTreeNode, Instance, InstantiateContext } from "./types";
 
@@ -48,7 +49,7 @@ export class QuickArray<T extends IAnyType> extends Array<Instance<T>> implement
   }
 
   toJSON(): Instance<T>[] {
-    return this;
+    return getSnapshot(this);
   }
 }
 

diff --git a/src/snapshot.ts b/src/snapshot.ts
@@ -16,7 +16,7 @@ export function getSnapshot<T extends IAnyType>(value: IStateTreeNode<T>): Snaps
 
 const snapshot = (value: any): unknown => {
   if (value instanceof QuickArray) {
-    return value.map((v) => snapshot(v));
+    return Array.from(value.map((v) => snapshot(v)));
   }
 
   if (value instanceof QuickMap) {