@aws-amplify/datastore 4.1.1 → 4.1.2

package/lib-esm/storage/adapter/StorageAdapterBase.js

@@ -0,0 +1,477 @@
+import { __asyncValues, __awaiter, __generator, __read, __spread, __values } from "tslib";
+import { ConsoleLogger as Logger } from '@aws-amplify/core';
+import { ModelPredicateCreator } from '../../predicates';
+import { isPredicateObj, } from '../../types';
+import { getStorename, getIndexKeys, extractPrimaryKeyValues, traverseModel, validatePredicate, getIndex, getIndexFromAssociation, isModelConstructor, } from '../../util';
+var logger = new Logger('DataStore');
+var DB_NAME = 'amplify-datastore';
+var StorageAdapterBase = /** @class */ (function () {
+    function StorageAdapterBase() {
+        this.dbName = DB_NAME;
+    }
+    /**
+     * Initializes local DB
+     *
+     * @param theSchema
+     * @param namespaceResolver
+     * @param modelInstanceCreator
+     * @param getModelConstructorByModelName
+     * @param sessionId
+     */
+    StorageAdapterBase.prototype.setUp = function (theSchema, namespaceResolver, modelInstanceCreator, getModelConstructorByModelName, sessionId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, error_1;
+            var _this = this;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.preSetUpChecks()];
+                    case 1:
+                        _b.sent();
+                        if (!!this.initPromise) return [3 /*break*/, 2];
+                        this.initPromise = new Promise(function (res, rej) {
+                            _this.resolve = res;
+                            _this.reject = rej;
+                        });
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, this.initPromise];
+                    case 3:
+                        _b.sent();
+                        return [2 /*return*/];
+                    case 4:
+                        if (sessionId) {
+                            this.dbName = DB_NAME + "-" + sessionId;
+                        }
+                        this.schema = theSchema;
+                        this.namespaceResolver = namespaceResolver;
+                        this.modelInstanceCreator = modelInstanceCreator;
+                        this.getModelConstructorByModelName = getModelConstructorByModelName;
+                        _b.label = 5;
+                    case 5:
+                        _b.trys.push([5, 8, , 9]);
+                        if (!!this.db) return [3 /*break*/, 7];
+                        _a = this;
+                        return [4 /*yield*/, this.initDb()];
+                    case 6:
+                        _a.db = _b.sent();
+                        this.resolve();
+                        _b.label = 7;
+                    case 7: return [3 /*break*/, 9];
+                    case 8:
+                        error_1 = _b.sent();
+                        this.reject(error_1);
+                        return [3 /*break*/, 9];
+                    case 9: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * @param modelConstructor
+     * @returns local DB table name
+     */
+    StorageAdapterBase.prototype.getStorenameForModel = function (modelConstructor) {
+        var namespace = this.namespaceResolver(modelConstructor);
+        var modelName = modelConstructor.name;
+        return getStorename(namespace, modelName);
+    };
+    /**
+     *
+     * @param model - instantiated model record
+     * @returns the record's primary key values
+     */
+    StorageAdapterBase.prototype.getIndexKeyValuesFromModel = function (model) {
+        var modelConstructor = Object.getPrototypeOf(model)
+            .constructor;
+        var namespaceName = this.namespaceResolver(modelConstructor);
+        var keys = getIndexKeys(this.schema.namespaces[namespaceName], modelConstructor.name);
+        return extractPrimaryKeyValues(model, keys);
+    };
+    /**
+     * Common metadata for `save` operation
+     * used by individual storage adapters
+     *
+     * @param model
+     */
+    StorageAdapterBase.prototype.saveMetadata = function (model) {
+        var _this = this;
+        var modelConstructor = Object.getPrototypeOf(model)
+            .constructor;
+        var storeName = this.getStorenameForModel(modelConstructor);
+        var namespaceName = this.namespaceResolver(modelConstructor);
+        var connectedModels = traverseModel(modelConstructor.name, model, this.schema.namespaces[namespaceName], this.modelInstanceCreator, this.getModelConstructorByModelName);
+        var set = new Set();
+        var connectionStoreNames = Object.values(connectedModels).map(function (_a) {
+            var modelName = _a.modelName, item = _a.item, instance = _a.instance;
+            var storeName = getStorename(namespaceName, modelName);
+            set.add(storeName);
+            var keys = getIndexKeys(_this.schema.namespaces[namespaceName], modelName);
+            return { storeName: storeName, item: item, instance: instance, keys: keys };
+        });
+        var modelKeyValues = this.getIndexKeyValuesFromModel(model);
+        return { storeName: storeName, set: set, connectionStoreNames: connectionStoreNames, modelKeyValues: modelKeyValues };
+    };
+    /**
+     * Enforces conditional save. Throws if condition is not met.
+     * used by individual storage adapters
+     *
+     * @param model
+     */
+    StorageAdapterBase.prototype.validateSaveCondition = function (condition, fromDB) {
+        if (!(condition && fromDB)) {
+            return;
+        }
+        var predicates = ModelPredicateCreator.getPredicates(condition);
+        var _a = predicates, predicateObjs = _a.predicates, type = _a.type;
+        var isValid = validatePredicate(fromDB, type, predicateObjs);
+        if (!isValid) {
+            var msg = 'Conditional update failed';
+            logger.error(msg, { model: fromDB, condition: predicateObjs });
+            throw new Error(msg);
+        }
+    };
+    /**
+     * Instantiate models from POJO records returned from the database
+     *
+     * @param namespaceName - string model namespace
+     * @param srcModelName - string model name
+     * @param records - array of uninstantiated records
+     * @returns
+     */
+    StorageAdapterBase.prototype.load = function (namespaceName, srcModelName, records) {
+        return __awaiter(this, void 0, void 0, function () {
+            var namespace, relations, connectionStoreNames, modelConstructor;
+            var _this = this;
+            return __generator(this, function (_a) {
+                namespace = this.schema.namespaces[namespaceName];
+                relations = namespace.relationships[srcModelName].relationTypes;
+                connectionStoreNames = relations.map(function (_a) {
+                    var modelName = _a.modelName;
+                    return getStorename(namespaceName, modelName);
+                });
+                modelConstructor = this.getModelConstructorByModelName(namespaceName, srcModelName);
+                if (connectionStoreNames.length === 0) {
+                    return [2 /*return*/, records.map(function (record) {
+                            return _this.modelInstanceCreator(modelConstructor, record);
+                        })];
+                }
+                return [2 /*return*/, records.map(function (record) {
+                        return _this.modelInstanceCreator(modelConstructor, record);
+                    })];
+            });
+        });
+    };
+    /**
+     * Extracts operands from a predicate group into an array of key values
+     * Used in the query method
+     *
+     * @param predicates - predicate group
+     * @param keyPath - string array of key names ['id', 'sortKey']
+     * @returns string[] of key values
+     *
+     * @example
+     * ```js
+     * { and:[{ id: { eq: 'abc' }}, { sortKey: { eq: 'def' }}] }
+     * ```
+     * Becomes
+     * ```
+     * ['abc', 'def']
+     * ```
+     */
+    StorageAdapterBase.prototype.keyValueFromPredicate = function (predicates, keyPath) {
+        var e_1, _a;
+        var predicateObjs = predicates.predicates;
+        if (predicateObjs.length !== keyPath.length) {
+            return;
+        }
+        var keyValues = [];
+        var _loop_1 = function (key) {
+            var predicateObj = predicateObjs.find(function (p) {
+                // it's a relevant predicate object only if it's an equality
+                // operation for a key field from the key:
+                return isPredicateObj(p) &&
+                    p.field === key &&
+                    p.operator === 'eq' &&
+                    p.operand !== null &&
+                    p.operand !== undefined;
+            });
+            predicateObj && keyValues.push(predicateObj.operand);
+        };
+        try {
+            for (var keyPath_1 = __values(keyPath), keyPath_1_1 = keyPath_1.next(); !keyPath_1_1.done; keyPath_1_1 = keyPath_1.next()) {
+                var key = keyPath_1_1.value;
+                _loop_1(key);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (keyPath_1_1 && !keyPath_1_1.done && (_a = keyPath_1.return)) _a.call(keyPath_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return keyValues.length === keyPath.length ? keyValues : undefined;
+    };
+    /**
+     * Common metadata for `query` operation
+     * used by individual storage adapters
+     *
+     * @param modelConstructor
+     * @param predicate
+     * @param pagination
+     */
+    StorageAdapterBase.prototype.queryMetadata = function (modelConstructor, predicate, pagination) {
+        var storeName = this.getStorenameForModel(modelConstructor);
+        var namespaceName = this.namespaceResolver(modelConstructor);
+        var predicates = predicate && ModelPredicateCreator.getPredicates(predicate);
+        var keyPath = getIndexKeys(this.schema.namespaces[namespaceName], modelConstructor.name);
+        var queryByKey = predicates && this.keyValueFromPredicate(predicates, keyPath);
+        var hasSort = pagination && pagination.sort;
+        var hasPagination = pagination && pagination.limit;
+        return {
+            storeName: storeName,
+            namespaceName: namespaceName,
+            queryByKey: queryByKey,
+            predicates: predicates,
+            hasSort: hasSort,
+            hasPagination: hasPagination,
+        };
+    };
+    /**
+     * Delete record
+     * Cascades to related records (for Has One and Has Many relationships)
+     *
+     * @param modelOrModelConstructor
+     * @param condition
+     * @returns
+     */
+    StorageAdapterBase.prototype.delete = function (modelOrModelConstructor, condition) {
+        return __awaiter(this, void 0, void 0, function () {
+            var deleteQueue, modelConstructor, namespace, models, relations, deletedModels, deletedModels, model, modelConstructor, namespaceName, storeName, keyValues, fromDB, msg, predicates, _a, predicateObjs, type, isValid, msg, relations, relations, deletedModels;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.preOpCheck()];
+                    case 1:
+                        _b.sent();
+                        deleteQueue = [];
+                        if (!isModelConstructor(modelOrModelConstructor)) return [3 /*break*/, 9];
+                        modelConstructor = modelOrModelConstructor;
+                        namespace = this.namespaceResolver(modelConstructor);
+                        return [4 /*yield*/, this.query(modelConstructor, condition)];
+                    case 2:
+                        models = _b.sent();
+                        relations = this.schema.namespaces[namespace].relationships[modelConstructor.name]
+                            .relationTypes;
+                        if (!(condition !== undefined)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.deleteTraverse(relations, models, modelConstructor.name, namespace, deleteQueue)];
+                    case 3:
+                        _b.sent();
+                        return [4 /*yield*/, this.deleteItem(deleteQueue)];
+                    case 4:
+                        _b.sent();
+                        deletedModels = deleteQueue.reduce(function (acc, _a) {
+                            var items = _a.items;
+                            return acc.concat(items);
+                        }, []);
+                        return [2 /*return*/, [models, deletedModels]];
+                    case 5: return [4 /*yield*/, this.deleteTraverse(relations, models, modelConstructor.name, namespace, deleteQueue)];
+                    case 6:
+                        _b.sent();
+                        return [4 /*yield*/, this.deleteItem(deleteQueue)];
+                    case 7:
+                        _b.sent();
+                        deletedModels = deleteQueue.reduce(function (acc, _a) {
+                            var items = _a.items;
+                            return acc.concat(items);
+                        }, []);
+                        return [2 /*return*/, [models, deletedModels]];
+                    case 8: return [3 /*break*/, 16];
+                    case 9:
+                        model = modelOrModelConstructor;
+                        modelConstructor = Object.getPrototypeOf(model)
+                            .constructor;
+                        namespaceName = this.namespaceResolver(modelConstructor);
+                        storeName = this.getStorenameForModel(modelConstructor);
+                        if (!condition) return [3 /*break*/, 12];
+                        keyValues = this.getIndexKeyValuesFromModel(model);
+                        return [4 /*yield*/, this._get(storeName, keyValues)];
+                    case 10:
+                        fromDB = _b.sent();
+                        if (fromDB === undefined) {
+                            msg = 'Model instance not found in storage';
+                            logger.warn(msg, { model: model });
+                            return [2 /*return*/, [[model], []]];
+                        }
+                        predicates = ModelPredicateCreator.getPredicates(condition);
+                        _a = predicates, predicateObjs = _a.predicates, type = _a.type;
+                        isValid = validatePredicate(fromDB, type, predicateObjs);
+                        if (!isValid) {
+                            msg = 'Conditional update failed';
+                            logger.error(msg, { model: fromDB, condition: predicateObjs });
+                            throw new Error(msg);
+                        }
+                        relations = this.schema.namespaces[namespaceName].relationships[modelConstructor.name].relationTypes;
+                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, namespaceName, deleteQueue)];
+                    case 11:
+                        _b.sent();
+                        return [3 /*break*/, 14];
+                    case 12:
+                        relations = this.schema.namespaces[namespaceName].relationships[modelConstructor.name].relationTypes;
+                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, namespaceName, deleteQueue)];
+                    case 13:
+                        _b.sent();
+                        _b.label = 14;
+                    case 14: return [4 /*yield*/, this.deleteItem(deleteQueue)];
+                    case 15:
+                        _b.sent();
+                        deletedModels = deleteQueue.reduce(function (acc, _a) {
+                            var items = _a.items;
+                            return acc.concat(items);
+                        }, []);
+                        return [2 /*return*/, [[model], deletedModels]];
+                    case 16: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Recursively traverse relationship graph and add
+     * all Has One and Has Many relations to `deleteQueue` param
+     *
+     * Actual deletion of records added to `deleteQueue` occurs in the `delete` method
+     *
+     * @param relations
+     * @param models
+     * @param srcModel
+     * @param namespace
+     * @param deleteQueue
+     */
+    StorageAdapterBase.prototype.deleteTraverse = function (relations, models, srcModel, namespace, deleteQueue) {
+        var relations_1, relations_1_1, models_1, models_1_1;
+        var e_2, _a, e_3, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var rel, modelName, relationType, targetNames, associatedWith, storeName, index, model, childRecords, _c, childRecord, keyValues, records, childModels, e_3_1, e_2_1;
+            var _this = this;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _d.trys.push([0, 28, 29, 34]);
+                        relations_1 = __asyncValues(relations);
+                        _d.label = 1;
+                    case 1: return [4 /*yield*/, relations_1.next()];
+                    case 2:
+                        if (!(relations_1_1 = _d.sent(), !relations_1_1.done)) return [3 /*break*/, 27];
+                        rel = relations_1_1.value;
+                        modelName = rel.modelName, relationType = rel.relationType, targetNames = rel.targetNames, associatedWith = rel.associatedWith;
+                        storeName = getStorename(namespace, modelName);
+                        index = getIndex(this.schema.namespaces[namespace].relationships[modelName]
+                            .relationTypes, srcModel) ||
+                            // if we were unable to find an index via relationTypes
+                            // i.e. for keyName connections, attempt to find one by the
+                            // associatedWith property
+                            getIndexFromAssociation(this.schema.namespaces[namespace].relationships[modelName].indexes, associatedWith);
+                        _d.label = 3;
+                    case 3:
+                        _d.trys.push([3, 20, 21, 26]);
+                        models_1 = __asyncValues(models);
+                        _d.label = 4;
+                    case 4: return [4 /*yield*/, models_1.next()];
+                    case 5:
+                        if (!(models_1_1 = _d.sent(), !models_1_1.done)) return [3 /*break*/, 19];
+                        model = models_1_1.value;
+                        childRecords = [];
+                        _c = relationType;
+                        switch (_c) {
+                            case 'HAS_ONE': return [3 /*break*/, 6];
+                            case 'HAS_MANY': return [3 /*break*/, 11];
+                            case 'BELONGS_TO': return [3 /*break*/, 13];
+                        }
+                        return [3 /*break*/, 14];
+                    case 6:
+                        childRecord = void 0;
+                        if (!(targetNames === null || targetNames === void 0 ? void 0 : targetNames.length)) return [3 /*break*/, 8];
+                        return [4 /*yield*/, this.getHasOneChild(model, srcModel, namespace, rel)];
+                    case 7:
+                        childRecord = _d.sent();
+                        return [3 /*break*/, 10];
+                    case 8: return [4 /*yield*/, this.getHasOneChildLegacy(model, srcModel, namespace, rel)];
+                    case 9:
+                        childRecord = _d.sent();
+                        _d.label = 10;
+                    case 10:
+                        if (childRecord) {
+                            childRecords.push(childRecord);
+                        }
+                        return [3 /*break*/, 15];
+                    case 11:
+                        keyValues = this.getIndexKeyValuesFromModel(model);
+                        return [4 /*yield*/, this.getHasManyChildren(storeName, index, keyValues)];
+                    case 12:
+                        records = _d.sent();
+                        if (records === null || records === void 0 ? void 0 : records.length) {
+                            childRecords.push.apply(childRecords, __spread(records));
+                        }
+                        return [3 /*break*/, 15];
+                    case 13: 
+                    // Intentionally blank
+                    return [3 /*break*/, 15];
+                    case 14: throw new Error("Invalid relation type " + relationType);
+                    case 15: return [4 /*yield*/, this.load(namespace, modelName, childRecords)];
+                    case 16:
+                        childModels = _d.sent();
+                        return [4 /*yield*/, this.deleteTraverse(this.schema.namespaces[namespace].relationships[modelName]
+                                .relationTypes, childModels, modelName, namespace, deleteQueue)];
+                    case 17:
+                        _d.sent();
+                        _d.label = 18;
+                    case 18: return [3 /*break*/, 4];
+                    case 19: return [3 /*break*/, 26];
+                    case 20:
+                        e_3_1 = _d.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 26];
+                    case 21:
+                        _d.trys.push([21, , 24, 25]);
+                        if (!(models_1_1 && !models_1_1.done && (_b = models_1.return))) return [3 /*break*/, 23];
+                        return [4 /*yield*/, _b.call(models_1)];
+                    case 22:
+                        _d.sent();
+                        _d.label = 23;
+                    case 23: return [3 /*break*/, 25];
+                    case 24:
+                        if (e_3) throw e_3.error;
+                        return [7 /*endfinally*/];
+                    case 25: return [7 /*endfinally*/];
+                    case 26: return [3 /*break*/, 1];
+                    case 27: return [3 /*break*/, 34];
+                    case 28:
+                        e_2_1 = _d.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 34];
+                    case 29:
+                        _d.trys.push([29, , 32, 33]);
+                        if (!(relations_1_1 && !relations_1_1.done && (_a = relations_1.return))) return [3 /*break*/, 31];
+                        return [4 /*yield*/, _a.call(relations_1)];
+                    case 30:
+                        _d.sent();
+                        _d.label = 31;
+                    case 31: return [3 /*break*/, 33];
+                    case 32:
+                        if (e_2) throw e_2.error;
+                        return [7 /*endfinally*/];
+                    case 33: return [7 /*endfinally*/];
+                    case 34:
+                        deleteQueue.push({
+                            storeName: getStorename(namespace, srcModel),
+                            items: models.map(function (record) {
+                                return _this.modelInstanceCreator(_this.getModelConstructorByModelName(namespace, srcModel), record);
+                            }),
+                        });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return StorageAdapterBase;
+}());
+export { StorageAdapterBase };
+//# sourceMappingURL=StorageAdapterBase.js.map

package/lib-esm/storage/adapter/StorageAdapterBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StorageAdapterBase.js","sourceRoot":"","sources":["../../../src/storage/adapter/StorageAdapterBase.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/datastore",
-	"version": "4.1.1",
+	"version": "4.1.2",
 	"description": "AppSyncLocal support for aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -55,10 +55,10 @@
 		"ssr"
 	],
 	"dependencies": {
-		"@aws-amplify/api": "5.0.19",
-		"@aws-amplify/auth": "5.1.13",
-		"@aws-amplify/core": "5.1.2",
-		"@aws-amplify/pubsub": "5.1.2",
+		"@aws-amplify/api": "5.0.20",
+		"@aws-amplify/auth": "5.1.14",
+		"@aws-amplify/core": "5.1.3",
+		"@aws-amplify/pubsub": "5.1.3",
 		"amazon-cognito-identity-js": "6.1.2",
 		"idb": "5.0.6",
 		"immer": "9.0.6",
@@ -129,5 +129,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "a0bcb09b9b3b272d4327b97ffa638a0658075783"
+	"gitHead": "3a4569007743a76dabd1728401f90449e068292e"
 }