taon 18.0.24 → 18.0.26

package/lib/base-classes/base-repository.js

@@ -1,230 +1,189 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseRepository = void 0;
-var tslib_1 = require("tslib");
-var tnp_core_1 = require("tnp-core");
-var tnp_core_2 = require("tnp-core");
-var class_helpers_1 = require("../helpers/class-helpers");
-var taon_type_sql_1 = require("taon-type-sql");
-var repository_decorator_1 = require("../decorators/classes/repository-decorator");
-var base_injector_1 = require("./base-injector");
+const tnp_core_1 = require("tnp-core");
+const tnp_core_2 = require("tnp-core");
+const class_helpers_1 = require("../helpers/class-helpers");
+const taon_type_sql_1 = require("taon-type-sql");
+const repository_decorator_1 = require("../decorators/classes/repository-decorator");
+const base_injector_1 = require("./base-injector");
 //#endregion
-var INDEX_KEYS_NO_FOR_UPDATE = ['id'];
-var BaseRepository = /** @class */ (function (_super) {
-    tslib_1.__extends(BaseRepository, _super);
-    function BaseRepository(
+const INDEX_KEYS_NO_FOR_UPDATE = ['id'];
+let BaseRepository = class BaseRepository extends base_injector_1.BaseInjector {
+    __entityClassResolveFn;
+    constructor(
     // Injected through BaseCrudController
     __entityClassResolveFn) {
-        var _this = _super.call(this) || this;
-        _this.__entityClassResolveFn = __entityClassResolveFn;
+        super();
+        this.__entityClassResolveFn = __entityClassResolveFn;
         // @ts-ignore
-        _this.entityClassResolveFn = __entityClassResolveFn;
-        return _this;
-    }
-    Object.defineProperty(BaseRepository.prototype, "dbQuery", {
-        get: function () {
-            var _a, _b;
-            //#region @websqlFunc
-            if (!this.__dbQuery) {
-                if (!this.ctx) {
-                    return; // TODO
-                    throw new Error("[BaseRepository] Context not inited for class ".concat(class_helpers_1.ClassHelpers.getName(this)));
-                }
-                var connection = (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.connection;
-                if (!connection) {
-                    throw new Error("[BaseRepository] Database not inited for context ".concat((_b = this.ctx) === null || _b === void 0 ? void 0 : _b.contextName));
-                }
-                this.__dbQuery = new taon_type_sql_1.MySqlQuerySource(connection);
+        this.entityClassResolveFn = __entityClassResolveFn;
+    }
+    //#endregion
+    //#region db query
+    __dbQuery;
+    get dbQuery() {
+        //#region @websqlFunc
+        if (!this.__dbQuery) {
+            if (!this.ctx) {
+                return; // TODO
+                throw new Error(`[BaseRepository] Context not inited for class ${class_helpers_1.ClassHelpers.getName(this)}`);
+            }
+            const connection = this.ctx?.connection;
+            if (!connection) {
+                throw new Error(`[BaseRepository] Database not inited for context ${this.ctx?.contextName}`);
             }
-            return this.__dbQuery;
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(BaseRepository.prototype, "connection", {
+            this.__dbQuery = new taon_type_sql_1.MySqlQuerySource(connection);
+        }
+        return this.__dbQuery;
+        //#endregion
+    }
+    //#endregion
+    //#region connection
+    get connection() {
+        //#region @websqlFunc
+        return this.ctx?.connection;
+        //#endregion
+    }
+    //#endregion
+    //#region repository
+    //#region @websql
+    __repository;
+    //#endregion
+    get repository() {
+        //#region @websqlFunc
+        return this.__repository;
+        //#endregion
+    }
+    /**
+     * target for repository
+     */
+    get target() {
+        //#region @websqlFunc
+        return this?.repository?.target;
+        //#endregion
+    }
+    /**
+     * alias to repository
+     */
+    get repo() {
+        //#region @websqlFunc
+        return this.repository;
         //#endregion
-        //#region connection
-        get: function () {
-            var _a;
-            //#region @websqlFunc
-            return (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.connection;
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(BaseRepository.prototype, "repository", {
+    }
+    get repositoryExists() {
+        //#region @websqlFunc
+        return !!this.__repository;
         //#endregion
-        get: function () {
-            //#region @websqlFunc
-            return this.__repository;
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(BaseRepository.prototype, "target", {
-        /**
-         * target for repository
-         */
-        get: function () {
-            var _a;
-            //#region @websqlFunc
-            return (_a = this === null || this === void 0 ? void 0 : this.repository) === null || _a === void 0 ? void 0 : _a.target;
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(BaseRepository.prototype, "repo", {
-        /**
-         * alias to repository
-         */
-        get: function () {
-            //#region @websqlFunc
-            return this.repository;
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(BaseRepository.prototype, "repositoryExists", {
-        get: function () {
-            //#region @websqlFunc
-            return !!this.__repository;
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
+    }
     //#endregion
     //#region init
-    BaseRepository.prototype.__init = function (context) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var entityClassFn, ctx, connection, _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        //#region @websql
-                        if (this.__repository) {
-                            return [2 /*return*/];
-                        }
-                        entityClassFn = this.entityClassResolveFn();
-                        if (!entityClassFn) {
-                            tnp_core_1.Helpers.warn("Entity class not provided for repository ".concat(class_helpers_1.ClassHelpers.getName(this)));
-                            return [2 /*return*/];
-                        }
-                        ctx = this.__endpoint_context__;
-                        if (ctx.remoteHost) {
-                            return [2 /*return*/];
-                        }
-                        connection = ctx.connection;
-                        if (!connection) {
-                            throw new Error("\n\n        Connection not found for context ".concat(ctx.contextName, "\n\n\n        Maybe you forgot to init database ?\n\n        Taon.createContext({\n        ...\n        database:true\n        ...\n        })\n\n        "));
-                        }
-                        if (!entityClassFn) {
-                            tnp_core_1.Helpers.warn("Entity class not found for repository ".concat(class_helpers_1.ClassHelpers.getName(this)));
-                            return [2 /*return*/];
-                        }
-                        _a = this;
-                        return [4 /*yield*/, connection.getRepository(class_helpers_1.ClassHelpers.getOrginalClass(entityClassFn))];
-                    case 1:
-                        _a.__repository = (_b.sent());
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async __init(context) {
+        //#region @websql
+        if (this.__repository) {
+            return;
+        }
+        let entityClassFn = this.entityClassResolveFn();
+        if (!entityClassFn) {
+            tnp_core_1.Helpers.warn(`Entity class not provided for repository ${class_helpers_1.ClassHelpers.getName(this)}`);
+            return;
+        }
+        const ctx = this.__endpoint_context__;
+        if (ctx.remoteHost) {
+            return;
+        }
+        const connection = ctx.connection;
+        if (!connection) {
+            throw new Error(`
+
+        Connection not found for context ${ctx.contextName}
+
+
+        Maybe you forgot to init database ?
+
+        Taon.createContext({
+        ...
+        database:true
+        ...
+        })
+
+        `);
+        }
+        if (!entityClassFn) {
+            tnp_core_1.Helpers.warn(`Entity class not found for repository ${class_helpers_1.ClassHelpers.getName(this)}`);
+            return;
+        }
+        this.__repository = (await connection.getRepository(class_helpers_1.ClassHelpers.getOrginalClass(entityClassFn)));
+        // console.log(
+        //   `Inited repository for (${ClassHelpers.getName(this)}/` +
+        //     `${ClassHelpers.getName(entityClassFn)}/${ClassHelpers.getName(context)}`,
+        //   this.repository,
+        // );
+        //#endregion
+    }
     //#endregion
     //#region crud operations / typeorm / has id
     /**
      * Checks if entity has an id.
      * If entity composite compose ids, it will check them all.
      */
-    BaseRepository.prototype.hasId = function (entity) {
+    hasId(entity) {
         return this.repo.hasId(entity);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / get id
     /**
      * Gets entity mixed id.
      */
-    BaseRepository.prototype.getId = function (entity) {
+    getId(entity) {
         return this.repo.getId(entity);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / create & bulk create
     /**
       Saves a given entity in the database.
      * If entity does not exist in the database then inserts, otherwise updates.
      */
-    BaseRepository.prototype.save = function (item, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var model, id;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.repo.create(item)];
-                    case 1:
-                        model = _a.sent();
-                        return [4 /*yield*/, this.repo.save(model, options)];
-                    case 2:
-                        model = _a.sent();
-                        id = model.id;
-                        return [4 /*yield*/, this.repo.findOne({
-                                where: { id: id },
-                            })];
-                    case 3:
-                        model = _a.sent();
-                        return [2 /*return*/, model];
-                }
-            });
+    async save(item, options) {
+        //#region @websqlFunc
+        let model = await this.repo.create(item);
+        model = await this.repo.save(model, options);
+        const { id } = model;
+        model = await this.repo.findOne({
+            where: { id },
         });
-    };
+        return model;
+        //#endregion
+    }
     /**
      * alias to save
      * -> it will actuall create new entity in db
      * in oposite to typeorm create method
      */
-    BaseRepository.prototype.create = function (item, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.save(item, options)];
-            });
-        });
-    };
-    BaseRepository.prototype.bulkSave = function (items, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var models, index, item, model;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        models = [];
-                        index = 0;
-                        _a.label = 1;
-                    case 1:
-                        if (!(index < items.length)) return [3 /*break*/, 4];
-                        item = items[index];
-                        return [4 /*yield*/, this.save(item, options)];
-                    case 2:
-                        model = _a.sent();
-                        models.push(model);
-                        _a.label = 3;
-                    case 3:
-                        index++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, models];
-                }
-            });
-        });
-    };
-    BaseRepository.prototype.bulkCreate = function (items, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.bulkSave(items, options)];
-            });
-        });
-    };
+    async create(item, options) {
+        return this.save(item, options);
+    }
+    async bulkSave(items, options) {
+        //#region @websqlFunc
+        const models = [];
+        for (let index = 0; index < items.length; index++) {
+            const item = items[index];
+            // TODO FIX THIS / REFACTOR
+            const model = await this.save(item, options);
+            models.push(model);
+        }
+        return models;
+        //#endregion
+    }
+    async bulkCreate(items, options) {
+        return this.bulkSave(items, options);
+    }
     //#region old typeorm version
     // /**
     //  * Creates a new entity instance.
@@ -284,14 +243,9 @@ var BaseRepository = /** @class */ (function (_super) {
     /**
      * Merges multiple entities (or entity-like objects) into a given entity.
      */
-    BaseRepository.prototype.merge = function (mergeIntoEntity) {
-        var _a;
-        var entityLikes = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            entityLikes[_i - 1] = arguments[_i];
-        }
-        return (_a = this.repo).merge.apply(_a, tslib_1.__spreadArray([mergeIntoEntity], tslib_1.__read(entityLikes), false));
-    };
+    merge(mergeIntoEntity, ...entityLikes) {
+        return this.repo.merge(mergeIntoEntity, ...entityLikes);
+    }
     //#endregion
     //#region crud operations / typeorm / preload
     /**
@@ -303,107 +257,69 @@ var BaseRepository = /** @class */ (function (_super) {
      * Note that given entity-like object must have an entity id / primary key to find entity by.
      * Returns undefined if entity with given id was not found.
      */
-    BaseRepository.prototype.preload = function (entityLike) {
+    preload(entityLike) {
         return this.repo.preload(entityLike);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / remove (delete) & bulk remove (delete)
     /**
      * Removes a given entities from the database.
      */
-    BaseRepository.prototype.remove = function (idOrEntity) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var deletedEntity, idCopy;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        //#region @websqlFunc
-                        if (tnp_core_2._.isObject(idOrEntity)) {
-                            idOrEntity = idOrEntity.id;
-                        }
-                        return [4 /*yield*/, this.repo.findOne({
-                                where: { id: idOrEntity },
-                            })];
-                    case 1:
-                        deletedEntity = _a.sent();
-                        idCopy = deletedEntity.id;
-                        return [4 /*yield*/, this.repo.remove(deletedEntity)];
-                    case 2:
-                        _a.sent();
-                        deletedEntity.id = idCopy;
-                        return [2 /*return*/, deletedEntity];
-                }
-            });
+    async remove(idOrEntity) {
+        //#region @websqlFunc
+        if (tnp_core_2._.isObject(idOrEntity)) {
+            idOrEntity = idOrEntity.id;
+        }
+        const deletedEntity = await this.repo.findOne({
+            where: { id: idOrEntity },
         });
-    };
+        const idCopy = deletedEntity.id;
+        await this.repo.remove(deletedEntity);
+        deletedEntity.id = idCopy;
+        return deletedEntity;
+        //#endregion
+    }
     /**
      * alias to remove
      */
-    BaseRepository.prototype.delete = function (idOrEntity) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.remove(idOrEntity)];
-            });
-        });
-    };
+    async delete(idOrEntity) {
+        return this.remove(idOrEntity);
+    }
     /**
      * alias to removeById
      */
-    BaseRepository.prototype.deleteById = function (id) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.remove(id)];
-            });
-        });
-    };
-    BaseRepository.prototype.bulkRemove = function (idsOrEntities) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var models, index, id, model;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        //#region @websqlFunc
-                        idsOrEntities = idsOrEntities.map(function (id) {
-                            return tnp_core_2._.isObject(id) ? id.id : id;
-                        });
-                        models = [];
-                        index = 0;
-                        _a.label = 1;
-                    case 1:
-                        if (!(index < idsOrEntities.length)) return [3 /*break*/, 4];
-                        id = idsOrEntities[index];
-                        return [4 /*yield*/, this.remove(id)];
-                    case 2:
-                        model = _a.sent();
-                        models.push(model);
-                        _a.label = 3;
-                    case 3:
-                        index++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, models];
-                }
-            });
-        });
-    };
-    BaseRepository.prototype.bulkDelete = function (ids) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.bulkRemove(ids)];
-            });
+    async deleteById(id) {
+        return this.remove(id);
+    }
+    async bulkRemove(idsOrEntities) {
+        //#region @websqlFunc
+        idsOrEntities = idsOrEntities.map(id => {
+            return tnp_core_2._.isObject(id) ? id.id : id;
         });
-    };
+        const models = [];
+        for (let index = 0; index < idsOrEntities.length; index++) {
+            const id = idsOrEntities[index];
+            const model = await this.remove(id);
+            models.push(model);
+        }
+        return models;
+        //#endregion
+    }
+    async bulkDelete(ids) {
+        return this.bulkRemove(ids);
+    }
     /**
      * Records the delete date of a given entity.
      */
