wip
This commit is contained in:
parent
48b1abffbe
commit
887f57e682
|
@ -116,10 +116,10 @@ export type Obj = Record<string, Schema>;
|
||||||
// https://github.com/misskey-dev/misskey/issues/8535
|
// https://github.com/misskey-dev/misskey/issues/8535
|
||||||
// To avoid excessive stack depth error,
|
// To avoid excessive stack depth error,
|
||||||
// deceive TypeScript with UnionToIntersection (or more precisely, `infer` expression within it).
|
// deceive TypeScript with UnionToIntersection (or more precisely, `infer` expression within it).
|
||||||
export type ObjType<s extends Obj, RequiredProps extends keyof s> =
|
export type ObjType<s extends Obj, RequiredProps extends ReadonlyArray<keyof s>> =
|
||||||
UnionToIntersection<
|
UnionToIntersection<
|
||||||
{ -readonly [R in RequiredPropertyNames<s>]-?: SchemaType<s[R]> } &
|
{ -readonly [R in RequiredPropertyNames<s>]-?: SchemaType<s[R]> } &
|
||||||
{ -readonly [R in RequiredProps]-?: SchemaType<s[R]> } &
|
{ -readonly [R in RequiredProps[number]]-?: SchemaType<s[R]> } &
|
||||||
{ -readonly [P in keyof s]?: SchemaType<s[P]> }
|
{ -readonly [P in keyof s]?: SchemaType<s[P]> }
|
||||||
>;
|
>;
|
||||||
|
|
||||||
|
@ -142,10 +142,10 @@ type ArrayUnion<T> = T extends any ? Array<T> : never;
|
||||||
type ObjectSchemaTypeDef<p extends Schema> =
|
type ObjectSchemaTypeDef<p extends Schema> =
|
||||||
p['ref'] extends keyof typeof refs ? Packed<p['ref']> :
|
p['ref'] extends keyof typeof refs ? Packed<p['ref']> :
|
||||||
p['properties'] extends NonNullable<Obj> ?
|
p['properties'] extends NonNullable<Obj> ?
|
||||||
p['anyOf'] extends ReadonlyArray<Schema> ? p['anyOf'][number]['required'] extends ReadonlyArray<keyof NonNullable<p['properties']>> ?
|
p['anyOf'] extends ReadonlyArray<Schema> ? p['anyOf'][number]['required'] extends ReadonlyArray<keyof p['properties']> ?
|
||||||
ObjType<p['properties'], NonNullable<p['required']>[number]> & ObjType<p['properties'], p['anyOf'][number]['required'][number]>
|
ObjType<p['properties'], NonNullable<p['anyOf'][number]['required']>> & ObjType<p['properties'], NonNullable<p['required']>>
|
||||||
: never
|
: never
|
||||||
: ObjType<p['properties'], NonNullable<p['required']>[number]>
|
: ObjType<p['properties'], NonNullable<p['required']>>
|
||||||
:
|
:
|
||||||
p['anyOf'] extends ReadonlyArray<Schema> ? UnionObjectSchemaType<p['anyOf']> & PartialIntersection<UnionObjectSchemaType<p['anyOf']>> :
|
p['anyOf'] extends ReadonlyArray<Schema> ? UnionObjectSchemaType<p['anyOf']> & PartialIntersection<UnionObjectSchemaType<p['anyOf']>> :
|
||||||
p['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
|
p['allOf'] extends ReadonlyArray<Schema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
|
||||||
|
|
Loading…
Reference in New Issue