npm - cnpmcore - Versions diffs - 1.7.0 → 1.9.0 - Mend

cnpmcore 1.7.0 → 1.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/History.md CHANGED Viewed

@@ -1,4 +1,22 @@
+1.9.0 / 2022-07-25
+==================
+**features**
+  * [[`af6a75a`](http://github.com/cnpm/cnpmcore/commit/af6a75af32ea04c90fda82be3a56c99ec77e5807)] - feat: add forceSyncHistory options (#271) (killa <<killa123@126.com>>)
+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
 ==================

package/dist/app/core/entity/Task.d.ts CHANGED Viewed

@@ -19,6 +19,7 @@ export declare type SyncPackageTaskOptions = {
     tips?: string;
     skipDependencies?: boolean;
     syncDownloadData?: boolean;
+    forceSyncHistory?: boolean;
 };
 export declare class Task extends Entity {
     taskId: string;

package/dist/app/core/entity/Task.js CHANGED Viewed

@@ -51,6 +51,7 @@ class Task extends Entity_1.Entity {
                 tips: options === null || options === void 0 ? void 0 : options.tips,
                 skipDependencies: options === null || options === void 0 ? void 0 : options.skipDependencies,
                 syncDownloadData: options === null || options === void 0 ? void 0 : options.syncDownloadData,
+                forceSyncHistory: options === null || options === void 0 ? void 0 : options.forceSyncHistory,
             },
         };
         const task = this.create(data);
@@ -91,4 +92,4 @@ class Task extends Entity_1.Entity {
     }
 }
 exports.Task = Task;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFzay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL2VudGl0eS9UYXNrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDRDQUFvQjtBQUNwQixnREFBd0I7QUFDeEIscUNBQThDO0FBQzlDLG1EQUEwRDtBQUMxRCxpREFBNkQ7QUFDN0QsK0RBQXVDO0FBd0J2QyxNQUFhLElBQUssU0FBUSxlQUFNO0lBYTlCLFlBQVksSUFBYzs7UUFDeEIsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ1osSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUN0QixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUM7UUFDeEIsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUM5QixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBQSxJQUFJLENBQUMsT0FBTyxtQ0FBSSxFQUFFLENBQUM7UUFDbEMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLE1BQUEsSUFBSSxDQUFDLGdCQUFnQixtQ0FBSSxFQUFFLENBQUM7UUFDcEQsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFBLElBQUksQ0FBQyxRQUFRLG1DQUFJLENBQUMsQ0FBQztRQUNuQyxJQUFJLENBQUMsS0FBSyxHQUFHLE1BQUEsSUFBSSxDQUFDLEtBQUssbUNBQUksRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFFTSxZQUFZO1FBQ2pCLElBQUksQ0FBQyxPQUFPLEdBQUcsR0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFzay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL2VudGl0eS9UYXNrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDRDQUFvQjtBQUNwQixnREFBd0I7QUFDeEIscUNBQThDO0FBQzlDLG1EQUEwRDtBQUMxRCxpREFBNkQ7QUFDN0QsK0RBQXVDO0FBMEJ2QyxNQUFhLElBQUssU0FBUSxlQUFNO0lBYTlCLFlBQVksSUFBYzs7UUFDeEIsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ1osSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUN0QixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUM7UUFDeEIsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUM5QixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBQSxJQUFJLENBQUMsT0FBTyxtQ0FBSSxFQUFFLENBQUM7UUFDbEMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLE1BQUEsSUFBSSxDQUFDLGdCQUFnQixtQ0FBSSxFQUFFLENBQUM7UUFDcEQsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFBLElBQUksQ0FBQyxRQUFRLG1DQUFJLENBQUMsQ0FBQztRQUNuQyxJQUFJLENBQUMsS0FBSyxHQUFHLE1BQUEsSUFBSSxDQUFDLEtBQUssbUNBQUksRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFFTSxZQUFZO1FBQ2pCLElBQUksQ0FBQyxPQUFPLEdBQUcsR0FB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

package/dist/app/core/service/PackageSyncerService.js CHANGED Viewed

@@ -153,7 +153,7 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
     async executeTask(task) {
         var _a, _b;
         const fullname = task.targetName;
-        const { tips, skipDependencies: originSkipDependencies, syncDownloadData } = task.data;
+        const { tips, skipDependencies: originSkipDependencies, syncDownloadData, forceSyncHistory } = task.data;
         const registry = this.npmRegistry.registry;
         let logs = [];
         if (tips) {
@@ -166,7 +166,7 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
         const syncUpstream = !!(!taskQueueInHighWaterState && this.config.cnpmcore.sourceRegistryIsCNpm && this.config.cnpmcore.syncUpstreamFirst);
         const logUrl = `${this.config.cnpmcore.registry}/-/package/${fullname}/syncs/${task.taskId}/log`;
         this.logger.info('[PackageSyncerService.executeTask:start] taskId: %s, targetName: %s, attempts: %s, taskQueue: %s/%s, syncUpstream: %s, log: %s', task.taskId, task.targetName, task.attempts, taskQueueLength, taskQueueHighWaterSize, syncUpstream, logUrl);
-        logs.push(`[${isoNow()}] 🚧🚧🚧🚧🚧 Syncing from ${registry}/${fullname}, skipDependencies: ${skipDependencies}, syncUpstream: ${syncUpstream}, syncDownloadData: ${!!syncDownloadData}, attempts: ${task.attempts}, worker: "${os_1.default.hostname()}/${process.pid}", taskQueue: ${taskQueueLength}/${taskQueueHighWaterSize} 🚧🚧🚧🚧🚧`);
+        logs.push(`[${isoNow()}] 🚧🚧🚧🚧🚧 Syncing from ${registry}/${fullname}, skipDependencies: ${skipDependencies}, syncUpstream: ${syncUpstream}, syncDownloadData: ${!!syncDownloadData}, forceSyncHistory: ${!!forceSyncHistory} attempts: ${task.attempts}, worker: "${os_1.default.hostname()}/${process.pid}", taskQueue: ${taskQueueLength}/${taskQueueHighWaterSize} 🚧🚧🚧🚧🚧`);
         logs.push(`[${isoNow()}] 🚧 log: ${logUrl}`);
         const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
         let pkg = await this.packageRepository.findPackage(scope, name);
@@ -336,7 +336,7 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
             if (!version)
                 continue;
             let existsItem = existsVersionMap[version];
-            const existsAbbreviatedItem = abbreviatedVersionMap[version];
+            let existsAbbreviatedItem = abbreviatedVersionMap[version];
             const shouldDeleteReadme = !!(existsItem && 'readme' in existsItem);
             if (pkg) {
                 if (existsItem) {
@@ -358,6 +358,17 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
                         logs.push(`[${isoNow()}] 🐛 Remote version ${version} not exists on local manifests, need to refresh`);
                     }
                 }
+                if (existsItem && forceSyncHistory === true) {
+                    const pkgVer = await this.packageRepository.findPackageVersion(pkg.packageId, version);
+                    if (pkgVer) {
+                        logs.push(`[${isoNow()}] 🚧 [${syncIndex}] Remove version ${version} for force sync history`);
+                        await this.packageManagerService.removePackageVersion(pkg, pkgVer, true);
+                        existsItem = undefined;
+                        existsAbbreviatedItem = undefined;
+                        existsVersionMap[version] = undefined;
+                        abbreviatedVersionMap[version] = undefined;
+                    }
+                }
             }
             if (existsItem) {
                 // check metaDataKeys, if different value, override exists one
@@ -664,4 +675,4 @@ PackageSyncerService = __decorate([
     })
 ], PackageSyncerService);
 exports.PackageSyncerService = PackageSyncerService;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}