-    BaseRepository.prototype.softRemove = function (entity, options) {
+    softRemove(entity, options) {
         return this.repo.softRemove(entity, options);
-    };
+    }
     /**
      * Recovers a given entity in the database.
      */
-    BaseRepository.prototype.recover = function (entity, options) {
+    recover(entity, options) {
         return this.repo.recover(entity, options);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / insert
     /**
@@ -412,100 +328,64 @@ var BaseRepository = /** @class */ (function (_super) {
      * Executes fast and efficient INSERT query.
      * Does not check if entity exist in the database, so query will fail if duplicate entity is being inserted.
      */
-    BaseRepository.prototype.insert = function (entity) {
+    insert(entity) {
         return this.repo.insert(entity);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / update & build update
-    BaseRepository.prototype.update = function (item) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var id;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        id = item.id;
-                        return [4 /*yield*/, this.updateById(id, item)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    BaseRepository.prototype.updateById = function (id, item) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var allowedPropsToUpdate, _loop_1, this_1, key, i, key, toSet, model;
-            var _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        allowedPropsToUpdate = [];
-                        _loop_1 = function (key) {
-                            if (tnp_core_2._.isObject(item) &&
-                                item.hasOwnProperty(key) &&
-                                typeof item[key] !== 'object' &&
-                                !tnp_core_2._.isUndefined(this_1.repo.metadata.ownColumns.find(function (c) { return c.propertyName === key; }))) {
-                                allowedPropsToUpdate.push(key);
-                            }
-                        };
-                        this_1 = this;
-                        for (key in item) {
-                            _loop_1(key);
-                        }
-                        i = 0;
-                        _b.label = 1;
-                    case 1:
-                        if (!(i < allowedPropsToUpdate.length)) return [3 /*break*/, 4];
-                        key = allowedPropsToUpdate[i];
-                        if (!!INDEX_KEYS_NO_FOR_UPDATE.includes(key.toLowerCase())) return [3 /*break*/, 3];
-                        toSet = item[key];
-                        // const tableName = tableNameFrom(this.entity as any);
-                        return [4 /*yield*/, this.repo.update({
-                                id: id,
-                            }, (_a = {},
-                                _a[key] = toSet,
-                                _a))];
-                    case 2:
-                        // const tableName = tableNameFrom(this.entity as any);
-                        _b.sent();
-                        _b.label = 3;
-                    case 3:
-                        i++;
-                        return [3 /*break*/, 1];
-                    case 4: return [4 /*yield*/, this.repo.findOne({
-                            where: { id: id },
-                        })];
-                    case 5:
-                        model = _b.sent();
-                        return [2 /*return*/, model];
-                }
-            });
-        });
-    };
-    BaseRepository.prototype.bulkUpdate = function (items) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var models, index, item, id, model;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        models = [];
-                        index = 0;
-                        _a.label = 1;
-                    case 1:
-                        if (!(index < items.length)) return [3 /*break*/, 4];
-                        item = items[index];
-                        id = item.id;
-                        return [4 /*yield*/, this.updateById(id, item)];
-                    case 2:
-                        model = _a.sent();
-                        models.push(model);
-                        _a.label = 3;
-                    case 3:
-                        index++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, { models: models }];
-                }
-            });
+    async update(item) {
+        //#region @websqlFunc
+        const { id } = item;
+        return await this.updateById(id, item);
+        //#endregion
+    }
+    async updateById(id, item) {
+        //#region @websqlFunc
+        const allowedPropsToUpdate = [];
+        for (const key in item) {
+            if (tnp_core_2._.isObject(item) &&
+                item.hasOwnProperty(key) &&
+                typeof item[key] !== 'object' &&
+                !tnp_core_2._.isUndefined(this.repo.metadata.ownColumns.find(c => c.propertyName === key))) {
+                allowedPropsToUpdate.push(key);
+            }
+        }
+        for (let i = 0; i < allowedPropsToUpdate.length; i++) {
+            const key = allowedPropsToUpdate[i];
+            if (!INDEX_KEYS_NO_FOR_UPDATE.includes(key.toLowerCase())) {
+                // const raw = _.isBoolean(item[key]) || _.isNumber(item[key]) || _.isNull(item[key]); // TODO does this make any sense ?
+                const toSet = item[key];
+                // const tableName = tableNameFrom(this.entity as any);
+                await this.repo.update({
+                    id,
+                }, {
+                    [key]: toSet,
+                });
+                //         await this.repo.query(
+                //           `UPDATE '${tableName}' as ${table}
+                // SET ${key}=${toSet}
+                // WHERE ${table}.id='${id}'
+                // `);
+            }
+        }
+        let model = await this.repo.findOne({
+            where: { id },
         });
-    };
+        return model;
+        //#endregion
+    }
+    async bulkUpdate(items) {
+        //#region @websqlFunc
+        const models = [];
+        for (let index = 0; index < items.length; index++) {
+            const item = items[index];
+            const { id } = item; // TOOD
+            const model = await this.updateById(id, item);
+            models.push(model);
+        }
+        return { models };
+        //#endregion
+    }
     //#region tpeorm update version
     // this version suck and will not return update entity
     // /**
