@graphql-tools/executor 2.0.0-alpha-20240702150434-510cb232d9e9dd0212d17ed8efc3e54d83ea25f4 → 2.0.0-alpha-20240702193427-1ce4b1efdef732d2635b657df6273a975a19d217

package/cjs/execution/IncrementalGraph.js

@@ -4,7 +4,6 @@ exports.IncrementalGraph = void 0;
 const utils_1 = require("@graphql-tools/utils");
 const BoxedPromiseOrValue_js_1 = require("./BoxedPromiseOrValue.js");
 const invariant_js_1 = require("./invariant.js");
-const promiseWithResolvers_js_1 = require("./promiseWithResolvers.js");
 const types_js_1 = require("./types.js");
 /**
  * @internal
@@ -47,7 +46,7 @@ class IncrementalGraph {
                         done: false,
                     });
                 }
-                const { promise, resolve } = (0, promiseWithResolvers_js_1.promiseWithResolvers)();
+                const { promise, resolve } = (0, utils_1.createDeferred)();
                 this._nextQueue.push(resolve);
                 return promise;
             },

package/cjs/execution/execute.js

@@ -762,7 +762,10 @@ function ensureValidRuntimeType(runtimeTypeName, exeContext, returnType, fieldGr
     // releases before 16.0.0 supported returning `GraphQLObjectType` from `resolveType`
     // TODO: remove in 17.0.0 release
     if ((0, graphql_1.isObjectType)(runtimeTypeName)) {
-        throw (0, utils_1.createGraphQLError)('Support for returning GraphQLObjectType from resolveType was removed in graphql-js@16.0.0 please return type name instead.');
+        if (graphql_1.versionInfo.major >= 16) {
+            throw (0, utils_1.createGraphQLError)('Support for returning GraphQLObjectType from resolveType was removed in graphql-js@16.0.0 please return type name instead.');
+        }
+        runtimeTypeName = runtimeTypeName.name;
     }
     if (typeof runtimeTypeName !== 'string') {
         throw (0, utils_1.createGraphQLError)(`Abstract type "${returnType.name}" must resolve to an Object type at runtime for field "${info.parentType.name}.${info.fieldName}" with ` +

package/cjs/execution/values.js

@@ -72,7 +72,7 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
             }
             onError((0, utils_1.createGraphQLError)(prefix + '; ' + error.message, {
                 nodes: varDefNode,
-                originalError: error.originalError,
+                originalError: error,
             }));
         });
     }

package/esm/execution/IncrementalGraph.js

@@ -1,7 +1,6 @@
-import { isPromise } from '@graphql-tools/utils';
+import { createDeferred, isPromise } from '@graphql-tools/utils';
 import { BoxedPromiseOrValue } from './BoxedPromiseOrValue.js';
 import { invariant } from './invariant.js';
-import { promiseWithResolvers } from './promiseWithResolvers.js';
 import { isDeferredFragmentRecord, isDeferredGroupedFieldSetRecord } from './types.js';
 /**
  * @internal
@@ -44,7 +43,7 @@ export class IncrementalGraph {
                         done: false,
                     });
                 }
-                const { promise, resolve } = promiseWithResolvers();
+                const { promise, resolve } = createDeferred();
                 this._nextQueue.push(resolve);
                 return promise;
             },

package/esm/execution/execute.js

@@ -1,4 +1,4 @@
-import { assertValidSchema, getDirectiveValues, GraphQLError, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, Kind, locatedError, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, } from 'graphql';
+import { assertValidSchema, getDirectiveValues, GraphQLError, isAbstractType, isLeafType, isListType, isNonNullType, isObjectType, Kind, locatedError, SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef, versionInfo, } from 'graphql';
 import { addPath, createGraphQLError, getArgumentValues, getDefinedRootType, GraphQLStreamDirective, inspect, isAsyncIterable, isIterableObject, isObjectLike, isPromise, mapAsyncIterator, memoize1, memoize3, pathToArray, promiseReduce, } from '@graphql-tools/utils';
 import { BoxedPromiseOrValue } from './BoxedPromiseOrValue.js';
 import { buildFieldPlan } from './buildFieldPlan.js';
@@ -754,7 +754,10 @@ function ensureValidRuntimeType(runtimeTypeName, exeContext, returnType, fieldGr
     // releases before 16.0.0 supported returning `GraphQLObjectType` from `resolveType`
     // TODO: remove in 17.0.0 release
     if (isObjectType(runtimeTypeName)) {
-        throw createGraphQLError('Support for returning GraphQLObjectType from resolveType was removed in graphql-js@16.0.0 please return type name instead.');
+        if (versionInfo.major >= 16) {
+            throw createGraphQLError('Support for returning GraphQLObjectType from resolveType was removed in graphql-js@16.0.0 please return type name instead.');
+        }
+        runtimeTypeName = runtimeTypeName.name;
     }
     if (typeof runtimeTypeName !== 'string') {
         throw createGraphQLError(`Abstract type "${returnType.name}" must resolve to an Object type at runtime for field "${info.parentType.name}.${info.fieldName}" with ` +

package/esm/execution/values.js

@@ -68,7 +68,7 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) {
             }
             onError(createGraphQLError(prefix + '; ' + error.message, {
                 nodes: varDefNode,
-                originalError: error.originalError,
+                originalError: error,
             }));
         });
     }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "2.0.0-alpha-20240702150434-510cb232d9e9dd0212d17ed8efc3e54d83ea25f4",
+  "version": "2.0.0-alpha-20240702193427-1ce4b1efdef732d2635b657df6273a975a19d217",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "10.3.0-alpha-20240702150434-510cb232d9e9dd0212d17ed8efc3e54d83ea25f4",
+    "@graphql-tools/utils": "10.3.0-alpha-20240702193427-1ce4b1efdef732d2635b657df6273a975a19d217",
     "@graphql-typed-document-node/core": "3.2.0",
     "@repeaterjs/repeater": "^3.0.4",
     "tslib": "^2.4.0",

package/cjs/execution/promiseWithResolvers.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseWithResolvers = void 0;
-/**
- * Based on Promise.withResolvers proposal
- * https://github.com/tc39/proposal-promise-with-resolvers
- */
-function promiseWithResolvers() {
-    // these are assigned synchronously within the Promise constructor
-    let resolve;
-    let reject;
-    const promise = new Promise((res, rej) => {
-        resolve = res;
-        reject = rej;
-    });
-    return { promise, resolve, reject };
-}
-exports.promiseWithResolvers = promiseWithResolvers;

