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

package/lib/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/types/PubSub.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectionState = exports.CONTROL_MSG = void 0;
 var CONTROL_MSG;
 (function (CONTROL_MSG) {
     CONTROL_MSG["CONNECTION_CLOSED"] = "Connection closed";
@@ -7,7 +8,7 @@ var CONTROL_MSG;
     CONTROL_MSG["REALTIME_SUBSCRIPTION_INIT_ERROR"] = "AppSync Realtime subscription init error";
     CONTROL_MSG["SUBSCRIPTION_ACK"] = "Subscription ack";
     CONTROL_MSG["TIMEOUT_DISCONNECT"] = "Timeout disconnect";
-})(CONTROL_MSG = exports.CONTROL_MSG || (exports.CONTROL_MSG = {}));
+})(CONTROL_MSG || (exports.CONTROL_MSG = CONTROL_MSG = {}));
 /** @enum {string} */
 var ConnectionState;
 (function (ConnectionState) {
@@ -43,4 +44,4 @@ var ConnectionState;
      * The connection is alive, but a keep alive message has been missed
      */
     ConnectionState["ConnectedPendingKeepAlive"] = "ConnectedPendingKeepAlive";
-})(ConnectionState = exports.ConnectionState || (exports.ConnectionState = {}));
+})(ConnectionState || (exports.ConnectionState = ConnectionState = {}));

package/lib/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/types/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.__amplify = exports.GraphQLAuthError = exports.ConnectionState = exports.CONTROL_MSG = void 0;
 var PubSub_1 = require("./PubSub");
-exports.CONTROL_MSG = PubSub_1.CONTROL_MSG;
-exports.ConnectionState = PubSub_1.ConnectionState;
+Object.defineProperty(exports, "CONTROL_MSG", { enumerable: true, get: function () { return PubSub_1.CONTROL_MSG; } });
+Object.defineProperty(exports, "ConnectionState", { enumerable: true, get: function () { return PubSub_1.ConnectionState; } });
 var GraphQLAuthError;
 (function (GraphQLAuthError) {
     GraphQLAuthError["NO_API_KEY"] = "No api-key configured";
@@ -10,5 +11,5 @@ var GraphQLAuthError;
     GraphQLAuthError["NO_CREDENTIALS"] = "No credentials";
     GraphQLAuthError["NO_FEDERATED_JWT"] = "No federated jwt";
     GraphQLAuthError["NO_AUTH_TOKEN"] = "No auth token specified";
-})(GraphQLAuthError = exports.GraphQLAuthError || (exports.GraphQLAuthError = {}));
+})(GraphQLAuthError || (exports.GraphQLAuthError = GraphQLAuthError = {}));
 exports.__amplify = Symbol('amplify');

package/lib/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/utils/ConnectionStateMonitor.js

@@ -2,6 +2,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectionStateMonitor = exports.CONNECTION_CHANGE = void 0;
 var tslib_1 = require("tslib");
 var rxjs_1 = require("rxjs");
 var PubSub_1 = require("../types/PubSub");
