@intuitionrobotics/db-api-generator 0.41.69 → 0.41.72

package/app-backend/BaseDB_ApiGenerator.js

@@ -17,30 +17,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-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) {
-        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) {
@@ -50,57 +26,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 (_) 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 __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseDB_ApiGenerator = exports.validator_InternationalPhoneNumber = exports.validator_LowerUpperStringWithDashesAndUnderscore = exports.validator_LowerUpperStringWithSpaces = exports.validator_LowercaseStringWithDashes = exports.validateNameWithDashesAndDots = exports.validator_JavaObjectMemberName = exports.validateStringAndNumbersWithDashes = exports.validateStringWithDashes = exports.validateOptionalId = exports.validateUniqueId = exports.validateGeneralUrl = exports.validateBucketUrl = exports.validateEmail = exports.validateId = void 0;
-var ts_common_1 = require("@intuitionrobotics/ts-common");
-var apis_1 = require("./apis");
-var backend_1 = require("@intuitionrobotics/thunderstorm/backend");
-var backend_2 = require("@intuitionrobotics/firebase/backend");
-var types_1 = require("../shared/types");
-var idLength = 32;
-var validateId = function (length, mandatory) {
-    if (mandatory === void 0) { mandatory = true; }
-    return ts_common_1.validateRegexp(new RegExp("^[0-9a-f]{" + length + "}$"), mandatory);
-};
+const ts_common_1 = require("@intuitionrobotics/ts-common");
+const apis_1 = require("./apis");
+const backend_1 = require("@intuitionrobotics/thunderstorm/backend");
+const backend_2 = require("@intuitionrobotics/firebase/backend");
+const types_1 = require("../shared/types");
+const idLength = 32;
+const validateId = (length, mandatory = true) => ts_common_1.validateRegexp(new RegExp(`^[0-9a-f]{${length}}$`), mandatory);
 exports.validateId = validateId;
 exports.validateEmail = ts_common_1.validateRegexp(/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/);
-var validateBucketUrl = function (mandatory) { return ts_common_1.validateRegexp(/gs?:\/\/[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/, mandatory); };
+const validateBucketUrl = (mandatory) => ts_common_1.validateRegexp(/gs?:\/\/[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/, mandatory);
 exports.validateBucketUrl = validateBucketUrl;
-var validateGeneralUrl = function (mandatory) { return ts_common_1.validateRegexp(/[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/, mandatory); };
+const validateGeneralUrl = (mandatory) => ts_common_1.validateRegexp(/[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/, mandatory);
 exports.validateGeneralUrl = validateGeneralUrl;
 exports.validateUniqueId = exports.validateId(idLength);
 exports.validateOptionalId = exports.validateId(idLength, false);
@@ -117,19 +56,17 @@ exports.validator_InternationalPhoneNumber = ts_common_1.validateRegexp(/^\+(?:[
  *
  * By default, it exposes API endpoints for creating, deleting, updating, querying and querying for unique document.
  */
-var BaseDB_ApiGenerator = /** @class */ (function (_super) {
-    __extends(BaseDB_ApiGenerator, _super);
-    function BaseDB_ApiGenerator(collectionName, validator, itemName) {
-        var _this = _super.call(this) || this;
+class BaseDB_ApiGenerator extends ts_common_1.Module {
+    constructor(collectionName, validator, itemName) {
+        super();
         // @ts-ignore
-        _this.setDefaultConfig({ itemName: itemName, collectionName: collectionName, externalFilterKeys: ["_id"], lockKeys: ["_id"] });
-        _this.validator = validator;
-        return _this;
+        this.setDefaultConfig({ itemName, collectionName, externalFilterKeys: ["_id"], lockKeys: ["_id"] });
+        this.validator = validator;
     }
-    BaseDB_ApiGenerator.prototype.setValidator = function (validator) {
+    setValidator(validator) {
         this.validator = validator;
-    };
-    BaseDB_ApiGenerator.prototype.__onFirestoreBackupSchedulerAct = function () {
+    }
+    __onFirestoreBackupSchedulerAct() {
         return [{
                 backupQuery: this.resolveBackupQuery(),
                 collection: this.collection,
@@ -137,10 +74,10 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
                 interval: ts_common_1.Day,
                 moduleKey: this.config.collectionName
             }];
-    };
-    BaseDB_ApiGenerator.prototype.resolveBackupQuery = function () {
+    }
+    resolveBackupQuery() {
         return { where: {} };
-    };
+    }
     // this.setExternalUniqueKeys(["accessLevelIds"]);
     /**
      * Sets the external unique keys. External keys are the attributes of a document that must be unique inside the
@@ -154,11 +91,11 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * The external filter keys.
      */
-    BaseDB_ApiGenerator.prototype.setExternalUniqueKeys = function (keys) {
+    setExternalUniqueKeys(keys) {
         if (this.initiated)
             throw new ts_common_1.BadImplementationException("You can only update the 'externalUniqueKeys' before the module was initialized.. preferably from its constructor");
         return this.config.externalFilterKeys = keys;
-    };
+    }
     /**
      * Sets the lock keys. Lock keys are the attributes of a document that must not be changed during a patch.
      * Thr property `_id` is always part of the lock keys.
@@ -171,44 +108,38 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * The lock keys.
      */
-    BaseDB_ApiGenerator.prototype.setLockKeys = function (keys) {
+    setLockKeys(keys) {
         if (this.initiated)
             throw new ts_common_1.BadImplementationException("You can only update the 'lockKeys' before the module was initialized.. preferably from its constructor");
-        return this.config.lockKeys = ts_common_1.filterDuplicates(__spreadArrays(keys, ["_id"]));
-    };
-    BaseDB_ApiGenerator.prototype.getCollectionName = function () {
+        return this.config.lockKeys = ts_common_1.filterDuplicates([...keys,
+            "_id"]);
+    }
+    getCollectionName() {
         return this.config.collectionName;
-    };
-    BaseDB_ApiGenerator.prototype.getItemName = function () {
+    }
+    getItemName() {
         return this.config.itemName;
-    };
+    }
     /**
      * Executed during the initialization of the module.
      * The collection reference is set in this method.
      */
-    BaseDB_ApiGenerator.prototype.init = function () {
+    init() {
         var _a;
-        var firestore = backend_2.FirebaseModule.createAdminSession((_a = this.config) === null || _a === void 0 ? void 0 : _a.projectId).getFirestore();
+        const firestore = backend_2.FirebaseModule.createAdminSession((_a = this.config) === null || _a === void 0 ? void 0 : _a.projectId).getFirestore();
         // @ts-ignore
         this.collection = firestore.getCollection(this.config.collectionName, this.config.externalFilterKeys);
-    };
-    BaseDB_ApiGenerator.prototype.assertExternalQueryUnique = function (instance, transaction) {
-        return __awaiter(this, void 0, void 0, function () {
-            var dbInstance, uniqueQuery;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, transaction.queryItem(this.collection, instance)];
-                    case 1:
-                        dbInstance = _a.sent();
-                        if (!dbInstance) {
-                            uniqueQuery = backend_2.FirestoreInterface.buildUniqueQuery(this.collection, instance);
-                            throw new backend_1.ApiException(404, "Could not find " + this.config.itemName + " with unique query '" + ts_common_1.__stringify(uniqueQuery) + "'");
-                        }
-                        return [2 /*return*/, dbInstance];
-                }
-            });
+    }
+    assertExternalQueryUnique(instance, transaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dbInstance = yield transaction.queryItem(this.collection, instance);
+            if (!dbInstance) {
+                const uniqueQuery = backend_2.FirestoreInterface.buildUniqueQuery(this.collection, instance);
+                throw new backend_1.ApiException(404, `Could not find ${this.config.itemName} with unique query '${ts_common_1.__stringify(uniqueQuery)}'`);
+            }
+            return dbInstance;
         });
-    };
+    }
     /**
      * Asserts the uniqueness of an instance in two steps:
      * - Executes `this.preUpsertProcessing`.
@@ -217,43 +148,28 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @param transaction - The transaction object.
      * @param instance - The document for which the uniqueness assertion will occur.
      */
-    BaseDB_ApiGenerator.prototype.assertUniqueness = function (transaction, instance, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var uniqueQueries, dbInstances, _loop_1, this_1, idx;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.preUpsertProcessing(transaction, instance, request)];
-                    case 1:
-                        _a.sent();
-                        uniqueQueries = this.internalFilter(instance);
-                        if (uniqueQueries.length === 0)
-                            return [2 /*return*/];
-                        return [4 /*yield*/, Promise.all(uniqueQueries.map(function (uniqueQuery) {
-                                return transaction.queryUnique(_this.collection, { where: uniqueQuery });
-                            }))];
-                    case 2:
-                        dbInstances = _a.sent();
-                        _loop_1 = function (idx) {
-                            var dbInstance = dbInstances[idx];
-                            if (!dbInstance || dbInstance._id === instance._id)
-                                return "continue";
-                            var query = uniqueQueries[idx];
-                            var message = ts_common_1._keys(query).reduce(function (carry, key) {
-                                return carry + "\n" + (key + ": " + query[key]);
-                            }, this_1.config.itemName + " uniqueness violation. There is already a document with");
-                            this_1.logWarning(message);
-                            throw new backend_1.ApiException(422, message);
-                        };
-                        this_1 = this;
-                        for (idx in dbInstances) {
-                            _loop_1(idx);
-                        }
-                        return [2 /*return*/];
-                }
-            });
+    assertUniqueness(transaction, instance, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.preUpsertProcessing(transaction, instance, request);
+            const uniqueQueries = this.internalFilter(instance);
+            if (uniqueQueries.length === 0)
+                return;
+            const dbInstances = yield Promise.all(uniqueQueries.map(uniqueQuery => {
+                return transaction.queryUnique(this.collection, { where: uniqueQuery });
+            }));
+            for (const idx in dbInstances) {
+                const dbInstance = dbInstances[idx];
+                if (!dbInstance || dbInstance._id === instance._id)
+                    continue;
+                const query = uniqueQueries[idx];
+                const message = ts_common_1._keys(query).reduce((carry, key) => {
+                    return carry + "\n" + `${key}: ${query[key]}`;
+                }, `${this.config.itemName} uniqueness violation. There is already a document with`);
+                this.logWarning(message);
+                throw new backend_1.ApiException(422, message);
+            }
         });
-    };
+    }
     /**
      * Runs the module's validator for the instance.
      *
@@ -261,55 +177,42 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      *
      * @throws `ApiException` for bad implementation or invalid input.
      */
-    BaseDB_ApiGenerator.prototype.validateImpl = function (instance) {
-        return __awaiter(this, void 0, void 0, function () {
-            var e_1, badImplementation, error, errorBody;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, ts_common_1.validate(instance, this.validator)];
-                    case 1:
-                        _a.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        e_1 = _a.sent();
-                        badImplementation = ts_common_1.isErrorOfType(e_1, ts_common_1.BadImplementationException);
-                        if (badImplementation)
-                            throw new backend_1.ApiException(500, badImplementation.message);
-                        error = ts_common_1.isErrorOfType(e_1, ts_common_1.ValidationException);
-                        if (error) {
-                            errorBody = { type: types_1.ErrorKey_BadInput, body: { path: error.path, input: error.input } };
-                            throw new backend_1.ApiException(400, error.message).setErrorBody(errorBody);
-                        }
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+    validateImpl(instance) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield ts_common_1.validate(instance, this.validator);
+            }
+            catch (e) {
+                const badImplementation = ts_common_1.isErrorOfType(e, ts_common_1.BadImplementationException);
+                if (badImplementation)
+                    throw new backend_1.ApiException(500, badImplementation.message);
+                const error = ts_common_1.isErrorOfType(e, ts_common_1.ValidationException);
+                if (error) {
+                    const errorBody = { type: types_1.ErrorKey_BadInput, body: { path: error.path, input: error.input } };
+                    throw new backend_1.ApiException(400, error.message).setErrorBody(errorBody);
                 }
-            });
+            }
         });
