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

Updates for GraphQL schema ordering and TypeScript type generation #9258

Merged
merged 2 commits into from
Aug 5, 2024
Merged

Updates for GraphQL schema ordering and TypeScript type generation #9258

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
0398475
tidy up GraphQL schema ordering
dcousens Aug 5, 2024
9594b52
different GraphQL and Prisma types in Typescript
dcousens Aug 5, 2024
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
2 changes: 1 addition & 1 deletion examples/assets-local/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
2 changes: 1 addition & 1 deletion examples/assets-s3/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
2 changes: 1 addition & 1 deletion examples/auth/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ input CreateInitialUserInput {
}

type Query {
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
user(where: UserWhereUniqueInput!): User
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
usersCount(where: UserWhereInput! = {}): Int
keystone: KeystoneMeta!
authenticatedItem: AuthenticatedItem
Expand Down
2 changes: 1 addition & 1 deletion examples/cloudinary/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-admin-ui-logo/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ type Mutation {
}

type Query {
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
task(where: TaskWhereUniqueInput!): Task
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
tasksCount(where: TaskWhereInput! = {}): Int
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
person(where: PersonWhereUniqueInput!): Person
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
peopleCount(where: PersonWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-admin-ui-navigation/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ type Mutation {
}

type Query {
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
task(where: TaskWhereUniqueInput!): Task
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
tasksCount(where: TaskWhereInput! = {}): Int
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
person(where: PersonWhereUniqueInput!): Person
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
peopleCount(where: PersonWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-admin-ui-pages/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ type Mutation {
}

type Query {
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
task(where: TaskWhereUniqueInput!): Task
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
tasksCount(where: TaskWhereInput! = {}): Int
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
person(where: PersonWhereUniqueInput!): Person
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
peopleCount(where: PersonWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-field-view/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ type Mutation {
}

type Query {
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
task(where: TaskWhereUniqueInput!): Task
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
tasksCount(where: TaskWhereInput! = {}): Int
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
person(where: PersonWhereUniqueInput!): Person
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
peopleCount(where: PersonWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-field/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
10 changes: 5 additions & 5 deletions examples/custom-id/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,20 +372,20 @@ type Mutation {
}

type Query {
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
task(where: TaskWhereUniqueInput!): Task
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
tasksCount(where: TaskWhereInput! = {}): Int
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
person(where: PersonWhereUniqueInput!): Person
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
peopleCount(where: PersonWhereInput! = {}): Int
orders(where: OrderWhereInput! = {}, orderBy: [OrderOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: OrderWhereUniqueInput): [Order!]
order(where: OrderWhereUniqueInput!): Order
orders(where: OrderWhereInput! = {}, orderBy: [OrderOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: OrderWhereUniqueInput): [Order!]
ordersCount(where: OrderWhereInput! = {}): Int
options(where: OptionWhereInput! = {}, orderBy: [OptionOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: OptionWhereUniqueInput): [Option!]
option(where: OptionWhereUniqueInput!): Option
options(where: OptionWhereInput! = {}, orderBy: [OptionOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: OptionWhereUniqueInput): [Option!]
optionsCount(where: OptionWhereInput! = {}): Int
products(where: ProductWhereInput! = {}, orderBy: [ProductOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: ProductWhereUniqueInput): [Product!]
product(where: ProductWhereUniqueInput!): Product
products(where: ProductWhereInput! = {}, orderBy: [ProductOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: ProductWhereUniqueInput): [Product!]
productsCount(where: ProductWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-output-paths/my-graphql.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
74 changes: 32 additions & 42 deletions examples/custom-output-paths/my-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
/* eslint-disable */

type Scalars = {
readonly ID: string
readonly Boolean: boolean
readonly String: string
readonly Int: number
readonly Float: number
readonly JSON: import('@keystone-6/core/types').JSONValue
readonly Decimal: import('@keystone-6/core/types').Decimal | string
}

export type PostWhereUniqueInput = {
readonly id?: Scalars['ID'] | null
readonly id?: string | null
}

export type PostWhereInput = {
Expand All @@ -25,41 +15,41 @@ export type PostWhereInput = {
}

export type IDFilter = {
readonly equals?: Scalars['ID'] | null
readonly in?: ReadonlyArray<Scalars['ID']> | Scalars['ID'] | null
readonly notIn?: ReadonlyArray<Scalars['ID']> | Scalars['ID'] | null
readonly lt?: Scalars['ID'] | null
readonly lte?: Scalars['ID'] | null
readonly gt?: Scalars['ID'] | null
readonly gte?: Scalars['ID'] | null
readonly equals?: string | null
readonly in?: ReadonlyArray<string> | string | null
readonly notIn?: ReadonlyArray<string> | string | null
readonly lt?: string | null
readonly lte?: string | null
readonly gt?: string | null
readonly gte?: string | null
readonly not?: IDFilter | null
}

export type StringFilter = {
readonly equals?: Scalars['String'] | null
readonly in?: ReadonlyArray<Scalars['String']> | Scalars['String'] | null
readonly notIn?: ReadonlyArray<Scalars['String']> | Scalars['String'] | null
readonly lt?: Scalars['String'] | null
readonly lte?: Scalars['String'] | null
readonly gt?: Scalars['String'] | null
readonly gte?: Scalars['String'] | null
readonly contains?: Scalars['String'] | null
readonly startsWith?: Scalars['String'] | null
readonly endsWith?: Scalars['String'] | null
readonly equals?: string | null
readonly in?: ReadonlyArray<string> | string | null
readonly notIn?: ReadonlyArray<string> | string | null
readonly lt?: string | null
readonly lte?: string | null
readonly gt?: string | null
readonly gte?: string | null
readonly contains?: string | null
readonly startsWith?: string | null
readonly endsWith?: string | null
readonly not?: NestedStringFilter | null
}

export type NestedStringFilter = {
readonly equals?: Scalars['String'] | null
readonly in?: ReadonlyArray<Scalars['String']> | Scalars['String'] | null
readonly notIn?: ReadonlyArray<Scalars['String']> | Scalars['String'] | null
readonly lt?: Scalars['String'] | null
readonly lte?: Scalars['String'] | null
readonly gt?: Scalars['String'] | null
readonly gte?: Scalars['String'] | null
readonly contains?: Scalars['String'] | null
readonly startsWith?: Scalars['String'] | null
readonly endsWith?: Scalars['String'] | null
readonly equals?: string | null
readonly in?: ReadonlyArray<string> | string | null
readonly notIn?: ReadonlyArray<string> | string | null
readonly lt?: string | null
readonly lte?: string | null
readonly gt?: string | null
readonly gte?: string | null
readonly contains?: string | null
readonly startsWith?: string | null
readonly endsWith?: string | null
readonly not?: NestedStringFilter | null
}

Expand All @@ -86,8 +76,8 @@ export type OrderDirection =
| 'desc'

export type PostUpdateInput = {
readonly title?: Scalars['String'] | null
readonly content?: Scalars['String'] | null
readonly title?: string | null
readonly content?: string | null
readonly publishDate?: any | null
}

Expand All @@ -97,8 +87,8 @@ export type PostUpdateArgs = {
}

export type PostCreateInput = {
readonly title?: Scalars['String'] | null
readonly content?: Scalars['String'] | null
readonly title?: string | null
readonly content?: string | null
readonly publishDate?: any | null
}

Expand Down
2 changes: 1 addition & 1 deletion examples/custom-session-invalidation/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ input CreateInitialUserInput {
}

type Query {
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
user(where: UserWhereUniqueInput!): User
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
usersCount(where: UserWhereInput! = {}): Int
keystone: KeystoneMeta!
authenticatedItem: AuthenticatedItem
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-session-jwt/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,11 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
user(where: UserWhereUniqueInput!): User
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
usersCount(where: UserWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-session-next-auth/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
authors(where: AuthorWhereInput! = {}, orderBy: [AuthorOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: AuthorWhereUniqueInput): [Author!]
author(where: AuthorWhereUniqueInput!): Author
authors(where: AuthorWhereInput! = {}, orderBy: [AuthorOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: AuthorWhereUniqueInput): [Author!]
authorsCount(where: AuthorWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-session-passport/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
authors(where: AuthorWhereInput! = {}, orderBy: [AuthorOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: AuthorWhereUniqueInput): [Author!]
author(where: AuthorWhereUniqueInput!): Author
authors(where: AuthorWhereInput! = {}, orderBy: [AuthorOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: AuthorWhereUniqueInput): [Author!]
authorsCount(where: AuthorWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-session-redis/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ input CreateInitialUserInput {
}

type Query {
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
user(where: UserWhereUniqueInput!): User
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
usersCount(where: UserWhereInput! = {}): Int
keystone: KeystoneMeta!
authenticatedItem: AuthenticatedItem
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-session/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,11 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
user(where: UserWhereUniqueInput!): User
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
usersCount(where: UserWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/default-values/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,11 @@ type Mutation {
}

type Query {
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
task(where: TaskWhereUniqueInput!): Task
tasks(where: TaskWhereInput! = {}, orderBy: [TaskOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: TaskWhereUniqueInput): [Task!]
tasksCount(where: TaskWhereInput! = {}): Int
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
person(where: PersonWhereUniqueInput!): Person
people(where: PersonWhereInput! = {}, orderBy: [PersonOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PersonWhereUniqueInput): [Person!]
peopleCount(where: PersonWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/document-field-customisation/keystone-server/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ type Mutation {
}

type Query {
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
user(where: UserWhereUniqueInput!): User
users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
Copy link
Member Author

Choose a reason for hiding this comment

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

This will be a noisy update for developers, but, this has been an inconsistency in our code for many moons, and is annoying to uphold.

usersCount(where: UserWhereInput! = {}): Int
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/document-field/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
authors(where: AuthorWhereInput! = {}, orderBy: [AuthorOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: AuthorWhereUniqueInput): [Author!]
author(where: AuthorWhereUniqueInput!): Author
authors(where: AuthorWhereInput! = {}, orderBy: [AuthorOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: AuthorWhereUniqueInput): [Author!]
authorsCount(where: AuthorWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
2 changes: 1 addition & 1 deletion examples/extend-express-app/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
keystone: KeystoneMeta!
}
Expand Down
4 changes: 2 additions & 2 deletions examples/extend-graphql-schema-graphql-tools/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@ type Mutation {
}

type Query {
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
post(where: PostWhereUniqueInput!): Post
posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: PostWhereUniqueInput): [Post!]
postsCount(where: PostWhereInput! = {}): Int
authors(where: AuthorWhereInput! = {}, orderBy: [AuthorOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: AuthorWhereUniqueInput): [Author!]
author(where: AuthorWhereUniqueInput!): Author
authors(where: AuthorWhereInput! = {}, orderBy: [AuthorOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: AuthorWhereUniqueInput): [Author!]
authorsCount(where: AuthorWhereInput! = {}): Int
keystone: KeystoneMeta!

Expand Down
Loading
Loading