Implemented Prettier for GraphQL formatting (#4022)

* Implemented Prettier for GraphQL formatting (#3242) * package bump and linting Co-authored-by: Dimitri Mitropoulos <[email protected]> Co-authored-by: James Gatz <[email protected]>
Kong · Oct 1, 2021 · d237b2c · d237b2c
1 parent 98916c9
commit d237b2c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.tsx b/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.tsx
@@ -6,10 +6,11 @@ import { ModifiedGraphQLJumpOptions } from 'codemirror-graphql/jump';
 import electron, { OpenDialogOptions } from 'electron';
 import { readFileSync } from 'fs';
 import { DefinitionNode, DocumentNode, GraphQLNonNull, GraphQLSchema, NonNullTypeNode, OperationDefinitionNode } from 'graphql';
-import { parse, print, typeFromAST } from 'graphql';
+import { parse, typeFromAST } from 'graphql';
 import Maybe from 'graphql/tsutils/Maybe';
 import { buildClientSchema, getIntrospectionQuery } from 'graphql/utilities';
 import { json as jsonPrettify } from 'insomnia-prettify';
+import prettier from 'prettier';
 import React, { PureComponent } from 'react';
 import ReactDOM from 'react-dom';
 
@@ -459,7 +460,11 @@ export class GraphQLEditor extends PureComponent<Props, State> {
   _handlePrettify() {
     const { body } = this.state;
     const { variables, query } = body;
-    const prettyQuery = query && print(parse(query));
+    const prettyQuery = prettier.format(query, {
+      parser: 'graphql',
+      useTabs: this.props.settings.editorIndentWithTabs,
+      tabWidth: this.props.settings.editorIndentSize,
+    });
     const prettyVariables = variables && JSON.parse(jsonPrettify(JSON.stringify(variables)));
 
     this._handleBodyChange(prettyQuery, prettyVariables, this.state.body.operationName);

diff --git a/packages/insomnia-app/package-lock.json b/packages/insomnia-app/package-lock.json
diff --git a/packages/insomnia-app/package.json b/packages/insomnia-app/package.json
@@ -142,6 +142,7 @@
     "openapi-2-kong": "2.3.2",
     "papaparse": "^5.2.0",
     "pdfjs-dist": "^2.5.207",
+    "prettier": "2.4.1",
     "ramda": "^0.27.1",
     "ramda-adjunct": "^2.33.0",
     "react": "^16.8.3",