-    };
+    }
     /**
      * Override this method to return a list of "where" queries that dictate uniqueness inside the collection.
      * Example return value: [{attribute1: item.attribute1, attribute2: item.attribute2}].
      *
      * @param item - The DB entry that will be used.
      */
-    BaseDB_ApiGenerator.prototype.internalFilter = function (item) {
+    internalFilter(item) {
         return [];
-    };
+    }
     /**
      * Override this method to customize the assertions that should be done before the insertion of the document to the DB.
      *
      * @param transaction - The transaction object.
      * @param dbInstance - The DB entry for which the uniqueness is being asserted.
      */
-    BaseDB_ApiGenerator.prototype.preUpsertProcessing = function (transaction, dbInstance, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/];
-            });
+    preUpsertProcessing(transaction, dbInstance, request) {
+        return __awaiter(this, void 0, void 0, function* () {
         });
-    };
+    }
     /**
      * Override this method to provide actions or assertions to be executed before the deletion happens.
      *
@@ -318,28 +221,17 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @param transaction - The transaction object
      * @param dbInstance - The DB entry that is going to be deleted.
      */
-    BaseDB_ApiGenerator.prototype.assertDeletion = function (transaction, dbInstance, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.assertDeletion_Read(transaction, dbInstance, request)];
-                    case 1: return [2 /*return*/, (_a.sent())()];
-                }
-            });
+    assertDeletion(transaction, dbInstance, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield this.assertDeletion_Read(transaction, dbInstance, request))();
         });
