cnpmcore 1.6.0 → 1.8.0

package/History.md

@@ -1,4 +1,22 @@
 
+1.8.0 / 2022-07-21
+==================
+
+**features**
+  * [[`b49a38c`](http://github.com/cnpm/cnpmcore/commit/b49a38c77e044c978e6de32a9d3e257cc90ea7c1)] - feat: use Model with inject (#269) (killa <<killa123@126.com>>)
+
+1.7.1 / 2022-07-20
+==================
+
+**fixes**
+  * [[`52fca55`](http://github.com/cnpm/cnpmcore/commit/52fca55aa883865f0ae70bfc1ff274c313b8f76a)] - fix: show package not use cache if isSync (#268) (killa <<killa123@126.com>>)
+
+1.7.0 / 2022-07-12
+==================
+
+**others**
+  * [[`4f7ce8b`](http://github.com/cnpm/cnpmcore/commit/4f7ce8b4b2a5806a225ce67228388e14388b7059)] - deps: upgrade leoric to 2.x (#262) (killa <<killa123@126.com>>)
+
 1.6.0 / 2022-07-11
 ==================
 

package/dist/app/port/controller/package/ShowPackageController.js

@@ -22,7 +22,7 @@ let ShowPackageController = class ShowPackageController extends AbstractControll
         const isFullManifests = ctx.accepts(['json', abbreviatedMetaType]) !== abbreviatedMetaType;
         // handle cache
         const cacheEtag = await this.cacheService.getPackageEtag(fullname, isFullManifests);
-        if (cacheEtag) {
+        if (!isSync && cacheEtag) {
             let requestEtag = ctx.request.get('if-none-match');
             if (requestEtag.startsWith('W/')) {
                 requestEtag = requestEtag.substring(2);
@@ -96,4 +96,4 @@ ShowPackageController = __decorate([
     (0, tegg_1.HTTPController)()
 ], ShowPackageController);
 exports.ShowPackageController = ShowPackageController;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hvd1BhY2thZ2VDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9wYWNrYWdlL1Nob3dQYWNrYWdlQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FRcUI7QUFDckIsOERBQTJEO0FBQzNELDZEQUFtRjtBQUNuRix1REFBK0Q7QUFLL0QsSUFBYSxxQkFBcUIsR0FBbEMsTUFBYSxxQkFBc0IsU0FBUSx1Q0FBa0I7SUFZM0QsS0FBSyxDQUFDLElBQUksQ0FBWSxHQUFlLEVBQWUsUUFBZ0I7UUFDbEUsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxNQUFNLEdBQUcsSUFBQSw4QkFBbUIsRUFBQyxHQUFHLENBQUMsQ0FBQztRQUN4QyxNQUFNLG1CQUFtQixHQUFHLHFDQUFxQyxDQUFDO1FBQ2xFLE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUUsQ0FBQyxLQUFLLG1CQUFtQixDQUFDO1FBQzdGLGVBQWU7UUFDZixNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLFFBQVEsRUFBRSxlQUFlLENBQUMsQ0FBQztRQUNwRixJQUFJLFNBQVMsRUFBRTtZQUNiLElBQUksV0FBVyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQ25ELElBQUksV0FBVyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDaEMsV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7YUFDeEM7WUFDRCxJQUFJLFdBQVcsS0FBSyxTQUFTLEVBQUU7Z0JBQzdCLHNDQUFzQztnQkFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hvd1BhY2thZ2VDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9wYWNrYWdlL1Nob3dQYWNrYWdlQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FRcUI7QUFDckIsOERBQTJEO0FBQzNELDZEQUFtRjtBQUNuRix1REFBK0Q7QUFLL0QsSUFBYSxxQkFBcUIsR0FBbEMsTUFBYSxxQkFBc0IsU0FBUSx1Q0FBa0I7SUFZM0QsS0FBSyxDQUFDLElBQUksQ0FBWSxHQUFlLEVBQWUsUUFBZ0I7UUFDbEUsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxNQUFNLEdBQUcsSUFBQSw4QkFBbUIsRUFBQyxHQUFHLENBQUMsQ0FBQztRQUN4QyxNQUFNLG1CQUFtQixHQUFHLHFDQUFxQyxDQUFDO1FBQ2xFLE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUUsQ0FBQyxLQUFLLG1CQUFtQixDQUFDO1FBQzdGLGVBQWU7UUFDZixNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLFFBQVEsRUFBRSxlQUFlLENBQUMsQ0FBQztRQUNwRixJQUFJLENBQUMsTUFBTSxJQUFJLFNBQVMsRUFBRTtZQUN4QixJQUFJLFdBQVcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUNuRCxJQUFJLFdBQVcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQ2hDLFdBQVcsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ3hDO1lBQ0QsSUFBSSxXQUFXLEtBQUssU0FBUyxFQUFFO2dC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

package/dist/app/repository/BinaryRepository.d.ts

@@ -1,6 +1,7 @@
 import { Binary as BinaryEntity } from '../core/entity/Binary';
 import { AbstractRepository } from './AbstractRepository';
 export declare class BinaryRepository extends AbstractRepository {
+    private readonly Binary;
     saveBinary(binary: BinaryEntity): Promise<void>;
     findBinary(category: string, parent: string, name: string): Promise<BinaryEntity | null>;
     listBinaries(category: string, parent: string): Promise<BinaryEntity[]>;

package/dist/app/repository/BinaryRepository.js

@@ -9,37 +9,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BinaryRepository = void 0;
 const tegg_1 = require("@eggjs/tegg");
 const ModelConvertor_1 = require("./util/ModelConvertor");
-const Binary_1 = require("./model/Binary");
-const Binary_2 = require("../core/entity/Binary");
+const Binary_1 = require("../core/entity/Binary");
 const AbstractRepository_1 = require("./AbstractRepository");
 let BinaryRepository = class BinaryRepository extends AbstractRepository_1.AbstractRepository {
     async saveBinary(binary) {
         if (binary.id) {
-            const model = await Binary_1.Binary.findOne({ id: binary.id });
+            const model = await this.Binary.findOne({ id: binary.id });
             if (!model)
                 return;
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(binary, model);
         }
         else {
-            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(binary, Binary_1.Binary);
+            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(binary, this.Binary);
             this.logger.info('[BinaryRepository:saveBinary:new] id: %s, binaryId: %s', model.id, model.binaryId);
         }
     }
     async findBinary(category, parent, name) {
-        const model = await Binary_1.Binary.findOne({ category, parent, name });
+        const model = await this.Binary.findOne({ category, parent, name });
         if (model)
-            return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Binary_2.Binary);
+            return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Binary_1.Binary);
         return null;
     }
     async listBinaries(category, parent) {
-        const models = await Binary_1.Binary.find({ category, parent });
-        return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Binary_2.Binary));
+        const models = await this.Binary.find({ category, parent });
+        return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Binary_1.Binary));
     }
 };
+__decorate([
+    (0, tegg_1.Inject)()
+], BinaryRepository.prototype, "Binary", void 0);
 BinaryRepository = __decorate([
     (0, tegg_1.ContextProto)({
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], BinaryRepository);
 exports.BinaryRepository = BinaryRepository;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmluYXJ5UmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L0JpbmFyeVJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsc0NBQXdEO0FBQ3hELDBEQUF1RDtBQUN2RCwyQ0FBdUQ7QUFDdkQsa0RBQStEO0FBQy9ELDZEQUEwRDtBQUsxRCxJQUFhLGdCQUFnQixHQUE3QixNQUFhLGdCQUFpQixTQUFRLHVDQUFrQjtJQUN0RCxLQUFLLENBQUMsVUFBVSxDQUFDLE1BQW9CO1FBQ25DLElBQUksTUFBTSxDQUFDLEVBQUUsRUFBRTtZQUNiLE1BQU0sS0FBSyxHQUFHLE1BQU0sZUFBVyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUMzRCxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDdkQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsZUFBVyxDQUFDLENBQUM7WUFDN0UsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsd0RBQXdELEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7U0FDdEc7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxRQUFnQixFQUFFLE1BQWMsRUFBRSxJQUFZO1FBQzdELE1BQU0sS0FBSyxHQUFHLE1BQU0sZUFBVyxDQUFDLE9BQU8sQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUNwRSxJQUFJLEtBQUs7WUFBRSxPQUFPLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLGVBQVksQ0FBQyxDQUFDO1FBQzNFLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELEtBQUssQ0FBQyxZQUFZLENBQUMsUUFBZ0IsRUFBRSxNQUFjO1FBQ2pELE1BQU0sTUFBTSxHQUFHLE1BQU0sZUFBVyxDQUFDLElBQUksQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzVELE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLGVBQVksQ0FBQyxDQUFDLENBQUM7SUFDdkYsQ0FBQztDQUNGLENBQUE7QUF0QlksZ0JBQWdCO0lBSDVCLElBQUEsbUJBQVksRUFBQztRQUNaLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLGdCQUFnQixDQXNCNUI7QUF0QlksNENBQWdCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmluYXJ5UmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L0JpbmFyeVJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsc0NBQWdFO0FBQ2hFLDBEQUF1RDtBQUV2RCxrREFBK0Q7QUFDL0QsNkRBQTBEO0FBSzFELElBQWEsZ0JBQWdCLEdBQTdCLE1BQWEsZ0JBQWlCLFNBQVEsdUNBQWtCO0lBSXRELEtBQUssQ0FBQyxVQUFVLENBQUMsTUFBb0I7UUFDbkMsSUFBSSxNQUFNLENBQUMsRUFBRSxFQUFFO1lBQ2IsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUMzRCxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDdkQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzdFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHdEQUF3RCxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQ3RHO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVLENBQUMsUUFBZ0IsRUFBRSxNQUFjLEVBQUUsSUFBWTtRQUM3RCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3BFLElBQUksS0FBSztZQUFFLE9BQU8sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsZUFBWSxDQUFDLENBQUM7UUFDM0UsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBQyxRQUFnQixFQUFFLE1BQWM7UUFDakQsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzVELE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLGVBQVksQ0FBQyxDQUFDLENBQUM7SUFDdkYsQ0FBQztDQUNGLENBQUE7QUF2QkM7SUFEQyxJQUFBLGFBQU0sR0FBRTtnREFDbUM7QUFGakMsZ0JBQWdCO0lBSDVCLElBQUEsbUJBQVksRUFBQztRQUNaLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLGdCQUFnQixDQXlCNUI7QUF6QlksNENBQWdCIn0=

package/dist/app/repository/ChangeRepository.d.ts

@@ -1,7 +1,8 @@
-import { Change as ChangeModel } from './model/Change';
+import type { Change as ChangeModel } from './model/Change';
 import { Change as ChangeEntity } from '../core/entity/Change';
 import { AbstractRepository } from './AbstractRepository';
 export declare class ChangeRepository extends AbstractRepository {
+    private readonly Change;
     addChange(change: ChangeEntity): Promise<void>;
     query(since: number, limit: number): Promise<Array<ChangeEntity>>;
     getLastChange(): Promise<ChangeModel | null>;

package/dist/app/repository/ChangeRepository.js

@@ -9,24 +9,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangeRepository = void 0;
 const tegg_1 = require("@eggjs/tegg");
 const ModelConvertor_1 = require("./util/ModelConvertor");
-const Change_1 = require("./model/Change");
 const AbstractRepository_1 = require("./AbstractRepository");
 let ChangeRepository = class ChangeRepository extends AbstractRepository_1.AbstractRepository {
     async addChange(change) {
-        await ModelConvertor_1.ModelConvertor.convertEntityToModel(change, Change_1.Change);
+        await ModelConvertor_1.ModelConvertor.convertEntityToModel(change, this.Change);
     }
     async query(since, limit) {
-        const models = await Change_1.Change.find({ id: { $gte: since } }).order('id', 'asc').limit(limit);
+        const models = await this.Change.find({ id: { $gte: since } }).order('id', 'asc').limit(limit);
         return models.toObject();
     }
     async getLastChange() {
-        return await Change_1.Change.findOne().order('id', 'desc').limit(1);
+        return await this.Change.findOne().order('id', 'desc').limit(1);
     }
 };
+__decorate([
+    (0, tegg_1.Inject)()
+], ChangeRepository.prototype, "Change", void 0);
 ChangeRepository = __decorate([
     (0, tegg_1.ContextProto)({
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], ChangeRepository);
 exports.ChangeRepository = ChangeRepository;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2hhbmdlUmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L0NoYW5nZVJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsc0NBQXdEO0FBQ3hELDBEQUF1RDtBQUN2RCwyQ0FBdUQ7QUFFdkQsNkRBQTBEO0FBSzFELElBQWEsZ0JBQWdCLEdBQTdCLE1BQWEsZ0JBQWlCLFNBQVEsdUNBQWtCO0lBQ3RELEtBQUssQ0FBQyxTQUFTLENBQUMsTUFBb0I7UUFDbEMsTUFBTSwrQkFBYyxDQUFDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxlQUFXLENBQUMsQ0FBQztJQUNqRSxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxLQUFhLEVBQUUsS0FBYTtRQUN0QyxNQUFNLE1BQU0sR0FBRyxNQUFNLGVBQVcsQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQy9GLE9BQU8sTUFBTSxDQUFDLFFBQVEsRUFBb0IsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWE7UUFDakIsT0FBTyxNQUFNLGVBQVcsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsRSxDQUFDO0NBQ0YsQ0FBQTtBQWJZLGdCQUFnQjtJQUg1QixJQUFBLG1CQUFZLEVBQUM7UUFDWixXQUFXLEVBQUUsa0JBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxnQkFBZ0IsQ0FhNUI7QUFiWSw0Q0FBZ0IifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2hhbmdlUmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L0NoYW5nZVJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsc0NBQWdFO0FBQ2hFLDBEQUF1RDtBQUd2RCw2REFBMEQ7QUFLMUQsSUFBYSxnQkFBZ0IsR0FBN0IsTUFBYSxnQkFBaUIsU0FBUSx1Q0FBa0I7SUFJdEQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFvQjtRQUNsQyxNQUFNLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNqRSxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxLQUFhLEVBQUUsS0FBYTtRQUN0QyxNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMvRixPQUFPLE1BQU0sQ0FBQyxRQUFRLEVBQW9CLENBQUM7SUFDN0MsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhO1FBQ2pCLE9BQU8sTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xFLENBQUM7Q0FDRixDQUFBO0FBZEM7SUFEQyxJQUFBLGFBQU0sR0FBRTtnREFDbUM7QUFGakMsZ0JBQWdCO0lBSDVCLElBQUEsbUJBQVksRUFBQztRQUNaLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLGdCQUFnQixDQWdCNUI7QUFoQlksNENBQWdCIn0=

package/dist/app/repository/PackageRepository.d.ts

@@ -1,11 +1,18 @@
 import { Package as PackageEntity } from '../core/entity/Package';
 import { PackageVersion as PackageVersionEntity } from '../core/entity/PackageVersion';
 import { PackageVersionManifest as PackageVersionManifestEntity } from '../core/entity/PackageVersionManifest';
-import { PackageVersionManifest as PackageVersionManifestModel } from './model/PackageVersionManifest';
+import type { PackageVersionManifest as PackageVersionManifestModel } from './model/PackageVersionManifest';
 import { PackageTag as PackageTagEntity } from '../core/entity/PackageTag';
 import { User as UserEntity } from '../core/entity/User';
 import { AbstractRepository } from './AbstractRepository';
 export declare class PackageRepository extends AbstractRepository {
+    private readonly Package;
+    private readonly Dist;
+    private readonly PackageVersion;
+    private readonly PackageVersionManifest;
+    private readonly PackageTag;
+    private readonly Maintainer;
+    private readonly User;
     findPackage(scope: string, name: string): Promise<PackageEntity | null>;
     findPackageId(scope: string, name: string): Promise<string | null>;
     savePackage(pkgEntity: PackageEntity): Promise<void>;

package/dist/app/repository/PackageRepository.js

@@ -8,49 +8,42 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageRepository = void 0;
 const tegg_1 = require("@eggjs/tegg");
-const Package_1 = require("./model/Package");
-const Package_2 = require("../core/entity/Package");
+const Package_1 = require("../core/entity/Package");
 const ModelConvertor_1 = require("./util/ModelConvertor");
 const PackageVersion_1 = require("../core/entity/PackageVersion");
-const PackageVersion_2 = require("./model/PackageVersion");
-const PackageVersionManifest_1 = require("./model/PackageVersionManifest");
-const Dist_1 = require("./model/Dist");
-const Dist_2 = require("../core/entity/Dist");
+const Dist_1 = require("../core/entity/Dist");
 const PackageTag_1 = require("../core/entity/PackageTag");
-const PackageTag_2 = require("./model/PackageTag");
-const Maintainer_1 = require("./model/Maintainer");
-const User_1 = require("./model/User");
-const User_2 = require("../core/entity/User");
+const User_1 = require("../core/entity/User");
 const AbstractRepository_1 = require("./AbstractRepository");
 let PackageRepository = class PackageRepository extends AbstractRepository_1.AbstractRepository {
     async findPackage(scope, name) {
-        const model = await Package_1.Package.findOne({ scope, name });
+        const model = await this.Package.findOne({ scope, name });
         if (!model)
             return null;
-        const manifestsDistModel = model.manifestsDistId ? await Dist_1.Dist.findOne({ distId: model.manifestsDistId }) : null;
-        const abbreviatedsDistModel = model.abbreviatedsDistId ? await Dist_1.Dist.findOne({ distId: model.abbreviatedsDistId }) : null;
+        const manifestsDistModel = model.manifestsDistId ? await this.Dist.findOne({ distId: model.manifestsDistId }) : null;
+        const abbreviatedsDistModel = model.abbreviatedsDistId ? await this.Dist.findOne({ distId: model.abbreviatedsDistId }) : null;
         const data = {
-            manifestsDist: manifestsDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(manifestsDistModel, Dist_2.Dist),
-            abbreviatedsDist: abbreviatedsDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(abbreviatedsDistModel, Dist_2.Dist),
+            manifestsDist: manifestsDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(manifestsDistModel, Dist_1.Dist),
+            abbreviatedsDist: abbreviatedsDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(abbreviatedsDistModel, Dist_1.Dist),
         };
-        const entity = ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Package_2.Package, data);
+        const entity = ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Package_1.Package, data);
         return entity;
     }
     async findPackageId(scope, name) {
-        const model = await Package_1.Package.findOne({ scope, name }).select('packageId');
+        const model = await this.Package.findOne({ scope, name }).select('packageId');
         if (!model)
             return null;
         return model.packageId;
     }
     async savePackage(pkgEntity) {
         if (pkgEntity.id) {
-            const model = await Package_1.Package.findOne({ id: pkgEntity.id });
+            const model = await this.Package.findOne({ id: pkgEntity.id });
             if (!model)
                 return;
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(pkgEntity, model);
         }
         else {
-            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgEntity, Package_1.Package);
+            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgEntity, this.Package);
             this.logger.info('[PackageRepository:savePackage:new] id: %s, packageId: %s', model.id, model.packageId);
         }
     }
@@ -59,13 +52,13 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
         if (!dist)
             return;
         if (dist.id) {
-            const model = await Dist_1.Dist.findOne({ id: dist.id });
+            const model = await this.Dist.findOne({ id: dist.id });
             if (!model)
                 return;
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(dist, model);
         }
         else {
-            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(dist, Dist_1.Dist);
+            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(dist, this.Dist);
             this.logger.info('[PackageRepository:savePackageDist:new] id: %s, distId: %s, packageId: %s', model.id, model.distId, pkgEntity.packageId);
         }
         await this.savePackage(pkgEntity);
@@ -74,7 +67,7 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
         const dist = isFullManifests ? pkgEntity.manifestsDist : pkgEntity.abbreviatedsDist;
         if (!dist)
             return;
-        const model = await Dist_1.Dist.findOne({ id: dist.id });
+        const model = await this.Dist.findOne({ id: dist.id });
         if (!model)
             return;
         await model.remove();
@@ -85,34 +78,34 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
     // Package Maintainers
     // return true meaning create new record
     async savePackageMaintainer(packageId, userId) {
-        let model = await Maintainer_1.Maintainer.findOne({ packageId, userId });
+        let model = await this.Maintainer.findOne({ packageId, userId });
         if (!model) {
-            model = await Maintainer_1.Maintainer.create({ packageId, userId });
+            model = await this.Maintainer.create({ packageId, userId });
             this.logger.info('[PackageRepository:addPackageMaintainer:new] id: %s, packageId: %s, userId: %s', model.id, model.packageId, model.userId);
             return true;
         }
     }
     async listPackageMaintainers(packageId) {
-        const models = await Maintainer_1.Maintainer.find({ packageId });
-        const userModels = await User_1.User.find({ userId: models.map(m => m.userId) });
-        return userModels.map(user => ModelConvertor_1.ModelConvertor.convertModelToEntity(user, User_2.User));
+        const models = await this.Maintainer.find({ packageId });
+        const userModels = await this.User.find({ userId: models.map(m => m.userId) });
+        return userModels.map(user => ModelConvertor_1.ModelConvertor.convertModelToEntity(user, User_1.User));
     }
     async replacePackageMaintainers(packageId, userIds) {
-        await Maintainer_1.Maintainer.transaction(async () => {
+        await this.Maintainer.transaction(async ({ connection }) => {
             // delete exists
-            // const removeCount = await MaintainerModel.remove({ packageId }, true, { transaction });
-            const removeCount = await Maintainer_1.Maintainer.remove({ packageId });
+            // const removeCount = await this.Maintainer.remove({ packageId }, true, { transaction });
+            const removeCount = await this.Maintainer.remove({ packageId }, true, { connection });
             this.logger.info('[PackageRepository:replacePackageMaintainers:remove] %d rows, packageId: %s', removeCount, packageId);
             // add news
             for (const userId of userIds) {
-                // const model = await MaintainerModel.create({ packageId, userId }, transaction);
-                const model = await Maintainer_1.Maintainer.create({ packageId, userId });
+                // const model = await this.Maintainer.create({ packageId, userId }, transaction);
+                const model = await this.Maintainer.create({ packageId, userId }, { connection });
                 this.logger.info('[PackageRepository:replacePackageMaintainers:new] id: %s, packageId: %s, userId: %s', model.id, model.packageId, model.userId);
             }
         });
     }
     async removePackageMaintainer(packageId, userId) {
-        const model = await Maintainer_1.Maintainer.findOne({ packageId, userId });
+        const model = await this.Maintainer.findOne({ packageId, userId });
         if (model) {
             await model.remove();
             this.logger.info('[PackageRepository:removePackageMaintainer:remove] id: %s, packageId: %s, userId: %s', model.id, model.packageId, model.userId);
@@ -122,48 +115,48 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
     }
     // TODO: support paging
     async listPackagesByUserId(userId) {
-        const models = await Maintainer_1.Maintainer.find({ userId });
-        const packageModels = await Package_1.Package.find({ packageId: models.map(m => m.packageId) });
-        return packageModels.map(pkg => ModelConvertor_1.ModelConvertor.convertModelToEntity(pkg, Package_2.Package));
+        const models = await this.Maintainer.find({ userId });
+        const packageModels = await this.Package.find({ packageId: models.map(m => m.packageId) });
+        return packageModels.map(pkg => ModelConvertor_1.ModelConvertor.convertModelToEntity(pkg, Package_1.Package));
     }
     async createPackageVersion(pkgVersionEntity) {
-        await PackageVersion_2.PackageVersion.transaction(async function (transaction) {
+        await this.PackageVersion.transaction(async (transaction) => {
             await Promise.all([
                 // FIXME: transaction is not the options
-                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity, PackageVersion_2.PackageVersion, transaction),
-                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity.manifestDist, Dist_1.Dist, transaction),
-                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity.tarDist, Dist_1.Dist, transaction),
-                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity.readmeDist, Dist_1.Dist, transaction),
-                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity.abbreviatedDist, Dist_1.Dist, transaction),
+                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity, this.PackageVersion, transaction),
+                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity.manifestDist, this.Dist, transaction),
+                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity.tarDist, this.Dist, transaction),
+                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity.readmeDist, this.Dist, transaction),
+                ModelConvertor_1.ModelConvertor.convertEntityToModel(pkgVersionEntity.abbreviatedDist, this.Dist, transaction),
             ]);
         });
     }
     async savePackageVersion(pkgVersionEntity) {
         // only abbreviatedDist and manifestDist allow to change, like `deprecated` message
-        let model = await Dist_1.Dist.findOne({ id: pkgVersionEntity.manifestDist.id });
+        let model = await this.Dist.findOne({ id: pkgVersionEntity.manifestDist.id });
         if (model) {
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(pkgVersionEntity.manifestDist, model);
         }
-        model = await Dist_1.Dist.findOne({ id: pkgVersionEntity.abbreviatedDist.id });
+        model = await this.Dist.findOne({ id: pkgVersionEntity.abbreviatedDist.id });
         if (model) {
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(pkgVersionEntity.abbreviatedDist, model);
         }
         if (pkgVersionEntity.id) {
-            const model = await PackageVersion_2.PackageVersion.findOne({ id: pkgVersionEntity.id });
+            const model = await this.PackageVersion.findOne({ id: pkgVersionEntity.id });
             if (model) {
                 await ModelConvertor_1.ModelConvertor.saveEntityToModel(pkgVersionEntity, model);
             }
         }
     }
     async findPackageVersion(packageId, version) {
-        const pkgVersionModel = await PackageVersion_2.PackageVersion.findOne({ packageId, version });
+        const pkgVersionModel = await this.PackageVersion.findOne({ packageId, version });
         if (!pkgVersionModel)
             return null;
         return await this.fillPackageVersionEntitiyData(pkgVersionModel);
     }
     async listPackageVersions(packageId) {
         // FIXME: read all versions will hit the memory limit
-        const models = await PackageVersion_2.PackageVersion.find({ packageId }).order('id desc');
+        const models = await this.PackageVersion.find({ packageId }).order('id desc');
         const entities = [];
         for (const model of models) {
             entities.push(await this.fillPackageVersionEntitiyData(model));
@@ -171,16 +164,16 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
         return entities;
     }
     async listPackageVersionNames(packageId) {
-        const rows = await PackageVersion_2.PackageVersion.find({ packageId }).select('version').order('id desc');
+        const rows = await this.PackageVersion.find({ packageId }).select('version').order('id desc');
         return rows.map(row => row.version);
     }
     // only for unittest now
     async removePackageVersions(packageId) {
-        const removeCount = await PackageVersion_2.PackageVersion.remove({ packageId });
+        const removeCount = await this.PackageVersion.remove({ packageId });
         this.logger.info('[PackageRepository:removePackageVersions:remove] %d rows, packageId: %s', removeCount, packageId);
     }
     async removePackageVersion(pkgVersion) {
-        const distRemoveCount = await Dist_1.Dist.remove({
+        const distRemoveCount = await this.Dist.remove({
             distId: [
                 pkgVersion.abbreviatedDist.distId,
                 pkgVersion.manifestDist.distId,
@@ -188,29 +181,29 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
                 pkgVersion.tarDist.distId,
             ],
         });
-        const removeCount = await PackageVersion_2.PackageVersion.remove({ packageVersionId: pkgVersion.packageVersionId });
+        const removeCount = await this.PackageVersion.remove({ packageVersionId: pkgVersion.packageVersionId });
         this.logger.info('[PackageRepository:removePackageVersion:remove] %d dist rows, %d rows, packageVersionId: %s', distRemoveCount, removeCount, pkgVersion.packageVersionId);
     }
     async savePackageVersionManifest(manifestEntity) {
-        let model = await PackageVersionManifest_1.PackageVersionManifest.findOne({ packageVersionId: manifestEntity.packageVersionId });
+        let model = await this.PackageVersionManifest.findOne({ packageVersionId: manifestEntity.packageVersionId });
         if (model) {
             model.manifest = manifestEntity.manifest;
             await model.save();
         }
         else {
-            model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(manifestEntity, PackageVersionManifest_1.PackageVersionManifest);
+            model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(manifestEntity, this.PackageVersionManifest);
             this.logger.info('[PackageRepository:savePackageVersionManifest:new] id: %s, packageVersionId: %s', model.id, model.packageVersionId);
         }
     }
     async findPackageVersionManifest(packageVersionId) {
-        const model = await PackageVersionManifest_1.PackageVersionManifest.findOne({ packageVersionId });
+        const model = await this.PackageVersionManifest.findOne({ packageVersionId });
         if (!model)
             return null;
-        return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageVersionManifest_1.PackageVersionManifest);
+        return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, this.PackageVersionManifest);
     }
     async queryTotal() {
-        const lastPkg = await Package_1.Package.findOne().order('id', 'desc');
-        const lastVersion = await PackageVersion_2.PackageVersion.findOne().order('id', 'desc');
+        const lastPkg = await this.Package.findOne().order('id', 'desc');
+        const lastVersion = await this.PackageVersion.findOne().order('id', 'desc');
         let packageCount = 0;
         let packageVersionCount = 0;
         let lastPackage = '';
@@ -221,7 +214,7 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
             packageCount = Number(lastPkg.id);
         }
         if (lastVersion) {
-            const pkg = await Package_1.Package.findOne({ packageId: lastVersion.packageId });
+            const pkg = await this.Package.findOne({ packageId: lastVersion.packageId });
             if (pkg) {
                 const fullname = pkg.scope ? `${pkg.scope}/${pkg.name}` : pkg.name;
                 lastPackageVersion = `${fullname}@${lastVersion.version}`;
@@ -237,21 +230,21 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
     }
     async fillPackageVersionEntitiyData(model) {
         const [tarDistModel, readmeDistModel, manifestDistModel, abbreviatedDistModel,] = await Promise.all([
-            Dist_1.Dist.findOne({ distId: model.tarDistId }),
-            Dist_1.Dist.findOne({ distId: model.readmeDistId }),
-            Dist_1.Dist.findOne({ distId: model.manifestDistId }),
-            Dist_1.Dist.findOne({ distId: model.abbreviatedDistId }),
+            this.Dist.findOne({ distId: model.tarDistId }),
+            this.Dist.findOne({ distId: model.readmeDistId }),
+            this.Dist.findOne({ distId: model.manifestDistId }),
+            this.Dist.findOne({ distId: model.abbreviatedDistId }),
         ]);
         const data = {
-            tarDist: tarDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(tarDistModel, Dist_2.Dist),
-            readmeDist: readmeDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(readmeDistModel, Dist_2.Dist),
-            manifestDist: manifestDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(manifestDistModel, Dist_2.Dist),
-            abbreviatedDist: abbreviatedDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(abbreviatedDistModel, Dist_2.Dist),
+            tarDist: tarDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(tarDistModel, Dist_1.Dist),
+            readmeDist: readmeDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(readmeDistModel, Dist_1.Dist),
+            manifestDist: manifestDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(manifestDistModel, Dist_1.Dist),
+            abbreviatedDist: abbreviatedDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(abbreviatedDistModel, Dist_1.Dist),
         };
         return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageVersion_1.PackageVersion, data);
     }
     async findPackageTag(packageId, tag) {
-        const model = await PackageTag_2.PackageTag.findOne({ packageId, tag });
+        const model = await this.PackageTag.findOne({ packageId, tag });
         if (!model)
             return null;
         const entity = ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageTag_1.PackageTag);
@@ -259,25 +252,25 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
     }
     async savePackageTag(packageTagEntity) {
         if (packageTagEntity.id) {
-            const model = await PackageTag_2.PackageTag.findOne({ id: packageTagEntity.id });
+            const model = await this.PackageTag.findOne({ id: packageTagEntity.id });
             if (!model)
                 return;
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(packageTagEntity, model);
         }
         else {
-            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(packageTagEntity, PackageTag_2.PackageTag);
+            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(packageTagEntity, this.PackageTag);
             this.logger.info('[PackageRepository:savePackageTag:new] id: %s, packageTagId: %s, tags: %s => %s', model.id, model.packageTagId, model.tag, model.version);
         }
     }
     async removePackageTag(packageTagEntity) {
-        const model = await PackageTag_2.PackageTag.findOne({ id: packageTagEntity.id });
+        const model = await this.PackageTag.findOne({ id: packageTagEntity.id });
         if (!model)
             return;
         await model.remove();
         this.logger.info('[PackageRepository:removePackageTag:remove] id: %s, packageTagId: %s, packageId: %s', model.id, model.packageTagId, model.packageId);
     }
     async listPackageTags(packageId) {
-        const models = await PackageTag_2.PackageTag.find({ packageId });
+        const models = await this.PackageTag.find({ packageId });
         const entities = [];
         for (const model of models) {
             entities.push(ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageTag_1.PackageTag));
@@ -285,10 +278,31 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
         return entities;
     }
 };
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageRepository.prototype, "Package", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageRepository.prototype, "Dist", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageRepository.prototype, "PackageVersion", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageRepository.prototype, "PackageVersionManifest", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageRepository.prototype, "PackageTag", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageRepository.prototype, "Maintainer", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageRepository.prototype, "User", void 0);
 PackageRepository = __decorate([
     (0, tegg_1.ContextProto)({
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], PackageRepository);
 exports.PackageRepository = PackageRepository;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}

package/dist/app/repository/PackageVersionBlockRepository.d.ts

@@ -1,7 +1,8 @@
-import { PackageVersionBlock as PackageVersionBlockModel } from './model/PackageVersionBlock';
+import type { PackageVersionBlock as PackageVersionBlockModel } from './model/PackageVersionBlock';
 import { PackageVersionBlock as PackageVersionBlockEntity } from '../core/entity/PackageVersionBlock';
 import { AbstractRepository } from './AbstractRepository';
 export declare class PackageVersionBlockRepository extends AbstractRepository {
+    private readonly PackageVersionBlock;
     savePackageVersionBlock(block: PackageVersionBlockEntity): Promise<void>;
     findPackageBlock(packageId: string): Promise<PackageVersionBlockEntity | null>;
     findPackageVersionBlock(packageId: string, version: string): Promise<PackageVersionBlockEntity | null>;

package/dist/app/repository/PackageVersionBlockRepository.js

@@ -9,19 +9,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageVersionBlockRepository = void 0;
 const tegg_1 = require("@eggjs/tegg");
 const ModelConvertor_1 = require("./util/ModelConvertor");
-const PackageVersionBlock_1 = require("./model/PackageVersionBlock");
-const PackageVersionBlock_2 = require("../core/entity/PackageVersionBlock");
+const PackageVersionBlock_1 = require("../core/entity/PackageVersionBlock");
 const AbstractRepository_1 = require("./AbstractRepository");
 let PackageVersionBlockRepository = class PackageVersionBlockRepository extends AbstractRepository_1.AbstractRepository {
     async savePackageVersionBlock(block) {
         if (block.id) {
-            const model = await PackageVersionBlock_1.PackageVersionBlock.findOne({ id: block.id });
+            const model = await this.PackageVersionBlock.findOne({ id: block.id });
             if (!model)
                 return;
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(block, model);
         }
         else {
-            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(block, PackageVersionBlock_1.PackageVersionBlock);
+            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(block, this.PackageVersionBlock);
             this.logger.info('[PackageVersionBlockRepository:savePackageVersionBlock:new] id: %s, packageVersionBlockId: %s', model.id, model.packageVersionBlockId);
         }
     }
@@ -29,23 +28,26 @@ let PackageVersionBlockRepository = class PackageVersionBlockRepository extends
         return await this.findPackageVersionBlock(packageId, '*');
     }
     async findPackageVersionBlock(packageId, version) {
-        const model = await PackageVersionBlock_1.PackageVersionBlock.findOne({ packageId, version });
+        const model = await this.PackageVersionBlock.findOne({ packageId, version });
         if (model)
-            return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageVersionBlock_2.PackageVersionBlock);
+            return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageVersionBlock_1.PackageVersionBlock);
         return null;
     }
     async listPackageVersionBlocks(packageId) {
-        return await PackageVersionBlock_1.PackageVersionBlock.find({ packageId });
+        return await this.PackageVersionBlock.find({ packageId });
     }
     async removePackageVersionBlock(packageVersionBlockId) {
-        const removeCount = await PackageVersionBlock_1.PackageVersionBlock.remove({ packageVersionBlockId });
+        const removeCount = await this.PackageVersionBlock.remove({ packageVersionBlockId });
         this.logger.info('[PackageVersionBlockRepository:removePackageVersionBlock:remove] %d rows, packageVersionBlockId: %s', removeCount, packageVersionBlockId);
     }
 };
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageVersionBlockRepository.prototype, "PackageVersionBlock", void 0);
 PackageVersionBlockRepository = __decorate([
     (0, tegg_1.ContextProto)({
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], PackageVersionBlockRepository);
 exports.PackageVersionBlockRepository = PackageVersionBlockRepository;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25CbG9ja1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9QYWNrYWdlVmVyc2lvbkJsb2NrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBd0Q7QUFDeEQsMERBQXVEO0FBQ3ZELHFFQUE4RjtBQUM5Riw0RUFBc0c7QUFDdEcsNkRBQTBEO0FBSzFELElBQWEsNkJBQTZCLEdBQTFDLE1BQWEsNkJBQThCLFNBQVEsdUNBQWtCO0lBQ25FLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxLQUFnQztRQUM1RCxJQUFJLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDWixNQUFNLEtBQUssR0FBRyxNQUFNLHlDQUF3QixDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RSxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDdEQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUseUNBQXdCLENBQUMsQ0FBQztZQUN6RixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQywrRkFBK0YsRUFDOUcsS0FBSyxDQUFDLEVBQUUsRUFBRSxLQUFLLENBQUMscUJBQXFCLENBQUMsQ0FBQztTQUMxQztJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsU0FBaUI7UUFDdEMsT0FBTyxNQUFNLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxTQUFpQixFQUFFLE9BQWU7UUFDOUQsTUFBTSxLQUFLLEdBQUcsTUFBTSx5Q0FBd0IsQ0FBQyxPQUFPLENBQUMsRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUM3RSxJQUFJLEtBQUs7WUFBRSxPQUFPLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLHlDQUF5QixDQUFDLENBQUM7UUFDeEYsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLHdCQUF3QixDQUFDLFNBQWlCO1FBQzlDLE9BQU8sTUFBTSx5Q0FBd0IsQ0FBQyxJQUFJLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxLQUFLLENBQUMseUJBQXlCLENBQUMscUJBQTZCO1FBQzNELE1BQU0sV0FBVyxHQUFHLE1BQU0seUNBQXdCLENBQUMsTUFBTSxDQUFDLEVBQUUscUJBQXFCLEVBQUUsQ0FBQyxDQUFDO1FBQ3JGLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHFHQUFxRyxFQUNwSCxXQUFXLEVBQUUscUJBQXFCLENBQUMsQ0FBQztJQUN4QyxDQUFDO0NBQ0YsQ0FBQTtBQWhDWSw2QkFBNkI7SUFIekMsSUFBQSxtQkFBWSxFQUFDO1FBQ1osV0FBVyxFQUFFLGtCQUFXLENBQUMsTUFBTTtLQUNoQyxDQUFDO0dBQ1csNkJBQTZCLENBZ0N6QztBQWhDWSxzRUFBNkIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25CbG9ja1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9QYWNrYWdlVmVyc2lvbkJsb2NrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBZ0U7QUFDaEUsMERBQXVEO0FBRXZELDRFQUFzRztBQUN0Ryw2REFBMEQ7QUFLMUQsSUFBYSw2QkFBNkIsR0FBMUMsTUFBYSw2QkFBOEIsU0FBUSx1Q0FBa0I7SUFJbkUsS0FBSyxDQUFDLHVCQUF1QixDQUFDLEtBQWdDO1FBQzVELElBQUksS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUNaLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RSxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDdEQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7WUFDekYsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsK0ZBQStGLEVBQzlHLEtBQUssQ0FBQyxFQUFFLEVBQUUsS0FBSyxDQUFDLHFCQUFxQixDQUFDLENBQUM7U0FDMUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQWlCO1FBQ3RDLE9BQU8sTUFBTSxJQUFJLENBQUMsdUJBQXVCLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxLQUFLLENBQUMsdUJBQXVCLENBQUMsU0FBaUIsRUFBRSxPQUFlO1FBQzlELE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQzdFLElBQUksS0FBSztZQUFFLE9BQU8sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUseUNBQXlCLENBQUMsQ0FBQztRQUN4RixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxLQUFLLENBQUMsd0JBQXdCLENBQUMsU0FBaUI7UUFDOUMsT0FBTyxNQUFNLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxLQUFLLENBQUMseUJBQXlCLENBQUMscUJBQTZCO1FBQzNELE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxFQUFFLHFCQUFxQixFQUFFLENBQUMsQ0FBQztRQUNyRixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxxR0FBcUcsRUFDcEgsV0FBVyxFQUFFLHFCQUFxQixDQUFDLENBQUM7SUFDeEMsQ0FBQztDQUNGLENBQUE7QUFqQ0M7SUFEQyxJQUFBLGFBQU0sR0FBRTswRUFDNkQ7QUFGM0QsNkJBQTZCO0lBSHpDLElBQUEsbUJBQVksRUFBQztRQUNaLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLDZCQUE2QixDQW1DekM7QUFuQ1ksc0VBQTZCIn0=

package/dist/app/repository/PackageVersionDownloadRepository.d.ts

@@ -1,6 +1,7 @@
 import { AbstractRepository } from './AbstractRepository';
-import { PackageVersionDownload as PackageVersionDownloadModel } from './model/PackageVersionDownload';
+import type { PackageVersionDownload as PackageVersionDownloadModel } from './model/PackageVersionDownload';
 export declare class PackageVersionDownloadRepository extends AbstractRepository {
+    private readonly PackageVersionDownload;
     plus(packageId: string, version: string, counter: number): Promise<void>;
     query(packageId: string, start: Date, end: Date): Promise<import("leoric").Collection<PackageVersionDownloadModel>>;
     saveSyncDataByMonth(packageId: string, yearMonth: number, counters: [string, number][]): Promise<void>;

package/dist/app/repository/PackageVersionDownloadRepository.js

@@ -9,14 +9,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageVersionDownloadRepository = void 0;
 const tegg_1 = require("@eggjs/tegg");
 const AbstractRepository_1 = require("./AbstractRepository");
-const PackageVersionDownload_1 = require("./model/PackageVersionDownload");
 let PackageVersionDownloadRepository = class PackageVersionDownloadRepository extends AbstractRepository_1.AbstractRepository {
     async plus(packageId, version, counter) {
         const now = new Date();
         const yearMonth = now.getFullYear() * 100 + now.getMonth() + 1;
         const date = new Date().getDate();
         const field = date < 10 ? `d0${date}` : `d${date}`;
-        let model = await PackageVersionDownload_1.PackageVersionDownload.findOne({
+        let model = await this.PackageVersionDownload.findOne({
             packageId,
             version,
             yearMonth,
@@ -28,10 +27,10 @@ let PackageVersionDownloadRepository = class PackageVersionDownloadRepository ex
                 version,
                 yearMonth,
             };
-            model = await PackageVersionDownload_1.PackageVersionDownload.create(attributes);
+            model = await this.PackageVersionDownload.create(attributes);
             this.logger.info('[PackageVersionDownloadRepository:plus:new] id: %s, packageId: %s, version: %s, yearMonth: %s', model.id, model.packageId, model.version, model.yearMonth);
         }
-        await PackageVersionDownload_1.PackageVersionDownload
+        await this.PackageVersionDownload
             .where({ id: model.id })
             .increment(field, counter);
         this.logger.info('[PackageVersionDownloadRepository:plus:increment] id: %s, packageId: %s, version: %s, field: %s%s, plus: %d', model.id, model.packageId, model.version, model.yearMonth, field, counter);
@@ -39,7 +38,7 @@ let PackageVersionDownloadRepository = class PackageVersionDownloadRepository ex
     async query(packageId, start, end) {
         const startYearMonth = start.getFullYear() * 100 + start.getMonth() + 1;
         const endYearMonth = end.getFullYear() * 100 + end.getMonth() + 1;
-        const models = await PackageVersionDownload_1.PackageVersionDownload.find({
+        const models = await this.PackageVersionDownload.find({
             packageId,
             yearMonth: { $gte: startYearMonth, $lte: endYearMonth },
         });
@@ -47,7 +46,7 @@ let PackageVersionDownloadRepository = class PackageVersionDownloadRepository ex
     }
     async saveSyncDataByMonth(packageId, yearMonth, counters) {
         const version = '*';
-        let model = await PackageVersionDownload_1.PackageVersionDownload.findOne({
+        let model = await this.PackageVersionDownload.findOne({
             packageId,
             version,
             yearMonth,
@@ -59,7 +58,7 @@ let PackageVersionDownloadRepository = class PackageVersionDownloadRepository ex
                 version,
                 yearMonth,
             };
-            model = await PackageVersionDownload_1.PackageVersionDownload.create(attributes);
+            model = await this.PackageVersionDownload.create(attributes);
         }
         for (const [date, counter] of counters) {
             const field = `d${date}`;
@@ -68,10 +67,13 @@ let PackageVersionDownloadRepository = class PackageVersionDownloadRepository ex
         await model.save();
     }
 };
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageVersionDownloadRepository.prototype, "PackageVersionDownload", void 0);
 PackageVersionDownloadRepository = __decorate([
     (0, tegg_1.ContextProto)({
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], PackageVersionDownloadRepository);
 exports.PackageVersionDownloadRepository = PackageVersionDownloadRepository;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25Eb3dubG9hZFJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9QYWNrYWdlVmVyc2lvbkRvd25sb2FkUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBd0Q7QUFDeEQsNkRBQTBEO0FBQzFELDJFQUF1RztBQUt2RyxJQUFhLGdDQUFnQyxHQUE3QyxNQUFhLGdDQUFpQyxTQUFRLHVDQUFrQjtJQUN0RSxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQWlCLEVBQUUsT0FBZSxFQUFFLE9BQWU7UUFDNUQsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUN2QixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUcsR0FBRyxHQUFHLEdBQUcsQ0FBQyxRQUFRLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDL0QsTUFBTSxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNsQyxNQUFNLEtBQUssR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ25ELElBQUksS0FBSyxHQUFHLE1BQU0sK0NBQTJCLENBQUMsT0FBTyxDQUFDO1lBQ3BELFNBQVM7WUFDVCxPQUFPO1lBQ1AsU0FBUztTQUNWLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDVixrQkFBa0I7WUFDbEIsTUFBTSxVQUFVLEdBQUc7Z0JBQ2pCLFNBQVM7Z0JBQ1QsT0FBTztnQkFDUCxTQUFTO2FBQ1YsQ0FBQztZQUNGLEtBQUssR0FBRyxNQUFNLCtDQUEyQixDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUM3RCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQywrRkFBK0YsRUFDOUcsS0FBSyxDQUFDLEVBQUUsRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQzlEO1FBQ0QsTUFBTSwrQ0FBMkI7YUFDOUIsS0FBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQzthQUN2QixTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzdCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLDZHQUE2RyxFQUM1SCxLQUFLLENBQUMsRUFBRSxFQUFFLEtBQUssQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMvRSxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxTQUFpQixFQUFFLEtBQVcsRUFBRSxHQUFTO1FBQ25ELE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxXQUFXLEVBQUUsR0FBRyxHQUFHLEdBQUcsS0FBSyxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUN4RSxNQUFNLFlBQVksR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUcsR0FBRyxHQUFHLEdBQUcsQ0FBQyxRQUFRLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDbEUsTUFBTSxNQUFNLEdBQUcsTUFBTSwrQ0FBMkIsQ0FBQyxJQUFJLENBQUM7WUFDcEQsU0FBUztZQUNULFNBQVMsRUFBRSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRTtTQUN4RCxDQUFDLENBQUM7UUFDSCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQsS0FBSyxDQUFDLG1CQUFtQixDQUFDLFNBQWlCLEVBQUUsU0FBaUIsRUFBRSxRQUE0QjtRQUMxRixNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUM7UUFDcEIsSUFBSSxLQUFLLEdBQUcsTUFBTSwrQ0FBMkIsQ0FBQyxPQUFPLENBQUM7WUFDcEQsU0FBUztZQUNULE9BQU87WUFDUCxTQUFTO1NBQ1YsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNWLGtCQUFrQjtZQUNsQixNQUFNLFVBQVUsR0FBRztnQkFDakIsU0FBUztnQkFDVCxPQUFPO2dCQUNQLFNBQVM7YUFDVixDQUFDO1lBQ0YsS0FBSyxHQUFHLE1BQU0sK0NBQTJCLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1NBQzlEO1FBQ0QsS0FBSyxNQUFNLENBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBRSxJQUFJLFFBQVEsRUFBRTtZQUN4QyxNQUFNLEtBQUssR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3pCLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxPQUFPLENBQUM7U0FDeEI7UUFDRCxNQUFNLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNyQixDQUFDO0NBQ0YsQ0FBQTtBQTdEWSxnQ0FBZ0M7SUFINUMsSUFBQSxtQkFBWSxFQUFDO1FBQ1osV0FBVyxFQUFFLGtCQUFXLENBQUMsTUFBTTtLQUNoQyxDQUFDO0dBQ1csZ0NBQWdDLENBNkQ1QztBQTdEWSw0RUFBZ0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25Eb3dubG9hZFJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9QYWNrYWdlVmVyc2lvbkRvd25sb2FkUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBZ0U7QUFDaEUsNkRBQTBEO0FBTTFELElBQWEsZ0NBQWdDLEdBQTdDLE1BQWEsZ0NBQWlDLFNBQVEsdUNBQWtCO0lBSXRFLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBaUIsRUFBRSxPQUFlLEVBQUUsT0FBZTtRQUM1RCxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ3ZCLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsR0FBRyxHQUFHLEdBQUcsR0FBRyxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUMvRCxNQUFNLElBQUksR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2xDLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUM7UUFDbkQsSUFBSSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsc0JBQXNCLENBQUMsT0FBTyxDQUFDO1lBQ3BELFNBQVM7WUFDVCxPQUFPO1lBQ1AsU0FBUztTQUNWLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDVixrQkFBa0I7WUFDbEIsTUFBTSxVQUFVLEdBQUc7Z0JBQ2pCLFNBQVM7Z0JBQ1QsT0FBTztnQkFDUCxTQUFTO2FBQ1YsQ0FBQztZQUNGLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDN0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENB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

package/dist/app/repository/TaskRepository.d.ts

@@ -2,6 +2,8 @@ import { Task as TaskEntity } from '../core/entity/Task';
 import { AbstractRepository } from './AbstractRepository';
 import { TaskType, TaskState } from '../../app/common/enum/Task';
 export declare class TaskRepository extends AbstractRepository {
+    private readonly Task;
+    private readonly HistoryTask;
     saveTask(task: TaskEntity): Promise<void>;
     saveTaskToHistory(task: TaskEntity): Promise<void>;
     findTask(taskId: string): Promise<TaskEntity | null>;

package/dist/app/repository/TaskRepository.js

@@ -9,44 +9,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRepository = void 0;
 const tegg_1 = require("@eggjs/tegg");
 const ModelConvertor_1 = require("./util/ModelConvertor");
-const Task_1 = require("./model/Task");
-const HistoryTask_1 = require("./model/HistoryTask");
-const Task_2 = require("../core/entity/Task");
+const Task_1 = require("../core/entity/Task");
 const AbstractRepository_1 = require("./AbstractRepository");
 let TaskRepository = class TaskRepository extends AbstractRepository_1.AbstractRepository {
     async saveTask(task) {
         if (task.id) {
-            const model = await Task_1.Task.findOne({ id: task.id });
+            const model = await this.Task.findOne({ id: task.id });
             if (!model)
                 return;
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(task, model);
         }
         else {
-            await ModelConvertor_1.ModelConvertor.convertEntityToModel(task, Task_1.Task);
+            await ModelConvertor_1.ModelConvertor.convertEntityToModel(task, this.Task);
         }
     }
     async saveTaskToHistory(task) {
-        const model = await Task_1.Task.findOne({ id: task.id });
+        const model = await this.Task.findOne({ id: task.id });
         if (!model)
             return;
-        const history = await HistoryTask_1.HistoryTask.findOne({ taskId: task.taskId });
+        const history = await this.HistoryTask.findOne({ taskId: task.taskId });
         if (history) {
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(task, history);
         }
         else {
-            await ModelConvertor_1.ModelConvertor.convertEntityToModel(task, HistoryTask_1.HistoryTask);
+            await ModelConvertor_1.ModelConvertor.convertEntityToModel(task, this.HistoryTask);
         }
         await model.remove();
     }
     async findTask(taskId) {
-        const task = await Task_1.Task.findOne({ taskId });
+        const task = await this.Task.findOne({ taskId });
         if (task) {
-            return ModelConvertor_1.ModelConvertor.convertModelToEntity(task, Task_2.Task);
+            return ModelConvertor_1.ModelConvertor.convertModelToEntity(task, Task_1.Task);
         }
         // try to read from history
-        const history = await HistoryTask_1.HistoryTask.findOne({ taskId });
+        const history = await this.HistoryTask.findOne({ taskId });
         if (history) {
-            return ModelConvertor_1.ModelConvertor.convertModelToEntity(history, Task_2.Task);
+            return ModelConvertor_1.ModelConvertor.convertModelToEntity(history, Task_1.Task);
         }
         return null;
     }
@@ -55,28 +53,34 @@ let TaskRepository = class TaskRepository extends AbstractRepository_1.AbstractR
         if (state) {
             where.state = state;
         }
-        const task = await Task_1.Task.findOne(where);
+        const task = await this.Task.findOne(where);
         if (task) {
-            return ModelConvertor_1.ModelConvertor.convertModelToEntity(task, Task_2.Task);
+            return ModelConvertor_1.ModelConvertor.convertModelToEntity(task, Task_1.Task);
         }
         return null;
     }
     async findTimeoutTasks(taskState, timeout) {
         const timeoutDate = new Date();
         timeoutDate.setTime(timeoutDate.getTime() - timeout);
-        const models = await Task_1.Task.find({
+        const models = await this.Task.find({
             state: taskState,
             updatedAt: {
                 $lt: timeoutDate,
             },
         }).limit(1000);
-        return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Task_2.Task));
+        return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Task_1.Task));
     }
 };
+__decorate([
+    (0, tegg_1.Inject)()
+], TaskRepository.prototype, "Task", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], TaskRepository.prototype, "HistoryTask", void 0);
 TaskRepository = __decorate([
     (0, tegg_1.ContextProto)({
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], TaskRepository);
 exports.TaskRepository = TaskRepository;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFza1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9UYXNrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBd0Q7QUFDeEQsMERBQXVEO0FBQ3ZELHVDQUFpRDtBQUNqRCxxREFBc0U7QUFDdEUsOENBQXlEO0FBQ3pELDZEQUEwRDtBQU0xRCxJQUFhLGNBQWMsR0FBM0IsTUFBYSxjQUFlLFNBQVEsdUNBQWtCO0lBQ3BELEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBZ0I7UUFDN0IsSUFBSSxJQUFJLENBQUMsRUFBRSxFQUFFO1lBQ1gsTUFBTSxLQUFLLEdBQUcsTUFBTSxXQUFTLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3ZELElBQUksQ0FBQyxLQUFLO2dCQUFFLE9BQU87WUFDbkIsTUFBTSwrQkFBYyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUNyRDthQUFNO1lBQ0wsTUFBTSwrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxXQUFTLENBQUMsQ0FBQztTQUM1RDtJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsaUJBQWlCLENBQUMsSUFBZ0I7UUFDdEMsTUFBTSxLQUFLLEdBQUcsTUFBTSxXQUFTLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZELElBQUksQ0FBQyxLQUFLO1lBQUUsT0FBTztRQUNuQixNQUFNLE9BQU8sR0FBRyxNQUFNLHlCQUFnQixDQUFDLE9BQU8sQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN4RSxJQUFJLE9BQU8sRUFBRTtZQUNYLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUM7U0FDdkQ7YUFBTTtZQUNMLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUseUJBQWdCLENBQUMsQ0FBQztTQUNuRTtRQUNELE1BQU0sS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQWM7UUFDM0IsTUFBTSxJQUFJLEdBQUcsTUFBTSxXQUFTLENBQUMsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUNqRCxJQUFJLElBQUksRUFBRTtZQUNSLE9BQU8sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsV0FBVSxDQUFDLENBQUM7U0FDOUQ7UUFDRCwyQkFBMkI7UUFDM0IsTUFBTSxPQUFPLEdBQUcsTUFBTSx5QkFBZ0IsQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzNELElBQUksT0FBTyxFQUFFO1lBQ1gsT0FBTywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLE9BQU8sRUFBRSxXQUFVLENBQUMsQ0FBQztTQUNqRTtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxVQUFrQixFQUFFLElBQWMsRUFBRSxLQUFpQjtRQUM5RSxNQUFNLEtBQUssR0FBUSxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsQ0FBQztRQUN4QyxJQUFJLEtBQUssRUFBRTtZQUNULEtBQUssQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1NBQ3JCO1FBQ0QsTUFBTSxJQUFJLEdBQUcsTUFBTSxXQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVDLElBQUksSUFBSSxFQUFFO1lBQ1IsT0FBTywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxXQUFVLENBQUMsQ0FBQztTQUM5RDtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFvQixFQUFFLE9BQWU7UUFDMUQsTUFBTSxXQUFXLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUMvQixXQUFXLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUMsQ0FBQztRQUNyRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFdBQVMsQ0FBQyxJQUFJLENBQUM7WUFDbEMsS0FBSyxFQUFFLFNBQVM7WUFDaEIsU0FBUyxFQUFFO2dCQUNULEdBQUcsRUFBRSxXQUFXO2FBQ2pCO1NBQ0YsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNmLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLFdBQVUsQ0FBQyxDQUFDLENBQUM7SUFDckYsQ0FBQztDQUNGLENBQUE7QUEzRFksY0FBYztJQUgxQixJQUFBLG1CQUFZLEVBQUM7UUFDWixXQUFXLEVBQUUsa0JBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxjQUFjLENBMkQxQjtBQTNEWSx3Q0FBYyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFza1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9UYXNrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBZ0U7QUFDaEUsMERBQXVEO0FBR3ZELDhDQUF5RDtBQUN6RCw2REFBMEQ7QUFNMUQsSUFBYSxjQUFjLEdBQTNCLE1BQWEsY0FBZSxTQUFRLHVDQUFrQjtJQU9wRCxLQUFLLENBQUMsUUFBUSxDQUFDLElBQWdCO1FBQzdCLElBQUksSUFBSSxDQUFDLEVBQUUsRUFBRTtZQUNYLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDdkQsSUFBSSxDQUFDLEtBQUs7Z0JBQUUsT0FBTztZQUNuQixNQUFNLCtCQUFjLENBQUMsaUJBQWlCLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO1NBQ3JEO2FBQU07WUFDTCxNQUFNLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUM1RDtJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsaUJBQWlCLENBQUMsSUFBZ0I7UUFDdEMsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN2RCxJQUFJLENBQUMsS0FBSztZQUFFLE9BQU87UUFDbkIsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN4RSxJQUFJLE9BQU8sRUFBRTtZQUNYLE1BQU0sK0JBQWMsQ0FBQyxpQkFB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

package/dist/app/repository/UserRepository.d.ts

@@ -2,6 +2,8 @@ import { User as UserEntity } from '../core/entity/User';
 import { Token as TokenEntity } from '../core/entity/Token';
 import { AbstractRepository } from './AbstractRepository';
 export declare class UserRepository extends AbstractRepository {
+    private readonly User;
+    private readonly Token;
     saveUser(user: UserEntity): Promise<void>;
     findUserByName(name: string): Promise<UserEntity | null>;
     findUserAndTokenByTokenKey(tokenKey: string): Promise<{

package/dist/app/repository/UserRepository.js

@@ -9,73 +9,77 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserRepository = void 0;
 const tegg_1 = require("@eggjs/tegg");
 const ModelConvertor_1 = require("./util/ModelConvertor");
-const User_1 = require("./model/User");
-const Token_1 = require("./model/Token");
-const User_2 = require("../core/entity/User");
-const Token_2 = require("../core/entity/Token");
+const User_1 = require("../core/entity/User");
+const Token_1 = require("../core/entity/Token");
 const AbstractRepository_1 = require("./AbstractRepository");
 let UserRepository = class UserRepository extends AbstractRepository_1.AbstractRepository {
     async saveUser(user) {
         if (user.id) {
-            const model = await User_1.User.findOne({ id: user.id });
+            const model = await this.User.findOne({ id: user.id });
             if (!model)
                 return;
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(user, model);
         }
         else {
-            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(user, User_1.User);
+            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(user, this.User);
             this.logger.info('[UserRepository:saveUser:new] id: %s, userId: %s', model.id, model.userId);
         }
     }
     async findUserByName(name) {
-        const model = await User_1.User.findOne({ name });
+        const model = await this.User.findOne({ name });
         if (!model)
             return null;
-        return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, User_2.User);
+        return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, User_1.User);
     }
     async findUserAndTokenByTokenKey(tokenKey) {
         const token = await this.findTokenByTokenKey(tokenKey);
         if (!token)
             return null;
-        const userModel = await User_1.User.findOne({ userId: token.userId });
+        const userModel = await this.User.findOne({ userId: token.userId });
         if (!userModel)
             return null;
         return {
             token,
-            user: ModelConvertor_1.ModelConvertor.convertModelToEntity(userModel, User_2.User),
+            user: ModelConvertor_1.ModelConvertor.convertModelToEntity(userModel, User_1.User),
         };
     }
     async findTokenByTokenKey(tokenKey) {
-        const model = await Token_1.Token.findOne({ tokenKey });
+        const model = await this.Token.findOne({ tokenKey });
         if (!model)
             return null;
-        return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Token_2.Token);
+        return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Token_1.Token);
     }
     async saveToken(token) {
         if (token.id) {
-            const model = await Token_1.Token.findOne({ id: token.id });
+            const model = await this.Token.findOne({ id: token.id });
             if (!model)
                 return;
             await ModelConvertor_1.ModelConvertor.saveEntityToModel(token, model);
         }
         else {
-            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(token, Token_1.Token);
+            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(token, this.Token);
             this.logger.info('[UserRepository:saveToken:new] id: %s, tokenId: %s', model.id, model.tokenId);
         }
     }
     async removeToken(tokenId) {
-        const removeCount = await Token_1.Token.remove({ tokenId });
+        const removeCount = await this.Token.remove({ tokenId });
         this.logger.info('[UserRepository:removeToken:remove] %d rows, tokenId: %s', removeCount, tokenId);
     }
     async listTokens(userId) {
-        const models = await Token_1.Token.find({ userId });
-        return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Token_2.Token));
+        const models = await this.Token.find({ userId });
+        return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Token_1.Token));
     }
 };
+__decorate([
+    (0, tegg_1.Inject)()
+], UserRepository.prototype, "User", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], UserRepository.prototype, "Token", void 0);
 UserRepository = __decorate([
     (0, tegg_1.ContextProto)({
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], UserRepository);
 exports.UserRepository = UserRepository;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Vc2VyUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBd0Q7QUFDeEQsMERBQXVEO0FBQ3ZELHVDQUFpRDtBQUNqRCx5Q0FBb0Q7QUFDcEQsOENBQXlEO0FBQ3pELGdEQUE0RDtBQUM1RCw2REFBMEQ7QUFLMUQsSUFBYSxjQUFjLEdBQTNCLE1BQWEsY0FBZSxTQUFRLHVDQUFrQjtJQUNwRCxLQUFLLENBQUMsUUFBUSxDQUFDLElBQWdCO1FBQzdCLElBQUksSUFBSSxDQUFDLEVBQUUsRUFBRTtZQUNYLE1BQU0sS0FBSyxHQUFHLE1BQU0sV0FBUyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RCxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDckQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsV0FBUyxDQUFDLENBQUM7WUFDekUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0RBQWtELEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7U0FDOUY7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxJQUFZO1FBQy9CLE1BQU0sS0FBSyxHQUFHLE1BQU0sV0FBUyxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDaEQsSUFBSSxDQUFDLEtBQUs7WUFBRSxPQUFPLElBQUksQ0FBQztRQUN4QixPQUFPLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFF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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Vc2VyUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBZ0U7QUFDaEUsMERBQXVEO0FBR3ZELDhDQUF5RDtBQUN6RCxnREFBNEQ7QUFDNUQsNkRBQTBEO0FBSzFELElBQWEsY0FBYyxHQUEzQixNQUFhLGNBQWUsU0FBUSx1Q0FBa0I7SUFPcEQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFnQjtRQUM3QixJQUFJLElBQUksQ0FBQyxFQUFFLEVBQUU7WUFDWCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3ZELElBQUksQ0FBQyxLQUFLO2dCQUFFLE9BQU87WUFDbkIsTUFBTSwrQkFBYyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUNyRDthQUFNO1lBQ0wsTUFBTSxLQUFLLEdBQUcsTUFBTSwrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDekUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0RBQWtELEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7U0FDOUY7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxJQUFZO1FBQy9CLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ2hELElBQUksQ0FBQyxLQUFLO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDeEIsT0FBTywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLEtBQUss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

package/dist/app/repository/util/ModelConvertor.js

@@ -12,7 +12,7 @@ const UPDATED_AT = 'updatedAt';
 const ID = 'id';
 class ModelConvertor {
     static async convertEntityToModel(entity, ModelClazz, options) {
-        const metadata = tegg_orm_decorator_1.ModelMetadataUtil.getControllerMetadata(ModelClazz);
+        const metadata = tegg_orm_decorator_1.ModelMetadataUtil.getModelMetadata(ModelClazz);
         if (!metadata) {
             throw new Error(`Model ${ModelClazz.name} has no metadata`);
         }
@@ -37,7 +37,7 @@ class ModelConvertor {
     // Find out which attributes changed and set `updatedAt` to now
     static async saveEntityToModel(entity, model, options) {
         const ModelClazz = model.constructor;
-        const metadata = tegg_orm_decorator_1.ModelMetadataUtil.getControllerMetadata(ModelClazz);
+        const metadata = tegg_orm_decorator_1.ModelMetadataUtil.getModelMetadata(ModelClazz);
         if (!metadata) {
             throw new Error(`Model ${ModelClazz.name} has no metadata`);
         }
@@ -59,7 +59,7 @@ class ModelConvertor {
     static convertModelToEntity(bone, entityClazz, data) {
         data = data || {};
         const ModelClazz = bone.constructor;
-        const metadata = tegg_orm_decorator_1.ModelMetadataUtil.getControllerMetadata(ModelClazz);
+        const metadata = tegg_orm_decorator_1.ModelMetadataUtil.getModelMetadata(ModelClazz);
         if (!metadata) {
             throw new Error(`Model ${ModelClazz.name} has no metadata`);
         }
@@ -74,4 +74,4 @@ class ModelConvertor {
     }
 }
 exports.ModelConvertor = ModelConvertor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWxDb252ZXJ0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS91dGlsL01vZGVsQ29udmVydG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGtFQUE4RDtBQUc5RCxvREFBdUI7QUFDdkIsNkRBQTBEO0FBRTFELE1BQU0sVUFBVSxHQUFHLFdBQVcsQ0FBQztBQUMvQixNQUFNLFVBQVUsR0FBRyxXQUFXLENBQUM7QUFDL0IsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDO0FBRWhCLE1BQWEsY0FBYztJQUN6QixNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFpQixNQUFjLEVBQUUsVUFBZ0MsRUFBRSxPQUFRO1FBQzFHLE1BQU0sUUFBUSxHQUFHLHNDQUFpQixDQUFDLHFCQUFxQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3JFLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDYixNQUFNLElBQUksS0FBSyxDQUFDLFNBQVMsVUFBVSxDQUFDLElBQUksa0JBQWtCLENBQUMsQ0FBQztTQUM3RDtRQUNELE1BQU0sVUFBVSxHQUFHLEVBQUUsQ0FBQztRQUN0QixLQUFLLE1BQU0sYUFBYSxJQUFJLFFBQVEsQ0FBQyxVQUFVLEVBQUU7WUFDL0MsTUFBTSxpQkFBaUIsR0FBRyxhQUFhLENBQUMsWUFBWSxDQUFDO1lBQ3JELE1BQU0sa0JBQWtCLEdBQUcsdUNBQWtCLENBQUMscUJBQXFCLENBQUMsVUFBVSxFQUFFLGlCQUFpQixDQUFDLENBQUM7WUFDbkcsSUFBSSxrQkFBa0IsS0FBSyxVQUFVLElBQUksa0JBQWtCLEtBQUssVUFBVSxJQUFJLGtCQUFrQixLQUFLLEVBQUU7Z0JBQUUsU0FBUztZQUNsSCxNQUFNLGNBQWMsR0FBRyxnQkFBQyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztZQUN6RCxVQUFVLENBQUMsaUJBQWlCLENBQUMsR0FBRyxjQUFjLENB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWxDb252ZXJ0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS91dGlsL01vZGVsQ29udmVydG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGtFQUE4RDtBQUc5RCxvREFBdUI7QUFDdkIsNkRBQTBEO0FBRTFELE1BQU0sVUFBVSxHQUFHLFdBQVcsQ0FBQztBQUMvQixNQUFNLFVBQVUsR0FBRyxXQUFXLENBQUM7QUFDL0IsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDO0FBRWhCLE1BQWEsY0FBYztJQUN6QixNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFpQixNQUFjLEVBQUUsVUFBZ0MsRUFBRSxPQUFRO1FBQzFHLE1BQU0sUUFBUSxHQUFHLHNDQUFpQixDQUFDLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2hFLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDYixNQUFNLElBQUksS0FBSyxDQUFDLFNBQVMsVUFBVSxDQUFDLElBQUksa0JBQWtCLENBQUMsQ0FBQztTQUM3RDtRQUNELE1BQU0sVUFBVSxHQUFHLEVBQUUsQ0FBQztRQUN0QixLQUFLLE1BQU0sYUFBYSxJQUFJLFFBQVEsQ0FBQyxVQUFVLEVBQUU7WUFDL0MsTUFBTSxpQkFBaUIsR0FBRyxhQUFhLENBQUMsWUFBWSxDQUFDO1lBQ3JELE1BQU0sa0JBQWtCLEdBQUcsdUNBQWtCLENBQUMscUJBQXFCLENBQUMsVUFBVSxFQUFFLGlCQUFpQixDQUFDLENBQUM7WUFDbkcsSUFBSSxrQkFBa0IsS0FBSyxVQUFVLElBQUksa0JBQWtCLEtBQUssVUFBVSxJQUFJLGtCQUFrQixLQUFLLEVBQUU7Z0JBQUUsU0FBUztZQUNsSCxNQUFNLGNBQWMsR0FBRyxnQkFBQyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztZQUN6RCxVQUFVLENBQUMsaUJBQWlCLENBQUMsR0FBRyxjQUFjLENB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

package/dist/app/repository/util/ModelConvertorUtil.js

@@ -13,9 +13,9 @@ class ModelConvertorUtil {
      */
     static getEntityPropertyName(clazz, modelProperty) {
         var _a;
-        const propertyMap = tegg_1.MetadataUtil.getOwnMetaData(ENTITY_PROPERTY_MAP_ATTRIBUTE, clazz);
+        const propertyMap = tegg_1.MetadataUtil.getMetaData(ENTITY_PROPERTY_MAP_ATTRIBUTE, clazz);
         return (_a = propertyMap === null || propertyMap === void 0 ? void 0 : propertyMap.get(modelProperty)) !== null && _a !== void 0 ? _a : modelProperty;
     }
 }
 exports.ModelConvertorUtil = ModelConvertorUtil;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWxDb252ZXJ0b3JVdGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvdXRpbC9Nb2RlbENvbnZlcnRvclV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0NBQThEO0FBRTlELE1BQU0sNkJBQTZCLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO0FBRXpGLE1BQWEsa0JBQWtCO0lBQzdCLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxjQUFzQixFQUFFLEtBQXdCLEVBQUUsYUFBcUI7UUFDbEcsTUFBTSxXQUFXLEdBQXdCLG1CQUFZLENBQUMsa0JBQWtCLENBQUMsNkJBQTZCLEVBQUUsS0FBSyxFQUFFLElBQUksR0FBRyxFQUFFLENBQUMsQ0FBQztRQUMxSCxXQUFXLENBQUMsR0FBRyxDQUFDLGFBQWEsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBd0IsRUFBRSxhQUFxQjs7UUFDMUUsTUFBTSxXQUFXLEdBQW9DLG1CQUFZLENBQUMsY0FBYyxDQUFDLDZCQUE2QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3ZILE9BQU8sTUFBQSxXQUFXLGFBQVgsV0FBVyx1QkFBWCxXQUFXLENBQUUsR0FBRyxDQUFDLGFBQWEsQ0FBQyxtQ0FBSSxhQUFhLENBQUM7SUFDMUQsQ0FBQztDQUNGO0FBYkQsZ0RBYUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWxDb252ZXJ0b3JVdGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvdXRpbC9Nb2RlbENvbnZlcnRvclV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0NBQThEO0FBRTlELE1BQU0sNkJBQTZCLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO0FBRXpGLE1BQWEsa0JBQWtCO0lBQzdCLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxjQUFzQixFQUFFLEtBQXdCLEVBQUUsYUFBcUI7UUFDbEcsTUFBTSxXQUFXLEdBQXdCLG1CQUFZLENBQUMsa0JBQWtCLENBQUMsNkJBQTZCLEVBQUUsS0FBSyxFQUFFLElBQUksR0FBRyxFQUFFLENBQUMsQ0FBQztRQUMxSCxXQUFXLENBQUMsR0FBRyxDQUFDLGFBQWEsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBd0IsRUFBRSxhQUFxQjs7UUFDMUUsTUFBTSxXQUFXLEdBQW9DLG1CQUFZLENBQUMsV0FBVyxDQUFDLDZCQUE2QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3BILE9BQU8sTUFBQSxXQUFXLGFBQVgsV0FBVyx1QkFBWCxXQUFXLENBQUUsR0FBRyxDQUFDLGFBQWEsQ0FBQyxtQ0FBSSxhQUFhLENBQUM7SUFDMUQsQ0FBQztDQUNGO0FBYkQsZ0RBYUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "npm core",
   "files": [
     "dist/**/*"
@@ -70,14 +70,14 @@
     "npm"
   ],
   "dependencies": {
-    "@eggjs/tegg": "^1.2.0",
-    "@eggjs/tegg-aop-plugin": "^1.0.5",
+    "@eggjs/tegg": "^1.3.2",
+    "@eggjs/tegg-aop-plugin": "^1.3.2",
     "@eggjs/tegg-config": "^1.0.0",
-    "@eggjs/tegg-controller-plugin": "^1.0.5",
-    "@eggjs/tegg-eventbus-plugin": "^1.0.5",
-    "@eggjs/tegg-orm-decorator": "^1.0.1",
-    "@eggjs/tegg-orm-plugin": "^1.0.5",
-    "@eggjs/tegg-plugin": "^1.0.5",
+    "@eggjs/tegg-controller-plugin": "^1.3.2",
+    "@eggjs/tegg-eventbus-plugin": "^1.3.2",
+    "@eggjs/tegg-orm-decorator": "^1.4.0",
+    "@eggjs/tegg-orm-plugin": "^2.1.0",
+    "@eggjs/tegg-plugin": "^1.3.2",
     "@eggjs/tsconfig": "^1.0.0",
     "@node-rs/crc32": "^1.2.2",
     "@sinclair/typebox": "^0.23.0",
@@ -93,7 +93,7 @@
     "egg-typebox-validate": "^2.0.0",
     "fs-cnpm": "^2.4.0",
     "ioredis": "^4.28.3",
-    "leoric": "^1.15.0",
+    "leoric": "^2.6.2",
     "lodash": "^4.17.21",
     "mysql": "^2.18.1",
     "mysql2": "^2.3.0",