From 31ceb536df851ebba5b4ecd4ff6882b01f02d2d4 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sun, 28 May 2023 20:38:27 +0200 Subject: [PATCH 1/2] Map, Set, WeakMap, WeakSet: use types from Js namespace --- src/Core__Map.res | 2 +- src/Core__Map.resi | 2 +- src/Core__Set.res | 2 +- src/Core__Set.resi | 2 +- src/Core__WeakMap.res | 2 +- src/Core__WeakSet.res | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Core__Map.res b/src/Core__Map.res index bedcc6d7..70d2c676 100644 --- a/src/Core__Map.res +++ b/src/Core__Map.res @@ -1,4 +1,4 @@ -type t<'k, 'v> +type t<'k, 'v> = Js.Map.t<'k, 'v> @new external make: unit => t<'k, 'v> = "Map" @new external fromArray: array<('k, 'v)> => t<'k, 'v> = "Map" diff --git a/src/Core__Map.resi b/src/Core__Map.resi index 7d3d4c09..643bcbdd 100644 --- a/src/Core__Map.resi +++ b/src/Core__Map.resi @@ -7,7 +7,7 @@ See [`Map`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Gl /** Type representing an instance of `Map`. */ -type t<'k, 'v> +type t<'k, 'v> = Js.Map.t<'k, 'v> /** Creates a new, mutable JavaScript `Map`. A `Map` can have any values as both keys and values. diff --git a/src/Core__Set.res b/src/Core__Set.res index 0ffdf0c1..6a2ed0fa 100644 --- a/src/Core__Set.res +++ b/src/Core__Set.res @@ -1,4 +1,4 @@ -type t<'a> +type t<'a> = Js.Set.t<'a> @new external make: unit => t<'a> = "Set" @new external fromArray: array<'a> => t<'a> = "Set" diff --git a/src/Core__Set.resi b/src/Core__Set.resi index 947213f7..621dee0c 100644 --- a/src/Core__Set.resi +++ b/src/Core__Set.resi @@ -7,7 +7,7 @@ See [`Set`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Gl /** Type representing an instance of `Set`. */ -type t<'a> +type t<'a> = Js.Set.t<'a> /** Creates a new, mutable JavaScript `Set`. A `Set` is a collection of unique values. diff --git a/src/Core__WeakMap.res b/src/Core__WeakMap.res index 42dde986..4bc91810 100644 --- a/src/Core__WeakMap.res +++ b/src/Core__WeakMap.res @@ -1,4 +1,4 @@ -type t<'k, 'v> +type t<'k, 'v> = Js.WeakMap.t<'k, 'v> @new external make: unit => t<'k, 'v> = "WeakMap" diff --git a/src/Core__WeakSet.res b/src/Core__WeakSet.res index b8c17e94..851329c8 100644 --- a/src/Core__WeakSet.res +++ b/src/Core__WeakSet.res @@ -1,4 +1,4 @@ -type t<'a> +type t<'a> = Js.WeakSet.t<'a> @new external make: unit => t<'a> = "WeakSet" From bba35fdb6f848260fa3e74a863e61f33be356897 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sun, 28 May 2023 20:51:42 +0200 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d8fae13..90ba7c72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### API changes +- Map, Set, WeakMap, WeakSet: use the types defined in the Js namespace. https://github.com/rescript-association/rescript-core/pull/143 - `Array` mutable & immutable helper name changed to conform to JS' upcoming APIs [such as `toSorted`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toSorted) - `sort` -> `toSorted`, `sortInPlace` -> `sort` - `reverse` -> `toReversed`, `reverseInPlace` -> `reverse`