@aws-amplify/api-graphql 4.0.1-console-preview.d745d43.0 → 4.0.1-mjs-test.6f5dab7.0

package/dist/esm/utils/errors/APIError.mjs

@@ -0,0 +1,19 @@
+import { AmplifyError } from '@aws-amplify/core/internals/utils';
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * @internal
+ */
+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);
+    }
+}
+
+export { APIError };
+//# sourceMappingURL=APIError.mjs.map

package/dist/esm/utils/errors/APIError.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"APIError.mjs","sources":["../../../../src/utils/errors/APIError.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { AmplifyError, } from '@aws-amplify/core/internals/utils';\n/**\n * @internal\n */\nexport class APIError extends AmplifyError {\n    constructor(params) {\n        super(params);\n        // Hack for making the custom error class work when transpiled to es5\n        // TODO: Delete the following 2 lines after we change the build target to >= es2015\n        this.constructor = APIError;\n        Object.setPrototypeOf(this, APIError.prototype);\n    }\n}\n"],"names":[],"mappings":";;AAAA;AACA;AAEA;AACA;AACA;AACO,MAAM,QAAQ,SAAS,YAAY,CAAC;AAC3C,IAAI,WAAW,CAAC,MAAM,EAAE;AACxB,QAAQ,KAAK,CAAC,MAAM,CAAC,CAAC;AACtB;AACA;AACA,QAAQ,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;AACpC,QAAQ,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;AACxD,KAAK;AACL;;;;"}

package/dist/esm/utils/errors/assertValidationError.mjs

@@ -0,0 +1,17 @@
+import { APIError } from './APIError.mjs';
+import { validationErrorMap } from './validation.mjs';
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * @internal
+ */
+function assertValidationError(assertion, name) {
+    const { message, recoverySuggestion } = validationErrorMap[name];
+    if (!assertion) {
+        throw new APIError({ name, message, recoverySuggestion });
+    }
+}
+
+export { assertValidationError };
+//# sourceMappingURL=assertValidationError.mjs.map

package/dist/esm/utils/errors/assertValidationError.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"assertValidationError.mjs","sources":["../../../../src/utils/errors/assertValidationError.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { APIError } from './APIError';\nimport { validationErrorMap } from './validation';\n/**\n * @internal\n */\nexport function assertValidationError(assertion, name) {\n    const { message, recoverySuggestion } = validationErrorMap[name];\n    if (!assertion) {\n        throw new APIError({ name, message, recoverySuggestion });\n    }\n}\n"],"names":[],"mappings":";;;AAAA;AACA;AAGA;AACA;AACA;AACO,SAAS,qBAAqB,CAAC,SAAS,EAAE,IAAI,EAAE;AACvD,IAAI,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;AACrE,IAAI,IAAI,CAAC,SAAS,EAAE;AACpB,QAAQ,MAAM,IAAI,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC;AAClE,KAAK;AACL;;;;"}

package/dist/esm/utils/errors/index.mjs

@@ -0,0 +1,4 @@
+export { APIError } from './APIError.mjs';
+export { assertValidationError } from './assertValidationError.mjs';
+export { APIValidationErrorCode, validationErrorMap } from './validation.mjs';
+//# sourceMappingURL=index.mjs.map

package/dist/esm/utils/errors/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;"}

package/{lib-esm/utils/errors/validation.js → dist/esm/utils/errors/validation.mjs}

@@ -1,24 +1,26 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var _a;
-export var APIValidationErrorCode;
+var APIValidationErrorCode;
 (function (APIValidationErrorCode) {
     APIValidationErrorCode["NoAuthSession"] = "NoAuthSession";
     APIValidationErrorCode["NoRegion"] = "NoRegion";
     APIValidationErrorCode["NoCustomEndpoint"] = "NoCustomEndpoint";
 })(APIValidationErrorCode || (APIValidationErrorCode = {}));
-export var validationErrorMap = (_a = {},
-    _a[APIValidationErrorCode.NoAuthSession] = {
+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);
+};
+
+export { APIValidationErrorCode, validationErrorMap };
+//# sourceMappingURL=validation.mjs.map

