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

package/lib/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -7,7 +7,6 @@ var tslib_1 = require("tslib");
 var rxjs_1 = require("rxjs");
 var graphql_1 = require("graphql");
 var url = tslib_1.__importStar(require("url"));
-var uuid_1 = require("uuid");
 var buffer_1 = require("buffer");
 var core_1 = require("@aws-amplify/core");
 var aws_client_utils_1 = require("@aws-amplify/core/internals/aws-client-utils");
@@ -16,7 +15,7 @@ var PubSub_1 = require("../../types/PubSub");
 var constants_1 = require("../constants");
 var ConnectionStateMonitor_1 = require("../../utils/ConnectionStateMonitor");
 var ReconnectionMonitor_1 = require("../../utils/ReconnectionMonitor");
-var logger = new utils_1.Logger('AWSAppSyncRealTimeProvider');
+var logger = new core_1.ConsoleLogger('AWSAppSyncRealTimeProvider');
 var dispatchApiEvent = function (payload) {
     core_1.Hub.dispatch('api', payload, 'PubSub', constants_1.AMPLIFY_SYMBOL);
 };
@@ -98,7 +97,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
             }
             else {
                 var subscriptionStartActive_1 = false;
-                var subscriptionId_1 = (0, uuid_1.v4)();
+                var subscriptionId_1 = (0, utils_1.amplifyUuid)();
                 var startSubscription_1 = function () {
                     if (!subscriptionStartActive_1) {
                         subscriptionStartActive_1 = true;
@@ -779,7 +778,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
                         signed_params = (0, aws_client_utils_1.signRequest)({
                             headers: request.headers,
                             method: request.method,
-                            url: new URL(request.url),
+                            url: new utils_1.AmplifyUrl(request.url),
                             body: request.data,
                         }, {
                             // TODO: What do we need to do to remove these !'s?

package/lib/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/internals/APIClient.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeMutationInput = exports.buildGraphQLVariables = exports.generateGraphQLDocument = exports.generateSelectionSet = exports.selectionSetIRToString = exports.customSelectionSetToIR = exports.graphQLOperationsInfo = exports.initializeModel = exports.flattenItems = void 0;
 var tslib_1 = require("tslib");
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+var resolveOwnerFields_1 = require("../utils/resolveOwnerFields");
 var connectionType = {
     HAS_ONE: 'HAS_ONE',
     HAS_MANY: 'HAS_MANY',
@@ -139,17 +142,26 @@ exports.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 = (0, resolveOwnerFields_1.resolveOwnerFields)(modelDefinition);
+    return Array.from(new Set(explicitFields.concat(ownerFields)));
 }
 var FIELD_IR = '';
 /**
@@ -325,6 +337,14 @@ function generateGraphQLDocument(modelIntrospection, modelName, modelOperation,
             });
             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) {
@@ -373,6 +393,9 @@ function buildGraphQLVariables(modelDefinition, operation, arg, modelIntrospecti
             }
             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/internals/InternalGraphQLAPI.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var graphql_1 = require("graphql");
+var core_1 = require("@aws-amplify/core");
 var utils_1 = require("@aws-amplify/core/internals/utils");
 var types_1 = require("../types");
 var api_rest_1 = require("@aws-amplify/api-rest");
@@ -12,7 +13,7 @@ var internals_1 = require("@aws-amplify/api-rest/internals");
 var AWSAppSyncRealTimeProvider_1 = require("../Providers/AWSAppSyncRealTimeProvider");
 var utils_2 = require("../utils");
 var USER_AGENT_HEADER = 'x-amz-user-agent';
-var logger = new utils_1.ConsoleLogger('GraphQLAPI');
+var logger = new core_1.ConsoleLogger('GraphQLAPI');
 var graphqlOperation = function (query, variables, authToken) {
     if (variables === void 0) { variables = {}; }
     return ({
@@ -239,7 +240,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 utils_1.AmplifyUrl(endpoint),
                                 options: {
                                     headers: headers,
                                     body: body,

package/lib/internals/generateModelsProperty.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateModelsProperty = void 0;
 var tslib_1 = require("tslib");
 var APIClient_1 = require("./APIClient");
+var rxjs_1 = require("rxjs");
 function generateModelsProperty(client, params) {
     var e_1, _a;
     var _this = this;
@@ -81,6 +82,20 @@ function generateModelsProperty(client, params) {
                     });
                 }); };
             }
+            else if (['ONCREATE', 'ONUPDATE', 'ONDELETE'].includes(operation)) {
+                models[name_1][operationPrefix] = function (arg, options) {
+                    var query = (0, APIClient_1.generateGraphQLDocument)(modelIntrospection.models, name_1, operation);
+                    var variables = (0, APIClient_1.buildGraphQLVariables)(model, operation, arg, modelIntrospection);
+                    var observable = client.graphql({
+                        query: query,
+                        variables: variables,
+                    });
+                    return observable.pipe((0, rxjs_1.map)(function (value) {
+                        var _a = tslib_1.__read(Object.keys(value.data), 1), key = _a[0];
+                        return value.data[key];
+                    }));
+                };
+            }
             else {
                 models[name_1][operationPrefix] = function (arg, options) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                     var query, variables, _a, data, extensions, _b, key_2, flattenedResult, _c, initialized, error_2;