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

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

@@ -1,11 +1,13 @@
-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';
 import { Observable } from 'rxjs';
 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()`.
  */
@@ -281,12 +283,47 @@ type ExcludeNeverFields<O> = {
     [K in FilteredKeys<O>]: O[K];
 };
 export declare const __amplify: unique symbol;
+export declare const __authMode: unique symbol;
+export declare const __authToken: unique symbol;
 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 | ((fn: (amplify: AmplifyClassV6) => Promise<any>) => Promise<any>);
+    config: ResourcesConfig;
+};

package/lib-esm/types/index.js

@@ -7,4 +7,6 @@ export var GraphQLAuthError;
     GraphQLAuthError["NO_FEDERATED_JWT"] = "No federated jwt";
     GraphQLAuthError["NO_AUTH_TOKEN"] = "No auth token specified";
 })(GraphQLAuthError || (GraphQLAuthError = {}));
-export var __amplify = Symbol('amplify');
+export const __amplify = Symbol('amplify');
+export const __authMode = Symbol('authMode');
+export const __authToken = Symbol('authToken');

package/lib-esm/utils/ConnectionStateMonitor.js

@@ -1,10 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { __assign } from "tslib";
 import { Observable, map, filter } from 'rxjs';
 import { ConnectionState } from '../types/PubSub';
 import { ReachabilityMonitor } from './ReachabilityMonitor';
-export var CONNECTION_CHANGE = {
+export const CONNECTION_CHANGE = {
     KEEP_ALIVE_MISSED: { keepAliveState: 'unhealthy' },
     KEEP_ALIVE: { keepAliveState: 'healthy' },
     CONNECTION_ESTABLISHED: { connectionState: 'connected' },
@@ -21,9 +20,8 @@ export var CONNECTION_CHANGE = {
     ONLINE: { networkState: 'connected' },
     OFFLINE: { networkState: 'disconnected' },
 };
-var ConnectionStateMonitor = /** @class */ (function () {
-    function ConnectionStateMonitor() {
-        var _this = this;
+export class ConnectionStateMonitor {
+    constructor() {
         this._networkMonitoringSubscription = undefined;
         this._linkedConnectionState = {
             networkState: 'connected',
@@ -32,73 +30,61 @@ var ConnectionStateMonitor = /** @class */ (function () {
             keepAliveState: 'healthy',
         };
         // Attempt to update the state with the current actual network state
-        this._initialNetworkStateSubscription = ReachabilityMonitor().subscribe(function (_a) {
-            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();
+        this._initialNetworkStateSubscription = ReachabilityMonitor().subscribe(({ online }) => {
+            this.record(online ? CONNECTION_CHANGE.ONLINE : CONNECTION_CHANGE.OFFLINE);
+            this._initialNetworkStateSubscription?.unsubscribe();
         });
         this._linkedConnectionStateObservable =
-            new Observable(function (connectionStateObserver) {
-                connectionStateObserver.next(_this._linkedConnectionState);
-                _this._linkedConnectionStateObserver = connectionStateObserver;
+            new Observable(connectionStateObserver => {
+                connectionStateObserver.next(this._linkedConnectionState);
+                this._linkedConnectionStateObserver = connectionStateObserver;
             });
     }
     /**
      * Turn network state monitoring on if it isn't on already
      */
-    ConnectionStateMonitor.prototype.enableNetworkMonitoring = function () {
-        var _this = this;
-        var _a;
+    enableNetworkMonitoring() {
         // If no initial network state was discovered, stop trying
-        (_a = this._initialNetworkStateSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        this._initialNetworkStateSubscription?.unsubscribe();
         // Maintain the network state based on the reachability monitor
         if (this._networkMonitoringSubscription === undefined) {
-            this._networkMonitoringSubscription = ReachabilityMonitor().subscribe(function (_a) {
-                var online = _a.online;
-                _this.record(online ? CONNECTION_CHANGE.ONLINE : CONNECTION_CHANGE.OFFLINE);
+            this._networkMonitoringSubscription = ReachabilityMonitor().subscribe(({ online }) => {
+                this.record(online ? CONNECTION_CHANGE.ONLINE : CONNECTION_CHANGE.OFFLINE);
             });
         }
-    };
+    }
     /**
      * Turn network state monitoring off if it isn't off already
      */
-    ConnectionStateMonitor.prototype.disableNetworkMonitoring = function () {
-        var _a;
-        (_a = this._networkMonitoringSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+    disableNetworkMonitoring() {
+        this._networkMonitoringSubscription?.unsubscribe();
         this._networkMonitoringSubscription = undefined;
-    };
-    Object.defineProperty(ConnectionStateMonitor.prototype, "connectionStateObservable", {
-        /**
-         * Get the observable that allows us to monitor the connection state
-         *
-         * @returns {Observable<ConnectionState>} - The observable that emits ConnectionState updates
-         */
-        get: function () {
-            var _this = this;
-            var previous;
-            // The linked state aggregates state changes to any of the network, connection,
-            // intendedConnection and keepAliveHealth. Some states will change these independent
-            // states without changing the overall connection state.
-            // After translating from linked states to ConnectionState, then remove any duplicates
-            return this._linkedConnectionStateObservable
-                .pipe(map(function (value) {
-                return _this.connectionStatesTranslator(value);
-            }))
-                .pipe(filter(function (current) {
-                var toInclude = current !== previous;
-                previous = current;
-                return toInclude;
-            }));
-        },
-        enumerable: false,
-        configurable: true
-    });
+    }
+    /**
+     * Get the observable that allows us to monitor the connection state
+     *
+     * @returns {Observable<ConnectionState>} - The observable that emits ConnectionState updates
+     */
+    get connectionStateObservable() {
+        let previous;
+        // The linked state aggregates state changes to any of the network, connection,
+        // intendedConnection and keepAliveHealth. Some states will change these independent
+        // states without changing the overall connection state.
+        // After translating from linked states to ConnectionState, then remove any duplicates
+        return this._linkedConnectionStateObservable
+            .pipe(map(value => {
+            return this.connectionStatesTranslator(value);
+        }))
+            .pipe(filter(current => {
+            const toInclude = current !== previous;
+            previous = current;
+            return toInclude;
+        }));
+    }
     /*
      * Updates local connection state and emits the full state to the observer.
      */
-    ConnectionStateMonitor.prototype.record = function (statusUpdates) {
-        var _a;
+    record(statusUpdates) {
         // Maintain the network monitor
         if (statusUpdates.intendedConnectionState === 'connected') {
             this.enableNetworkMonitoring();
@@ -107,15 +93,17 @@ var ConnectionStateMonitor = /** @class */ (function () {
             this.disableNetworkMonitoring();
         }
         // Maintain the socket state
-        var newSocketStatus = __assign(__assign({}, this._linkedConnectionState), statusUpdates);
-        this._linkedConnectionState = __assign({}, newSocketStatus);
-        (_a = this._linkedConnectionStateObserver) === null || _a === void 0 ? void 0 : _a.next(this._linkedConnectionState);
-    };
+        const newSocketStatus = {
+            ...this._linkedConnectionState,
+            ...statusUpdates,
+        };
+        this._linkedConnectionState = { ...newSocketStatus };
+        this._linkedConnectionStateObserver?.next(this._linkedConnectionState);
+    }
     /*
      * Translate the ConnectionState structure into a specific ConnectionState string literal union
      */
-    ConnectionStateMonitor.prototype.connectionStatesTranslator = function (_a) {
-        var connectionState = _a.connectionState, networkState = _a.networkState, intendedConnectionState = _a.intendedConnectionState, keepAliveState = _a.keepAliveState;
+    connectionStatesTranslator({ connectionState, networkState, intendedConnectionState, keepAliveState, }) {
         if (connectionState === 'connected' && networkState === 'disconnected')
             return ConnectionState.ConnectedPendingNetwork;
         if (connectionState === 'connected' &&
@@ -136,7 +124,5 @@ var ConnectionStateMonitor = /** @class */ (function () {
         if (connectionState === 'disconnected')
             return ConnectionState.Disconnected;
         return ConnectionState.Connected;
-    };
-    return ConnectionStateMonitor;
-}());
-export { ConnectionStateMonitor };
+    }
+}

package/lib-esm/utils/ReachabilityMonitor/index.js

@@ -1,4 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { Reachability } from '@aws-amplify/core/internals/utils';
-export var ReachabilityMonitor = function () { return new Reachability().networkMonitor(); };
+export const ReachabilityMonitor = () => new Reachability().networkMonitor();

package/lib-esm/utils/ReachabilityMonitor/index.native.js

@@ -2,6 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Reachability } from '@aws-amplify/core/internals/utils';
 import { default as NetInfo } from '@react-native-community/netinfo';
-export var ReachabilityMonitor = function () {
-    return new Reachability().networkMonitor(NetInfo);
-};
+export const ReachabilityMonitor = () => new Reachability().networkMonitor(NetInfo);

package/lib-esm/utils/ReconnectionMonitor.js

@@ -10,31 +10,30 @@ export var ReconnectEvent;
  *   Attempting to reconnect only once creates unrecoverable states when the network state isn't
  *   supported by the browser, so this keeps retrying every minute until halted.
  */
-var ReconnectionMonitor = /** @class */ (function () {
-    function ReconnectionMonitor() {
+export class ReconnectionMonitor {
+    constructor() {
         this.reconnectObservers = [];
     }
     /**
      * Add reconnect observer to the list of observers to alert on reconnect
      */
-    ReconnectionMonitor.prototype.addObserver = function (reconnectObserver) {
+    addObserver(reconnectObserver) {
         this.reconnectObservers.push(reconnectObserver);
-    };
+    }
     /**
      * Given a reconnect event, start the appropriate behavior
      */
-    ReconnectionMonitor.prototype.record = function (event) {
-        var _this = this;
+    record(event) {
         if (event === ReconnectEvent.START_RECONNECT) {
             // If the reconnection hasn't been started
             if (this.reconnectSetTimeoutId === undefined &&
                 this.reconnectIntervalId === undefined) {
-                this.reconnectSetTimeoutId = setTimeout(function () {
+                this.reconnectSetTimeoutId = setTimeout(() => {
                     // Reconnect now
-                    _this._triggerReconnect();
+                    this._triggerReconnect();
                     // Retry reconnect every periodically until it works
-                    _this.reconnectIntervalId = setInterval(function () {
-                        _this._triggerReconnect();
+                    this.reconnectIntervalId = setInterval(() => {
+                        this._triggerReconnect();
                     }, RECONNECT_INTERVAL);
                 }, RECONNECT_DELAY);
             }
@@ -49,22 +48,18 @@ var ReconnectionMonitor = /** @class */ (function () {
                 this.reconnectSetTimeoutId = undefined;
             }
         }
-    };
+    }
     /**
      * Complete all reconnect observers
      */
-    ReconnectionMonitor.prototype.close = function () {
-        this.reconnectObservers.forEach(function (reconnectObserver) {
-            var _a;
-            (_a = reconnectObserver.complete) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    close() {
+        this.reconnectObservers.forEach(reconnectObserver => {
+            reconnectObserver.complete?.();
         });
-    };
-    ReconnectionMonitor.prototype._triggerReconnect = function () {
-        this.reconnectObservers.forEach(function (reconnectObserver) {
-            var _a;
-            (_a = reconnectObserver.next) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    }
+    _triggerReconnect() {
+        this.reconnectObservers.forEach(reconnectObserver => {
+            reconnectObserver.next?.();
         });
-    };
-    return ReconnectionMonitor;
-}());
-export { ReconnectionMonitor };
+    }
+}

package/lib-esm/utils/errors/APIError.js

@@ -1,20 +1,15 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { __extends } from "tslib";
 import { AmplifyError, } from '@aws-amplify/core/internals/utils';
 /**
  * @internal
  */
-var APIError = /** @class */ (function (_super) {
-    __extends(APIError, _super);
-    function APIError(params) {
-        var _this = _super.call(this, params) || this;
+export class APIError extends AmplifyError {
+    constructor(params) {
+        super(params);
         // Hack for making the custom error class work when transpiled to es5
         // TODO: Delete the following 2 lines after we change the build target to >= es2015
-        _this.constructor = APIError;
-        Object.setPrototypeOf(_this, APIError.prototype);
-        return _this;
+        this.constructor = APIError;
+        Object.setPrototypeOf(this, APIError.prototype);
     }
-    return APIError;
-}(AmplifyError));
-export { APIError };
+}

package/lib-esm/utils/errors/assertValidationError.js

@@ -6,8 +6,8 @@ import { validationErrorMap } from './validation';
  * @internal
  */
 export function assertValidationError(assertion, name) {
-    var _a = validationErrorMap[name], message = _a.message, recoverySuggestion = _a.recoverySuggestion;
+    const { message, recoverySuggestion } = validationErrorMap[name];
     if (!assertion) {
-        throw new APIError({ name: name, message: message, recoverySuggestion: recoverySuggestion });
+        throw new APIError({ name, message, recoverySuggestion });
     }
 }

package/lib-esm/utils/errors/validation.js

@@ -1,24 +1,23 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var _a;
 export var APIValidationErrorCode;
 (function (APIValidationErrorCode) {
     APIValidationErrorCode["NoAuthSession"] = "NoAuthSession";
     APIValidationErrorCode["NoRegion"] = "NoRegion";
     APIValidationErrorCode["NoCustomEndpoint"] = "NoCustomEndpoint";
 })(APIValidationErrorCode || (APIValidationErrorCode = {}));
-export var validationErrorMap = (_a = {},
-    _a[APIValidationErrorCode.NoAuthSession] = {
+export const validationErrorMap = {
+    [APIValidationErrorCode.NoAuthSession]: {
         message: 'Auth session should not be empty.',
     },
     // TODO: re-enable when working in all test environments:
     // [APIValidationErrorCode.NoEndpoint]: {
     // 	message: 'Missing endpoint',
     // },
-    _a[APIValidationErrorCode.NoRegion] = {
+    [APIValidationErrorCode.NoRegion]: {
         message: 'Missing region.',
     },
-    _a[APIValidationErrorCode.NoCustomEndpoint] = {
+    [APIValidationErrorCode.NoCustomEndpoint]: {
         message: 'Custom endpoint region is present without custom endpoint.',
     },
-    _a);
+};

package/lib-esm/utils/findIndexByFields.js

@@ -9,16 +9,11 @@
  * @returns Index of `needle` in `haystack`, otherwise -1 if not found.
  */
 export function findIndexByFields(needle, haystack, keyFields) {
-    var searchObject = Object.fromEntries(keyFields.map(function (fieldName) { return [fieldName, needle[fieldName]]; }));
-    var _loop_1 = function (i) {
-        if (Object.keys(searchObject).every(function (k) { return searchObject[k] === haystack[i][k]; })) {
-            return { value: i };
+    const searchObject = Object.fromEntries(keyFields.map(fieldName => [fieldName, needle[fieldName]]));
+    for (let i = 0; i < haystack.length; i++) {
+        if (Object.keys(searchObject).every(k => searchObject[k] === haystack[i][k])) {
+            return i;
         }
-    };
-    for (var i = 0; i < haystack.length; i++) {
-        var state_1 = _loop_1(i);
-        if (typeof state_1 === "object")
-            return state_1.value;
     }
     return -1;
 }

package/lib-esm/utils/resolveConfig.js

@@ -4,18 +4,17 @@ import { APIValidationErrorCode, assertValidationError } from './errors';
 /**
  * @internal
  */
-export 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;
+export const resolveConfig = (amplify) => {
+    const { apiKey, customEndpoint, customEndpointRegion, defaultAuthMode, endpoint, region, } = amplify.getConfig().API?.GraphQL ?? {};
     // TODO: re-enable when working in all test environments:
     // assertValidationError(!!endpoint, APIValidationErrorCode.NoEndpoint);
     assertValidationError(!(!customEndpoint && customEndpointRegion), APIValidationErrorCode.NoCustomEndpoint);
     return {
-        apiKey: apiKey,
-        customEndpoint: customEndpoint,
-        customEndpointRegion: customEndpointRegion,
-        defaultAuthMode: defaultAuthMode,
-        endpoint: endpoint,
-        region: region,
+        apiKey,
+        customEndpoint,
+        customEndpointRegion,
+        defaultAuthMode,
+        endpoint,
+        region,
     };
 };

package/lib-esm/utils/resolveLibraryOptions.js

@@ -3,9 +3,8 @@
 /**
  * @internal
  */
-export 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 };
+export const resolveLibraryOptions = (amplify) => {
+    const headers = amplify.libraryOptions?.API?.GraphQL?.headers;
+    const withCredentials = amplify.libraryOptions?.API?.GraphQL?.withCredentials;
+    return { headers, withCredentials };
 };

package/lib-esm/utils/resolveOwnerFields.js

@@ -1,4 +1,3 @@
-import { __values } from "tslib";
 /**
  * Given an introspection schema model, returns all owner fields.
  *
@@ -6,37 +5,16 @@ import { __values } from "tslib";
  * @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; }
+    const ownerFields = new Set();
+    for (const attr of model.attributes || []) {
+        if (isAuthAttribute(attr)) {
+            for (const rule of attr.properties.rules) {
+                if (rule.allow === 'owner') {
+                    ownerFields.add(rule.ownerField || 'owner');
                 }
             }
         }
     }
-    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);
 }
 /**
@@ -47,11 +25,10 @@ export function resolveOwnerFields(model) {
  * @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; });
+    if (attribute?.type === 'auth') {
+        if (typeof attribute?.properties === 'object') {
+            if (Array.isArray(attribute?.properties?.rules)) {
+                return (attribute?.properties?.rules).every(rule => !!rule.allow);
             }
         }
     }

package/lib-esm/utils/resolvePKFields.js

@@ -1,4 +1,3 @@
-import { __read, __spreadArray } from "tslib";
 /**
  * Given a SchemaModel from a ModelIntrospectionSchema, returns the primary key
  * as an array of field names.
@@ -7,6 +6,6 @@ import { __read, __spreadArray } from "tslib";
  * @returns Array of field names
  */
 export function resolvePKFields(model) {
-    var _a = model.primaryKeyInfo, primaryKeyFieldName = _a.primaryKeyFieldName, sortKeyFieldNames = _a.sortKeyFieldNames;
-    return __spreadArray([primaryKeyFieldName], __read(sortKeyFieldNames), false);
+    const { primaryKeyFieldName, sortKeyFieldNames } = model.primaryKeyInfo;
+    return [primaryKeyFieldName, ...sortKeyFieldNames];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-api-v6-models.c1977f8.0+c1977f8",
+	"version": "4.0.1-api-v6-models.891fe0d.0+891fe0d",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -51,15 +51,16 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/amplify-api-next-types-alpha": "^0.2.0",
-		"@aws-amplify/api-rest": "4.0.1-api-v6-models.c1977f8.0+c1977f8",
-		"@aws-amplify/auth": "6.0.1-api-v6-models.c1977f8.0+c1977f8",
-		"@aws-amplify/core": "6.0.1-api-v6-models.c1977f8.0+c1977f8",
+		"@aws-amplify/amplify-api-next-types-alpha": "^0.2.5",
+		"@aws-amplify/api-rest": "4.0.1-api-v6-models.891fe0d.0+891fe0d",
+		"@aws-amplify/auth": "6.0.1-api-v6-models.891fe0d.0+891fe0d",
+		"@aws-amplify/core": "6.0.1-api-v6-models.891fe0d.0+891fe0d",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
 		"tslib": "^2.6.1",
-		"url": "0.11.0"
+		"url": "0.11.0",
+		"uuid": "^3.2.1"
 	},
 	"size-limit": [
 		{
@@ -126,5 +127,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "c1977f8efaae41b693495a2d6c53c503d0038e95"
+	"gitHead": "891fe0dc64e168de42b3b8d42def3eb9aed89efa"
 }

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';
@@ -31,11 +32,14 @@ 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);
+		return super.graphql(amplify, options, additionalHeaders, {
+			category: Category.API,
+			action: ApiAction.GraphQl,
+		});
 	}
 
 	/**