@@ -34,9 +35,9 @@ var ConnectionStateMonitor = /** @class */ (function () {
             keepAliveState: 'healthy',
         };
         // Attempt to update the state with the current actual network state
-        this._initialNetworkStateSubscription = ReachabilityMonitor_1.ReachabilityMonitor().subscribe(function (_a) {
-            var online = _a.online;
+        this._initialNetworkStateSubscription = (0, ReachabilityMonitor_1.ReachabilityMonitor)().subscribe(function (_a) {
             var _b;
+            var online = _a.online;
             _this.record(online ? exports.CONNECTION_CHANGE.ONLINE : exports.CONNECTION_CHANGE.OFFLINE);
             (_b = _this._initialNetworkStateSubscription) === null || _b === void 0 ? void 0 : _b.unsubscribe();
         });
@@ -56,7 +57,7 @@ var ConnectionStateMonitor = /** @class */ (function () {
         (_a = this._initialNetworkStateSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
         // Maintain the network state based on the reachability monitor
         if (this._networkMonitoringSubscription === undefined) {
-            this._networkMonitoringSubscription = ReachabilityMonitor_1.ReachabilityMonitor().subscribe(function (_a) {
+            this._networkMonitoringSubscription = (0, ReachabilityMonitor_1.ReachabilityMonitor)().subscribe(function (_a) {
                 var online = _a.online;
                 _this.record(online ? exports.CONNECTION_CHANGE.ONLINE : exports.CONNECTION_CHANGE.OFFLINE);
             });
@@ -84,16 +85,16 @@ var ConnectionStateMonitor = /** @class */ (function () {
             // states without changing the overall connection state.
             // After translating from linked states to ConnectionState, then remove any duplicates
             return this._linkedConnectionStateObservable
-                .pipe(rxjs_1.map(function (value) {
+                .pipe((0, rxjs_1.map)(function (value) {
                 return _this.connectionStatesTranslator(value);
             }))
-                .pipe(rxjs_1.filter(function (current) {
+                .pipe((0, rxjs_1.filter)(function (current) {
                 var toInclude = current !== previous;
                 previous = current;
                 return toInclude;
             }));
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     /*

package/lib/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/utils/ReachabilityMonitor/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReachabilityMonitor = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var utils_1 = require("@aws-amplify/core/internals/utils");
-exports.ReachabilityMonitor = function () { return new utils_1.Reachability().networkMonitor(); };
+var ReachabilityMonitor = function () { return new utils_1.Reachability().networkMonitor(); };
+exports.ReachabilityMonitor = ReachabilityMonitor;

package/lib/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/utils/ReachabilityMonitor/index.native.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReachabilityMonitor = void 0;
 var tslib_1 = require("tslib");
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var utils_1 = require("@aws-amplify/core/internals/utils");
 var netinfo_1 = tslib_1.__importDefault(require("@react-native-community/netinfo"));
-exports.ReachabilityMonitor = function () {
+var ReachabilityMonitor = function () {
     return new utils_1.Reachability().networkMonitor(netinfo_1.default);
 };
+exports.ReachabilityMonitor = ReachabilityMonitor;

package/lib/utils/ReconnectionMonitor.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReconnectionMonitor = exports.ReconnectEvent = void 0;
 var constants_1 = require("../Providers/constants");
 var ReconnectEvent;
 (function (ReconnectEvent) {
     ReconnectEvent["START_RECONNECT"] = "START_RECONNECT";
     ReconnectEvent["HALT_RECONNECT"] = "HALT_RECONNECT";
-})(ReconnectEvent = exports.ReconnectEvent || (exports.ReconnectEvent = {}));
+})(ReconnectEvent || (exports.ReconnectEvent = ReconnectEvent = {}));
 /**
  * Captures the reconnect event logic used to determine when to reconnect to PubSub providers.
  *   Reconnnect attempts are delayed by 5 seconds to let the interface settle.

package/lib/utils/errors/APIError.js

@@ -2,6 +2,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.APIError = void 0;
 var tslib_1 = require("tslib");
 var utils_1 = require("@aws-amplify/core/internals/utils");
 /**

package/lib/utils/errors/assertValidationError.js

@@ -2,6 +2,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertValidationError = void 0;
 var APIError_1 = require("./APIError");
 var validation_1 = require("./validation");
 /**

package/lib/utils/errors/index.js

@@ -2,10 +2,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validationErrorMap = exports.APIValidationErrorCode = exports.assertValidationError = exports.APIError = void 0;
 var APIError_1 = require("./APIError");
-exports.APIError = APIError_1.APIError;
+Object.defineProperty(exports, "APIError", { enumerable: true, get: function () { return APIError_1.APIError; } });
 var assertValidationError_1 = require("./assertValidationError");
-exports.assertValidationError = assertValidationError_1.assertValidationError;
+Object.defineProperty(exports, "assertValidationError", { enumerable: true, get: function () { return assertValidationError_1.assertValidationError; } });
 var validation_1 = require("./validation");
-exports.APIValidationErrorCode = validation_1.APIValidationErrorCode;
-exports.validationErrorMap = validation_1.validationErrorMap;
+Object.defineProperty(exports, "APIValidationErrorCode", { enumerable: true, get: function () { return validation_1.APIValidationErrorCode; } });
+Object.defineProperty(exports, "validationErrorMap", { enumerable: true, get: function () { return validation_1.validationErrorMap; } });

package/lib/utils/errors/validation.js

@@ -3,12 +3,13 @@
 // SPDX-License-Identifier: Apache-2.0
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validationErrorMap = exports.APIValidationErrorCode = void 0;
 var APIValidationErrorCode;
 (function (APIValidationErrorCode) {
     APIValidationErrorCode["NoAuthSession"] = "NoAuthSession";
     APIValidationErrorCode["NoRegion"] = "NoRegion";
     APIValidationErrorCode["NoCustomEndpoint"] = "NoCustomEndpoint";
-})(APIValidationErrorCode = exports.APIValidationErrorCode || (exports.APIValidationErrorCode = {}));
+})(APIValidationErrorCode || (exports.APIValidationErrorCode = APIValidationErrorCode = {}));
 exports.validationErrorMap = (_a = {},
     _a[APIValidationErrorCode.NoAuthSession] = {
         message: 'Auth session should not be empty.',

package/lib/utils/index.js

@@ -2,7 +2,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveLibraryOptions = exports.resolveConfig = void 0;
 var resolveConfig_1 = require("./resolveConfig");
-exports.resolveConfig = resolveConfig_1.resolveConfig;
+Object.defineProperty(exports, "resolveConfig", { enumerable: true, get: function () { return resolveConfig_1.resolveConfig; } });
 var resolveLibraryOptions_1 = require("./resolveLibraryOptions");
-exports.resolveLibraryOptions = resolveLibraryOptions_1.resolveLibraryOptions;
+Object.defineProperty(exports, "resolveLibraryOptions", { enumerable: true, get: function () { return resolveLibraryOptions_1.resolveLibraryOptions; } });

package/lib/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/utils/resolveConfig.js

@@ -2,16 +2,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveConfig = void 0;
 var errors_1 = require("./errors");
 /**
  * @internal
  */
-exports.resolveConfig = function (amplify) {
+var resolveConfig = function (amplify) {
     var _a, _b;
     var _c = (_b = (_a = amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.GraphQL) !== null && _b !== void 0 ? _b : {}, apiKey = _c.apiKey, customEndpoint = _c.customEndpoint, customEndpointRegion = _c.customEndpointRegion, defaultAuthMode = _c.defaultAuthMode, endpoint = _c.endpoint, region = _c.region;
     // TODO: re-enable when working in all test environments:
     // assertValidationError(!!endpoint, APIValidationErrorCode.NoEndpoint);
-    errors_1.assertValidationError(!(!customEndpoint && customEndpointRegion), errors_1.APIValidationErrorCode.NoCustomEndpoint);
+    (0, errors_1.assertValidationError)(!(!customEndpoint && customEndpointRegion), errors_1.APIValidationErrorCode.NoCustomEndpoint);
     return {
         apiKey: apiKey,
         customEndpoint: customEndpoint,
@@ -21,3 +22,4 @@ exports.resolveConfig = function (amplify) {
         region: region,
     };
 };
+exports.resolveConfig = resolveConfig;

package/lib/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/utils/resolveLibraryOptions.js

@@ -2,12 +2,14 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveLibraryOptions = void 0;
 /**
  * @internal
  */
-exports.resolveLibraryOptions = function (amplify) {
+var resolveLibraryOptions = function (amplify) {
     var _a, _b, _c, _d, _e, _f;
     var headers = (_c = (_b = (_a = amplify.libraryOptions) === null || _a === void 0 ? void 0 : _a.API) === null || _b === void 0 ? void 0 : _b.GraphQL) === null || _c === void 0 ? void 0 : _c.headers;
     var withCredentials = (_f = (_e = (_d = amplify.libraryOptions) === null || _d === void 0 ? void 0 : _d.API) === null || _e === void 0 ? void 0 : _e.GraphQL) === null || _f === void 0 ? void 0 : _f.withCredentials;
     return { headers: headers, withCredentials: withCredentials };
 };
+exports.resolveLibraryOptions = resolveLibraryOptions;

package/lib/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/utils/resolveOwnerFields.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveOwnerFields = void 0;
+var tslib_1 = require("tslib");
+/**
+ * Given an introspection schema model, returns all owner fields.
+ *
+ * @param model Model from an introspection schema
+ * @returns List of owner field names
+ */
+function resolveOwnerFields(model) {
+    var e_1, _a, e_2, _b;
+    var ownerFields = new Set();
+    try {
+        for (var _c = tslib_1.__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, tslib_1.__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);
+}
+exports.resolveOwnerFields = resolveOwnerFields;
+/**
+ * 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/lib-esm/GraphQLAPI.d.ts

@@ -2,7 +2,7 @@ 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) => {
+export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string) => {
     query: any;
     variables: {};
     authToken: string | undefined;
@@ -19,7 +19,7 @@ export declare class GraphQLAPIClass extends InternalGraphQLAPIClass {
      * @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?: {
+    graphql<T = any>(amplify: AmplifyClassV6 | (() => Promise<AmplifyClassV6>), options: GraphQLOptions, additionalHeaders?: {
         [key: string]: string;
     }): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>>;
     /**

package/lib-esm/GraphQLAPI.js

@@ -1,5 +1,4 @@
 import { __extends } from "tslib";
-import { Category, ApiAction } from '@aws-amplify/core/internals/utils';
 import { InternalGraphQLAPIClass } from './internals';
 export var graphqlOperation = function (query, variables, authToken) {
     if (variables === void 0) { variables = {}; }
@@ -28,10 +27,7 @@ var GraphQLAPIClass = /** @class */ (function (_super) {
      * @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: Category.API,
-            action: ApiAction.GraphQl
-        });
+        return _super.prototype.graphql.call(this, amplify, options, additionalHeaders);
     };
     /**
      * Checks to see if an error thrown is from an api request cancellation

package/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.d.ts

@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { GraphQLAuthMode, CustomUserAgentDetails, DocumentType } from '@aws-amplify/core/internals/utils';
 import { PubSubContentObserver } from '../../types/PubSub';
 import { SUBSCRIPTION_STATUS } from '../constants';
-export declare type ObserverQuery = {
+export type ObserverQuery = {
     observer: PubSubContentObserver;
     query: string;
     variables: Record<string, DocumentType>;