@aws-amplify/datastore 4.7.5 → 5.0.1-console-preview.4208d73.0

package/lib-esm/sync/utils.d.ts

@@ -1,5 +1,5 @@
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api-graphql';
 import { GraphQLAuthError } from '@aws-amplify/api';
+import { GraphQLAuthModeKeys } from '@aws-amplify/core/internals/utils';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { AuthorizationRule, GraphQLCondition, GraphQLFilter, ModelInstanceMetadata, OpType, PersistentModel, PersistentModelConstructor, PredicatesGroup, RelationshipType, SchemaModel, SchemaNamespace, SchemaNonModel, ModelOperation, InternalSchema, AuthModeStrategy } from '../types';
 import { MutationEvent } from './';
@@ -93,14 +93,14 @@ export declare function getUserGroupsFromToken(token: {
 }, rule: AuthorizationRule): string[];
 export declare function getModelAuthModes({ authModeStrategy, defaultAuthMode, modelName, schema, }: {
     authModeStrategy: AuthModeStrategy;
-    defaultAuthMode: GRAPHQL_AUTH_MODE;
+    defaultAuthMode: GraphQLAuthModeKeys;
     modelName: string;
     schema: InternalSchema;
 }): Promise<{
-    [key in ModelOperation]: GRAPHQL_AUTH_MODE[];
+    [key in ModelOperation]: GraphQLAuthModeKeys[];
 }>;
 export declare function getForbiddenError(error: any): any;
 export declare function getClientSideAuthError(error: any): GraphQLAuthError;
-export declare function getTokenForCustomAuth(authMode: GRAPHQL_AUTH_MODE, amplifyConfig?: Record<string, any>): Promise<string | undefined>;
+export declare function getTokenForCustomAuth(authMode: GraphQLAuthModeKeys, amplifyConfig?: Record<string, any>): Promise<string | undefined>;
 export declare function getIdentifierValue(modelDefinition: SchemaModel, model: ModelInstanceMetadata | PersistentModel): string;
 export {};

package/lib-esm/sync/utils.js

@@ -1,9 +1,90 @@
-import { __assign, __awaiter, __generator, __read, __spread, __values } from "tslib";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api-graphql';
 import { GraphQLAuthError } from '@aws-amplify/api';
-import { Logger } from '@aws-amplify/core';
+import { Logger } from '@aws-amplify/core/internals/utils';
 import { isEnumFieldType, isGraphQLScalarType, isPredicateObj, isSchemaModel, isSchemaModelWithAttributes, isTargetNameAssociation, isNonModelFieldType, OpType, ModelOperation, isPredicateGroup, } from '../types';
 import { extractPrimaryKeyFieldNames, establishRelationAndKeys, IDENTIFIER_KEY_SEPARATOR, } from '../util';
 var logger = new Logger('DataStore');
@@ -116,16 +197,16 @@ function getConnectionFields(modelDefinition, namespace) {
                         var keyFields = byPkIndex && byPkIndex[1];
                         var keyFieldSelectionSet = keyFields === null || keyFields === void 0 ? void 0 : keyFields.join(' ');
                         // We rely on `_deleted` when we process the sync query (e.g. in batchSave in the adapters)
-                        result.push(name + " { " + keyFieldSelectionSet + " _deleted }");
+                        result.push("".concat(name, " { ").concat(keyFieldSelectionSet, " _deleted }"));
                     }
                     else {
                         // backwards-compatability for schema generated prior to custom primary key support
-                        result.push(name + " { id _deleted }");
+                        result.push("".concat(name, " { id _deleted }"));
                     }
                 }
                 break;
             default:
-                throw new Error("Invalid connection type " + connectionType);
+                throw new Error("Invalid connection type ".concat(connectionType));
         }
     });
     return result;
