@aws-amplify/api-graphql 4.0.1-console-preview.4ae78ed.0 → 4.0.1-console-preview.8637b15.0

package/lib/GraphQLAPI.d.ts

@@ -1,10 +1,10 @@
 import { GraphQLOptions, GraphQLResult } from './types';
 import { InternalGraphQLAPIClass } from './internals';
 import { Observable } from 'rxjs';
-export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string) => {
+export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string | undefined) => {
     query: any;
     variables: {};
-    authToken: string;
+    authToken: string | undefined;
 };
 /**
  * Export Cloud Logic APIs

package/lib/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -781,6 +781,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
                             url: new URL(request.url),
                             body: request.data,
                         }, {
+                            // TODO: What do we need to do to remove these !'s?
                             credentials: creds,
                             signingRegion: endpointInfo.region,
                             signingService: endpointInfo.service,

package/lib/internals/InternalGraphQLAPI.d.ts

@@ -2,10 +2,10 @@ import { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
 import { CustomUserAgentDetails } from '@aws-amplify/core/internals/utils';
 import { GraphQLResult, GraphQLOperation, GraphQLOptions } from '../types';
-export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string) => {
+export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string | undefined) => {
     query: any;
     variables: {};
-    authToken: string;
+    authToken: string | undefined;
 };
 /**
  * Export Cloud Logic APIs

package/lib/internals/InternalGraphQLAPI.js

@@ -39,18 +39,18 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
     };
     InternalGraphQLAPIClass.prototype._headerBasedAuth = function (authMode, additionalHeaders) {
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
-        var _a;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var config, _b, region, appSyncGraphqlEndpoint, apiKey, defaultAuthMode, authenticationType, headers, _c, session, token, e_1;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var config, _c, region, appSyncGraphqlEndpoint, apiKey, defaultAuthMode, authenticationType, headers, _d, session, token, e_1;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         config = core_1.Amplify.getConfig();
-                        _b = config.API.GraphQL, region = _b.region, appSyncGraphqlEndpoint = _b.endpoint, apiKey = _b.apiKey, defaultAuthMode = _b.defaultAuthMode;
+                        _c = ((_a = config.API) === null || _a === void 0 ? void 0 : _a.GraphQL) || {}, region = _c.region, appSyncGraphqlEndpoint = _c.endpoint, apiKey = _c.apiKey, defaultAuthMode = _c.defaultAuthMode;
                         authenticationType = authMode || defaultAuthMode || 'iam';
                         headers = {};
-                        _c = authenticationType;
-                        switch (_c) {
+                        _d = authenticationType;
+                        switch (_d) {
                             case 'apiKey': return [3 /*break*/, 1];
                             case 'iam': return [3 /*break*/, 2];
                             case 'oidc': return [3 /*break*/, 4];
@@ -69,17 +69,17 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         return [3 /*break*/, 11];
                     case 2: return [4 /*yield*/, core_1.fetchAuthSession()];
                     case 3:
-                        session = _d.sent();
+                        session = _e.sent();
                         if (session.credentials === undefined) {
                             throw new Error(types_1.GraphQLAuthError.NO_CREDENTIALS);
                         }
                         return [3 /*break*/, 11];
                     case 4:
-                        _d.trys.push([4, 6, , 7]);
+                        _e.trys.push([4, 6, , 7]);
                         token = void 0;
                         return [4 /*yield*/, core_1.fetchAuthSession()];
                     case 5:
-                        token = (_a = (_d.sent()).tokens) === null || _a === void 0 ? void 0 : _a.accessToken.toString();
+                        token = (_b = (_e.sent()).tokens) === null || _b === void 0 ? void 0 : _b.accessToken.toString();
                         if (!token) {
                             throw new Error(types_1.GraphQLAuthError.NO_FEDERATED_JWT);
                         }
@@ -88,7 +88,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         };
                         return [3 /*break*/, 7];
                     case 6:
-                        e_1 = _d.sent();
+                        e_1 = _e.sent();
                         throw new Error(types_1.GraphQLAuthError.NO_CURRENT_USER);
                     case 7: return [3 /*break*/, 11];
                     case 8:
