@aws-amplify/api-graphql 4.0.1-console-preview.d745d43.0 → 4.0.1-ssr-api.df60e41.0

package/lib-esm/utils/ReconnectionMonitor.js

@@ -10,31 +10,30 @@ export var ReconnectEvent;
  *   Attempting to reconnect only once creates unrecoverable states when the network state isn't
  *   supported by the browser, so this keeps retrying every minute until halted.
  */
-var ReconnectionMonitor = /** @class */ (function () {
-    function ReconnectionMonitor() {
+export class ReconnectionMonitor {
+    constructor() {
         this.reconnectObservers = [];
     }
     /**
      * Add reconnect observer to the list of observers to alert on reconnect
      */
-    ReconnectionMonitor.prototype.addObserver = function (reconnectObserver) {
+    addObserver(reconnectObserver) {
         this.reconnectObservers.push(reconnectObserver);
-    };
+    }
     /**
      * Given a reconnect event, start the appropriate behavior
      */
-    ReconnectionMonitor.prototype.record = function (event) {
-        var _this = this;
+    record(event) {
         if (event === ReconnectEvent.START_RECONNECT) {
             // If the reconnection hasn't been started
             if (this.reconnectSetTimeoutId === undefined &&
                 this.reconnectIntervalId === undefined) {
-                this.reconnectSetTimeoutId = setTimeout(function () {
+                this.reconnectSetTimeoutId = setTimeout(() => {
                     // Reconnect now
-                    _this._triggerReconnect();
+                    this._triggerReconnect();
                     // Retry reconnect every periodically until it works
-                    _this.reconnectIntervalId = setInterval(function () {
-                        _this._triggerReconnect();
+                    this.reconnectIntervalId = setInterval(() => {
+                        this._triggerReconnect();
                     }, RECONNECT_INTERVAL);
                 }, RECONNECT_DELAY);
             }
@@ -49,22 +48,18 @@ var ReconnectionMonitor = /** @class */ (function () {
                 this.reconnectSetTimeoutId = undefined;
             }
         }
-    };
+    }
     /**
      * Complete all reconnect observers
      */
-    ReconnectionMonitor.prototype.close = function () {
-        this.reconnectObservers.forEach(function (reconnectObserver) {
-            var _a;
-            (_a = reconnectObserver.complete) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    close() {
+        this.reconnectObservers.forEach(reconnectObserver => {
+            reconnectObserver.complete?.();
         });
-    };
-    ReconnectionMonitor.prototype._triggerReconnect = function () {
-        this.reconnectObservers.forEach(function (reconnectObserver) {
-            var _a;
-            (_a = reconnectObserver.next) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    }
+    _triggerReconnect() {
+        this.reconnectObservers.forEach(reconnectObserver => {
+            reconnectObserver.next?.();
         });
-    };
-    return ReconnectionMonitor;
-}());
-export { ReconnectionMonitor };
+    }
+}

package/lib-esm/utils/errors/APIError.js

@@ -1,20 +1,15 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { __extends } from "tslib";
 import { AmplifyError, } from '@aws-amplify/core/internals/utils';
 /**
  * @internal
  */
-var APIError = /** @class */ (function (_super) {
-    __extends(APIError, _super);
-    function APIError(params) {
-        var _this = _super.call(this, params) || this;
+export class APIError extends AmplifyError {
+    constructor(params) {
+        super(params);
         // Hack for making the custom error class work when transpiled to es5
         // TODO: Delete the following 2 lines after we change the build target to >= es2015
-        _this.constructor = APIError;
-        Object.setPrototypeOf(_this, APIError.prototype);
-        return _this;
+        this.constructor = APIError;
+        Object.setPrototypeOf(this, APIError.prototype);
     }
-    return APIError;
-}(AmplifyError));
-export { APIError };
+}

package/lib-esm/utils/errors/assertValidationError.js

@@ -6,8 +6,8 @@ import { validationErrorMap } from './validation';
  * @internal
  */
 export function assertValidationError(assertion, name) {
-    var _a = validationErrorMap[name], message = _a.message, recoverySuggestion = _a.recoverySuggestion;
+    const { message, recoverySuggestion } = validationErrorMap[name];
     if (!assertion) {
-        throw new APIError({ name: name, message: message, recoverySuggestion: recoverySuggestion });
+        throw new APIError({ name, message, recoverySuggestion });
     }
 }

package/lib-esm/utils/errors/validation.js

@@ -1,24 +1,23 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var _a;
 export var APIValidationErrorCode;
 (function (APIValidationErrorCode) {
     APIValidationErrorCode["NoAuthSession"] = "NoAuthSession";
     APIValidationErrorCode["NoRegion"] = "NoRegion";
     APIValidationErrorCode["NoCustomEndpoint"] = "NoCustomEndpoint";
 })(APIValidationErrorCode || (APIValidationErrorCode = {}));
-export var validationErrorMap = (_a = {},
-    _a[APIValidationErrorCode.NoAuthSession] = {
+export const validationErrorMap = {
+    [APIValidationErrorCode.NoAuthSession]: {
         message: 'Auth session should not be empty.',
     },
     // TODO: re-enable when working in all test environments:
     // [APIValidationErrorCode.NoEndpoint]: {
     // 	message: 'Missing endpoint',
     // },
-    _a[APIValidationErrorCode.NoRegion] = {
+    [APIValidationErrorCode.NoRegion]: {
         message: 'Missing region.',
     },
-    _a[APIValidationErrorCode.NoCustomEndpoint] = {
+    [APIValidationErrorCode.NoCustomEndpoint]: {
         message: 'Custom endpoint region is present without custom endpoint.',
     },
-    _a);
+};

package/lib-esm/utils/resolveConfig.js

@@ -4,18 +4,17 @@ import { APIValidationErrorCode, assertValidationError } from './errors';
 /**
  * @internal
  */
-export var resolveConfig = function (amplify) {
-    var _a, _b;
-    var _c = (_b = (_a = amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.GraphQL) !== null && _b !== void 0 ? _b : {}, apiKey = _c.apiKey, customEndpoint = _c.customEndpoint, customEndpointRegion = _c.customEndpointRegion, defaultAuthMode = _c.defaultAuthMode, endpoint = _c.endpoint, region = _c.region;
+export const resolveConfig = (amplify) => {
+    const { apiKey, customEndpoint, customEndpointRegion, defaultAuthMode, endpoint, region, } = amplify.getConfig().API?.GraphQL ?? {};
     // TODO: re-enable when working in all test environments:
     // assertValidationError(!!endpoint, APIValidationErrorCode.NoEndpoint);
     assertValidationError(!(!customEndpoint && customEndpointRegion), APIValidationErrorCode.NoCustomEndpoint);
     return {
-        apiKey: apiKey,
-        customEndpoint: customEndpoint,
-        customEndpointRegion: customEndpointRegion,
-        defaultAuthMode: defaultAuthMode,
-        endpoint: endpoint,
-        region: region,
+        apiKey,
+        customEndpoint,
+        customEndpointRegion,
+        defaultAuthMode,
+        endpoint,
+        region,
     };
 };

package/lib-esm/utils/resolveLibraryOptions.js

@@ -3,9 +3,8 @@
 /**
  * @internal
  */
-export var resolveLibraryOptions = function (amplify) {
-    var _a, _b, _c, _d, _e, _f;
-    var headers = (_c = (_b = (_a = amplify.libraryOptions) === null || _a === void 0 ? void 0 : _a.API) === null || _b === void 0 ? void 0 : _b.GraphQL) === null || _c === void 0 ? void 0 : _c.headers;
-    var withCredentials = (_f = (_e = (_d = amplify.libraryOptions) === null || _d === void 0 ? void 0 : _d.API) === null || _e === void 0 ? void 0 : _e.GraphQL) === null || _f === void 0 ? void 0 : _f.withCredentials;
-    return { headers: headers, withCredentials: withCredentials };
+export const resolveLibraryOptions = (amplify) => {
+    const headers = amplify.libraryOptions?.API?.GraphQL?.headers;
+    const withCredentials = amplify.libraryOptions?.API?.GraphQL?.withCredentials;
+    return { headers, withCredentials };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-console-preview.d745d43.0+d745d43",
+	"version": "4.0.1-ssr-api.df60e41.0+df60e41",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -47,13 +47,13 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.1-console-preview.d745d43.0+d745d43",
-		"@aws-amplify/auth": "6.0.1-console-preview.d745d43.0+d745d43",
-		"@aws-amplify/core": "6.0.1-console-preview.d745d43.0+d745d43",
+		"@aws-amplify/api-rest": "4.0.1-ssr-api.df60e41.0+df60e41",
+		"@aws-amplify/auth": "6.0.1-ssr-api.df60e41.0+df60e41",
+		"@aws-amplify/core": "6.0.1-ssr-api.df60e41.0+df60e41",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
-		"tslib": "^1.8.0"
+		"tslib": "^2.5.0"
 	},
 	"size-limit": [
 		{
@@ -120,5 +120,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "d745d43595a690928a86070deff39f3eed526437"
+	"gitHead": "df60e41fbc70bd6277162b7780b3fc030c93c6a0"
 }

package/src/GraphQLAPI.ts

@@ -32,13 +32,14 @@ export class GraphQLAPIClass extends InternalGraphQLAPIClass {
 	 * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
 	 */
 	graphql<T = any>(
-		amplify: AmplifyClassV6,
+		amplify: AmplifyClassV6 | (() => Promise<AmplifyClassV6>),
+		// amplify: AmplifyClassV6 | (() => Promise<AmplifyClassV6>),
 		options: GraphQLOptions,
 		additionalHeaders?: { [key: string]: string }
 	): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>> {
 		return super.graphql(amplify, options, additionalHeaders, {
 			category: Category.API,
-			action: ApiAction.GraphQl
+			action: ApiAction.GraphQl,
 		});
 	}
 

package/src/internals/InternalGraphQLAPI.ts

@@ -45,6 +45,10 @@ export const graphqlOperation = (
 	authToken,
 });
 
+const isAmplifyInstance = (amplify): amplify is AmplifyClassV6 => {
+	return typeof amplify !== 'function';
+};
+
 /**
  * Export Cloud Logic APIs
  */
@@ -163,7 +167,9 @@ export class InternalGraphQLAPIClass {
 	 * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
 	 */
 	graphql<T = any>(
-		amplify: AmplifyClassV6,
+		amplify:
+			| AmplifyClassV6
+			| ((fn: (amplify: any) => Promise<any>) => Promise<AmplifyClassV6>),
 		{ query: paramQuery, variables = {}, authMode, authToken }: GraphQLOptions,
 		additionalHeaders?: { [key: string]: string },
 		customUserAgentDetails?: CustomUserAgentDetails
@@ -190,13 +196,32 @@ export class InternalGraphQLAPIClass {
 			case 'query':
 			case 'mutation':
 				const abortController = new AbortController();
-				const responsePromise = this._graphql<T>(
-					amplify,
-					{ query, variables, authMode },
-					headers,
-					abortController,
-					customUserAgentDetails
-				);
+
+				let responsePromise: Promise<GraphQLResult<T>>;
+
+				if (isAmplifyInstance(amplify)) {
+					responsePromise = this._graphql<T>(
+						amplify,
+						{ query, variables, authMode },
+						headers,
+						abortController,
+						customUserAgentDetails
+					);
+				} else {
+					const wrapper = amplifyInstance =>
+						this._graphql<T>(
+							amplifyInstance,
+							{ query, variables, authMode },
+							headers,
+							abortController,
+							customUserAgentDetails
+						);
+
+					responsePromise = amplify(wrapper) as unknown as Promise<
+						GraphQLResult<T>
+					>;
+				}
+
 				this._api.updateRequestToBeCancellable(
 					responsePromise,
 					abortController
@@ -204,7 +229,7 @@ export class InternalGraphQLAPIClass {
 				return responsePromise;
 			case 'subscription':
 				return this._graphqlSubscribe(
-					amplify,
+					amplify as AmplifyClassV6,
 					{ query, variables, authMode },
 					headers,
 					customUserAgentDetails
@@ -375,7 +400,7 @@ export class InternalGraphQLAPIClass {
 				variables,
 				appSyncGraphqlEndpoint: config?.endpoint,
 				region: config?.region,
-				authenticationType: config?.defaultAuthMode,
+				authenticationType: authMode ?? config?.defaultAuthMode,
 				apiKey: config?.apiKey,
 				additionalHeaders,
 			},

package/src/types/index.ts

@@ -9,6 +9,7 @@ import {
 	GraphQLAuthMode,
 	DocumentType,
 } from '@aws-amplify/core/internals/utils';
+import { AmplifyServer } from '@aws-amplify/core/internals/adapter-core';
 export { CONTROL_MSG, ConnectionState } from './PubSub';
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
@@ -353,16 +354,45 @@ type ExcludeNeverFields<O> = {
 
 export const __amplify = Symbol('amplify');
 
+/**
+ * TODO: Refactor these 2. Pull out `graphQL` into its own type
+ */
 export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
 	[__amplify]: AmplifyClassV6;
-	graphql: <FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string>(
-		options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,
-		additionalHeaders?:
-			| {
-					[key: string]: string;
-			  }
-			| undefined
-	) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
+	graphql: GraphQLMethod;
 	cancel: (promise: Promise<any>, message?: string) => boolean;
 	isCancelError: (error: any) => boolean;
 }>;
+
+export type V6ClientSSR<T extends Record<any, any> = never> =
+	ExcludeNeverFields<{
+		[__amplify]: AmplifyClassV6;
+		graphql: GraphQLMethodSSR;
+		cancel: (promise: Promise<any>, message?: string) => boolean;
+		isCancelError: (error: any) => boolean;
+	}>;
+
+export type GraphQLMethod = <
+	FALLBACK_TYPES = unknown,
+	TYPED_GQL_STRING extends string = string
+>(
+	options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,
+	additionalHeaders?:
+		| {
+				[key: string]: string;
+		  }
+		| undefined
+) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
+
+export type GraphQLMethodSSR = <
+	FALLBACK_TYPES = unknown,
+	TYPED_GQL_STRING extends string = string
+>(
+	contextSpec: AmplifyServer.ContextSpec,
+	options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,
+	additionalHeaders?:
+		| {
+				[key: string]: string;
+		  }
+		| undefined
+) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;