wip

src/core/observer.ts

@@ -29,6 +29,14 @@ export class Observer {
       // fun fact: typeof null === 'object'
       return value;
     }
+    if (
+      value instanceof Map ||
+      value instanceof WeakMap ||
+      value instanceof Set ||
+      value instanceof WeakSet
+    ) {
+      return value;
+    }
     let metadata = this.weakMap.get(value) || this._observe(value, parent);
     return metadata.proxy;
   }

tests/core/observer.test.ts

@@ -429,4 +429,44 @@ describe("observer", () => {
       obj.a.push(2);
     }).toThrow('Observed state cannot be changed here! (key: "1", val: "2")');
   });
+
+  test("functions are not observed, but are properly bound", () => {
+    const observer = new Observer();
+    const obj: any = observer.observe({ m: new Map() });
+    expect(observer.rev).toBe(1);
+    obj.m.set("a", 1);
+    expect(obj.m.get("a")).toBe(1);
+
+    // should be 2, but we do not support reactivity on maps/weakmaps/set/weakset
+    expect(observer.rev).toBe(1);
+  });
+
+  test("functions are correctly bound", async () => {
+    const observer = new Observer();
+    const obj: any = observer.observe({ set: new Set() });
+    expect(observer.revNumber(obj)).toBe(1);
+    obj.set.add('mojo');
+    expect(observer.revNumber(obj)).toBe(1);
+
+    const steps: string[] = [];
+    obj.set.forEach((elm)=>{steps.push(elm)});
+
+    expect(steps).toStrictEqual(['mojo']);
+
+    obj.set.clear();
+    expect(observer.revNumber(obj)).toBe(1);
+  });
+
+  test("functions are correctly bound", async () => {
+    const observer = new Observer();
+    const obj: any = observer.observe({ set: [] });
+    expect(observer.revNumber(obj)).toBe(1);
+    obj.set.push('mojo');
+    expect(observer.revNumber(obj)).toBe(2);
+
+    const steps: string[] = [];
+    obj.set.forEach((elm)=>{steps.push(elm)});
+
+    expect(steps).toStrictEqual(['mojo']);
+  });
 });