-    };
-    BaseDB_ApiGenerator.prototype.assertDeletion_Read = function (transaction, dbInstance, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, function () { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        });
-                    }); }];
+    }
+    assertDeletion_Read(transaction, dbInstance, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return () => __awaiter(this, void 0, void 0, function* () {
             });
         });
-    };
+    }
     /**
      * A wrapper of the collections's `runInTransaction`.
      *
@@ -348,26 +240,17 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of the result of the `processor`.
      */
-    BaseDB_ApiGenerator.prototype.runInTransaction = function (processor) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.collection.runInTransaction(processor)];
-            });
+    runInTransaction(processor) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.collection.runInTransaction(processor);
         });
-    };
+    }
     // @ts-ignore
-    BaseDB_ApiGenerator.prototype.deleteCollection = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.collection.deleteAll()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
+    deleteCollection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.collection.deleteAll();
         });
-    };
+    }
     /**
      * Inserts the `instance` using the `transaction` object.
      *
@@ -381,24 +264,13 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
     // private async createImpl(transaction: FirestoreTransaction, instance: DBType, request?: ExpressRequest): Promise<DBType> {
     // 	return (await this.createImpl_Read(transaction, instance, request))()
     // };
-    BaseDB_ApiGenerator.prototype.createImpl_Read = function (transaction, instance, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.validateImpl(instance)];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, this.assertUniqueness(transaction, instance, request)];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/, function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                return [2 /*return*/, transaction.insert(this.collection, instance)];
-                            }); }); }];
-                }
-            });
+    createImpl_Read(transaction, instance, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateImpl(instance);
+            yield this.assertUniqueness(transaction, instance, request);
+            return () => __awaiter(this, void 0, void 0, function* () { return transaction.insert(this.collection, instance); });
         });
