@aws-amplify/api-graphql 4.0.29-unstable.f37faeb.0 → 4.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.29-unstable.f37faeb.0+f37faeb",
+	"version": "4.0.29",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -72,7 +72,6 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"devDependencies": {
-		"@aws-amplify/data-schema": "^0.14.8",
 		"@rollup/plugin-typescript": "11.1.5",
 		"rollup": "^4.9.6",
 		"typescript": "5.0.2"
@@ -85,9 +84,9 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.28-unstable.f37faeb.0+f37faeb",
-		"@aws-amplify/core": "6.0.28-unstable.f37faeb.0+f37faeb",
-		"@aws-amplify/data-schema-types": "^0.7.14",
+		"@aws-amplify/api-rest": "4.0.28",
+		"@aws-amplify/core": "6.0.28",
+		"@aws-amplify/data-schema": "^0.16.1",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -102,5 +101,5 @@
 			"limit": "91.7 kB"
 		}
 	],
-	"gitHead": "f37faebacddeed66ce5bc1d7f78b8d1d46aecb17"
+	"gitHead": "672417ff6e9823f8b92c5d43585acf6ad9e43264"
 }

package/src/GraphQLAPI.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { AmplifyClassV6 } from '@aws-amplify/core';
 import { ApiAction, Category } from '@aws-amplify/core/internals/utils';
-import { CustomHeaders } from '@aws-amplify/data-schema-types';
+import { CustomHeaders } from '@aws-amplify/data-schema/runtime';
 import { Observable } from 'rxjs';
 
 import { GraphQLOptions, GraphQLResult } from './types';

package/src/Providers/AWSAppSyncRealTimeProvider/index.ts

@@ -22,7 +22,10 @@ import {
 	isNonRetryableError,
 	jitteredExponentialRetry,
 } from '@aws-amplify/core/internals/utils';
