[#79] Patches GetIndexField<>

birdofpreyru · birdofpreyru · commit b13a706d3990 · 2024-05-29T00:19:18.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,10 +1,10 @@
 install-and-test: &install-and-test
   - checkout
   - restore_cache:
-      key: node-modules-1-{{ checksum "package-lock.json" }}-{{ checksum "docs/package-lock.json" }}
+      key: node-modules-2-{{ checksum "package-lock.json" }}-{{ checksum "docs/package-lock.json" }}
   - run: npm install && cd docs && npm install
   - save_cache:
-      key: node-modules-1-{{ checksum "package-lock.json" }}-{{ checksum "docs/package-lock.json" }}
+      key: node-modules-2-{{ checksum "package-lock.json" }}-{{ checksum "docs/package-lock.json" }}
       paths:
         - node_modules
         - docs/node_modules
diff --git a/__tests__/ts-types/utils/value-at-path.ts b/__tests__/ts-types/utils/value-at-path.ts
@@ -82,3 +82,24 @@ test('type resolution with [] brackets in path', () => {
   expect<ValueAtPathT<StateT, `a[${string}][${string}]`, never>>()
     .type.toEqual<string | undefined>();
 });
+
+// Test related to: https://github.com/birdofpreyru/react-global-state/issues/79
+test('type resolution with number keys', () => {
+  type StateT = Record<string, string>;
+
+  expect<StateT[string]>().type.toEqual<string>();
+
+  // It works because for JavaScript objects numeric keys are converted
+  // to their string representations anyway, and TypeScript knows it.
+  expect<StateT[number]>().type.toEqual<string>();
+
+  // GetFieldType<> must follow the TypeScript behavior above.
+  expect<GetFieldType<StateT, string>>().type.toEqual<string>();
+  expect<GetFieldType<StateT, number>>().type.toEqual<string>();
+  expect<GetFieldType<StateT, `[${number}]`>>().type.toEqual<string>();
+
+  type ArrT = string[];
+  expect<ArrT[1]>().type.toEqual<string>();
+  expect<GetFieldType<ArrT, number>>().type.toEqual<string>();
+  // expect<GetFieldType<ArrT, `[${number}]`>>().type.toEqual<string>();
+});
diff --git a/patches/@types+lodash+4.17.4.patch b/patches/@types+lodash+4.17.4.patch
@@ -1,8 +1,36 @@
 diff --git a/node_modules/@types/lodash/common/object.d.ts b/node_modules/@types/lodash/common/object.d.ts
-index 69552b0..2c10bea 100644
+index 69552b0..7e88e0c 100644
 --- a/node_modules/@types/lodash/common/object.d.ts
 +++ b/node_modules/@types/lodash/common/object.d.ts
-@@ -1051,9 +1051,11 @@ declare module "../index" {
+@@ -1021,17 +1021,19 @@ declare module "../index" {
+         functionsIn(): CollectionChain<string>;
+     }
+ 
+-    type GetIndexedField<T, K> = K extends keyof T
+-        ? T[K]
+-        : K extends `${number}`
+-            ? 'length' extends keyof T
+-                ? number extends T['length']
+-                    ? number extends keyof T
+-                        ? T[number]
++    type GetIndexedField<T, K> = K extends string | number | bigint | boolean | null | undefined
++        ? `${K}` extends keyof T
++            ? T[`${K}`]
++            : K extends `${number}`
++                ? 'length' extends keyof T
++                    ? number extends T['length']
++                        ? number extends keyof T
++                            ? T[number]
++                            : undefined
+                         : undefined
+                     : undefined
+                 : undefined
+-            : undefined;
++        : undefined;
+ 
+     type FieldWithPossiblyUndefined<T, Key> =
+         | GetFieldType<Exclude<T, undefined>, Key>
+@@ -1051,9 +1053,11 @@ declare module "../index" {
                  : undefined
          : P extends keyof T
              ? T[P]