-    };
+    }
     ;
     /**
      * Upserts the `instance` using a transaction, after validating it and asserting uniqueness.
@@ -410,34 +282,23 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of the document that was upserted.
      */
-    BaseDB_ApiGenerator.prototype.upsert = function (instance, transaction, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var processor;
-            var _this = this;
-            return __generator(this, function (_a) {
-                processor = function (_transaction) { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, this.upsert_Read(instance, _transaction, request)];
-                            case 1: return [2 /*return*/, (_a.sent())()];
-                        }
-                    });
-                }); };
-                if (transaction)
-                    return [2 /*return*/, processor(transaction)];
-                return [2 /*return*/, this.collection.runInTransaction(processor)];
+    upsert(instance, transaction, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const processor = (_transaction) => __awaiter(this, void 0, void 0, function* () {
+                return (yield this.upsert_Read(instance, _transaction, request))();
             });
+            if (transaction)
+                return processor(transaction);
+            return this.collection.runInTransaction(processor);
         });
-    };
-    BaseDB_ApiGenerator.prototype.upsert_Read = function (instance, transaction, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                if (instance._id === undefined)
-                    return [2 /*return*/, this.createImpl_Read(transaction, __assign(__assign({}, instance), { _id: ts_common_1.generateHex(idLength) }), request)];
-                return [2 /*return*/, this.upsertImpl_Read(transaction, instance, request)];
-            });
+    }
+    upsert_Read(instance, transaction, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (instance._id === undefined)
+                return this.createImpl_Read(transaction, Object.assign(Object.assign({}, instance), { _id: ts_common_1.generateHex(idLength) }), request);
+            return this.upsertImpl_Read(transaction, instance, request);
         });