@@ -155,45 +155,47 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
     InternalGraphQLAPIClass.prototype._graphql = function (_a, additionalHeaders, abortController, customUserAgentDetails) {
         var query = _a.query, variables = _a.variables, authMode = _a.authMode;
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
+        var _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var config, _b, region, appSyncGraphqlEndpoint, customGraphqlEndpoint, customEndpointRegion, headers, _c, _d, _e, _f, _g, body, endpoint, error, response, responseBody, result, err_1, errors;
-            var _h;
-            return tslib_1.__generator(this, function (_j) {
-                switch (_j.label) {
+            var config, _c, region, appSyncGraphqlEndpoint, customGraphqlEndpoint, customEndpointRegion, headers, _d, _e, _f, _g, _h, body, endpoint, error, response, responseBody, result, err_1, errors;
+            var _j;
+            return tslib_1.__generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         config = core_1.Amplify.getConfig();
-                        _b = config.API.GraphQL, region = _b.region, appSyncGraphqlEndpoint = _b.endpoint;
+                        _c = ((_b = config.API) === null || _b === void 0 ? void 0 : _b.GraphQL) || {}, region = _c.region, appSyncGraphqlEndpoint = _c.endpoint;
                         customGraphqlEndpoint = null;
                         customEndpointRegion = null;
-                        _c = [{}];
-                        _d = !customGraphqlEndpoint;
-                        if (!_d) return [3 /*break*/, 2];
+                        _d = [{}];
+                        _e = !customGraphqlEndpoint;
+                        if (!_e) return [3 /*break*/, 2];
                         return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
                     case 1:
-                        _d = (_j.sent());
-                        _j.label = 2;
+                        _e = (_k.sent());
+                        _k.label = 2;
                     case 2:
-                        _e = [tslib_1.__assign.apply(void 0, _c.concat([(_d)]))];
-                        _f = customGraphqlEndpoint;
-                        if (!_f) return [3 /*break*/, 6];
+                        _f = [tslib_1.__assign.apply(void 0, _d.concat([(_e)]))];
+                        _g = customGraphqlEndpoint;
+                        if (!_g) return [3 /*break*/, 6];
                         if (!customEndpointRegion) return [3 /*break*/, 4];
                         return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
                     case 3:
-                        _g = _j.sent();
+                        _h = _k.sent();
                         return [3 /*break*/, 5];
                     case 4:
-                        _g = { Authorization: null };
-                        _j.label = 5;
+                        _h = { Authorization: null };
+                        _k.label = 5;
                     case 5:
-                        _f = (_g);
-                        _j.label = 6;
+                        _g = (_h);
+                        _k.label = 6;
                     case 6:
-                        headers = tslib_1.__assign.apply(void 0, [tslib_1.__assign.apply(void 0, [tslib_1.__assign.apply(void 0, _e.concat([(_f)])), additionalHeaders]), (!customGraphqlEndpoint && (_h = {},
-                                _h[USER_AGENT_HEADER] = utils_1.getAmplifyUserAgent(customUserAgentDetails),
-                                _h))]);
+                        headers = tslib_1.__assign.apply(void 0, [tslib_1.__assign.apply(void 0, [tslib_1.__assign.apply(void 0, _f.concat([((_g) ||
+                                        {})])), additionalHeaders]), (!customGraphqlEndpoint && (_j = {},
+                                _j[USER_AGENT_HEADER] = utils_1.getAmplifyUserAgent(customUserAgentDetails),
+                                _j))]);
                         body = {
                             query: graphql_1.print(query),
-                            variables: variables,
+                            variables: variables || null,
                         };
                         endpoint = customGraphqlEndpoint || appSyncGraphqlEndpoint;
                         if (!endpoint) {
@@ -203,9 +205,9 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                                 errors: [error],
                             };
                         }
-                        _j.label = 7;
+                        _k.label = 7;
                     case 7:
-                        _j.trys.push([7, 10, , 11]);
+                        _k.trys.push([7, 10, , 11]);
                         return [4 /*yield*/, this._api.post({
                                 url: new URL(endpoint),
                                 options: {
@@ -219,14 +221,14 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                                 abortController: abortController,
                             })];
                     case 8:
-                        responseBody = (_j.sent()).body;
+                        responseBody = (_k.sent()).body;
                         return [4 /*yield*/, responseBody.json()];
                     case 9:
-                        result = _j.sent();
+                        result = _k.sent();
                         response = result;
                         return [3 /*break*/, 11];
                     case 10:
-                        err_1 = _j.sent();
+                        err_1 = _k.sent();
                         // If the exception is because user intentionally
                         // cancelled the request, do not modify the exception
                         // so that clients can identify the exception correctly.

package/lib/tsconfig.tsbuildinfo

@@ -1318,12 +1318,12 @@
         "signature": "77d9972e4e2dd35f88e03335d8d0d9592a754693e4ea00d27f0ccc44f43c1c59"
       },
       "../src/types/PubSub.ts": {
-        "version": "70ac482472a54d226119a9a20fbb3f3baa04e9e305526ab90559626561206a64",
-        "signature": "ad2b3dd90d30fe70b81a40ed52c2f676547c6d6cfb740278e8798c15d780ddde"
+        "version": "14b4a96cd324440e30040d2a8d147af5f71ac1603546e16a9e0b56aa705aeb05",
+        "signature": "69998b609508e9a6a8acbba64b5e4cdbe313c53451b349fe049d56786c2afd14"
       },
       "../src/types/index.ts": {
-        "version": "8cc63a0a395a658e6307999a4dba9b82b466965c59d44226e21a76df8b9f727f",
-        "signature": "6a5e869b97f16df46e0aa1510c561ce541d1f8dc548144de8bac12048ea64856"
+        "version": "93ad3a1a8ee1d0a593f245ad2a9e4558de336823e21ecb3310584dec9ad26193",
+        "signature": "1ec49e2a63d9fe4506977191b899c08704ef20f62611498215f2235e6e8f5113"
       },
       "../../core/lib-esm/singleton/apis/fetchAuthSession.d.ts": {
         "version": "df1a1f23d18a3dac758a03f4f8f6a3d14e83fb78a45431d15e6833fb53ed8055",
@@ -1450,12 +1450,12 @@
         "signature": "b0afc2803af9e818fad28464e4e62ee1b255d282f8f19ba8a2459b7bab4d789e"
       },
       "../src/Providers/AWSAppSyncRealTimeProvider/index.ts": {
-        "version": "29954fb873eeb8da70ded5f56ee4d1c21818db5d9ca5d9f69c4a6a40abf51d85",
+        "version": "70307fdb8b8731ddf884d9974e4c6995a8882d434a9e89d0bcaf865a4e6f1fab",
         "signature": "1e99d3031c6655bc40f2a8d877d7a10a8747d29046f6e4b0e1dba3590cd2fdf8"
       },
       "../src/internals/InternalGraphQLAPI.ts": {
-        "version": "a612370b2c60bf029ee457af362c4885509d1194cde4f3c0704eac5a40bc293b",
-        "signature": "3247c9c68592c4a9f34556a8cfcc45aeed26ec3267bfd21a69adb449503e1ab9"
+        "version": "4b77a15f276dd6a438831595b4ebe9edd9da3f3ec60504a9dc6d727ba25179db",
+        "signature": "2935cf9761be3485380b77cbe856f428a1c342ca4377ad1dfa72af6eac46db2e"
       },
       "../src/internals/v6.ts": {
         "version": "2acd7dbd0aa7c028f597a68a21cce2b24e9ed4a254a650ed144a162a9653f476",
@@ -1467,7 +1467,7 @@
       },
       "../src/GraphQLAPI.ts": {
         "version": "e728905616fa216dfc13c3f044c4f349ff3a534c3849888b6614cf40e2cc899b",
-        "signature": "fd3d568c0c5301c0d8aea98d012ba4cee64535ebd582028a8131c438fc03d566"
+        "signature": "5db56760293eb5283bccc3ec49e63afe428213aad441147f90fe6e28f655f1a6"
       },
       "../src/index.ts": {
         "version": "98d8433766c112c8658d03649ac495f403979234c503594a7b7baf3b5f8e5a02",
@@ -1495,7 +1495,7 @@
       },
       "../src/utils/resolveCredentials.ts": {
         "version": "22c610d9879b27de3f79333284f54ce4f330b35e930837627cdfc0d276bf8a57",
-        "signature": "d56e9d5742bdb7916c1aee7a741bcc0ebd76efb1e9b0b8acacb597e7915e8f36"
+        "signature": "f848a594e5ecbebed6b9e7a2b62c57466dbf0faede2b27e3538a1c7fe2efb2e1"
       },
       "../src/utils/index.ts": {
         "version": "6601832367b2c1359b16db86700174171375fa7d1403c5558910962ce36fa70a",
@@ -1541,6 +1541,7 @@
         "node"
       ],
       "strict": false,
+      "strictNullChecks": true,
       "skipLibCheck": true,
       "module": 1,
       "outDir": "./",

package/lib/types/PubSub.d.ts

@@ -23,5 +23,5 @@ export declare enum ConnectionState {
     Disconnected = "Disconnected",
     ConnectedPendingKeepAlive = "ConnectedPendingKeepAlive"
 }
-export declare type PubSubContent = Record<string, unknown> | string;
+export declare type PubSubContent = Record<string, unknown>;
 export declare type PubSubContentObserver = Observer<PubSubContent>;

package/lib/types/index.d.ts

@@ -17,7 +17,7 @@ export interface GraphQLOptions {
     userAgentSuffix?: string;
 }
 export interface GraphQLResult<T = object> {
-    data?: T;
+    data: T;
     errors?: GraphQLError[];
     extensions?: {
         [key: string]: any;
@@ -30,6 +30,66 @@ export declare type GraphQLQuery<T> = T & {
 export declare type GraphQLSubscription<T> = T & {
     readonly [queryType]: 'subscription';
 };
+/**
+ * Accepts a code generated model type and returns a supertype that
+ * can accept return values from the relevant graphql operations.
+ *
+ * For example:
+ *
+ * ```typescript
+ * import { GraphQLReturnType } from 'aws-amplify/api';
+ * import { MyModel } from './API';
+ * import { getMyModel } from './graphql/queries';
+ *
+ * const [item, setItem] = useState<GraphQLReturnType<MyModel>>();
+ * setItem(await client.graphql({ query: getMyModel }).data.getMyModel!)
+ * ```
+ *
+ * Trying to assign the result of a `getMyModel` operation directly to a
+ * `MyModel` variables won't necessarily work, because normally-required related
+ * models might not be part of the selection set.
+ *
+ * This util simply makes related model properties optional recursively.
+ */
+export declare type GraphQLReturnType<T> = T extends {} ? {
+    [K in keyof T]?: GraphQLReturnType<T[K]>;
+} : T;
+/**
+ * Describes a paged list result from AppSync, which can either
+ * live at the top query or property (e.g., related model) level.
+ */
+declare type PagedList<T, TYPENAME> = {
+    __typename: TYPENAME;
+    nextToken?: string | null | undefined;
+    items: Array<T>;
+};
+/**
+ * Recursively looks through a result type and removes nulls and
+ * and undefined from `PagedList` types.
+ *
+ * Although a graphql response might contain empty values in an
+ * array, this will only be the case when we also have errors,
+ * which will then be *thrown*.
+ */
+declare type WithListsFixed<T> = T extends PagedList<infer IT, infer NAME> ? PagedList<Exclude<IT, null | undefined>, NAME> : T extends {} ? {
+    [K in keyof T]: WithListsFixed<T[K]>;
+} : T;
+/**
+ * Returns an updated response type to always return a value.
+ */
+declare type NeverEmpty<T> = {
+    [K in keyof T]-?: Exclude<WithListsFixed<T[K]>, undefined | null>;
+};
+/**
+ * Replaces all list result types in a query result with types to exclude
+ * nulls and undefined from list member unions.
+ *
+ * If empty members are present, there will also be errors present,
+ * and the response will instead be *thrown*.
+ */
+declare type FixedQueryResult<T> = Exclude<T[keyof T], null | undefined> extends PagedList<any, any> ? {
+    [K in keyof T]-?: WithListsFixed<Exclude<T[K], null | undefined>>;
+} : T;
 /**
  * The return value from a `graphql({query})` call when `query` is a subscription.
  *
@@ -68,7 +128,7 @@ export declare type GraphqlSubscriptionResult<T> = Observable<GraphqlSubscriptio
  * ```
  */
 export declare type GraphqlSubscriptionMessage<T> = {
-    data?: T;
+    data: T;
 };
 export interface AWSAppSyncRealTimeProviderOptions {
     appSyncGraphqlEndpoint?: string;
@@ -128,7 +188,7 @@ export declare type GraphQLVariablesV6<FALLBACK_TYPES = unknown, TYPED_GQL_STRIN
  * The expected return type with respect to the given `FALLBACK_TYPE`
  * and `TYPED_GQL_STRING`.
  */
-export declare type GraphQLResponseV6<FALLBACK_TYPE = unknown, TYPED_GQL_STRING extends string = string> = TYPED_GQL_STRING extends GeneratedQuery<infer IN, infer QUERY_OUT> ? Promise<GraphQLResult<QUERY_OUT>> : TYPED_GQL_STRING extends GeneratedMutation<infer IN, infer MUTATION_OUT> ? Promise<GraphQLResult<MUTATION_OUT>> : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT> ? GraphqlSubscriptionResult<SUB_OUT> : FALLBACK_TYPE extends GraphQLQuery<infer T> ? Promise<GraphQLResult<FALLBACK_TYPE>> : FALLBACK_TYPE extends GraphQLSubscription<infer T> ? GraphqlSubscriptionResult<FALLBACK_TYPE> : FALLBACK_TYPE extends GraphQLOperationType<infer IN, infer CUSTOM_OUT> ? CUSTOM_OUT : UnknownGraphQLResponse;
+export declare type GraphQLResponseV6<FALLBACK_TYPE = unknown, TYPED_GQL_STRING extends string = string> = TYPED_GQL_STRING extends GeneratedQuery<infer IN, infer QUERY_OUT> ? Promise<GraphQLResult<FixedQueryResult<QUERY_OUT>>> : TYPED_GQL_STRING extends GeneratedMutation<infer IN, infer MUTATION_OUT> ? Promise<GraphQLResult<NeverEmpty<MUTATION_OUT>>> : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT> ? GraphqlSubscriptionResult<NeverEmpty<SUB_OUT>> : FALLBACK_TYPE extends GraphQLQuery<infer T> ? Promise<GraphQLResult<FALLBACK_TYPE>> : FALLBACK_TYPE extends GraphQLSubscription<infer T> ? GraphqlSubscriptionResult<FALLBACK_TYPE> : FALLBACK_TYPE extends GraphQLOperationType<infer IN, infer CUSTOM_OUT> ? CUSTOM_OUT : UnknownGraphQLResponse;
 /**
  * The shape customers can use to provide `T` to `graphql<T>()` to specify both
  * `IN` and `OUT` types (the type of `variables` and the return type, respectively).

package/lib/utils/resolveCredentials.d.ts

@@ -5,8 +5,8 @@ export declare const resolveCredentials: () => Promise<{
     credentials: {
         accessKeyId: string;
         secretAccessKey: string;
-        sessionToken?: string;
-        expiration?: Date;
+        sessionToken?: string | undefined;
+        expiration?: Date | undefined;
     };
-    identityId: string;
+    identityId: string | undefined;
 }>;

package/lib-esm/GraphQLAPI.d.ts

@@ -1,10 +1,10 @@
 import { GraphQLOptions, GraphQLResult } from './types';
 import { InternalGraphQLAPIClass } from './internals';
 import { Observable } from 'rxjs';
-export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string) => {
+export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string | undefined) => {
     query: any;
     variables: {};
-    authToken: string;
+    authToken: string | undefined;
 };
 /**
  * Export Cloud Logic APIs

package/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -779,6 +779,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
                             url: new URL(request.url),
                             body: request.data,
                         }, {
+                            // TODO: What do we need to do to remove these !'s?
                             credentials: creds,
                             signingRegion: endpointInfo.region,
                             signingService: endpointInfo.service,

package/lib-esm/internals/InternalGraphQLAPI.d.ts

@@ -2,10 +2,10 @@ import { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
 import { CustomUserAgentDetails } from '@aws-amplify/core/internals/utils';
 import { GraphQLResult, GraphQLOperation, GraphQLOptions } from '../types';
-export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string) => {
+export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string | undefined) => {
     query: any;
     variables: {};
-    authToken: string;
+    authToken: string | undefined;
 };
 /**
  * Export Cloud Logic APIs

package/lib-esm/internals/InternalGraphQLAPI.js

@@ -37,18 +37,18 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
     };
     InternalGraphQLAPIClass.prototype._headerBasedAuth = function (authMode, additionalHeaders) {
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var config, _b, region, appSyncGraphqlEndpoint, apiKey, defaultAuthMode, authenticationType, headers, _c, session, token, e_1;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var config, _c, region, appSyncGraphqlEndpoint, apiKey, defaultAuthMode, authenticationType, headers, _d, session, token, e_1;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         config = Amplify.getConfig();
-                        _b = config.API.GraphQL, region = _b.region, appSyncGraphqlEndpoint = _b.endpoint, apiKey = _b.apiKey, defaultAuthMode = _b.defaultAuthMode;
+                        _c = ((_a = config.API) === null || _a === void 0 ? void 0 : _a.GraphQL) || {}, region = _c.region, appSyncGraphqlEndpoint = _c.endpoint, apiKey = _c.apiKey, defaultAuthMode = _c.defaultAuthMode;
                         authenticationType = authMode || defaultAuthMode || 'iam';
                         headers = {};
-                        _c = authenticationType;
-                        switch (_c) {
+                        _d = authenticationType;
+                        switch (_d) {
                             case 'apiKey': return [3 /*break*/, 1];
                             case 'iam': return [3 /*break*/, 2];
                             case 'oidc': return [3 /*break*/, 4];
@@ -67,17 +67,17 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         return [3 /*break*/, 11];
                     case 2: return [4 /*yield*/, fetchAuthSession()];
                     case 3:
-                        session = _d.sent();
+                        session = _e.sent();
                         if (session.credentials === undefined) {
                             throw new Error(GraphQLAuthError.NO_CREDENTIALS);
                         }
                         return [3 /*break*/, 11];
                     case 4:
-                        _d.trys.push([4, 6, , 7]);
+                        _e.trys.push([4, 6, , 7]);
                         token = void 0;
                         return [4 /*yield*/, fetchAuthSession()];
                     case 5:
-                        token = (_a = (_d.sent()).tokens) === null || _a === void 0 ? void 0 : _a.accessToken.toString();
+                        token = (_b = (_e.sent()).tokens) === null || _b === void 0 ? void 0 : _b.accessToken.toString();
                         if (!token) {
                             throw new Error(GraphQLAuthError.NO_FEDERATED_JWT);
                         }
@@ -86,7 +86,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         };
                         return [3 /*break*/, 7];
                     case 6:
-                        e_1 = _d.sent();
+                        e_1 = _e.sent();
                         throw new Error(GraphQLAuthError.NO_CURRENT_USER);
                     case 7: return [3 /*break*/, 11];
                     case 8:
@@ -153,45 +153,47 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
     InternalGraphQLAPIClass.prototype._graphql = function (_a, additionalHeaders, abortController, customUserAgentDetails) {
         var query = _a.query, variables = _a.variables, authMode = _a.authMode;
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
+        var _b;
         return __awaiter(this, void 0, void 0, function () {
-            var config, _b, region, appSyncGraphqlEndpoint, customGraphqlEndpoint, customEndpointRegion, headers, _c, _d, _e, _f, _g, body, endpoint, error, response, responseBody, result, err_1, errors;
-            var _h;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
+            var config, _c, region, appSyncGraphqlEndpoint, customGraphqlEndpoint, customEndpointRegion, headers, _d, _e, _f, _g, _h, body, endpoint, error, response, responseBody, result, err_1, errors;
+            var _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         config = Amplify.getConfig();
-                        _b = config.API.GraphQL, region = _b.region, appSyncGraphqlEndpoint = _b.endpoint;
+                        _c = ((_b = config.API) === null || _b === void 0 ? void 0 : _b.GraphQL) || {}, region = _c.region, appSyncGraphqlEndpoint = _c.endpoint;
                         customGraphqlEndpoint = null;
                         customEndpointRegion = null;
-                        _c = [{}];
-                        _d = !customGraphqlEndpoint;
-                        if (!_d) return [3 /*break*/, 2];
+                        _d = [{}];
+                        _e = !customGraphqlEndpoint;
+                        if (!_e) return [3 /*break*/, 2];
                         return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
                     case 1:
-                        _d = (_j.sent());
-                        _j.label = 2;
+                        _e = (_k.sent());
+                        _k.label = 2;
                     case 2:
-                        _e = [__assign.apply(void 0, _c.concat([(_d)]))];
-                        _f = customGraphqlEndpoint;
-                        if (!_f) return [3 /*break*/, 6];
+                        _f = [__assign.apply(void 0, _d.concat([(_e)]))];
+                        _g = customGraphqlEndpoint;
+                        if (!_g) return [3 /*break*/, 6];
                         if (!customEndpointRegion) return [3 /*break*/, 4];
                         return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
                     case 3:
-                        _g = _j.sent();
+                        _h = _k.sent();
                         return [3 /*break*/, 5];
                     case 4:
-                        _g = { Authorization: null };
-                        _j.label = 5;
+                        _h = { Authorization: null };
+                        _k.label = 5;
                     case 5:
-                        _f = (_g);
-                        _j.label = 6;
+                        _g = (_h);
+                        _k.label = 6;
                     case 6:
-                        headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_f)])), additionalHeaders]), (!customGraphqlEndpoint && (_h = {},
-                                _h[USER_AGENT_HEADER] = getAmplifyUserAgent(customUserAgentDetails),
-                                _h))]);
+                        headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _f.concat([((_g) ||
+                                        {})])), additionalHeaders]), (!customGraphqlEndpoint && (_j = {},
+                                _j[USER_AGENT_HEADER] = getAmplifyUserAgent(customUserAgentDetails),
+                                _j))]);
                         body = {
                             query: print(query),
-                            variables: variables,
+                            variables: variables || null,
                         };
                         endpoint = customGraphqlEndpoint || appSyncGraphqlEndpoint;
                         if (!endpoint) {
@@ -201,9 +203,9 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                                 errors: [error],
                             };
                         }
