Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SetRequiredDeep type #939

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export type {InvariantOf} from './source/invariant-of';
export type {SetOptional} from './source/set-optional';
export type {SetReadonly} from './source/set-readonly';
export type {SetRequired} from './source/set-required';
export type {SetRequiredDeep} from './source/set-required-deep';
export type {SetNonNullable} from './source/set-non-nullable';
export type {ValueOf} from './source/value-of';
export type {AsyncReturnType} from './source/async-return-type';
Expand Down
1 change: 1 addition & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ Click the type names for complete docs.
- [`SetOptional`](source/set-optional.d.ts) - Create a type that makes the given keys optional.
- [`SetReadonly`](source/set-readonly.d.ts) - Create a type that makes the given keys readonly.
- [`SetRequired`](source/set-required.d.ts) - Create a type that makes the given keys required.
- [`SetRequiredDeep`](source/set-required-deep.d.ts) - Like `SetRequired` except it selects the keys deeply.
- [`SetNonNullable`](source/set-non-nullable.d.ts) - Create a type that makes the given keys non-nullable.
- [`ValueOf`](source/value-of.d.ts) - Create a union of the given object's values, and optionally specify which keys to get the values from.
- [`ConditionalKeys`](source/conditional-keys.d.ts) - Extract keys from a shape where values extend the given `Condition` type.
Expand Down
72 changes: 72 additions & 0 deletions source/set-required-deep.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import type {NonRecursiveType} from './internal';
import type {Paths} from './paths';
import type {SimplifyDeep} from './simplify-deep';

/**
Create a type that makes the given keys required. You can specify deeply nested key paths. The remaining keys are kept as is.

Use-case: You want to define as required only a some nested keys inside a model.

@example
```
import type {SetRequiredDeep} from 'type-fest';

type Foo = {
a?: number;
b?: string;
hugomartinet marked this conversation as resolved.
Show resolved Hide resolved
c?: {
d?: number
}[]
}

type SomeRequiredDeep = SetRequiredDeep<Foo, 'a' | `c.${number}.d`>;
// type SomeRequiredDeep = {
// a: number; // Is now required
// b?: string;
// c: {
// d: number // Is now required
// }[]
// }
```

@category Object
*/
export type SetRequiredDeep<
BaseType,
KeyPaths extends Paths<BaseType>,
> = BaseType extends NonRecursiveType
? never
: SimplifyDeep<
BaseType extends Array<infer _>
? Array<
SetRequiredDeep<
NonNullable<BaseType[number]>,
KeyPaths extends `${number}.${infer Rest extends Paths<NonNullable<BaseType[number]>>}`
? Rest
: never
>
>
: Omit<BaseType, RootRequiredKeys<BaseType, KeyPaths>> &
Required<
Pick<
BaseType,
Extract<KeyPaths, RootRequiredKeys<BaseType, KeyPaths>>
>
> & Partial<{
[K in RootRequiredKeys<
BaseType,
Exclude<KeyPaths, RootRequiredKeys<BaseType, KeyPaths>>
>]: SetRequiredDeep<
NonNullable<BaseType[K]>,
KeyPaths extends `${K}.${infer Rest extends Paths<NonNullable<BaseType[K]>>}`
? Rest
: never
>;
}>
>;

// Extract the BaseType root keys from the KeyPaths
type RootRequiredKeys<BaseType, KeyPaths extends Paths<BaseType>> = Extract<
keyof BaseType,
KeyPaths extends `${infer Root}.${string}` ? Root : KeyPaths
>;
38 changes: 38 additions & 0 deletions test-d/set-required-deep.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import {expectType} from 'tsd';
import type {SetRequiredDeep} from '../index';

// Set nested key to required
declare const variation1: SetRequiredDeep<{a?: number; b?: {c?: string}}, 'b.c'>;
expectType<{a?: number; b?: {c: string}}>(variation1);

hugomartinet marked this conversation as resolved.
Show resolved Hide resolved
// Set key to required but not nested keys if not specified
declare const variation2: SetRequiredDeep<{a?: number; b?: {c?: string}}, 'b'>;
expectType<{a?: number; b: {c?: string}}>(variation2);

// Set root key to required
declare const variation3: SetRequiredDeep<{a?: number; b?: {c?: string}}, 'a'>;
expectType<{a: number; b?: {c?: string}}>(variation3);

// Keeps required key as required
declare const variation4: SetRequiredDeep<{a: number; b?: {c?: string}}, 'a'>;
expectType<{a: number; b?: {c?: string}}>(variation4);

// Set key to required in a union.
declare const variation5: SetRequiredDeep<{a?: '1'; b?: {c?: boolean}} | {a?: '2'; b?: {c?: boolean}}, 'a'>;
expectType<{a: '1'; b?: {c?: boolean}} | {a: '2'; b?: {c?: boolean}}>(variation5);

// Set array key to required
declare const variation6: SetRequiredDeep<{a?: Array<{b?: number}>}, 'a'>;
expectType<{a: Array<{b?: number}>}>(variation6);

hugomartinet marked this conversation as resolved.
Show resolved Hide resolved
// Set key inside array to required
declare const variation7: SetRequiredDeep<{a?: Array<{b?: number}>}, `a.${number}.b`>;
expectType<{a?: Array<{b: number}>}>(variation7);

// Set only specified keys inside array to required
declare const variation8: SetRequiredDeep<{a?: Array<{b?: number; c?: string}>}, `a.${number}.b`>;
expectType<{a?: Array<{b: number; c?: string}>}>(variation8);

// Can set both root and nested keys to required
declare const variation9: SetRequiredDeep<{a?: number; b?: {c?: string}}, 'b' | 'b.c'>;
expectType<{a?: number; b: {c: string}}>(variation9);