package/dist/esm/utils/errors/validation.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"validation.mjs","sources":["../../../../src/utils/errors/validation.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nexport var APIValidationErrorCode;\n(function (APIValidationErrorCode) {\n    APIValidationErrorCode[\"NoAuthSession\"] = \"NoAuthSession\";\n    APIValidationErrorCode[\"NoRegion\"] = \"NoRegion\";\n    APIValidationErrorCode[\"NoCustomEndpoint\"] = \"NoCustomEndpoint\";\n})(APIValidationErrorCode || (APIValidationErrorCode = {}));\nexport const validationErrorMap = {\n    [APIValidationErrorCode.NoAuthSession]: {\n        message: 'Auth session should not be empty.',\n    },\n    // TODO: re-enable when working in all test environments:\n    // [APIValidationErrorCode.NoEndpoint]: {\n    // \tmessage: 'Missing endpoint',\n    // },\n    [APIValidationErrorCode.NoRegion]: {\n        message: 'Missing region.',\n    },\n    [APIValidationErrorCode.NoCustomEndpoint]: {\n        message: 'Custom endpoint region is present without custom endpoint.',\n    },\n};\n"],"names":[],"mappings":"AAAA;AACA;AACU,IAAC,uBAAuB;AAClC,CAAC,UAAU,sBAAsB,EAAE;AACnC,IAAI,sBAAsB,CAAC,eAAe,CAAC,GAAG,eAAe,CAAC;AAC9D,IAAI,sBAAsB,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC;AACpD,IAAI,sBAAsB,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAAC;AACpE,CAAC,EAAE,sBAAsB,KAAK,sBAAsB,GAAG,EAAE,CAAC,CAAC,CAAC;AAChD,MAAC,kBAAkB,GAAG;AAClC,IAAI,CAAC,sBAAsB,CAAC,aAAa,GAAG;AAC5C,QAAQ,OAAO,EAAE,mCAAmC;AACpD,KAAK;AACL;AACA;AACA;AACA;AACA,IAAI,CAAC,sBAAsB,CAAC,QAAQ,GAAG;AACvC,QAAQ,OAAO,EAAE,iBAAiB;AAClC,KAAK;AACL,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,GAAG;AAC/C,QAAQ,OAAO,EAAE,4DAA4D;AAC7E,KAAK;AACL;;;;"}

package/dist/esm/utils/index.mjs

@@ -0,0 +1,3 @@
+export { resolveConfig } from './resolveConfig.mjs';
+export { resolveLibraryOptions } from './resolveLibraryOptions.mjs';
+//# sourceMappingURL=index.mjs.map

package/dist/esm/utils/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/{lib → dist/esm}/utils/resolveConfig.d.ts

@@ -6,7 +6,7 @@ export declare const resolveConfig: (amplify: AmplifyClassV6) => {
     apiKey: string | undefined;
     customEndpoint: string | undefined;
     customEndpointRegion: string | undefined;
-    defaultAuthMode: "apiKey" | "oidc" | "userPool" | "iam" | "lambda" | "none" | undefined;
+    defaultAuthMode: import("@aws-amplify/core/internals/utils").GraphQLAuthMode | undefined;
     endpoint: string | undefined;
     region: string | undefined;
 };

package/dist/esm/utils/resolveConfig.mjs

@@ -0,0 +1,26 @@
+import '@aws-amplify/core/internals/utils';
+import { assertValidationError } from './errors/assertValidationError.mjs';
+import { APIValidationErrorCode } from './errors/validation.mjs';
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * @internal
+ */
+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,
+        customEndpoint,
+        customEndpointRegion,
+        defaultAuthMode,
+        endpoint,
+        region,
+    };
+};
+
+export { resolveConfig };
+//# sourceMappingURL=resolveConfig.mjs.map