package/esm/execution/promiseWithResolvers.js

@@ -1,14 +0,0 @@
-/**
- * Based on Promise.withResolvers proposal
- * https://github.com/tc39/proposal-promise-with-resolvers
- */
-export function promiseWithResolvers() {
-    // these are assigned synchronously within the Promise constructor
-    let resolve;
-    let reject;
-    const promise = new Promise((res, rej) => {
-        resolve = res;
-        reject = rej;
-    });
-    return { promise, resolve, reject };
-}

package/typings/execution/promiseWithResolvers.d.cts

@@ -1,10 +0,0 @@
-import { MaybePromise } from '@graphql-tools/utils';
-/**
- * Based on Promise.withResolvers proposal
- * https://github.com/tc39/proposal-promise-with-resolvers
- */
-export declare function promiseWithResolvers<T>(): {
-    promise: Promise<T>;
-    resolve: (value: T | MaybePromise<T>) => void;
-    reject: (reason?: any) => void;
-};

package/typings/execution/promiseWithResolvers.d.ts

@@ -1,10 +0,0 @@
-import { MaybePromise } from '@graphql-tools/utils';
-/**
- * Based on Promise.withResolvers proposal
- * https://github.com/tc39/proposal-promise-with-resolvers
- */
-export declare function promiseWithResolvers<T>(): {
-    promise: Promise<T>;
-    resolve: (value: T | MaybePromise<T>) => void;
-    reject: (reason?: any) => void;
-};