@aws-amplify/api-graphql 4.0.1-api-v6-models.c1977f8.0 → 4.0.1-api-v6-models.891fe0d.0

package/src/internals/operations/get.ts

@@ -0,0 +1,121 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { AmplifyServer } from '@aws-amplify/core/internals/adapter-core';
+import {
+	initializeModel,
+	generateGraphQLDocument,
+	buildGraphQLVariables,
+	flattenItems,
+	authModeParams,
+} from '../APIClient';
+
+export function getFactory(
+	client,
+	modelIntrospection,
+	model,
+	operation,
+	context = false
+) {
+	const getWithContext = async (
+		contextSpec: AmplifyServer.ContextSpec,
+		arg?: any,
+		options?: any
+	) => {
+		return _get(
+			client,
+			modelIntrospection,
+			model,
+			arg,
+			options,
+			operation,
+			contextSpec
+		);
+	};
+
+	const get = async (arg?: any, options?: any) => {
+		return _get(
+			client,
+			modelIntrospection,
+			model,
+			arg,
+			options,
+			operation,
+			context
+		);
+	};
+
+	return context ? getWithContext : get;
+}
+
+async function _get(
+	client,
+	modelIntrospection,
+	model,
+	arg,
+	options,
+	operation,
+	context
+) {
+	const { name } = model as any;
+
+	const query = generateGraphQLDocument(
+		modelIntrospection.models,
+		name,
+		operation,
+		options
+	);
+	const variables = buildGraphQLVariables(
+		model,
+		operation,
+		arg,
+		modelIntrospection
+	);
+
+	try {
+		const auth = authModeParams(client, options);
+		const { data, extensions } = context
+			? ((await client.graphql(context, {
+					...auth,
+					query,
+					variables,
+			  })) as any)
+			: ((await client.graphql({
+					...auth,
+					query,
+					variables,
+			  })) as any);
+
+		// flatten response
+		if (data !== undefined) {
+			const [key] = Object.keys(data);
+			const flattenedResult = flattenItems(data)[key];
+
+			if (options?.selectionSet) {
+				return { data: flattenedResult, extensions };
+			} else {
+				// TODO: refactor to avoid destructuring here
+				const [initialized] = initializeModel(
+					client,
+					name,
+					[flattenedResult],
+					modelIntrospection,
+					auth.authMode,
+					auth.authToken,
+					context
+				);
+
+				return { data: initialized, extensions };
+			}
+		} else {
+			return { data: null, extensions };
+		}
+	} catch (error) {
+		if (error.errors) {
+			// graphql errors pass through
+			return error as any;
+		} else {
+			// non-graphql errors re re-thrown
+			throw error;
+		}
+	}
+}

package/src/internals/operations/list.ts

@@ -0,0 +1,111 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { AmplifyServer } from '@aws-amplify/core/internals/adapter-core';
+import {
+	initializeModel,
+	generateGraphQLDocument,
+	buildGraphQLVariables,
+	flattenItems,
+	authModeParams,
+} from '../APIClient';
+
+export function listFactory(
+	client,
+	modelIntrospection,
+	model,
+	context = false
+) {
+	const listWithContext = async (
+		contextSpec: AmplifyServer.ContextSpec,
+		args?: any
+	) => {
+		return _list(client, modelIntrospection, model, args, contextSpec);
+	};
+
+	const list = async (args?: any) => {
+		return _list(client, modelIntrospection, model, args, context);
+	};
+
+	return context ? listWithContext : list;
+}
+
+async function _list(client, modelIntrospection, model, args, context) {
+	const { name } = model as any;
+
+	const query = generateGraphQLDocument(
+		modelIntrospection.models,
+		name,
+		'LIST',
+		args
+	);
+	const variables = buildGraphQLVariables(
+		model,
+		'LIST',
+		args,
+		modelIntrospection
+	);
+
+	try {
+		const auth = authModeParams(client, args);
+
+		const { data, extensions } = context
+			? ((await client.graphql(context, {
+					...auth,
+					query,
+					variables,
+			  })) as any)
+			: ((await client.graphql({
+					...auth,
+					query,
+					variables,
+			  })) as any);
+
+		// flatten response
+		if (data !== undefined) {
+			const [key] = Object.keys(data);
+
+			if (data[key].items) {
+				const flattenedResult = flattenItems(data)[key];
+
+				// don't init if custom selection set
+				if (args?.selectionSet) {
+					return {
+						data: flattenedResult,
+						nextToken: data[key].nextToken,
+						extensions,
+					};
+				} else {
+					const initialized = initializeModel(
+						client,
+						name,
+						flattenedResult,
+						modelIntrospection,
+						auth.authMode,
+						auth.authToken,
+						context
+					);
+
+					return {
+						data: initialized,
+						nextToken: data[key].nextToken,
+						extensions,
+					};
+				}
+			}
+
+			return {
+				data: data[key],
+				nextToken: data[key].nextToken,
+				extensions,
+			};
+		}
+	} catch (error) {
+		if (error.errors) {
+			// graphql errors pass through
+			return error as any;
+		} else {
+			// non-graphql errors re re-thrown
+			throw error;
+		}
+	}
+}

