cnpmcore 4.1.1 → 4.1.3
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.
- package/dist/app/common/AbstractService.d.ts +1 -1
- package/dist/app/common/AbstractService.js +2 -2
- package/dist/app/common/ErrorUtil.js +6 -6
- package/dist/app/common/FileUtil.d.ts +1 -1
- package/dist/app/common/FileUtil.js +8 -6
- package/dist/app/common/PackageUtil.js +5 -6
- package/dist/app/common/SyncUtil.d.ts +1 -1
- package/dist/app/common/UserUtil.js +4 -4
- package/dist/app/common/adapter/BugVersionStore.d.ts +1 -1
- package/dist/app/common/adapter/NFSAdapter.d.ts +2 -2
- package/dist/app/common/adapter/NFSAdapter.js +2 -2
- package/dist/app/common/adapter/NPMRegistry.d.ts +2 -2
- package/dist/app/common/adapter/NPMRegistry.js +4 -4
- package/dist/app/common/adapter/binary/AbstractBinary.d.ts +5 -5
- package/dist/app/common/adapter/binary/AbstractBinary.js +1 -1
- package/dist/app/common/adapter/binary/ApiBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/ApiBinary.js +3 -2
- package/dist/app/common/adapter/binary/BucketBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/BucketBinary.js +1 -1
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.js +4 -2
- package/dist/app/common/adapter/binary/CypressBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/CypressBinary.js +5 -3
- package/dist/app/common/adapter/binary/EdgedriverBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/EdgedriverBinary.js +2 -2
- package/dist/app/common/adapter/binary/ElectronBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/ElectronBinary.js +3 -2
- package/dist/app/common/adapter/binary/GithubBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/GithubBinary.js +3 -2
- package/dist/app/common/adapter/binary/ImageminBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/ImageminBinary.js +1 -1
- package/dist/app/common/adapter/binary/NodeBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/NodeBinary.js +2 -2
- package/dist/app/common/adapter/binary/NodePreGypBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/NodePreGypBinary.js +35 -22
- package/dist/app/common/adapter/binary/NwjsBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/NwjsBinary.js +5 -3
- package/dist/app/common/adapter/binary/PlaywrightBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/PlaywrightBinary.js +94 -72
- package/dist/app/common/adapter/binary/PrismaBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/PrismaBinary.js +4 -3
- package/dist/app/common/adapter/binary/PuppeteerBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/PuppeteerBinary.js +4 -2
- package/dist/app/common/adapter/binary/SqlcipherBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/SqlcipherBinary.js +2 -2
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.d.ts +4 -4
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.js +2 -2
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.d.ts +1 -1
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.js +3 -3
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.d.ts +1 -1
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.js +3 -3
- package/dist/app/common/adapter/changesStream/NpmChangesStream.d.ts +3 -2
- package/dist/app/common/adapter/changesStream/NpmChangesStream.js +3 -3
- package/dist/app/common/aop/AsyncTimer.d.ts +3 -5
- package/dist/app/common/aop/AsyncTimer.js +10 -10
- package/dist/app/common/typing.d.ts +5 -5
- package/dist/app/core/entity/Binary.d.ts +3 -2
- package/dist/app/core/entity/Binary.js +1 -1
- package/dist/app/core/entity/Change.d.ts +3 -2
- package/dist/app/core/entity/Change.js +1 -1
- package/dist/app/core/entity/Dist.d.ts +3 -2
- package/dist/app/core/entity/Dist.js +1 -1
- package/dist/app/core/entity/Hook.d.ts +4 -3
- package/dist/app/core/entity/Hook.js +3 -2
- package/dist/app/core/entity/Package.d.ts +3 -2
- package/dist/app/core/entity/Package.js +3 -2
- package/dist/app/core/entity/PackageTag.d.ts +3 -2
- package/dist/app/core/entity/PackageTag.js +1 -1
- package/dist/app/core/entity/PackageVersion.d.ts +4 -3
- package/dist/app/core/entity/PackageVersion.js +1 -1
- package/dist/app/core/entity/PackageVersionBlock.d.ts +3 -2
- package/dist/app/core/entity/PackageVersionBlock.js +1 -1
- package/dist/app/core/entity/PackageVersionFile.d.ts +4 -3
- package/dist/app/core/entity/PackageVersionFile.js +4 -2
- package/dist/app/core/entity/PackageVersionManifest.d.ts +3 -2
- package/dist/app/core/entity/PackageVersionManifest.js +1 -1
- package/dist/app/core/entity/PaddingSemVer.js +2 -2
- package/dist/app/core/entity/ProxyCache.d.ts +4 -3
- package/dist/app/core/entity/ProxyCache.js +1 -1
- package/dist/app/core/entity/Registry.d.ts +3 -2
- package/dist/app/core/entity/Registry.js +1 -1
- package/dist/app/core/entity/Scope.d.ts +3 -2
- package/dist/app/core/entity/Scope.js +1 -1
- package/dist/app/core/entity/Task.d.ts +4 -3
- package/dist/app/core/entity/Task.js +1 -1
- package/dist/app/core/entity/Token.d.ts +3 -2
- package/dist/app/core/entity/Token.js +4 -2
- package/dist/app/core/entity/User.d.ts +3 -2
- package/dist/app/core/entity/User.js +1 -1
- package/dist/app/core/entity/WebauthnCredential.d.ts +3 -2
- package/dist/app/core/entity/WebauthnCredential.js +1 -1
- package/dist/app/core/event/BugVersionFixHandler.js +2 -3
- package/dist/app/core/event/CacheCleaner.js +2 -3
- package/dist/app/core/event/ChangesStream.d.ts +4 -4
- package/dist/app/core/event/ChangesStream.js +15 -9
- package/dist/app/core/event/StoreManifest.d.ts +1 -1
- package/dist/app/core/event/StoreManifest.js +3 -5
- package/dist/app/core/event/SyncESPackage.d.ts +2 -2
- package/dist/app/core/event/SyncESPackage.js +2 -3
- package/dist/app/core/event/SyncPackageVersionFile.d.ts +1 -1
- package/dist/app/core/event/SyncPackageVersionFile.js +6 -7
- package/dist/app/core/event/index.d.ts +1 -1
- package/dist/app/core/service/BinarySyncerService.d.ts +1 -1
- package/dist/app/core/service/BinarySyncerService.js +10 -15
- package/dist/app/core/service/BugVersionService.js +5 -9
- package/dist/app/core/service/CacheService.d.ts +1 -1
- package/dist/app/core/service/CacheService.js +27 -26
- package/dist/app/core/service/ChangesStreamService.d.ts +2 -2
- package/dist/app/core/service/ChangesStreamService.js +13 -18
- package/dist/app/core/service/CreateHookTriggerService.d.ts +1 -1
- package/dist/app/core/service/CreateHookTriggerService.js +4 -7
- package/dist/app/core/service/EventCorkerAdvice.d.ts +1 -1
- package/dist/app/core/service/EventCorkerAdvice.js +5 -3
- package/dist/app/core/service/FixNoPaddingVersionService.js +5 -4
- package/dist/app/core/service/HookManageService.d.ts +1 -1
- package/dist/app/core/service/HookManageService.js +3 -4
- package/dist/app/core/service/HookTriggerService.d.ts +3 -3
- package/dist/app/core/service/HookTriggerService.js +6 -11
- package/dist/app/core/service/PackageManagerService.d.ts +4 -4
- package/dist/app/core/service/PackageManagerService.js +54 -32
- package/dist/app/core/service/PackageSearchService.d.ts +3 -3
- package/dist/app/core/service/PackageSearchService.js +11 -13
- package/dist/app/core/service/PackageSyncerService.d.ts +4 -3
- package/dist/app/core/service/PackageSyncerService.js +76 -53
- package/dist/app/core/service/PackageVersionFileService.d.ts +2 -2
- package/dist/app/core/service/PackageVersionFileService.js +13 -17
- package/dist/app/core/service/PackageVersionService.d.ts +1 -1
- package/dist/app/core/service/PackageVersionService.js +6 -11
- package/dist/app/core/service/ProxyCacheService.d.ts +3 -2
- package/dist/app/core/service/ProxyCacheService.js +38 -25
- package/dist/app/core/service/RegistryManagerService.d.ts +1 -1
- package/dist/app/core/service/RegistryManagerService.js +19 -15
- package/dist/app/core/service/ScopeManagerService.d.ts +1 -1
- package/dist/app/core/service/ScopeManagerService.js +3 -4
- package/dist/app/core/service/TaskService.js +8 -8
- package/dist/app/core/service/TokenService.d.ts +1 -1
- package/dist/app/core/service/TokenService.js +6 -5
- package/dist/app/core/service/UserService.d.ts +4 -3
- package/dist/app/core/service/UserService.js +6 -8
- package/dist/app/core/util/EntityUtil.d.ts +1 -1
- package/dist/app/core/util/EntityUtil.js +1 -1
- package/dist/app/infra/AuthAdapter.d.ts +3 -3
- package/dist/app/infra/AuthAdapter.js +3 -4
- package/dist/app/infra/NFSClientAdapter.d.ts +2 -2
- package/dist/app/infra/NFSClientAdapter.js +3 -3
- package/dist/app/infra/QueueAdapter.d.ts +1 -1
- package/dist/app/infra/QueueAdapter.js +3 -4
- package/dist/app/infra/SearchAdapter.d.ts +2 -2
- package/dist/app/infra/SearchAdapter.js +6 -7
- package/dist/app/port/UserRoleManager.d.ts +5 -5
- package/dist/app/port/UserRoleManager.js +7 -9
- package/dist/app/port/config.d.ts +6 -6
- package/dist/app/port/config.js +1 -1
- package/dist/app/port/controller/AbstractController.d.ts +8 -8
- package/dist/app/port/controller/AbstractController.js +16 -15
- package/dist/app/port/controller/BinarySyncController.d.ts +2 -2
- package/dist/app/port/controller/BinarySyncController.js +5 -4
- package/dist/app/port/controller/ChangesStreamController.d.ts +1 -1
- package/dist/app/port/controller/ChangesStreamController.js +2 -3
- package/dist/app/port/controller/DownloadController.js +3 -4
- package/dist/app/port/controller/HomeController.d.ts +2 -2
- package/dist/app/port/controller/HomeController.js +3 -5
- package/dist/app/port/controller/HookController.d.ts +1 -1
- package/dist/app/port/controller/HookController.js +7 -10
- package/dist/app/port/controller/PackageBlockController.d.ts +2 -2
- package/dist/app/port/controller/PackageBlockController.js +3 -5
- package/dist/app/port/controller/PackageSyncController.d.ts +2 -2
- package/dist/app/port/controller/PackageSyncController.js +13 -11
- package/dist/app/port/controller/PackageTagController.d.ts +1 -1
- package/dist/app/port/controller/PackageTagController.js +2 -3
- package/dist/app/port/controller/PackageVersionFileController.d.ts +1 -1
- package/dist/app/port/controller/PackageVersionFileController.js +12 -10
- package/dist/app/port/controller/ProxyCacheController.d.ts +3 -3
- package/dist/app/port/controller/ProxyCacheController.js +5 -8
- package/dist/app/port/controller/RegistryController.d.ts +5 -4
- package/dist/app/port/controller/RegistryController.js +22 -11
- package/dist/app/port/controller/ScopeController.d.ts +2 -2
- package/dist/app/port/controller/ScopeController.js +7 -6
- package/dist/app/port/controller/TokenController.d.ts +2 -2
- package/dist/app/port/controller/TokenController.js +11 -7
- package/dist/app/port/controller/UserController.d.ts +2 -2
- package/dist/app/port/controller/UserController.js +2 -2
- package/dist/app/port/controller/admin/PaddingVersionController.d.ts +1 -1
- package/dist/app/port/controller/admin/PaddingVersionController.js +2 -3
- package/dist/app/port/controller/convertor/HookConvertor.d.ts +4 -4
- package/dist/app/port/controller/convertor/HookConvertor.js +1 -1
- package/dist/app/port/controller/package/DownloadPackageVersionTar.d.ts +2 -2
- package/dist/app/port/controller/package/DownloadPackageVersionTar.js +8 -13
- package/dist/app/port/controller/package/RemovePackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/RemovePackageVersionController.js +5 -5
- package/dist/app/port/controller/package/SavePackageVersionController.d.ts +3 -3
- package/dist/app/port/controller/package/SavePackageVersionController.js +27 -15
- package/dist/app/port/controller/package/SearchPackageController.d.ts +3 -3
- package/dist/app/port/controller/package/SearchPackageController.js +2 -3
- package/dist/app/port/controller/package/ShowPackageController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageController.js +13 -11
- package/dist/app/port/controller/package/ShowPackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageVersionController.js +3 -5
- package/dist/app/port/controller/package/UpdatePackageController.d.ts +2 -2
- package/dist/app/port/controller/package/UpdatePackageController.js +5 -5
- package/dist/app/port/middleware/AdminAccess.d.ts +1 -1
- package/dist/app/port/middleware/AlwaysAuth.d.ts +1 -1
- package/dist/app/port/middleware/AlwaysAuth.js +1 -1
- package/dist/app/port/middleware/ErrorHandler.d.ts +1 -1
- package/dist/app/port/middleware/ErrorHandler.js +13 -5
- package/dist/app/port/middleware/Tracing.d.ts +1 -1
- package/dist/app/port/middleware/Tracing.js +1 -1
- package/dist/app/port/schedule/ChangesStreamWorker.js +4 -4
- package/dist/app/port/schedule/CheckProxyCacheUpdateWorker.js +11 -7
- package/dist/app/port/schedule/CheckRecentlyUpdatedPackages.js +10 -7
- package/dist/app/port/schedule/CleanTempDir.js +1 -1
- package/dist/app/port/schedule/CreateSyncBinaryTask.js +2 -3
- package/dist/app/port/schedule/CreateTriggerHookWorker.js +9 -9
- package/dist/app/port/schedule/SavePackageVersionDownloadCounter.js +2 -3
- package/dist/app/port/schedule/SyncBinaryWorker.js +2 -3
- package/dist/app/port/schedule/SyncPackageWorker.js +4 -4
- package/dist/app/port/schedule/SyncProxyCacheWorker.js +4 -4
- package/dist/app/port/schedule/TaskTimeoutHandler.js +3 -5
- package/dist/app/port/schedule/TriggerHookWorker.js +7 -8
- package/dist/app/port/schedule/UpdateTotalData.js +11 -15
- package/dist/app/port/typebox.d.ts +2 -2
- package/dist/app/port/typebox.js +5 -2
- package/dist/app/port/webauth/WebauthController.d.ts +4 -4
- package/dist/app/port/webauth/WebauthController.js +52 -21
- package/dist/app/repository/AbstractRepository.d.ts +1 -1
- package/dist/app/repository/AbstractRepository.js +2 -2
- package/dist/app/repository/ChangeRepository.d.ts +1 -1
- package/dist/app/repository/ChangeRepository.js +4 -2
- package/dist/app/repository/DistRepository.d.ts +2 -2
- package/dist/app/repository/DistRepository.js +3 -5
- package/dist/app/repository/HookRepository.d.ts +1 -1
- package/dist/app/repository/HookRepository.js +1 -1
- package/dist/app/repository/PackageRepository.d.ts +2 -2
- package/dist/app/repository/PackageRepository.js +68 -27
- package/dist/app/repository/PackageVersionRepository.d.ts +2 -2
- package/dist/app/repository/PackageVersionRepository.js +12 -13
- package/dist/app/repository/ProxyCacheRepository.d.ts +2 -2
- package/dist/app/repository/ProxyCacheRepository.js +28 -10
- package/dist/app/repository/RegistryRepository.d.ts +3 -2
- package/dist/app/repository/RegistryRepository.js +1 -1
- package/dist/app/repository/ScopeRepository.d.ts +2 -2
- package/dist/app/repository/ScopeRepository.js +4 -2
- package/dist/app/repository/SearchRepository.d.ts +2 -2
- package/dist/app/repository/SearchRepository.js +1 -1
- package/dist/app/repository/TaskRepository.d.ts +3 -2
- package/dist/app/repository/TaskRepository.js +1 -1
- package/dist/app/repository/UserRepository.js +8 -5
- package/dist/app/repository/model/HistoryTask.d.ts +1 -1
- package/dist/app/repository/model/HistoryTask.js +1 -2
- package/dist/app/repository/model/Hook.d.ts +1 -1
- package/dist/app/repository/model/Hook.js +1 -2
- package/dist/app/repository/model/ProxyCache.d.ts +1 -1
- package/dist/app/repository/model/ProxyCache.js +1 -2
- package/dist/app/repository/model/Registry.d.ts +1 -1
- package/dist/app/repository/model/Registry.js +1 -2
- package/dist/app/repository/model/Task.d.ts +1 -1
- package/dist/app/repository/model/Task.js +1 -2
- package/dist/app/repository/util/EntityProperty.js +1 -1
- package/dist/app/repository/util/ModelConvertor.d.ts +2 -2
- package/dist/app/repository/util/ModelConvertor.js +7 -4
- package/dist/app/repository/util/ModelConvertorUtil.d.ts +1 -1
- package/dist/app/repository/util/ModelConvertorUtil.js +1 -1
- package/dist/app.d.ts +1 -1
- package/dist/app.js +1 -1
- package/dist/config/config.default.d.ts +3 -3
- package/dist/config/config.default.js +5 -9
- package/dist/config/config.unittest.d.ts +2 -3
- package/dist/config/config.unittest.js +3 -3
- package/dist/config/plugin.d.ts +1 -1
- package/package.json +18 -10
|
@@ -14,7 +14,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
14
14
|
};
|
|
15
15
|
var _PackageRepository_instances, _PackageRepository_convertPackageModelToEntity;
|
|
16
16
|
import { AccessLevel, SingletonProto, Inject } from '@eggjs/tegg';
|
|
17
|
-
import { Orm } from '@eggjs/tegg-orm-plugin';
|
|
18
17
|
import { Package as PackageModel } from './model/Package.js';
|
|
19
18
|
import { Package as PackageEntity } from '../core/entity/Package.js';
|
|
20
19
|
import { ModelConvertor } from './util/ModelConvertor.js';
|
|
@@ -61,7 +60,9 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
62
|
async savePackageDist(pkgEntity, isFullManifests) {
|
|
64
|
-
const dist = isFullManifests
|
|
63
|
+
const dist = isFullManifests
|
|
64
|
+
? pkgEntity.manifestsDist
|
|
65
|
+
: pkgEntity.abbreviatedsDist;
|
|
65
66
|
if (!dist)
|
|
66
67
|
return;
|
|
67
68
|
if (dist.id) {
|
|
@@ -77,7 +78,9 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
77
78
|
await this.savePackage(pkgEntity);
|
|
78
79
|
}
|
|
79
80
|
async removePackageDist(pkgEntity, isFullManifests) {
|
|
80
|
-
const dist = isFullManifests
|
|
81
|
+
const dist = isFullManifests
|
|
82
|
+
? pkgEntity.manifestsDist
|
|
83
|
+
: pkgEntity.abbreviatedsDist;
|
|
81
84
|
if (!dist)
|
|
82
85
|
return;
|
|
83
86
|
const model = await this.Dist.findOne({ id: dist.id });
|
|
@@ -100,14 +103,18 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
100
103
|
}
|
|
101
104
|
async listPackageMaintainers(packageId) {
|
|
102
105
|
const models = await this.Maintainer.find({ packageId });
|
|
103
|
-
const userModels = await this.User.find({
|
|
106
|
+
const userModels = await this.User.find({
|
|
107
|
+
userId: models.map(m => m.userId),
|
|
108
|
+
});
|
|
104
109
|
return userModels.map(user => ModelConvertor.convertModelToEntity(user, UserEntity));
|
|
105
110
|
}
|
|
106
111
|
async replacePackageMaintainers(packageId, userIds) {
|
|
107
112
|
await this.Maintainer.transaction(async ({ connection }) => {
|
|
108
113
|
// delete exists
|
|
109
114
|
// const removeCount = await this.Maintainer.remove({ packageId }, true, { transaction });
|
|
110
|
-
const removeCount = await this.Maintainer.remove({ packageId }, true, {
|
|
115
|
+
const removeCount = await this.Maintainer.remove({ packageId }, true, {
|
|
116
|
+
connection,
|
|
117
|
+
});
|
|
111
118
|
this.logger.info('[PackageRepository:replacePackageMaintainers:remove] %d rows, packageId: %s', removeCount, packageId);
|
|
112
119
|
// add news
|
|
113
120
|
for (const userId of userIds) {
|
|
@@ -129,7 +136,9 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
129
136
|
// TODO: support paging
|
|
130
137
|
async listPackagesByUserId(userId) {
|
|
131
138
|
const models = await this.Maintainer.find({ userId });
|
|
132
|
-
const packageModels = await this.Package.find({
|
|
139
|
+
const packageModels = await this.Package.find({
|
|
140
|
+
packageId: models.map(m => m.packageId),
|
|
141
|
+
});
|
|
133
142
|
return packageModels.map(pkg => ModelConvertor.convertModelToEntity(pkg, PackageEntity));
|
|
134
143
|
}
|
|
135
144
|
async createPackageVersion(pkgVersionEntity) {
|
|
@@ -146,23 +155,32 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
146
155
|
}
|
|
147
156
|
async savePackageVersion(pkgVersionEntity) {
|
|
148
157
|
// only abbreviatedDist and manifestDist allow to change, like `deprecated` message
|
|
149
|
-
let model = await this.Dist.findOne({
|
|
158
|
+
let model = await this.Dist.findOne({
|
|
159
|
+
id: pkgVersionEntity.manifestDist.id,
|
|
160
|
+
});
|
|
150
161
|
if (model) {
|
|
151
162
|
await ModelConvertor.saveEntityToModel(pkgVersionEntity.manifestDist, model);
|
|
152
163
|
}
|
|
153
|
-
model = await this.Dist.findOne({
|
|
164
|
+
model = await this.Dist.findOne({
|
|
165
|
+
id: pkgVersionEntity.abbreviatedDist.id,
|
|
166
|
+
});
|
|
154
167
|
if (model) {
|
|
155
168
|
await ModelConvertor.saveEntityToModel(pkgVersionEntity.abbreviatedDist, model);
|
|
156
169
|
}
|
|
157
170
|
if (pkgVersionEntity.id) {
|
|
158
|
-
const model = await this.PackageVersion.findOne({
|
|
171
|
+
const model = await this.PackageVersion.findOne({
|
|
172
|
+
id: pkgVersionEntity.id,
|
|
173
|
+
});
|
|
159
174
|
if (model) {
|
|
160
175
|
await ModelConvertor.saveEntityToModel(pkgVersionEntity, model);
|
|
161
176
|
}
|
|
162
177
|
}
|
|
163
178
|
}
|
|
164
179
|
async findPackageVersion(packageId, version) {
|
|
165
|
-
const pkgVersionModel = await this.PackageVersion.findOne({
|
|
180
|
+
const pkgVersionModel = await this.PackageVersion.findOne({
|
|
181
|
+
packageId,
|
|
182
|
+
version,
|
|
183
|
+
});
|
|
166
184
|
if (!pkgVersionModel)
|
|
167
185
|
return null;
|
|
168
186
|
return await this.fillPackageVersionEntityData(pkgVersionModel);
|
|
@@ -177,7 +195,9 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
177
195
|
return entities;
|
|
178
196
|
}
|
|
179
197
|
async listPackageVersionNames(packageId) {
|
|
180
|
-
const rows = await this.PackageVersion.find({ packageId })
|
|
198
|
+
const rows = await this.PackageVersion.find({ packageId })
|
|
199
|
+
.select('version')
|
|
200
|
+
.order('id desc');
|
|
181
201
|
return rows.map(row => row.version);
|
|
182
202
|
}
|
|
183
203
|
// only for unittest now
|
|
@@ -194,11 +214,15 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
194
214
|
pkgVersion.tarDist.distId,
|
|
195
215
|
],
|
|
196
216
|
});
|
|
197
|
-
const removeCount = await this.PackageVersion.remove({
|
|
217
|
+
const removeCount = await this.PackageVersion.remove({
|
|
218
|
+
packageVersionId: pkgVersion.packageVersionId,
|
|
219
|
+
});
|
|
198
220
|
this.logger.info('[PackageRepository:removePackageVersion:remove] %d dist rows, %d rows, packageVersionId: %s', distRemoveCount, removeCount, pkgVersion.packageVersionId);
|
|
199
221
|
}
|
|
200
222
|
async savePackageVersionManifest(manifestEntity) {
|
|
201
|
-
let model = await this.PackageVersionManifest.findOne({
|
|
223
|
+
let model = await this.PackageVersionManifest.findOne({
|
|
224
|
+
packageVersionId: manifestEntity.packageVersionId,
|
|
225
|
+
});
|
|
202
226
|
if (model) {
|
|
203
227
|
model.manifest = manifestEntity.manifest;
|
|
204
228
|
await model.save();
|
|
@@ -209,7 +233,9 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
209
233
|
}
|
|
210
234
|
}
|
|
211
235
|
async findPackageVersionManifest(packageVersionId) {
|
|
212
|
-
const model = await this.PackageVersionManifest.findOne({
|
|
236
|
+
const model = await this.PackageVersionManifest.findOne({
|
|
237
|
+
packageVersionId,
|
|
238
|
+
});
|
|
213
239
|
if (!model)
|
|
214
240
|
return null;
|
|
215
241
|
return ModelConvertor.convertModelToEntity(model, this.PackageVersionManifest);
|
|
@@ -242,18 +268,23 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
242
268
|
let lastPackage = '';
|
|
243
269
|
let lastPackageVersion = '';
|
|
244
270
|
if (lastPkg) {
|
|
245
|
-
lastPackage = lastPkg.scope
|
|
271
|
+
lastPackage = lastPkg.scope
|
|
272
|
+
? `${lastPkg.scope}/${lastPkg.name}`
|
|
273
|
+
: lastPkg.name;
|
|
246
274
|
// FIXME: id will be out of range number
|
|
247
275
|
// 可能存在 id 增长不连续的情况,通过 count 查询
|
|
248
276
|
packageCount = await this.getTotalCountByModel(PackageModel);
|
|
249
277
|
}
|
|
250
278
|
if (lastVersion) {
|
|
251
|
-
const pkg = await this.Package.findOne({
|
|
279
|
+
const pkg = await this.Package.findOne({
|
|
280
|
+
packageId: lastVersion.packageId,
|
|
281
|
+
});
|
|
252
282
|
if (pkg) {
|
|
253
283
|
const fullname = pkg.scope ? `${pkg.scope}/${pkg.name}` : pkg.name;
|
|
254
284
|
lastPackageVersion = `${fullname}@${lastVersion.version}`;
|
|
255
285
|
}
|
|
256
|
-
packageVersionCount =
|
|
286
|
+
packageVersionCount =
|
|
287
|
+
await this.getTotalCountByModel(PackageVersionModel);
|
|
257
288
|
}
|
|
258
289
|
return {
|
|
259
290
|
packageCount,
|
|
@@ -270,10 +301,14 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
270
301
|
this.Dist.findOne({ distId: model.abbreviatedDistId }),
|
|
271
302
|
]);
|
|
272
303
|
const data = {
|
|
273
|
-
tarDist: tarDistModel &&
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
304
|
+
tarDist: tarDistModel &&
|
|
305
|
+
ModelConvertor.convertModelToEntity(tarDistModel, DistEntity),
|
|
306
|
+
readmeDist: readmeDistModel &&
|
|
307
|
+
ModelConvertor.convertModelToEntity(readmeDistModel, DistEntity),
|
|
308
|
+
manifestDist: manifestDistModel &&
|
|
309
|
+
ModelConvertor.convertModelToEntity(manifestDistModel, DistEntity),
|
|
310
|
+
abbreviatedDist: abbreviatedDistModel &&
|
|
311
|
+
ModelConvertor.convertModelToEntity(abbreviatedDistModel, DistEntity),
|
|
277
312
|
};
|
|
278
313
|
return ModelConvertor.convertModelToEntity(model, PackageVersionEntity, data);
|
|
279
314
|
}
|
|
@@ -314,11 +349,17 @@ let PackageRepository = class PackageRepository extends AbstractRepository {
|
|
|
314
349
|
};
|
|
315
350
|
_PackageRepository_instances = new WeakSet();
|
|
316
351
|
_PackageRepository_convertPackageModelToEntity = async function _PackageRepository_convertPackageModelToEntity(model) {
|
|
317
|
-
const manifestsDistModel = model.manifestsDistId
|
|
318
|
-
|
|
352
|
+
const manifestsDistModel = model.manifestsDistId
|
|
353
|
+
? await this.Dist.findOne({ distId: model.manifestsDistId })
|
|
354
|
+
: null;
|
|
355
|
+
const abbreviatedsDistModel = model.abbreviatedsDistId
|
|
356
|
+
? await this.Dist.findOne({ distId: model.abbreviatedsDistId })
|
|
357
|
+
: null;
|
|
319
358
|
const data = {
|
|
320
|
-
manifestsDist: manifestsDistModel &&
|
|
321
|
-
|
|
359
|
+
manifestsDist: manifestsDistModel &&
|
|
360
|
+
ModelConvertor.convertModelToEntity(manifestsDistModel, DistEntity),
|
|
361
|
+
abbreviatedsDist: abbreviatedsDistModel &&
|
|
362
|
+
ModelConvertor.convertModelToEntity(abbreviatedsDistModel, DistEntity),
|
|
322
363
|
};
|
|
323
364
|
const entity = ModelConvertor.convertModelToEntity(model, PackageEntity, data);
|
|
324
365
|
return entity;
|
|
@@ -357,7 +398,7 @@ __decorate([
|
|
|
357
398
|
], PackageRepository.prototype, "config", void 0);
|
|
358
399
|
__decorate([
|
|
359
400
|
Inject(),
|
|
360
|
-
__metadata("design:type",
|
|
401
|
+
__metadata("design:type", Function)
|
|
361
402
|
], PackageRepository.prototype, "orm", void 0);
|
|
362
403
|
PackageRepository = __decorate([
|
|
363
404
|
SingletonProto({
|
|
@@ -365,4 +406,4 @@ PackageRepository = __decorate([
|
|
|
365
406
|
})
|
|
366
407
|
], PackageRepository);
|
|
367
408
|
export { PackageRepository };
|
|
368
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAI7C,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,cAAc,IAAI,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,cAAc,IAAI,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAIlF,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAI9E,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAsJlD,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,kBAAkB;IAAlD;;;IA4VP,CAAC;IArTC,KAAK,CAAC,WAAW,CAAC,KAAa,EAAE,IAAY;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,MAAM,uBAAA,IAAI,oFAA6B,MAAjC,IAAI,EAA8B,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,SAAiB;QAC5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,MAAM,uBAAA,IAAI,oFAA6B,MAAjC,IAAI,EAA8B,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,IAAY;QAC7C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC9E,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,KAAK,CAAC,SAAS,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,SAAwB;QACxC,IAAI,SAAS,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/D,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,cAAc,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACjF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3G,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAwB,EAAE,eAAwB;QACtE,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpF,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,cAAc,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACzE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2EAA2E,EAC1F,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAwB,EAAE,eAAwB;QACxE,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACpF,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,EAC/F,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAClC,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,sBAAsB;IACtB,wCAAwC;IACxC,KAAK,CAAC,qBAAqB,CAAC,SAAiB,EAAE,MAAc;QAC3D,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,EAC/F,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,SAAiB;QAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/E,OAAO,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,SAAiB,EAAE,OAAiB;QAClE,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;YACzD,gBAAgB;YAChB,0FAA0F;YAC1F,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6EAA6E,EAC5F,WAAW,EAAE,SAAS,CAAC,CAAC;YAC1B,WAAW;YACX,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,kFAAkF;gBAClF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;gBAClF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qFAAqF,EACpG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,SAAiB,EAAE,MAAc;QAC7D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QACnE,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sFAAsF,EACrG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB;IACvB,KAAK,CAAC,oBAAoB,CAAC,MAAc;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC3F,OAAO,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,oBAAoB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,gBAAsC;QAC/D,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,EAAC,WAAW,EAAC,EAAE;YACxD,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,wCAAwC;gBACxC,cAAc,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC;gBACvF,cAAc,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;gBAC1F,cAAc,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;gBACrF,cAAc,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;gBACxF,cAAc,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC;aAC9F,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAsC;QAC7D,mFAAmF;QACnF,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9E,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,cAAc,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAC/E,CAAC;QACD,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,cAAc,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,gBAAgB,CAAC,EAAE,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7E,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,cAAc,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,SAAiB,EAAE,OAAe;QACzD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QAClC,OAAO,MAAM,IAAI,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,SAAiB;QACzC,qDAAqD;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAA2B,EAAE,CAAC;QAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,SAAiB;QAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9F,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,wBAAwB;IACxB,KAAK,CAAC,qBAAqB,CAAC,SAAiB;QAC3C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yEAAyE,EACxF,WAAW,EAAE,SAAS,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,UAAgC;QACzD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7C,MAAM,EAAE;gBACN,UAAU,CAAC,eAAe,CAAC,MAAM;gBACjC,UAAU,CAAC,YAAY,CAAC,MAAM;gBAC9B,UAAU,CAAC,UAAU,CAAC,MAAM;gBAC5B,UAAU,CAAC,OAAO,CAAC,MAAM;aAC1B;SACF,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACxG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6FAA6F,EAC5G,eAAe,EAAE,WAAW,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,cAA4C;QAC3E,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC7G,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;YACzC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,MAAM,cAAc,CAAC,oBAAoB,CAAC,cAAc,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAC/F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iFAAiF,EAChG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,gBAAwB;QACvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC9E,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,cAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACjF,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAkB;QACnD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,aAAa,CAAC,KAAK,EAAE,CAAC;YAC/D,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,GAA2B,CAAC;YAC7D,MAAM,GAAG,GAAG;;;;;;8BAMY,QAAQ;gCACN,KAAK,CAAC,KAAK;OACpC,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,UAAoB,CAAC;QAC/C,CAAC;QACD,MAAM,GAAG,GAAG,kCAAkC,KAAK,CAAC,KAAK,GAAG,CAAC;QAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5E,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI,mBAAmB,GAAG,CAAC,CAAC;QAC5B,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,kBAAkB,GAAG,EAAE,CAAC;QAE5B,IAAI,OAAO,EAAE,CAAC;YACZ,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;YAChF,wCAAwC;YACxC,+BAA+B;YAC/B,YAAY,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC;YAC7E,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;gBACnE,kBAAkB,GAAG,GAAG,QAAQ,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YAC5D,CAAC;YACD,mBAAmB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;QAC7E,CAAC;QACD,OAAO;YACL,YAAY;YACZ,mBAAmB;YACnB,WAAW;YACX,kBAAkB;SACnB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,KAA0B;QACnE,MAAM,CACJ,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,oBAAoB,EACrB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;YACjD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC;YACnD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAAC;SACvD,CAAC,CAAC;QACH,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,YAAY,IAAI,cAAc,CAAC,oBAAoB,CAAC,YAAY,EAAE,UAAU,CAAC;YACtF,UAAU,EAAE,eAAe,IAAI,cAAc,CAAC,oBAAoB,CAAC,eAAe,EAAE,UAAU,CAAC;YAC/F,YAAY,EAAE,iBAAiB,IAAI,cAAc,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,UAAU,CAAC;YACrG,eAAe,EAAE,oBAAoB,IAAI,cAAc,CAAC,oBAAoB,CAAC,oBAAoB,EAAE,UAAU,CAAC;SAC/G,CAAC;QACF,OAAO,cAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAiB,EAAE,GAAW;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,MAAM,MAAM,GAAG,cAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QAC5E,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,gBAAkC;QACrD,IAAI,gBAAgB,CAAC,EAAE,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,cAAc,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iFAAiF,EAChG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,gBAAkC;QACvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qFAAqF,EACpG,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAuB,EAAE,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;CAEF,CAAA;;iDAhUC,KAAK,yDAA8B,KAAmB;IACpD,MAAM,kBAAkB,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACrH,MAAM,qBAAqB,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9H,MAAM,IAAI,GAAG;QACX,aAAa,EAAE,kBAAkB,IAAI,cAAc,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,UAAU,CAAC;QACxG,gBAAgB,EAAE,qBAAqB,IAAI,cAAc,CAAC,oBAAoB,CAAC,qBAAqB,EAAE,UAAU,CAAC;KAClH,CAAC;IACF,MAAM,MAAM,GAAG,cAAc,CAAC,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC;AAChB,CAAC;AAnCgB;IADhB,MAAM,EAAE;;kDACqC;AAG7B;IADhB,MAAM,EAAE;;+CAC+B;AAGvB;IADhB,MAAM,EAAE;;yDACmD;AAG3C;IADhB,MAAM,EAAE;;iEACmE;AAG3D;IADhB,MAAM,EAAE;;qDAC2C;AAGnC;IADhB,MAAM,EAAE;;qDAC2C;AAGnC;IADhB,MAAM,EAAE;;+CAC+B;AAGvB;IADhB,MAAM,EAAE;;iDAC6B;AAGrB;IADhB,MAAM,EAAE;8BACa,GAAG;8CAAC;AA1Bf,iBAAiB;IAH7B,cAAc,CAAC;QACd,WAAW,EAAE,WAAW,CAAC,MAAM;KAChC,CAAC;GACW,iBAAiB,CA4V7B"}
|
|
409
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { PaddingSemVer } from '../core/entity/PaddingSemVer.js';
|
|
1
|
+
import type { PaddingSemVer } from '../core/entity/PaddingSemVer.js';
|
|
2
2
|
import { PackageVersion } from '../core/entity/PackageVersion.js';
|
|
3
|
-
import { SqlRange } from '../core/entity/SqlRange.js';
|
|
3
|
+
import type { SqlRange } from '../core/entity/SqlRange.js';
|
|
4
4
|
export declare class PackageVersionRepository {
|
|
5
5
|
private readonly Package;
|
|
6
6
|
private readonly PackageVersion;
|
|
@@ -13,13 +13,13 @@ import { ModelConvertor } from './util/ModelConvertor.js';
|
|
|
13
13
|
let PackageVersionRepository = class PackageVersionRepository {
|
|
14
14
|
async findHaveNotPaddingVersion(id) {
|
|
15
15
|
if (!id) {
|
|
16
|
-
id = await this.PackageVersion.minimum('id')
|
|
17
|
-
.where('paddingVersion is null');
|
|
16
|
+
id = (await this.PackageVersion.minimum('id').where('paddingVersion is null'));
|
|
18
17
|
}
|
|
19
18
|
if (!id)
|
|
20
19
|
return [];
|
|
21
|
-
const versions = await this.PackageVersion.find({
|
|
22
|
-
|
|
20
|
+
const versions = await this.PackageVersion.find({
|
|
21
|
+
id: { $gte: id },
|
|
22
|
+
}).limit(1000);
|
|
23
23
|
const versionModels = versions.map(t => ModelConvertor.convertModelToEntity(t, PackageVersion));
|
|
24
24
|
return versionModels.toObject();
|
|
25
25
|
}
|
|
@@ -30,13 +30,13 @@ let PackageVersionRepository = class PackageVersionRepository {
|
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
32
|
async findVersionByTag(scope, name, tag) {
|
|
33
|
-
const tags = await this.PackageTag.select('version')
|
|
33
|
+
const tags = (await this.PackageTag.select('version')
|
|
34
34
|
.join(this.Package, 'packageTags.packageId = packages.packageId')
|
|
35
35
|
.where({
|
|
36
36
|
scope,
|
|
37
37
|
name,
|
|
38
38
|
tag,
|
|
39
|
-
});
|
|
39
|
+
}));
|
|
40
40
|
const tagModel = tags && tags[0];
|
|
41
41
|
return tagModel?.version;
|
|
42
42
|
}
|
|
@@ -44,27 +44,26 @@ let PackageVersionRepository = class PackageVersionRepository {
|
|
|
44
44
|
* if sql version not contains prerelease, find the max version
|
|
45
45
|
*/
|
|
46
46
|
async findMaxSatisfyVersion(scope, name, sqlRange) {
|
|
47
|
-
const versions = await this.PackageVersion
|
|
48
|
-
.select('packageVersions.version')
|
|
47
|
+
const versions = (await this.PackageVersion.select('packageVersions.version')
|
|
49
48
|
.join(this.Package, 'packageVersions.packageId = packages.packageId')
|
|
50
49
|
.where({
|
|
51
50
|
'packages.scope': scope,
|
|
52
51
|
'packages.name': name,
|
|
53
52
|
...sqlRange.condition,
|
|
54
53
|
})
|
|
55
|
-
.order('packageVersions.paddingVersion', 'desc');
|
|
54
|
+
.order('packageVersions.paddingVersion', 'desc'));
|
|
56
55
|
return versions?.[0]?.version;
|
|
57
56
|
}
|
|
58
57
|
async findSatisfyVersionsWithPrerelease(scope, name, sqlRange) {
|
|
59
|
-
const versions = await this.PackageVersion
|
|
60
|
-
.select('version')
|
|
58
|
+
const versions = await this.PackageVersion.select('version')
|
|
61
59
|
.join(this.Package, 'packageVersions.packageId = packages.packageId')
|
|
62
60
|
.where({
|
|
63
61
|
scope,
|
|
64
62
|
name,
|
|
65
63
|
...sqlRange.condition,
|
|
66
64
|
});
|
|
67
|
-
return versions
|
|
65
|
+
return versions
|
|
66
|
+
.toObject()
|
|
68
67
|
.map((t) => t.version);
|
|
69
68
|
}
|
|
70
69
|
};
|
|
@@ -86,4 +85,4 @@ PackageVersionRepository = __decorate([
|
|
|
86
85
|
})
|
|
87
86
|
], PackageVersionRepository);
|
|
88
87
|
export { PackageVersionRepository };
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25SZXBvc2l0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvUGFja2FnZVZlcnNpb25SZXBvc2l0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUlsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBT25ELElBQU0sd0JBQXdCLEdBQTlCLE1BQU0sd0JBQXdCO0lBVW5DLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxFQUFXO1FBQ3pDLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNSLEVBQUUsR0FBRyxDQUFDLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxDQUNqRCx3QkFBd0IsQ0FDekIsQ0FBVyxDQUFDO1FBQ2YsQ0FBQztRQUNELElBQUksQ0FBQyxFQUFFO1lBQUUsT0FBTyxFQUFFLENBQUM7UUFDbkIsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQztZQUM5QyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFO1NBQ1AsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN6QixNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQ3JDLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLEVBQUUsY0FBYyxDQUFDLENBQ3ZELENBQUM7UUFDRixPQUFRLGFBQXFCLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDM0MsQ0FBQztJQUVELEtBQUssQ0FBQyxpQkFBaUIsQ0FDckIsWUFBb0IsRUFDcEIsYUFBNEI7UUFFNUIsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FDOUIsRUFBRSxnQkFBZ0IsRUFBRSxZQUFZLEVBQUUsRUFDbEM7WUFDRSxjQUFjLEVBQUUsYUFBYSxDQUFDLGNBQWM7WUFDNUMsWUFBWSxFQUFFLGFBQWEsQ0FBQyxZQUFZO1NBQ3pDLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxLQUFLLENBQUMsZ0JBQWdCLENBQ3BCLEtBQWEsRUFDYixJQUFZLEVBQ1osR0FBVztRQUVYLE1BQU0sSUFBSSxHQUFHLENBQUMsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7YUFDbEQsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFjLEVBQUUsNENBQTRDLENBQUM7YUFDdkUsS0FBSyxDQUFDO1lBQ0wsS0FBSztZQUNMLElBQUk7WUFDSixHQUFHO1NBQ00sQ0FBQyxDQUEwQixDQUFDO1FBQ3pDLE1BQU0sUUFBUSxHQUFHLElBQUksSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDakMsT0FBTyxRQUFRLEVBQUUsT0FBTyxDQUFDO0lBQzNCLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxxQkFBcUIsQ0FDekIsS0FBYSxFQUNiLElBQVksRUFDWixRQUFrQjtRQUVsQixNQUFNLFFBQVEsR0FBRyxDQUFDLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQ2hELHlCQUF5QixDQUMxQjthQUNFLElBQUksQ0FDSCxJQUFJLENBQUMsT0FBYyxFQUNuQixnREFBZ0QsQ0FDakQ7YUFDQSxLQUFLLENBQUM7WUFDTCxnQkFBZ0IsRUFBRSxLQUFLO1lBQ3ZCLGVBQWUsRUFBRSxJQUFJO1lBQ3JCLEdBQUcsUUFBUSxDQUFDLFNBQVM7U0FDWixDQUFDO2FBQ1gsS0FBSyxDQUFDLGdDQUFnQyxFQUFFLE1BQU0sQ0FBQyxDQUUvQyxDQUFDO1FBQ0osT0FBTyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDaEMsQ0FBQztJQUVELEtBQUssQ0FBQyxpQ0FBaUMsQ0FDckMsS0FBYSxFQUNiLElBQVksRUFDWixRQUFrQjtRQUVsQixNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQzthQUN6RCxJQUFJLENBQ0gsSUFBSSxDQUFDLE9BQWMsRUFDbkIsZ0RBQWdELENBQ2pEO2FBQ0EsS0FBSyxDQUFDO1lBQ0wsS0FBSztZQUNMLElBQUk7WUFDSixHQUFHLFFBQVEsQ0FBQyxTQUFTO1NBQ1osQ0FBQyxDQUFDO1FBQ2YsT0FBUSxRQUFnQjthQUNyQixRQUFRLEVBQUU7YUFDVixHQUFHLENBQUMsQ0FBQyxDQUFzQixFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDaEQsQ0FBQztDQUNGLENBQUE7QUFsR2tCO0lBRGhCLE1BQU0sRUFBRTs7eURBQ3FDO0FBRzdCO0lBRGhCLE1BQU0sRUFBRTs7Z0VBQ21EO0FBRzNDO0lBRGhCLE1BQU0sRUFBRTs7NERBQ3NDO0FBUnBDLHdCQUF3QjtJQUhwQyxjQUFjLENBQUM7UUFDZCxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLHdCQUF3QixDQW9HcEMifQ==
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { ProxyCache as ProxyModeCachedFilesModel } from './model/ProxyCache.js';
|
|
2
2
|
import { ProxyCache as ProxyCacheEntity } from '../core/entity/ProxyCache.js';
|
|
3
3
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
4
|
-
import { DIST_NAMES } from '../core/entity/Package.js';
|
|
5
|
-
import { PageOptions, PageResult } from '../core/util/EntityUtil.js';
|
|
4
|
+
import type { DIST_NAMES } from '../core/entity/Package.js';
|
|
5
|
+
import type { PageOptions, PageResult } from '../core/util/EntityUtil.js';
|
|
6
6
|
export declare class ProxyCacheRepository extends AbstractRepository {
|
|
7
7
|
private readonly ProxyCache;
|
|
8
8
|
saveProxyCache(proxyCacheEntity: ProxyCacheEntity): Promise<ProxyModeCachedFilesModel>;
|
|
@@ -14,9 +14,16 @@ import { AbstractRepository } from './AbstractRepository.js';
|
|
|
14
14
|
import { EntityUtil } from '../core/util/EntityUtil.js';
|
|
15
15
|
let ProxyCacheRepository = class ProxyCacheRepository extends AbstractRepository {
|
|
16
16
|
async saveProxyCache(proxyCacheEntity) {
|
|
17
|
-
let model = proxyCacheEntity.version
|
|
18
|
-
await this.ProxyCache.findOne({
|
|
19
|
-
|
|
17
|
+
let model = proxyCacheEntity.version
|
|
18
|
+
? await this.ProxyCache.findOne({
|
|
19
|
+
fullname: proxyCacheEntity.fullname,
|
|
20
|
+
version: proxyCacheEntity.version,
|
|
21
|
+
fileType: proxyCacheEntity.fileType,
|
|
22
|
+
})
|
|
23
|
+
: await this.ProxyCache.findOne({
|
|
24
|
+
fullname: proxyCacheEntity.fullname,
|
|
25
|
+
fileType: proxyCacheEntity.fileType,
|
|
26
|
+
});
|
|
20
27
|
if (model) {
|
|
21
28
|
model.updatedAt = proxyCacheEntity.updatedAt;
|
|
22
29
|
await model.save();
|
|
@@ -26,34 +33,45 @@ let ProxyCacheRepository = class ProxyCacheRepository extends AbstractRepository
|
|
|
26
33
|
model = await ModelConvertor.convertEntityToModel(proxyCacheEntity, this.ProxyCache);
|
|
27
34
|
}
|
|
28
35
|
catch (e) {
|
|
29
|
-
e.message =
|
|
36
|
+
e.message =
|
|
37
|
+
'[ProxyCacheRepository] insert ProxyCache failed: ' + e.message;
|
|
30
38
|
throw e;
|
|
31
39
|
}
|
|
32
40
|
}
|
|
33
41
|
return model;
|
|
34
42
|
}
|
|
35
43
|
async findProxyCache(fullname, fileType, version) {
|
|
36
|
-
const model = version
|
|
44
|
+
const model = version
|
|
45
|
+
? await this.ProxyCache.findOne({ fullname, version, fileType })
|
|
46
|
+
: await this.ProxyCache.findOne({ fullname, fileType });
|
|
37
47
|
if (model)
|
|
38
48
|
return ModelConvertor.convertModelToEntity(model, ProxyCacheEntity);
|
|
39
49
|
return null;
|
|
40
50
|
}
|
|
41
51
|
// used by update & delete all cache
|
|
42
52
|
async findProxyCaches(fullname, version) {
|
|
43
|
-
const models = version
|
|
53
|
+
const models = version
|
|
54
|
+
? await this.ProxyCache.find({ fullname, version })
|
|
55
|
+
: await this.ProxyCache.find({ fullname });
|
|
44
56
|
return models;
|
|
45
57
|
}
|
|
46
58
|
async listCachedFiles(page, fullname) {
|
|
47
59
|
const { offset, limit } = EntityUtil.convertPageOptionsToLimitOption(page);
|
|
48
|
-
const count = fullname
|
|
49
|
-
|
|
60
|
+
const count = fullname
|
|
61
|
+
? await this.ProxyCache.find({ fullname }).count()
|
|
62
|
+
: await this.ProxyCache.find().count();
|
|
63
|
+
const models = fullname
|
|
64
|
+
? await this.ProxyCache.find({ fullname }).offset(offset).limit(limit)
|
|
65
|
+
: await this.ProxyCache.find().offset(offset).limit(limit);
|
|
50
66
|
return {
|
|
51
67
|
count,
|
|
52
68
|
data: models.map(model => ModelConvertor.convertModelToEntity(model, ProxyCacheEntity)),
|
|
53
69
|
};
|
|
54
70
|
}
|
|
55
71
|
async removeProxyCache(fullname, fileType, version) {
|
|
56
|
-
version
|
|
72
|
+
version
|
|
73
|
+
? await this.ProxyCache.remove({ fullname, version, fileType })
|
|
74
|
+
: await this.ProxyCache.remove({ fullname, fileType });
|
|
57
75
|
}
|
|
58
76
|
async truncateProxyCache() {
|
|
59
77
|
await this.ProxyCache.truncate();
|
|
@@ -69,4 +87,4 @@ ProxyCacheRepository = __decorate([
|
|
|
69
87
|
})
|
|
70
88
|
], ProxyCacheRepository);
|
|
71
89
|
export { ProxyCacheRepository };
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJveHlDYWNoZVJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Qcm94eUNhY2hlUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTFELE9BQU8sRUFBRSxVQUFVLElBQUksZ0JBQWdCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM5RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUc3RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFJakQsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSxrQkFBa0I7SUFJMUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxnQkFBa0M7UUFDckQsSUFBSSxLQUFLLEdBQUcsZ0JBQWdCLENBQUMsT0FBTztZQUNsQyxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztnQkFDNUIsUUFBUSxFQUFFLGdCQUFnQixDQUFDLFFBQVE7Z0JBQ25DLE9BQU8sRUFBRSxnQkFBZ0IsQ0FBQyxPQUFPO2dCQUNqQyxRQUFRLEVBQUUsZ0JBQWdCLENBQUMsUUFBUTthQUNwQyxDQUFDO1lBQ0osQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7Z0JBQzVCLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQyxRQUFRO2dCQUNuQyxRQUFRLEVBQUUsZ0JBQWdCLENBQUMsUUFBUTthQUNwQyxDQUFDLENBQUM7UUFDUCxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ1YsS0FBSyxDQUFDLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUM7WUFDN0MsTUFB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
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { Registry
|
|
1
|
+
import type { Registry } from '../core/entity/Registry.js';
|
|
2
|
+
import { Registry as RegistryEntity } from '../core/entity/Registry.js';
|
|
2
3
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
3
4
|
import type { Registry as RegistryModel } from './model/Registry.js';
|
|
4
|
-
import { PageOptions, PageResult } from '../core/util/EntityUtil.js';
|
|
5
|
+
import type { PageOptions, PageResult } from '../core/util/EntityUtil.js';
|
|
5
6
|
export declare class RegistryRepository extends AbstractRepository {
|
|
6
7
|
private readonly Registry;
|
|
7
8
|
listRegistries(page: PageOptions): Promise<PageResult<Registry>>;
|
|
@@ -69,4 +69,4 @@ RegistryRepository = __decorate([
|
|
|
69
69
|
})
|
|
70
70
|
], RegistryRepository);
|
|
71
71
|
export { RegistryRepository };
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVnaXN0cnlSZXBvc2l0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvUmVnaXN0cnlSZXBvc2l0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFMUQsT0FBTyxFQUFFLFFBQVEsSUFBSSxjQUFjLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN4RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUc3RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFLakQsSUFBTSxrQkFBa0IsR0FBeEIsTUFBTSxrQkFBbUIsU0FBUSxrQkFBa0I7SUFJeEQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxJQUFpQjtRQUNwQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLFVBQVUsQ0FBQywrQkFBK0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMzRSxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDakQsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdEUsT0FBTztZQUNMLEtBQUs7WUFDTCxJQUFJLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUN2QixjQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLGNBQWMsQ0FBQyxDQUMzRDtTQUNGLENBQUM7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBQyxJQUFhO1FBQzlCLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3BELElBQUksS0FBSyxFQUFFLENBQUM7WUFDVixPQUFPLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsY0FBYyxDQUFDLENBQUM7UUFDcEUsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELEtBQUssQ0FBQyx3QkFBd0IsQ0FDNUIsVUFBa0I7UUFFbEIsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUM7UUFDMUQsSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUNWLE9BQU8sY0FBYyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRSxjQUFjLENBQUMsQ0FBQztRQUNwRSxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLDBCQUEwQixDQUM5QixJQUFZO1FBRVosTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDcEQsSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUNWLE9BQU8sY0FBYyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRSxjQUFjLENBQUMsQ0FBQztRQUNwRSxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBQyxRQUFrQjtRQUNuQyxJQUFJLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNoQixNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQy9ELElBQUksQ0FBQyxLQUFLO2dCQUFFLE9BQU87WUFDbkIsTUFBTSxjQUFjLENBQUMsaUJBQWlCLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ3hELE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLE1BQU0sY0FBYyxDQUFDLG9CQUFvQixDQUNyRCxRQUFRLEVBQ1IsSUFBSSxDQUFDLFFBQVEsQ0FDZCxDQUFDO1FBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2QsOERBQThELEVBQzlELEtBQUssQ0FBQyxFQUFFLEVBQ1IsS0FBSyxDQUFDLFVBQVUsQ0FDakIsQ0FBQztRQUNGLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjLENBQUMsVUFBa0I7UUFDckMsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDN0MsQ0FBQztDQUNGLENBQUE7QUFoRWtCO0lBRGhCLE1BQU0sRUFBRTs7b0RBQ3VDO0FBRnJDLGtCQUFrQjtJQUg5QixjQUFjLENBQUM7UUFDZCxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLGtCQUFrQixDQWtFOUIifQ==
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
2
|
-
import { Scope as ScopeModel } from './model/Scope.js';
|
|
2
|
+
import type { Scope as ScopeModel } from './model/Scope.js';
|
|
3
3
|
import { Scope } from '../core/entity/Scope.js';
|
|
4
|
-
import { PageOptions, PageResult } from '../core/util/EntityUtil.js';
|
|
4
|
+
import type { PageOptions, PageResult } from '../core/util/EntityUtil.js';
|
|
5
5
|
export declare class ScopeRepository extends AbstractRepository {
|
|
6
6
|
private readonly Scope;
|
|
7
7
|
countByRegistryId(registryId: string): Promise<number>;
|
|
@@ -26,7 +26,9 @@ let ScopeRepository = class ScopeRepository extends AbstractRepository {
|
|
|
26
26
|
async listScopesByRegistryId(registryId, page) {
|
|
27
27
|
const { offset, limit } = EntityUtil.convertPageOptionsToLimitOption(page);
|
|
28
28
|
const count = await this.Scope.find({ registryId }).count();
|
|
29
|
-
const models = await this.Scope.find({ registryId })
|
|
29
|
+
const models = await this.Scope.find({ registryId })
|
|
30
|
+
.offset(offset)
|
|
31
|
+
.limit(limit);
|
|
30
32
|
return {
|
|
31
33
|
count,
|
|
32
34
|
data: models.map(model => ModelConvertor.convertModelToEntity(model, Scope)),
|
|
@@ -71,4 +73,4 @@ ScopeRepository = __decorate([
|
|
|
71
73
|
})
|
|
72
74
|
], ScopeRepository);
|
|
73
75
|
export { ScopeRepository };
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NvcGVSZXBvc2l0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvU2NvcGVSZXBvc2l0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFN0QsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWhELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUtqRCxJQUFNLGVBQWUsR0FBckIsTUFBTSxlQUFnQixTQUFRLGtCQUFrQjtJQUlyRCxLQUFLLENBQUMsaUJBQWlCLENBQUMsVUFBa0I7UUFDeEMsT0FBTyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUN2RCxDQUFDO0lBQ0QsS0FBSyxDQUFDLFVBQVUsQ0FBQyxJQUFZO1FBQzNCLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ2pELElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNYLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUNELE9BQU8sY0FBYyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBQ0QsS0FBSyxDQUFDLHNCQUFzQixDQUMxQixVQUFrQixFQUNsQixJQUFpQjtRQUVqQixNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLFVBQVUsQ0FBQywrQkFBK0Is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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { estypes } from '@elastic/elasticsearch';
|
|
2
|
-
import { AuthorType, CnpmcorePatchInfo, PackageManifestType } from './PackageRepository.js';
|
|
1
|
+
import type { estypes } from '@elastic/elasticsearch';
|
|
2
|
+
import type { AuthorType, CnpmcorePatchInfo, PackageManifestType } from './PackageRepository.js';
|
|
3
3
|
export type SearchJSONPickKey = '_rev' | 'name' | 'description' | 'keywords' | 'license' | 'maintainers' | 'dist-tags' | '_source_registry_name';
|
|
4
4
|
export type SearchMappingType = Pick<PackageManifestType, SearchJSONPickKey> & CnpmcorePatchInfo & {
|
|
5
5
|
scope: string;
|
|
@@ -29,4 +29,4 @@ SearchRepository = __decorate([
|
|
|
29
29
|
})
|
|
30
30
|
], SearchRepository);
|
|
31
31
|
export { SearchRepository };
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VhcmNoUmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L1NlYXJjaFJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBaUQzRCxJQUFNLGdCQUFnQixHQUF0QixNQUFNLGdCQUFnQjtJQUkzQixLQUFLLENBQUMsYUFBYSxDQUNqQixLQUFVO1FBRVYsT0FBTyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFxQixLQUFLLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxRQUE0QjtRQUM5QyxPQUFPLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDMUUsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsUUFBZ0I7UUFDbEMsT0FBTyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ25ELENBQUM7Q0FDRixDQUFBO0FBZmtCO0lBRGhCLE1BQU0sRUFBRTs7dURBQ3FDO0FBRm5DLGdCQUFnQjtJQUg1QixjQUFjLENBQUM7UUFDZCxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLGdCQUFnQixDQWlCNUIifQ==
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
2
|
-
import { TaskType, TaskState } from '../../app/common/enum/Task.js';
|
|
3
|
-
import {
|
|
2
|
+
import type { TaskType, TaskState } from '../../app/common/enum/Task.js';
|
|
3
|
+
import type { TaskUpdateCondition } from '../core/entity/Task.js';
|
|
4
|
+
import { Task as TaskEntity } from '../core/entity/Task.js';
|
|
4
5
|
export declare class TaskRepository extends AbstractRepository {
|
|
5
6
|
private readonly Task;
|
|
6
7
|
private readonly HistoryTask;
|