-    };
+    }
     /**
      * Upserts a set of objects. Batching is used to circumvent firestore limitations on the number of objects.
      *
@@ -447,16 +308,11 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of an array of documents that were upserted.
      */
-    BaseDB_ApiGenerator.prototype.upsertAll_Batched = function (instances, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, ts_common_1.batchAction(instances, 500, function (chunked) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                        return [2 /*return*/, this.upsertAll(chunked, undefined, request)];
-                    }); }); })];
-            });
+    upsertAll_Batched(instances, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return ts_common_1.batchAction(instances, 500, (chunked) => __awaiter(this, void 0, void 0, function* () { return this.upsertAll(chunked, undefined, request); }));
         });
-    };
+    }
     /**
      * Upserts the `dbInstances` using the `transaction` object.
      *
@@ -469,50 +325,32 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of the array of documents that were upserted.
      */
-    BaseDB_ApiGenerator.prototype.upsertAll = function (instances, transaction, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var processor;
-            var _this = this;
-            return __generator(this, function (_a) {
-                if (instances.length > 500) {
-                    if (transaction)
-                        throw new ts_common_1.BadImplementationException('Firestore transaction supports maximum 500 at a time');
-                    return [2 /*return*/, this.upsertAll_Batched(instances, request)];
-                }
-                processor = function (_transaction) { return __awaiter(_this, void 0, void 0, function () {
-                    var writes, _a, _b;
-                    return __generator(this, function (_c) {
-                        switch (_c.label) {
-                            case 0:
-                                _b = (_a = Promise).all;
-                                return [4 /*yield*/, this.upsertAllImpl_Read(instances, _transaction, request)];
-                            case 1: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                            case 2:
-                                writes = _c.sent();
-                                return [2 /*return*/, Promise.all(writes.map(function (write) { return write(); }))];
-                        }
-                    });
-                }); };
+    upsertAll(instances, transaction, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (instances.length > 500) {
                 if (transaction)
-                    return [2 /*return*/, processor(transaction)];
-                return [2 /*return*/, this.collection.runInTransaction(processor)];
+                    throw new ts_common_1.BadImplementationException('Firestore transaction supports maximum 500 at a time');
+                return this.upsertAll_Batched(instances, request);
+            }
+            const processor = (_transaction) => __awaiter(this, void 0, void 0, function* () {
+                const writes = yield Promise.all(yield this.upsertAllImpl_Read(instances, _transaction, request));
+                return Promise.all(writes.map(write => write()));
             });
+            if (transaction)
+                return processor(transaction);
+            return this.collection.runInTransaction(processor);
         });
-    };
-    BaseDB_ApiGenerator.prototype.upsertAllImpl_Read = function (instances, transaction, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var actions;
-            var _this = this;
-            return __generator(this, function (_a) {
-                actions = [];
-                instances.reduce(function (carry, instance) {
-                    ts_common_1.addItemToArray(carry, _this.upsert_Read(instance, transaction, request));
-                    return carry;
-                }, actions);
-                return [2 /*return*/, Promise.all(actions)];
-            });
+    }
+    upsertAllImpl_Read(instances, transaction, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const actions = [];
+            instances.reduce((carry, instance) => {
+                ts_common_1.addItemToArray(carry, this.upsert_Read(instance, transaction, request));
+                return carry;
+            }, actions);
+            return Promise.all(actions);
         });
