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.

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

Jump to bottom

Restore existing type inference behaviour of z.ZodObject #1122

Merged
merged 2 commits into from May 12, 2022
Merged

Restore existing type inference behaviour of z.ZodObject #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aba4d1
Fix addQuestionsMarks so it resolves correctly in more cases
bentefay May 9, 2022
e967932
Ran lint on languageServerFeatures.test.ts
bentefay May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions deno/lib/types.ts
View file
Open in desktop
Expand Up @@ -1363,13 +1363,18 @@ export namespace objectUtil {
[k in Exclude<keyof U, keyof V>]: U[k];
} & V;

export type requiredKeys<T extends object> = {
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];

export type addQuestionMarks<T extends object> = {
[k in keyof T]?: T[k];
} & { [k in requiredKeys<T>]: T[k] };
export type addQuestionMarks<T extends object> = Partial<
Pick<T, optionalKeys<T>>
> &
Pick<T, requiredKeys<T>>;

export type identity<T> = T;
export type flatten<T extends object> = identity<{ [k in keyof T]: T[k] }>;
Expand Down
5 changes: 3 additions & 2 deletions src/__tests__/languageServerFeatures.test.ts
View file
Open in desktop
@@ -1,8 +1,9 @@
// @ts-ignore TS6133
import { expect, fit } from "@jest/globals";
import { filePath } from "./languageServerFeatures.source";
import { Project, Node, SyntaxKind } from "ts-morph";
import path from "path";
import { Node, Project, SyntaxKind } from "ts-morph";

import { filePath } from "./languageServerFeatures.source";

// The following tool is helpful for understanding the TypeScript AST associated with these tests:
// https://ts-ast-viewer.com/ (just copy the contents of languageServerFeatures.source into the viewer)
Expand Down
13 changes: 9 additions & 4 deletions src/types.ts
View file
Open in desktop
Expand Up @@ -1363,13 +1363,18 @@ export namespace objectUtil {
[k in Exclude<keyof U, keyof V>]: U[k];
} & V;

export type requiredKeys<T extends object> = {
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];

export type addQuestionMarks<T extends object> = {
[k in keyof T]?: T[k];
} & { [k in requiredKeys<T>]: T[k] };
export type addQuestionMarks<T extends object> = Partial<
Pick<T, optionalKeys<T>>
> &
Pick<T, requiredKeys<T>>;

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