package/src/internals/operations/observeQuery.ts

@@ -0,0 +1,140 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { Observable, map } from 'rxjs';
+import { findIndexByFields, resolvePKFields } from '../../utils';
+
+export function observeQueryFactory(models, model) {
+	const { name } = model as any;
+
+	const observeQuery = (arg?: any) =>
+		new Observable(subscriber => {
+			// what we'll be sending to our subscribers
+			const items: object[] = [];
+
+			// To enqueue subscription messages while we collect our initial
+			// result set.
+			const messageQueue = [] as {
+				type: 'create' | 'update' | 'delete';
+				item: object;
+			}[];
+
+			// operation to take when message(s) arrive.
+			// this operation will be swapped out once initial "sync" is complete
+			// to immediately ingest messsages.
+			let receiveMessages = (...messages: typeof messageQueue) => {
+				return messageQueue.push(...messages);
+			};
+
+			// start subscriptions
+			const onCreateSub = models[name].onCreate(arg).subscribe({
+				next(item) {
+					receiveMessages({ item, type: 'create' });
+				},
+				error(error) {
+					subscriber.error({ type: 'onCreate', error });
+				},
+			});
+			const onUpdateSub = models[name].onUpdate(arg).subscribe({
+				next(item) {
+					receiveMessages({ item, type: 'update' });
+				},
+				error(error) {
+					subscriber.error({ type: 'onUpdate', error });
+				},
+			});
+			const onDeleteSub = models[name].onDelete(arg).subscribe({
+				next(item) {
+					receiveMessages({ item, type: 'delete' });
+				},
+				error(error) {
+					subscriber.error({ type: 'onDelete', error });
+				},
+			});
+
+			// consumes a list of messages and sends a snapshot
+			function ingestMessages(messages: typeof messageQueue) {
+				for (const message of messages) {
+					const idx = findIndexByFields(message.item, items, pkFields as any);
+					switch (message.type) {
+						case 'create':
+							if (idx < 0) items.push(message.item);
+							break;
+						case 'update':
+							if (idx >= 0) items[idx] = message.item;
+							break;
+						case 'delete':
+							if (idx >= 0) items.splice(idx, 1);
+							break;
+						default:
+							console.error('Unrecognized message in observeQuery.', message);
+					}
+				}
+				subscriber.next({
+					items,
+					isSynced: true,
+				});
+			}
+
+			const pkFields = resolvePKFields(model);
+
+			// initial results
+			(async () => {
+				let firstPage = true;
+				let nextToken: string | null = null;
+				while (!subscriber.closed && (firstPage || nextToken)) {
+					firstPage = false;
+
+					const {
+						data: page,
+						errors,
+						nextToken: _nextToken,
+					} = await models[name].list({ ...arg, nextToken });
+					nextToken = _nextToken;
+
+					items.push(...page);
+
+					// if there are no more pages and no items we already know about
+					// that need to be merged in from sub, we're "synced"
+					const isSynced =
+						messageQueue.length === 0 &&
+						(nextToken === null || nextToken === undefined);
+
+					subscriber.next({
+						items,
+						isSynced,
+					});
+
+					if (Array.isArray(errors)) {
+						for (const error of errors) {
+							subscriber.error(error);
+						}
+					}
+				}
+
+				// play through the queue
+				if (messageQueue.length > 0) {
+					ingestMessages(messageQueue);
+				}
+
+				// switch the queue to write directly to the items collection
+				receiveMessages = (...messages: typeof messageQueue) => {
+					ingestMessages(messages);
+					return items.length;
+				};
+			})();
+
+			// when subscriber unsubscribes, tear down internal subs
+			return () => {
+				// 1. tear down internal subs
+				onCreateSub.unsubscribe();
+				onUpdateSub.unsubscribe();
+				onDeleteSub.unsubscribe();
+
+				// 2. there is no need to explicitly stop paging. instead, we
+				// just check `subscriber.closed` above before fetching each page.
+			};
+		});
+
+	return observeQuery;
+}

