@trpc/server 10.0.0-proxy-beta.17 → 10.0.0-proxy-beta.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/initTRPC.d.ts +6 -17
- package/dist/core/initTRPC.d.ts.map +1 -1
- package/dist/core/internals/procedureBuilder.d.ts +2 -2
- package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
- package/dist/types.d.ts +6 -5
- package/dist/types.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/core/initTRPC.ts +2 -2
- package/src/core/internals/procedureBuilder.ts +3 -2
- package/src/types.ts +13 -13
package/dist/core/initTRPC.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { mergeRoutersGeneric } from './internals/__generated__/mergeRoutersGeneric';
|
|
2
2
|
import { DefaultErrorShape, ErrorFormatter, ErrorFormatterShape } from '../error/formatter';
|
|
3
3
|
import { CombinedDataTransformer, DataTransformerOptions, DefaultDataTransformer } from '../transformer';
|
|
4
|
+
import { FlatOverwrite } from '../types';
|
|
4
5
|
import { CreateRootConfigTypes, RootConfig, RootConfigTypes, RuntimeConfig } from './internals/config';
|
|
5
6
|
import { PickFirstDefined, ValidateShape } from './internals/utils';
|
|
6
7
|
declare type PartialRootConfigTypes = Partial<RootConfigTypes>;
|
|
@@ -16,25 +17,13 @@ declare type CreateRootConfigTypesFromPartial<TTypes extends PartialRootConfigTy
|
|
|
16
17
|
* - Simplify typings
|
|
17
18
|
* - Doesn't need to be a class but it doesn't really hurt either
|
|
18
19
|
*/
|
|
19
|
-
declare class TRPCBuilder<TParams extends
|
|
20
|
-
context<TNewContext extends RootConfigTypes['ctx']>(): TRPCBuilder<
|
|
20
|
+
declare class TRPCBuilder<TParams extends PartialRootConfigTypes = {}> {
|
|
21
|
+
context<TNewContext extends RootConfigTypes['ctx']>(): TRPCBuilder<FlatOverwrite<TParams, {
|
|
21
22
|
ctx: TNewContext;
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
} : never) extends never ? never : "ctx")>> & Omit<{ [TKey in "ctx" | keyof TParams]: TKey extends "ctx" ? {
|
|
25
|
-
ctx: TNewContext;
|
|
26
|
-
}[TKey] : TKey extends keyof TParams ? TParams[TKey] : never; }, ({ [K_1 in keyof TParams]: TParams[K_1] extends undefined ? TParams : never; } extends infer T ? { [K in keyof T]: { [K_1 in keyof TParams]: TParams[K_1] extends undefined ? TParams : never; }[K] extends never ? never : K; } : never)[keyof TParams] | ((TNewContext extends undefined ? {
|
|
27
|
-
ctx: TNewContext;
|
|
28
|
-
} : never) extends never ? never : "ctx")>>>;
|
|
29
|
-
meta<TNewMeta extends RootConfigTypes['meta']>(): TRPCBuilder<import("../types").Simplify<Partial<Pick<{ [TKey in "meta" | keyof TParams]: TKey extends "meta" ? {
|
|
30
|
-
meta: TNewMeta;
|
|
31
|
-
}[TKey] : TKey extends keyof TParams ? TParams[TKey] : never; }, ({ [K_1 in keyof TParams]: TParams[K_1] extends undefined ? TParams : never; } extends infer T ? { [K in keyof T]: { [K_1 in keyof TParams]: TParams[K_1] extends undefined ? TParams : never; }[K] extends never ? never : K; } : never)[keyof TParams] | ((TNewMeta extends undefined ? {
|
|
32
|
-
meta: TNewMeta;
|
|
33
|
-
} : never) extends never ? never : "meta")>> & Omit<{ [TKey in "meta" | keyof TParams]: TKey extends "meta" ? {
|
|
34
|
-
meta: TNewMeta;
|
|
35
|
-
}[TKey] : TKey extends keyof TParams ? TParams[TKey] : never; }, ({ [K_1 in keyof TParams]: TParams[K_1] extends undefined ? TParams : never; } extends infer T ? { [K in keyof T]: { [K_1 in keyof TParams]: TParams[K_1] extends undefined ? TParams : never; }[K] extends never ? never : K; } : never)[keyof TParams] | ((TNewMeta extends undefined ? {
|
|
23
|
+
}>>;
|
|
24
|
+
meta<TNewMeta extends RootConfigTypes['meta']>(): TRPCBuilder<FlatOverwrite<TParams, {
|
|
36
25
|
meta: TNewMeta;
|
|
37
|
-
}
|
|
26
|
+
}>>;
|
|
38
27
|
create<TOptions extends Partial<RuntimeConfig<CreateRootConfigTypesFromPartial<TParams>>>>(options?: ValidateShape<TOptions, Partial<RuntimeConfig<CreateRootConfigTypesFromPartial<TParams>>>> | undefined): {
|
|
39
28
|
/**
|
|
40
29
|
* These are just types, they can't be used
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/core/initTRPC.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/core/initTRPC.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EAEpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,eAAe,EACf,aAAa,EAEd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIpE,aAAK,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvD,aAAK,gCAAgC,CAAC,MAAM,SAAS,sBAAsB,IACzE,qBAAqB,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,eAAe,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IACvE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IAC3E,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACjC,WAAW,EAAE,sBAAsB,CAAC;CACrC,CAAC,CAAC;AAEL;;;;;GAKG;AAEH,cAAM,WAAW,CAAC,OAAO,SAAS,sBAAsB,GAAG,EAAE;IAC3D,OAAO,CAAC,WAAW,SAAS,eAAe,CAAC,KAAK,CAAC;aACK,WAAW;;IAElE,IAAI,CAAC,QAAQ,SAAS,eAAe,CAAC,MAAM,CAAC;cACW,QAAQ;;IAEhE,MAAM,CACJ,QAAQ,SAAS,OAAO,CACtB,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CACzD,EAED,OAAO,CAAC,EACJ,aAAa,CACX,QAAQ,EACR,OAAO,CAAC,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,CAClE,GACD,SAAS;QAuEX;;;WAGG;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;QAEH;;WAEG;;;CAtFR;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,iBAAoB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FlatOverwrite, MaybePromise } from '../../types';
|
|
1
|
+
import { FlatOverwrite, MaybePromise, Simplify } from '../../types';
|
|
2
2
|
import { MiddlewareFunction } from '../middleware';
|
|
3
3
|
import { Parser, inferParser } from '../parser';
|
|
4
4
|
import { Procedure, ProcedureParams } from '../procedure';
|
|
@@ -22,7 +22,7 @@ export interface BuildProcedure<TType extends ProcedureType, TParams extends Pro
|
|
|
22
22
|
_output_out: TOutput;
|
|
23
23
|
}> : TParams> {
|
|
24
24
|
}
|
|
25
|
-
declare type OverwriteIfDefined<TType, TWith> = UnsetMarker extends TType ? TWith : FlatOverwrite<TType, TWith
|
|
25
|
+
declare type OverwriteIfDefined<TType, TWith> = UnsetMarker extends TType ? TWith : Simplify<FlatOverwrite<TType, TWith>>;
|
|
26
26
|
declare type ErrorMessage<TMessage extends string> = TMessage;
|
|
27
27
|
export declare type ProcedureBuilderDef<TParams extends ProcedureParams> = {
|
|
28
28
|
inputs: Parser[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -12,9 +12,9 @@ declare type UndefinedKeys<TType> = keyof OmitNever<{
|
|
|
12
12
|
/**
|
|
13
13
|
* @internal
|
|
14
14
|
*/
|
|
15
|
-
export declare type FlatOverwrite<TType, TWith> =
|
|
15
|
+
export declare type FlatOverwrite<TType, TWith> = InferOptional<{
|
|
16
16
|
[TKey in keyof TWith | keyof TType]: TKey extends keyof TWith ? TWith[TKey] : TKey extends keyof TType ? TType[TKey] : never;
|
|
17
|
-
}, UndefinedKeys<TType> | UndefinedKeys<TWith
|
|
17
|
+
}, UndefinedKeys<TType> | UndefinedKeys<TWith>>;
|
|
18
18
|
/**
|
|
19
19
|
* @public
|
|
20
20
|
*/
|
|
@@ -25,10 +25,11 @@ export declare type Maybe<TType> = TType | undefined | null;
|
|
|
25
25
|
export declare type ThenArg<TType> = TType extends PromiseLike<infer U> ? ThenArg<U> : TType;
|
|
26
26
|
/**
|
|
27
27
|
* @internal
|
|
28
|
+
* @see https://github.com/ianstormtaylor/superstruct/blob/7973400cd04d8ad92bbdc2b6f35acbfb3c934079/src/utils.ts#L323-L325
|
|
28
29
|
*/
|
|
29
|
-
export declare type Simplify<TType> = {
|
|
30
|
-
[
|
|
31
|
-
};
|
|
30
|
+
export declare type Simplify<TType> = TType extends any[] | Date ? TType : {
|
|
31
|
+
[K in keyof TType]: TType[K];
|
|
32
|
+
} & {};
|
|
32
33
|
/**
|
|
33
34
|
* @public
|
|
34
35
|
*/
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC;AAEpC,aAAK,aAAa,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,KAAK,IAAI,OAAO,CAC5D,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CACnB,GACC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAErB,aAAK,SAAS,CAAC,KAAK,IAAI,IAAI,CAC1B,KAAK,EACL;KACG,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,GAAG,CAAC;CACvD,CAAC,MAAM,KAAK,CAAC,CACf,CAAC;AAEF,aAAK,aAAa,CAAC,KAAK,IAAI,MAAM,SAAS,CAAC;KACzC,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK;CAC/D,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,aAAa,CAAC,KAAK,EAAE,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC;AAEpC,aAAK,aAAa,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,KAAK,IAAI,OAAO,CAC5D,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CACnB,GACC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAErB,aAAK,SAAS,CAAC,KAAK,IAAI,IAAI,CAC1B,KAAK,EACL;KACG,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,GAAG,CAAC;CACvD,CAAC,MAAM,KAAK,CAAC,CACf,CAAC;AAEF,aAAK,aAAa,CAAC,KAAK,IAAI,MAAM,SAAS,CAAC;KACzC,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK;CAC/D,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,aAAa,CAAC,KAAK,EAAE,KAAK,IAAI,aAAa,CACrD;KACG,IAAI,IAAI,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,IAAI,SAAS,MAAM,KAAK,GACzD,KAAK,CAAC,IAAI,CAAC,GACX,IAAI,SAAS,MAAM,KAAK,GACxB,KAAK,CAAC,IAAI,CAAC,GACX,KAAK;CACV,EACD,aAAa,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAC5C,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,KAAK,IAAI,KAAK,GAAG,SAAS,GAAG,IAAI,CAAC;AAEpD;;GAEG;AACH,oBAAY,OAAO,CAAC,KAAK,IAAI,KAAK,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAC3D,OAAO,CAAC,CAAC,CAAC,GACV,KAAK,CAAC;AAEV;;;GAGG;AACH,oBAAY,QAAQ,CAAC,KAAK,IAAI,KAAK,SAAS,GAAG,EAAE,GAAG,IAAI,GACpD,KAAK,GACL;KAAG,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAC;AAC1C;;GAEG;AACH,oBAAY,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,CAAC,CAAC;AAE5D;;GAEG;AACH,oBAAY,YAAY,CAAC,KAAK,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAEzD;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,KAAK,IAAI,KAAK,GAAG;KACpC,OAAO,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,IAAI;KAC7C,IAAI,IAAI,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,OAAO,GAAG,IAAI,GAAG,KAAK;CAChE,CAAC,MAAM,IAAI,CAAC,CAAC;AAEd;;GAEG;AACH,oBAAY,MAAM,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,IAAI,IAAI,CACrD,IAAI,EACJ,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAC1B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/server",
|
|
3
|
-
"version": "10.0.0-proxy-beta.
|
|
3
|
+
"version": "10.0.0-proxy-beta.18",
|
|
4
4
|
"description": "tRPC Server",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -122,10 +122,10 @@
|
|
|
122
122
|
"@testing-library/jest-dom": "^5.16.5",
|
|
123
123
|
"@testing-library/react": "^13.4.0",
|
|
124
124
|
"@testing-library/user-event": "^14.4.3",
|
|
125
|
-
"@trpc/client": "10.0.0-proxy-beta.
|
|
126
|
-
"@trpc/next": "10.0.0-proxy-beta.
|
|
127
|
-
"@trpc/react": "10.0.0-proxy-beta.
|
|
128
|
-
"@trpc/server": "10.0.0-proxy-beta.
|
|
125
|
+
"@trpc/client": "10.0.0-proxy-beta.18",
|
|
126
|
+
"@trpc/next": "10.0.0-proxy-beta.18",
|
|
127
|
+
"@trpc/react": "10.0.0-proxy-beta.18",
|
|
128
|
+
"@trpc/server": "10.0.0-proxy-beta.18",
|
|
129
129
|
"@types/aws-lambda": "^8.10.97",
|
|
130
130
|
"@types/express": "^4.17.12",
|
|
131
131
|
"@types/hash-sum": "^1.0.0",
|
|
@@ -161,5 +161,5 @@
|
|
|
161
161
|
"yup": "^0.32.8",
|
|
162
162
|
"zod": "^3.0.0"
|
|
163
163
|
},
|
|
164
|
-
"gitHead": "
|
|
164
|
+
"gitHead": "d9914b26e761f2a02a5cc7b53b5675e19b8dc409"
|
|
165
165
|
}
|
package/src/core/initTRPC.ts
CHANGED
|
@@ -43,7 +43,7 @@ type CreateRootConfigTypesFromPartial<TTypes extends PartialRootConfigTypes> =
|
|
|
43
43
|
* - Doesn't need to be a class but it doesn't really hurt either
|
|
44
44
|
*/
|
|
45
45
|
|
|
46
|
-
class TRPCBuilder<TParams extends
|
|
46
|
+
class TRPCBuilder<TParams extends PartialRootConfigTypes = {}> {
|
|
47
47
|
context<TNewContext extends RootConfigTypes['ctx']>() {
|
|
48
48
|
return new TRPCBuilder<FlatOverwrite<TParams, { ctx: TNewContext }>>();
|
|
49
49
|
}
|
|
@@ -71,7 +71,7 @@ class TRPCBuilder<TParams extends Partial<RootConfigTypes> = {}> {
|
|
|
71
71
|
*/
|
|
72
72
|
export const initTRPC = new TRPCBuilder();
|
|
73
73
|
|
|
74
|
-
function createTRPCInner<TParams extends
|
|
74
|
+
function createTRPCInner<TParams extends PartialRootConfigTypes>() {
|
|
75
75
|
type $Generics = CreateRootConfigTypesFromPartial<TParams>;
|
|
76
76
|
|
|
77
77
|
type $Context = $Generics['ctx'];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TRPCError } from '../../error/TRPCError';
|
|
2
2
|
import { getTRPCErrorFromUnknown } from '../../error/utils';
|
|
3
|
-
import { FlatOverwrite, MaybePromise } from '../../types';
|
|
3
|
+
import { FlatOverwrite, MaybePromise, Simplify } from '../../types';
|
|
4
4
|
import {
|
|
5
5
|
MiddlewareFunction,
|
|
6
6
|
MiddlewareResult,
|
|
@@ -64,7 +64,7 @@ export interface BuildProcedure<
|
|
|
64
64
|
|
|
65
65
|
type OverwriteIfDefined<TType, TWith> = UnsetMarker extends TType
|
|
66
66
|
? TWith
|
|
67
|
-
: FlatOverwrite<TType, TWith
|
|
67
|
+
: Simplify<FlatOverwrite<TType, TWith>>;
|
|
68
68
|
|
|
69
69
|
type ErrorMessage<TMessage extends string> = TMessage;
|
|
70
70
|
|
|
@@ -105,6 +105,7 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
|
|
|
105
105
|
TParams['_input_out'],
|
|
106
106
|
inferParser<$Parser>['out']
|
|
107
107
|
>;
|
|
108
|
+
|
|
108
109
|
_output_in: TParams['_output_in'];
|
|
109
110
|
_output_out: TParams['_output_out'];
|
|
110
111
|
}>;
|
package/src/types.ts
CHANGED
|
@@ -24,17 +24,15 @@ type UndefinedKeys<TType> = keyof OmitNever<{
|
|
|
24
24
|
/**
|
|
25
25
|
* @internal
|
|
26
26
|
*/
|
|
27
|
-
export type FlatOverwrite<TType, TWith> =
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
[TKey
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
UndefinedKeys<TType> | UndefinedKeys<TWith>
|
|
37
|
-
>
|
|
27
|
+
export type FlatOverwrite<TType, TWith> = InferOptional<
|
|
28
|
+
{
|
|
29
|
+
[TKey in keyof TWith | keyof TType]: TKey extends keyof TWith
|
|
30
|
+
? TWith[TKey]
|
|
31
|
+
: TKey extends keyof TType
|
|
32
|
+
? TType[TKey]
|
|
33
|
+
: never;
|
|
34
|
+
},
|
|
35
|
+
UndefinedKeys<TType> | UndefinedKeys<TWith>
|
|
38
36
|
>;
|
|
39
37
|
|
|
40
38
|
/**
|
|
@@ -51,9 +49,11 @@ export type ThenArg<TType> = TType extends PromiseLike<infer U>
|
|
|
51
49
|
|
|
52
50
|
/**
|
|
53
51
|
* @internal
|
|
52
|
+
* @see https://github.com/ianstormtaylor/superstruct/blob/7973400cd04d8ad92bbdc2b6f35acbfb3c934079/src/utils.ts#L323-L325
|
|
54
53
|
*/
|
|
55
|
-
export type Simplify<TType> =
|
|
56
|
-
|
|
54
|
+
export type Simplify<TType> = TType extends any[] | Date
|
|
55
|
+
? TType
|
|
56
|
+
: { [K in keyof TType]: TType[K] } & {};
|
|
57
57
|
/**
|
|
58
58
|
* @public
|
|
59
59
|
*/
|