remove pagination options from examples

MacondoExpress · MacondoExpress · commit 2507cfccfcba · 2024-10-21T17:12:26.000+01:00
diff --git a/modules/ROOT/pages/directives/schema-configuration/field-configuration.adoc b/modules/ROOT/pages/directives/schema-configuration/field-configuration.adoc
@@ -27,7 +27,7 @@ It generates the type `Actor`:
 type Actor {
   name: String!
   age: Int
-  actedIn(where: MovieWhere, options: MovieOptions, directed: Boolean = true): [Movie!]!
+  actedIn(where: MovieWhere, sort: [MovieSort!]!, limit: Int, offset: Int, directed: Boolean = true): [Movie!]!
   actedInAggregate(where: MovieWhere, directed: Boolean = true): ActorMovieActedInAggregationSelection
   actedInConnection(where: ActorActedInConnectionWhere, first: Int, after: String, directed: Boolean = true, sort: [ActorActedInConnectionSort!]): ActorActedInConnection!
 }
@@ -56,7 +56,7 @@ Now the type `Actor` looks like this:
 ----
 type Actor {
   name: String!
-  actedIn(where: MovieWhere, options: MovieOptions, directed: Boolean = true): [Movie!]!
+  actedIn(where: MovieWhere, sort: [MovieSort!]!, limit: Int, offset: Int, directed: Boolean = true): [Movie!]!
   actedInAggregate(where: MovieWhere, directed: Boolean = true): ActorMovieActedInAggregationSelection
   actedInConnection(where: ActorActedInConnectionWhere, first: Int, after: String, directed: Boolean = true, sort: [ActorActedInConnectionSort!]): ActorActedInConnection!
 }
@@ -105,7 +105,7 @@ From the previous type definitions, the type `Actor` produced is:
 ----
 type Actor {
   name: String!
-  actedIn(where: MovieWhere, options: MovieOptions, directed: Boolean = true): [Movie!]!
+  actedIn(where: MovieWhere, sort: [MovieSort!]!, limit: Int, offset: Int, directed: Boolean = true): [Movie!]!
   actedInAggregate(where: MovieWhere, directed: Boolean = true): ActorMovieActedInAggregationSelection
   actedInConnection(where: ActorActedInConnectionWhere, first: Int, after: String, directed: Boolean = true, sort: [ActorActedInConnectionSort!]): ActorActedInConnection!
 }
@@ -135,7 +135,7 @@ In this case, as the argument `aggregate` was passed as false, the type `Actor`
 type Actor {
   name: String!
   age: Int
-  actedIn(where: MovieWhere, options: MovieOptions, directed: Boolean = true): [Movie!]!
+  actedIn(where: MovieWhere, sort: [MovieSort!]!, limit: Int, offset: Int, directed: Boolean = true): [Movie!]!
   actedInConnection(where: ActorActedInConnectionWhere, first: Int, after: String, directed: Boolean = true, sort: [ActorActedInConnectionSort!]): ActorActedInConnection!
 }
 ----
@@ -269,7 +269,7 @@ From the previous type definitions, the type `Actor` produced is:
 ----
 type Actor {
   name: String!
-  actedIn(where: MovieWhere, options: MovieOptions, directed: Boolean = true): [Movie!]!
+  actedIn(where: MovieWhere, sort: [MovieSort!]!, limit: Int, offset: Int, directed: Boolean = true): [Movie!]!
   actedInAggregate(where: MovieWhere, directed: Boolean = true): ActorMovieActedInAggregationSelection
   actedInConnection(where: ActorActedInConnectionWhere, first: Int, after: String, directed: Boolean = true, sort: [ActorActedInConnectionSort!]): ActorActedInConnection!
 }
diff --git a/modules/ROOT/pages/queries-aggregations/aggregations.adoc b/modules/ROOT/pages/queries-aggregations/aggregations.adoc
@@ -33,10 +33,10 @@ For which the following query fields are generated:
 [source, graphql, indent=0]
 ----
 type Query {
-    posts(where: PostWhere, options: PostOptions): [Post!]!
+    posts(where: PostWhere, sort: [PostSort!]!, limit: Int, offset: Int,): [Post!]!
     postsAggregate(where: PostWhere): PostAggregationSelection!
 
-    users(where: UserWhere, options: UserOptions): [User!]!
+    users(where: UserWhere, sort: [UserSort!]!, limit: Int, offset: Int,): [User!]!
     usersAggregate(where: UserWhere): UserAggregationSelection!
 }
 ----
