Merge branch 'main' into 5.x

immutable-js · Jan 26, 2024 · ac7e48c · ac7e48c
2 parents 2d15265 + 7f67a23
commit ac7e48c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1 +1 @@
-github: [Methuselah96]
+github: [jdeniau, Methuselah96]
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/immutable-js/immutable-js/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/immutable-js/immutable-js/actions/workflows/ci.yml?query=branch%3Amain) [Chat on slack](https://immutable-js.slack.com)
 
-[Read the docs](https://immutable-js.com) and eat your vegetables.
+[Read the docs](https://immutable-js.com/docs/) and eat your vegetables.
 
 Docs are automatically generated from [README.md][] and [immutable.d.ts][].
 Please contribute! Also, don't miss the [wiki][] which contains articles on

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -125,7 +125,7 @@
     "transducers-js": "0.4.174",
     "tslint": "6.1.3",
     "tslint-config-prettier": "1.18.0",
-    "typescript": "^4.9"
+    "typescript": "5.1"
   },
   "size-limit": [
     {

diff --git a/type-definitions/immutable.d.ts b/type-definitions/immutable.d.ts
@@ -1830,6 +1830,8 @@ declare namespace Immutable {
      * `Set.fromKeys()` creates a new immutable Set containing the keys from
      * this Collection or JavaScript Object.
      */
+    function fromKeys<T>(iter: Collection.Keyed<T, unknown>): Set<T>;
+    // tslint:disable-next-line unified-signatures
     function fromKeys<T>(iter: Collection<T, unknown>): Set<T>;
     function fromKeys(obj: { [key: string]: unknown }): Set<string>;
 
@@ -2053,6 +2055,8 @@ declare namespace Immutable {
      * `OrderedSet.fromKeys()` creates a new immutable OrderedSet containing
      * the keys from this Collection or JavaScript Object.
      */
+    function fromKeys<T>(iter: Collection.Keyed<T, unknown>): OrderedSet<T>;
+    // tslint:disable-next-line unified-signatures
     function fromKeys<T>(iter: Collection<T, unknown>): OrderedSet<T>;
     function fromKeys(obj: { [key: string]: unknown }): OrderedSet<string>;
   }

diff --git a/type-definitions/ts-tests/ordered-set.ts b/type-definitions/ts-tests/ordered-set.ts
@@ -42,7 +42,7 @@ import { OrderedSet, Map } from 'immutable';
 {
   // .fromKeys
 
-  // $ExpectType OrderedSet<string>
+  // $ExpectType OrderedSet<number>
   OrderedSet.fromKeys(Map<number, string>());
 
   // $ExpectType OrderedSet<number>

diff --git a/type-definitions/ts-tests/set.ts b/type-definitions/ts-tests/set.ts
@@ -1,4 +1,4 @@
-import { Set, Map } from 'immutable';
+import { Set, Map, Collection } from 'immutable';
 
 {
   // #constructor
@@ -39,7 +39,7 @@ import { Set, Map } from 'immutable';
 {
   // .fromKeys
 
-  // $ExpectType Set<string>
+  // $ExpectType Set<number>
   Set.fromKeys(Map<number, string>());
 
   // $ExpectType Set<number>