@aws-amplify/datastore 4.7.6-api-v6-models.b3abc9b.0 → 5.0.0

package/lib/sync/processors/errorMaps.js

@@ -1,45 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var connectionTimeout = function (error) {
-    return /^Connection failed: Connection Timeout/.test(error.message);
-};
-var serverError = function (error) {
-    return /^Error: Request failed with status code 5\d\d/.test(error.message);
-};
+exports.mapErrorToType = exports.getSyncErrorType = exports.getSubscriptionErrorType = exports.getMutationErrorType = exports.syncErrorMap = exports.subscriptionErrorMap = exports.mutationErrorMap = void 0;
+const utils_1 = require("../utils");
+const connectionTimeout = error => /^Connection failed: Connection Timeout/.test(error.message);
+const serverError = error => (0, utils_1.resolveServiceErrorStatusCode)(error) >= 500;
 exports.mutationErrorMap = {
-    BadModel: function () { return false; },
-    BadRecord: function (error) {
-        var message = error.message;
+    BadModel: () => false,
+    BadRecord: error => {
+        const { message } = error;
         return (/^Cannot return \w+ for [\w-_]+ type/.test(message) ||
             /^Variable '.+' has coerced Null value for NonNull type/.test(message)); // newly required field, out of date client
     },
-    ConfigError: function () { return false; },
-    Transient: function (error) { return connectionTimeout(error) || serverError(error); },
-    Unauthorized: function (error) {
-        return error.message === 'Unauthorized' ||
-            /^Request failed with status code 401/.test(error.message);
-    },
+    ConfigError: () => false,
+    Transient: error => connectionTimeout(error) || serverError(error),
+    Unauthorized: error => error.message === 'Unauthorized' ||
+        (0, utils_1.resolveServiceErrorStatusCode)(error) === 401,
 };
 exports.subscriptionErrorMap = {
-    BadModel: function () { return false; },
-    BadRecord: function () { return false; },
-    ConfigError: function () { return false; },
-    Transient: function (observableError) {
-        var error = unwrapObservableError(observableError);
+    BadModel: () => false,
+    BadRecord: () => false,
+    ConfigError: () => false,
+    Transient: observableError => {
+        const error = unwrapObservableError(observableError);
         return connectionTimeout(error) || serverError(error);
     },
-    Unauthorized: function (observableError) {
-        var error = unwrapObservableError(observableError);
+    Unauthorized: observableError => {
+        const error = unwrapObservableError(observableError);
         return /Connection failed.+Unauthorized/.test(error.message);
     },
 };
 exports.syncErrorMap = {
-    BadModel: function () { return false; },
-    BadRecord: function (error) { return /^Cannot return \w+ for [\w-_]+ type/.test(error.message); },
-    ConfigError: function () { return false; },
-    Transient: function (error) { return connectionTimeout(error) || serverError(error); },
-    Unauthorized: function (error) { return error.errorType === 'Unauthorized'; },
+    BadModel: () => false,
+    BadRecord: error => /^Cannot return \w+ for [\w-_]+ type/.test(error.message),
+    ConfigError: () => false,
+    Transient: error => connectionTimeout(error) || serverError(error),
+    Unauthorized: error => error.errorType === 'Unauthorized',
 };
 /**
  * Get the first error reason of an observable.
@@ -48,9 +43,9 @@ exports.syncErrorMap = {
  * @param observableError an error from ZenObservable subscribe error callback
  */
 function unwrapObservableError(observableError) {
-    var _a = observableError.error, _b = tslib_1.__read((_a === void 0 ? {
+    const { errors: [error], } = ({
         errors: [],
-    } : _a).errors, 1), error = _b[0];
+    } = observableError);
     return error;
 }
 function getMutationErrorType(error) {
@@ -72,25 +67,13 @@ exports.getSyncErrorType = getSyncErrorType;
  * @param error The underying error to categorize.
  */
 function mapErrorToType(errorMap, error) {
-    var e_1, _a;
-    var errorTypes = tslib_1.__spread(Object.keys(errorMap));
-    try {
-        for (var errorTypes_1 = tslib_1.__values(errorTypes), errorTypes_1_1 = errorTypes_1.next(); !errorTypes_1_1.done; errorTypes_1_1 = errorTypes_1.next()) {
-            var errorType = errorTypes_1_1.value;
-            var matcher = errorMap[errorType];
-            if (matcher === null || matcher === void 0 ? void 0 : matcher(error)) {
-                return errorType;
-            }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (errorTypes_1_1 && !errorTypes_1_1.done && (_a = errorTypes_1.return)) _a.call(errorTypes_1);
+    const errorTypes = [...Object.keys(errorMap)];
+    for (const errorType of errorTypes) {
+        const matcher = errorMap[errorType];
+        if (matcher?.(error)) {
+            return errorType;
         }
-        finally { if (e_1) throw e_1.error; }
     }
     return 'Unknown';
 }
 exports.mapErrorToType = mapErrorToType;
-//# sourceMappingURL=errorMaps.js.map

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

@@ -1,11 +1,11 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { MutationEvent } from '../';
 import { ModelInstanceCreator } from '../../datastore/datastore';
 import { ExclusiveStorage as Storage } from '../../storage/storage';
 import { AuthModeStrategy, ConflictHandler, ErrorHandler, InternalSchema, PersistentModel, PersistentModelConstructor, SchemaModel, TypeConstructorMap, AmplifyContext } from '../../types';
 import { MutationEventOutbox } from '../outbox';
 import { TransformerMutationType } from '../utils';
-declare type MutationProcessorEvent = {
+type MutationProcessorEvent = {
     operation: TransformerMutationType;
     modelDefinition: SchemaModel;
     model: PersistentModel;