package/dist/esm/utils/resolveConfig.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveConfig.mjs","sources":["../../../src/utils/resolveConfig.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { APIValidationErrorCode, assertValidationError } from './errors';\n/**\n * @internal\n */\nexport const resolveConfig = (amplify) => {\n    const { apiKey, customEndpoint, customEndpointRegion, defaultAuthMode, endpoint, region, } = amplify.getConfig().API?.GraphQL ?? {};\n    // TODO: re-enable when working in all test environments:\n    // assertValidationError(!!endpoint, APIValidationErrorCode.NoEndpoint);\n    assertValidationError(!(!customEndpoint && customEndpointRegion), APIValidationErrorCode.NoCustomEndpoint);\n    return {\n        apiKey,\n        customEndpoint,\n        customEndpointRegion,\n        defaultAuthMode,\n        endpoint,\n        region,\n    };\n};\n"],"names":[],"mappings":";;;;AAAA;AACA;AAEA;AACA;AACA;AACY,MAAC,aAAa,GAAG,CAAC,OAAO,KAAK;AAC1C,IAAI,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,IAAI,EAAE,CAAC;AACxI;AACA;AACA,IAAI,qBAAqB,CAAC,EAAE,CAAC,cAAc,IAAI,oBAAoB,CAAC,EAAE,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;AAC/G,IAAI,OAAO;AACX,QAAQ,MAAM;AACd,QAAQ,cAAc;AACtB,QAAQ,oBAAoB;AAC5B,QAAQ,eAAe;AACvB,QAAQ,QAAQ;AAChB,QAAQ,MAAM;AACd,KAAK,CAAC;AACN;;;;"}

package/{lib-esm → dist/esm}/utils/resolveLibraryOptions.d.ts

@@ -5,7 +5,7 @@ import { AmplifyClassV6 } from '@aws-amplify/core';
 export declare const resolveLibraryOptions: (amplify: AmplifyClassV6) => {
     headers: ((options: {
         query: string;
-        variables?: Record<string, import("@aws-amplify/core/lib-esm/libraryUtils").DocumentType> | undefined;
-    }) => Promise<Record<string, string>>) | undefined;
+        variables?: Record<string, import("@aws-amplify/core/internals/utils").DocumentType> | undefined;
+    }) => Promise<import("@aws-amplify/core/internals/aws-client-utils").Headers>) | undefined;
     withCredentials: boolean | undefined;
 };

package/dist/esm/utils/resolveLibraryOptions.mjs

@@ -0,0 +1,13 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * @internal
+ */
+const resolveLibraryOptions = (amplify) => {
+    const headers = amplify.libraryOptions?.API?.GraphQL?.headers;
+    const withCredentials = amplify.libraryOptions?.API?.GraphQL?.withCredentials;
+    return { headers, withCredentials };
+};
+
+export { resolveLibraryOptions };
+//# sourceMappingURL=resolveLibraryOptions.mjs.map

package/dist/esm/utils/resolveLibraryOptions.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveLibraryOptions.mjs","sources":["../../../src/utils/resolveLibraryOptions.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\n/**\n * @internal\n */\nexport const resolveLibraryOptions = (amplify) => {\n    const headers = amplify.libraryOptions?.API?.GraphQL?.headers;\n    const withCredentials = amplify.libraryOptions?.API?.GraphQL?.withCredentials;\n    return { headers, withCredentials };\n};\n"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACY,MAAC,qBAAqB,GAAG,CAAC,OAAO,KAAK;AAClD,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC;AAClE,IAAI,MAAM,eAAe,GAAG,OAAO,CAAC,cAAc,EAAE,GAAG,EAAE,OAAO,EAAE,eAAe,CAAC;AAClF,IAAI,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;AACxC;;;;"}

package/internals/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@aws-amplify/api-graphql/internals",
-	"types": "../lib-esm/internals/index.d.ts",
-	"main": "../lib/internals/index.js",
-	"module": "../lib-esm/internals/index.js",
-	"react-native": "../lib-esm/internals/index.js",
+	"types": "../dist/esm/internals/index.d.ts",
+	"main": "../dist/cjs/internals/index.js",
+	"module": "../dist/esm/internals/index.mjs",
+	"react-native": "../src/internals/index.ts",
 	"sideEffects": false
 }

package/package.json

@@ -1,16 +1,14 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-console-preview.d745d43.0+d745d43",
+	"version": "4.0.1-mjs-test.6f5dab7.0+6f5dab7",
 	"description": "Api-graphql category of aws-amplify",
