@graphql-tools/executor 0.0.9 → 0.0.10-alpha-20221114133606-dae9ff99

package/cjs/execution/execute.js

@@ -8,12 +8,6 @@ const promiseForObject_js_1 = require("./promiseForObject.js");
 const flattenAsyncIterable_js_1 = require("./flattenAsyncIterable.js");
 const invariant_js_1 = require("./invariant.js");
 const value_or_promise_1 = require("value-or-promise");
-/**
- * A memoized collection of relevant subfields with regard to the return
- * type. Memoizing ensures the subfields are not repeatedly calculated, which
- * saves overhead when resolving lists of values.
- */
-const collectSubfields = (0, utils_1.memoize3)((exeContext, returnType, fieldNodes) => (0, utils_1.collectSubFields)(exeContext.schema, exeContext.fragments, exeContext.variableValues, returnType, fieldNodes));
 /**
  * Implements the "Executing requests" section of the GraphQL specification,
  * including `@defer` and `@stream` as proposed in
@@ -293,7 +287,7 @@ function executeField(exeContext, parentType, source, fieldNodes, path, asyncPay
         // Build a JS object of arguments from the field.arguments AST, using the
         // variables scope to fulfill any variable references.
         // TODO: find a way to memoize, in case this field is within a List type.
-        const args = (0, utils_1.getArgumentValues)(fieldDef, fieldNodes[0], exeContext.variableValues);
+        const args = (0, graphql_1.getArgumentValues)(fieldDef, fieldNodes[0], exeContext.variableValues);
         // The resolve function's optional third argument is a context value that
         // is provided to every resolve function within an execution. It is commonly
         // used to represent an authenticated user, or request-specific caches.
@@ -634,7 +628,7 @@ function invalidReturnTypeError(returnType, result, fieldNodes) {
 }
 function collectAndExecuteSubfields(exeContext, returnType, fieldNodes, path, result, asyncPayloadRecord) {
     // Collect sub-fields to execute to complete this value.
-    const { fields: subFieldNodes, patches: subPatches } = collectSubfields(exeContext, returnType, fieldNodes);
+    const { fields: subFieldNodes, patches: subPatches } = (0, utils_1.collectSubFields)(exeContext.schema, exeContext.fragments, exeContext.variableValues, returnType, fieldNodes);
     const subFields = executeFields(exeContext, returnType, result, path, subFieldNodes, asyncPayloadRecord);
     for (const subPatch of subPatches) {
         const { label, fields: subPatchFieldNodes } = subPatch;
@@ -903,7 +897,7 @@ function executeSubscription(exeContext) {
         // It differs from "ResolveFieldValue" due to providing a different `resolveFn`.
         // Build a JS object of arguments from the field.arguments AST, using the
         // variables scope to fulfill any variable references.
-        const args = (0, utils_1.getArgumentValues)(fieldDef, fieldNodes[0], variableValues);
+        const args = (0, graphql_1.getArgumentValues)(fieldDef, fieldNodes[0], variableValues);
         // The resolve function's optional third argument is a context value that
         // is provided to every resolve function within an execution. It is commonly
         // used to represent an authenticated user, or request-specific caches.

package/esm/execution/execute.js

@@ -1,16 +1,10 @@
-import { locatedError, Kind, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, assertValidSchema, getDirectiveValues, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, } from 'graphql';
-import { createGraphQLError, inspect, isAsyncIterable, isIterableObject, isObjectLike, isPromise, pathToArray, addPath, getArgumentValues, promiseReduce, memoize3, getDefinedRootType, mapAsyncIterator, GraphQLStreamDirective, collectFields, collectSubFields as _collectSubfields, } from '@graphql-tools/utils';
+import { locatedError, Kind, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, assertValidSchema, getDirectiveValues, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, getArgumentValues, } from 'graphql';
+import { createGraphQLError, inspect, isAsyncIterable, isIterableObject, isObjectLike, isPromise, pathToArray, addPath, promiseReduce, getDefinedRootType, mapAsyncIterator, GraphQLStreamDirective, collectFields, collectSubFields, } from '@graphql-tools/utils';
 import { getVariableValues } from './values.js';
 import { promiseForObject } from './promiseForObject.js';
 import { flattenAsyncIterable } from './flattenAsyncIterable.js';
 import { invariant } from './invariant.js';
 import { ValueOrPromise } from 'value-or-promise';
-/**
- * A memoized collection of relevant subfields with regard to the return
- * type. Memoizing ensures the subfields are not repeatedly calculated, which
- * saves overhead when resolving lists of values.
- */
-const collectSubfields = memoize3((exeContext, returnType, fieldNodes) => _collectSubfields(exeContext.schema, exeContext.fragments, exeContext.variableValues, returnType, fieldNodes));
 /**
  * Implements the "Executing requests" section of the GraphQL specification,
  * including `@defer` and `@stream` as proposed in
@@ -626,7 +620,7 @@ function invalidReturnTypeError(returnType, result, fieldNodes) {
 }
 function collectAndExecuteSubfields(exeContext, returnType, fieldNodes, path, result, asyncPayloadRecord) {
     // Collect sub-fields to execute to complete this value.
-    const { fields: subFieldNodes, patches: subPatches } = collectSubfields(exeContext, returnType, fieldNodes);
+    const { fields: subFieldNodes, patches: subPatches } = collectSubFields(exeContext.schema, exeContext.fragments, exeContext.variableValues, returnType, fieldNodes);
     const subFields = executeFields(exeContext, returnType, result, path, subFieldNodes, asyncPayloadRecord);
     for (const subPatch of subPatches) {
         const { label, fields: subPatchFieldNodes } = subPatch;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "0.0.9",
+  "version": "0.0.10-alpha-20221114133606-dae9ff99",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@repeaterjs/repeater": "3.0.4",
-    "@graphql-tools/utils": "9.1.1",
+    "@graphql-tools/utils": "9.1.2-alpha-20221114133606-dae9ff99",
     "@graphql-typed-document-node/core": "3.1.1",
     "tslib": "^2.4.0",
     "value-or-promise": "1.0.11"

package/typings/execution/execute.d.cts

@@ -1,6 +1,7 @@
 import { GraphQLFormattedError, FieldNode, FragmentDefinitionNode, OperationDefinitionNode, GraphQLField, GraphQLFieldResolver, GraphQLObjectType, GraphQLResolveInfo, GraphQLTypeResolver, GraphQLSchema } from 'graphql';
 import type { GraphQLError } from 'graphql';
-import { Path, Maybe, MaybePromise } from '@graphql-tools/utils';
+import { MaybePromise } from '@graphql-tools/utils';
+import type { Maybe, Path } from '@graphql-tools/utils';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 export interface SingularExecutionResult<TData = any, TExtensions = any> {
     errors?: ReadonlyArray<GraphQLError>;

package/typings/execution/execute.d.ts

@@ -1,6 +1,7 @@
 import { GraphQLFormattedError, FieldNode, FragmentDefinitionNode, OperationDefinitionNode, GraphQLField, GraphQLFieldResolver, GraphQLObjectType, GraphQLResolveInfo, GraphQLTypeResolver, GraphQLSchema } from 'graphql';
 import type { GraphQLError } from 'graphql';
-import { Path, Maybe, MaybePromise } from '@graphql-tools/utils';
+import { MaybePromise } from '@graphql-tools/utils';
+import type { Maybe, Path } from '@graphql-tools/utils';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 export interface SingularExecutionResult<TData = any, TExtensions = any> {
     errors?: ReadonlyArray<GraphQLError>;

package/typings/execution/normalizedExecutor.d.cts

@@ -1,3 +1,3 @@
-import { MaybeAsyncIterable, ExecutionResult, MaybePromise } from '@graphql-tools/utils';
+import type { MaybeAsyncIterable, ExecutionResult, MaybePromise } from '@graphql-tools/utils';
 import { ExecutionArgs } from './execute.cjs';
 export declare function normalizedExecutor<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<MaybeAsyncIterable<ExecutionResult<TData>>>;

package/typings/execution/normalizedExecutor.d.ts

@@ -1,3 +1,3 @@
-import { MaybeAsyncIterable, ExecutionResult, MaybePromise } from '@graphql-tools/utils';
+import type { MaybeAsyncIterable, ExecutionResult, MaybePromise } from '@graphql-tools/utils';
 import { ExecutionArgs } from './execute.js';
 export declare function normalizedExecutor<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<MaybeAsyncIterable<ExecutionResult<TData>>>;