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

package/lib-esm/datastore/datastore.js

@@ -1,10 +1,123 @@
-import { __assign, __asyncValues, __awaiter, __extends, __generator, __read, __rest, __spread, __values } from "tslib";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+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 __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+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 __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));
+};
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { InternalAPI } from '@aws-amplify/api/internals';
-import { Auth } from '@aws-amplify/auth';
-import { Cache } from '@aws-amplify/cache';
-import { Amplify, ConsoleLogger as Logger, Hub, browserOrNode, BackgroundProcessManager, } from '@aws-amplify/core';
+import { Amplify, Hub, Cache } from '@aws-amplify/core';
 import { immerable, produce, setAutoFreeze, enablePatches, } from 'immer';
 import { v4 as uuid4 } from 'uuid';
 import Observable from 'zen-observable-ts';
@@ -17,11 +130,11 @@ import { GraphQLScalarType, isGraphQLScalarType, isSchemaModelWithAttributes, Au
 import { DATASTORE, errorMessages, establishRelationAndKeys, isModelConstructor, monotonicUlidFactory, STORAGE, SYNC, USER, isNullOrUndefined, registerNonModelClass, sortCompareFunction, DeferredCallbackResolver, inMemoryPagination, extractPrimaryKeyFieldNames, extractPrimaryKeysAndValues, isIdManaged, isIdOptionallyManaged, mergePatches, getTimestampFields, } from '../util';
 import { recursivePredicateFor, predicateFor, internals, } from '../predicates/next';
 import { getIdentifierValue } from '../sync/utils';
+import { BackgroundProcessManager, Logger, } from '@aws-amplify/core/internals/utils';
 setAutoFreeze(true);
 enablePatches();
 var logger = new Logger('DataStore');
 var ulid = monotonicUlidFactory(Date.now());
-var isNode = browserOrNode().isNode;
 var SETTING_SCHEMA_VERSION = 'schemaVersion';
 var schema;
 var modelNamespaceMap = new WeakMap();
@@ -51,7 +164,7 @@ var isValidModelConstructor = function (obj) {
 var namespaceResolver = function (modelConstructor) {
     var resolver = modelNamespaceMap.get(modelConstructor);
     if (!resolver) {
-        throw new Error("Namespace Resolver for '" + modelConstructor.name + "' not found! This is probably a bug in '@amplify-js/datastore'.");
+        throw new Error("Namespace Resolver for '".concat(modelConstructor.name, "' not found! This is probably a bug in '@amplify-js/datastore'."));
     }
     return resolver;
 };
@@ -215,7 +328,7 @@ var initSchema = function (userSchema) {
                         get: function () {
                             var relatedModelDefinition = getModelDefinition(relatedModel);
                             if (!relatedModelDefinition)
-                                throw new Error("Could not find model definition for " + relatedModel.name);
+                                throw new Error("Could not find model definition for ".concat(relatedModel.name));
                             return {
                                 builder: relatedModel,
                                 schema: relatedModelDefinition,
@@ -255,7 +368,7 @@ var initSchema = function (userSchema) {
                 }
                 finally { if (e_2) throw e_2.error; }
             }
-            model.allFields = __assign(__assign({}, Object.fromEntries(__spread(indexFields.values()).map(function (name) { return [
+            model.allFields = __assign(__assign({}, Object.fromEntries(__spreadArray([], __read(indexFields.values()), false).map(function (name) { return [
                 name,
                 {
                     name: name,
@@ -340,10 +453,10 @@ var checkSchemaCodegenVersion = function (codegenVersion) {
         isValid = Number(major) === majorVersion && Number(minor) >= minorVersion;
     }
     catch (err) {
-        console.log("Error parsing codegen version: " + codegenVersion + "\n" + err);
+        console.log("Error parsing codegen version: ".concat(codegenVersion, "\n").concat(err));
     }
     if (!isValid) {
-        var message = "Models were generated with an unsupported version of codegen. Codegen artifacts are from " + (codegenVersion || 'an unknown version') + ", whereas ^" + majorVersion + "." + minorVersion + ".0 is required. " +
+        var message = "Models were generated with an unsupported version of codegen. Codegen artifacts are from ".concat(codegenVersion || 'an unknown version', ", whereas ^").concat(majorVersion, ".").concat(minorVersion, ".0 is required. ") +
             "Update to the latest CLI and run 'amplify codegen models'.";
         logger.error(message);
         throw new Error(message);
@@ -385,7 +498,7 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
         if (((!isArray && isRequired_1) || (isArray && !isArrayNullable)) &&
             !isTimestampField &&
             (v === null || v === undefined)) {
-            throw new Error("Field " + name_1 + " is required");
+            throw new Error("Field ".concat(name_1, " is required"));
         }
         if (isSchemaModelWithAttributes(modelDefinition) &&
             !isIdManaged(modelDefinition)) {
@@ -408,17 +521,17 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                         return;
                     }
                     catch (error) {
-                        throw new Error("Field " + name_1 + " is an invalid JSON object. " + v);
+                        throw new Error("Field ".concat(name_1, " is an invalid JSON object. ").concat(v));
                     }
                 }
             }
             if (isArray) {
                 var errorTypeText = jsType_1;
                 if (!isRequired_1) {
-                    errorTypeText = jsType_1 + " | null | undefined";
+                    errorTypeText = "".concat(jsType_1, " | null | undefined");
                 }
                 if (!Array.isArray(v) && !isArrayNullable) {
-                    throw new Error("Field " + name_1 + " should be of type [" + errorTypeText + "], " + typeof v + " received. " + v);
+                    throw new Error("Field ".concat(name_1, " should be of type [").concat(errorTypeText, "], ").concat(typeof v, " received. ").concat(v));
                 }
                 if (!isNullOrUndefined(v) &&
                     v.some(function (e) {
@@ -427,7 +540,7 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                     var elemTypes = v
                         .map(function (e) { return (e === null ? 'null' : typeof e); })
                         .join(',');
-                    throw new Error("All elements in the " + name_1 + " array should be of type " + errorTypeText + ", [" + elemTypes + "] received. " + v);
+                    throw new Error("All elements in the ".concat(name_1, " array should be of type ").concat(errorTypeText, ", [").concat(elemTypes, "] received. ").concat(v));
                 }
                 if (validateScalar_1 && !isNullOrUndefined(v)) {
                     var validationStatus = v.map(function (e) {
@@ -442,7 +555,7 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                         }
                     });
                     if (!validationStatus.every(function (s) { return s; })) {
-                        throw new Error("All elements in the " + name_1 + " array should be of type " + type_1 + ", validation failed for one or more elements. " + v);
+                        throw new Error("All elements in the ".concat(name_1, " array should be of type ").concat(type_1, ", validation failed for one or more elements. ").concat(v));
                     }
                 }
             }
@@ -450,13 +563,13 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                 return;
             }
             else if (typeof v !== jsType_1 && v !== null) {
-                throw new Error("Field " + name_1 + " should be of type " + jsType_1 + ", " + typeof v + " received. " + v);
+                throw new Error("Field ".concat(name_1, " should be of type ").concat(jsType_1, ", ").concat(typeof v, " received. ").concat(v));
             }
             else if (!isNullOrUndefined(v) &&
                 validateScalar_1 &&
                 !validateScalar_1(v) // TODO: why never, TS ... why ...
             ) {
-                throw new Error("Field " + name_1 + " should be of type " + type_1 + ", validation failed. " + v);
+                throw new Error("Field ".concat(name_1, " should be of type ").concat(type_1, ", validation failed. ").concat(v));
             }
         }
         else if (isNonModelFieldType(type_1)) {
@@ -467,15 +580,15 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                 if (isArray) {
                     var errorTypeText = type_1.nonModel;
                     if (!isRequired_1) {
-                        errorTypeText = type_1.nonModel + " | null | undefined";
+                        errorTypeText = "".concat(type_1.nonModel, " | null | undefined");
                     }
                     if (!Array.isArray(v)) {
-                        throw new Error("Field " + name_1 + " should be of type [" + errorTypeText + "], " + typeof v + " received. " + v);
+                        throw new Error("Field ".concat(name_1, " should be of type [").concat(errorTypeText, "], ").concat(typeof v, " received. ").concat(v));
                     }
                     v.forEach(function (item) {
                         if ((isNullOrUndefined(item) && isRequired_1) ||
                             (typeof item !== 'object' && typeof item !== 'undefined')) {
-                            throw new Error("All elements in the " + name_1 + " array should be of type " + type_1.nonModel + ", [" + typeof item + "] received. " + item);
+                            throw new Error("All elements in the ".concat(name_1, " array should be of type ").concat(type_1.nonModel, ", [").concat(typeof item, "] received. ").concat(item));
                         }
                         if (!isNullOrUndefined(item)) {
                             Object.keys(subNonModelDefinition_1.fields).forEach(function (subKey) {
@@ -486,7 +599,7 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                 }
                 else {
                     if (typeof v !== 'object') {
-                        throw new Error("Field " + name_1 + " should be of type " + type_1.nonModel + ", " + typeof v + " recieved. " + v);
+                        throw new Error("Field ".concat(name_1, " should be of type ").concat(type_1.nonModel, ", ").concat(typeof v, " recieved. ").concat(v));
                     }
                     Object.keys(subNonModelDefinition_1.fields).forEach(function (subKey) {
                         modelValidator_1(subKey, v[subKey]);
@@ -640,7 +753,7 @@ var createModelClass = function (modelDefinition) {
                 // Keys are immutable
                 keyNames.forEach(function (key) {
                     if (draft[key] !== source[key]) {
-                        logger.warn("copyOf() does not update PK fields. The '" + key + "' update is being ignored.", { source: source });
+                        logger.warn("copyOf() does not update PK fields. The '".concat(key, "' update is being ignored."), { source: source });
                     }
                     draft[key] = source[key];
                 });
@@ -718,13 +831,13 @@ var createModelClass = function (modelDefinition) {
                         var modelConstructor = Object.getPrototypeOf(model || {})
                             .constructor;
                         if (!isValidModelConstructor(modelConstructor)) {
-                            var msg = "Value passed to " + modelDefinition.name + "." + field + " is not a valid instance of a model";
+                            var msg = "Value passed to ".concat(modelDefinition.name, ".").concat(field, " is not a valid instance of a model");
                             logger.error(msg, { model: model });
                             throw new Error(msg);
                         }
                         if (modelConstructor.name.toLowerCase() !==
                             relationship.remoteModelConstructor.name.toLowerCase()) {
-                            var msg = "Value passed to " + modelDefinition.name + "." + field + " is not an instance of " + relationship.remoteModelConstructor.name;
+                            var msg = "Value passed to ".concat(modelDefinition.name, ".").concat(field, " is not an instance of ").concat(relationship.remoteModelConstructor.name);
                             logger.error(msg, { model: model });
                             throw new Error(msg);
                         }
@@ -733,7 +846,8 @@ var createModelClass = function (modelDefinition) {
                 // if the relationship can be managed automagically, set the FK's
                 if (relationship.isComplete) {
                     for (var i = 0; i < relationship.localJoinFields.length; i++) {
-                        this[relationship.localJoinFields[i]] = model === null || model === void 0 ? void 0 : model[relationship.remoteJoinFields[i]];
+                        this[relationship.localJoinFields[i]] =
+                            model === null || model === void 0 ? void 0 : model[relationship.remoteJoinFields[i]];
                     }
                     var instanceMemos = modelInstanceAssociationsMap.has(this)
                         ? modelInstanceAssociationsMap.get(this)
@@ -781,7 +895,7 @@ var createModelClass = function (modelDefinition) {
                             instanceMemos[field] = resultPromise.then(function (rows) {
                                 if (rows.length > 1) {
                                     // should never happen for a HAS_ONE or BELONGS_TO.
-                                    var err = new Error("\n\t\t\t\t\t\t\t\t\tData integrity error.\n\t\t\t\t\t\t\t\t\tToo many records found for a HAS_ONE/BELONGS_TO field '" + modelDefinition.name + "." + field + "'\n\t\t\t\t\t\t\t\t");
+                                    var err = new Error("\n\t\t\t\t\t\t\t\t\tData integrity error.\n\t\t\t\t\t\t\t\t\tToo many records found for a HAS_ONE/BELONGS_TO field '".concat(modelDefinition.name, ".").concat(field, "'\n\t\t\t\t\t\t\t\t"));
                                     console.error(err);
                                     throw err;
                                 }
@@ -895,45 +1009,52 @@ var AsyncCollection = /** @class */ (function () {
      * ```
      */
     AsyncCollection.prototype.toArray = function (_a) {
-        var _b = (_a === void 0 ? {} : _a).max, max = _b === void 0 ? Number.MAX_SAFE_INTEGER : _b;
-        var e_6, _c;
+        var _b, e_6, _c, _d;
+        var _e = _a === void 0 ? {} : _a, _f = _e.max, max = _f === void 0 ? Number.MAX_SAFE_INTEGER : _f;
         return __awaiter(this, void 0, void 0, function () {
-            var output, i, _d, _e, element, e_6_1;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var output, i, _g, _h, _j, element, e_6_1;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         output = [];
                         i = 0;
-                        _f.label = 1;
+                        _k.label = 1;
                     case 1:
-                        _f.trys.push([1, 6, 7, 12]);
-                        _d = __asyncValues(this);
-                        _f.label = 2;
-                    case 2: return [4 /*yield*/, _d.next()];
+                        _k.trys.push([1, 6, 7, 12]);
+                        _g = true, _h = __asyncValues(this);
+                        _k.label = 2;
+                    case 2: return [4 /*yield*/, _h.next()];
                     case 3:
-                        if (!(_e = _f.sent(), !_e.done)) return [3 /*break*/, 5];
-                        element = _e.value;
-                        if (i < max) {
-                            output.push(element);
-                            i++;
+                        if (!(_j = _k.sent(), _b = _j.done, !_b)) return [3 /*break*/, 5];
+                        _d = _j.value;
+                        _g = false;
+                        try {
+                            element = _d;
+                            if (i < max) {
+                                output.push(element);
+                                i++;
+                            }
+                            else {
+                                return [3 /*break*/, 5];
+                            }
                         }
-                        else {
-                            return [3 /*break*/, 5];
+                        finally {
+                            _g = true;
                         }
-                        _f.label = 4;
+                        _k.label = 4;
                     case 4: return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 12];
                     case 6:
-                        e_6_1 = _f.sent();
+                        e_6_1 = _k.sent();
                         e_6 = { error: e_6_1 };
                         return [3 /*break*/, 12];
                     case 7:
-                        _f.trys.push([7, , 10, 11]);
-                        if (!(_e && !_e.done && (_c = _d.return))) return [3 /*break*/, 9];
-                        return [4 /*yield*/, _c.call(_d)];
+                        _k.trys.push([7, , 10, 11]);
+                        if (!(!_g && !_b && (_c = _h.return))) return [3 /*break*/, 9];
+                        return [4 /*yield*/, _c.call(_h)];
                     case 8:
-                        _f.sent();
-                        _f.label = 9;
+                        _k.sent();
+                        _k.label = 9;
                     case 9: return [3 /*break*/, 11];
                     case 10:
                         if (e_6) throw e_6.error;
@@ -952,7 +1073,7 @@ var checkReadOnlyPropertyOnCreate = function (draft, modelDefinition) {
     var fields = modelDefinition.fields;
     modelKeys.forEach(function (key) {
         if (fields[key] && fields[key].isReadOnly) {
-            throw new Error(key + " is read-only.");
+            throw new Error("".concat(key, " is read-only."));
         }
     });
 };
@@ -964,7 +1085,7 @@ var checkReadOnlyPropertyOnUpdate = function (patches, modelDefinition) {
         if (!val || !fields[key])
             return;
         if (fields[key].isReadOnly) {
-            throw new Error(key + " is read-only.");
+            throw new Error("".concat(key, " is read-only."));
         }
     });
 };
@@ -1010,13 +1131,13 @@ function getModelConstructorByModelName(namespaceName, modelName) {
             result = storageClasses[modelName];
             break;
         default:
-            throw new Error("Invalid namespace: " + namespaceName);
+            throw new Error("Invalid namespace: ".concat(namespaceName));
     }
     if (isValidModelConstructor(result)) {
         return result;
     }
     else {
-        var msg = "Model name is not valid for namespace. modelName: " + modelName + ", namespace: " + namespaceName;
+        var msg = "Model name is not valid for namespace. modelName: ".concat(modelName, ", namespace: ").concat(namespaceName);
         logger.error(msg);
         throw new Error(msg);
     }
@@ -1129,7 +1250,6 @@ var DataStore = /** @class */ (function () {
     function DataStore() {
         var _this = this;
         // reference to configured category instances. Used for preserving SSR context
-        this.Auth = Auth;
         this.InternalAPI = InternalAPI;
         this.Cache = Cache;
         // Non-null assertions (bang operator) have been added to most of these properties
@@ -1142,9 +1262,7 @@ var DataStore = /** @class */ (function () {
         this.syncPredicates = new WeakMap();
         // object that gets passed to descendent classes. Allows us to pass these down by reference
         this.amplifyContext = {
-            Auth: this.Auth,
             InternalAPI: this.InternalAPI,
-            Cache: this.Cache,
         };
         /**
          * **IMPORTANT!**
@@ -1237,11 +1355,8 @@ var DataStore = /** @class */ (function () {
                                         .subscribe({
                                         next: function (_a) {
                                             var type = _a.type, data = _a.data;
-                                            // In Node, we need to wait for queries to be synced to prevent returning empty arrays.
                                             // In the Browser, we can begin returning data once subscriptions are in place.
-                                            var readyType = isNode
-                                                ? ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY
-                                                : ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED;
+                                            var readyType = ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED;
                                             if (type === readyType) {
                                                 _this.initResolve();
                                             }
@@ -1411,10 +1526,10 @@ var DataStore = /** @class */ (function () {
                                                         related = _c.sent();
                                                         if (related.length === 0) {
                                                             throw new Error([
-                                                                "Data integrity error. You tried to save a " + modelDefinition.name + " (" + JSON.stringify(model) + ")",
-                                                                "but the instance assigned to the \"" + relationship.field + "\" property",
+                                                                "Data integrity error. You tried to save a ".concat(modelDefinition.name, " (").concat(JSON.stringify(model), ")"),
+                                                                "but the instance assigned to the \"".concat(relationship.field, "\" property"),
                                                                 "does not exist in the local database. If you're trying to create the related",
-                                                                "\"" + ((_b = relationship.remoteDefinition) === null || _b === void 0 ? void 0 : _b.name) + "\", you must save it independently first.",
+                                                                "\"".concat((_b = relationship.remoteDefinition) === null || _b === void 0 ? void 0 : _b.name, "\", you must save it independently first."),
                                                             ].join(' '));
                                                         }
                                                         _c.label = 4;
@@ -1851,7 +1966,7 @@ var DataStore = /** @class */ (function () {
                 var generateSnapshot = function () {
                     var _a, _b;
                     var isSynced = (_b = (_a = _this.sync) === null || _a === void 0 ? void 0 : _a.getModelSyncedStatus(model)) !== null && _b !== void 0 ? _b : false;
-                    var itemsArray = __spread(Array.from(items.values()), Array.from(itemsChanged.values()));
+                    var itemsArray = __spreadArray(__spreadArray([], __read(Array.from(items.values())), false), __read(Array.from(itemsChanged.values())), false);
                     items.clear();
                     itemsArray.forEach(function (item) {
                         var itemModelDefinition = getModelDefinition(model);
@@ -1911,16 +2026,16 @@ var DataStore = /** @class */ (function () {
                  * @param payload The payload from the Hub event.
                  */
                 var hubCallback = function (_a) {
-                    var payload = _a.payload;
                     var _b;
+                    var payload = _a.payload;
                     var event = payload.event, data = payload.data;
                     if (event === ControlMessage.SYNC_ENGINE_MODEL_SYNCED &&
                         ((_b = data === null || data === void 0 ? void 0 : data.model) === null || _b === void 0 ? void 0 : _b.name) === model.name) {
                         generateAndEmitSnapshot();
-                        Hub.remove('datastore', hubCallback);
+                        hubRemove();
                     }
                 };
-                Hub.listen('datastore', hubCallback);
+                var hubRemove = Hub.listen('datastore', hubCallback);
                 return _this.runningProcesses.addCleaner(function () { return __awaiter(_this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
                         if (handle) {
@@ -1932,12 +2047,22 @@ var DataStore = /** @class */ (function () {
             });
         };
         this.configure = function (config) {
+            var _a;
             if (config === void 0) { config = {}; }
-            _this.amplifyContext.Auth = _this.Auth;
             _this.amplifyContext.InternalAPI = _this.InternalAPI;
-            _this.amplifyContext.Cache = _this.Cache;
             var configDataStore = config.DataStore, configAuthModeStrategyType = config.authModeStrategyType, configConflictHandler = config.conflictHandler, configErrorHandler = config.errorHandler, configMaxRecordsToSync = config.maxRecordsToSync, configSyncPageSize = config.syncPageSize, configFullSyncInterval = config.fullSyncInterval, configSyncExpressions = config.syncExpressions, configAuthProviders = config.authProviders, configStorageAdapter = config.storageAdapter, configFromAmplify = __rest(config, ["DataStore", "authModeStrategyType", "conflictHandler", "errorHandler", "maxRecordsToSync", "syncPageSize", "fullSyncInterval", "syncExpressions", "authProviders", "storageAdapter"]);
-            _this.amplifyConfig = __assign(__assign({}, configFromAmplify), _this.amplifyConfig);
+            var apiKey = '';
+            var currentAppSyncConfig = (_a = Amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.AppSync;
+            if ((currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.defaultAuthMode.type) === 'apiKey') {
+                apiKey = currentAppSyncConfig.defaultAuthMode.apiKey;
+            }
+            var appSyncConfig = {
+                aws_appsync_graphqlEndpoint: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.endpoint,
+                aws_appsync_authenticationType: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.defaultAuthMode.type,
+                aws_appsync_region: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.region,
+                aws_appsync_apiKey: apiKey,
+            };
+            _this.amplifyConfig = __assign(__assign(__assign({}, _this.amplifyConfig), configFromAmplify), (currentAppSyncConfig && appSyncConfig));
             _this.conflictHandler = _this.setConflictHandler(config);
             _this.errorHandler = _this.setErrorHandler(config);
             var authModeStrategyType = (configDataStore && configDataStore.authModeStrategyType) ||
@@ -2009,7 +2134,7 @@ var DataStore = /** @class */ (function () {
         var handler = function (err) {
             if (err.message.startsWith('BackgroundManagerNotOpenError')) {
                 throw new Error([
-                    "DataStoreStateError: Tried to execute `" + operation + "` while DataStore was \"" + _this.state + "\".",
+                    "DataStoreStateError: Tried to execute `".concat(operation, "` while DataStore was \"").concat(_this.state, "\"."),
                     "This can only be done while DataStore is \"Started\" or \"Stopped\". To remedy:",
                     'Ensure all calls to `stop()` and `clear()` have completed first.',
                     'If this is not possible, retry the operation until it succeeds.',
@@ -2218,7 +2343,7 @@ var DataStore = /** @class */ (function () {
             var _b = __read(_a, 2), modelDefinition = _b[0], predicate = _b[1];
             if (map.has(modelDefinition)) {
                 var name_2 = modelDefinition.name;
-                logger.warn("You can only utilize one Sync Expression per model.\n          Subsequent sync expressions for the " + name_2 + " model will be ignored.");
+                logger.warn("You can only utilize one Sync Expression per model.\n          Subsequent sync expressions for the ".concat(name_2, " model will be ignored."));
                 return map;
             }
             if (predicate) {
@@ -2238,7 +2363,7 @@ var DataStore = /** @class */ (function () {
                 var aws_appsync_graphqlEndpoint = this.amplifyConfig.aws_appsync_graphqlEndpoint;
                 var appSyncUrl = aws_appsync_graphqlEndpoint.split('/')[2];
                 var _a = __read(appSyncUrl.split('.'), 1), appSyncId = _a[0];
-                return sessionId + "-" + appSyncId;
+                return "".concat(sessionId, "-").concat(appSyncId);
             }
         }
         catch (_b) { }
@@ -2247,6 +2372,10 @@ var DataStore = /** @class */ (function () {
     return DataStore;
 }());
 var instance = new DataStore();
-Amplify.register(instance);
+instance.configure({});
+Hub.listen('core', function (capsule) {
+    if (capsule.payload.event === 'configure') {
+        instance.configure({});
+    }
+});
 export { DataStore as DataStoreClass, initSchema, instance as DataStore };
-//# sourceMappingURL=datastore.js.map

package/lib-esm/index.d.ts

@@ -9,7 +9,7 @@ export declare const utils: {
         item: T;
         instance: T;
     }[];
-    validatePredicate: <T_2 extends Readonly<Record<string, any>>>(model: T_2, groupType: "and" | "or" | "not", predicatesOrGroups: (import("./types").PredicateObject<T_2> | import("./types").PredicatesGroup<T_2>)[]) => any;
+    validatePredicate: <T_2 extends Readonly<Record<string, any>>>(model: T_2, groupType: keyof import("./types").PredicateGroups<T_2>, predicatesOrGroups: (import("./types").PredicateObject<T_2> | import("./types").PredicatesGroup<T_2>)[]) => any;
     isNonModelConstructor: (obj: any) => obj is import("./types").NonModelTypeConstructor<any>;
     isModelConstructor: <T_3 extends Readonly<Record<string, any>>>(obj: any) => obj is import("./types").PersistentModelConstructor<T_3>;
 };

package/lib-esm/index.js

@@ -12,4 +12,3 @@ export var utils = {
     isModelConstructor: isModelConstructor,
 };
 export * from './types';
-//# sourceMappingURL=index.js.map