@types/lodash 4.17.5 → 4.17.7

lodash/README.md

@@ -8,7 +8,7 @@ This package contains type definitions for lodash (https://lodash.com).
 Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/lodash.
 
 ### Additional Details
- * Last updated: Sat, 08 Jun 2024 07:07:49 GMT
+ * Last updated: Tue, 16 Jul 2024 02:21:33 GMT
  * Dependencies: none
 
 # Credits

lodash/common/object.d.ts

@@ -1021,41 +1021,98 @@ 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]
-                        : undefined
-                    : undefined
-                : undefined
-            : undefined;
+    type GetFieldTypeOfArrayLikeByKey<T extends unknown[], K> =
+        K extends number ? T[K]
+        : K extends `${infer N extends number}` ? T[N]
+        : K extends keyof T ? T[K] : undefined;
 
-    type FieldWithPossiblyUndefined<T, Key> =
-        | GetFieldType<Exclude<T, undefined>, Key>
-        | Extract<T, undefined>;
+    type GetFieldTypeOfStringByKey<T extends string, K> =
+        K extends number ? T[K]
+        : K extends `${infer N extends number}` ? T[N]
+        : K extends keyof T ? T[K]
+        : undefined;
 
-    type IndexedFieldWithPossiblyUndefined<T, Key> =
-        | GetIndexedField<Exclude<T, undefined>, Key>
-        | Extract<T, undefined>;
+    type GetFieldTypeOfNarrowedByKey<T, K> =
+        T extends unknown[] ? GetFieldTypeOfArrayLikeByKey<T, K>
+        : T extends string ? GetFieldTypeOfStringByKey<T, K>
+        : K extends keyof T ? T[K]
+        : K extends number
+            ? `${K}` extends keyof T ? T[`${K}`] : undefined
+        : K extends `${infer N extends number}`
+            ? N extends keyof T ? T[N] : undefined
+        : undefined;
 
