reorganize delegate files

ardatan · Jul 7, 2020 · 0cc6745 · 0cc6745
1 parent 942ed48
commit 0cc6745
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 33 deletions.
diff --git a/packages/delegate/src/createMergedResolver.ts b/packages/delegate/src/createMergedResolver.ts
@@ -1,6 +1,6 @@
 import { IFieldResolver } from '@graphql-tools/utils';
 
-import { unwrapResult, dehoistResult } from './proxiedResult';
+import { unwrapResult, dehoistResult } from './results/proxiedResult';
 import { defaultMergedResolver } from './defaultMergedResolver';
 
 export function createMergedResolver({

diff --git a/...s/delegate/src/getFieldsNotInSubschema.ts → ...te/src/results/getFieldsNotInSubschema.ts b/...s/delegate/src/getFieldsNotInSubschema.ts → ...te/src/results/getFieldsNotInSubschema.ts
@@ -1,8 +1,9 @@
 import { GraphQLSchema, FieldNode, GraphQLObjectType, GraphQLResolveInfo } from 'graphql';
 
 import { collectFields, GraphQLExecutionContext } from '@graphql-tools/utils';
-import { isSubschemaConfig } from './Subschema';
-import { MergedTypeInfo, SubschemaConfig, StitchingInfo } from './types';
+import { isSubschemaConfig } from '../Subschema';
+import { MergedTypeInfo, SubschemaConfig, StitchingInfo } from '../types';
+
 import { memoizeInfoAnd2Objectsand1Primitive } from './memoize';
 
 function collectSubFields(info: GraphQLResolveInfo, typeName: string): Record<string, Array<FieldNode>> {

diff --git a/packages/delegate/src/results/handleObject.ts b/packages/delegate/src/results/handleObject.ts
@@ -5,8 +5,9 @@ import { setErrors, slicedError } from '@graphql-tools/utils';
 import { SubschemaConfig } from '../types';
 
 import { setObjectSubschema } from '../Subschema';
-import { mergeFields } from '../mergeFields';
-import { getFieldsNotInSubschema } from '../getFieldsNotInSubschema';
+
+import { mergeFields } from './mergeFields';
+import { getFieldsNotInSubschema } from './getFieldsNotInSubschema';
 
 export function handleObject(
   type: GraphQLCompositeType,

diff --git a/packages/delegate/src/memoize.ts → packages/delegate/src/results/memoize.ts b/packages/delegate/src/memoize.ts → packages/delegate/src/results/memoize.ts
diff --git a/packages/delegate/src/mergeFields.ts → packages/delegate/src/results/mergeFields.ts b/packages/delegate/src/mergeFields.ts → packages/delegate/src/results/mergeFields.ts
@@ -1,8 +1,9 @@
 import { FieldNode, SelectionNode, Kind, GraphQLResolveInfo, SelectionSetNode } from 'graphql';
 
-import { mergeProxiedResults } from './proxiedResult';
-import { MergedTypeInfo, SubschemaConfig } from './types';
+import { MergedTypeInfo, SubschemaConfig } from '../types';
+
 import { memoize3, memoize2 } from './memoize';
+import { mergeProxiedResults } from './mergeProxiedResults';
 
 const sortSubschemasByProxiability = memoize3(function (
   mergedTypeInfo: MergedTypeInfo,

diff --git a/packages/delegate/src/results/mergeProxiedResults.ts b/packages/delegate/src/results/mergeProxiedResults.ts
@@ -0,0 +1,25 @@
+import { mergeDeep, ERROR_SYMBOL } from '@graphql-tools/utils';
+
+import { SubschemaConfig } from '../types';
+import { OBJECT_SUBSCHEMA_SYMBOL, FIELD_SUBSCHEMA_MAP_SYMBOL } from '../symbols';
+
+export function mergeProxiedResults(target: any, ...sources: Array<any>): any {
+  const results = sources.filter(source => !(source instanceof Error));
+  const fieldSubschemaMap = results.reduce((acc: Record<any, SubschemaConfig>, source: any) => {
+    const subschema = source[OBJECT_SUBSCHEMA_SYMBOL];
+    Object.keys(source).forEach(key => {
+      acc[key] = subschema;
+    });
+    return acc;
+  }, {});
+
+  const result = results.reduce(mergeDeep, target);
+  result[FIELD_SUBSCHEMA_MAP_SYMBOL] = target[FIELD_SUBSCHEMA_MAP_SYMBOL]
+    ? Object.assign({}, target[FIELD_SUBSCHEMA_MAP_SYMBOL], fieldSubschemaMap)
+    : fieldSubschemaMap;
+
+  const errors = sources.map((source: any) => (source instanceof Error ? source : source[ERROR_SYMBOL]));
+  result[ERROR_SYMBOL] = target[ERROR_SYMBOL].concat(...errors);
+
+  return result;
+}
diff --git a/packages/delegate/src/proxiedResult.ts → ...ges/delegate/src/results/proxiedResult.ts b/packages/delegate/src/proxiedResult.ts → ...ges/delegate/src/results/proxiedResult.ts
@@ -1,12 +1,11 @@
 import { GraphQLError } from 'graphql';
 
-import { mergeDeep, ERROR_SYMBOL, relocatedError, setErrors, getErrors } from '@graphql-tools/utils';
+import { ERROR_SYMBOL, relocatedError, setErrors, getErrors } from '@graphql-tools/utils';
 
-import { handleNull } from './results/handleNull';
+import { OBJECT_SUBSCHEMA_SYMBOL } from '../symbols';
+import { getSubschema, setObjectSubschema } from '../Subschema';
 
-import { FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL } from './symbols';
-import { getSubschema, setObjectSubschema } from './Subschema';
-import { SubschemaConfig } from './types';
+import { handleNull } from './handleNull';
 
 export function isProxiedResult(result: any) {
   return result != null ? result[ERROR_SYMBOL] : result;
@@ -66,24 +65,3 @@ export function dehoistResult(parent: any, delimeter = '__gqltf__'): any {
 
   return result;
 }
-
-export function mergeProxiedResults(target: any, ...sources: Array<any>): any {
-  const results = sources.filter(source => !(source instanceof Error));
-  const fieldSubschemaMap = results.reduce((acc: Record<any, SubschemaConfig>, source: any) => {
-    const subschema = source[OBJECT_SUBSCHEMA_SYMBOL];
-    Object.keys(source).forEach(key => {
-      acc[key] = subschema;
-    });
-    return acc;
-  }, {});
-
-  const result = results.reduce(mergeDeep, target);
-  result[FIELD_SUBSCHEMA_MAP_SYMBOL] = target[FIELD_SUBSCHEMA_MAP_SYMBOL]
-    ? Object.assign({}, target[FIELD_SUBSCHEMA_MAP_SYMBOL], fieldSubschemaMap)
-    : fieldSubschemaMap;
-
-  const errors = sources.map((source: any) => (source instanceof Error ? source : source[ERROR_SYMBOL]));
-  result[ERROR_SYMBOL] = target[ERROR_SYMBOL].concat(...errors);
-
-  return result;
-}