package/dist/app/port/controller/PackageSyncController.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ import { TaskState } from '../../common/enum/Task';
 import { SyncPackageTaskType } from '../typebox';
 export declare class PackageSyncController extends AbstractController {
     private packageSyncerService;
+    private backgroundTaskHelper;
     private _executeTaskAsync;
     createSyncTask(ctx: EggContext, fullname: string, data: SyncPackageTaskType): Promise<{
         ok: boolean;

package/dist/app/port/controller/PackageSyncController.js CHANGED Viewed

@@ -38,12 +38,15 @@ let PackageSyncController = class PackageSyncController extends AbstractControll
             throw new egg_errors_1.ForbiddenError('Not allow to sync package');
         }
         const tips = data.tips || `Sync cause by "${ctx.href}", parent traceId: ${ctx.tracer.traceId}`;
+        const isAdmin = await this.userRoleManager.isAdmin(ctx);
         const params = {
             fullname,
             tips,
             skipDependencies: !!data.skipDependencies,
             syncDownloadData: !!data.syncDownloadData,
             force: !!data.force,
+            // only admin allow to sync history version
+            forceSyncHistory: !!data.forceSyncHistory && isAdmin,
         };
         ctx.tValidate(typebox_1.SyncPackageTaskRule, params);
         const [scope, name] = (0, PackageUtil_1.getScopeAndName)(params.fullname);
@@ -61,14 +64,18 @@ let PackageSyncController = class PackageSyncController extends AbstractControll
             tips: params.tips,
             skipDependencies: params.skipDependencies,
             syncDownloadData: params.syncDownloadData,
+            forceSyncHistory: params.forceSyncHistory,
         });
         ctx.logger.info('[PackageSyncController.createSyncTask:success] taskId: %s, fullname: %s', task.taskId, fullname);
         if (data.force) {
-            const isAdmin = await this.userRoleManager.isAdmin(ctx);
             if (isAdmin) {
-                // execute task in background
-                this._executeTaskAsync(task);
-                ctx.logger.info('[PackageSyncController.createSyncTask:execute-immediately] taskId: %s', task.taskId);
+                // set background task timeout to 5min
+                this.backgroundTaskHelper.timeout = 1000 * 60 * 5;
+                this.backgroundTaskHelper.run(async () => {
+                    ctx.logger.info('[PackageSyncController.createSyncTask:execute-immediately] taskId: %s', task.taskId);
+                    // execute task in background
+                    await this._executeTaskAsync(task);
+                });
             }
         }
         ctx.status = 201;
