cnpmcore 3.48.2 → 3.48.4
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.
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.PackageSearchService = void 0;
|
|
16
16
|
const tegg_1 = require("@eggjs/tegg");
|
|
17
|
+
const elasticsearch_1 = require("@elastic/elasticsearch");
|
|
17
18
|
const dayjs_1 = __importDefault(require("dayjs"));
|
|
18
19
|
const AbstractService_1 = require("../../common/AbstractService");
|
|
19
20
|
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
@@ -125,7 +126,17 @@ let PackageSearchService = class PackageSearchService extends AbstractService_1.
|
|
|
125
126
|
};
|
|
126
127
|
}
|
|
127
128
|
async removePackage(fullname) {
|
|
128
|
-
|
|
129
|
+
try {
|
|
130
|
+
return await this.searchRepository.removePackage(fullname);
|
|
131
|
+
}
|
|
132
|
+
catch (error) {
|
|
133
|
+
// if the package does not exist, returns success
|
|
134
|
+
if (error instanceof elasticsearch_1.errors.ResponseError && error?.statusCode === 404) {
|
|
135
|
+
this.logger.warn('[PackageSearchService.removePackage] remove package:%s not found', fullname);
|
|
136
|
+
return fullname;
|
|
137
|
+
}
|
|
138
|
+
throw error;
|
|
139
|
+
}
|
|
129
140
|
}
|
|
130
141
|
// https://github.com/npms-io/queries/blob/master/lib/search.js#L8C1-L78C2
|
|
131
142
|
_buildMatchQueries(text) {
|
|
@@ -195,7 +206,7 @@ let PackageSearchService = class PackageSearchService extends AbstractService_1.
|
|
|
195
206
|
_buildScriptScore(params) {
|
|
196
207
|
// keep search simple, only download(popularity)
|
|
197
208
|
const downloads = 'doc["downloads.all"].value';
|
|
198
|
-
const source = `doc["package.name.raw"].value.equals(
|
|
209
|
+
const source = `doc["package.name.raw"].value.equals(params.text) ? 100000 + ${downloads} : _score * Math.pow(${downloads}, params.scoreEffect)`;
|
|
199
210
|
return {
|
|
200
211
|
script: {
|
|
201
212
|
source,
|
|
@@ -229,4 +240,4 @@ exports.PackageSearchService = PackageSearchService = __decorate([
|
|
|
229
240
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
230
241
|
})
|
|
231
242
|
], PackageSearchService);
|
|
232
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
243
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVNlYXJjaFNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1BhY2thZ2VTZWFyY2hTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUFrRTtBQUNsRSwwREFBeUQ7QUFDekQsa0RBQTBCO0FBRTFCLGtFQUErRDtBQUMvRCwwREFBeUU7QUFDekUsbUVBQWdFO0FBQ2hFLHdFQUE0RztBQUM1Ryx3R0FBcUc7QUFDckcsMEVBQXVFO0FBTWhFLElBQU0sb0JBQW9CLEdBQTFCLE1BQU0sb0JBQXFCLFNBQVEsaUNBQWU7SUFVdkQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxRQUFnQixFQUFFLE1BQU0sR0FBRyxJQUFJO1FBQy9DLE1BQU0sQ0FBRSxLQUFLLEVBQUUsSUFBSSxDQUFFLEdBQUcsSUFBQSw2QkFBZSxFQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2xELE1BQU0sYUFBYSxHQUFHLE1BQU0sSUFBSSxDQUFDLHFCQUFxQixDQUFDLHdCQUF3QixDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFckcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUU7WUFDdkIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsOERBQThELEVBQUUsUUFBUSxDQUFDLENBQUM7WUFDM0YsT0FBTztTQUNSO1FBRUQsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNsRSxJQUFJLENBQUMsR0FBRyxFQUFFO1lBQ1IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsNkRBQTZELEVBQUUsUUFBUSxDQUFDLENBQUM7WUFDMUYsT0FBTztTQUNSO1FBRUQsOEJBQThCO1FBQzlCLE1BQU0sU0FBUyxHQUFHLElBQUEsZUFBSyxHQUFFLENB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
|
|
@@ -20,8 +20,6 @@ const promises_1 = require("timers/promises");
|
|
|
20
20
|
const promises_2 = require("fs/promises");
|
|
21
21
|
const lodash_1 = require("lodash");
|
|
22
22
|
const semver_1 = __importDefault(require("semver"));
|
|
23
|
-
const rcompare_1 = __importDefault(require("semver/functions/rcompare"));
|
|
24
|
-
const prerelease_1 = __importDefault(require("semver/functions/prerelease"));
|
|
25
23
|
const NPMRegistry_1 = require("../../common/adapter/NPMRegistry");
|
|
26
24
|
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
27
25
|
const FileUtil_1 = require("../../common/FileUtil");
|
|
@@ -487,16 +485,33 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
|
|
|
487
485
|
logs.push(`[${isoNow()}] 📦 Add latest tag version "${fullname}: ${distTags.latest}"`);
|
|
488
486
|
specificVersions.push(distTags.latest);
|
|
489
487
|
}
|
|
490
|
-
const versions = specificVersions ?
|
|
491
|
-
|
|
488
|
+
const versions = specificVersions ?
|
|
489
|
+
Object.values(versionMap).filter(verItem => specificVersions.includes(verItem.version)) :
|
|
490
|
+
Object.values(versionMap);
|
|
491
|
+
// 全量同步时跳过排序
|
|
492
|
+
const sortedAvailableVersions = specificVersions ?
|
|
493
|
+
versions.map(item => item.version).sort(semver_1.default.rcompare) : [];
|
|
494
|
+
// 在strictSyncSpecivicVersion模式下(不同步latest)且所有传入的version均不可用
|
|
495
|
+
if (specificVersions && sortedAvailableVersions.length === 0) {
|
|
496
|
+
logs.push(`[${isoNow()}] ❌ `);
|
|
497
|
+
task.error = 'There is no available specific versions, stop task.';
|
|
498
|
+
logs.push(`[${isoNow()}] ${task.error}, log: ${logUrl}`);
|
|
499
|
+
logs.push(`[${isoNow()}] ❌❌❌❌❌ ${fullname} ❌❌❌❌❌`);
|
|
500
|
+
await this.taskService.finishTask(task, Task_1.TaskState.Fail, logs.join('\n'));
|
|
501
|
+
this.logger.info('[PackageSyncerService.executeTask:fail-empty-list] taskId: %s, targetName: %s, %s', task.taskId, task.targetName, task.error);
|
|
502
|
+
return;
|
|
503
|
+
}
|
|
492
504
|
if (specificVersions) {
|
|
493
|
-
|
|
494
|
-
|
|
505
|
+
// specific versions may not in manifest.
|
|
506
|
+
const notAvailableVersionList = specificVersions.filter(i => !sortedAvailableVersions.includes(i));
|
|
507
|
+
logs.push(`[${isoNow()}] 🚧 Syncing specific versions: ${sortedAvailableVersions.join(' | ')}`);
|
|
495
508
|
if (notAvailableVersionList.length > 0) {
|
|
496
|
-
|
|
497
|
-
logs.push(`[${isoNow()}] 🚧 Some specific versions are not available: 👉 ${notAvailableVersionList.join(' | ')} 👈`);
|
|
509
|
+
logs.push(`🚧 Some specific versions are not available: 👉 ${notAvailableVersionList.join(' | ')} 👈`);
|
|
498
510
|
}
|
|
499
511
|
}
|
|
512
|
+
else {
|
|
513
|
+
logs.push(`[${isoNow()}] 🚧 Syncing versions ${existsVersionCount} => ${versions.length}`);
|
|
514
|
+
}
|
|
500
515
|
const updateVersions = [];
|
|
501
516
|
const differentMetas = [];
|
|
502
517
|
let syncIndex = 0;
|
|
@@ -741,14 +756,12 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
|
|
|
741
756
|
// 在同步 sepcific version 时如果没有同步 latestTag 的版本会出现 latestTag 丢失或指向版本不正确的情况
|
|
742
757
|
if (specificVersions && this.config.cnpmcore.strictSyncSpecivicVersion) {
|
|
743
758
|
// 不允许自动同步 latest 版本,从已同步版本中选出 latest
|
|
744
|
-
let latestStableVersion;
|
|
745
|
-
const sortedVersionList = specificVersions.sort(rcompare_1.default);
|
|
746
|
-
latestStableVersion = sortedVersionList.filter(i => !(0, prerelease_1.default)(i))[0];
|
|
759
|
+
let latestStableVersion = semver_1.default.maxSatisfying(sortedAvailableVersions, '*');
|
|
747
760
|
// 所有版本都不是稳定版本则指向非稳定版本保证 latest 存在
|
|
748
761
|
if (!latestStableVersion) {
|
|
749
|
-
latestStableVersion =
|
|
762
|
+
latestStableVersion = sortedAvailableVersions[0];
|
|
750
763
|
}
|
|
751
|
-
if (!existsDistTags.latest ||
|
|
764
|
+
if (!existsDistTags.latest || semver_1.default.rcompare(existsDistTags.latest, latestStableVersion) === 1) {
|
|
752
765
|
logs.push(`[${isoNow()}] 🚧 patch latest tag from specific versions 🚧`);
|
|
753
766
|
changedTags.push({ action: 'change', tag: 'latest', version: latestStableVersion });
|
|
754
767
|
await this.packageManagerService.savePackageTag(pkg, 'latest', latestStableVersion);
|
|
@@ -875,4 +888,4 @@ exports.PackageSyncerService = PackageSyncerService = __decorate([
|
|
|
875
888
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
876
889
|
})
|
|
877
890
|
], PackageSyncerService);
|
|
878
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}
|
|
891
|
+
//# 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/typebox.js
CHANGED
|
@@ -10,6 +10,7 @@ const semver_1 = __importDefault(require("semver"));
|
|
|
10
10
|
const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
|
|
11
11
|
const Hook_1 = require("../common/enum/Hook");
|
|
12
12
|
const binaries_1 = __importDefault(require("../../config/binaries"));
|
|
13
|
+
const lodash_1 = require("lodash");
|
|
13
14
|
exports.Name = typebox_1.Type.String({
|
|
14
15
|
transform: ['trim'],
|
|
15
16
|
});
|
|
@@ -52,7 +53,7 @@ exports.Version = typebox_1.Type.String({
|
|
|
52
53
|
maxLength: 256,
|
|
53
54
|
});
|
|
54
55
|
exports.VersionStringArray = typebox_1.Type.String({
|
|
55
|
-
format: 'semver-version-array',
|
|
56
|
+
format: 'unique-semver-version-array',
|
|
56
57
|
transform: ['trim'],
|
|
57
58
|
});
|
|
58
59
|
exports.Spec = typebox_1.Type.String({
|
|
@@ -137,7 +138,7 @@ function patchAjv(ajv) {
|
|
|
137
138
|
return binaries_1.default[binaryName];
|
|
138
139
|
},
|
|
139
140
|
});
|
|
140
|
-
ajv.addFormat('semver-version-array', {
|
|
141
|
+
ajv.addFormat('unique-semver-version-array', {
|
|
141
142
|
type: 'string',
|
|
142
143
|
validate: (versionStringList) => {
|
|
143
144
|
let versionList;
|
|
@@ -147,8 +148,10 @@ function patchAjv(ajv) {
|
|
|
147
148
|
catch (error) {
|
|
148
149
|
return false;
|
|
149
150
|
}
|
|
150
|
-
if (versionList
|
|
151
|
-
|
|
151
|
+
if (Array.isArray(versionList)) {
|
|
152
|
+
const isSemver = versionList.every(version => !!semver_1.default.valid(version));
|
|
153
|
+
const isUnique = (0, lodash_1.uniq)(versionList).length === versionList.length;
|
|
154
|
+
return isSemver && isUnique;
|
|
152
155
|
}
|
|
153
156
|
return false;
|
|
154
157
|
},
|
|
@@ -265,4 +268,4 @@ exports.SearchQueryOptions = typebox_1.Type.Object({
|
|
|
265
268
|
maxLength: 256,
|
|
266
269
|
}),
|
|
267
270
|
});
|
|
268
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
271
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"typebox.js","sourceRoot":"","sources":["../../../app/port/typebox.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAiD;AACjD,sDAAuD;AACvD,oDAA4B;AAC5B,sEAAkC;AAClC,8CAA+C;AAC/C,qEAAiE;AACjE,mCAA8B;AAEjB,QAAA,IAAI,GAAG,cAAI,CAAC,MAAM,CAAC;IAC9B,SAAS,EAAE,CAAE,MAAM,CAAE;CACtB,CAAC,CAAC;AAEU,QAAA,GAAG,GAAG,cAAI,CAAC,MAAM,CAAC;IAC7B,SAAS,EAAE,CAAE,MAAM,CAAE;IACrB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,IAAI;CAChB,CAAC,CAAC;AAEU,QAAA,MAAM,GAAG,cAAI,CAAC,MAAM,CAAC;IAChC,SAAS,EAAE,CAAE,MAAM,CAAE;IACrB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACf,CAAC,CAAC;AAEU,QAAA,QAAQ,GAAG,cAAI,CAAC,MAAM,CAAC;IAClC,SAAS,EAAE,CAAE,MAAM,CAAE;IACrB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACf,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,eAAQ,CAAC,CAAC;AAEnC,QAAA,cAAc,GAAG,cAAI,CAAC,MAAM,CAAC;IACxC,MAAM,EAAE,aAAa;IACrB,SAAS,EAAE,CAAE,MAAM,CAAE;IACrB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACf,CAAC,CAAC;AAEH,iDAAiD;AACjD,yCAAyC;AAC5B,QAAA,iBAAiB,GAAG,cAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;AAElD,QAAA,GAAG,GAAG,cAAI,CAAC,MAAM,CAAC;IAC7B,MAAM,EAAE,YAAY;IACpB,SAAS,EAAE,CAAE,MAAM,CAAE;IACrB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACf,CAAC,CAAC;AACH,aAAa;AACA,QAAA,OAAO,GAAG,cAAI,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,gBAAgB;IACxB,SAAS,EAAE,CAAE,MAAM,CAAE;IACrB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACf,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,6BAA6B;IACrC,SAAS,EAAE,CAAE,MAAM,CAAE;CACtB,CAAC,CAAC;AAEU,QAAA,IAAI,GAAG,cAAI,CAAC,MAAM,CAAC;IAC9B,MAAM,EAAE,aAAa;IACrB,SAAS,EAAE,CAAC;CACb,CAAC,CAAC;AAEU,QAAA,WAAW,GAAG,cAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAE,MAAM,CAAE,EAAE,CAAC,CAAC;AAEvE,QAAA,OAAO,GAAG,cAAI,CAAC,MAAM,CAAC;IACjC,GAAG,EAAE,WAAG;CACT,CAAC,CAAC;AACU,QAAA,WAAW,GAAG,cAAI,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,eAAO;CACjB,CAAC,CAAC;AACU,QAAA,kBAAkB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC5C,GAAG,EAAE,WAAG;IACR,OAAO,EAAE,eAAO;CACjB,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC7C,QAAQ,EAAE,YAAI;IACd,IAAI,EAAE,cAAI,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,IAAI;KAChB,CAAC;IACF,gBAAgB,EAAE,cAAI,CAAC,OAAO,EAAE;IAChC,gBAAgB,EAAE,cAAI,CAAC,QAAQ,CAAC,0BAAkB,CAAC;IACnD,gBAAgB,EAAE,cAAI,CAAC,OAAO,EAAE;IAChC,8CAA8C;IAC9C,KAAK,EAAE,cAAI,CAAC,OAAO,EAAE;IACrB,uBAAuB;IACvB,gBAAgB,EAAE,cAAI,CAAC,OAAO,EAAE;IAChC,kBAAkB;IAClB,YAAY,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,MAAM,EAAE,CAAC;CAC3C,CAAC,CAAC;AAGU,QAAA,gBAAgB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC1C,QAAQ,EAAE,YAAI;IACd,MAAM,EAAE,cAAI,CAAC,MAAM,CAAC;QAClB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,KAAK;KACjB,CAAC;CACH,CAAC,CAAC;AAGU,QAAA,qBAAqB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC/C,QAAQ,EAAE,WAAG;IACb,MAAM,EAAE,cAAM;CACf,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC/C,QAAQ,EAAE,WAAG;IACb,MAAM,EAAE,cAAM;IACd,IAAI,EAAE,gBAAQ;IACd,IAAI,EAAE,oBAAY;CACnB,CAAC,CAAC;AAEH,+IAA+I;AAC/I,6BAA6B;AAC7B,SAAgB,QAAQ,CAAC,GAAQ;IAC/B,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE;QAC9B,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,CAAC,OAAe,EAAE,EAAE;YAC5B,OAAO,CAAC,CAAC,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE;QAC1B,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE;YACxB,OAAO,CAAC,gBAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE;QAC3B,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAE;YACzB,IAAI;gBACF,uBAAuB;gBACvB,8DAA8D;gBAC9D,OAAO,CAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAE,CAAC,QAAQ,CAAC,IAAA,yBAAG,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;aAC/D;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,KAAK,CAAC;aACd;QACH,CAAC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE;QAC3B,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,CAAC,UAAsB,EAAE,EAAE;YACnC,OAAO,kBAAY,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE;QAC3C,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,CAAC,iBAAyB,EAAE,EAAE;YACtC,IAAI,WAAW,CAAC;YAChB,IAAI;gBACF,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;aAC7C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,KAAK,CAAC;aACd;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC9B,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBACvE,MAAM,QAAQ,GAAG,IAAA,aAAI,EAAC,WAAW,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC;gBACjE,OAAO,QAAQ,IAAI,QAAQ,CAAC;aAC7B;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAhDD,4BAgDC;AAEY,QAAA,gBAAgB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC1C,QAAQ,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,MAAM,CAAC;QAClC,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,GAAG;KACb,CAAC,CAAC;IACH,SAAS,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,MAAM,CAAC;QACnC,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,OAAO,EAAE,CAAC;KACX,CAAC,CAAC;CACJ,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,cAAI,CAAC,MAAM,CAAC;IACnD,KAAK,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,MAAM,EAAE,CAAC;CACpC,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC/C,IAAI,EAAE,cAAI,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC;IACF,IAAI,EAAE,cAAI,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,IAAI;KAChB,CAAC;IACF,YAAY,EAAE,cAAI,CAAC,MAAM,CAAC;QACxB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,IAAI;KAChB,CAAC;IACF,UAAU,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,MAAM,CAAC;QACpC,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC,CAAC;IACH,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,uBAAY,CAAC;IAC7B,SAAS,EAAE,cAAI,CAAC,QAAQ,CACtB,cAAI,CAAC,MAAM,CAAC;QACV,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,GAAG;KACf,CAAC,CACH;CACF,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC/C,IAAI,EAAE,cAAI,CAAC,QAAQ,CACjB,cAAI,CAAC,MAAM,CAAC;QACV,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC,CACH;IACD,IAAI,EAAE,cAAI,CAAC,QAAQ,CACjB,cAAI,CAAC,MAAM,CAAC;QACV,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,IAAI;KAChB,CAAC,CACH;IACD,YAAY,EAAE,cAAI,CAAC,QAAQ,CACzB,cAAI,CAAC,MAAM,CAAC;QACV,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,IAAI;KAChB,CAAC,CACH;IACD,IAAI,EAAE,cAAI,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,uBAAY,CAAC,CAAC;IAC5C,SAAS,EAAE,cAAI,CAAC,QAAQ,CACtB,cAAI,CAAC,MAAM,CAAC;QACV,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC,CACH;CACF,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,cAAI,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC;IACF,UAAU,EAAE,cAAI,CAAC,MAAM,CAAC;QACtB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,cAAI,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC;IACF,UAAU,EAAE,cAAI,CAAC,MAAM,CAAC;QACtB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC;IACF,OAAO,EAAE,cAAI,CAAC,MAAM,CAAC;QACnB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,cAAI,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,cAAI,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;KACX,CAAC;IACF,IAAI,EAAE,cAAI,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,IAAI,EAAE,cAAI,CAAC,MAAM,CAAC;QAChB,SAAS,EAAE,CAAE,MAAM,CAAE;QACrB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;KACf,CAAC;CACH,CAAC,CAAC"}
|
|
@@ -18,6 +18,7 @@ const tegg_1 = require("@eggjs/tegg");
|
|
|
18
18
|
const ModelConvertor_1 = require("./util/ModelConvertor");
|
|
19
19
|
const Task_1 = require("../core/entity/Task");
|
|
20
20
|
const AbstractRepository_1 = require("./AbstractRepository");
|
|
21
|
+
const lodash_1 = require("lodash");
|
|
21
22
|
let TaskRepository = class TaskRepository extends AbstractRepository_1.AbstractRepository {
|
|
22
23
|
async saveTask(task) {
|
|
23
24
|
if (task.id) {
|
|
@@ -77,7 +78,7 @@ let TaskRepository = class TaskRepository extends AbstractRepository_1.AbstractR
|
|
|
77
78
|
return;
|
|
78
79
|
if (specificVersions) {
|
|
79
80
|
const data = model.data;
|
|
80
|
-
const combinedVersions =
|
|
81
|
+
const combinedVersions = (0, lodash_1.uniq)(data.specificVersions.concat(specificVersions));
|
|
81
82
|
data.specificVersions = combinedVersions;
|
|
82
83
|
await model.update({ data });
|
|
83
84
|
}
|
|
@@ -158,4 +159,4 @@ exports.TaskRepository = TaskRepository = __decorate([
|
|
|
158
159
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
159
160
|
})
|
|
160
161
|
], TaskRepository);
|
|
161
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
162
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFza1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9UYXNrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxvREFBNEI7QUFDNUIsc0NBQWtFO0FBQ2xFLDBEQUF1RDtBQUd2RCw4Q0FBOEU7QUFDOUUsNkRBQTBEO0FBRTFELG1DQUE4QjtBQUt2QixJQUFNLGNBQWMsR0FBcEIsTUFBTSxjQUFlLFNBQVEsdUNBQWtCO0lBT3BELEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBZ0I7UUFDN0IsSUFBSSxJQUFJLENBQUMsRUFBRSxFQUFFO1lBQ1gsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RCxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDckQ7YUFBTTtZQUNMLElBQUk7Z0JBQ0YsTUFBTSwrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDNUQ7WUFBQyxPQUFPLENBQUMsRUFBRTtnQkFDVixDQUFDLENBQUMsT0FBTyxHQUFHLHVDQUF1QyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUM7Z0JBQ2hFLElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxjQUFjLEVBQUU7b0JBQzdCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNwQixNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO29CQUNqRSwyQkFBMkI7b0JBQzNCLElBQUksU0FBUyxFQUFFO3dCQUNiLElBQUksQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQzt3QkFDdkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDO3dCQUMvQixPQUFPO3FCQUNSO29CQUNELHlCQUF5QjtvQkFDekIsV0FBVztvQkFDWCxNQUFNLENBQUMsQ0FBQztpQkFDVDtnQkFDRCxNQUFNLENBQUMsQ0FBQzthQUNUO1NBQ0Y7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLGtCQUFrQixDQUFDLElBQWdCLEVBQUUsU0FBOEI7UUFDdkUsSUFBQSxnQkFBTSxFQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztRQUNyQyxNQUFNLE9BQU8sR0FBRywrQkFBYyxDQUFDLHNCQUFzQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdkUsTUFBTSxVQUFVLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQztZQUN4QyxNQUFNLEVBQUUsU0FBUyxDQUFDLE1BQU07WUFDeEIsUUFBUSxFQUFFLFNBQVMsQ0FBQyxRQUFRO1NBQzdCLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDWixPQUFPLFVBQVUsS0FBSyxDQUFDLENBQUM7SUFDMUIsQ0FBQztJQUVELEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxJQUFnQjtRQUN0QyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZELElBQUksQ0FBQyxLQUFLO1lBQUUsT0FBTztRQUNuQixNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ3hFLElBQUksT0FBTyxFQUFFO1lBQ1gsTUFBTSwrQkFBYyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztTQUN2RDthQUFNO1lBQ0wsTUFBTSwrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7U0FDbkU7UUFDRCxNQUFNLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUN2QixDQUFDO0lBRUQsS0FBSyxDQUFDLG1DQUFtQyxDQUFDLElBQWdCLEVBQUUsZ0JBQWdDO1FBQzFGLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDdkQsSUFBSSxDQUFDLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsZ0JBQWdCO1lBQUUsT0FBTztRQUNuRCxJQUFJLGdCQUFnQixFQUFFO1lBQ3BCLE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUM7WUFDeEIsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLGFBQUksRUFBUyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztZQUN0RixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsZ0JBQWdCLENBQUM7WUFDekMsTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztTQUM5QjthQUFNO1lBQ0wsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQztZQUN4QixPQUFPLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1lBQ2pELE1BQU0sS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7U0FDOUI7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFjO1FBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ2pELElBQUksSUFBSSxFQUFFO1lBQ1IsT0FBTywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxXQUFVLENBQUMsQ0FBQztTQUM5RDtRQUNELDJCQUEyQjtRQUMzQixNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUMzRCxJQUFJLE9BQU8sRUFBRTtZQUNYLE9BQU8sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxPQUFPLEVBQUUsV0FBVSxDQUFDLENBQUM7U0FDakU7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxLQUFLLENBQUMsZUFBZSxDQUFDLEtBQWE7UUFDakMsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7UUFDaEQsSUFBSSxJQUFJLEVBQUU7WUFDUixPQUFPLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLFdBQVUsQ0FBQyxDQUFDO1NBQzlEO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxPQUFzQjtRQUNwQyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN4RSxPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxXQUFVLENBQUMsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFFRCxLQUFLLENBQUMsb0JBQW9CLENBQUMsS0FBaUU7UUFDMUYsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMxQyxPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxXQUFVLENBQUMsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFFRCxLQUFLLENBQUMsb0JBQW9CLENBQUMsVUFBa0IsRUFBRSxJQUFjLEVBQUUsS0FBaUI7UUFDOUUsTUFBTSxLQUFLLEdBQVEsRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDeEMsSUFBSSxLQUFLLEVBQUU7WUFDVCxLQUFLLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztTQUNyQjtRQUNELE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDNUMsSUFBSSxJQUFJLEVBQUU7WUFDUixPQUFPLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLFdBQVUsQ0FBQyxDQUFDO1NBQzlEO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQW9CLEVBQUUsT0FBZTtRQUMxRCxNQUFNLFdBQVcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQy9CLFdBQVcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxHQUFHLE9BQU8sQ0FBQyxDQUFDO1FBQ3JELE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7WUFDbEMsS0FBSyxFQUFFLFNBQVM7WUFDaEIsU0FBUyxFQUFFO2dCQUNULEdBQUcsRUFBRSxXQUFXO2FBQ2pCO1NBQ0YsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNmLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLFdBQVUsQ0FBQyxDQUFDLENBQUM7SUFDckYsQ0FBQztJQUVELEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxRQUFnQixFQUFFLElBQWM7UUFDOUQsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztZQUNsQyxJQUFJO1lBQ0osUUFBUTtTQUNULENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDZixPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRSxXQUFVLENBQUMsQ0FBQyxDQUFDO0lBQ3JGLENBQUM7Q0FDRixDQUFBO0FBdElZLHdDQUFjO0FBRVI7SUFEaEIsSUFBQSxhQUFNLEdBQUU7OzRDQUMrQjtBQUd2QjtJQURoQixJQUFBLGFBQU0sR0FBRTs7bURBQzZDO3lCQUwzQyxjQUFjO0lBSDFCLElBQUEscUJBQWMsRUFBQztRQUNkLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLGNBQWMsQ0FzSTFCIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cnpmcore",
|
|
3
|
-
"version": "3.48.
|
|
3
|
+
"version": "3.48.4",
|
|
4
4
|
"description": "npm core",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist/**/*"
|
|
@@ -135,7 +135,7 @@
|
|
|
135
135
|
"eslint": "^8.29.0",
|
|
136
136
|
"eslint-config-egg": "^13.0.0",
|
|
137
137
|
"git-contributor": "2",
|
|
138
|
-
"typescript": "
|
|
138
|
+
"typescript": "5.2.2"
|
|
139
139
|
},
|
|
140
140
|
"author": "killagu",
|
|
141
141
|
"license": "MIT",
|