@@ -537,9 +417,9 @@ var BaseRepository = /** @class */ (function (_super) {
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
      * Executes fast and efficient INSERT ... ON CONFLICT DO UPDATE/ON DUPLICATE KEY UPDATE query.
      */
-    BaseRepository.prototype.upsert = function (entityOrEntities, conflictPathsOrOptions) {
+    upsert(entityOrEntities, conflictPathsOrOptions) {
         return this.repo.upsert(entityOrEntities, conflictPathsOrOptions);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / soft delete
     /**
@@ -548,9 +428,9 @@ var BaseRepository = /** @class */ (function (_super) {
      * Executes fast and efficient SOFT-DELETE query.
      * Does not check if entity exist in the database.
      */
-    BaseRepository.prototype.softDelete = function (criteria) {
+    softDelete(criteria) {
         return this.repo.softDelete(criteria);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / restore
     /**
@@ -559,43 +439,43 @@ var BaseRepository = /** @class */ (function (_super) {
      * Executes fast and efficient SOFT-DELETE query.
      * Does not check if entity exist in the database.
      */
-    BaseRepository.prototype.restore = function (criteria) {
+    restore(criteria) {
         return this.repo.restore(criteria);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / count
     /**
      * Counts entities that match given options.
      * Useful for pagination.
      */
-    BaseRepository.prototype.count = function (options) {
+    count(options) {
         return this.repo.count(options);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / count by
     /**
      * Counts entities that match given conditions.
      * Useful for pagination.
      */
-    BaseRepository.prototype.countBy = function (where) {
+    countBy(where) {
         return this.repo.countBy(where);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find
     /**
      * Finds entities that match given find options.
      */
-    BaseRepository.prototype.find = function (options) {
+    find(options) {
         return this.repo.find(options);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find by
     /**
      * Finds entities that match given find options.
      */
-    BaseRepository.prototype.findBy = function (where) {
+    findBy(where) {
         return this.repo.findBy(where);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find and count
     // async findAndCount(options: { take: number; skip: number }) {
@@ -614,9 +494,9 @@ var BaseRepository = /** @class */ (function (_super) {
      * Also counts all entities that match given conditions,
      * but ignores pagination settings (from and take options).
      */
-    BaseRepository.prototype.findAndCount = function (options) {
+    findAndCount(options) {
         return this.repo.findAndCount(options);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find and count by
     /**
@@ -624,9 +504,9 @@ var BaseRepository = /** @class */ (function (_super) {
      * Also counts all entities that match given conditions,
      * but ignores pagination settings (from and take options).
      */
-    BaseRepository.prototype.findAndCountBy = function (where) {
+    findAndCountBy(where) {
         return this.repo.findAndCountBy(where);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find by ids
     /**
@@ -639,27 +519,27 @@ var BaseRepository = /** @class */ (function (_super) {
      *     id: In([1, 2, 3])
      * })
      */
-    BaseRepository.prototype.findByIds = function (ids) {
+    findByIds(ids) {
         return this.repo.findByIds(ids);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find one
     /**
      * Finds first entity by a given find options.
      * If entity was not found in the database - returns null.
      */
-    BaseRepository.prototype.findOne = function (options) {
+    findOne(options) {
         return this.repo.findOne(options);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find one by
     /**
      * Finds first entity that matches given where condition.
      * If entity was not found in the database - returns null.
      */
-    BaseRepository.prototype.findOneBy = function (where) {
+    findOneBy(where) {
         return this.repo.findOneBy(where);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find one or fail
     /**
@@ -672,36 +552,36 @@ var BaseRepository = /** @class */ (function (_super) {
      *     id: 1 // where "id" is your primary column name
      * })
      */
-    BaseRepository.prototype.findOneById = function (id) {
+    findOneById(id) {
         return this.repo.findOneById(id);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find one or fail
     /**
      * Finds first entity by a given find options.
      * If entity was not found in the database - rejects with error.
      */
-    BaseRepository.prototype.findOneOrFail = function (options) {
+    findOneOrFail(options) {
         return this.repo.findOneOrFail(options);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / find one by or fail
     /**
      * Finds first entity that matches given where condition.
      * If entity was not found in the database - rejects with error.
      */
-    BaseRepository.prototype.findOneByOrFail = function (where) {
+    findOneByOrFail(where) {
         return this.repo.findOneByOrFail(where);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / query
     /**
      * Executes a raw SQL query and returns a raw database results.
      * Raw query execution is supported only by relational databases (MongoDB is not supported).
      */
-    BaseRepository.prototype.query = function (query, parameters) {
+    query(query, parameters) {
         return this.repo.query(query, parameters);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / clear
     /**
@@ -710,71 +590,57 @@ var BaseRepository = /** @class */ (function (_super) {
      * Note: this method uses TRUNCATE and may not work as you expect in transactions on some platforms.
      * @see https://stackoverflow.com/a/5972738/925151
      */
-    BaseRepository.prototype.clear = function () {
+    clear() {
         return this.repo.clear();
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / increment
     /**
      * Increments some column by provided value of the entities matched given conditions.
      */
-    BaseRepository.prototype.increment = function (conditions, propertyPath, value) {
+    increment(conditions, propertyPath, value) {
         return this.repo.increment(conditions, propertyPath, value);
-    };
+    }
     //#endregion
     //#region crud operations / typeorm / decrement
     /**
      * Decrements some column by provided value of the entities matched given conditions.
      */
-    BaseRepository.prototype.decrement = function (conditions, propertyPath, value) {
+    decrement(conditions, propertyPath, value) {
         return this.repo.decrement(conditions, propertyPath, value);
-    };
+    }
     //#endregion
     //#region crud operations / get all
     /**
      * @deprecated use findAndCount instead
      */
-    BaseRepository.prototype.getAll = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var totalCount, models;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.repo.count()];
-                    case 1:
-                        totalCount = _a.sent();
-                        return [4 /*yield*/, this.repo.find()];
-                    case 2:
-                        models = _a.sent();
-                        // console.log('models', models);
-                        // console.log('totalCount', totalCount);
-                        return [2 /*return*/, { models: models, totalCount: totalCount }];
-                }
-            });
-        });
-    };
+    async getAll() {
+        //#region @websqlFunc
+        // console.log('repo', this.__repository);
+        // console.log(
+        //   `repo taget name "${ClassHelpers.getName(this.__repository.target)}"`,
+        // );
+        // debugger;
+        const totalCount = await this.repo.count();
+        const models = await this.repo.find();
+        // console.log('models', models);
+        // console.log('totalCount', totalCount);
+        return { models, totalCount };
+        //#endregion
+    }
     //#endregion
     //#region crud operations / get by id
-    BaseRepository.prototype.getBy = function (id) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var model;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.repo.findOne({
-                            where: { id: id },
-                        })];
-                    case 1: return [4 /*yield*/, _a.sent()];
-                    case 2:
-                        model = _a.sent();
-                        return [2 /*return*/, model];
-                }
-            });
+    async getBy(id) {
+        //#region @websqlFunc
+        const model = await await this.repo.findOne({
+            where: { id },
         });
-    };
-    BaseRepository = tslib_1.__decorate([
-        (0, repository_decorator_1.TaonRepository)({ className: 'BaseRepository' }),
-        tslib_1.__metadata("design:paramtypes", [Function])
-    ], BaseRepository);
-    return BaseRepository;
-}(base_injector_1.BaseInjector));
+        return model;
+        //#endregion
+    }
+};
 exports.BaseRepository = BaseRepository;
+exports.BaseRepository = BaseRepository = __decorate([
+    (0, repository_decorator_1.TaonRepository)({ className: 'BaseRepository' })
+], BaseRepository);
 //# sourceMappingURL=base-repository.js.map