@aws-amplify/api-graphql 4.0.1-api-v6-models.8035dfc.0 → 4.0.1-api-v6-models.3eb7748.0

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/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -4,16 +4,15 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 import { Observable } from 'rxjs';
 import { GraphQLError } from 'graphql';
 import * as url from 'url';
-import { v4 as uuid } from 'uuid';
 import { Buffer } from 'buffer';
-import { Hub, fetchAuthSession } from '@aws-amplify/core';
+import { Hub, fetchAuthSession, ConsoleLogger } from '@aws-amplify/core';
 import { signRequest } from '@aws-amplify/core/internals/aws-client-utils';
-import { Logger, NonRetryableError, USER_AGENT_HEADER, getAmplifyUserAgent, isNonRetryableError, jitteredExponentialRetry, } from '@aws-amplify/core/internals/utils';
+import { NonRetryableError, USER_AGENT_HEADER, getAmplifyUserAgent, isNonRetryableError, jitteredExponentialRetry, amplifyUuid, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
 import { CONTROL_MSG, ConnectionState, } from '../../types/PubSub';
 import { AMPLIFY_SYMBOL, AWS_APPSYNC_REALTIME_HEADERS, CONNECTION_INIT_TIMEOUT, DEFAULT_KEEP_ALIVE_TIMEOUT, DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT, MAX_DELAY_MS, MESSAGE_TYPES, NON_RETRYABLE_CODES, SOCKET_STATUS, START_ACK_TIMEOUT, SUBSCRIPTION_STATUS, CONNECTION_STATE_CHANGE, } from '../constants';
 import { ConnectionStateMonitor, CONNECTION_CHANGE, } from '../../utils/ConnectionStateMonitor';
 import { ReconnectEvent, ReconnectionMonitor, } from '../../utils/ReconnectionMonitor';
-var logger = new Logger('AWSAppSyncRealTimeProvider');
+var logger = new ConsoleLogger('AWSAppSyncRealTimeProvider');
 var dispatchApiEvent = function (payload) {
     Hub.dispatch('api', payload, 'PubSub', AMPLIFY_SYMBOL);
 };
@@ -95,7 +94,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
             }
             else {
                 var subscriptionStartActive_1 = false;
-                var subscriptionId_1 = uuid();
+                var subscriptionId_1 = amplifyUuid();
                 var startSubscription_1 = function () {
                     if (!subscriptionStartActive_1) {
                         subscriptionStartActive_1 = true;
@@ -776,7 +775,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
                         signed_params = signRequest({
                             headers: request.headers,
                             method: request.method,
-                            url: new URL(request.url),
+                            url: new AmplifyUrl(request.url),
                             body: request.data,
                         }, {
                             // TODO: What do we need to do to remove these !'s?

package/lib-esm/internals/APIClient.d.ts

@@ -30,6 +30,18 @@ export declare const graphQLOperationsInfo: {
         operationPrefix: "list";
         usePlural: boolean;
     };
+    ONCREATE: {
+        operationPrefix: "onCreate";
+        usePlural: boolean;
+    };
+    ONUPDATE: {
+        operationPrefix: "onUpdate";
+        usePlural: boolean;
+    };
+    ONDELETE: {
+        operationPrefix: "onDelete";
+        usePlural: boolean;
+    };
 };
 export type ModelOperation = keyof typeof graphQLOperationsInfo;
 /**

package/lib-esm/internals/APIClient.js

@@ -1,4 +1,7 @@
 import { __assign, __read, __spreadArray, __values } from "tslib";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { resolveOwnerFields } from '../utils/resolveOwnerFields';
 var connectionType = {
     HAS_ONE: 'HAS_ONE',
     HAS_MANY: 'HAS_MANY',
@@ -134,17 +137,26 @@ export var graphQLOperationsInfo = {
     UPDATE: { operationPrefix: 'update', usePlural: false },
     DELETE: { operationPrefix: 'delete', usePlural: false },
     LIST: { operationPrefix: 'list', usePlural: true },
+    ONCREATE: { operationPrefix: 'onCreate', usePlural: false },
+    ONUPDATE: { operationPrefix: 'onUpdate', usePlural: false },
+    ONDELETE: { operationPrefix: 'onDelete', usePlural: false },
 };
 var graphQLDocumentsCache = new Map();
 var SELECTION_SET_ALL_NESTED = '*';
 function defaultSelectionSetForModel(modelDefinition) {
+    // fields that are explicitly part of the graphql schema; not
+    // inferred from owner auth rules.
     var fields = modelDefinition.fields;
-    return Object.values(fields)
+    var explicitFields = Object.values(fields)
         .map(function (_a) {
         var type = _a.type, name = _a.name;
         return typeof type === 'string' && name;
     }) // Default selection set omits model fields
         .filter(Boolean);
+    // fields used for owner auth rules that may or may not also
+    // be explicit on the model.
+    var ownerFields = resolveOwnerFields(modelDefinition);
+    return Array.from(new Set(explicitFields.concat(ownerFields)));
 }
 var FIELD_IR = '';
 /**
@@ -317,6 +329,14 @@ export function generateGraphQLDocument(modelIntrospection, modelName, modelOper
             });
             graphQLOperationType !== null && graphQLOperationType !== void 0 ? graphQLOperationType : (graphQLOperationType = 'query');
             graphQLSelectionSet !== null && graphQLSelectionSet !== void 0 ? graphQLSelectionSet : (graphQLSelectionSet = "items { ".concat(selectionSetFields, " }"));
+        case 'ONCREATE':
+        case 'ONUPDATE':
+        case 'ONDELETE':
+            graphQLArguments !== null && graphQLArguments !== void 0 ? graphQLArguments : (graphQLArguments = {
+                filter: "ModelSubscription".concat(name, "FilterInput"),
+            });
+            graphQLOperationType !== null && graphQLOperationType !== void 0 ? graphQLOperationType : (graphQLOperationType = 'subscription');
+            graphQLSelectionSet !== null && graphQLSelectionSet !== void 0 ? graphQLSelectionSet : (graphQLSelectionSet = selectionSetFields);
     }
     var graphQLDocument = "".concat(graphQLOperationType).concat(graphQLArguments
         ? "(".concat(Object.entries(graphQLArguments).map(function (_a) {
@@ -364,6 +384,9 @@ export function buildGraphQLVariables(modelDefinition, operation, arg, modelIntr
             }
             break;
         case 'LIST':
+        case 'ONCREATE':
+        case 'ONUPDATE':
+        case 'ONDELETE':
             if (arg === null || arg === void 0 ? void 0 : arg.filter) {
                 variables = { filter: arg.filter };
             }

package/lib-esm/internals/InternalGraphQLAPI.js

@@ -2,14 +2,15 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { print, parse, GraphQLError, } from 'graphql';
-import { ConsoleLogger as Logger, getAmplifyUserAgent, } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
+import { getAmplifyUserAgent, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
 import { GraphQLAuthError, } from '../types';
 import { isCancelError as isCancelErrorREST } from '@aws-amplify/api-rest';
 import { post, cancel as cancelREST, updateRequestToBeCancellable, } from '@aws-amplify/api-rest/internals';
 import { AWSAppSyncRealTimeProvider } from '../Providers/AWSAppSyncRealTimeProvider';
 import { resolveConfig, resolveLibraryOptions } from '../utils';
 var USER_AGENT_HEADER = 'x-amz-user-agent';
-var logger = new Logger('GraphQLAPI');
+var logger = new ConsoleLogger('GraphQLAPI');
 export var graphqlOperation = function (query, variables, authToken) {
     if (variables === void 0) { variables = {}; }
     return ({
@@ -235,7 +236,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                     case 9:
                         _m.trys.push([9, 12, , 13]);
                         return [4 /*yield*/, this._api.post({
-                                url: new URL(endpoint),
+                                url: new AmplifyUrl(endpoint),
                                 options: {
                                     headers: headers,
                                     body: body,

package/lib-esm/internals/generateModelsProperty.js

@@ -1,5 +1,6 @@
 import { __awaiter, __generator, __read, __values } from "tslib";
 import { initializeModel, generateGraphQLDocument, buildGraphQLVariables, graphQLOperationsInfo, flattenItems, } from './APIClient';
+import { map } from 'rxjs';
 export function generateModelsProperty(client, params) {
     var e_1, _a;
     var _this = this;
@@ -78,6 +79,20 @@ export function generateModelsProperty(client, params) {
                     });
                 }); };
             }
+            else if (['ONCREATE', 'ONUPDATE', 'ONDELETE'].includes(operation)) {
+                models[name_1][operationPrefix] = function (arg, options) {
+                    var query = generateGraphQLDocument(modelIntrospection.models, name_1, operation);
+                    var variables = buildGraphQLVariables(model, operation, arg, modelIntrospection);
+                    var observable = client.graphql({
+                        query: query,
+                        variables: variables,
+                    });
+                    return observable.pipe(map(function (value) {
+                        var _a = __read(Object.keys(value.data), 1), key = _a[0];
+                        return value.data[key];
+                    }));
+                };
+            }
             else {
                 models[name_1][operationPrefix] = function (arg, options) { return __awaiter(_this, void 0, void 0, function () {
                     var query, variables, _a, data, extensions, _b, key_2, flattenedResult, _c, initialized, error_2;