Skip to content

fix: module imports optional types #2

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.

Sign up for GitHub

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

Merged
DemonHa merged 1 commit into from
Sep 2, 2025
Merged

fix: module imports optional types #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions src/type/module/infer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,15 @@ type TInferIntersect<ModuleProperties extends TProperties, Types extends TSchema
// ------------------------------------------------------------------
// Object
// ------------------------------------------------------------------
type ReadonlyOptionalPropertyKeys<Properties extends TProperties> = { [Key in keyof Properties]: Properties[Key] extends TReadonly<TSchema> ? (Properties[Key] extends TOptional<Properties[Key]> ? Key : never) : never }[keyof Properties]
type ReadonlyPropertyKeys<Source extends TProperties> = { [Key in keyof Source]: Source[Key] extends TReadonly<TSchema> ? (Source[Key] extends TOptional<Source[Key]> ? never : Key) : never }[keyof Source]
type OptionalPropertyKeys<Source extends TProperties> = { [Key in keyof Source]: Source[Key] extends TOptional<TSchema> ? (Source[Key] extends TReadonly<Source[Key]> ? never : Key) : never }[keyof Source]
type ReadonlyOptionalPropertyKeys<Properties extends TProperties> = {
[Key in keyof Properties]: Properties[Key] extends TReadonly<TSchema> ? (Properties[Key] extends TOptional<Properties[Key]> ? Key : never) : never
}[keyof Properties]
type ReadonlyPropertyKeys<Source extends TProperties> = {
[Key in keyof Source]: Source[Key] extends TReadonly<TSchema> ? (Source[Key] extends TOptional<Source[Key]> ? never : Key) : never
}[keyof Source]
type OptionalPropertyKeys<Source extends TProperties> = {
[Key in keyof Source]: Source[Key] extends TOptional<TSchema> ? (Source[Key] extends TReadonly<Source[Key]> ? never : Key) : never
}[keyof Source]
type RequiredPropertyKeys<Source extends TProperties> = keyof Omit<Source, ReadonlyOptionalPropertyKeys<Source> | ReadonlyPropertyKeys<Source> | OptionalPropertyKeys<Source>>
// prettier-ignore
type InferPropertiesWithModifiers<Properties extends TProperties, Source extends Record<keyof any, unknown>> = Evaluate<(
Expand Down Expand Up @@ -149,6 +155,7 @@ type TInferUnion<ModuleProperties extends TProperties, Types extends TSchema[],
// ------------------------------------------------------------------
// prettier-ignore
type TInfer<ModuleProperties extends TProperties, Type extends TSchema> = (
Type extends TOptional<infer O extends TSchema> ? TInfer<ModuleProperties, O> | undefined :
Type extends TArray<infer Type extends TSchema> ? TInferArray<ModuleProperties, Type> :
Type extends TAsyncIterator<infer Type extends TSchema> ? TInferAsyncIterator<ModuleProperties, Type> :
Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TInferConstructor<ModuleProperties, Parameters, InstanceType> :
Expand Down
Loading