-    };
+    }
     /**
      * Upserts the `dbInstance` using the `transaction` transaction object.
      *
@@ -523,32 +361,19 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of the document that was upserted.
      */
-    BaseDB_ApiGenerator.prototype.upsertImpl = function (transaction, dbInstance, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.upsertImpl_Read(transaction, dbInstance, request)];
-                    case 1: return [2 /*return*/, (_a.sent())()];
-                }
-            });
+    upsertImpl(transaction, dbInstance, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield this.upsertImpl_Read(transaction, dbInstance, request))();
         });
-    };
+    }
     ;
-    BaseDB_ApiGenerator.prototype.upsertImpl_Read = function (transaction, dbInstance, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.validateImpl(dbInstance)];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, this.assertUniqueness(transaction, dbInstance, request)];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/, transaction.upsert_Read(this.collection, dbInstance)];
-                }
-            });
+    upsertImpl_Read(transaction, dbInstance, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateImpl(dbInstance);
+            yield this.assertUniqueness(transaction, dbInstance, request);
+            return transaction.upsert_Read(this.collection, dbInstance);
         });
-    };
+    }
     ;
     /**
      * Deletes a unique document based on its `_id`. Uses a transaction, after deletion assertions occur.
@@ -562,69 +387,39 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of the document that was deleted.
      */
-    BaseDB_ApiGenerator.prototype.deleteUnique = function (_id, transaction, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var processor;
-            var _this = this;
-            return __generator(this, function (_a) {
-                if (!_id)
-                    throw new ts_common_1.BadImplementationException("No _id for deletion provided.");
-                processor = function (_transaction) { return __awaiter(_this, void 0, void 0, function () {
-                    var write;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, this.deleteUnique_Read(_id, _transaction, request)];
-                            case 1:
-                                write = _a.sent();
-                                if (!write)
-                                    throw new backend_1.ApiException(404, "Could not find " + this.config.itemName + " with unique id: " + _id);
-                                return [2 /*return*/, write()];
-                        }
-                    });
-                }); };
-                if (transaction)
-                    return [2 /*return*/, processor(transaction)];
-                return [2 /*return*/, this.collection.runInTransaction(processor)];
+    deleteUnique(_id, transaction, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!_id)
+                throw new ts_common_1.BadImplementationException(`No _id for deletion provided.`);
+            const processor = (_transaction) => __awaiter(this, void 0, void 0, function* () {
+                const write = yield this.deleteUnique_Read(_id, _transaction, request);
+                if (!write)
+                    throw new backend_1.ApiException(404, `Could not find ${this.config.itemName} with unique id: ${_id}`);
+                return write();
             });
+            if (transaction)
+                return processor(transaction);
+            return this.collection.runInTransaction(processor);
         });
-    };
-    BaseDB_ApiGenerator.prototype.deleteUnique_Read = function (_id, transaction, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var ourQuery, dbInstance, write;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!_id)
-                            throw new ts_common_1.BadImplementationException("No _id for deletion provided.");
-                        ourQuery = { where: { _id: _id } };
-                        return [4 /*yield*/, transaction.queryUnique(this.collection, ourQuery)];
-                    case 1:
-                        dbInstance = _a.sent();
-                        if (!dbInstance)
-                            throw new backend_1.ApiException(404, "Could not find " + this.config.itemName + " with unique id: " + _id);
-                        return [4 /*yield*/, this.deleteImpl_Read(transaction, ourQuery, request)];
-                    case 2:
-                        write = _a.sent();
-                        return [2 /*return*/, function () { return __awaiter(_this, void 0, void 0, function () {
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            if (!write)
-                                                return [2 /*return*/, dbInstance];
-                                            // Here can do both read an write!
-                                            return [4 /*yield*/, this.assertDeletion(transaction, dbInstance, request)];
-                                        case 1:
-                                            // Here can do both read an write!
-                                            _a.sent();
-                                            return [2 /*return*/, write()];
-                                    }
-                                });
-                            }); }];
-                }
+    }
+    deleteUnique_Read(_id, transaction, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!_id)
+                throw new ts_common_1.BadImplementationException(`No _id for deletion provided.`);
+            const ourQuery = { where: { _id } };
+            const dbInstance = yield transaction.queryUnique(this.collection, ourQuery);
+            if (!dbInstance)
+                throw new backend_1.ApiException(404, `Could not find ${this.config.itemName} with unique id: ${_id}`);
+            const write = yield this.deleteImpl_Read(transaction, ourQuery, request);
+            return () => __awaiter(this, void 0, void 0, function* () {
+                if (!write)
+                    return dbInstance;
+                // Here can do both read an write!
+                yield this.assertDeletion(transaction, dbInstance, request);
+                return write();
             });
         });
