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

perf: speed up addQuestionMarks #2620

Closed
wants to merge 2 commits into from
Closed
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
27 changes: 14 additions & 13 deletions deno/lib/helpers/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,21 @@ export namespace objectUtil {
[k in Exclude<keyof U, keyof V>]: U[k];
} & V;

type optionalKeys<T extends object> = {
[k in keyof T]: undefined extends T[k] ? k : never;
}[keyof T];
type requiredKeys<T extends object> = {
[k in keyof T]: undefined extends T[k] ? never : k;
}[keyof T];
type pickRequired<T extends object, R extends keyof T = requiredKeys<T>> = {
[k in R]: T[k];
};
type pickOptional<T extends object, O extends keyof T = optionalKeys<T>> = {
[k in O]?: T[k];
// type optionalKeys<T extends object> = {
// [k in keyof T]: undefined extends T[k] ? k : never;
// }[keyof T];

type keepRequiredKeys<T extends object> = {
[k in keyof T as undefined extends T[k] ? never : k]-?: T[k];
};
export type addQuestionMarks<T extends object> = pickRequired<T> &
pickOptional<T> & { [k in keyof T]?: unknown };

// type alkjsdf = addQuestionMarks<{ a: any }>;

export type addQuestionMarks<
T extends object
// O extends keyof T = optionalKeys<T>
> = keepRequiredKeys<T> & Partial<T>;
// = { [k in O]?: T[k] } & { [k in R]: T[k] };

export type identity<T> = T;
export type flatten<T> = identity<{ [k in keyof T]: T[k] }>;
Expand Down
27 changes: 14 additions & 13 deletions src/helpers/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,21 @@ export namespace objectUtil {
[k in Exclude<keyof U, keyof V>]: U[k];
} & V;

type optionalKeys<T extends object> = {
[k in keyof T]: undefined extends T[k] ? k : never;
}[keyof T];
type requiredKeys<T extends object> = {
[k in keyof T]: undefined extends T[k] ? never : k;
}[keyof T];
type pickRequired<T extends object, R extends keyof T = requiredKeys<T>> = {
[k in R]: T[k];
};
type pickOptional<T extends object, O extends keyof T = optionalKeys<T>> = {
[k in O]?: T[k];
// type optionalKeys<T extends object> = {
// [k in keyof T]: undefined extends T[k] ? k : never;
// }[keyof T];

type keepRequiredKeys<T extends object> = {
[k in keyof T as undefined extends T[k] ? never : k]-?: T[k];
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if some semantic difference is found using this approach then we could also try this

Suggested change
[k in keyof T as undefined extends T[k] ? never : k]-?: T[k];
[k in keyof T as undefined extends T[k] ? never : k]-?: unknown;

};
export type addQuestionMarks<T extends object> = pickRequired<T> &
pickOptional<T> & { [k in keyof T]?: unknown };

// type alkjsdf = addQuestionMarks<{ a: any }>;

export type addQuestionMarks<
T extends object
// O extends keyof T = optionalKeys<T>
> = keepRequiredKeys<T> & Partial<T>;
// = { [k in O]?: T[k] } & { [k in R]: T[k] };

export type identity<T> = T;
export type flatten<T> = identity<{ [k in keyof T]: T[k] }>;
Expand Down
Loading