package/src/internals/operations/subscription.ts

@@ -0,0 +1,59 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { map } from 'rxjs';
+import { GraphqlSubscriptionResult } from '../../types';
+import {
+	initializeModel,
+	generateGraphQLDocument,
+	buildGraphQLVariables,
+	authModeParams,
+} from '../APIClient';
+
+export function subscriptionFactory(
+	client,
+	modelIntrospection,
+	model,
+	operation
+) {
+	const { name } = model as any;
+
+	const subscription = (args?: any) => {
+		const query = generateGraphQLDocument(
+			modelIntrospection.models,
+			name,
+			operation
+		);
+		const variables = buildGraphQLVariables(
+			model,
+			operation,
+			args,
+			modelIntrospection
+		);
+
+		const auth = authModeParams(client, args);
+
+		const observable = client.graphql({
+			...auth,
+			query,
+			variables,
+		}) as GraphqlSubscriptionResult<object>;
+
+		return observable.pipe(
+			map(value => {
+				const [key] = Object.keys(value.data);
+				const [initialized] = initializeModel(
+					client,
+					name,
+					[value.data[key]],
+					modelIntrospection,
+					auth.authMode,
+					auth.authToken
+				);
+				return initialized;
+			})
+		);
+	};
+
+	return subscription;
+}

package/src/internals/server/generateClient.ts

@@ -0,0 +1,45 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { graphql, cancel, isCancelError } from '../';
+import { generateModelsProperty } from './generateModelsProperty';
+import {
+	__amplify,
+	__authMode,
+	__authToken,
+	V6ClientSSRRequest,
+	V6ClientSSRCookies,
+	ServerClientGenerationParams,
+	CommonPublicClientOptions,
+} from '../../types';
+
+/**
+ * @private
+ *
+ * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`
+ * compatible context object for config and auth fetching.
+ *
+ * @param params
+ * @returns
+ */
+export function generateClient<
+	T extends Record<any, any> = never,
+	ClientType extends
+		| V6ClientSSRRequest<T>
+		| V6ClientSSRCookies<T> = V6ClientSSRCookies<T>
+>(
+	params: ServerClientGenerationParams & CommonPublicClientOptions
+): ClientType {
+	const client = {
+		[__amplify]: params.amplify,
+		[__authMode]: params.authMode,
+		[__authToken]: params.authToken,
+		graphql,
+		cancel,
+		isCancelError,
+	} as any;
+
+	client.models = generateModelsProperty<T, ClientType>(client, params);
+
+	return client as ClientType;
+}

package/src/internals/server/generateModelsProperty.ts

