rename ExternalData to ExternalObject

Author: yaacovCR

packages/delegate/src/defaultMergedResolver.ts

@@ -4,8 +4,8 @@ import { getResponseKeyFromInfo } from '@graphql-tools/utils';
 
 import { resolveExternalValue } from './resolveExternalValue';
 import { getSubschema } from './Subschema';
-import { getUnpathedErrors, isExternalData } from './externalData';
-import { ExternalData } from './types';
+import { getUnpathedErrors, isExternalObject } from './externalObjects';
+import { ExternalObject } from './types';
 
 /**
  * Resolver that knows how to:
@@ -14,7 +14,7 @@ import { ExternalData } from './types';
  * c) handle external to internal enum coversion
  */
 export function defaultMergedResolver(
-  parent: ExternalData,
+  parent: ExternalObject,
   args: Record<string, any>,
   context: Record<string, any>,
   info: GraphQLResolveInfo
@@ -27,7 +27,7 @@ export function defaultMergedResolver(
 
   // check to see if parent is not a proxied result, i.e. if parent resolver was manually overwritten
   // See https://github.com/apollographql/graphql-tools/issues/967
-  if (!isExternalData(parent)) {
+  if (!isExternalObject(parent)) {
     return defaultFieldResolver(parent, args, context, info);
   }
 

packages/delegate/src/externalData.ts renamed to packages/delegate/src/externalObjects.ts

@@ -2,42 +2,42 @@ import { GraphQLSchema, GraphQLError, GraphQLObjectType, SelectionSetNode } from
 
 import { mergeDeep, relocatedError, GraphQLExecutionContext, collectFields } from '@graphql-tools/utils';
 
-import { SubschemaConfig, ExternalData } from './types';
+import { SubschemaConfig, ExternalObject } from './types';
 import { OBJECT_SUBSCHEMA_SYMBOL, FIELD_SUBSCHEMA_MAP_SYMBOL, UNPATHED_ERRORS_SYMBOL } from './symbols';
 
-export function isExternalData(data: any): data is ExternalData {
+export function isExternalObject(data: any): data is ExternalObject {
   return data[UNPATHED_ERRORS_SYMBOL] !== undefined;
 }
 
-export function annotateExternalData(
-  data: any,
+export function annotateExternalObject(
+  object: any,
   errors: Array<GraphQLError>,
   subschema: GraphQLSchema | SubschemaConfig
-): ExternalData {
-  Object.defineProperties(data, {
+): ExternalObject {
+  Object.defineProperties(object, {
     [OBJECT_SUBSCHEMA_SYMBOL]: { value: subschema },
     [FIELD_SUBSCHEMA_MAP_SYMBOL]: { value: Object.create(null) },
     [UNPATHED_ERRORS_SYMBOL]: { value: errors },
   });
-  return data;
+  return object;
 }
 
-export function getSubschema(data: ExternalData, responseKey: string): GraphQLSchema | SubschemaConfig {
-  return data[FIELD_SUBSCHEMA_MAP_SYMBOL][responseKey] ?? data[OBJECT_SUBSCHEMA_SYMBOL];
+export function getSubschema(object: ExternalObject, responseKey: string): GraphQLSchema | SubschemaConfig {
+  return object[FIELD_SUBSCHEMA_MAP_SYMBOL][responseKey] ?? object[OBJECT_SUBSCHEMA_SYMBOL];
 }
 
-export function getUnpathedErrors(data: ExternalData): Array<GraphQLError> {
-  return data[UNPATHED_ERRORS_SYMBOL];
+export function getUnpathedErrors(object: ExternalObject): Array<GraphQLError> {
+  return object[UNPATHED_ERRORS_SYMBOL];
 }
 
-export function mergeExternalData(
+export function mergeExternalObjects(
   schema: GraphQLSchema,
   path: Array<string | number>,
   typeName: string,
-  target: ExternalData,
-  sources: Array<ExternalData>,
+  target: ExternalObject,
+  sources: Array<ExternalObject>,
   selectionSets: Array<SelectionSetNode>
-): ExternalData {
+): ExternalObject {
   const results: Array<any> = [];
   let errors: Array<GraphQLError> = [];
 

packages/delegate/src/index.ts

@@ -6,6 +6,6 @@ export { Subschema, isSubschema, isSubschemaConfig } from './Subschema';
 
 export * from './applySchemaTransforms';
 export * from './delegationBindings';
-export * from './externalData';
+export * from './externalObjects';
 export * from './transforms';
 export * from './types';

packages/delegate/src/mergeFields.ts

@@ -13,7 +13,7 @@ import isPromise from 'is-promise';
 
 import { MergedTypeInfo, SubschemaConfig } from './types';
 import { memoize4, memoize3, memoize2 } from './memoize';
-import { mergeExternalData } from './externalData';
+import { mergeExternalObjects } from './externalObjects';
 
 const sortSubschemasByProxiability = memoize4(function (
   mergedTypeInfo: MergedTypeInfo,
@@ -190,7 +190,7 @@ export function mergeFields(
         mergeFields(
           mergedTypeInfo,
           typeName,
-          mergeExternalData(
+          mergeExternalObjects(
             info.schema,
             responsePathAsArray(info.path),
             object.__typename,
@@ -208,7 +208,7 @@ export function mergeFields(
     : mergeFields(
         mergedTypeInfo,
         typeName,
-        mergeExternalData(
+        mergeExternalObjects(
           info.schema,
           responsePathAsArray(info.path),
           object.__typename,

packages/delegate/src/resolveExternalValue.ts

@@ -14,7 +14,7 @@ import {
 } from 'graphql';
 
 import { SubschemaConfig } from './types';
-import { annotateExternalData } from './externalData';
+import { annotateExternalObject } from './externalObjects';
 import { getFieldsNotInSubschema } from './getFieldsNotInSubschema';
 import { mergeFields } from './mergeFields';
 
@@ -57,7 +57,7 @@ function resolveExternalObject(
 ) {
   const stitchingInfo = info?.schema.extensions?.stitchingInfo;
 
-  annotateExternalData(object, unpathedErrors, subschema);
+  annotateExternalObject(object, unpathedErrors, subschema);
 
   if (skipTypeMerging || !stitchingInfo) {
     return object;

packages/delegate/src/types.ts

@@ -180,7 +180,7 @@ export interface StitchingInfo {
   mergedTypes: Record<string, MergedTypeInfo>;
 }
 
-export interface ExternalData {
+export interface ExternalObject {
   key: any;
   [OBJECT_SUBSCHEMA_SYMBOL]: GraphQLSchema | SubschemaConfig;
   [FIELD_SUBSCHEMA_MAP_SYMBOL]: Record<string, GraphQLSchema | SubschemaConfig>;

packages/delegate/tests/errors.test.ts

@@ -6,7 +6,7 @@ import { stitchSchemas } from '@graphql-tools/stitch';
 
 import { checkResultAndHandleErrors } from '../src/transforms/CheckResultAndHandleErrors';
 import { UNPATHED_ERRORS_SYMBOL } from '../src/symbols';
-import { getUnpathedErrors } from '../src/externalData';
+import { getUnpathedErrors } from '../src/externalObjects';
 import { delegateToSchema, defaultMergedResolver } from '../src';
 
 class ErrorWithExtensions extends GraphQLError {
@@ -21,13 +21,13 @@ describe('Errors', () => {
       const error = {
         message: 'Test error without path',
       };
-      const mockExternalData: any = {
+      const mockExternalObject: any = {
         responseKey: '',
         [UNPATHED_ERRORS_SYMBOL]: [error],
       };
 
-      expect(getUnpathedErrors(mockExternalData)).toEqual([
-        mockExternalData[UNPATHED_ERRORS_SYMBOL][0],
+      expect(getUnpathedErrors(mockExternalObject)).toEqual([
+        mockExternalObject[UNPATHED_ERRORS_SYMBOL][0],
       ]);
     });
   });

packages/wrap/src/generateProxyingResolvers.ts

@@ -11,7 +11,7 @@ import {
   ICreateProxyingResolverOptions,
   Transform,
   applySchemaTransforms,
-  isExternalData,
+  isExternalObject,
   getUnpathedErrors,
 } from '@graphql-tools/delegate';
 
@@ -92,7 +92,7 @@ function createPossiblyNestedProxyingResolver(
       const responseKey = getResponseKeyFromInfo(info);
 
       // Check to see if the parent contains a proxied result
-      if (isExternalData(parent)) {
+      if (isExternalObject(parent)) {
         const unpathedErrors = getUnpathedErrors(parent);
         const subschema = getSubschema(parent, responseKey);