-	"main": "./lib/index.js",
-	"module": "./lib-esm/index.js",
-	"typings": "./lib-esm/index.d.ts",
-	"react-native": {
-		"./lib/index": "./lib-esm/index.js"
-	},
+	"main": "./dist/cjs/index.js",
+	"module": "./dist/esm/index.mjs",
+	"typings": "./dist/esm/index.d.ts",
+	"react-native": "./src/index.ts",
 	"sideEffects": [
-		"./lib/GraphQLAPI.js",
-		"./lib-esm/GraphQLAPI.js"
+		"./dist/cjs/GraphQLAPI.js",
+		"./dist/esm/GraphQLAPI.mjs"
 	],
 	"publishConfig": {
 		"access": "public"
@@ -18,18 +16,40 @@
 	"scripts": {
 		"test": "npm run lint && jest -w 1 --coverage",
 		"test:watch": "tslint 'src/**/*.ts' && jest -w 1 --watch",
-		"build-with-test": "npm run clean && npm test && tsc && webpack",
-		"build:cjs": "rimraf lib && tsc -m commonjs --outDir lib && webpack && webpack --config ./webpack.config.dev.js",
-		"build:esm": "rimraf lib-esm && tsc -m esnext --outDir lib-esm",
-		"build:cjs:watch": "rimraf lib && tsc -m commonjs --outDir lib --watch",
-		"build:esm:watch": "rimraf lib-esm && tsc -m esnext --outDir lib-esm --watch",
-		"build": "npm run clean && npm run build:esm && npm run build:cjs",
-		"clean": "npm run clean:size && rimraf lib-esm lib dist",
+		"build-with-test": "npm test && npm build",
+		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
+		"build:esm-cjs": "rollup -c rollup.config.mjs",
+		"build:cjs:watch": "rimraf dist/cjs && tsc -m commonjs --outDir dist/cjs --watch",
+		"build:esm:watch": "rimraf dist/esm && tsc -m esnext --outDir dist/esm --watch",
+		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
+		"clean": "npm run clean:size && rimraf dist lib lib-esm",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.json -t 70.0"
 	},
+	"exports": {
+		".": {
+			"types": "./dist/esm/index.d.ts",
+			"import": "./dist/esm/index.mjs",
+			"require": "./dist/cjs/index.js",
+			"react-native": "./src/index.ts"
+		},
+		"./internals": {
+			"types": "./dist/esm/internals/index.d.ts",
+			"import": "./dist/esm/internals/index.mjs",
+			"require": "./dist/cjs/internals/index.js",
+			"react-native": "./src/internals/index.ts"
+		},
+		"./package.json": "./package.json"
+	},
+	"typesVersions": {
+		">=4.2": {
+			"internals": [
+				"./dist/esm/internals/index.d.ts"
+			]
+		}
+	},
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/aws-amplify/amplify-js.git"
@@ -40,25 +60,29 @@
 		"url": "https://github.com/aws/aws-amplify/issues"
 	},
 	"homepage": "https://aws-amplify.github.io/",
+	"devDependencies": {
+		"@rollup/plugin-typescript": "11.1.5",
+		"rollup": "3.29.4"
+	},
 	"files": [
-		"lib",
-		"lib-esm",
+		"dist/cjs",
+		"dist/esm",
 		"src",
 		"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-mjs-test.6f5dab7.0+6f5dab7",
+		"@aws-amplify/auth": "6.0.1-mjs-test.6f5dab7.0+6f5dab7",
+		"@aws-amplify/core": "6.0.1-mjs-test.6f5dab7.0+6f5dab7",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
-		"tslib": "^1.8.0"
+		"tslib": "^2.5.0"
 	},
 	"size-limit": [
 		{
 			"name": "API (GraphQL client)",
-			"path": "./lib-esm/index.js",
+			"path": "./dist/esm/index.mjs",
 			"import": "{ Amplify, GraphQLAPI }",
 			"limit": "91.7 kB"
 		}
@@ -115,10 +139,8 @@
 		"coveragePathIgnorePatterns": [
 			"<rootDir>/node_modules/",
 			"<rootDir>/dist",
-			"<rootDir>/lib",
-			"<rootDir>/lib-esm",
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "d745d43595a690928a86070deff39f3eed526437"
+	"gitHead": "6f5dab7f07d1781d39217d1e5a253c6a5165c8b2"
 }

package/src/GraphQLAPI.ts

@@ -32,13 +32,13 @@ 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>),
 		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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { AmplifyClassV6 } from '@aws-amplify/core';