diff --git a/modules/ROOT/pages/queries-aggregations/pagination/offset-based.adoc b/modules/ROOT/pages/queries-aggregations/pagination/offset-based.adoc
@@ -18,9 +18,7 @@ You would fetch the first "page" of 10 by executing:
 [source, graphql, indent=0]
 ----
 query {
-    users(options: {
-        limit: 10
-    }) {
+    users(limit: 10) {
         name
     }
 }
@@ -33,10 +31,7 @@ And then on subsequent calls, introduce the `offset` argument and increment it b
 [source, graphql, indent=0]
 ----
 query {
-    users(options: {
-        offset: 10
-        limit: 10
-    }) {
+    users(offset: 10, limit: 10) {
         name
     }
 }
@@ -47,10 +42,7 @@ query {
 [source, graphql, indent=0]
 ----
 query {
-    users(options: {
-        offset: 20
-        limit: 10
-    }) {
+    users(offset: 20, limit: 10) {
         name
     }
 }
@@ -75,10 +67,7 @@ query {
         name_EQ: "Billy"
     }) {
         name
-        posts(options: {
-            offset: 20
-            limit: 10
-        }) {
+        posts(offset: 20, limit: 10) {
             content
         }
     }
diff --git a/modules/ROOT/pages/queries-aggregations/queries.adoc b/modules/ROOT/pages/queries-aggregations/queries.adoc
@@ -33,10 +33,10 @@ For which the following query fields are generated:
 [source, graphql, indent=0]
 ----
 type Query {
-    posts(where: PostWhere, options: PostOptions): [Post!]!
+    posts(where: PostWhere, sort: [PostSort!]!, limit: Int, offset: Int,): [Post!]!
     postsAggregate(where: PostWhere): PostAggregationSelection!
 
-    users(where: UserWhere, options: UserOptions): [User!]!
+    users(where: UserWhere, sort: [UserSort!]!, limit: Int, offset: Int,): [User!]!
     usersAggregate(where: UserWhere): UserAggregationSelection!
 }
 ----
diff --git a/modules/ROOT/pages/queries-aggregations/sorting.adoc b/modules/ROOT/pages/queries-aggregations/sorting.adoc
@@ -35,15 +35,8 @@ input MovieSort {
     runtime: SortDirection
 }
 
-input MovieOptions {
-    """Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array."""
-    sort: [MovieSort!]
-    limit: Int
-    offset: Int
-}
-
 type Query {
-    movies(where: MovieWhere, options: MovieOptions): [Movie!]!
+    movies(where: MovieWhere, sort: [MovieSort!], limit: Int, offset: Int): [Movie!]!
 }
 ----
 
@@ -52,13 +45,12 @@ The following query fetches all movies sorted by runtime in ascending order:
 [source, graphql, indent=0]
 ----
 query {
-    movies(options: {
-        sort: [
+    movies(sort: [
             {
                 runtime: ASC
             }
         ]
-    }) {
+    ) {
         title
         runtime
     }
@@ -73,13 +65,12 @@ query {
     movies {
         title
         runtime
-        actors(options: {
-            sort: [
+        actors(sort: [
                 {
                     surname: ASC
                 }
             ]
-        }) {
+        ) {
             surname
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,7 @@ You would fetch the first "page" of 10 by executing:`
`18`	`18`	`[source, graphql, indent=0]`
`19`	`19`	`----`
`20`	`20`	`query {`
`21`		`- users(options: {`
`22`		`- limit: 10`
`23`		`- }) {`
	`21`	`+ users(limit: 10) {`
`24`	`22`	`name`
`25`	`23`	`}`
`26`	`24`	`}`
@@ -33,10 +31,7 @@ And then on subsequent calls, introduce the `offset` argument and increment it b
`33`	`31`	`[source, graphql, indent=0]`
`34`	`32`	`----`
`35`	`33`	`query {`
`36`		`- users(options: {`
`37`		`- offset: 10`
`38`		`- limit: 10`
`39`		`- }) {`
	`34`	`+ users(offset: 10, limit: 10) {`
`40`	`35`	`name`
`41`	`36`	`}`
`42`	`37`	`}`
`@@ -47,10 +42,7 @@ query {`
`47`	`42`	`[source, graphql, indent=0]`
`48`	`43`	`----`
`49`	`44`	`query {`
`50`		`- users(options: {`
`51`		`- offset: 20`
`52`		`- limit: 10`
`53`		`- }) {`
	`45`	`+ users(offset: 20, limit: 10) {`
`54`	`46`	`name`
`55`	`47`	`}`
`56`	`48`	`}`
`@@ -75,10 +67,7 @@ query {`
`75`	`67`	`name_EQ: "Billy"`
`76`	`68`	`}) {`
`77`	`69`	`name`
`78`		`- posts(options: {`
`79`		`- offset: 20`
`80`		`- limit: 10`
`81`		`- }) {`
	`70`	`+ posts(offset: 20, limit: 10) {`
`82`	`71`	`content`
`83`	`72`	`}`
`84`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,8 @@ input MovieSort {`
`35`	`35`	`runtime: SortDirection`
`36`	`36`	`}`
`37`	`37`
`38`		`-input MovieOptions {`
`39`		`- """Specify one or more MovieSort objects to sort Movies by. The sorts will be applied in the order in which they are arranged in the array."""`
`40`		`- sort: [MovieSort!]`
`41`		`- limit: Int`
`42`		`- offset: Int`
`43`		`-}`
`44`		`-`
`45`	`38`	`type Query {`
`46`		`- movies(where: MovieWhere, options: MovieOptions): [Movie!]!`
	`39`	`+ movies(where: MovieWhere, sort: [MovieSort!], limit: Int, offset: Int): [Movie!]!`
`47`	`40`	`}`
`48`	`41`	`----`
`49`	`42`
`@@ -52,13 +45,12 @@ The following query fetches all movies sorted by runtime in ascending order:`
`52`	`45`	`[source, graphql, indent=0]`
`53`	`46`	`----`
`54`	`47`	`query {`
`55`		`- movies(options: {`
`56`		`- sort: [`
	`48`	`+ movies(sort: [`
`57`	`49`	`{`
`58`	`50`	`runtime: ASC`
`59`	`51`	`}`
`60`	`52`	`]`
`61`		`- }) {`
	`53`	`+ ) {`
`62`	`54`	`title`
`63`	`55`	`runtime`
`64`	`56`	`}`
`@@ -73,13 +65,12 @@ query {`
`73`	`65`	`movies {`
`74`	`66`	`title`
`75`	`67`	`runtime`
`76`		`- actors(options: {`
`77`		`- sort: [`
	`68`	`+ actors(sort: [`
`78`	`69`	`{`
`79`	`70`	`surname: ASC`
`80`	`71`	`}`
`81`	`72`	`]`
`82`		`- }) {`
	`73`	`+ ) {`
`83`	`74`	`surname`
`84`	`75`	`}`
`85`	`76`	`}`