-                        _j.label = 7;
+                        _k.label = 7;
                     case 7:
-                        _j.trys.push([7, 10, , 11]);
+                        _k.trys.push([7, 10, , 11]);
                         return [4 /*yield*/, this._api.post({
                                 url: new URL(endpoint),
                                 options: {
@@ -217,14 +219,14 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                                 abortController: abortController,
                             })];
                     case 8:
-                        responseBody = (_j.sent()).body;
+                        responseBody = (_k.sent()).body;
                         return [4 /*yield*/, responseBody.json()];
                     case 9:
-                        result = _j.sent();
+                        result = _k.sent();
                         response = result;
                         return [3 /*break*/, 11];
                     case 10:
-                        err_1 = _j.sent();
+                        err_1 = _k.sent();
                         // If the exception is because user intentionally
                         // cancelled the request, do not modify the exception
                         // so that clients can identify the exception correctly.

package/lib-esm/tsconfig.tsbuildinfo

@@ -1318,12 +1318,12 @@
         "signature": "77d9972e4e2dd35f88e03335d8d0d9592a754693e4ea00d27f0ccc44f43c1c59"
       },
       "../src/types/PubSub.ts": {
-        "version": "70ac482472a54d226119a9a20fbb3f3baa04e9e305526ab90559626561206a64",
-        "signature": "ad2b3dd90d30fe70b81a40ed52c2f676547c6d6cfb740278e8798c15d780ddde"
+        "version": "14b4a96cd324440e30040d2a8d147af5f71ac1603546e16a9e0b56aa705aeb05",
+        "signature": "69998b609508e9a6a8acbba64b5e4cdbe313c53451b349fe049d56786c2afd14"
       },
       "../src/types/index.ts": {
-        "version": "8cc63a0a395a658e6307999a4dba9b82b466965c59d44226e21a76df8b9f727f",
-        "signature": "6a5e869b97f16df46e0aa1510c561ce541d1f8dc548144de8bac12048ea64856"
+        "version": "93ad3a1a8ee1d0a593f245ad2a9e4558de336823e21ecb3310584dec9ad26193",
+        "signature": "1ec49e2a63d9fe4506977191b899c08704ef20f62611498215f2235e6e8f5113"
       },
       "../../core/lib-esm/singleton/apis/fetchAuthSession.d.ts": {
         "version": "df1a1f23d18a3dac758a03f4f8f6a3d14e83fb78a45431d15e6833fb53ed8055",
@@ -1450,12 +1450,12 @@
         "signature": "b0afc2803af9e818fad28464e4e62ee1b255d282f8f19ba8a2459b7bab4d789e"
       },
       "../src/Providers/AWSAppSyncRealTimeProvider/index.ts": {
-        "version": "29954fb873eeb8da70ded5f56ee4d1c21818db5d9ca5d9f69c4a6a40abf51d85",
+        "version": "70307fdb8b8731ddf884d9974e4c6995a8882d434a9e89d0bcaf865a4e6f1fab",
         "signature": "1e99d3031c6655bc40f2a8d877d7a10a8747d29046f6e4b0e1dba3590cd2fdf8"
       },
       "../src/internals/InternalGraphQLAPI.ts": {
-        "version": "a612370b2c60bf029ee457af362c4885509d1194cde4f3c0704eac5a40bc293b",
-        "signature": "3247c9c68592c4a9f34556a8cfcc45aeed26ec3267bfd21a69adb449503e1ab9"
+        "version": "4b77a15f276dd6a438831595b4ebe9edd9da3f3ec60504a9dc6d727ba25179db",
+        "signature": "2935cf9761be3485380b77cbe856f428a1c342ca4377ad1dfa72af6eac46db2e"
       },
       "../src/internals/v6.ts": {
         "version": "2acd7dbd0aa7c028f597a68a21cce2b24e9ed4a254a650ed144a162a9653f476",
@@ -1467,7 +1467,7 @@
       },
       "../src/GraphQLAPI.ts": {
         "version": "e728905616fa216dfc13c3f044c4f349ff3a534c3849888b6614cf40e2cc899b",
-        "signature": "fd3d568c0c5301c0d8aea98d012ba4cee64535ebd582028a8131c438fc03d566"
+        "signature": "5db56760293eb5283bccc3ec49e63afe428213aad441147f90fe6e28f655f1a6"
       },
       "../src/index.ts": {
         "version": "98d8433766c112c8658d03649ac495f403979234c503594a7b7baf3b5f8e5a02",
@@ -1495,7 +1495,7 @@
       },
       "../src/utils/resolveCredentials.ts": {
         "version": "22c610d9879b27de3f79333284f54ce4f330b35e930837627cdfc0d276bf8a57",
-        "signature": "d56e9d5742bdb7916c1aee7a741bcc0ebd76efb1e9b0b8acacb597e7915e8f36"
+        "signature": "f848a594e5ecbebed6b9e7a2b62c57466dbf0faede2b27e3538a1c7fe2efb2e1"
       },
       "../src/utils/index.ts": {
         "version": "6601832367b2c1359b16db86700174171375fa7d1403c5558910962ce36fa70a",
@@ -1541,6 +1541,7 @@
         "node"
       ],
       "strict": false,
