Rework Book

book/src/SUMMARY.md

@@ -6,17 +6,16 @@
 
 
 - [Type System](types/index.md)
-
-  - [Defining objects](types/objects/defining_objects.md)
+  - [Objects](types/objects/index.md)
     - [Complex fields](types/objects/complex_fields.md)
     - [Using contexts](types/objects/using_contexts.md)
     - [Error handling](types/objects/error_handling.md)
-  - [Other types](types/other-index.md)
-    - [Enums](types/enums.md)
-    - [Interfaces](types/interfaces.md)
-    - [Input objects](types/input_objects.md)
-    - [Scalars](types/scalars.md)
-    - [Unions](types/unions.md)
+  - [Interfaces](types/interfaces.md)
+  - [Unions](types/unions.md)
+  - [Enums](types/enums.md)
+  - [Input objects](types/input_objects.md)
+  - [Scalars](types/scalars.md)
+
 
 - [Schemas and mutations](schema/schemas_and_mutations.md)
 

book/src/quickstart.md

@@ -24,7 +24,7 @@ juniper = "0.16.0"
 
 Exposing simple enums and structs as [GraphQL] types is just a matter of adding a custom [derive attribute] to them. [Juniper] includes support for basic [Rust] types that naturally map to [GraphQL] features, such as `Option<T>`, `Vec<T>`, `Box<T>`, `Arc<T>`, `String`, `f64`, `i32`, references, slices and arrays.
 
-For more advanced mappings, [Juniper] provides multiple macros to map your [Rust] types to a [GraphQL schema][schema]. The most important one is the [`#[graphql_object]` attribute][macro.graphql_object] that is used for declaring a [GraphQL object] with resolvers (typically used for declaring [`Query` and `Mutation` roots][1]).
+For more advanced mappings, [Juniper] provides multiple macros to map your [Rust] types to a [GraphQL schema][schema]. The most important one is the [`#[graphql_object]` attribute][2] that is used for declaring a [GraphQL object] with resolvers (typically used for declaring [`Query` and `Mutation` roots][1]).
 
 ```rust
 # # ![allow(unused_variables)]
@@ -118,7 +118,8 @@ impl Query {
 
 struct Mutation;
 
-#[graphql_object(
+#[graphql_object]
+#[graphql(
     context = Context,
     // If we need to use `ScalarValue` parametrization explicitly somewhere
     // in the object definition (like here in `FieldResult`), we could
@@ -167,7 +168,7 @@ use juniper::{
 #[derive(GraphQLEnum, Clone, Copy)]
 enum Episode {
     // Note, that the enum value will be automatically converted to the
-    // `SCREAMING_CASE` variant, just as GraphQL conventions imply.
+    // `SCREAMING_SNAKE_CASE` variant, just as GraphQL conventions imply.
     NewHope,
     Empire,
     Jedi,
@@ -221,9 +222,9 @@ fn main() {
 [GraphQL]: https://graphql.org
 [GraphQL object]: https://spec.graphql.org/October2021#sec-Objects
 [Juniper]: https://docs.rs/juniper
-[macro.graphql_object]: https://docs.rs/juniper/latest/juniper/macro.graphql_object.html
 [Rust]: https://www.rust-lang.org
 [schema]: https://graphql.org/learn/schema
 [schema-first]: https://www.apollographql.com/blog/backend/architecture/schema-first-vs-code-only-graphql#schema-first
 
-[1]: https://spec.graphql.org/October2021#sec-Root-Operation-Types
+[1]: https://spec.graphql.org/October2021#sec-Root-Operation-Types
+[2]: https://docs.rs/juniper/latest/juniper/macro.graphql_object.html

book/src/types/index.md

@@ -8,13 +8,12 @@ as painless as possible.
 
 Find out more in the individual chapters below.
 
-- [Defining objects](objects/defining_objects.md)
+- [Objects](objects/index.md)
   - [Complex fields](objects/complex_fields.md)
   - [Using contexts](objects/using_contexts.md)
   - [Error handling](objects/error_handling.md)
-- [Other types](other-index.md)
-  - [Enums](enums.md)
-  - [Interfaces](interfaces.md)
-  - [Input objects](input_objects.md)
-  - [Scalars](scalars.md)
-  - [Unions](unions.md)
+- [Interfaces](interfaces.md)
+- [Unions](unions.md)
+- [Enums](enums.md)
+- [Input objects](input_objects.md)
+- [Scalars](scalars.md)