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

package/lib/sync/processors/sync.d.ts

@@ -17,7 +17,7 @@ declare class SyncProcessor {
     start(typesLastSync: Map<SchemaModel, [string, number]>): Observable<SyncModelPage>;
     stop(): Promise<void>;
 }
-export declare type SyncModelPage = {
+export type SyncModelPage = {
     namespace: string;
     modelDefinition: SchemaModel;
     items: ModelInstanceMetadata[];

package/lib/sync/processors/sync.js

@@ -1,10 +1,77 @@
 "use strict";
+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 __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.");
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+exports.SyncProcessor = void 0;
 var internals_1 = require("@aws-amplify/api/internals");
-var zen_observable_ts_1 = tslib_1.__importDefault(require("zen-observable-ts"));
+var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
 var types_1 = require("../../types");
 var utils_1 = require("../utils");
+var utils_2 = require("@aws-amplify/core/internals/utils");
 var core_1 = require("@aws-amplify/core");
 var predicates_1 = require("../../predicates");
 var errorMaps_1 = require("./errorMaps");
@@ -13,7 +80,7 @@ var opResultDefaults = {
     nextToken: null,
     startedAt: null,
 };
-var logger = new core_1.ConsoleLogger('DataStore');
+var logger = new utils_2.ConsoleLogger('DataStore');
 var SyncProcessor = /** @class */ (function () {
     function SyncProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler, amplifyContext) {
         if (amplifyConfig === void 0) { amplifyConfig = {}; }
@@ -24,7 +91,7 @@ var SyncProcessor = /** @class */ (function () {
         this.errorHandler = errorHandler;
         this.amplifyContext = amplifyContext;
         this.typeQuery = new WeakMap();
-        this.runningProcesses = new core_1.BackgroundProcessManager();
+        this.runningProcesses = new utils_2.BackgroundProcessManager();
         amplifyContext.InternalAPI = amplifyContext.InternalAPI || internals_1.InternalAPI;
         this.generateQueries();
     }
@@ -37,7 +104,7 @@ var SyncProcessor = /** @class */ (function () {
                 return syncable;
             })
                 .forEach(function (model) {
-                var _a = tslib_1.__read(utils_1.buildGraphQLOperation(namespace, model, 'LIST'), 1), _b = tslib_1.__read(_a[0]), opNameQuery = _b.slice(1);
+                var _a = __read((0, utils_1.buildGraphQLOperation)(namespace, model, 'LIST'), 1), _b = __read(_a[0]), opNameQuery = _b.slice(1);
                 _this.typeQuery.set(model, opNameQuery);
             });
         });
@@ -50,24 +117,24 @@ var SyncProcessor = /** @class */ (function () {
         if (!predicatesGroup) {
             return null;
         }
-        return utils_1.predicateToGraphQLFilter(predicatesGroup);
+        return (0, utils_1.predicateToGraphQLFilter)(predicatesGroup);
     };
     SyncProcessor.prototype.retrievePage = function (modelDefinition, lastSync, nextToken, limit, filter, onTerminate) {
         if (limit === void 0) { limit = null; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a, opName, query, variables, modelAuthModes, readAuthModes, authModeAttempts, authModeRetry, data, _b, _c, opResult, items, newNextToken, startedAt;
             var _this = this;
-            return tslib_1.__generator(this, function (_d) {
+            return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        _a = tslib_1.__read(this.typeQuery.get(modelDefinition), 2), opName = _a[0], query = _a[1];
+                        _a = __read(this.typeQuery.get(modelDefinition), 2), opName = _a[0], query = _a[1];
                         variables = {
                             limit: limit,
                             nextToken: nextToken,
                             lastSync: lastSync,
                             filter: filter,
                         };
-                        return [4 /*yield*/, utils_1.getModelAuthModes({
+                        return [4 /*yield*/, (0, utils_1.getModelAuthModes)({
                                 authModeStrategy: this.authModeStrategy,
                                 defaultAuthMode: this.amplifyConfig.aws_appsync_authenticationType,
                                 modelName: modelDefinition.name,
@@ -77,10 +144,10 @@ var SyncProcessor = /** @class */ (function () {
                         modelAuthModes = _d.sent();
                         readAuthModes = modelAuthModes.READ;
                         authModeAttempts = 0;
-                        authModeRetry = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        authModeRetry = function () { return __awaiter(_this, void 0, void 0, function () {
                             var response, error_1, authMode;
                             var _a;
-                            return tslib_1.__generator(this, function (_b) {
+                            return __generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
                                         if (!this.runningProcesses.isOpen) {
@@ -89,7 +156,7 @@ var SyncProcessor = /** @class */ (function () {
                                         _b.label = 1;
                                     case 1:
                                         _b.trys.push([1, 3, , 5]);
-                                        logger.debug("Attempting sync with authMode: " + readAuthModes[authModeAttempts]);
+                                        logger.debug("Attempting sync with authMode: ".concat(readAuthModes[authModeAttempts]));
                                         return [4 /*yield*/, this.jitteredRetry({
                                                 query: query,
                                                 variables: variables,
@@ -100,17 +167,17 @@ var SyncProcessor = /** @class */ (function () {
                                             })];
                                     case 2:
                                         response = _b.sent();
-                                        logger.debug("Sync successful with authMode: " + readAuthModes[authModeAttempts]);
+                                        logger.debug("Sync successful with authMode: ".concat(readAuthModes[authModeAttempts]));
                                         return [2 /*return*/, response];
                                     case 3:
                                         error_1 = _b.sent();
                                         authModeAttempts++;
                                         if (authModeAttempts >= readAuthModes.length) {
                                             authMode = readAuthModes[authModeAttempts - 1];
-                                            logger.debug("Sync failed with authMode: " + authMode, error_1);
-                                            if (utils_1.getClientSideAuthError(error_1) || utils_1.getForbiddenError(error_1)) {
+                                            logger.debug("Sync failed with authMode: ".concat(authMode), error_1);
+                                            if ((0, utils_1.getClientSideAuthError)(error_1) || (0, utils_1.getForbiddenError)(error_1)) {
                                                 // return empty list of data so DataStore will continue to sync other models
-                                                logger.warn("User is unauthorized to query " + opName + " with auth mode " + authMode + ". No data could be returned.");
+                                                logger.warn("User is unauthorized to query ".concat(opName, " with auth mode ").concat(authMode, ". No data could be returned."));
                                                 return [2 /*return*/, {
                                                         data: (_a = {},
                                                             _a[opName] = opResultDefaults,
@@ -119,7 +186,7 @@ var SyncProcessor = /** @class */ (function () {
                                             }
                                             throw error_1;
                                         }
-                                        logger.debug("Sync failed with authMode: " + readAuthModes[authModeAttempts - 1] + ". Retrying with authMode: " + readAuthModes[authModeAttempts]);
+                                        logger.debug("Sync failed with authMode: ".concat(readAuthModes[authModeAttempts - 1], ". Retrying with authMode: ").concat(readAuthModes[authModeAttempts]));
                                         return [4 /*yield*/, authModeRetry()];
                                     case 4: return [2 /*return*/, _b.sent()];
                                     case 5: return [2 /*return*/];
@@ -142,24 +209,24 @@ var SyncProcessor = /** @class */ (function () {
     };
     SyncProcessor.prototype.jitteredRetry = function (_a) {
         var query = _a.query, variables = _a.variables, opName = _a.opName, modelDefinition = _a.modelDefinition, authMode = _a.authMode, onTerminate = _a.onTerminate;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, core_1.jitteredExponentialRetry(function (query, variables) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    case 0: return [4 /*yield*/, (0, utils_2.jitteredExponentialRetry)(function (query, variables) { return __awaiter(_this, void 0, void 0, function () {
                             var authToken, customUserAgentDetails, error_2, clientOrForbiddenErrorMessage, hasItems, unauthorized, otherErrors, result;
                             var _this = this;
                             var _a, _b, _c, _d;
-                            return tslib_1.__generator(this, function (_e) {
+                            return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
                                         _e.trys.push([0, 3, , 6]);
-                                        return [4 /*yield*/, utils_1.getTokenForCustomAuth(authMode, this.amplifyConfig)];
+                                        return [4 /*yield*/, (0, utils_1.getTokenForCustomAuth)(authMode, this.amplifyConfig)];
                                     case 1:
                                         authToken = _e.sent();
                                         customUserAgentDetails = {
-                                            category: core_1.Category.DataStore,
-                                            action: core_1.DataStoreAction.GraphQl,
+                                            category: utils_2.Category.DataStore,
+                                            action: utils_2.DataStoreAction.GraphQl,
                                         };
                                         return [4 /*yield*/, this.amplifyContext.InternalAPI.graphql({
                                                 query: query,
@@ -170,10 +237,10 @@ var SyncProcessor = /** @class */ (function () {
                                     case 2: return [2 /*return*/, _e.sent()];
                                     case 3:
                                         error_2 = _e.sent();
-                                        clientOrForbiddenErrorMessage = utils_1.getClientSideAuthError(error_2) || utils_1.getForbiddenError(error_2);
+                                        clientOrForbiddenErrorMessage = (0, utils_1.getClientSideAuthError)(error_2) || (0, utils_1.getForbiddenError)(error_2);
                                         if (clientOrForbiddenErrorMessage) {
                                             logger.error('Sync processor retry error:', error_2);
-                                            throw new core_1.NonRetryableError(clientOrForbiddenErrorMessage);
+                                            throw new utils_2.NonRetryableError(clientOrForbiddenErrorMessage);
                                         }
                                         hasItems = Boolean((_b = (_a = error_2 === null || error_2 === void 0 ? void 0 : error_2.data) === null || _a === void 0 ? void 0 : _a[opName]) === null || _b === void 0 ? void 0 : _b.items);
                                         unauthorized = (error_2 === null || error_2 === void 0 ? void 0 : error_2.errors) &&
@@ -185,9 +252,9 @@ var SyncProcessor = /** @class */ (function () {
                                             result.data[opName].items = result.data[opName].items.filter(function (item) { return item !== null; });
                                         }
                                         if (!(hasItems && (otherErrors === null || otherErrors === void 0 ? void 0 : otherErrors.length))) return [3 /*break*/, 5];
-                                        return [4 /*yield*/, Promise.all(otherErrors.map(function (err) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                        return [4 /*yield*/, Promise.all(otherErrors.map(function (err) { return __awaiter(_this, void 0, void 0, function () {
                                                 var e_1;
-                                                return tslib_1.__generator(this, function (_a) {
+                                                return __generator(this, function (_a) {
                                                     switch (_a.label) {
                                                         case 0:
                                                             _a.trys.push([0, 2, , 3]);
@@ -197,7 +264,7 @@ var SyncProcessor = /** @class */ (function () {
                                                                     message: err.message,
                                                                     model: modelDefinition.name,
                                                                     operation: opName,
-                                                                    errorType: errorMaps_1.getSyncErrorType(err),
+                                                                    errorType: (0, errorMaps_1.getSyncErrorType)(err),
                                                                     process: types_1.ProcessName.sync,
                                                                     remoteModel: null,
                                                                     cause: err,
@@ -255,12 +322,12 @@ var SyncProcessor = /** @class */ (function () {
                                                 message: error_2.message,
                                                 model: modelDefinition.name,
                                                 operation: opName,
-                                                errorType: errorMaps_1.getSyncErrorType(error_2.errors[0]),
+                                                errorType: (0, errorMaps_1.getSyncErrorType)(error_2.errors[0]),
                                                 process: types_1.ProcessName.sync,
                                                 remoteModel: null,
                                                 cause: error_2,
                                             });
-                                            throw new core_1.NonRetryableError(error_2);
+                                            throw new utils_2.NonRetryableError(error_2);
                                         }
                                         if ((_d = (_c = result.data) === null || _c === void 0 ? void 0 : _c[opName].items) === null || _d === void 0 ? void 0 : _d.length) {
                                             return [2 /*return*/, result];
@@ -283,7 +350,7 @@ var SyncProcessor = /** @class */ (function () {
             var sortedTypesLastSyncs = Object.values(_this.schema.namespaces).reduce(function (map, namespace) {
                 var e_2, _a;
                 try {
-                    for (var _b = tslib_1.__values(Array.from(namespace.modelTopologicalOrdering.keys())), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = __values(Array.from(namespace.modelTopologicalOrdering.keys())), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var modelName = _c.value;
                         var typeLastSync = typesLastSync.get(namespace.models[modelName]);
                         map.set(namespace.models[modelName], typeLastSync);
@@ -300,16 +367,16 @@ var SyncProcessor = /** @class */ (function () {
             }, new Map());
             var allModelsReady = Array.from(sortedTypesLastSyncs.entries())
                 .filter(function (_a) {
-                var _b = tslib_1.__read(_a, 1), syncable = _b[0].syncable;
+                var _b = __read(_a, 1), syncable = _b[0].syncable;
                 return syncable;
             })
                 .map(function (_a) {
-                var _b = tslib_1.__read(_a, 2), modelDefinition = _b[0], _c = tslib_1.__read(_b[1], 2), namespace = _c[0], lastSync = _c[1];
+                var _b = __read(_a, 2), modelDefinition = _b[0], _c = __read(_b[1], 2), namespace = _c[0], lastSync = _c[1];
                 return _this.runningProcesses.isOpen &&
-                    _this.runningProcesses.add(function (onTerminate) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    _this.runningProcesses.add(function (onTerminate) { return __awaiter(_this, void 0, void 0, function () {
                         var done, nextToken, startedAt, items, recordsReceived, filter, parents, promises, promise;
                         var _this = this;
-                        return tslib_1.__generator(this, function (_a) {
+                        return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     done = false;
@@ -320,12 +387,12 @@ var SyncProcessor = /** @class */ (function () {
                                     filter = this.graphqlFilterFromPredicate(modelDefinition);
                                     parents = this.schema.namespaces[namespace].modelTopologicalOrdering.get(modelDefinition.name);
                                     promises = parents.map(function (parent) {
-                                        return parentPromises.get(namespace + "_" + parent);
+                                        return parentPromises.get("".concat(namespace, "_").concat(parent));
                                     });
-                                    promise = new Promise(function (res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                    promise = new Promise(function (res) { return __awaiter(_this, void 0, void 0, function () {
                                         var limit, error_3, e_3;
                                         var _a;
-                                        return tslib_1.__generator(this, function (_b) {
+                                        return __generator(this, function (_b) {
                                             switch (_b.label) {
                                                 case 0: return [4 /*yield*/, Promise.all(promises)];
                                                 case 1:
@@ -338,7 +405,7 @@ var SyncProcessor = /** @class */ (function () {
                                                      * finished terminating and/or waiting for its background processes to complete.
                                                      */
                                                     if (!this.runningProcesses.isOpen) {
-                                                        logger.debug("Sync processor has been stopped, terminating sync for " + modelDefinition.name);
+                                                        logger.debug("Sync processor has been stopped, terminating sync for ".concat(modelDefinition.name));
                                                         return [2 /*return*/, res()];
                                                     }
                                                     limit = Math.min(maxRecordsToSync - recordsReceived, syncPageSize);
@@ -360,7 +427,7 @@ var SyncProcessor = /** @class */ (function () {
                                                             message: error_3.message,
                                                             model: modelDefinition.name,
                                                             operation: null,
-                                                            errorType: errorMaps_1.getSyncErrorType(error_3),
+                                                            errorType: (0, errorMaps_1.getSyncErrorType)(error_3),
                                                             process: types_1.ProcessName.sync,
                                                             remoteModel: null,
                                                             cause: error_3,
@@ -405,14 +472,14 @@ var SyncProcessor = /** @class */ (function () {
                                             }
                                         });
                                     }); });
-                                    parentPromises.set(namespace + "_" + modelDefinition.name, promise);
+                                    parentPromises.set("".concat(namespace, "_").concat(modelDefinition.name), promise);
                                     return [4 /*yield*/, promise];
                                 case 1:
                                     _a.sent();
                                     return [2 /*return*/];
                             }
                         });
-                    }); }, "adding model " + modelDefinition.name);
+                    }); }, "adding model ".concat(modelDefinition.name));
             });
             Promise.all(allModelsReady).then(function () {
                 observer.complete();
@@ -421,8 +488,8 @@ var SyncProcessor = /** @class */ (function () {
         return observable;
     };
     SyncProcessor.prototype.stop = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         logger.debug('stopping sync processor');
@@ -441,4 +508,3 @@ var SyncProcessor = /** @class */ (function () {
     return SyncProcessor;
 }());
 exports.SyncProcessor = SyncProcessor;
-//# sourceMappingURL=sync.js.map

package/lib/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 {};