+      "strictNullChecks": true,
       "skipLibCheck": true,
       "module": 99,
       "outDir": "./",

package/lib-esm/types/PubSub.d.ts

@@ -23,5 +23,5 @@ export declare enum ConnectionState {
     Disconnected = "Disconnected",
     ConnectedPendingKeepAlive = "ConnectedPendingKeepAlive"
 }
-export declare type PubSubContent = Record<string, unknown> | string;
+export declare type PubSubContent = Record<string, unknown>;
 export declare type PubSubContentObserver = Observer<PubSubContent>;

package/lib-esm/types/index.d.ts

@@ -17,7 +17,7 @@ export interface GraphQLOptions {
     userAgentSuffix?: string;
 }
 export interface GraphQLResult<T = object> {
-    data?: T;
+    data: T;
     errors?: GraphQLError[];
     extensions?: {
         [key: string]: any;
@@ -30,6 +30,66 @@ export declare type GraphQLQuery<T> = T & {
 export declare type GraphQLSubscription<T> = T & {
     readonly [queryType]: 'subscription';
 };
+/**
+ * Accepts a code generated model type and returns a supertype that
+ * can accept return values from the relevant graphql operations.
+ *
+ * For example:
+ *
+ * ```typescript
+ * import { GraphQLReturnType } from 'aws-amplify/api';
+ * import { MyModel } from './API';
+ * import { getMyModel } from './graphql/queries';
+ *
+ * const [item, setItem] = useState<GraphQLReturnType<MyModel>>();
+ * setItem(await client.graphql({ query: getMyModel }).data.getMyModel!)
+ * ```
+ *
+ * Trying to assign the result of a `getMyModel` operation directly to a
+ * `MyModel` variables won't necessarily work, because normally-required related
+ * models might not be part of the selection set.
+ *
+ * This util simply makes related model properties optional recursively.
+ */
+export declare type GraphQLReturnType<T> = T extends {} ? {
+    [K in keyof T]?: GraphQLReturnType<T[K]>;
+} : T;
+/**
+ * Describes a paged list result from AppSync, which can either
+ * live at the top query or property (e.g., related model) level.
+ */
+declare type PagedList<T, TYPENAME> = {
+    __typename: TYPENAME;
+    nextToken?: string | null | undefined;
+    items: Array<T>;
+};
+/**
+ * Recursively looks through a result type and removes nulls and
+ * and undefined from `PagedList` types.
+ *
+ * Although a graphql response might contain empty values in an
+ * array, this will only be the case when we also have errors,
+ * which will then be *thrown*.
+ */
+declare type WithListsFixed<T> = T extends PagedList<infer IT, infer NAME> ? PagedList<Exclude<IT, null | undefined>, NAME> : T extends {} ? {
+    [K in keyof T]: WithListsFixed<T[K]>;
+} : T;
+/**
+ * Returns an updated response type to always return a value.
+ */
+declare type NeverEmpty<T> = {
+    [K in keyof T]-?: Exclude<WithListsFixed<T[K]>, undefined | null>;
+};
+/**
+ * Replaces all list result types in a query result with types to exclude
+ * nulls and undefined from list member unions.
+ *
+ * If empty members are present, there will also be errors present,
+ * and the response will instead be *thrown*.
+ */
+declare type FixedQueryResult<T> = Exclude<T[keyof T], null | undefined> extends PagedList<any, any> ? {
+    [K in keyof T]-?: WithListsFixed<Exclude<T[K], null | undefined>>;
+} : T;
 /**
  * The return value from a `graphql({query})` call when `query` is a subscription.
  *
@@ -68,7 +128,7 @@ export declare type GraphqlSubscriptionResult<T> = Observable<GraphqlSubscriptio
  * ```
  */
 export declare type GraphqlSubscriptionMessage<T> = {
-    data?: T;
+    data: T;
 };
 export interface AWSAppSyncRealTimeProviderOptions {
     appSyncGraphqlEndpoint?: string;
@@ -128,7 +188,7 @@ export declare type GraphQLVariablesV6<FALLBACK_TYPES = unknown, TYPED_GQL_STRIN
  * The expected return type with respect to the given `FALLBACK_TYPE`
  * and `TYPED_GQL_STRING`.
  */
-export declare type GraphQLResponseV6<FALLBACK_TYPE = unknown, TYPED_GQL_STRING extends string = string> = TYPED_GQL_STRING extends GeneratedQuery<infer IN, infer QUERY_OUT> ? Promise<GraphQLResult<QUERY_OUT>> : TYPED_GQL_STRING extends GeneratedMutation<infer IN, infer MUTATION_OUT> ? Promise<GraphQLResult<MUTATION_OUT>> : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT> ? GraphqlSubscriptionResult<SUB_OUT> : FALLBACK_TYPE extends GraphQLQuery<infer T> ? Promise<GraphQLResult<FALLBACK_TYPE>> : FALLBACK_TYPE extends GraphQLSubscription<infer T> ? GraphqlSubscriptionResult<FALLBACK_TYPE> : FALLBACK_TYPE extends GraphQLOperationType<infer IN, infer CUSTOM_OUT> ? CUSTOM_OUT : UnknownGraphQLResponse;
+export declare type GraphQLResponseV6<FALLBACK_TYPE = unknown, TYPED_GQL_STRING extends string = string> = TYPED_GQL_STRING extends GeneratedQuery<infer IN, infer QUERY_OUT> ? Promise<GraphQLResult<FixedQueryResult<QUERY_OUT>>> : TYPED_GQL_STRING extends GeneratedMutation<infer IN, infer MUTATION_OUT> ? Promise<GraphQLResult<NeverEmpty<MUTATION_OUT>>> : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT> ? GraphqlSubscriptionResult<NeverEmpty<SUB_OUT>> : FALLBACK_TYPE extends GraphQLQuery<infer T> ? Promise<GraphQLResult<FALLBACK_TYPE>> : FALLBACK_TYPE extends GraphQLSubscription<infer T> ? GraphqlSubscriptionResult<FALLBACK_TYPE> : FALLBACK_TYPE extends GraphQLOperationType<infer IN, infer CUSTOM_OUT> ? CUSTOM_OUT : UnknownGraphQLResponse;
 /**
  * The shape customers can use to provide `T` to `graphql<T>()` to specify both
  * `IN` and `OUT` types (the type of `variables` and the return type, respectively).

package/lib-esm/utils/resolveCredentials.d.ts

@@ -5,8 +5,8 @@ export declare const resolveCredentials: () => Promise<{
     credentials: {
         accessKeyId: string;
         secretAccessKey: string;
-        sessionToken?: string;
-        expiration?: Date;
+        sessionToken?: string | undefined;
+        expiration?: Date | undefined;
     };
-    identityId: string;
+    identityId: string | undefined;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-console-preview.4ae78ed.0+4ae78ed",
+	"version": "4.0.1-console-preview.8637b15.0+8637b15",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -47,9 +47,9 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.1-console-preview.4ae78ed.0+4ae78ed",
-		"@aws-amplify/auth": "6.0.1-console-preview.4ae78ed.0+4ae78ed",
-		"@aws-amplify/core": "6.0.1-console-preview.4ae78ed.0+4ae78ed",
+		"@aws-amplify/api-rest": "4.0.1-console-preview.8637b15.0+8637b15",
+		"@aws-amplify/auth": "6.0.1-console-preview.8637b15.0+8637b15",
+		"@aws-amplify/core": "6.0.1-console-preview.8637b15.0+8637b15",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -81,6 +81,7 @@
 					],
 					"allowJs": true,
 					"noEmitOnError": false,
+					"strictNullChecks": true,
 					"types": [
 						"@types/jest"
 					]
@@ -121,5 +122,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "4ae78ed23fc03ae718488c98fc48782d2bd6f5f3"
+	"gitHead": "8637b15b240e2ea176ac025bd6fc12e25a46118d"
 }

package/src/Providers/AWSAppSyncRealTimeProvider/index.ts

@@ -972,8 +972,9 @@ export class AWSAppSyncRealTimeProvider {
 				body: request.data,
 			},
 			{
-				credentials: creds,
-				signingRegion: endpointInfo.region,
+				// TODO: What do we need to do to remove these !'s?
+				credentials: creds!,
+				signingRegion: endpointInfo.region!,
 				signingService: endpointInfo.service,
 			}
 		);

package/src/internals/InternalGraphQLAPI.ts

@@ -80,7 +80,7 @@ export class InternalGraphQLAPIClass {
 			endpoint: appSyncGraphqlEndpoint,
 			apiKey,
 			defaultAuthMode,
-		} = config.API.GraphQL;
+		} = config.API?.GraphQL || {};
 
 		const authenticationType = authMode || defaultAuthMode || 'iam';
 		let headers = {};
@@ -215,18 +215,20 @@ export class InternalGraphQLAPIClass {
 		const config = Amplify.getConfig();
 
 		const { region: region, endpoint: appSyncGraphqlEndpoint } =
-			config.API.GraphQL;
+			config.API?.GraphQL || {};
 
 		const customGraphqlEndpoint = null;
 		const customEndpointRegion = null;
 
+		// TODO: Figure what we need to do to remove `!`'s.
 		const headers = {
 			...(!customGraphqlEndpoint &&
-				(await this._headerBasedAuth(authMode, additionalHeaders))),
-			...(customGraphqlEndpoint &&
+				(await this._headerBasedAuth(authMode!, additionalHeaders))),
+			...((customGraphqlEndpoint &&
 				(customEndpointRegion
-					? await this._headerBasedAuth(authMode, additionalHeaders)
-					: { Authorization: null })),
+					? await this._headerBasedAuth(authMode!, additionalHeaders)
+					: { Authorization: null })) ||
+				{}),
 			...additionalHeaders,
 			...(!customGraphqlEndpoint && {
 				[USER_AGENT_HEADER]: getAmplifyUserAgent(customUserAgentDetails),
@@ -235,7 +237,7 @@ export class InternalGraphQLAPIClass {
 
 		const body = {
 			query: print(query as DocumentNode),
-			variables,
+			variables: variables || null,
 		};
 
 		const endpoint = customGraphqlEndpoint || appSyncGraphqlEndpoint;

package/src/types/PubSub.ts

@@ -52,5 +52,5 @@ export enum ConnectionState {
 	ConnectedPendingKeepAlive = 'ConnectedPendingKeepAlive',
 }
 
-export type PubSubContent = Record<string, unknown> | string;
+export type PubSubContent = Record<string, unknown>;
 export type PubSubContentObserver = Observer<PubSubContent>;

package/src/types/index.ts

@@ -21,7 +21,7 @@ export interface GraphQLOptions {
 }
 
 export interface GraphQLResult<T = object> {
-	data?: T;
+	data: T;
 	errors?: GraphQLError[];
 	extensions?: {
 		[key: string]: any;
@@ -36,6 +36,82 @@ export type GraphQLSubscription<T> = T & {
 	readonly [queryType]: 'subscription';
 };
 
+/**
+ * Accepts a code generated model type and returns a supertype that
+ * can accept return values from the relevant graphql operations.
+ *
+ * For example:
+ *
+ * ```typescript
+ * import { GraphQLReturnType } from 'aws-amplify/api';
+ * import { MyModel } from './API';
+ * import { getMyModel } from './graphql/queries';
+ *
+ * const [item, setItem] = useState<GraphQLReturnType<MyModel>>();
+ * setItem(await client.graphql({ query: getMyModel }).data.getMyModel!)
+ * ```
+ *
+ * Trying to assign the result of a `getMyModel` operation directly to a
+ * `MyModel` variables won't necessarily work, because normally-required related
+ * models might not be part of the selection set.
+ *
+ * This util simply makes related model properties optional recursively.
+ */
+export type GraphQLReturnType<T> = T extends {}
+	? {
+			[K in keyof T]?: GraphQLReturnType<T[K]>;
+	  }
+	: T;
+
+/**
+ * Describes a paged list result from AppSync, which can either
+ * live at the top query or property (e.g., related model) level.
+ */
+type PagedList<T, TYPENAME> = {
+	__typename: TYPENAME;
+	nextToken?: string | null | undefined;
+	items: Array<T>;
+};
+
+/**
+ * Recursively looks through a result type and removes nulls and
+ * and undefined from `PagedList` types.
+ *
+ * Although a graphql response might contain empty values in an
+ * array, this will only be the case when we also have errors,
+ * which will then be *thrown*.
+ */
+type WithListsFixed<T> = T extends PagedList<infer IT, infer NAME>
+	? PagedList<Exclude<IT, null | undefined>, NAME>
+	: T extends {}
+	? {
+			[K in keyof T]: WithListsFixed<T[K]>;
+	  }
+	: T;
+
+/**
+ * Returns an updated response type to always return a value.
+ */
+type NeverEmpty<T> = {
+	[K in keyof T]-?: Exclude<WithListsFixed<T[K]>, undefined | null>;
+};
+
+/**
+ * Replaces all list result types in a query result with types to exclude
+ * nulls and undefined from list member unions.
+ *
+ * If empty members are present, there will also be errors present,
+ * and the response will instead be *thrown*.
+ */
+type FixedQueryResult<T> = Exclude<
+	T[keyof T],
+	null | undefined
+> extends PagedList<any, any>
+	? {
+			[K in keyof T]-?: WithListsFixed<Exclude<T[K], null | undefined>>;
+	  }
+	: T;
+
 /**
  * The return value from a `graphql({query})` call when `query` is a subscription.
  *
@@ -77,7 +153,7 @@ export type GraphqlSubscriptionResult<T> = Observable<
  * ```
  */
 export type GraphqlSubscriptionMessage<T> = {
-	data?: T;
+	data: T;
 };
 
 export interface AWSAppSyncRealTimeProviderOptions {
@@ -165,11 +241,11 @@ export type GraphQLResponseV6<
 	FALLBACK_TYPE = unknown,
 	TYPED_GQL_STRING extends string = string
 > = TYPED_GQL_STRING extends GeneratedQuery<infer IN, infer QUERY_OUT>
-	? Promise<GraphQLResult<QUERY_OUT>>
+	? Promise<GraphQLResult<FixedQueryResult<QUERY_OUT>>>
 	: TYPED_GQL_STRING extends GeneratedMutation<infer IN, infer MUTATION_OUT>
-	? Promise<GraphQLResult<MUTATION_OUT>>
+	? Promise<GraphQLResult<NeverEmpty<MUTATION_OUT>>>
 	: TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT>
-	? GraphqlSubscriptionResult<SUB_OUT>
+	? GraphqlSubscriptionResult<NeverEmpty<SUB_OUT>>
 	: FALLBACK_TYPE extends GraphQLQuery<infer T>
 	? Promise<GraphQLResult<FALLBACK_TYPE>>
 	: FALLBACK_TYPE extends GraphQLSubscription<infer T>