+import { AmplifyClassV6, ResourcesConfig } from '@aws-amplify/core';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
@@ -9,6 +9,8 @@ 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()`.
@@ -355,14 +357,54 @@ export const __amplify = Symbol('amplify');
 
 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>;
+
+/**
+ * @private
+ *
+ * The knobs available for configuring `server/generateClient` internally.
+ */
+export type ServerClientGenerationParams = {
+	amplify:
+		| null // null expected when used with `generateServerClient`
+		// closure expected with `generateServerClientUsingCookies`
+		| ((fn: (amplify: any) => Promise<any>) => Promise<AmplifyClassV6>);
+	// global env-sourced config use for retrieving modelIntro
+	config: ResourcesConfig;
+};

package/lib/GraphQLAPI.d.ts

@@ -1,38 +0,0 @@
-import { AmplifyClassV6 } from '@aws-amplify/core';
-import { GraphQLOptions, GraphQLResult } from './types';
-import { InternalGraphQLAPIClass } from './internals';
-import { Observable } from 'rxjs';
-export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string | undefined) => {
-    query: any;
-    variables: {};
-    authToken: string | undefined;
-};
-/**
- * Export Cloud Logic APIs
- */
-export declare class GraphQLAPIClass extends InternalGraphQLAPIClass {
-    getModuleName(): string;
-    /**
-     * Executes a GraphQL operation
-     *
-     * @param options - GraphQL Options
-     * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
-     * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
-     */
-    graphql<T = any>(amplify: AmplifyClassV6, options: GraphQLOptions, additionalHeaders?: {
-        [key: string]: string;
-    }): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>>;
-    /**
-     * Checks to see if an error thrown is from an api request cancellation
-     * @param error - Any error
-     * @returns A boolean indicating if the error was from an api request cancellation
-     */
-    isCancelError(error: any): boolean;
-    /**
-     * Cancels an inflight request. Only applicable for graphql queries and mutations
-     * @param {any} request - request to cancel
-     * @returns A boolean indicating if the request was cancelled
-     */
-    cancel(request: Promise<any>, message?: string): boolean;
-}
-export declare const GraphQLAPI: GraphQLAPIClass;

package/lib/GraphQLAPI.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var utils_1 = require("@aws-amplify/core/internals/utils");
-var internals_1 = require("./internals");
-exports.graphqlOperation = function (query, variables, authToken) {
-    if (variables === void 0) { variables = {}; }
-    return ({
-        query: query,
-        variables: variables,
-        authToken: authToken,
-    });
-};
-/**
- * Export Cloud Logic APIs
- */
-var GraphQLAPIClass = /** @class */ (function (_super) {
-    tslib_1.__extends(GraphQLAPIClass, _super);
-    function GraphQLAPIClass() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    GraphQLAPIClass.prototype.getModuleName = function () {
-        return 'GraphQLAPI';
-    };
-    /**
-     * Executes a GraphQL operation
-     *
-     * @param options - GraphQL Options
-     * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
-     * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
-     */
-    GraphQLAPIClass.prototype.graphql = function (amplify, options, additionalHeaders) {
-        return _super.prototype.graphql.call(this, amplify, options, additionalHeaders, {
-            category: utils_1.Category.API,
-            action: utils_1.ApiAction.GraphQl
-        });
-    };
-    /**
-     * Checks to see if an error thrown is from an api request cancellation
-     * @param error - Any error
-     * @returns A boolean indicating if the error was from an api request cancellation
-     */
-    GraphQLAPIClass.prototype.isCancelError = function (error) {
-        return _super.prototype.isCancelError.call(this, error);
-    };
-    /**
-     * Cancels an inflight request. Only applicable for graphql queries and mutations
-     * @param {any} request - request to cancel
-     * @returns A boolean indicating if the request was cancelled
-     */
-    GraphQLAPIClass.prototype.cancel = function (request, message) {
-        return _super.prototype.cancel.call(this, request, message);
-    };
-    return GraphQLAPIClass;
-}(internals_1.InternalGraphQLAPIClass));
-exports.GraphQLAPIClass = GraphQLAPIClass;
-exports.GraphQLAPI = new GraphQLAPIClass(null);