-import { CustomHeaders, RequestOptions } from '@aws-amplify/data-schema-types';
+import {
+	CustomHeaders,
+	RequestOptions,
+} from '@aws-amplify/data-schema/runtime';
 
 import {
 	CONTROL_MSG,

package/src/internals/InternalGraphQLAPI.ts

@@ -21,7 +21,10 @@ import {
 	post,
 	updateRequestToBeCancellable,
 } from '@aws-amplify/api-rest/internals';
-import { CustomHeaders, RequestOptions } from '@aws-amplify/data-schema-types';
+import {
+	CustomHeaders,
+	RequestOptions,
+} from '@aws-amplify/data-schema/runtime';
 
 import { AWSAppSyncRealTimeProvider } from '../Providers/AWSAppSyncRealTimeProvider';
 import { GraphQLOperation, GraphQLOptions, GraphQLResult } from '../types';

package/src/internals/generateClient.ts

@@ -7,7 +7,8 @@ import {
 	CustomSubscriptions,
 	EnumTypes,
 	ModelTypes,
-} from '@aws-amplify/data-schema-types';
+	addSchemaToClient,
+} from '@aws-amplify/data-schema/runtime';
 
 import {
 	V6Client,
@@ -15,19 +16,13 @@ import {
 	__authMode,
 	__authToken,
 	__headers,
+	getInternals,
 } from '../types';
 
-import { cancel, graphql, isCancelError } from './v6';
-import { generateEnumsProperty } from './utils/clientProperties/generateEnumsProperty';
-import { generateModelsProperty } from './utils/clientProperties/generateModelsProperty';
 import { isApiGraphQLConfig } from './utils/runtimeTypeGuards/isApiGraphQLProviderConfig';
-import {
-	generateCustomMutationsProperty,
-	generateCustomQueriesProperty,
-	generateCustomSubscriptionsProperty,
-} from './generateCustomOperationsProperty';
-import { ClientGenerationParams } from './types';
 import { isConfigureEventWithResourceConfig } from './utils/runtimeTypeGuards/isConfigureEventWithResourceConfig';
+import { cancel, graphql, isCancelError } from './v6';
+import { ClientGenerationParams } from './types';
 
 /**
  * @private
@@ -59,17 +54,7 @@ export function generateClient<T extends Record<any, any> = never>(
 	const apiGraphqlConfig = params.amplify.getConfig().API?.GraphQL;
 
 	if (isApiGraphQLConfig(apiGraphqlConfig)) {
-		client.models = generateModelsProperty<T>(client, apiGraphqlConfig);
-		client.enums = generateEnumsProperty<T>(apiGraphqlConfig);
-		client.queries = generateCustomQueriesProperty<T>(client, apiGraphqlConfig);
-		client.mutations = generateCustomMutationsProperty<T>(
-			client,
-			apiGraphqlConfig,
-		);
-		client.subscriptions = generateCustomSubscriptionsProperty(
-			client,
-			apiGraphqlConfig,
-		);
+		addSchemaToClient(client, apiGraphqlConfig, getInternals);
 	} else {
 		// This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.
 		//
@@ -86,7 +71,7 @@ export function generateClient<T extends Record<any, any> = never>(
 		generateModelsPropertyOnAmplifyConfigure(client);
 	}
 
-	return client as V6Client<T>;
+	return client as any;
 }
 
 const generateModelsPropertyOnAmplifyConfigure = (clientRef: any) => {
@@ -98,20 +83,7 @@ const generateModelsPropertyOnAmplifyConfigure = (clientRef: any) => {
 		const apiGraphQLConfig = coreEvent.payload.data.API?.GraphQL;
 
 		if (isApiGraphQLConfig(apiGraphQLConfig)) {
-			clientRef.models = generateModelsProperty(clientRef, apiGraphQLConfig);
-			clientRef.enums = generateEnumsProperty(apiGraphQLConfig);
-			clientRef.queries = generateCustomQueriesProperty(
-				clientRef,
-				apiGraphQLConfig,
-			);
-			clientRef.mutations = generateCustomMutationsProperty(
-				clientRef,
-				apiGraphQLConfig,
-			);
-			clientRef.subscriptions = generateCustomSubscriptionsProperty(
-				clientRef,
-				apiGraphQLConfig,
-			);
+			addSchemaToClient(clientRef, apiGraphQLConfig, getInternals);
 		}
 	});
 };

package/src/internals/server/generateClientWithAmplifyInstance.ts

@@ -1,7 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { cancel, graphql, isCancelError } from '..';
+import { addSchemaToClientWithInstance } from '@aws-amplify/data-schema/runtime';
+
 import {
 	CommonPublicClientOptions,
 	ServerClientGenerationParams,
@@ -11,15 +12,10 @@ import {
 	__authMode,
 	__authToken,
 	__headers,
+	getInternals,
 } from '../../types';
 import { isApiGraphQLConfig } from '../utils/runtimeTypeGuards/isApiGraphQLProviderConfig';
-import { generateEnumsProperty } from '../utils/clientProperties/generateEnumsProperty';
-import {
-	generateCustomMutationsProperty,
-	generateCustomQueriesProperty,
-} from '../generateCustomOperationsProperty';
-
-import { generateModelsProperty } from './generateModelsProperty';
+import { cancel, graphql, isCancelError } from '..';
 
 /**
  * @private
@@ -53,14 +49,8 @@ export function generateClientWithAmplifyInstance<
 	const apiGraphqlConfig = params.config?.API?.GraphQL;
 
 	if (isApiGraphQLConfig(apiGraphqlConfig)) {
-		client.models = generateModelsProperty<T>(client, params);
-		client.enums = generateEnumsProperty<T>(apiGraphqlConfig);
-		client.queries = generateCustomQueriesProperty<T>(client, apiGraphqlConfig);
-		client.mutations = generateCustomMutationsProperty<T>(
-			client,
-			apiGraphqlConfig,
-		);
+		addSchemaToClientWithInstance<T>(client, params, getInternals);
 	}
 
-	return client as ClientType;
+	return client as any;
 }

package/src/internals/types.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { AmplifyClassV6 } from '@aws-amplify/core';
 import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
-import { CustomHeaders } from '@aws-amplify/data-schema-types';
+import { CustomHeaders } from '@aws-amplify/data-schema/runtime';
 
 /**
  * @private

package/src/internals/v6.ts

@@ -1,15 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { CustomHeaders } from '@aws-amplify/data-schema-types';
+import { CustomHeaders } from '@aws-amplify/data-schema/runtime';
 
 import { GraphQLAPI } from '../GraphQLAPI';
 import {
 	GraphQLOptionsV6,
 	GraphQLResponseV6,
 	V6Client,
-	__amplify,
-	__authMode,
-	__authToken,
+	getInternals,
 } from '../types';
 
 /**
@@ -105,8 +103,9 @@ export function graphql<
 	additionalHeaders?: CustomHeaders,
 ): GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING> {
 	// inject client-level auth
-	options.authMode = options.authMode || this[__authMode];
-	options.authToken = options.authToken || this[__authToken];
+	const internals = getInternals(this as any);
+	options.authMode = options.authMode || internals.authMode;
+	options.authToken = options.authToken || internals.authToken;
 
 	/**
 	 * The correctness of these typings depends on correct string branding or overrides.
@@ -114,7 +113,8 @@ export function graphql<
 	 * any validation or type-guarding here.
 	 */
 	const result = GraphQLAPI.graphql(
-		this[__amplify],
+		// TODO: move V6Client back into this package?
+		internals.amplify as any,
 		options,
 		additionalHeaders,
 	);

package/src/server/generateClient.ts

@@ -5,7 +5,7 @@ import {
 	AmplifyServer,
 	getAmplifyServerContext,
 } from '@aws-amplify/core/internals/adapter-core';
-import { CustomHeaders } from '@aws-amplify/data-schema-types';
+import { CustomHeaders } from '@aws-amplify/data-schema/runtime';
 
 import { generateClientWithAmplifyInstance } from '../internals/server';
 import {

package/src/types/index.ts

@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 import { AmplifyClassV6, ResourcesConfig } from '@aws-amplify/core';
 import {
+	BaseClient,
+	ClientExtensions,
+	ClientExtensionsSSRCookies,
+	ClientExtensionsSSRRequest,
+	ClientInternals,
 	CustomHeaders,
-	CustomMutations,
-	CustomQueries,
-	CustomSubscriptions,
-	EnumTypes,
 	ModelSortDirection,
-	ModelTypes,
-} from '@aws-amplify/data-schema-types';
+} from '@aws-amplify/data-schema/runtime';
 import { DocumentNode, GraphQLError, Source } from 'graphql';
 import { Observable } from 'rxjs';
 import {
@@ -22,7 +22,7 @@ export { OperationTypeNode } from 'graphql';
 
 export { CONTROL_MSG, ConnectionState } from './PubSub';
 
-export { SelectionSet } from '@aws-amplify/data-schema-types';
+export { SelectionSet } from '@aws-amplify/data-schema/runtime';
 
 export { CommonPublicClientOptions } from '../internals/types';
 
@@ -366,68 +366,44 @@ export type GeneratedSubscription<InputType, OutputType> = string & {
 	__generatedSubscriptionOutput: OutputType;
 };
 
-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');
 export const __authMode = Symbol('authMode');
 export const __authToken = Symbol('authToken');
 export const __headers = Symbol('headers');
 
+export function getInternals(client: BaseClient): ClientInternals {
+	const c = client as any;
+
+	return {
+		amplify: c[__amplify],
+		authMode: c[__authMode],
+		authToken: c[__authToken],
+		headers: c[__headers],
+	} as any;
+}
+
 export type ClientWithModels =
-	| V6Client<Record<string, any>>
-	| V6ClientSSRRequest<Record<string, any>>
-	| V6ClientSSRCookies<Record<string, any>>;
-
-export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
-	[__amplify]: AmplifyClassV6;
-	[__authMode]?: GraphQLAuthMode;
-	[__authToken]?: string;
-	[__headers]?: CustomHeaders;
+	| V6Client
+	| V6ClientSSRRequest
+	| V6ClientSSRCookies;
+
+export type V6Client<T extends Record<any, any> = never> = {
+	graphql: GraphQLMethod;
+	cancel(promise: Promise<any>, message?: string): boolean;
+	isCancelError(error: any): boolean;
+} & ClientExtensions<T>;
+
+export type V6ClientSSRRequest<T extends Record<any, any> = never> = {
+	graphql: GraphQLMethodSSR;
+	cancel(promise: Promise<any>, message?: string): boolean;
+	isCancelError(error: any): boolean;
+} & ClientExtensionsSSRRequest<T>;
+
+export type V6ClientSSRCookies<T extends Record<any, any> = never> = {
 	graphql: GraphQLMethod;
 	cancel(promise: Promise<any>, message?: string): boolean;
 	isCancelError(error: any): boolean;
-	models: ModelTypes<T>;
-	enums: EnumTypes<T>;
-	queries: CustomQueries<T>;
-	mutations: CustomMutations<T>;
-	subscriptions: CustomSubscriptions<T>;
-}>;
-
-export type V6ClientSSRRequest<T extends Record<any, any> = never> =
-	ExcludeNeverFields<{
-		[__amplify]: AmplifyClassV6;
-		[__authMode]?: GraphQLAuthMode;
-		[__authToken]?: string;
-		[__headers]?: CustomHeaders;
-		graphql: GraphQLMethodSSR;
-		cancel(promise: Promise<any>, message?: string): boolean;
-		isCancelError(error: any): boolean;
-		models: ModelTypes<T, 'REQUEST'>;
-		enums: EnumTypes<T>;
-		queries: CustomQueries<T, 'REQUEST'>;
-		mutations: CustomMutations<T, 'REQUEST'>;
-	}>;
-
-export type V6ClientSSRCookies<T extends Record<any, any> = never> =
-	ExcludeNeverFields<{
-		[__amplify]: AmplifyClassV6;
-		[__authMode]?: GraphQLAuthMode;
-		[__authToken]?: string;
-		[__headers]?: CustomHeaders;
-		graphql: GraphQLMethod;
-		cancel(promise: Promise<any>, message?: string): boolean;
-		isCancelError(error: any): boolean;
-		models: ModelTypes<T, 'COOKIES'>;
-		enums: EnumTypes<T>;
-		queries: CustomQueries<T, 'COOKIES'>;
-		mutations: CustomMutations<T, 'COOKIES'>;
-	}>;
+} & ClientExtensionsSSRCookies<T>;
 
 export type GraphQLMethod = <
 	FALLBACK_TYPES = unknown,

package/src/utils/index.ts

@@ -3,5 +3,3 @@
 
 export { resolveConfig } from './resolveConfig';
 export { resolveLibraryOptions } from './resolveLibraryOptions';
-export { resolvePKFields } from './resolvePKFields';
-export { findIndexByFields } from './findIndexByFields';