@@ -145,10 +226,10 @@ function getNonModelFields(namespace, modelDefinition) {
                 var type = field.type, name = field.name;
                 if (isNonModelFieldType(type)) {
                     var typeDefinition_1 = namespace.nonModels[type.nonModel];
-                    nested_1.push(name + " { " + generateSelectionSet(namespace, typeDefinition_1) + " }");
+                    nested_1.push("".concat(name, " { ").concat(generateSelectionSet(namespace, typeDefinition_1), " }"));
                 }
             });
-            result.push(name + " { " + scalarFields.join(' ') + " " + nested_1.join(' ') + " }");
+            result.push("".concat(name, " { ").concat(scalarFields.join(' '), " ").concat(nested_1.join(' '), " }"));
         }
     });
     return result;
@@ -158,7 +239,7 @@ export function getAuthorizationRules(modelDefinition) {
     var authConfig = []
         .concat(modelDefinition.attributes || [])
         .find(function (attr) { return attr && attr.type === 'auth'; });
-    var _a = (authConfig || {}).properties, _b = (_a === void 0 ? {} : _a).rules, rules = _b === void 0 ? [] : _b;
+    var _a = (authConfig || {}).properties, _b = _a === void 0 ? {} : _a, _c = _b.rules, rules = _c === void 0 ? [] : _c;
     var resultRules = [];
     // Multiple rules can be declared for allow: owner
     rules.forEach(function (rule) {
@@ -186,7 +267,7 @@ export function getAuthorizationRules(modelDefinition) {
                 .concat(modelDefinition.attributes || [])
                 .find(function (attr) { return attr && attr.type === 'model'; });
             // find the subscriptions level. ON is default
-            var _j = (modelConfig || {}).properties, _k = (_j === void 0 ? {} : _j).subscriptions, _l = (_k === void 0 ? {} : _k).level, level = _l === void 0 ? 'on' : _l;
+            var _j = (modelConfig || {}).properties, _k = _j === void 0 ? {} : _j, _l = _k.subscriptions, _m = _l === void 0 ? {} : _l, _o = _m.level, level = _o === void 0 ? 'on' : _o;
             // treat subscriptions as public for owner auth with unprotected reads
             // when `read` is omitted from `operations`
             authRule.areSubscriptionsPublic =
@@ -205,23 +286,23 @@ export function buildSubscriptionGraphQLOperation(namespace, modelDefinition, tr
     if (filterArg === void 0) { filterArg = false; }
     var selectionSet = generateSelectionSet(namespace, modelDefinition);
     var typeName = modelDefinition.name;
-    var opName = "on" + transformerMutationType + typeName;
+    var opName = "on".concat(transformerMutationType).concat(typeName);
     var docArgs = [];
     var opArgs = [];
     if (filterArg) {
-        docArgs.push("$filter: ModelSubscription" + typeName + "FilterInput");
+        docArgs.push("$filter: ModelSubscription".concat(typeName, "FilterInput"));
         opArgs.push('filter: $filter');
     }
     if (isOwnerAuthorization) {
-        docArgs.push("$" + ownerField + ": String!");
-        opArgs.push(ownerField + ": $" + ownerField);
+        docArgs.push("$".concat(ownerField, ": String!"));
+        opArgs.push("".concat(ownerField, ": $").concat(ownerField));
     }
-    var docStr = docArgs.length ? "(" + docArgs.join(',') + ")" : '';
-    var opStr = opArgs.length ? "(" + opArgs.join(',') + ")" : '';
+    var docStr = docArgs.length ? "(".concat(docArgs.join(','), ")") : '';
+    var opStr = opArgs.length ? "(".concat(opArgs.join(','), ")") : '';
     return [
         transformerMutationType,
         opName,
-        "subscription operation" + docStr + "{\n\t\t\t" + opName + opStr + "{\n\t\t\t\t" + selectionSet + "\n\t\t\t}\n\t\t}",
+        "subscription operation".concat(docStr, "{\n\t\t\t").concat(opName).concat(opStr, "{\n\t\t\t\t").concat(selectionSet, "\n\t\t\t}\n\t\t}"),
     ];
 }
 export function buildGraphQLOperation(namespace, modelDefinition, graphQLOpType) {
@@ -233,44 +314,44 @@ export function buildGraphQLOperation(namespace, modelDefinition, graphQLOpType)
     var transformerMutationType;
     switch (graphQLOpType) {
         case 'LIST':
-            operation = "sync" + pluralTypeName;
-            documentArgs = "($limit: Int, $nextToken: String, $lastSync: AWSTimestamp, $filter: Model" + typeName + "FilterInput)";
+            operation = "sync".concat(pluralTypeName);
+            documentArgs = "($limit: Int, $nextToken: String, $lastSync: AWSTimestamp, $filter: Model".concat(typeName, "FilterInput)");
             operationArgs =
                 '(limit: $limit, nextToken: $nextToken, lastSync: $lastSync, filter: $filter)';
-            selectionSet = "items {\n\t\t\t\t\t\t\t" + selectionSet + "\n\t\t\t\t\t\t}\n\t\t\t\t\t\tnextToken\n\t\t\t\t\t\tstartedAt";
+            selectionSet = "items {\n\t\t\t\t\t\t\t".concat(selectionSet, "\n\t\t\t\t\t\t}\n\t\t\t\t\t\tnextToken\n\t\t\t\t\t\tstartedAt");
             break;
         case 'CREATE':
-            operation = "create" + typeName;
-            documentArgs = "($input: Create" + typeName + "Input!)";
+            operation = "create".concat(typeName);
+            documentArgs = "($input: Create".concat(typeName, "Input!)");
             operationArgs = '(input: $input)';
             transformerMutationType = TransformerMutationType.CREATE;
             break;
         case 'UPDATE':
-            operation = "update" + typeName;
-            documentArgs = "($input: Update" + typeName + "Input!, $condition: Model" + typeName + "ConditionInput)";
+            operation = "update".concat(typeName);
+            documentArgs = "($input: Update".concat(typeName, "Input!, $condition: Model").concat(typeName, "ConditionInput)");
             operationArgs = '(input: $input, condition: $condition)';
             transformerMutationType = TransformerMutationType.UPDATE;
             break;
         case 'DELETE':
-            operation = "delete" + typeName;
-            documentArgs = "($input: Delete" + typeName + "Input!, $condition: Model" + typeName + "ConditionInput)";
+            operation = "delete".concat(typeName);
+            documentArgs = "($input: Delete".concat(typeName, "Input!, $condition: Model").concat(typeName, "ConditionInput)");
             operationArgs = '(input: $input, condition: $condition)';
             transformerMutationType = TransformerMutationType.DELETE;
             break;
         case 'GET':
-            operation = "get" + typeName;
+            operation = "get".concat(typeName);
             documentArgs = "($id: ID!)";
             operationArgs = '(id: $id)';
             transformerMutationType = TransformerMutationType.GET;
             break;
         default:
-            throw new Error("Invalid graphQlOpType " + graphQLOpType);
+            throw new Error("Invalid graphQlOpType ".concat(graphQLOpType));
     }
     return [
         [
             transformerMutationType,
             operation,
-            GraphQLOperationType[graphQLOpType] + " operation" + documentArgs + "{\n\t\t" + operation + operationArgs + "{\n\t\t\t" + selectionSet + "\n\t\t}\n\t}",
+            "".concat(GraphQLOperationType[graphQLOpType], " operation").concat(documentArgs, "{\n\t\t").concat(operation).concat(operationArgs, "{\n\t\t\t").concat(selectionSet, "\n\t\t}\n\t}"),
         ],
     ];
 }
@@ -287,7 +368,7 @@ export function createMutationInstanceFromModelOperation(relationships, modelDef
             operation = TransformerMutationType.DELETE;
             break;
         default:
-            throw new Error("Invalid opType " + opType);
+            throw new Error("Invalid opType ".concat(opType));
     }
     // stringify nested objects of type AWSJSON
     // this allows us to return parsed JSON to users (see `castInstanceType()` in datastore.ts),
@@ -407,14 +488,14 @@ export function filterFields(group) {
     if (!group || !Array.isArray(group.predicates))
         return fields;
     var predicates = group.predicates;
-    var stack = __spread(predicates);
+    var stack = __spreadArray([], __read(predicates), false);
     while (stack.length > 0) {
         var current = stack.pop();
         if (isPredicateObj(current)) {
             fields.add(current.field);
         }
         else if (isPredicateGroup(current)) {
-            stack.push.apply(stack, __spread(current.predicates));
+            stack.push.apply(stack, __spreadArray([], __read(current.predicates), false));
         }
     }
     return fields;
@@ -475,7 +556,7 @@ export function countFilterCombinations(group) {
             if (type === 'or' && predicates.length > 1) {
                 count += predicates.length;
             }
-            stack.push.apply(stack, __spread(predicates));
+            stack.push.apply(stack, __spreadArray([], __read(predicates), false));
         }
     }
     // if we didn't encounter any OR groups, default to 1
@@ -541,7 +622,7 @@ export function repeatedFieldInGroup(group) {
                 return repeatedField;
             }
         }
-        stack.push.apply(stack, __spread(predicateGroups));
+        stack.push.apply(stack, __spreadArray([], __read(predicateGroups), false));
     }
     return null;
 }
@@ -556,9 +637,9 @@ export var RTFError;
 })(RTFError || (RTFError = {}));
 export function generateRTFRemediation(errorType, modelDefinition, predicatesGroup) {
     var selSyncFields = filterFields(predicatesGroup);
-    var selSyncFieldStr = __spread(selSyncFields).join(', ');
+    var selSyncFieldStr = __spreadArray([], __read(selSyncFields), false).join(', ');
     var dynamicAuthModeFields = dynamicAuthFields(modelDefinition);
-    var dynamicAuthFieldsStr = __spread(dynamicAuthModeFields).join(', ');
+    var dynamicAuthFieldsStr = __spreadArray([], __read(dynamicAuthModeFields), false).join(', ');
     var filterCombinations = countFilterCombinations(predicatesGroup);
     var repeatedField = repeatedFieldInGroup(predicatesGroup);
     switch (errorType) {
@@ -566,29 +647,29 @@ export function generateRTFRemediation(errorType, modelDefinition, predicatesGro
             return ("Your API was generated with an older version of the CLI that doesn't support backend subscription filtering." +
                 'To enable backend subscription filtering, upgrade your Amplify CLI to the latest version and push your app by running `amplify upgrade` followed by `amplify push`');
         case RTFError.MaxAttributes: {
-            var message = "Your selective sync expression for " + modelDefinition.name + " contains " + selSyncFields.size + " different model fields: " + selSyncFieldStr + ".\n\n";
+            var message = "Your selective sync expression for ".concat(modelDefinition.name, " contains ").concat(selSyncFields.size, " different model fields: ").concat(selSyncFieldStr, ".\n\n");
             if (dynamicAuthModeFields.size > 0) {
                 message +=
                     "Note: the number of fields you can use with selective sync is affected by @auth rules configured on the model.\n\n" +
                         "Dynamic auth modes, such as owner auth and dynamic group auth each utilize 1 field.\n" +
-                        ("You currently have " + dynamicAuthModeFields.size + " dynamic auth mode(s) configured on this model: " + dynamicAuthFieldsStr + ".");
+                        "You currently have ".concat(dynamicAuthModeFields.size, " dynamic auth mode(s) configured on this model: ").concat(dynamicAuthFieldsStr, ".");
             }
             return message;
         }
         case RTFError.MaxCombinations: {
-            var message = "Your selective sync expression for " + modelDefinition.name + " contains " + filterCombinations + " field combinations (total number of predicates in an OR expression).\n\n";
+            var message = "Your selective sync expression for ".concat(modelDefinition.name, " contains ").concat(filterCombinations, " field combinations (total number of predicates in an OR expression).\n\n");
             if (dynamicAuthModeFields.size > 0) {
                 message +=
                     "Note: the number of fields you can use with selective sync is affected by @auth rules configured on the model.\n\n" +
                         "Dynamic auth modes, such as owner auth and dynamic group auth factor in to the number of combinations you're using.\n" +
-                        ("You currently have " + dynamicAuthModeFields.size + " dynamic auth mode(s) configured on this model: " + dynamicAuthFieldsStr + ".");
+                        "You currently have ".concat(dynamicAuthModeFields.size, " dynamic auth mode(s) configured on this model: ").concat(dynamicAuthFieldsStr, ".");
             }
             return message;
         }
         case RTFError.RepeatedFieldname:
-            return "Your selective sync expression for " + modelDefinition.name + " contains multiple entries for " + repeatedField + " in the same AND group.";
+            return "Your selective sync expression for ".concat(modelDefinition.name, " contains multiple entries for ").concat(repeatedField, " in the same AND group.");
         case RTFError.NotGroup:
-            return ("Your selective sync expression for " + modelDefinition.name + " uses a `not` group. If you'd like to filter subscriptions in the backend, " +
+            return ("Your selective sync expression for ".concat(modelDefinition.name, " uses a `not` group. If you'd like to filter subscriptions in the backend, ") +
                 "rewrite your expression using `ne` or `notContains` operators.");
         case RTFError.FieldNotInType:
             // no remediation instructions. We'll surface the message directly
@@ -658,7 +739,7 @@ export function getModelAuthModes(_a) {
                     return [3 /*break*/, 4];
                 case 3:
                     error_1 = _b.sent();
-                    logger.debug("Error getting auth modes for model: " + modelName, error_1);
+                    logger.debug("Error getting auth modes for model: ".concat(modelName), error_1);
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/, modelAuthModes];
             }
@@ -696,27 +777,27 @@ export function getClientSideAuthError(error) {
 export function getTokenForCustomAuth(authMode, amplifyConfig) {
     if (amplifyConfig === void 0) { amplifyConfig = {}; }
     return __awaiter(this, void 0, void 0, function () {
-        var _a, functionAuthProvider, token, error_2;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var _a, _b, functionAuthProvider, token, error_2;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    if (!(authMode === GRAPHQL_AUTH_MODE.AWS_LAMBDA)) return [3 /*break*/, 6];
-                    _a = amplifyConfig.authProviders, functionAuthProvider = (_a === void 0 ? { functionAuthProvider: null } : _a).functionAuthProvider;
+                    if (!(authMode === 'lambda')) return [3 /*break*/, 6];
+                    _a = amplifyConfig.authProviders, _b = _a === void 0 ? { functionAuthProvider: null } : _a, functionAuthProvider = _b.functionAuthProvider;
                     if (!(functionAuthProvider && typeof functionAuthProvider === 'function')) return [3 /*break*/, 5];
-                    _b.label = 1;
+                    _c.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
+                    _c.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, functionAuthProvider()];
                 case 2:
-                    token = (_b.sent()).token;
+                    token = (_c.sent()).token;
                     return [2 /*return*/, token];
                 case 3:
-                    error_2 = _b.sent();
-                    throw new Error("Error retrieving token from `functionAuthProvider`: " + error_2);
+                    error_2 = _c.sent();
+                    throw new Error("Error retrieving token from `functionAuthProvider`: ".concat(error_2));
                 case 4: return [3 /*break*/, 6];
                 case 5: 
                 // TODO: add docs link once available
-                throw new Error("You must provide a `functionAuthProvider` function to `DataStore.configure` when using " + GRAPHQL_AUTH_MODE.AWS_LAMBDA);
+                throw new Error('You must provide a `functionAuthProvider` function to `DataStore.configure` when using lambda');
                 case 6: return [2 /*return*/];
             }
         });
@@ -728,4 +809,3 @@ export function getIdentifierValue(modelDefinition, model) {
     var idOrPk = pkFieldNames.map(function (f) { return model[f]; }).join(IDENTIFIER_KEY_SEPARATOR);
     return idOrPk;
 }
-//# sourceMappingURL=utils.js.map