Merge branch 'main' into 3850-new-set-methods

urugator · web-flow · commit d68dd2a5d94d · 2024-07-02T13:21:18.000+02:00
diff --git a/packages/mobx/CHANGELOG.md b/packages/mobx/CHANGELOG.md
@@ -1,5 +1,11 @@
 # mobx
 
+## 6.12.5
+
+### Patch Changes
+
+-   [`ba890343`](https://github.com/mobxjs/mobx/commit/ba8903430ce96746db5dcde6b78edeb195ea8018) [#3893](https://github.com/mobxjs/mobx/pull/3893) Thanks [@g6123](https://github.com/g6123)! - Fix ES6 Map/Set checks for cross-window scripts
+
 ## 6.12.4
 
 ### Patch Changes
diff --git a/packages/mobx/package.json b/packages/mobx/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mobx",
-    "version": "6.12.4",
+    "version": "6.12.5",
     "description": "Simple, scalable state management.",
     "source": "src/mobx.ts",
     "main": "dist/index.js",
diff --git a/packages/mobx/src/types/observablemap.ts b/packages/mobx/src/types/observablemap.ts
@@ -16,6 +16,7 @@ import {
     hasListeners,
     interceptChange,
     isES6Map,
+    isPlainES6Map,
     isPlainObject,
     isSpyEnabled,
     makeIterable,
@@ -351,7 +352,7 @@ export class ObservableMap<K = any, V = any>
             } else if (Array.isArray(other)) {
                 other.forEach(([key, value]) => this.set(key, value))
             } else if (isES6Map(other)) {
-                if (other.constructor !== Map) {
+                if (!isPlainES6Map(other)) {
                     die(19, other)
                 }
                 other.forEach((value, key) => this.set(key, value))
diff --git a/packages/mobx/src/utils/utils.ts b/packages/mobx/src/utils/utils.ts
@@ -141,11 +141,18 @@ export function createInstanceofPredicate<T>(
 }
 
 export function isES6Map(thing: any): thing is Map<any, any> {
-    return thing instanceof Map
+    return thing != null && Object.prototype.toString.call(thing) === "[object Map]"
+}
+
+export function isPlainES6Map(thing: Map<any, any>): boolean {
+    const mapProto = Object.getPrototypeOf(thing)
+    const objectProto = Object.getPrototypeOf(mapProto)
+    const nullProto = Object.getPrototypeOf(objectProto)
+    return nullProto === null
 }
 
 export function isES6Set(thing: any): thing is Set<any> {
-    return thing instanceof Set
+    return thing != null && Object.prototype.toString.call(thing) === "[object Set]"
 }
 
 const hasGetOwnPropertySymbols = typeof Object.getOwnPropertySymbols !== "undefined"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mobx",`
`3`		`- "version": "6.12.4",`
	`3`	`+ "version": "6.12.5",`
`4`	`4`	`"description": "Simple, scalable state management.",`
`5`	`5`	`"source": "src/mobx.ts",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -141,11 +141,18 @@ export function createInstanceofPredicate<T>(`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`export function isES6Map(thing: any): thing is Map<any, any> {`
`144`		`- return thing instanceof Map`
	`144`	`+ return thing != null && Object.prototype.toString.call(thing) === "[object Map]"`
	`145`	`+}`
	`146`	`+`
	`147`	`+export function isPlainES6Map(thing: Map<any, any>): boolean {`
	`148`	`+ const mapProto = Object.getPrototypeOf(thing)`
	`149`	`+ const objectProto = Object.getPrototypeOf(mapProto)`
	`150`	`+ const nullProto = Object.getPrototypeOf(objectProto)`
	`151`	`+ return nullProto === null`
`145`	`152`	`}`
`146`	`153`
`147`	`154`	`export function isES6Set(thing: any): thing is Set<any> {`
`148`		`- return thing instanceof Set`
	`155`	`+ return thing != null && Object.prototype.toString.call(thing) === "[object Set]"`
`149`	`156`	`}`
`150`	`157`
`151`	`158`	`const hasGetOwnPropertySymbols = typeof Object.getOwnPropertySymbols !== "undefined"`