-    type GetFieldType<T, P> = P extends `${infer Left}.${infer Right}`
-        ? Left extends keyof Exclude<T, undefined>
-            ? FieldWithPossiblyUndefined<Exclude<T, undefined>[Left], Right> | Extract<T, undefined>
-            : Left extends `${infer FieldKey}[${infer IndexKey}]`
-                ? FieldKey extends keyof T
-                    ? FieldWithPossiblyUndefined<IndexedFieldWithPossiblyUndefined<T[FieldKey], IndexKey>, Right>
-                    : undefined
-                : undefined
-        : P extends keyof T
-            ? T[P]
-            : P extends `${infer FieldKey}[${infer IndexKey}]`
-                ? FieldKey extends keyof T
-                    ? IndexedFieldWithPossiblyUndefined<T[FieldKey], IndexKey>
-                    : undefined
-                : IndexedFieldWithPossiblyUndefined<T, P>;
+    /** Internal. Assumes P is a dot-delimited path. */
+    type GetFieldTypeOfNarrowedByDotPath<T, P> =
+        P extends `${infer L}.${infer R}`
+        ? GetFieldType<GetFieldTypeOfNarrowedByKey<T, L>, R, 'DotPath'>
+        : GetFieldTypeOfNarrowedByKey<T, P>;
+
+    /** Internal. This is a piece of GetFieldTypeOfNarrowedByLKR logic,
+     *  assuming that Lc isn't to be ignored, and does not end with dot. */
+    type GetFieldTypeOfNarrowedByLcKR<T, Lc, K, R> =
+        '' extends R
+            ? GetFieldType<GetFieldTypeOfNarrowedByDotPath<T, Lc>, K, 'Key'>
+        : R extends `.${infer Rc}`
+            ? GetFieldType<GetFieldType<GetFieldTypeOfNarrowedByDotPath<T, Lc>, K, 'Key'>, Rc>
+            : GetFieldType<GetFieldType<GetFieldTypeOfNarrowedByDotPath<T, Lc>, K, 'Key'>, R>
+
+    /** Internal. Assumes T has been narrowed; L is a dot-delimited path,
+     *  and should be ignored if an empty string; K is a key name; and R is
+     *  a dot-delimetered path, to be ignored if an empty string. Also if
+     *  L has a tail dot, or R has a front dot, these dots should be discarded,
+     *  however when L or R is just a dot, they should be interpreted as empty
+     *  key name (rather than ignored). */
+    type GetFieldTypeOfNarrowedByLKR<T, L, K, R> =
+        '' extends L
+        ? '' extends R
+            ? GetFieldTypeOfNarrowedByKey<T, K>
+            : R extends `.${infer Rc}`
+                ? GetFieldType<GetFieldTypeOfNarrowedByKey<T, K>, Rc>
+                : GetFieldType<GetFieldTypeOfNarrowedByKey<T, K>, R>
+        : L extends `${infer Lc}.`
+            ? GetFieldTypeOfNarrowedByLcKR<T, Lc, K, R>
+            : GetFieldTypeOfNarrowedByLcKR<T, L, K, R>
+
+    /** Internal. Assumes T has been narrowed. */
+    type GetFieldTypeOfNarrowed<T, X, XT extends 'DotPath' | 'Key' | 'Path'> =
+        XT extends 'Key' ? GetFieldTypeOfNarrowedByKey<T, X>
+        : XT extends 'DotPath' ? GetFieldTypeOfNarrowedByDotPath<T, X>
+        : X extends `${infer L}['${infer K}']${infer R}`
+            ? GetFieldTypeOfNarrowedByLKR<T, L, K, R>
+        : X extends `${infer L}["${infer K}"]${infer R}`
+            ? GetFieldTypeOfNarrowedByLKR<T, L, K, R>
+        : X extends `${infer L}[${infer K}]${infer R}`
+            ? GetFieldTypeOfNarrowedByLKR<T, L, K, R>
+        : GetFieldTypeOfNarrowedByDotPath<T, X>;
+
+    /** Internal. Assumes T has been narrowed to an object type. */
+    type GetFieldTypeOfObject<T, X, XT extends 'DotPath' | 'Key' | 'Path'> =
+        Extract<T, unknown[]> extends never
+        ? GetFieldTypeOfNarrowed<T, X, XT>
+        : GetFieldTypeOfNarrowed<Exclude<T, unknown[]>, X, XT>
+            | GetFieldTypeOfNarrowed<Extract<T, unknown[]>, X, XT>;
+
+    /** Internal. Assumes T has been narrowed to a primitive type. */
+    type GetFieldTypeOfPrimitive<T, X, XT extends 'DotPath' | 'Key' | 'Path'> =
+        Extract<T, string> extends never
+        ? T extends never ? never : undefined
+        : (Exclude<T, string> extends never ? never : undefined)
+            | GetFieldTypeOfNarrowed<Extract<T, string>, X, XT>;
+
+    /**
+     * Deduces the type of value at the path P of type T,
+     * so that _.get<T, P>(t: T, p: P): GetFieldType<T, P>.
+     * XT specifies the exact meaning of X:
+     * - 'Path' (default) - X is a path type to be fully parsed;
+     * - 'DotPath - X is a dot-delimitered path, without square (indexing) brackets;
+     * - 'Key' - X is a simple key, and needs no parsing.
+     */
+    type GetFieldType<T, X, XT extends 'DotPath' | 'Key' | 'Path' = 'Path'> =
+        Extract<T, object> extends never
+        ? GetFieldTypeOfPrimitive<T, X, XT>
+        : GetFieldTypeOfPrimitive<Exclude<T, object>, X, XT>
+            | GetFieldTypeOfObject<Extract<T, object>, X, XT>;
 
     interface LoDashStatic {
         /**
@@ -1083,11 +1140,11 @@ declare module "../index" {
         /**
          * @see _.get
          */
-        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof TObject[TKey1]>(object: TObject | null | undefined, path: [TKey1, TKey2]): TObject[TKey1][TKey2] | undefined;
+        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof NonNullable<TObject[TKey1]>>(object: TObject | null | undefined, path: [TKey1, TKey2]): NonNullable<TObject[TKey1]>[TKey2] | undefined;
         /**
          * @see _.get
          */
-        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof TObject[TKey1], TDefault>(object: TObject | null | undefined, path: [TKey1, TKey2], defaultValue: TDefault): Exclude<TObject[TKey1][TKey2], undefined> | TDefault;
+        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof NonNullable<TObject[TKey1]>, TDefault>(object: TObject | null | undefined, path: [TKey1, TKey2], defaultValue: TDefault): Exclude<NonNullable<TObject[TKey1]>[TKey2], undefined> | TDefault;
         /**
          * @see _.get
          */
@@ -1095,11 +1152,11 @@ declare module "../index" {
         /**
          * @see _.get
          */
-        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof TObject[TKey1], TKey3 extends keyof TObject[TKey1][TKey2]>(object: TObject | null | undefined, path: [TKey1, TKey2, TKey3]): TObject[TKey1][TKey2][TKey3] | undefined;
+        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof NonNullable<TObject[TKey1]>, TKey3 extends keyof NonNullable<NonNullable<TObject[TKey1]>[TKey2]>>(object: TObject | null | undefined, path: [TKey1, TKey2, TKey3]): NonNullable<NonNullable<TObject[TKey1]>[TKey2]>[TKey3] | undefined;
         /**
          * @see _.get
          */
-        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof TObject[TKey1], TKey3 extends keyof TObject[TKey1][TKey2], TDefault>(object: TObject | null | undefined, path: [TKey1, TKey2, TKey3], defaultValue: TDefault): Exclude<TObject[TKey1][TKey2][TKey3], undefined> | TDefault;
+        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof NonNullable<TObject[TKey1]>, TKey3 extends keyof NonNullable<NonNullable<TObject[TKey1]>[TKey2]>, TDefault>(object: TObject | null | undefined, path: [TKey1, TKey2, TKey3], defaultValue: TDefault): Exclude<NonNullable<NonNullable<TObject[TKey1]>[TKey2]>[TKey3], undefined> | TDefault;
         /**
          * @see _.get
          */
@@ -1107,11 +1164,11 @@ declare module "../index" {
         /**
          * @see _.get
          */
-        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof TObject[TKey1], TKey3 extends keyof TObject[TKey1][TKey2], TKey4 extends keyof TObject[TKey1][TKey2][TKey3]>(object: TObject | null | undefined, path: [TKey1, TKey2, TKey3, TKey4]): TObject[TKey1][TKey2][TKey3][TKey4] | undefined;
+        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof NonNullable<TObject[TKey1]>, TKey3 extends keyof NonNullable<NonNullable<TObject[TKey1]>[TKey2]>, TKey4 extends keyof NonNullable<NonNullable<NonNullable<TObject[TKey1]>[TKey2]>[TKey3]>>(object: TObject | null | undefined, path: [TKey1, TKey2, TKey3, TKey4]): NonNullable<NonNullable<NonNullable<TObject[TKey1]>[TKey2]>[TKey3]>[TKey4] | undefined;
         /**
          * @see _.get
          */
-        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof TObject[TKey1], TKey3 extends keyof TObject[TKey1][TKey2], TKey4 extends keyof TObject[TKey1][TKey2][TKey3], TDefault>(object: TObject | null | undefined, path: [TKey1, TKey2, TKey3, TKey4], defaultValue: TDefault): Exclude<TObject[TKey1][TKey2][TKey3][TKey4], undefined> | TDefault;
+        get<TObject extends object, TKey1 extends keyof TObject, TKey2 extends keyof NonNullable<TObject[TKey1]>, TKey3 extends keyof NonNullable<NonNullable<TObject[TKey1]>[TKey2]>, TKey4 extends keyof NonNullable<NonNullable<NonNullable<TObject[TKey1]>[TKey2]>[TKey3]>, TDefault>(object: TObject | null | undefined, path: [TKey1, TKey2, TKey3, TKey4], defaultValue: TDefault): Exclude<NonNullable<NonNullable<NonNullable<TObject[TKey1]>[TKey2]>[TKey3]>[TKey4], undefined> | TDefault;
         /**
          * @see _.get
          */

lodash/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@types/lodash",
-    "version": "4.17.5",
+    "version": "4.17.7",
     "description": "TypeScript definitions for lodash",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/lodash",
     "license": "MIT",
@@ -55,6 +55,6 @@
     },
     "scripts": {},
     "dependencies": {},
-    "typesPublisherContentHash": "74ebed2e7d6c57a170dd86cb86d1848722ce0a78369151c7ac087d43a7a6e2d5",
-    "typeScriptVersion": "4.7"
+    "typesPublisherContentHash": "bfe2463828cc30244e31ef7b2555c36d16c840d293fe58f7533b2804c9fd409d",
+    "typeScriptVersion": "4.8"
 }