@@ -124,6 +131,7 @@ let PackageSyncController = class PackageSyncController extends AbstractControll
             skipDependencies: nodeps === 'true',
             syncDownloadData: false,
             force: false,
+            forceSyncHistory: false,
         };
         const task = await this.createSyncTask(ctx, fullname, options);
         return {
@@ -150,6 +158,9 @@ let PackageSyncController = class PackageSyncController extends AbstractControll
 __decorate([
     (0, tegg_1.Inject)()
 ], PackageSyncController.prototype, "packageSyncerService", void 0);
+__decorate([
+    (0, tegg_1.Inject)()
+], PackageSyncController.prototype, "backgroundTaskHelper", void 0);
 __decorate([
     (0, tegg_1.HTTPMethod)({
         // PUT /-/package/:fullname/syncs
@@ -202,4 +213,4 @@ PackageSyncController = __decorate([
     (0, tegg_1.HTTPController)()
 ], PackageSyncController);
 exports.PackageSyncController = PackageSyncController;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncController.js","sourceRoot":"","sources":["../../../../app/port/controller/PackageSyncController.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncController.js","sourceRoot":"","sources":["../../../../app/port/controller/PackageSyncController.ts"],"names":[],"mappings":"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"}

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

@@ -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/port/typebox.d.ts CHANGED Viewed

@@ -19,6 +19,7 @@ export declare const SyncPackageTaskRule: import("@sinclair/typebox").TObject<{
     skipDependencies: import("@sinclair/typebox").TBoolean;
     syncDownloadData: import("@sinclair/typebox").TBoolean;
     force: import("@sinclair/typebox").TBoolean;
+    forceSyncHistory: import("@sinclair/typebox").TBoolean;
 }>;
 export declare type SyncPackageTaskType = Static<typeof SyncPackageTaskRule>;
 export declare const BlockPackageRule: import("@sinclair/typebox").TObject<{

package/dist/app/port/typebox.js CHANGED Viewed

@@ -43,6 +43,8 @@ exports.SyncPackageTaskRule = typebox_1.Type.Object({
     syncDownloadData: typebox_1.Type.Boolean(),
     // force sync immediately, only allow by admin
     force: typebox_1.Type.Boolean(),
+    // sync history version
+    forceSyncHistory: typebox_1.Type.Boolean(),
 });
 exports.BlockPackageRule = typebox_1.Type.Object({
     fullname: exports.Name,
@@ -68,4 +70,4 @@ function patchAjv(ajv) {
     });
 }
 exports.patchAjv = patchAjv;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZWJveC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9wb3J0L3R5cGVib3gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsK0NBQWlEO0FBQ2pELG9EQUE0QjtBQUVmLFFBQUEsSUFBSSxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDOUIsU0FBUyxFQUFFLENBQUUsTUFBTSxDQUFFO0NBQ3RCLENBQUMsQ0FBQztBQUVVLFFBQUEsR0FBRyxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDN0IsTUFBTSxFQUFFLFlBQVk7SUFDcEIsU0FBUyxFQUFFLENBQUUsTUFBTSxDQUFFO0lBQ3JCLFNBQVMsRUFBRSxDQUFDO0lBQ1osU0FBUyxFQUFFLEdBQUc7Q0FDZixDQUFDLENBQUM7QUFDSCxhQUFhO0FBQ0EsUUFBQSxPQUFPLEdBQUcsY0FBSSxDQUFDLE1BQU0sQ0FBQztJQUNqQyxNQUFNLEVBQUUsZ0JBQWdCO0lBQ3hCLFNBQVMsRUFBRSxDQUFFLE1BQU0sQ0FBRTtJQUNyQixTQUFTLEVBQUUsQ0FBQztJQUNaLFNBQVMsRUFBRSxHQUFHO0NBQ2YsQ0FBQyxDQUFDO0FBRVUsUUFBQSxXQUFXLEdBQUcsY0FBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUUsTUFBTSxDQUFFLEVBQUUsQ0FBQyxDQUFDO0FBRXZFLFFBQUEsT0FBTyxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDakMsR0FBRyxFQUFFLFdBQUc7Q0FDVCxDQUFDLENBQUM7QUFDVSxRQUFBLFdBQVcsR0FBRyxjQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JDLE9BQU8sRUFBRSxlQUFPO0NBQ2pCLENBQUMsQ0FBQztBQUNVLFFBQUEsa0JBQWtCLEdBQUcsY0FBSSxDQUFDLE1BQU0sQ0FBQztJQUM1QyxHQUFHLEVBQUUsV0FBRztJQUNSLE9BQU8sRUFBRSxlQUFPO0NBQ2pCLENBQUMsQ0FBQztBQUVVLFFBQUEsbUJBQW1CLEdBQUcsY0FBSSxDQUFDLE1BQU0sQ0FBQztJQUM3QyxRQUFRLEVBQUUsWUFBSTtJQUNkLElBQUksRUFBRSxjQUFJLENBQUMsTUFBTSxDQUFDO1FBQ2hCLFNBQVMsRUFBRSxDQUFFLE1BQU0sQ0FBRTtRQUNyQixTQUFTLEVBQUUsSUFBSTtLQUNoQixDQUFDO0lBQ0YsZ0JBQWdCLEVBQUUsY0FBSSxDQUFDLE9BQU8sRUFBRTtJQUNoQyxnQkFBZ0IsRUFBRSxjQUFJLENBQUMsT0FBTyxFQUFFO0lBQ2hDLDhDQUE4QztJQUM5QyxLQUFLLEVBQUUsY0FBSSxDQUFDLE9BQU8sRUFBRTtDQUN0QixDQUFDLENBQUM7QUFHVSxRQUFBLGdCQUFnQixHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDMUMsUUFBUSxFQUFFLFlBQUk7SUFDZCxNQUFNLEVBQUUsY0FBSSxDQUFDLE1BQU0sQ0FBQztRQUNsQixTQUFTLEVBQUUsQ0FBRSxNQUFNLENBQUU7UUFDckIsU0FBUyxFQUFFLEtBQUs7S0FDakIsQ0FBQztDQUNILENBQUMsQ0FBQztBQUdILCtJQUErSTtBQUMvSSw2QkFBNkI7QUFDN0IsU0FBZ0IsUUFBUSxDQUFDLEdBQVE7SUFDL0IsR0FBRyxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRTtRQUM5QixJQUFJLEVBQUUsUUFBUTtRQUNkLFFBQVEsRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFO1lBQzVCLE9BQU8sQ0FBQyxDQUFDLGdCQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2pDLENBQUM7S0FDRixDQUFDLENBQUM7SUFDSCxHQUFHLENBQUMsU0FBUyxDQUFDLFlBQVksRUFBRTtRQUMxQixJQUFJLEVBQUUsUUFBUTtRQUNkLFFBQVEsRUFBRSxDQUFDLEdBQVcsRUFBRSxFQUFFO1lBQ3hCLE9BQU8sQ0FBQyxnQkFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNqQyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQWJELDRCQWFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZWJveC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9wb3J0L3R5cGVib3gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsK0NBQWlEO0FBQ2pELG9EQUE0QjtBQUVmLFFBQUEsSUFBSSxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDOUIsU0FBUyxFQUFFLENBQUUsTUFBTSxDQUFFO0NBQ3RCLENBQUMsQ0FBQztBQUVVLFFBQUEsR0FBRyxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDN0IsTUFBTSxFQUFFLFlBQVk7SUFDcEIsU0FBUyxFQUFFLENBQUUsTUFBTSxDQUFFO0lBQ3JCLFNBQVMsRUFBRSxDQUFDO0lBQ1osU0FBUyxFQUFFLEdBQUc7Q0FDZixDQUFDLENBQUM7QUFDSCxhQUFhO0FBQ0EsUUFBQSxPQUFPLEdBQUcsY0FBSSxDQUFDLE1BQU0sQ0FBQztJQUNqQyxNQUFNLEVBQUUsZ0JBQWdCO0lBQ3hCLFNBQVMsRUFBRSxDQUFFLE1BQU0sQ0FBRTtJQUNyQixTQUFTLEVBQUUsQ0FBQztJQUNaLFNBQVMsRUFBRSxHQUFHO0NBQ2YsQ0FBQyxDQUFDO0FBRVUsUUFBQSxXQUFXLEdBQUcsY0FBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUUsTUFBTSxDQUFFLEVBQUUsQ0FBQyxDQUFDO0FBRXZFLFFBQUEsT0FBTyxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDakMsR0FBRyxFQUFFLFdBQUc7Q0FDVCxDQUFDLENBQUM7QUFDVSxRQUFBLFdBQVcsR0FBRyxjQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JDLE9BQU8sRUFBRSxlQUFPO0NBQ2pCLENBQUMsQ0FBQztBQUNVLFFBQUEsa0JBQWtCLEdBQUcsY0FBSSxDQUFDLE1BQU0sQ0FBQztJQUM1QyxHQUFHLEVBQUUsV0FBRztJQUNSLE9BQU8sRUFBRSxlQUFPO0NBQ2pCLENBQUMsQ0FBQztBQUVVLFFBQUEsbUJBQW1CLEdBQUcsY0FBSSxDQUFDLE1BQU0sQ0FBQztJQUM3QyxRQUFRLEVBQUUsWUFBSTtJQUNkLElBQUksRUFBRSxjQUFJLENBQUMsTUFBTSxDQUFDO1FBQ2hCLFNBQVMsRUFBRSxDQUFFLE1BQU0sQ0FBRTtRQUNyQixTQUFTLEVBQUUsSUFBSTtLQUNoQixDQUFDO0lBQ0YsZ0JBQWdCLEVBQUUsY0FBSSxDQUFDLE9BQU8sRUFBRTtJQUNoQyxnQkFBZ0IsRUFBRSxjQUFJLENBQUMsT0FBTyxFQUFFO0lBQ2hDLDhDQUE4QztJQUM5QyxLQUFLLEVBQUUsY0FBSSxDQUFDLE9BQU8sRUFBRTtJQUNyQix1QkFBdUI7SUFDdkIsZ0JBQWdCLEVBQUUsY0FBSSxDQUFDLE9BQU8sRUFBRTtDQUNqQyxDQUFDLENBQUM7QUFHVSxRQUFBLGdCQUFnQixHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDMUMsUUFBUSxFQUFFLFlBQUk7SUFDZCxNQUFNLEVBQUUsY0FBSSxDQUFDLE1BQU0sQ0FBQztRQUNsQixTQUFTLEVBQUUsQ0FBRSxNQUFNLENBQUU7UUFDckIsU0FBUyxFQUFFLEtBQUs7S0FDakIsQ0FBQztDQUNILENBQUMsQ0FBQztBQUdILCtJQUErSTtBQUMvSSw2QkFBNkI7QUFDN0IsU0FBZ0IsUUFBUSxDQUFDLEdBQVE7SUFDL0IsR0FBRyxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRTtRQUM5QixJQUFJLEVBQUUsUUFBUTtRQUNkLFFBQVEsRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFO1lBQzVCLE9BQU8sQ0FBQyxDQUFDLGdCQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2pDLENBQUM7S0FDRixDQUFDLENBQUM7SUFDSCxHQUFHLENBQUMsU0FBUyxDQUFDLFlBQVksRUFBRTtRQUMxQixJQUFJLEVBQUUsUUFBUTtRQUNkLFFBQVEsRUFBRSxDQUFDLEdBQVcsRUFBRSxFQUFFO1lBQ3hCLE9BQU8sQ0FBQyxnQkFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNqQyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQWJELDRCQWFDIn0=

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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>;