Merge pull request #165 from maxymshg/add-prettier

tomhoule · web-flow · commit 6c5c3db1a74e · 2018-10-31T20:11:10.000+01:00
Prettier setup
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,5 @@
+target/
+node_modules/
+**/*.rs.bk
+Cargo.lock
+.idea
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,14 @@ rust:
   - nightly
 cache: cargo
 before_script:
+  - sudo apt-get update
+  - sudo apt-get install -y nodejs
+  - npm i -g prettier
   - if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then (rustup component add rustfmt-preview clippy-preview) fi
 script:
   - if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then (cargo fmt --all -- --check) fi
   - if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then (cargo clippy -- -D warnings) fi
+  - prettier --debug-check -l './**/*.json' './**/*.graphql'
   - cargo test --all
   - cargo build --manifest-path=./graphql_client/examples/github/Cargo.toml
   - cargo build --manifest-path=./graphql_client_cli/Cargo.toml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -33,6 +33,13 @@ If you want install to a different toolchain (if for instance your default is se
 rustup component add rustfmt-preview clippy-preview --toolchain stable
 ```
 
+We are using [Prettier](https://prettier.io) to check `.json|.graphql` files. To have it on your local machine you need to install [Node.js](https://nodejs.org) first.
+Our build is now using latest LTS version of Node.js. We're using `npm` and global install here:
+
+```bash
+npm install --global prettier
+```
+
 ### Running
 
 Verify you are using the stable channel (output of `rustc --version` does not contain "nightly" or "beta"). Then run fmt, clippy, and test as they are invoked in the `.travis.yml` file.
diff --git a/graphql_client/examples/call_from_js/schema.json b/graphql_client/examples/call_from_js/schema.json
diff --git a/graphql_client/tests/interfaces/interface_response.json b/graphql_client/tests/interfaces/interface_response.json
@@ -1,24 +1,24 @@
 {
-    "everything": [
-        {
-            "__typename": "Person",
-            "name": "Audrey Lorde",
-            "birthday": "1934-02-18"
-        },
-        {
-            "__typename": "Dog",
-            "name": "Laïka",
-            "isGoodDog": true
-        },
-        {
-            "__typename": "Organization",
-            "name": "Mozilla",
-            "industry": "OTHER"
-        },
-        {
-            "__typename": "Dog",
-            "name": "Norbert",
-            "isGoodDog": true
-        }
-    ]
+  "everything": [
+    {
+      "__typename": "Person",
+      "name": "Audrey Lorde",
+      "birthday": "1934-02-18"
+    },
+    {
+      "__typename": "Dog",
+      "name": "Laïka",
+      "isGoodDog": true
+    },
+    {
+      "__typename": "Organization",
+      "name": "Mozilla",
+      "industry": "OTHER"
+    },
+    {
+      "__typename": "Dog",
+      "name": "Norbert",
+      "isGoodDog": true
+    }
+  ]
 }
diff --git a/graphql_client/tests/interfaces/interface_response_not_on_everything.json b/graphql_client/tests/interfaces/interface_response_not_on_everything.json
@@ -1,22 +1,22 @@
 {
-    "everything": [
-        {
-            "__typename": "Person",
-            "name": "Audrey Lorde",
-            "birthday": "1934-02-18"
-        },
-        {
-            "__typename": "Dog",
-            "name": "Laïka"
-        },
-        {
-            "__typename": "Organization",
-            "name": "Mozilla",
-            "industry": "OTHER"
-        },
-        {
-            "__typename": "Dog",
-            "name": "Norbert"
-        }
-    ]
+  "everything": [
+    {
+      "__typename": "Person",
+      "name": "Audrey Lorde",
+      "birthday": "1934-02-18"
+    },
+    {
+      "__typename": "Dog",
+      "name": "Laïka"
+    },
+    {
+      "__typename": "Organization",
+      "name": "Mozilla",
+      "industry": "OTHER"
+    },
+    {
+      "__typename": "Dog",
+      "name": "Norbert"
+    }
+  ]
 }
diff --git a/graphql_client/tests/interfaces/interface_schema.graphql b/graphql_client/tests/interfaces/interface_schema.graphql
@@ -1,36 +1,36 @@
 schema {
-    query: InterfaceQuery
+  query: InterfaceQuery
 }
 
 interface Named {
-    name: String!
-    displayName: Boolean!
+  name: String!
+  displayName: Boolean!
 }
 
 type Person implements Named {
-    name: String!
-    birthday: String
+  name: String!
+  birthday: String
 }
 
 enum Industry {
-    CHOCOLATE
-    OTHER
+  CHOCOLATE
+  OTHER
 }
 
 type Organization implements Named {
-    name: String
-    industry: Industry!
-    createdAt: String
+  name: String
+  industry: Industry!
+  createdAt: String
 }
 
 type Dog implements Named {
-    name: String!
-    """
-    Always returns true
-    """
-    isGoodDog: Boolean!
+  name: String!
+  """
+  Always returns true
+  """
+  isGoodDog: Boolean!
 }
 
 type InterfaceQuery {
-    everything: [Named!]
+  everything: [Named!]
 }
diff --git a/graphql_client/tests/interfaces/interface_with_fragment_response.json b/graphql_client/tests/interfaces/interface_with_fragment_response.json
@@ -1,27 +1,27 @@
 {
-    "everything": [
-        {
-            "__typename": "Person",
-            "name": "Audrey Lorde",
-            "displayName": false,
-            "birthday": "1934-02-18"
-        },
-        {
-            "__typename": "Dog",
-            "name": "Laïka",
-            "displayName": true,
-            "isGoodDog": true
-        },
-        {
-            "__typename": "Organization",
-            "name": "Mozilla",
-            "displayName": false
-        },
-        {
-            "__typename": "Dog",
-            "name": "Norbert",
-            "displayName": true,
-            "isGoodDog": true
-        }
-    ]
+  "everything": [
+    {
+      "__typename": "Person",
+      "name": "Audrey Lorde",
+      "displayName": false,
+      "birthday": "1934-02-18"
+    },
+    {
+      "__typename": "Dog",
+      "name": "Laïka",
+      "displayName": true,
+      "isGoodDog": true
+    },
+    {
+      "__typename": "Organization",
+      "name": "Mozilla",
+      "displayName": false
+    },
+    {
+      "__typename": "Dog",
+      "name": "Norbert",
+      "displayName": true,
+      "isGoodDog": true
+    }
+  ]
 }
diff --git a/graphql_client/tests/scalar_variables/scalar_variables_query.graphql b/graphql_client/tests/scalar_variables/scalar_variables_query.graphql
@@ -1,5 +1,5 @@
 query VariablesQuery($msg: String!, $reps: Int) {
-    echo(message: $msg, repetitions: $reps) {
-        result
-    }
+  echo(message: $msg, repetitions: $reps) {
+    result
+  }
 }
diff --git a/graphql_client/tests/scalar_variables/scalar_variables_schema.graphql b/graphql_client/tests/scalar_variables/scalar_variables_schema.graphql
@@ -1,12 +1,11 @@
-
 schema {
-    query: ScalarVariablesQuery
+  query: ScalarVariablesQuery
 }
 
 type ScalarVariablesQuery {
-    echo(message: String!, repetitions: Int): EchoResult
+  echo(message: String!, repetitions: Int): EchoResult
 }
 
 type EchoResult {
-    result: String!
+  result: String!
 }
diff --git a/graphql_client/tests/subscription/subscription_query_response.json b/graphql_client/tests/subscription/subscription_query_response.json
@@ -1,16 +1,16 @@
 {
-    "dogBirthdays": [
-        {
-            "name": "Maya"
-        },
-        {
-            "name": "Norbert"
-        },
-        {
-            "name": "Strelka"
-        },
-        {
-            "name": "Belka"
-        }
-    ]
+  "dogBirthdays": [
+    {
+      "name": "Maya"
+    },
+    {
+      "name": "Norbert"
+    },
+    {
+      "name": "Strelka"
+    },
+    {
+      "name": "Belka"
+    }
+  ]
 }
diff --git a/graphql_client/tests/unions/union_query.graphql b/graphql_client/tests/unions/union_query.graphql
@@ -1,15 +1,15 @@
 query MyQuery {
-    names {
-        __typename
-        ...on Dog {
-            name
-        }
-        ...on Person {
-            firstName
-            lastName
-        }
-        ...on Organization {
-            title
-        }
+  names {
+    __typename
+    ... on Dog {
+      name
     }
+    ... on Person {
+      firstName
+      lastName
+    }
+    ... on Organization {
+      title
+    }
+  }
 }
diff --git a/graphql_client/tests/unions/union_query_response.json b/graphql_client/tests/unions/union_query_response.json
@@ -1,21 +1,21 @@
 {
-    "names": [
-        {
-            "__typename": "Person",
-            "firstName": "Audrey",
-            "lastName": "Lorde"
-        },
-        {
-            "__typename": "Dog",
-            "name": "Laïka"
-        },
-        {
-            "__typename": "Organization",
-            "title": "Mozilla"
-        },
-        {
-            "__typename": "Dog",
-            "name": "Norbert"
-        }
-    ]
+  "names": [
+    {
+      "__typename": "Person",
+      "firstName": "Audrey",
+      "lastName": "Lorde"
+    },
+    {
+      "__typename": "Dog",
+      "name": "Laïka"
+    },
+    {
+      "__typename": "Organization",
+      "title": "Mozilla"
+    },
+    {
+      "__typename": "Dog",
+      "name": "Norbert"
+    }
+  ]
 }
diff --git a/graphql_client/tests/unions/union_schema.graphql b/graphql_client/tests/unions/union_schema.graphql
@@ -1,28 +1,28 @@
 schema {
-    query: UnionQuery
+  query: UnionQuery
 }
 
 type Person {
-    firstName: String!
-    lastName: String
-    birthday: String
+  firstName: String!
+  lastName: String
+  birthday: String
 }
 
 type Organization {
-    title: String!
-    createdAt: String
+  title: String!
+  createdAt: String
 }
 
 type Dog {
-    name: String!
-    """
-    Always returns true
-    """
-    isGoodDog: Boolean!
+  name: String!
+  """
+  Always returns true
+  """
+  isGoodDog: Boolean!
 }
 
 union NamedThing = Person | Dog | Organization
 
 type UnionQuery {
-    names: [NamedThing!]
+  names: [NamedThing!]
 }
diff --git a/graphql_client_cli/src/graphql/introspection_schema.graphql b/graphql_client_cli/src/graphql/introspection_schema.graphql
diff --git a/graphql_client_codegen/src/tests/github_schema.json b/graphql_client_codegen/src/tests/github_schema.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`query VariablesQuery($msg: String!, $reps: Int) {`
`2`		`- echo(message: $msg, repetitions: $reps) {`
`3`		`- result`
`4`		`- }`
	`2`	`+ echo(message: $msg, repetitions: $reps) {`
	`3`	`+ result`
	`4`	`+ }`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`		`-`
`2`	`1`	`schema {`
`3`		`- query: ScalarVariablesQuery`
	`2`	`+ query: ScalarVariablesQuery`
`4`	`3`	`}`
`5`	`4`
`6`	`5`	`type ScalarVariablesQuery {`
`7`		`- echo(message: String!, repetitions: Int): EchoResult`
	`6`	`+ echo(message: String!, repetitions: Int): EchoResult`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`type EchoResult {`
`11`		`- result: String!`
	`10`	`+ result: String!`
`12`	`11`	`}`