@@ -0,0 +1,70 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { graphQLOperationsInfo, ModelOperation } from '../APIClient';
+import { ServerClientGenerationParams } from '../../types/';
+import { V6ClientSSRRequest, V6ClientSSRCookies } from '../../types';
+
+import { listFactory } from '../operations/list';
+import { getFactory } from '../operations/get';
+
+export function generateModelsProperty<
+	T extends Record<any, any> = never,
+	ClientType extends
+		| V6ClientSSRRequest<T>
+		| V6ClientSSRCookies<T> = V6ClientSSRCookies<T>
+>(client: ClientType, params: ServerClientGenerationParams): ClientType {
+	const models = {} as any;
+	const config = params.config;
+	const useContext = client === null;
+
+	if (!config) {
+		// TODO: improve
+		throw new Error('generateModelsProperty cannot retrieve Amplify config');
+	}
+
+	const modelIntrospection = config.API?.GraphQL?.modelIntrospection;
+	if (!modelIntrospection) {
+		return {} as any;
+	}
+
+	const SSR_UNSUPORTED_OPS = [
+		'ONCREATE',
+		'ONUPDATE',
+		'ONDELETE',
+		'OBSERVE_QUERY',
+	];
+
+	for (const model of Object.values(modelIntrospection.models)) {
+		const { name } = model as any;
+		models[name] = {} as any;
+
+		Object.entries(graphQLOperationsInfo).forEach(
+			([key, { operationPrefix }]) => {
+				const operation = key as ModelOperation;
+
+				// subscriptions are not supported in SSR
+				if (SSR_UNSUPORTED_OPS.includes(operation)) return;
+
+				if (operation === 'LIST') {
+					models[name][operationPrefix] = listFactory(
+						client,
+						modelIntrospection,
+						model,
+						useContext
+					);
+				} else {
+					models[name][operationPrefix] = getFactory(
+						client,
+						modelIntrospection,
+						model,
+						operation,
+						useContext
+					);
+				}
+			}
+		);
+	}
+
+	return models;
+}

package/src/internals/server/index.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { generateClient } from './generateClient';

package/src/internals/types.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 { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 
 /**
  * @private
@@ -9,4 +10,12 @@ import { AmplifyClassV6 } from '@aws-amplify/core';
  */
 export type ClientGenerationParams = {
 	amplify: AmplifyClassV6;
+} & CommonPublicClientOptions;
+
+/**
+ * Common options that can be used on public `generateClient()` interfaces.
+ */
+export type CommonPublicClientOptions = {
+	authMode?: GraphQLAuthMode;
+	authToken?: string;
 };

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 { ModelTypes } from '@aws-amplify/amplify-api-next-types-alpha';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
@@ -10,10 +10,14 @@ 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';
 
+export { CommonPublicClientOptions } from '../internals/types';
+
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
  */
@@ -357,18 +361,76 @@ type ExcludeNeverFields<O> = {
 };
 
 export const __amplify = Symbol('amplify');
+export const __authMode = Symbol('authMode');
+export const __authToken = Symbol('authToken');
 
 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>;
+	[__authMode]?: GraphQLAuthMode;
+	[__authToken]?: string;
+	graphql: GraphQLMethod;
 	cancel: (promise: Promise<any>, message?: string) => boolean;
 	isCancelError: (error: any) => boolean;
 	models: ModelTypes<T>;
 }>;
+
+export type V6ClientSSRRequest<T extends Record<any, any> = never> =
+	ExcludeNeverFields<{
+		[__amplify]: AmplifyClassV6;
+		[__authMode]?: GraphQLAuthMode;
+		[__authToken]?: string;
+		graphql: GraphQLMethodSSR;
+		cancel: (promise: Promise<any>, message?: string) => boolean;
+		isCancelError: (error: any) => boolean;
+		models: ModelTypes<T, 'REQUEST'>;
+	}>;
+
+export type V6ClientSSRCookies<T extends Record<any, any> = never> =
+	ExcludeNeverFields<{
+		[__amplify]: AmplifyClassV6;
+		[__authMode]?: GraphQLAuthMode;
+		[__authToken]?: string;
+		graphql: GraphQLMethod;
+		cancel: (promise: Promise<any>, message?: string) => boolean;
+		isCancelError: (error: any) => boolean;
+		models: ModelTypes<T, 'COOKIES'>;
+	}>;
+
+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: AmplifyClassV6) => Promise<any>) => Promise<any>);
+	// global env-sourced config use for retrieving modelIntro
+	config: ResourcesConfig;
+};