Remove fields from buildQuery

Author: phortx

src/queryBuilder.ts

@@ -74,8 +74,8 @@ export default class QueryBuilder {
     }
   }
 
-  public buildQuery (type: string, name?: string, args?: Arguments, model?: (Model | null | string), fields?: string, multiple?: boolean) {
-    model = model ? this.getModel(model) : null;
+  public buildQuery (type: string, model: Model | string, name?: string, args?: Arguments, multiple?: boolean) {
+    model = this.getModel(model);
 
     args = args ? JSON.parse(JSON.stringify(args)) : {};
     if (!args) throw new Error('args is undefined');
@@ -91,7 +91,7 @@ export default class QueryBuilder {
 
     const query: string =
       `${type} ${upcaseFirstLetter(name)}${this.buildArguments(args, true)} {\n` +
-      `  ${model ? this.buildField(model, multiple, args, model, name, true) : fields}\n` +
+      `  ${this.buildField(model, multiple, args, model, name, true)}\n` +
       `}`;
 
     return gql(query);

src/vuex-orm-apollo.ts

@@ -108,7 +108,7 @@ export default class VuexORMApollo {
     const multiple: boolean = !(filter && filter['id']);
     const model: Model = this.getModel(state.$name);
     const name: string = `${multiple ? model.pluralName : model.singularName}`;
-    const query = this.queryBuilder.buildQuery('query', name, filter, model.singularName);
+    const query = this.queryBuilder.buildQuery('query', model, name, filter);
 
     // Send the request to the GraphQL API
     const data = await this.apolloRequest(query, filter);
@@ -219,9 +219,7 @@ export default class VuexORMApollo {
   private async mutate (action: string, variables: Data | undefined, dispatch: DispatchFunction, model: Model, multiple?: boolean): Promise<any> {
     if (variables) {
       const id = variables.id ? variables.id : undefined;
-
-      // TODO what about the query fields?
-      const query = this.queryBuilder.buildQuery('mutation', action, variables, model, undefined, multiple);
+      const query = this.queryBuilder.buildQuery('mutation', model, action, variables, multiple);
 
       // Send GraphQL Mutation
       const newData = await this.apolloRequest(query, variables, true);

test/unit/QueryBuilder.spec.js

@@ -294,7 +294,7 @@ query users {
       const args = new Map();
       args.set('age', 32);
 
-      let query = queryBuilder.buildQuery('query', null, args, new Model(User));
+      let query = queryBuilder.buildQuery('query', new Model(User), null, args, args);
       query = QueryBuilder.prettify(query.loc.source.body);
 
       expect(query).toEqual(`
@@ -317,7 +317,7 @@ query Users {
     });
 
     it('generates a complete create mutation query for a model', () => {
-      let query = queryBuilder.buildQuery('mutation', 'createUser', { user: { id: 15, name: 'test' } }, new Model(User), undefined, false);
+      let query = queryBuilder.buildQuery('mutation', new Model(User), 'createUser', { user: { id: 15, name: 'test' } }, false);
       query = QueryBuilder.prettify(query.loc.source.body);
 
       expect(query).toEqual(`
@@ -338,7 +338,7 @@ mutation CreateUser($user: UserInput!) {
     });
 
     it('generates a complete update mutation query for a model', () => {
-      let query = queryBuilder.buildQuery('mutation', 'updateUser', { id: 15, user: { name: 'test' } }, new Model(User), undefined, false);
+      let query = queryBuilder.buildQuery('mutation', new Model(User), 'updateUser', { id: 15, user: { name: 'test' } }, false);
       query = QueryBuilder.prettify(query.loc.source.body);
 
       expect(query).toEqual(`
@@ -361,7 +361,7 @@ mutation UpdateUser($id: ID!, $user: UserInput!) {
 
 
     it('generates a complete delete mutation query for a model', () => {
-      let query = queryBuilder.buildQuery('mutation', 'deleteUser', { id: 15 }, new Model(User));
+      let query = queryBuilder.buildQuery('mutation', new Model(User), 'deleteUser', { id: 15 });
       query = QueryBuilder.prettify(query.loc.source.body);
 
       expect(query).toEqual(`