Better object detection

Author: phortx

src/common/logger.ts

@@ -1,7 +1,7 @@
 import { DocumentNode } from 'graphql';
 import { Arguments } from '../support/interfaces';
 import { FetchPolicy } from 'apollo-client';
-import { prettify } from '../support/utils';
+import { isObject, prettify } from '../support/utils';
 
 /**
  * Vuex-ORM-Apollo Debug Logger.
@@ -87,8 +87,8 @@ export default class Logger {
     if (this.enabled) {
       try {
         let prettified = '';
-        if (typeof query === 'object' && query.loc) {
-          prettified = prettify(query.loc.source.body);
+        if (isObject(query) && (query as DocumentNode).loc) {
+          prettified = prettify((query as DocumentNode).loc!.source.body);
         } else {
           prettified = prettify(query as string);
         }

src/graphql/query-builder.ts

@@ -1,6 +1,6 @@
 import Model from '../orm/model';
 import { Arguments, Field } from '../support/interfaces';
-import { upcaseFirstLetter } from '../support/utils';
+import { isObject, upcaseFirstLetter } from '../support/utils';
 import gql from 'graphql-tag';
 import Context from '../common/context';
 const inflection = require('inflection');
@@ -105,7 +105,7 @@ export default class QueryBuilder {
     if (!args) throw new Error('args is undefined');
 
     Object.keys(args).forEach((key: string) => {
-      if (args && args[key] && typeof args[key] === 'object') {
+      if (args && args[key] && isObject(args[key])) {
         args[key] = { __type: upcaseFirstLetter(key) };
       }
     });
@@ -172,7 +172,7 @@ export default class QueryBuilder {
             const type = schema.getType(model.singularName + (filter ? 'Filter' : ''));
             const schemaField = (filter ? type.inputFields! : type.fields!).find(f => f.name === key);
 
-            if (typeof value === 'object' && value.__type) {
+            if (isObject(value) && value.__type) {
               // Case 2 (User!)
               typeOrValue = value.__type + 'Input!';
             } else if (schemaField && schemaField.type.name) {

src/support/utils.ts

@@ -29,3 +29,12 @@ export function downcaseFirstLetter (input: string) {
 export function prettify (query: string): string {
   return print(parse(query));
 }
+
+/**
+ * Tells if a value is a object (returns false for arrays)
+ * @param {any} a
+ * @returns {boolean}
+ */
+export function isObject (a: any): boolean {
+  return (!!a) && (a.constructor === Object);
+}

src/vuex-orm-graphql.ts

@@ -5,6 +5,7 @@ import { Destroy, Fetch, Mutate, Persist, Push } from './actions';
 import Query from './actions/query';
 import SimpleQuery from './actions/simple-query';
 import SimpleMutation from './actions/simple-mutation';
+import { isObject } from './support/utils';
 
 /**
  * Main class of the plugin. Setups the internal context, Vuex actions and model methods
@@ -48,7 +49,7 @@ export default class VuexORMGraphQL {
     // Register static model convenience methods
     (context.components.Model as (typeof PatchedModel)).fetch = async function (filter: any, bypassCache = false) {
       let filterObj = filter;
-      if (typeof filterObj !== 'object') filterObj = { id: filter };
+      if (!isObject(filterObj)) filterObj = { id: filter };
       return this.dispatch('fetch', { filter: filterObj, bypassCache });
     };