@aws-amplify/api-graphql 4.0.1-server-generate-client.1e317a1.0 → 4.0.1-ssr-api.df60e41.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-server-generate-client.1e317a1.0+1e317a1",
+	"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",
@@ -40,10 +40,6 @@
 		"url": "https://github.com/aws/aws-amplify/issues"
 	},
 	"homepage": "https://aws-amplify.github.io/",
-	"devDependencies": {
-		"@aws-amplify/amplify-api-next-alpha": "^0.6.0",
-		"typescript": "5.1.6"
-	},
 	"files": [
 		"lib",
 		"lib-esm",
@@ -51,15 +47,13 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/amplify-api-next-types-alpha": "^0.2.0",
-		"@aws-amplify/api-rest": "4.0.1-server-generate-client.1e317a1.0+1e317a1",
-		"@aws-amplify/auth": "6.0.1-server-generate-client.1e317a1.0+1e317a1",
-		"@aws-amplify/core": "6.0.1-server-generate-client.1e317a1.0+1e317a1",
+		"@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": "^2.6.1",
-		"url": "0.11.0"
+		"tslib": "^2.5.0"
 	},
 	"size-limit": [
 		{
@@ -126,5 +120,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "1e317a10a7a7e980919b0d78e397bcff1461fec5"
+	"gitHead": "df60e41fbc70bd6277162b7780b3fc030c93c6a0"
 }

package/src/GraphQLAPI.ts

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { AmplifyClassV6 } from '@aws-amplify/core';
+import { Category, ApiAction } from '@aws-amplify/core/internals/utils';
 import { GraphQLOptions, GraphQLResult } from './types';
 import { InternalGraphQLAPIClass } from './internals';
 import { Observable } from 'rxjs';
@@ -32,10 +33,14 @@ export class GraphQLAPIClass extends InternalGraphQLAPIClass {
 	 */
 	graphql<T = any>(
 		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);
+		return super.graphql(amplify, options, additionalHeaders, {
+			category: Category.API,
+			action: ApiAction.GraphQl,
+		});
 	}
 
 	/**

package/src/Providers/AWSAppSyncRealTimeProvider/index.ts

@@ -2,11 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Observable, SubscriptionLike } from 'rxjs';
 import { GraphQLError } from 'graphql';
-import * as url from 'url';
-import { Buffer } from 'buffer';
 import { Hub, fetchAuthSession, ConsoleLogger } from '@aws-amplify/core';
 import { signRequest } from '@aws-amplify/core/internals/aws-client-utils';
 import {
+	base64Encoder,
 	GraphQLAuthMode,
 	CustomUserAgentDetails,
 	NonRetryableError,
@@ -700,9 +699,9 @@ export class AWSAppSyncRealTimeProvider {
 					});
 
 					const headerString = authHeader ? JSON.stringify(authHeader) : '';
-					const headerQs = Buffer.from(headerString).toString('base64');
+					const headerQs = base64Encoder.convert(headerString);
 
-					const payloadQs = Buffer.from(payloadString).toString('base64');
+					const payloadQs = base64Encoder.convert(payloadString);
 
 					let discoverableEndpoint = appSyncGraphqlEndpoint ?? '';
 
@@ -900,7 +899,9 @@ export class AWSAppSyncRealTimeProvider {
 		} else {
 			const handler = headerHandler[authenticationType];
 
-			const { host } = url.parse(appSyncGraphqlEndpoint ?? '');
+			const host = appSyncGraphqlEndpoint
+				? new AmplifyUrl(appSyncGraphqlEndpoint).host
+				: undefined;
 
 			logger.debug(`Authenticating with ${JSON.stringify(authenticationType)}`);
 			let resolvedApiKey;

package/src/internals/InternalGraphQLAPI.ts

@@ -46,10 +46,7 @@ export const graphqlOperation = (
 });
 
 const isAmplifyInstance = (amplify): amplify is AmplifyClassV6 => {
-	if (typeof amplify !== 'function') {
-		return true;
-	}
-	return false;
+	return typeof amplify !== 'function';
 };
 
 /**
@@ -200,7 +197,7 @@ export class InternalGraphQLAPIClass {
 			case 'mutation':
 				const abortController = new AbortController();
 
-				let responsePromise;
+				let responsePromise: Promise<GraphQLResult<T>>;
 
 				if (isAmplifyInstance(amplify)) {
 					responsePromise = this._graphql<T>(
@@ -220,7 +217,9 @@ export class InternalGraphQLAPIClass {
 							customUserAgentDetails
 						);
 
-					responsePromise = amplify(wrapper);
+					responsePromise = amplify(wrapper) as unknown as Promise<
+						GraphQLResult<T>
+					>;
 				}
 
 				this._api.updateRequestToBeCancellable(
@@ -347,7 +346,7 @@ export class InternalGraphQLAPIClass {
 			// If the exception is because user intentionally
 			// cancelled the request, do not modify the exception
 			// so that clients can identify the exception correctly.
-			if (this._api.isCancelErrorREST(err)) {
+			if (this.isCancelError(err)) {
 				throw err;
 			}
 
@@ -401,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/internals/index.ts

@@ -6,4 +6,3 @@ export {
 } from './InternalGraphQLAPI';
 
 export { graphql, cancel, isCancelError } from './v6';
-export { generateClient } from './generateClient';

package/src/types/index.ts

@@ -1,7 +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 { ModelTypes } from '@aws-amplify/amplify-api-next-types-alpha';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
@@ -10,10 +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';
-
-export { SelectionSet } from '@aws-amplify/amplify-api-next-types-alpha';
-
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
  */
@@ -351,24 +348,51 @@ export type GeneratedSubscription<InputType, OutputType> = string & {
 type FilteredKeys<T> = {
 	[P in keyof T]: T[P] extends never ? never : P;
 }[keyof T];
-
 type ExcludeNeverFields<O> = {
 	[K in FilteredKeys<O>]: O[K];
 };
 
 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 | (() => Promise<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>;
+	[__amplify]: AmplifyClassV6;
+	graphql: GraphQLMethod;
 	cancel: (promise: Promise<any>, message?: string) => boolean;
 	isCancelError: (error: any) => boolean;
-	models: ModelTypes<T>;
 }>;
+
+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>;

package/lib/internals/APIClient.d.ts

@@ -1,101 +0,0 @@
-type ListArgs = {
-    selectionSet?: string[];
-    filter?: {};
-};
-/**
- *
- * @param GraphQL response object
- * @returns response object with `items` properties flattened
- */
-export declare const flattenItems: (obj: Record<string, any>) => Record<string, any>;
-export declare function initializeModel(client: any, modelName: string, result: any[], modelIntrospection: any): any[];
-export declare const graphQLOperationsInfo: {
-    CREATE: {
-        operationPrefix: "create";
-        usePlural: boolean;
-    };
-    READ: {
-        operationPrefix: "get";
-        usePlural: boolean;
-    };
-    UPDATE: {
-        operationPrefix: "update";
-        usePlural: boolean;
-    };
-    DELETE: {
-        operationPrefix: "delete";
-        usePlural: boolean;
-    };
-    LIST: {
-        operationPrefix: "list";
-        usePlural: boolean;
-    };
-    ONCREATE: {
-        operationPrefix: "onCreate";
-        usePlural: boolean;
-    };
-    ONUPDATE: {
-        operationPrefix: "onUpdate";
-        usePlural: boolean;
-    };
-    ONDELETE: {
-        operationPrefix: "onDelete";
-        usePlural: boolean;
-    };
-};
-export type ModelOperation = keyof typeof graphQLOperationsInfo;
-/**
- * Generates nested Custom Selection Set IR from path
- *
- * @param modelIntrospection
- * @param modelName
- * @param selectionSet - array of object paths
- * @example
- * ### Given
- * `selectionSet = ['id', 'comments.post.id']`
- * ### Returns
- * ```ts
- * {
- *   id: '',
- *   comments: {
- *     items: { post: { id: '' } }
- *   }
- * }
- * ```
- */
-export declare function customSelectionSetToIR(modelIntrospection: any, modelName: string, selectionSet: string[]): Record<string, string | object>;
-/**
- * Stringifies selection set IR
- * * @example
- * ### Given
- * ```ts
- * {
- *   id: '',
- *   comments: {
- *     items: { post: { id: '' } }
- *   }
- * }
- * ```
- * ### Returns
- * `'id comments { items { post { id } } }'`
- */
-export declare function selectionSetIRToString(obj: Record<string, string | any>): string;
-export declare function generateSelectionSet(modelIntrospection: any, modelName: string, selectionSet?: string[]): string;
-export declare function generateGraphQLDocument(modelIntrospection: any, modelName: string, modelOperation: ModelOperation, listArgs?: ListArgs): string;
-export declare function buildGraphQLVariables(modelDefinition: any, operation: ModelOperation, arg: any, modelIntrospection: any): object;
-/**
- * Iterates over mutation input values and resolves any model inputs to their corresponding join fields/values
- *
- * @example
- * ### Usage
- * ```ts
- * const result = normalizeMutationInput({ post: post }, model, modelDefinition);
- * ```
- * ### Result
- * ```ts
- * { postId: "abc123" }
- * ```
- *
- */
-export declare function normalizeMutationInput(mutationInput: any, model: any, modelDefinition: any): Record<string, unknown>;
-export {};