-    };
+    }
     /**
      * Uses the `transaction` to delete a unique document, querying with the `ourQuery`.
      *
@@ -635,34 +430,25 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of the document that was deleted.
      */
-    BaseDB_ApiGenerator.prototype.deleteImpl_Read = function (transaction, ourQuery, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var write;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, transaction.deleteUnique_Read(this.collection, ourQuery)];
-                    case 1:
-                        write = _a.sent();
-                        if (!write)
-                            throw new ts_common_1.ThisShouldNotHappenException("I just checked that I had an instance for query: " + ts_common_1.__stringify(ourQuery));
-                        return [2 /*return*/, write];
-                }
-            });
+    deleteImpl_Read(transaction, ourQuery, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const write = yield transaction.deleteUnique_Read(this.collection, ourQuery);
+            if (!write)
+                throw new ts_common_1.ThisShouldNotHappenException(`I just checked that I had an instance for query: ${ts_common_1.__stringify(ourQuery)}`);
+            return write;
         });
-    };
+    }
     /**
      * Calls the `delete` method of the module's collection.
      *
      * @param query - The query to be executed for the deletion.
      * @param request - The request in order to possibly obtain more info.
      */
-    BaseDB_ApiGenerator.prototype.delete = function (query, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.collection.delete(query)];
-            });
+    delete(query, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.collection.delete(query);
         });
-    };
+    }
     /**
      * Queries the database for a specific document in the module's collection.
      *
@@ -674,21 +460,14 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * The DB document that was found.
      */
-    BaseDB_ApiGenerator.prototype.queryUnique = function (where, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var dbItem;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.collection.queryUnique({ where: where })];
-                    case 1:
-                        dbItem = _a.sent();
-                        if (!dbItem)
-                            throw new backend_1.ApiException(404, "Could not find " + this.config.itemName + " with unique query: " + JSON.stringify(where));
-                        return [2 /*return*/, dbItem];
-                }
-            });
+    queryUnique(where, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dbItem = yield this.collection.queryUnique({ where });
+            if (!dbItem)
+                throw new backend_1.ApiException(404, `Could not find ${this.config.itemName} with unique query: ${JSON.stringify(where)}`);
+            return dbItem;
         });
-    };
+    }
     /**
      * Executes the specified query on the module's collection.
      *
@@ -698,16 +477,11 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of an array of documents.
      */
-    BaseDB_ApiGenerator.prototype.query = function (query, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.collection.query(query)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
+    query(query, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.collection.query(query);
         });
-    };
+    }
     /**
      * If propsToPatch is not set, we remove the lock keys from the caller's instance
      * before merging with the original dbInstance.
@@ -721,57 +495,43 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * A promise of the patched document.
      */
