@aws-amplify/api-graphql 4.0.1-console-preview.3d7f188.0 → 4.0.1-server-generate-client.1e317a1.0

package/lib-esm/types/PubSub.d.ts

@@ -23,5 +23,5 @@ export declare enum ConnectionState {
     Disconnected = "Disconnected",
     ConnectedPendingKeepAlive = "ConnectedPendingKeepAlive"
 }
-export declare type PubSubContent = Record<string, unknown>;
-export declare type PubSubContentObserver = Observer<PubSubContent>;
+export type PubSubContent = Record<string, unknown>;
+export type PubSubContentObserver = Observer<PubSubContent>;

package/lib-esm/types/index.d.ts

@@ -1,9 +1,11 @@
 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';
 import { GraphQLAuthMode, DocumentType } from '@aws-amplify/core/internals/utils';
 export { CONTROL_MSG, ConnectionState } from './PubSub';
+export { SelectionSet } from '@aws-amplify/amplify-api-next-types-alpha';
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
  */
@@ -25,10 +27,10 @@ export interface GraphQLResult<T = object> {
     };
 }
 declare const queryType: unique symbol;
-export declare type GraphQLQuery<T> = T & {
+export type GraphQLQuery<T> = T & {
     readonly [queryType]: 'query';
 };
-export declare type GraphQLSubscription<T> = T & {
+export type GraphQLSubscription<T> = T & {
     readonly [queryType]: 'subscription';
 };
 /**
@@ -52,14 +54,14 @@ export declare type GraphQLSubscription<T> = T & {
  *
  * This util simply makes related model properties optional recursively.
  */
-export declare type GraphQLReturnType<T> = T extends {} ? {
+export type GraphQLReturnType<T> = T extends {} ? {
     [K in keyof T]?: GraphQLReturnType<T[K]>;
 } : T;
 /**
  * Describes a paged list result from AppSync, which can either
  * live at the top query or property (e.g., related model) level.
  */
-declare type PagedList<T, TYPENAME> = {
+type PagedList<T, TYPENAME> = {
     __typename: TYPENAME;
     nextToken?: string | null | undefined;
     items: Array<T>;
@@ -72,13 +74,13 @@ declare type PagedList<T, TYPENAME> = {
  * array, this will only be the case when we also have errors,
  * which will then be *thrown*.
  */
-declare type WithListsFixed<T> = T extends PagedList<infer IT, infer NAME> ? PagedList<Exclude<IT, null | undefined>, NAME> : T extends {} ? {
+type WithListsFixed<T> = T extends PagedList<infer IT, infer NAME> ? PagedList<Exclude<IT, null | undefined>, NAME> : T extends {} ? {
     [K in keyof T]: WithListsFixed<T[K]>;
 } : T;
 /**
  * Returns an updated response type to always return a value.
  */
-declare type NeverEmpty<T> = {
+type NeverEmpty<T> = {
     [K in keyof T]-?: Exclude<WithListsFixed<T[K]>, undefined | null>;
 };
 /**
@@ -88,7 +90,7 @@ declare type NeverEmpty<T> = {
  * If empty members are present, there will also be errors present,
  * and the response will instead be *thrown*.
  */
-declare type FixedQueryResult<T> = Exclude<T[keyof T], null | undefined> extends PagedList<any, any> ? {
+type FixedQueryResult<T> = Exclude<T[keyof T], null | undefined> extends PagedList<any, any> ? {
     [K in keyof T]-?: WithListsFixed<Exclude<T[K], null | undefined>>;
 } : T;
 /**
@@ -111,7 +113,7 @@ declare type FixedQueryResult<T> = Exclude<T[keyof T], null | undefined> extends
  * })
  * ```
  */
-export declare type GraphqlSubscriptionResult<T> = Observable<GraphqlSubscriptionMessage<T>>;
+export type GraphqlSubscriptionResult<T> = Observable<GraphqlSubscriptionMessage<T>>;
 /**
  * The shape of messages passed to `next()` from a graphql subscription. E.g.,
  *
@@ -128,7 +130,7 @@ export declare type GraphqlSubscriptionResult<T> = Observable<GraphqlSubscriptio
  * })
  * ```
  */
-export declare type GraphqlSubscriptionMessage<T> = {
+export type GraphqlSubscriptionMessage<T> = {
     data: T;
 };
 export interface AWSAppSyncRealTimeProviderOptions {
@@ -143,7 +145,7 @@ export interface AWSAppSyncRealTimeProviderOptions {
         [key: string]: string;
     };
 }
-export declare type AWSAppSyncRealTimeProvider = {
+export type AWSAppSyncRealTimeProvider = {
     subscribe(options?: AWSAppSyncRealTimeProviderOptions): Observable<Record<string, unknown>>;
 };
 export declare enum GraphQLAuthError {
@@ -157,7 +159,7 @@ export declare enum GraphQLAuthError {
  * GraphQLSource or string, the type of the parameter for calling graphql.parse
  * @see: https://graphql.org/graphql-js/language/#parse
  */
-export declare type GraphQLOperation = Source | string;
+export type GraphQLOperation = Source | string;
 /**
  * API V6 `graphql({options})` type that can leverage branded graphql `query`
  * objects and fallback types.
@@ -179,17 +181,17 @@ export interface GraphQLOptionsV6<FALLBACK_TYPES = unknown, TYPED_GQL_STRING ext
  * Invoking code should either cast the result or use `?` and `!` operators to
  * navigate the result objects.
  */
-export declare type UnknownGraphQLResponse = Promise<GraphQLResult<any>> | GraphqlSubscriptionResult<any>;
+export type UnknownGraphQLResponse = Promise<GraphQLResult<any>> | GraphqlSubscriptionResult<any>;
 /**
  * The expected type for `variables` in a V6 `graphql()` operation with
  * respect to the given `FALLBACK_TYPES` and `TYPED_GQL_STRING`.
  */
-export declare type GraphQLVariablesV6<FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string> = TYPED_GQL_STRING extends GeneratedQuery<infer IN, any> ? IN : TYPED_GQL_STRING extends GeneratedMutation<infer IN, any> ? IN : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, any> ? IN : FALLBACK_TYPES extends GraphQLOperationType<infer IN, any> ? IN : any;
+export type GraphQLVariablesV6<FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string> = TYPED_GQL_STRING extends GeneratedQuery<infer IN, any> ? IN : TYPED_GQL_STRING extends GeneratedMutation<infer IN, any> ? IN : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, any> ? IN : FALLBACK_TYPES extends GraphQLOperationType<infer IN, any> ? IN : any;
 /**
  * The expected return type with respect to the given `FALLBACK_TYPE`
  * and `TYPED_GQL_STRING`.
  */
-export declare type GraphQLResponseV6<FALLBACK_TYPE = unknown, TYPED_GQL_STRING extends string = string> = TYPED_GQL_STRING extends GeneratedQuery<infer IN, infer QUERY_OUT> ? Promise<GraphQLResult<FixedQueryResult<QUERY_OUT>>> : TYPED_GQL_STRING extends GeneratedMutation<infer IN, infer MUTATION_OUT> ? Promise<GraphQLResult<NeverEmpty<MUTATION_OUT>>> : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT> ? GraphqlSubscriptionResult<NeverEmpty<SUB_OUT>> : FALLBACK_TYPE extends GraphQLQuery<infer T> ? Promise<GraphQLResult<FALLBACK_TYPE>> : FALLBACK_TYPE extends GraphQLSubscription<infer T> ? GraphqlSubscriptionResult<FALLBACK_TYPE> : FALLBACK_TYPE extends GraphQLOperationType<infer IN, infer CUSTOM_OUT> ? CUSTOM_OUT : UnknownGraphQLResponse;
+export type GraphQLResponseV6<FALLBACK_TYPE = unknown, TYPED_GQL_STRING extends string = string> = TYPED_GQL_STRING extends GeneratedQuery<infer IN, infer QUERY_OUT> ? Promise<GraphQLResult<FixedQueryResult<QUERY_OUT>>> : TYPED_GQL_STRING extends GeneratedMutation<infer IN, infer MUTATION_OUT> ? Promise<GraphQLResult<NeverEmpty<MUTATION_OUT>>> : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT> ? GraphqlSubscriptionResult<NeverEmpty<SUB_OUT>> : FALLBACK_TYPE extends GraphQLQuery<infer T> ? Promise<GraphQLResult<FALLBACK_TYPE>> : FALLBACK_TYPE extends GraphQLSubscription<infer T> ? GraphqlSubscriptionResult<FALLBACK_TYPE> : FALLBACK_TYPE extends GraphQLOperationType<infer IN, infer CUSTOM_OUT> ? CUSTOM_OUT : UnknownGraphQLResponse;
 /**
  * The shape customers can use to provide `T` to `graphql<T>()` to specify both
  * `IN` and `OUT` types (the type of `variables` and the return type, respectively).
@@ -208,7 +210,7 @@ export declare type GraphQLResponseV6<FALLBACK_TYPE = unknown, TYPED_GQL_STRING
  * })
  * ```
  */
-export declare type GraphQLOperationType<IN extends {}, OUT extends {}> = {
+export type GraphQLOperationType<IN extends {}, OUT extends {}> = {
     variables: IN;
     result: OUT;
 };
@@ -228,7 +230,7 @@ export declare type GraphQLOperationType<IN extends {}, OUT extends {}> = {
  * This allows `graphql()` to extract `InputType` and `OutputType` to correctly
  * assign types to the `variables` and result objects.
  */
-export declare type GeneratedQuery<InputType, OutputType> = string & {
+export type GeneratedQuery<InputType, OutputType> = string & {
     __generatedQueryInput: InputType;
     __generatedQueryOutput: OutputType;
 };
@@ -248,7 +250,7 @@ export declare type GeneratedQuery<InputType, OutputType> = string & {
  * This allows `graphql()` to extract `InputType` and `OutputType` to correctly
  * assign types to the `variables` and result objects.
  */
-export declare type GeneratedMutation<InputType, OutputType> = string & {
+export type GeneratedMutation<InputType, OutputType> = string & {
     __generatedMutationInput: InputType;
     __generatedMutationOutput: OutputType;
 };
@@ -268,22 +270,23 @@ export declare type GeneratedMutation<InputType, OutputType> = string & {
  * This allows `graphql()` to extract `InputType` and `OutputType` to correctly
  * assign types to the `variables` and result objects.
  */
-export declare type GeneratedSubscription<InputType, OutputType> = string & {
+export type GeneratedSubscription<InputType, OutputType> = string & {
     __generatedSubscriptionInput: InputType;
     __generatedSubscriptionOutput: OutputType;
 };
-declare type FilteredKeys<T> = {
+type FilteredKeys<T> = {
     [P in keyof T]: T[P] extends never ? never : P;
 }[keyof T];
-declare type ExcludeNeverFields<O> = {
+type ExcludeNeverFields<O> = {
     [K in FilteredKeys<O>]: O[K];
 };
 export declare const __amplify: unique symbol;
-export declare type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
-    [__amplify]: AmplifyClassV6;
+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>;
     cancel: (promise: Promise<any>, message?: string) => boolean;
     isCancelError: (error: any) => boolean;
+    models: ModelTypes<T>;
 }>;

package/lib-esm/utils/ConnectionStateMonitor.d.ts

@@ -1,8 +1,8 @@
 import { Observable } from 'rxjs';
 import { ConnectionState } from '../types/PubSub';
-declare type LinkedConnectionState = 'connected' | 'disconnected';
-declare type LinkedHealthState = 'healthy' | 'unhealthy';
-declare type LinkedConnectionStates = {
+type LinkedConnectionState = 'connected' | 'disconnected';
+type LinkedHealthState = 'healthy' | 'unhealthy';
+type LinkedConnectionStates = {
     networkState: LinkedConnectionState;
     connectionState: LinkedConnectionState | 'connecting';
     intendedConnectionState: LinkedConnectionState;

package/lib-esm/utils/ConnectionStateMonitor.js

@@ -33,8 +33,8 @@ var ConnectionStateMonitor = /** @class */ (function () {
         };
         // Attempt to update the state with the current actual network state
         this._initialNetworkStateSubscription = ReachabilityMonitor().subscribe(function (_a) {
-            var online = _a.online;
             var _b;
+            var online = _a.online;
             _this.record(online ? CONNECTION_CHANGE.ONLINE : CONNECTION_CHANGE.OFFLINE);
             (_b = _this._initialNetworkStateSubscription) === null || _b === void 0 ? void 0 : _b.unsubscribe();
         });
@@ -91,7 +91,7 @@ var ConnectionStateMonitor = /** @class */ (function () {
                 return toInclude;
             }));
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     /*

package/lib-esm/utils/ReachabilityMonitor/index.d.ts

@@ -1 +1 @@
-export declare const ReachabilityMonitor: () => any;
+export declare const ReachabilityMonitor: () => import("rxjs").Observable<import("@aws-amplify/core/lib-esm/Reachability/types").NetworkStatus>;

package/lib-esm/utils/ReachabilityMonitor/index.native.d.ts

@@ -1 +1 @@
-export declare const ReachabilityMonitor: () => any;
+export declare const ReachabilityMonitor: () => import("rxjs").Observable<import("@aws-amplify/core/lib-esm/Reachability/types").NetworkStatus>;

package/lib-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/lib-esm/libraryUtils").GraphQLAuthMode | undefined;
     endpoint: string | undefined;
     region: string | undefined;
 };

package/lib-esm/utils/resolveLibraryOptions.d.ts

@@ -6,6 +6,6 @@ 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;
+    }) => Promise<import("@aws-amplify/core/lib-esm/clients").Headers>) | undefined;
     withCredentials: boolean | undefined;
 };

package/lib-esm/utils/resolveOwnerFields.d.ts

@@ -0,0 +1,12 @@
+import { ResourcesConfig } from '@aws-amplify/core';
+type GraphQLConfig = Exclude<ResourcesConfig['API'], undefined>['GraphQL'];
+type ModelIntrospectionSchema = Exclude<Exclude<GraphQLConfig, undefined>['modelIntrospection'], undefined>;
+type Model = ModelIntrospectionSchema['models'][string];
+/**
+ * Given an introspection schema model, returns all owner fields.
+ *
+ * @param model Model from an introspection schema
+ * @returns List of owner field names
+ */
+export declare function resolveOwnerFields(model: Model): string[];
+export {};

package/lib-esm/utils/resolveOwnerFields.js

@@ -0,0 +1,59 @@
+import { __values } from "tslib";
+/**
+ * Given an introspection schema model, returns all owner fields.
+ *
+ * @param model Model from an introspection schema
+ * @returns List of owner field names
+ */
+export function resolveOwnerFields(model) {
+    var e_1, _a, e_2, _b;
+    var ownerFields = new Set();
+    try {
+        for (var _c = __values(model.attributes || []), _d = _c.next(); !_d.done; _d = _c.next()) {
+            var attr = _d.value;
+            if (isAuthAttribute(attr)) {
+                try {
+                    for (var _e = (e_2 = void 0, __values(attr.properties.rules)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                        var rule = _f.value;
+                        if (rule.allow === 'owner') {
+                            ownerFields.add(rule.ownerField || 'owner');
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return Array.from(ownerFields);
+}
+/**
+ * Type guard that identifies an auth attribute with an attached rules list that
+ * specifies an `allow` attribute at a minimum.
+ *
+ * @param attribute Any object. Ideally a model introspection schema model attribute
+ * @returns True if given object is an auth attribute
+ */
+function isAuthAttribute(attribute) {
+    var _a, _b;
+    if ((attribute === null || attribute === void 0 ? void 0 : attribute.type) === 'auth') {
+        if (typeof (attribute === null || attribute === void 0 ? void 0 : attribute.properties) === 'object') {
+            if (Array.isArray((_a = attribute === null || attribute === void 0 ? void 0 : attribute.properties) === null || _a === void 0 ? void 0 : _a.rules)) {
+                return ((_b = attribute === null || attribute === void 0 ? void 0 : attribute.properties) === null || _b === void 0 ? void 0 : _b.rules).every(function (rule) { return !!rule.allow; });
+            }
+        }
+    }
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-console-preview.3d7f188.0+3d7f188",
+	"version": "4.0.1-server-generate-client.1e317a1.0+1e317a1",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -40,6 +40,10 @@
 		"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",
@@ -47,13 +51,15 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.1-console-preview.3d7f188.0+3d7f188",
-		"@aws-amplify/auth": "6.0.1-console-preview.3d7f188.0+3d7f188",
-		"@aws-amplify/core": "6.0.1-console-preview.3d7f188.0+3d7f188",
+		"@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-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
-		"tslib": "^1.8.0"
+		"tslib": "^2.6.1",
+		"url": "0.11.0"
 	},
 	"size-limit": [
 		{
@@ -120,5 +126,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "3d7f18818c2f9e0790157aac2d0a0bfe90f21aff"
+	"gitHead": "1e317a10a7a7e980919b0d78e397bcff1461fec5"
 }

package/src/GraphQLAPI.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 { Category, ApiAction } from '@aws-amplify/core/internals/utils';
 import { GraphQLOptions, GraphQLResult } from './types';
 import { InternalGraphQLAPIClass } from './internals';
 import { Observable } from 'rxjs';
@@ -32,14 +31,11 @@ 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
-		});
+		return super.graphql(amplify, options, additionalHeaders);
 	}
 
 	/**

package/src/Providers/AWSAppSyncRealTimeProvider/index.ts

@@ -2,6 +2,7 @@
 // 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';
@@ -899,9 +900,7 @@ export class AWSAppSyncRealTimeProvider {
 		} else {
 			const handler = headerHandler[authenticationType];
 
-			const host = appSyncGraphqlEndpoint
-				? new AmplifyUrl(appSyncGraphqlEndpoint).host
-				: undefined;
+			const { host } = url.parse(appSyncGraphqlEndpoint ?? '');
 
 			logger.debug(`Authenticating with ${JSON.stringify(authenticationType)}`);
 			let resolvedApiKey;