@envelop/apollo-server-errors 1.0.1 → 1.1.0-alpha-e8998c9.0

package/index.js

@@ -2,15 +2,46 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
 const apolloServerErrors = require('apollo-server-errors');
-const isAsyncIterable = _interopDefault(require('graphql/jsutils/isAsyncIterable.js'));
+
+/**
+ * Returns true if the provided object implements the AsyncIterator protocol via
+ * implementing a `Symbol.asyncIterator` method.
+ *
+ * Source: https://github.com/graphql/graphql-js/blob/main/src/jsutils/isAsyncIterable.ts
+ */
+function isAsyncIterable(maybeAsyncIterable) {
+    return typeof (maybeAsyncIterable === null || maybeAsyncIterable === void 0 ? void 0 : maybeAsyncIterable[Symbol.asyncIterator]) === 'function';
+}
+/**
+ * A utility function for hanlding `onExecuteDone` hook result, for simplifying the hanlding of AsyncIterable returned from `execute`.
+ *
+ * @param payload The payload send to `onExecuteDone` hook function
+ * @param fn The handler to be executed on each result
+ * @returns a subscription for streamed results, or undefined in case of an non-async
+ */
+function handleStreamOrSingleExecutionResult(payload, fn) {
+    if (isAsyncIterable(payload.result)) {
+        return { onNext: fn };
+    }
+    else {
+        fn({
+            args: payload.args,
+            result: payload.result,
+            setResult: payload.setResult,
+        });
+        return undefined;
+    }
+}
 
 const makeHandleResult = (options = {}) => ({ result, setResult }) => {
     if (result.errors && result.errors.length > 0) {
         setResult({
             ...result,
+            // Upstream issue in apollo with GraphQL.js 16
+            // Type 'ApolloError[]' is not assignable to type 'readonly GraphQLError[]'. Property '[Symbol.toStringTag]' is missing in type 'ApolloError' but required in type 'GraphQLError'.
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
             errors: apolloServerErrors.formatApolloErrors(result.errors, {
                 debug: options.debug,
                 formatter: options.formatter,
@@ -23,16 +54,8 @@ const useApolloServerErrors = (options = {}) => {
         onExecute() {
             const handleResult = makeHandleResult(options);
             return {
-                onExecuteDone({ result, setResult }) {
-                    if (isAsyncIterable(result)) {
-                        return {
-                            onNext: ({ result, setResult }) => {
-                                handleResult({ result, setResult });
-                            },
-                        };
-                    }
-                    handleResult({ result, setResult });
-                    return undefined;
+                onExecuteDone(payload) {
+                    return handleStreamOrSingleExecutionResult(payload, handleResult);
                 },
             };
         },
@@ -40,4 +63,3 @@ const useApolloServerErrors = (options = {}) => {
 };
 
 exports.useApolloServerErrors = useApolloServerErrors;
-//# sourceMappingURL=index.js.map

package/index.mjs

@@ -1,10 +1,43 @@
 import { formatApolloErrors } from 'apollo-server-errors';
-import isAsyncIterable from 'graphql/jsutils/isAsyncIterable.js';
+
+/**
+ * Returns true if the provided object implements the AsyncIterator protocol via
+ * implementing a `Symbol.asyncIterator` method.
+ *
+ * Source: https://github.com/graphql/graphql-js/blob/main/src/jsutils/isAsyncIterable.ts
+ */
+function isAsyncIterable(maybeAsyncIterable) {
+    return typeof (maybeAsyncIterable === null || maybeAsyncIterable === void 0 ? void 0 : maybeAsyncIterable[Symbol.asyncIterator]) === 'function';
+}
+/**
+ * A utility function for hanlding `onExecuteDone` hook result, for simplifying the hanlding of AsyncIterable returned from `execute`.
+ *
+ * @param payload The payload send to `onExecuteDone` hook function
+ * @param fn The handler to be executed on each result
+ * @returns a subscription for streamed results, or undefined in case of an non-async
+ */
+function handleStreamOrSingleExecutionResult(payload, fn) {
+    if (isAsyncIterable(payload.result)) {
+        return { onNext: fn };
+    }
+    else {
+        fn({
+            args: payload.args,
+            result: payload.result,
+            setResult: payload.setResult,
+        });
+        return undefined;
+    }
+}
 
 const makeHandleResult = (options = {}) => ({ result, setResult }) => {
     if (result.errors && result.errors.length > 0) {
         setResult({
             ...result,
+            // Upstream issue in apollo with GraphQL.js 16
+            // Type 'ApolloError[]' is not assignable to type 'readonly GraphQLError[]'. Property '[Symbol.toStringTag]' is missing in type 'ApolloError' but required in type 'GraphQLError'.
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
             errors: formatApolloErrors(result.errors, {
                 debug: options.debug,
                 formatter: options.formatter,
@@ -17,16 +50,8 @@ const useApolloServerErrors = (options = {}) => {
         onExecute() {
             const handleResult = makeHandleResult(options);
             return {
-                onExecuteDone({ result, setResult }) {
-                    if (isAsyncIterable(result)) {
-                        return {
-                            onNext: ({ result, setResult }) => {
-                                handleResult({ result, setResult });
-                            },
-                        };
-                    }
-                    handleResult({ result, setResult });
-                    return undefined;
+                onExecuteDone(payload) {
+                    return handleStreamOrSingleExecutionResult(payload, handleResult);
                 },
             };
         },
@@ -34,4 +59,3 @@ const useApolloServerErrors = (options = {}) => {
 };
 
 export { useApolloServerErrors };
-//# sourceMappingURL=index.mjs.map

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@envelop/apollo-server-errors",
-  "version": "1.0.1",
+  "version": "1.1.0-alpha-e8998c9.0",
   "sideEffects": false,
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "apollo-server-errors": "3.0.1"
+    "apollo-server-errors": "3.2.0"
   },
   "repository": {
     "type": "git",

package/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":["../../../dist/plugins/apollo-server-errors/src/index.js"],"sourcesContent":["import { formatApolloErrors } from 'apollo-server-errors';\nimport isAsyncIterable from 'graphql/jsutils/isAsyncIterable.js';\nconst makeHandleResult = (options = {}) => ({ result, setResult }) => {\n    if (result.errors && result.errors.length > 0) {\n        setResult({\n            ...result,\n            errors: formatApolloErrors(result.errors, {\n                debug: options.debug,\n                formatter: options.formatter,\n            }),\n        });\n    }\n};\nexport const useApolloServerErrors = (options = {}) => {\n    return {\n        onExecute() {\n            const handleResult = makeHandleResult(options);\n            return {\n                onExecuteDone({ result, setResult }) {\n                    if (isAsyncIterable(result)) {\n                        return {\n                            onNext: ({ result, setResult }) => {\n                                handleResult({ result, setResult });\n                            },\n                        };\n                    }\n                    handleResult({ result, setResult });\n                    return undefined;\n                },\n            };\n        },\n    };\n};\n//# sourceMappingURL=index.js.map"],"names":["formatApolloErrors"],"mappings":";;;;;;;;;AAEA,MAAM,gBAAgB,GAAG,CAAC,OAAO,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK;AACtE,IAAI,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;AACnD,QAAQ,SAAS,CAAC;AAClB,YAAY,GAAG,MAAM;AACrB,YAAY,MAAM,EAAEA,qCAAkB,CAAC,MAAM,CAAC,MAAM,EAAE;AACtD,gBAAgB,KAAK,EAAE,OAAO,CAAC,KAAK;AACpC,gBAAgB,SAAS,EAAE,OAAO,CAAC,SAAS;AAC5C,aAAa,CAAC;AACd,SAAS,CAAC,CAAC;AACX,KAAK;AACL,CAAC,CAAC;AACU,MAAC,qBAAqB,GAAG,CAAC,OAAO,GAAG,EAAE,KAAK;AACvD,IAAI,OAAO;AACX,QAAQ,SAAS,GAAG;AACpB,YAAY,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC3D,YAAY,OAAO;AACnB,gBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;AACrD,oBAAoB,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE;AACjD,wBAAwB,OAAO;AAC/B,4BAA4B,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK;AAC/D,gCAAgC,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;AACpE,6BAA6B;AAC7B,yBAAyB,CAAC;AAC1B,qBAAqB;AACrB,oBAAoB,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;AACxD,oBAAoB,OAAO,SAAS,CAAC;AACrC,iBAAiB;AACjB,aAAa,CAAC;AACd,SAAS;AACT,KAAK,CAAC;AACN;;;;"}

package/index.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.mjs","sources":["../../../dist/plugins/apollo-server-errors/src/index.js"],"sourcesContent":["import { formatApolloErrors } from 'apollo-server-errors';\nimport isAsyncIterable from 'graphql/jsutils/isAsyncIterable.js';\nconst makeHandleResult = (options = {}) => ({ result, setResult }) => {\n    if (result.errors && result.errors.length > 0) {\n        setResult({\n            ...result,\n            errors: formatApolloErrors(result.errors, {\n                debug: options.debug,\n                formatter: options.formatter,\n            }),\n        });\n    }\n};\nexport const useApolloServerErrors = (options = {}) => {\n    return {\n        onExecute() {\n            const handleResult = makeHandleResult(options);\n            return {\n                onExecuteDone({ result, setResult }) {\n                    if (isAsyncIterable(result)) {\n                        return {\n                            onNext: ({ result, setResult }) => {\n                                handleResult({ result, setResult });\n                            },\n                        };\n                    }\n                    handleResult({ result, setResult });\n                    return undefined;\n                },\n            };\n        },\n    };\n};\n//# sourceMappingURL=index.js.map"],"names":[],"mappings":";;;AAEA,MAAM,gBAAgB,GAAG,CAAC,OAAO,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK;AACtE,IAAI,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;AACnD,QAAQ,SAAS,CAAC;AAClB,YAAY,GAAG,MAAM;AACrB,YAAY,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE;AACtD,gBAAgB,KAAK,EAAE,OAAO,CAAC,KAAK;AACpC,gBAAgB,SAAS,EAAE,OAAO,CAAC,SAAS;AAC5C,aAAa,CAAC;AACd,SAAS,CAAC,CAAC;AACX,KAAK;AACL,CAAC,CAAC;AACU,MAAC,qBAAqB,GAAG,CAAC,OAAO,GAAG,EAAE,KAAK;AACvD,IAAI,OAAO;AACX,QAAQ,SAAS,GAAG;AACpB,YAAY,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC3D,YAAY,OAAO;AACnB,gBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;AACrD,oBAAoB,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE;AACjD,wBAAwB,OAAO;AAC/B,4BAA4B,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK;AAC/D,gCAAgC,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;AACpE,6BAA6B;AAC7B,yBAAyB,CAAC;AAC1B,qBAAqB;AACrB,oBAAoB,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;AACxD,oBAAoB,OAAO,SAAS,CAAC;AACrC,iBAAiB;AACjB,aAAa,CAAC;AACd,SAAS;AACT,KAAK,CAAC;AACN;;;;"}