Optimize query, fixes some null returns, fix stitched GraphQLUpload

Author: Moumouls

package-lock.json

@@ -20,6 +20,7 @@
   "license": "BSD-3-Clause",
   "dependencies": {
     "@apollographql/graphql-playground-html": "1.6.24",
+    "@graphql-tools/links": "^6.0.0",
     "@graphql-tools/stitch": "^6.0.0",
     "@graphql-tools/utils": "^6.0.0",
     "@parse/fs-files-adapter": "1.0.1",
@@ -37,7 +38,7 @@
     "graphql": "15.0.0",
     "graphql-list-fields": "2.0.2",
     "graphql-relay": "^0.6.0",
-    "graphql-upload": "11.0.0",
+    "graphql-upload": "^11.0.0",
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "1.8.0",

package.json

@@ -19,7 +19,11 @@ const needToGetAllKeys = (fields, keys, parseClasses) =>
               // Current sub key is not custom
               return false;
             }
-          } else if (!key[1]) {
+          } else if (
+            !key[1] ||
+            fields[key[0]].type === 'Array' ||
+            fields[key[0]].type === 'Object'
+          ) {
             // current key is not custom
             return false;
           }

src/GraphQL/helpers/objectsQueries.js

@@ -15,7 +15,7 @@ import {
   GraphQLUnionType,
 } from 'graphql';
 import { toGlobalId } from 'graphql-relay';
-import { GraphQLUpload } from 'graphql-upload';
+import { GraphQLUpload } from '@graphql-tools/links';
 
 class TypeValidationError extends Error {
   constructor(value, type) {

src/GraphQL/loaders/defaultGraphQLTypes.js

@@ -1,6 +1,6 @@
 import { GraphQLNonNull } from 'graphql';
 import { mutationWithClientMutationId } from 'graphql-relay';
-import { GraphQLUpload } from 'graphql-upload';
+import { GraphQLUpload } from '@graphql-tools/links';
 import Parse from 'parse/node';
 import * as defaultGraphQLTypes from './defaultGraphQLTypes';
 import logger from '../../logger';
@@ -14,7 +14,7 @@ const handleUpload = async (upload, config) => {
       const chunks = [];
       stream
         .on('error', reject)
-        .on('data', chunk => chunks.push(chunk))
+        .on('data', (chunk) => chunks.push(chunk))
         .on('end', () => resolve(Buffer.concat(chunks)));
     });
   }
@@ -52,7 +52,7 @@ const handleUpload = async (upload, config) => {
   }
 };
 
-const load = parseGraphQLSchema => {
+const load = (parseGraphQLSchema) => {
   const createMutation = mutationWithClientMutationId({
     name: 'CreateFile',
     description:

src/GraphQL/loaders/filesMutations.js

@@ -22,41 +22,32 @@ export function toGraphQLError(error) {
   return new ApolloError(message, code);
 }
 
-export const extractKeysAndInclude = selectedFields => {
+export const extractKeysAndInclude = (selectedFields) => {
   selectedFields = selectedFields.filter(
-    field => !field.includes('__typename')
-  );
+    (field) => !field.includes('__typename')
+  ); // Handles "id" field for both current and included objects
 
-  // Handles "id" field for both current and included objects
-  selectedFields = selectedFields.map(field => {
+  selectedFields = selectedFields.map((field) => {
     if (field === 'id') return 'objectId';
     return field.endsWith('.id')
       ? `${field.substring(0, field.lastIndexOf('.id'))}.objectId`
       : field;
   });
   let keys = undefined;
   let include = undefined;
+
   if (selectedFields.length > 0) {
     keys = selectedFields.join(',');
-    include = selectedFields
-      .reduce((fields, field) => {
-        fields = fields.slice();
-        let pointIndex = field.lastIndexOf('.');
-        while (pointIndex > 0) {
-          const lastField = field.slice(pointIndex + 1);
-          field = field.slice(0, pointIndex);
-          if (!fields.includes(field) && lastField !== 'objectId') {
-            fields.push(field);
-          }
-          pointIndex = field.lastIndexOf('.');
-        }
-        return fields;
-      }, [])
-      .join(',');
+    // We can use this shortcut since optimization is handled
+    // later on RestQuery, avoid overhead here.
+    include = keys;
   }
-  return { keys, include };
+  return {
+    keys,
+    include,
+  };
 };
 
-export const getParseClassMutationConfig = function(parseClassConfig) {
+export const getParseClassMutationConfig = function (parseClassConfig) {
   return (parseClassConfig && parseClassConfig.mutation) || {};
 };