-    BaseDB_ApiGenerator.prototype.patch = function (instance, propsToPatch, request) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.collection.runInTransaction(function (transaction) { return __awaiter(_this, void 0, void 0, function () {
-                        var dbInstance, wrongKey, mergedObject;
-                        var _this = this;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.assertExternalQueryUnique(instance, transaction)];
-                                case 1:
-                                    dbInstance = _a.sent();
-                                    wrongKey = propsToPatch === null || propsToPatch === void 0 ? void 0 : propsToPatch.find(function (prop) { return _this.config.lockKeys.includes(prop); });
-                                    if (wrongKey)
-                                        throw new ts_common_1.BadImplementationException("Key " + wrongKey + " is part of the 'lockKeys' and cannot be updated.");
-                                    // If the caller has not specified props, we remove the keys from the caller's instance
-                                    // before merging with the original dbInstance.
-                                    ts_common_1._keys(instance).forEach(function (key) {
-                                        if (_this.config.lockKeys.includes(key) || (propsToPatch && !propsToPatch.includes(key))) {
-                                            delete instance[key];
-                                        }
-                                    });
-                                    mergedObject = ts_common_1.merge(dbInstance, instance);
-                                    return [4 /*yield*/, ts_common_1.validate(mergedObject, this.validator)];
-                                case 2:
-                                    _a.sent();
-                                    return [4 /*yield*/, this.assertUniqueness(transaction, mergedObject, request)];
-                                case 3:
-                                    _a.sent();
-                                    return [2 /*return*/, this.upsertImpl(transaction, mergedObject, request)];
-                            }
-                        });
-                    }); })];
-            });
+    patch(instance, propsToPatch, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.collection.runInTransaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+                const dbInstance = yield this.assertExternalQueryUnique(instance, transaction);
+                // If the caller has specified props to be changed, make sure the don't conflict with the lockKeys.
+                const wrongKey = propsToPatch === null || propsToPatch === void 0 ? void 0 : propsToPatch.find(prop => this.config.lockKeys.includes(prop));
+                if (wrongKey)
+                    throw new ts_common_1.BadImplementationException(`Key ${wrongKey} is part of the 'lockKeys' and cannot be updated.`);
+                // If the caller has not specified props, we remove the keys from the caller's instance
+                // before merging with the original dbInstance.
+                ts_common_1._keys(instance).forEach(key => {
+                    if (this.config.lockKeys.includes(key) || (propsToPatch && !propsToPatch.includes(key))) {
+                        delete instance[key];
+                    }
+                });
+                const mergedObject = ts_common_1.merge(dbInstance, instance);
+                yield ts_common_1.validate(mergedObject, this.validator);
+                yield this.assertUniqueness(transaction, mergedObject, request);
+                return this.upsertImpl(transaction, mergedObject, request);
+            }));
         });
-    };
-    BaseDB_ApiGenerator.prototype.apiCreate = function (pathPart) {
+    }
+    apiCreate(pathPart) {
         return new apis_1.ServerApi_Create(this, pathPart);
-    };
-    BaseDB_ApiGenerator.prototype.apiQuery = function (pathPart) {
+    }
+    apiQuery(pathPart) {
         return new apis_1.ServerApi_Query(this, pathPart);
-    };
-    BaseDB_ApiGenerator.prototype.apiQueryUnique = function (pathPart) {
+    }
+    apiQueryUnique(pathPart) {
         return new apis_1.ServerApi_Unique(this, pathPart);
-    };
-    BaseDB_ApiGenerator.prototype.apiUpdate = function (pathPart) {
+    }
+    apiUpdate(pathPart) {
         return new apis_1.ServerApi_Update(this, pathPart);
-    };
-    BaseDB_ApiGenerator.prototype.apiDelete = function (pathPart) {
+    }
+    apiDelete(pathPart) {
         return new apis_1.ServerApi_Delete(this, pathPart);
-    };
+    }
     /**
      * Override this method, to control which server api endpoints are created automatically.
      *
@@ -780,7 +540,7 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
      * @returns
      * An array of api endpoints.
      */
-    BaseDB_ApiGenerator.prototype.apis = function (pathPart) {
+    apis(pathPart) {
         return ts_common_1.filterInstances([
             this.apiCreate(pathPart),
             this.apiQuery(pathPart),
@@ -788,8 +548,7 @@ var BaseDB_ApiGenerator = /** @class */ (function (_super) {
             this.apiUpdate(pathPart),
             this.apiDelete(pathPart),
         ]);
-    };
-    return BaseDB_ApiGenerator;
-}(ts_common_1.Module));
+    }
+}
 exports.BaseDB_ApiGenerator = BaseDB_ApiGenerator;
 //# sourceMappingURL=BaseDB_ApiGenerator.js.map