@aws-amplify/api-graphql 4.0.1-api-v6-models.572a7b5.0 → 4.0.1-api-v6-models.9493d4d.0

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 = '*';
+var SELECTION_SET_WILDCARD = '*';
 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 = '';
 /**
@@ -172,71 +184,54 @@ var FIELD_IR = '';
  * ```
  */
 function customSelectionSetToIR(modelIntrospection, modelName, selectionSet) {
-    var e_2, _a;
-    var _b, _c, _d, _e;
     var modelDefinition = modelIntrospection[modelName];
-    var fields = modelDefinition.fields;
-    var intermediateSelectionSet = {};
-    try {
-        for (var selectionSet_1 = tslib_1.__values(selectionSet), selectionSet_1_1 = selectionSet_1.next(); !selectionSet_1_1.done; selectionSet_1_1 = selectionSet_1.next()) {
-            var f = selectionSet_1_1.value;
-            var nested = f.includes('.');
-            if (nested) {
-                var _f = tslib_1.__read(f.split('.'), 2), modelFieldName = _f[0], selectedField = _f[1];
-                var relatedModel = (_c = (_b = fields[modelFieldName]) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.model;
-                if (!relatedModel) {
-                    // TODO: may need to change this to support custom types
-                    throw Error("".concat(modelFieldName, " is not a model field"));
-                }
-                if (selectedField === SELECTION_SET_ALL_NESTED) {
-                    var relatedModelDefinition = modelIntrospection[relatedModel];
-                    var defaultSelectionSet = defaultSelectionSetForModel(relatedModelDefinition);
-                    var reduced = defaultSelectionSet.reduce(function (acc, curVal) {
-                        acc[curVal] = FIELD_IR;
-                        return acc;
-                    }, {});
-                    if ((_d = fields[modelFieldName]) === null || _d === void 0 ? void 0 : _d.isArray) {
-                        intermediateSelectionSet[modelFieldName] = {
-                            items: reduced,
-                        };
-                    }
-                    else {
-                        intermediateSelectionSet[modelFieldName] = reduced;
-                    }
-                }
-                else {
-                    var getNestedSelSet = customSelectionSetToIR(modelIntrospection, relatedModel, [selectedField]);
-                    if ((_e = fields[modelFieldName]) === null || _e === void 0 ? void 0 : _e.isArray) {
-                        var existing = intermediateSelectionSet[modelFieldName] || { items: {} };
-                        var merged = tslib_1.__assign(tslib_1.__assign({}, existing.items), getNestedSelSet);
-                        intermediateSelectionSet[modelFieldName] = { items: merged };
-                    }
-                    else {
-                        var existingItems = intermediateSelectionSet[modelFieldName] || {};
-                        var merged = tslib_1.__assign(tslib_1.__assign({}, existingItems), getNestedSelSet);
-                        intermediateSelectionSet[modelFieldName] = merged;
-                    }
-                }
+    var modelFields = modelDefinition.fields;
+    return selectionSet.reduce(function (resultObj, path) {
+        var _a, _b, _c;
+        var _d = tslib_1.__read(path.split('.')), fieldName = _d[0], nested = _d[1], rest = _d.slice(2);
+        if (nested) {
+            var relatedModel = (_b = (_a = modelFields[fieldName]) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.model;
+            if (!relatedModel) {
+                // TODO: may need to change this to support custom types
+                throw Error("".concat(fieldName, " is not a model field"));
             }
-            else {
-                var exists = Boolean(fields[f]);
-                if (!exists) {
-                    throw Error("".concat(f, " is not a field of model ").concat(modelName));
-                }
-                intermediateSelectionSet[f] = FIELD_IR;
+            var relatedModelDefinition = modelIntrospection[relatedModel];
+            var selectionSet_1 = nested === SELECTION_SET_WILDCARD
+                ? defaultSelectionSetIR(relatedModelDefinition)
+                : // if we have a path like 'field.anotherField' recursively build up selection set IR
+                    customSelectionSetToIR(modelIntrospection, relatedModel, [
+                        tslib_1.__spreadArray([nested], tslib_1.__read(rest), false).join('.'),
+                    ]);
+            if ((_c = modelFields[fieldName]) === null || _c === void 0 ? void 0 : _c.isArray) {
+                var existing = resultObj[fieldName] || {
+                    items: {},
+                };
+                var merged_1 = tslib_1.__assign(tslib_1.__assign({}, existing.items), selectionSet_1);
+                resultObj[fieldName] = { items: merged_1 };
+                return resultObj;
             }
+            var existingItems = resultObj[fieldName] || {};
+            var merged = tslib_1.__assign(tslib_1.__assign({}, existingItems), selectionSet_1);
+            resultObj[fieldName] = merged;
+            return resultObj;
         }
-    }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-    finally {
-        try {
-            if (selectionSet_1_1 && !selectionSet_1_1.done && (_a = selectionSet_1.return)) _a.call(selectionSet_1);
+        var exists = Boolean(modelFields[fieldName]);
+        if (!exists) {
+            throw Error("".concat(fieldName, " is not a field of model ").concat(modelName));
         }
-        finally { if (e_2) throw e_2.error; }
-    }
-    return intermediateSelectionSet;
+        resultObj[fieldName] = FIELD_IR;
+        return resultObj;
+    }, {});
 }
 exports.customSelectionSetToIR = customSelectionSetToIR;
+var defaultSelectionSetIR = function (relatedModelDefinition) {
+    var defaultSelectionSet = defaultSelectionSetForModel(relatedModelDefinition);
+    var reduced = defaultSelectionSet.reduce(function (acc, curVal) {
+        acc[curVal] = FIELD_IR;
+        return acc;
+    }, {});
+    return reduced;
+};
 /**
  * Stringifies selection set IR
  * * @example
@@ -325,6 +320,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 +376,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/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;