cnpmcore 3.82.1 → 3.83.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.
- package/dist/app/core/entity/PackageVersionBlock.d.ts +6 -0
- package/dist/app/core/entity/PackageVersionBlock.js +9 -2
- package/dist/app/core/service/PackageManagerService.d.ts +25 -0
- package/dist/app/core/service/PackageManagerService.js +186 -3
- package/dist/app/port/config.d.ts +21 -0
- package/dist/app/port/schedule/BufferReleaseDispatcher.d.ts +8 -0
- package/dist/app/port/schedule/BufferReleaseDispatcher.js +77 -0
- package/dist/app/port/schedule/BufferReleaseWorker.d.ts +6 -0
- package/dist/app/port/schedule/BufferReleaseWorker.js +72 -0
- package/dist/app/repository/PackageVersionBlockRepository.d.ts +2 -0
- package/dist/app/repository/PackageVersionBlockRepository.js +20 -1
- package/dist/app/repository/model/PackageVersionBlock.d.ts +2 -0
- package/dist/app/repository/model/PackageVersionBlock.js +9 -1
- package/dist/config/config.default.js +4 -1
- package/package.json +1 -1
|
@@ -1,17 +1,23 @@
|
|
|
1
1
|
import { Entity, EntityData } from './Entity';
|
|
2
2
|
import { EasyData } from '../util/EntityUtil';
|
|
3
|
+
export declare const PACKAGE_VERSION_BLOCK_TYPE_BUFFER = "buffer";
|
|
3
4
|
interface PackageVersionBlockData extends EntityData {
|
|
4
5
|
packageVersionBlockId: string;
|
|
5
6
|
packageId: string;
|
|
6
7
|
version: string;
|
|
7
8
|
reason: string;
|
|
9
|
+
type?: string | null;
|
|
10
|
+
expiredAt?: Date | null;
|
|
8
11
|
}
|
|
9
12
|
export declare class PackageVersionBlock extends Entity {
|
|
10
13
|
packageVersionBlockId: string;
|
|
11
14
|
packageId: string;
|
|
12
15
|
version: string;
|
|
13
16
|
reason: string;
|
|
17
|
+
type: string | null;
|
|
18
|
+
expiredAt: Date | null;
|
|
14
19
|
constructor(data: PackageVersionBlockData);
|
|
20
|
+
get isBuffer(): boolean;
|
|
15
21
|
static create(data: EasyData<PackageVersionBlockData, 'packageVersionBlockId'>): PackageVersionBlock;
|
|
16
22
|
}
|
|
17
23
|
export {};
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PackageVersionBlock = void 0;
|
|
3
|
+
exports.PackageVersionBlock = exports.PACKAGE_VERSION_BLOCK_TYPE_BUFFER = void 0;
|
|
4
4
|
const Entity_1 = require("./Entity");
|
|
5
5
|
const EntityUtil_1 = require("../util/EntityUtil");
|
|
6
|
+
// dependency isolation buffer record (auto-releasable). null type = permanent block.
|
|
7
|
+
exports.PACKAGE_VERSION_BLOCK_TYPE_BUFFER = 'buffer';
|
|
6
8
|
class PackageVersionBlock extends Entity_1.Entity {
|
|
7
9
|
constructor(data) {
|
|
8
10
|
super(data);
|
|
@@ -10,6 +12,11 @@ class PackageVersionBlock extends Entity_1.Entity {
|
|
|
10
12
|
this.packageId = data.packageId;
|
|
11
13
|
this.version = data.version;
|
|
12
14
|
this.reason = data.reason;
|
|
15
|
+
this.type = data.type ?? null;
|
|
16
|
+
this.expiredAt = data.expiredAt ?? null;
|
|
17
|
+
}
|
|
18
|
+
get isBuffer() {
|
|
19
|
+
return this.type === exports.PACKAGE_VERSION_BLOCK_TYPE_BUFFER;
|
|
13
20
|
}
|
|
14
21
|
static create(data) {
|
|
15
22
|
const newData = EntityUtil_1.EntityUtil.defaultData(data, 'packageVersionBlockId');
|
|
@@ -17,4 +24,4 @@ class PackageVersionBlock extends Entity_1.Entity {
|
|
|
17
24
|
}
|
|
18
25
|
}
|
|
19
26
|
exports.PackageVersionBlock = PackageVersionBlock;
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25CbG9jay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL2VudGl0eS9QYWNrYWdlVmVyc2lvbkJsb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFDQUE4QztBQUM5QyxtREFBMEQ7QUFFMUQscUZBQXFGO0FBQ3hFLFFBQUEsaUNBQWlDLEdBQUcsUUFBUSxDQUFDO0FBVzFELE1BQWEsbUJBQW9CLFNBQVEsZUFBTTtJQVE3QyxZQUFZLElBQTZCO1FBQ3ZDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNaLElBQUksQ0FBQyxxQkFBcUIsR0FBRyxJQUFJLENBQUMscUJBQXFCLENBQUM7UUFDeEQsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUM1QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDMUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQztRQUM5QixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxDQUFDO0lBQzFDLENBQUM7SUFFRCxJQUFJLFFBQVE7UUFDVixPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUsseUNBQWlDLENBQUM7SUFDekQsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBZ0U7UUFDNUUsTUFBTSxPQUFPLEdBQUcsdUJBQVUsQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLHVCQUF1QixDQUFDLENBQUM7UUFDdEUsT0FBTyxJQUFJLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FDRjtBQTFCRCxrREEwQkMifQ==
|
|
@@ -35,12 +35,37 @@ export declare class PackageManagerService extends AbstractService {
|
|
|
35
35
|
private readonly packageVersionService;
|
|
36
36
|
private static downloadCounters;
|
|
37
37
|
publish(cmd: PublishPackageCmd, publisher: User): Promise<PackageVersion>;
|
|
38
|
+
private _shouldIsolateNewVersion;
|
|
39
|
+
private _isolateNewVersion;
|
|
40
|
+
private _isDependencyIsolationExcluded;
|
|
38
41
|
blockPackageByFullname(name: string, reason: string): Promise<PackageVersionBlock>;
|
|
39
42
|
blockPackage(pkg: Package, reason: string): Promise<PackageVersionBlock>;
|
|
40
43
|
unblockPackageByFullname(name: string): Promise<void>;
|
|
41
44
|
unblockPackage(pkg: Package): Promise<void>;
|
|
42
45
|
blockPackageVersion(pkg: Package, version: string, reason: string): Promise<PackageVersionBlock>;
|
|
43
46
|
unblockPackageVersion(pkg: Package, version: string): Promise<void>;
|
|
47
|
+
/**
|
|
48
|
+
* Idempotently set whether a package version is available (visible) to the outside, for
|
|
49
|
+
* external decision sources (e.g. a deployment's security scan).
|
|
50
|
+
* - available=false: permanently block; if the version is currently in the dependency-isolation
|
|
51
|
+
* buffer, the buffer record is overwritten to a permanent block (type=null, no auto-release).
|
|
52
|
+
* - available=true: only lifts a PERMANENT block. It deliberately does NOT release a buffer
|
|
53
|
+
* record — automated "make available" must not let a version escape the isolation window
|
|
54
|
+
* ahead of its timer. Buffer release is owned by the timer (releaseBufferedVersions); an
|
|
55
|
+
* admin can still force-release via unblockPackageVersion (the explicit escape channel).
|
|
56
|
+
*/
|
|
57
|
+
ensurePackageVersionAvailability(pkg: Package, version: string, available: boolean, reason?: string): Promise<{
|
|
58
|
+
changed: boolean;
|
|
59
|
+
}>;
|
|
60
|
+
/**
|
|
61
|
+
* Dependency isolation: release expired buffer versions of a single package in one batch.
|
|
62
|
+
* Only records still of type='buffer' are released (a record overwritten to a permanent
|
|
63
|
+
* block is left alone). The package manifest is rebuilt once for the whole batch (the
|
|
64
|
+
* rebuild is O(versions) regardless of how many are released), then PACKAGE_VERSION_ADDED
|
|
65
|
+
* is emitted per released version so search / changes stream / file sync pick them up.
|
|
66
|
+
* Idempotent: already-removed / no-longer-buffer versions are skipped.
|
|
67
|
+
*/
|
|
68
|
+
releaseBufferedVersions(packageId: string, versions: string[]): Promise<string[]>;
|
|
44
69
|
replacePackageMaintainersAndDist(pkg: Package, maintainers: User[]): Promise<void>;
|
|
45
70
|
savePackageMaintainers(pkg: Package, maintainers: User[]): Promise<void>;
|
|
46
71
|
removePackageMaintainer(pkg: Package, maintainer: User): Promise<void>;
|
|
@@ -207,20 +207,86 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
207
207
|
}
|
|
208
208
|
throw e;
|
|
209
209
|
}
|
|
210
|
+
// dependency isolation (buffer) zone: hold a newly synced version invisible for a while
|
|
211
|
+
// before it is auto-released. Decide first (pure), so PACKAGE_VERSION_ADDED is suppressed
|
|
212
|
+
// — the event (and thus search index / changes stream / file sync) fires only when the
|
|
213
|
+
// version is released. see RFC: https://github.com/cnpm/cnpmcore/issues/1057
|
|
214
|
+
const shouldIsolate = this._shouldIsolateNewVersion(pkg, cmd);
|
|
210
215
|
if (cmd.skipRefreshPackageManifests !== true) {
|
|
211
216
|
await this.refreshPackageChangeVersionsToDists(pkg, [pkgVersion.version]);
|
|
212
217
|
}
|
|
213
218
|
if (cmd.tags) {
|
|
214
219
|
for (const tag of cmd.tags) {
|
|
215
220
|
await this.savePackageTag(pkg, tag, cmd.version, true);
|
|
216
|
-
|
|
221
|
+
if (!shouldIsolate) {
|
|
222
|
+
this.eventBus.emit(event_1.PACKAGE_VERSION_ADDED, pkg.fullname, pkgVersion.version, tag);
|
|
223
|
+
}
|
|
217
224
|
}
|
|
218
225
|
}
|
|
219
|
-
else {
|
|
226
|
+
else if (!shouldIsolate) {
|
|
220
227
|
this.eventBus.emit(event_1.PACKAGE_VERSION_ADDED, pkg.fullname, pkgVersion.version, undefined);
|
|
221
228
|
}
|
|
229
|
+
// isolate AFTER the normal publish flow has built manifestsDist + tags (identical to a
|
|
230
|
+
// non-isolated publish up to here), then hide the version. Doing it here — rather than
|
|
231
|
+
// before the refresh — avoids the new-package case where the only version is isolated and
|
|
232
|
+
// manifestsDist is never created (which crashes savePackageTag).
|
|
233
|
+
if (shouldIsolate) {
|
|
234
|
+
await this._isolateNewVersion(pkg, cmd, pkgVersion.version);
|
|
235
|
+
}
|
|
222
236
|
return pkgVersion;
|
|
223
237
|
}
|
|
238
|
+
// Decide whether a newly published/synced version should enter the dependency isolation buffer.
|
|
239
|
+
_shouldIsolateNewVersion(pkg, cmd) {
|
|
240
|
+
const config = this.config.cnpmcore;
|
|
241
|
+
if (!config.enableDependencyIsolation)
|
|
242
|
+
return false;
|
|
243
|
+
// buffer enforcement reuses version-level block; without it the version can't be hidden
|
|
244
|
+
if (!config.enableBlockPackageVersion)
|
|
245
|
+
return false;
|
|
246
|
+
const duration = config.dependencyIsolationDuration;
|
|
247
|
+
if (!duration || duration <= 0)
|
|
248
|
+
return false;
|
|
249
|
+
// only isolate external/synced (public) versions, never user-published private packages
|
|
250
|
+
if (cmd.isPrivate)
|
|
251
|
+
return false;
|
|
252
|
+
// allowlist: trusted packages skip the buffer (analogous to pnpm minimumReleaseAgeExclude)
|
|
253
|
+
if (this._isDependencyIsolationExcluded(pkg.fullname))
|
|
254
|
+
return false;
|
|
255
|
+
return true;
|
|
256
|
+
}
|
|
257
|
+
// Persist a buffer block record (type='buffer', expiredAt) and hide the version from the manifest.
|
|
258
|
+
async _isolateNewVersion(pkg, cmd, version) {
|
|
259
|
+
const duration = this.config.cnpmcore.dependencyIsolationDuration;
|
|
260
|
+
const expiredAt = new Date(Date.now() + duration);
|
|
261
|
+
const block = PackageVersionBlock_1.PackageVersionBlock.create({
|
|
262
|
+
packageId: pkg.packageId,
|
|
263
|
+
version,
|
|
264
|
+
reason: `[buffer] in dependency isolation zone, release at ${expiredAt.toISOString()}`,
|
|
265
|
+
type: PackageVersionBlock_1.PACKAGE_VERSION_BLOCK_TYPE_BUFFER,
|
|
266
|
+
expiredAt,
|
|
267
|
+
});
|
|
268
|
+
await this.packageVersionBlockRepository.savePackageVersionBlock(block);
|
|
269
|
+
// hide it now for the user-publish path (manifestsDist already built above). the sync path
|
|
270
|
+
// (skipRefreshPackageManifests) leaves it to the batch refresh, which is block-aware.
|
|
271
|
+
if (cmd.skipRefreshPackageManifests !== true) {
|
|
272
|
+
await this._refreshPackageManifestsToDists(pkg);
|
|
273
|
+
}
|
|
274
|
+
this.logger.info('[packageManagerService.isolateNewVersion] packageId: %s, version: %s, release at: %s', pkg.packageId, version, expiredAt.toISOString());
|
|
275
|
+
}
|
|
276
|
+
// Match `dependencyIsolationExclude` rules: exact name (`lodash`, `@scope/pkg`) or scope wildcard (`@scope/*`)
|
|
277
|
+
_isDependencyIsolationExcluded(fullname) {
|
|
278
|
+
const list = this.config.cnpmcore.dependencyIsolationExclude;
|
|
279
|
+
if (!list || list.length === 0)
|
|
280
|
+
return false;
|
|
281
|
+
const [scope] = (0, PackageUtil_1.getScopeAndName)(fullname);
|
|
282
|
+
return list.some(rule => {
|
|
283
|
+
if (rule === fullname)
|
|
284
|
+
return true;
|
|
285
|
+
if (rule.endsWith('/*'))
|
|
286
|
+
return scope !== '' && scope === rule.slice(0, -2);
|
|
287
|
+
return false;
|
|
288
|
+
});
|
|
289
|
+
}
|
|
224
290
|
async blockPackageByFullname(name, reason) {
|
|
225
291
|
const [scope, pkgName] = (0, PackageUtil_1.getScopeAndName)(name);
|
|
226
292
|
const pkg = await this.packageRepository.findPackage(scope, pkgName);
|
|
@@ -302,6 +368,9 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
302
368
|
let block = await this.packageVersionBlockRepository.findPackageVersionBlockExact(pkg.packageId, version);
|
|
303
369
|
if (block) {
|
|
304
370
|
block.reason = reason;
|
|
371
|
+
// a permanent block always overrides a dependency-isolation buffer record
|
|
372
|
+
block.type = null;
|
|
373
|
+
block.expiredAt = null;
|
|
305
374
|
}
|
|
306
375
|
else {
|
|
307
376
|
block = PackageVersionBlock_1.PackageVersionBlock.create({
|
|
@@ -329,8 +398,103 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
329
398
|
// Refresh manifests to update dist files (will restore unblocked version and update dist-tags)
|
|
330
399
|
await this._refreshPackageManifestsToDists(pkg);
|
|
331
400
|
this.eventBus.emit(event_1.PACKAGE_UNBLOCKED, pkg.fullname);
|
|
401
|
+
if (block) {
|
|
402
|
+
// the version becomes visible again -> emit PACKAGE_VERSION_ADDED so consumers that only
|
|
403
|
+
// listen to it (changes stream / store-manifest / unpkg file sync) pick it up. Needed
|
|
404
|
+
// because an isolated version's PACKAGE_VERSION_ADDED was suppressed at publish; if it was
|
|
405
|
+
// permanently blocked and is now unblocked, this is the first time the event fires for it.
|
|
406
|
+
this.eventBus.emit(event_1.PACKAGE_VERSION_ADDED, pkg.fullname, version, undefined);
|
|
407
|
+
}
|
|
332
408
|
this.logger.info('[packageManagerService.unblockPackageVersion:success] packageId: %s, version: %s', pkg.packageId, version);
|
|
333
409
|
}
|
|
410
|
+
/**
|
|
411
|
+
* Idempotently set whether a package version is available (visible) to the outside, for
|
|
412
|
+
* external decision sources (e.g. a deployment's security scan).
|
|
413
|
+
* - available=false: permanently block; if the version is currently in the dependency-isolation
|
|
414
|
+
* buffer, the buffer record is overwritten to a permanent block (type=null, no auto-release).
|
|
415
|
+
* - available=true: only lifts a PERMANENT block. It deliberately does NOT release a buffer
|
|
416
|
+
* record — automated "make available" must not let a version escape the isolation window
|
|
417
|
+
* ahead of its timer. Buffer release is owned by the timer (releaseBufferedVersions); an
|
|
418
|
+
* admin can still force-release via unblockPackageVersion (the explicit escape channel).
|
|
419
|
+
*/
|
|
420
|
+
async ensurePackageVersionAvailability(pkg, version, available, reason) {
|
|
421
|
+
const existing = await this.packageVersionBlockRepository.findPackageVersionBlockExact(pkg.packageId, version);
|
|
422
|
+
if (available) {
|
|
423
|
+
if (!existing)
|
|
424
|
+
return { changed: false };
|
|
425
|
+
// never spring a buffered version out of isolation here (no automated escape)
|
|
426
|
+
if (existing.isBuffer)
|
|
427
|
+
return { changed: false };
|
|
428
|
+
await this.unblockPackageVersion(pkg, version);
|
|
429
|
+
return { changed: true };
|
|
430
|
+
}
|
|
431
|
+
// make unavailable (permanent block)
|
|
432
|
+
if (existing && !existing.isBuffer && existing.reason === (reason ?? '')) {
|
|
433
|
+
return { changed: false };
|
|
434
|
+
}
|
|
435
|
+
await this.blockPackageVersion(pkg, version, reason ?? '');
|
|
436
|
+
return { changed: true };
|
|
437
|
+
}
|
|
438
|
+
/**
|
|
439
|
+
* Dependency isolation: release expired buffer versions of a single package in one batch.
|
|
440
|
+
* Only records still of type='buffer' are released (a record overwritten to a permanent
|
|
441
|
+
* block is left alone). The package manifest is rebuilt once for the whole batch (the
|
|
442
|
+
* rebuild is O(versions) regardless of how many are released), then PACKAGE_VERSION_ADDED
|
|
443
|
+
* is emitted per released version so search / changes stream / file sync pick them up.
|
|
444
|
+
* Idempotent: already-removed / no-longer-buffer versions are skipped.
|
|
445
|
+
*/
|
|
446
|
+
async releaseBufferedVersions(packageId, versions) {
|
|
447
|
+
const pkg = await this.packageRepository.findPackageByPackageId(packageId);
|
|
448
|
+
if (!pkg)
|
|
449
|
+
return [];
|
|
450
|
+
const released = [];
|
|
451
|
+
for (const version of versions) {
|
|
452
|
+
const block = await this.packageVersionBlockRepository.findPackageVersionBlockExact(packageId, version);
|
|
453
|
+
if (!block || !block.isBuffer)
|
|
454
|
+
continue;
|
|
455
|
+
// atomically remove only while it is still a buffer row: a concurrent permanent block
|
|
456
|
+
// (ensurePackageVersionAvailability(false) / blockPackageVersion sets type=null) must win
|
|
457
|
+
// this race and keep the version hidden.
|
|
458
|
+
const removed = await this.packageVersionBlockRepository.removeBufferBlock(block.packageVersionBlockId);
|
|
459
|
+
if (!removed)
|
|
460
|
+
continue;
|
|
461
|
+
// only emit a publish event for a version that still exists; an orphan buffer row left by
|
|
462
|
+
// an unpublished version is cleaned up above without a phantom PACKAGE_VERSION_ADDED.
|
|
463
|
+
const pkgVersion = await this.packageRepository.findPackageVersion(packageId, version);
|
|
464
|
+
if (pkgVersion) {
|
|
465
|
+
released.push({ version, reason: block.reason, expiredAt: block.expiredAt });
|
|
466
|
+
}
|
|
467
|
+
}
|
|
468
|
+
if (released.length === 0)
|
|
469
|
+
return [];
|
|
470
|
+
try {
|
|
471
|
+
// rebuild the package manifest once for the whole batch (restores released versions + dist-tags)
|
|
472
|
+
await this._refreshPackageManifestsToDists(pkg);
|
|
473
|
+
}
|
|
474
|
+
catch (err) {
|
|
475
|
+
// the manifest rebuild (NFS write) is the only non-transactional step. if it fails after the
|
|
476
|
+
// buffer rows were removed, re-create them so the dispatcher re-enqueues and retries — keeping
|
|
477
|
+
// DB rows as the release source-of-truth instead of leaving the version permanently stale.
|
|
478
|
+
for (const r of released) {
|
|
479
|
+
await this.packageVersionBlockRepository.savePackageVersionBlock(PackageVersionBlock_1.PackageVersionBlock.create({
|
|
480
|
+
packageId,
|
|
481
|
+
version: r.version,
|
|
482
|
+
reason: r.reason,
|
|
483
|
+
type: PackageVersionBlock_1.PACKAGE_VERSION_BLOCK_TYPE_BUFFER,
|
|
484
|
+
expiredAt: r.expiredAt ?? new Date(0),
|
|
485
|
+
}));
|
|
486
|
+
}
|
|
487
|
+
throw err;
|
|
488
|
+
}
|
|
489
|
+
// emit only after a successful refresh, so a failed rebuild never produces phantom events
|
|
490
|
+
this.eventBus.emit(event_1.PACKAGE_UNBLOCKED, pkg.fullname);
|
|
491
|
+
for (const r of released) {
|
|
492
|
+
this.eventBus.emit(event_1.PACKAGE_VERSION_ADDED, pkg.fullname, r.version, undefined);
|
|
493
|
+
}
|
|
494
|
+
const releasedVersions = released.map(r => r.version);
|
|
495
|
+
this.logger.info('[packageManagerService.releaseBufferedVersions:success] packageId: %s, released: %j', packageId, releasedVersions);
|
|
496
|
+
return releasedVersions;
|
|
497
|
+
}
|
|
334
498
|
async replacePackageMaintainersAndDist(pkg, maintainers) {
|
|
335
499
|
await this.packageRepository.replacePackageMaintainers(pkg.packageId, maintainers.map(m => m.userId));
|
|
336
500
|
await this.refreshPackageMaintainersToDists(pkg);
|
|
@@ -610,7 +774,26 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
610
774
|
return await this._refreshPackageManifestsToDists(pkg);
|
|
611
775
|
}
|
|
612
776
|
if (updateVersions) {
|
|
777
|
+
// blocked versions (incl. dependency-isolation buffer) must stay out of the manifest.
|
|
778
|
+
// this incremental path adds versions directly, so it must filter the same way the
|
|
779
|
+
// full rebuild (_listPackageFullManifests) does — otherwise an isolated/blocked version
|
|
780
|
+
// would leak into the dist on publish/sync refresh.
|
|
781
|
+
let blockedVersionSet;
|
|
782
|
+
if (this.config.cnpmcore.enableBlockPackageVersion) {
|
|
783
|
+
const blockedVersions = await this.packageVersionBlockRepository.listBlockedVersions(pkg.packageId);
|
|
784
|
+
if (blockedVersions.length > 0) {
|
|
785
|
+
blockedVersionSet = new Set(blockedVersions.map(v => v.version));
|
|
786
|
+
}
|
|
787
|
+
}
|
|
613
788
|
for (const version of updateVersions) {
|
|
789
|
+
if (blockedVersionSet?.has(version)) {
|
|
790
|
+
// keep hidden; also drop it if a previous dist happened to contain it (e.g. re-sync of a blocked version)
|
|
791
|
+
delete fullManifests.versions[version];
|
|
792
|
+
if (fullManifests.time)
|
|
793
|
+
delete fullManifests.time[version];
|
|
794
|
+
delete abbreviatedManifests.versions[version];
|
|
795
|
+
continue;
|
|
796
|
+
}
|
|
614
797
|
const packageVersion = await this.packageRepository.findPackageVersion(pkg.packageId, version);
|
|
615
798
|
if (packageVersion) {
|
|
616
799
|
const manifest = await this.distRepository.readDistBytesToJSON(packageVersion.manifestDist);
|
|
@@ -1037,4 +1220,4 @@ exports.PackageManagerService = PackageManagerService = PackageManagerService_1
|
|
|
1037
1220
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
1038
1221
|
})
|
|
1039
1222
|
], PackageManagerService);
|
|
1040
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageManagerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageManagerService.ts"],"names":[],"mappings":"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"}
|
|
1223
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageManagerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageManagerService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAkD;AAClD,6CAA+C;AAC/C,sCAKqB;AACrB,2CAA4E;AAE5E,sEAAkC;AAClC,oDAA4B;AAC5B,kDAAyB;AACzB,0DAOkC;AAClC,kEAA+D;AAC/D,0EAAyK;AACzK,kGAA+F;AAC/F,wGAAqG;AACrG,oEAAiE;AACjE,+DAAsE;AACtE,+CAA4C;AAC5C,6DAA0D;AAC1D,uEAAuG;AACvG,qDAAkD;AAGlD,oCAYkB;AAClB,2DAAwD;AAExD,qEAAkE;AAElE,mEAAgE;AA2BhE,MAAM,KAAK,GAAG,WAAW,CAAC;AAC1B,MAAM,kBAAkB,GAAG,YAAY,CAAC;AACxC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;AAK7B,IAAM,qBAAqB,6BAA3B,MAAM,qBAAsB,SAAQ,iCAAe;IAoBxD,8EAA8E;IAC9E,KAAK,CAAC,OAAO,CAAC,GAAsB,EAAE,SAAe;QACnD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,EAAE;YAClD,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;SACtD;QACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,EAAE;YACR,GAAG,GAAG,iBAAO,CAAC,MAAM,CAAC;gBACnB,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE;gBAClC,UAAU,EAAE,GAAG,CAAC,UAAU;aAC3B,CAAC,CAAC;SACJ;aAAM;YACL,qBAAqB;YACrB,wFAAwF;YACxF,IAAI,GAAG,CAAC,WAAW,KAAK,GAAG,CAAC,WAAW,EAAE;gBACvC,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;aACzC;YAED,sBAAsB;YACtB,gDAAgD;YAChD,IAAI,GAAG,CAAC,UAAU,EAAE;gBAClB,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;aACjC;SACF;QAED,4BAA4B;QAC5B,IAAI,GAAG,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,EAAE;YAC/C,GAAG,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;SACnE;QACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC9C,oBAAoB;QACpB,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAEpF,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7F,IAAI,UAAU,EAAE;YACd,MAAM,IAAI,2BAAc,CAAC,sCAAsC,GAAG,CAAC,QAAQ,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;SACtG;QAED,8CAA8C;QAC9C,IAAI,QAAQ,IAAI,GAAG,CAAC,WAAW,EAAE;YAC/B,OAAO,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;SAC/B;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,IAAI,IAAI,EAAE,CAAC;QAElD,sDAAsD;QACtD,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,sBAAsB,EAAE;YAC3C,GAAG,CAAC,WAAW,CAAC,sBAAsB,GAAG,WAAW,CAAC;SACtD;QACD,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,EAAE;YACjC,GAAG,CAAC,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;SACtD;QACD,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,KAAK,SAAS,EAAE;YAChD,GAAG,CAAC,WAAW,CAAC,cAAc,GAAG,MAAM,IAAA,gCAAkB,EAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,SAAU,CAAC,CAAC;SACpG;QAED,wCAAwC;QACxC,GAAG,CAAC,WAAW,CAAC,QAAQ,GAAG;YACzB,0BAA0B;YAC1B,IAAI,EAAE,SAAS,CAAC,WAAW;YAC3B,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC;QAEF,8CAA8C;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,QAAQ,EAAE;YACZ,GAAG,CAAC,WAAW,CAAC,qBAAqB,GAAG,QAAQ,CAAC,IAAI,CAAC;SACvD;QAED,4GAA4G;QAC5G,MAAM,gBAAgB,GAAG,IAAA,iCAAmB,EAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACjF,IAAI,gBAAqB,CAAC;QAC1B,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE;YACpB,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;YACtC,gBAAgB,GAAG,MAAM,IAAA,gCAAkB,EAAC,YAAY,CAAC,CAAC;YAC1D,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC;SACnC;aAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE;YAC7B,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,eAAI,EAAC,SAAS,CAAC,CAAC;YACvC,gBAAgB,GAAG,MAAM,IAAA,gCAAkB,EAAC,SAAS,CAAC,CAAC;YACvD,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC;SAC7B;QACD,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE;YACzC,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,SAAS,EAAE,gBAAgB,CAAC,SAAS;SACtC,CAAC,CAAC;QACH,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE;YACpB,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/D;aAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE;YAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjE;QAED,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG;YACrB,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI;YACvB,OAAO,EAAE,IAAA,2BAAa,EAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC;YACvF,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,SAAS,EAAE,gBAAgB,CAAC,SAAS;SACtC,CAAC;QAEF,0GAA0G;QAC1G,6BAA6B;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;YACjC,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI;YAC1B,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO;YAChC,UAAU,EAAE,GAAG,CAAC,WAAW,CAAC,UAAU;YACtC,YAAY,EAAE,GAAG,CAAC,WAAW,CAAC,YAAY;YAC1C,kBAAkB,EAAE,GAAG,CAAC,WAAW,CAAC,kBAAkB;YACtD,oBAAoB,EAAE,GAAG,CAAC,WAAW,CAAC,oBAAoB;YAC1D,eAAe,EAAE,GAAG,CAAC,WAAW,CAAC,eAAe;YAChD,kBAAkB,EAAE,GAAG,CAAC,WAAW,CAAC,kBAAkB;YACtD,gBAAgB,EAAE,GAAG,CAAC,WAAW,CAAC,gBAAgB;YAClD,oBAAoB,EAAE,GAAG,CAAC,WAAW,CAAC,oBAAoB;YAC1D,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG;YACxB,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,WAAW;YACxC,EAAE,EAAE,GAAG,CAAC,WAAW,CAAC,EAAE;YACtB,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG;YACxB,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI;YAC1B,UAAU,EAAE,GAAG,CAAC,WAAW,CAAC,UAAU;YACtC,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI;YAC1B,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO;YAChC,cAAc,EAAE,GAAG,CAAC,WAAW,CAAC,cAAc;YAC9C,gBAAgB;YAChB,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO;YAChC,+GAA+G;YAC/G,uEAAuE;YACvE,YAAY,EAAE,GAAG,CAAC,WAAW,CAAC,YAAY;YAC1C,qBAAqB,EAAE,GAAG,CAAC,WAAW,CAAC,qBAAqB;SAC/B,CAAC,CAAC;QACjC,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,wBAAwB,GAAG,MAAM,IAAA,gCAAkB,EAAC,oBAAoB,CAAC,CAAC;QAChF,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,mBAAmB,GAAG,MAAM,IAAA,gCAAkB,EAAC,eAAe,CAAC,CAAC;QACtE,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;QACvE,MAAM,qBAAqB,GAAG,MAAM,IAAA,gCAAkB,EAAC,iBAAiB,CAAC,CAAC;QAE1E,UAAU,GAAG,+BAAc,CAAC,MAAM,CAAC;YACjC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,WAAW;YACX,YAAY,EAAE,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE;gBAC5C,IAAI,EAAE,iBAAiB,CAAC,MAAM;gBAC9B,MAAM,EAAE,qBAAqB,CAAC,MAAM;gBACpC,SAAS,EAAE,qBAAqB,CAAC,SAAS;aAC3C,CAAC;YACF,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE;gBACxC,IAAI,EAAE,eAAe,CAAC,MAAM;gBAC5B,MAAM,EAAE,mBAAmB,CAAC,MAAM;gBAClC,SAAS,EAAE,mBAAmB,CAAC,SAAS;aACzC,CAAC;YACF,eAAe,EAAE,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE;gBAClD,IAAI,EAAE,oBAAoB,CAAC,MAAM;gBACjC,MAAM,EAAE,wBAAwB,CAAC,MAAM;gBACvC,SAAS,EAAE,wBAAwB,CAAC,SAAS;aAC9C,CAAC;YACF,OAAO;SACR,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,oBAAoB,CAAC;YAC9E,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE,iBAAiB,CAAC;YACxE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,eAAe,CAAC;SACrE,CAAC,CAAC;QACH,IAAI;YACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;SAC/D;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,IAAA,+BAAmB,EAAC,CAAC,CAAC,EAAE;gBAC1B,MAAM,IAAI,2BAAc,CAAC,sCAAsC,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;aAC/F;YACD,MAAM,CAAC,CAAC;SACT;QACD,wFAAwF;QACxF,0FAA0F;QAC1F,uFAAuF;QACvF,6EAA6E;QAC7E,MAAM,aAAa,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAE9D,IAAI,GAAG,CAAC,2BAA2B,KAAK,IAAI,EAAE;YAC5C,MAAM,IAAI,CAAC,mCAAmC,CAAC,GAAG,EAAE,CAAE,UAAU,CAAC,OAAO,CAAE,CAAC,CAAC;SAC7E;QACD,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE;gBAC1B,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACvD,IAAI,CAAC,aAAa,EAAE;oBAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,6BAAqB,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAClF;aACF;SACF;aAAM,IAAI,CAAC,aAAa,EAAE;YACzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,6BAAqB,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;SACxF;QAED,uFAAuF;QACvF,uFAAuF;QACvF,0FAA0F;QAC1F,iEAAiE;QACjE,IAAI,aAAa,EAAE;YACjB,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;SAC7D;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,gGAAgG;IACxF,wBAAwB,CAAC,GAAY,EAAE,GAAsB;QACnE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,yBAAyB;YAAE,OAAO,KAAK,CAAC;QACpD,wFAAwF;QACxF,IAAI,CAAC,MAAM,CAAC,yBAAyB;YAAE,OAAO,KAAK,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,2BAA2B,CAAC;QACpD,IAAI,CAAC,QAAQ,IAAI,QAAQ,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7C,wFAAwF;QACxF,IAAI,GAAG,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAChC,2FAA2F;QAC3F,IAAI,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,OAAO,KAAK,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,mGAAmG;IAC3F,KAAK,CAAC,kBAAkB,CAAC,GAAY,EAAE,GAAsB,EAAE,OAAe;QACpF,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAAqC,CAAC;QAC5E,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,yCAAmB,CAAC,MAAM,CAAC;YACvC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,OAAO;YACP,MAAM,EAAE,qDAAqD,SAAS,CAAC,WAAW,EAAE,EAAE;YACtF,IAAI,EAAE,uDAAiC;YACvC,SAAS;SACV,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACxE,2FAA2F;QAC3F,sFAAsF;QACtF,IAAI,GAAG,CAAC,2BAA2B,KAAK,IAAI,EAAE;YAC5C,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;SACjD;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sFAAsF,EACrG,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,+GAA+G;IACvG,8BAA8B,CAAC,QAAgB;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAAC;QAC7D,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7C,MAAM,CAAE,KAAK,CAAE,GAAG,IAAA,6BAAe,EAAC,QAAQ,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACtB,IAAI,IAAI,KAAK,QAAQ;gBAAE,OAAO,IAAI,CAAC;YACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,OAAO,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC5E,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAAY,EAAE,MAAc;QACvD,MAAM,CAAE,KAAK,EAAE,OAAO,CAAE,GAAG,IAAA,6BAAe,EAAC,IAAI,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,IAAI,0BAAa,CAAC,gBAAgB,IAAI,aAAa,CAAC,CAAC;SAC5D;QACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAY,EAAE,MAAc;QAC7C,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrF,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;SACvB;aAAM;YACL,KAAK,GAAG,yCAAmB,CAAC,MAAM,CAAC;gBACjC,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,OAAO,EAAE,GAAG;gBACZ,MAAM;aACP,CAAC,CAAC;SACJ;QACD,MAAM,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACxE,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,gBAAgB,EAAE;YAC7C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAsB,GAAG,CAAC,aAAa,CAAC,CAAC;YAC5G,IAAI,aAAa,EAAE;gBACjB,aAAa,CAAC,KAAK,GAAG,MAAM,CAAC;aAC9B;YACD,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAiC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACjI,IAAI,oBAAoB,EAAE;gBACxB,oBAAoB,CAAC,KAAK,GAAG,MAAM,CAAC;aACrC;YACD,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,aAAa,IAAI,IAAI,EAAE,oBAAoB,IAAI,IAAI,CAAC,CAAC;YACpG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,uBAAe,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wEAAwE,EACvF,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,IAAY;QACzC,MAAM,CAAE,KAAK,EAAE,OAAO,CAAE,GAAG,IAAA,6BAAe,EAAC,IAAI,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,IAAI,0BAAa,CAAC,gBAAgB,IAAI,aAAa,CAAC,CAAC;SAC5D;QACD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAY;QAC/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACnG,IAAI,KAAK,EAAE;YACT,MAAM,IAAI,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;SACjG;QACD,IAAI,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,gBAAgB,EAAE;YAC7C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAsB,GAAG,CAAC,aAAa,CAAC,CAAC;YAC5G,IAAI,aAAa,EAAE;gBACjB,aAAa,CAAC,KAAK,GAAG,SAAS,CAAC;aACjC;YACD,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAiC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACjI,IAAI,oBAAoB,EAAE;gBACxB,oBAAoB,CAAC,KAAK,GAAG,SAAS,CAAC;aACxC;YACD,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,aAAa,IAAI,IAAI,EAAE,oBAAoB,IAAI,IAAI,CAAC,CAAC;YACpG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,yBAAiB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,EAC7E,GAAG,CAAC,SAAS,CAAC,CAAC;SAClB;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,GAAY,EAAE,OAAe,EAAE,MAAc;QACrE,2BAA2B;QAC3B,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE;YAC/C,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC,QAAQ,uBAAuB,CAAC,CAAC;SAClE;QAED,sCAAsC;QACtC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9F,IAAI,YAAY,EAAE;YAChB,MAAM,IAAI,2BAAc,CAAC,YAAY,GAAG,CAAC,QAAQ,yEAAyE,CAAC,CAAC;SAC7H;QAED,0BAA0B;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC3F,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,0BAAa,CAAC,WAAW,OAAO,0BAA0B,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SACrF;QAED,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,4BAA4B,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC1G,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACtB,0EAA0E;YAC1E,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;YAClB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;SACxB;aAAM;YACL,KAAK,GAAG,yCAAmB,CAAC,MAAM,CAAC;gBACjC,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,OAAO;gBACP,MAAM;aACP,CAAC,CAAC;SACJ;QACD,MAAM,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAExE,6FAA6F;QAC7F,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,uBAAe,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4FAA4F,EAC3G,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAElC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,GAAY,EAAE,OAAe;QACvD,2BAA2B;QAC3B,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE;YAC/C,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC,QAAQ,uBAAuB,CAAC,CAAC;SAClE;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,4BAA4B,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5G,IAAI,KAAK,EAAE;YACT,MAAM,IAAI,CAAC,6BAA6B,CAAC,yBAAyB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;SACjG;QAED,+FAA+F;QAC/F,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,yBAAiB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,KAAK,EAAE;YACT,yFAAyF;YACzF,sFAAsF;YACtF,2FAA2F;YAC3F,2FAA2F;YAC3F,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,6BAAqB,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;SAC7E;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kFAAkF,EACjG,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,gCAAgC,CAAC,GAAY,EAAE,OAAe,EAAE,SAAkB,EAAE,MAAe;QACvG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,4BAA4B,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/G,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,QAAQ;gBAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;YACzC,8EAA8E;YAC9E,IAAI,QAAQ,CAAC,QAAQ;gBAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;YACjD,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;QACD,qCAAqC;QACrC,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE;YACxE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC3B;QACD,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;QAC3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,uBAAuB,CAAC,SAAiB,EAAE,QAAkB;QACjE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC3E,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAkE,EAAE,CAAC;QACnF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,4BAA4B,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACxG,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAAE,SAAS;YACxC,sFAAsF;YACtF,0FAA0F;YAC1F,yCAAyC;YACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,iBAAiB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACxG,IAAI,CAAC,OAAO;gBAAE,SAAS;YACvB,0FAA0F;YAC1F,sFAAsF;YACtF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACvF,IAAI,UAAU,EAAE;gBACd,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;aAC9E;SACF;QACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACrC,IAAI;YACF,iGAAiG;YACjG,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;SACjD;QAAC,OAAO,GAAG,EAAE;YACZ,6FAA6F;YAC7F,+FAA+F;YAC/F,2FAA2F;YAC3F,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE;gBACxB,MAAM,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,CAAC,yCAAmB,CAAC,MAAM,CAAC;oBAC1F,SAAS;oBACT,OAAO,EAAE,CAAC,CAAC,OAAO;oBAClB,MAAM,EAAE,CAAC,CAAC,MAAM;oBAChB,IAAI,EAAE,uDAAiC;oBACvC,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC;iBACtC,CAAC,CAAC,CAAC;aACL;YACD,MAAM,GAAG,CAAC;SACX;QACD,0FAA0F;QAC1F,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,yBAAiB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE;YACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,6BAAqB,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;SAC/E;QACD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qFAAqF,EACpG,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAC/B,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAGD,KAAK,CAAC,gCAAgC,CAAC,GAAY,EAAE,WAAmB;QACtE,MAAM,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACtG,MAAM,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,kCAA0B,EAAE,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,GAAY,EAAE,WAAmB;QAC5D,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;YACvG,IAAI,SAAS,EAAE;gBACb,YAAY,GAAG,IAAI,CAAC;aACrB;SACF;QACD,IAAI,YAAY,EAAE;YAChB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,kCAA0B,EAAE,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;SAC3E;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,GAAY,EAAE,UAAgB;QAC1D,MAAM,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QACvF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,kCAA0B,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,gCAAgC,CAAC,GAAY;QACjD,MAAM,IAAI,CAAC,+CAA+C,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,GAAY;QAC9C,MAAM,IAAI,CAAC,+CAA+C,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,KAAa,EAAE,IAAY,EAAE,MAAM,GAAG,KAAK;QACxE,OAAO,MAAM,IAAI,CAAC,sCAAsC,CAAsB,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3G,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,KAAa,EAAE,IAAY,EAAE,MAAM,GAAG,KAAK;QAC/E,OAAO,MAAM,IAAI,CAAC,sCAAsC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,gCAAgC,CAAC,KAAa,EAAE,IAAY,EAAE,IAAY;QAK9E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvF,IAAI,KAAK,EAAE;YACT,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;SAC3C;QACD,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAA,yBAAG,EAAC,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,EAAE,CAAC;SACX;QACD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/F,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,KAAa,EAAE,IAAY,EAAE,IAAY,EAAE,MAAM,GAAG,KAAK,EAAE,eAAe,GAAG,KAAK;QACjH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QAEpB,kCAAkC;QAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvF,IAAI,KAAK,EAAE;YACT,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;SAC3C;QAED,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAA,yBAAG,EAAC,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;QAEhH,sEAAsE;QACtE,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,IAAI,QAAQ,EAAE,OAAO,EAAE;YACvE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,4BAA4B,CACxF,GAAG,CAAC,SAAS,EACb,QAAQ,CAAC,OAAO,CACjB,CAAC;YACF,IAAI,YAAY,EAAE;gBAChB,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;aAClD;SACF;QAED,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,cAA8B;QAC5D,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACxE,CAAC;IAEM,yBAAyB,CAAC,QAAgB,EAAE,OAAe;QAChE,0DAA0D;QAC1D,MAAM,QAAQ,GAA2C,uBAAqB,CAAC,gBAAgB,CAAC;QAChG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjD,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACrE,QAAQ;QACR,MAAM,GAAG,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC3C,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACvD,cAAc;QACd,MAAM,KAAK,GAAG,IAAA,6BAAe,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,KAAK,EAAE;YACT,MAAM,QAAQ,GAAG,GAAG,kBAAkB,GAAG,KAAK,EAAE,CAAC;YACjD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACjD,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC9D;IACH,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,0BAA0B;QAC9B,wCAAwC;QACxC,MAAM,QAAQ,GAA2C,uBAAqB,CAAC,gBAAgB,CAAC;QAChG,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEnC,uBAAqB,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wEAAwE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAE7G,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE;YAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,SAAS,GAAkB,IAAI,CAAC;YACpC,IAAI,QAAQ,KAAK,KAAK,EAAE;gBACtB,SAAS,GAAG,OAAO,CAAC;aACrB;iBAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;gBAClD,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;aACtD;iBAAM;gBACL,+BAA+B;gBAC/B,MAAM,CAAE,KAAK,EAAE,IAAI,CAAE,GAAG,IAAA,6BAAe,EAAC,QAAQ,CAAC,CAAC;gBAClD,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;aACrE;YACD,IAAI,CAAC,SAAS;gBAAE,SAAS;YAEzB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAClC,MAAM,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC9E,KAAK,IAAI,OAAO,CAAC;aAClB;SACF;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,EAAE,KAAK,CAAC,CAAC;IAC/F,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,GAAY,EAAE,cAAyD;QACzG,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,KAAK,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,cAAc,EAAE;YACpD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC3F,IAAI,CAAC,UAAU;gBAAE,SAAS;YAC1B,MAAM,OAAO,GAAG,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;YAC3D,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;YAChF,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,eAAe,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;YACnF,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAC5D,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC9B;QACD,MAAM,IAAI,CAAC,mCAAmC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,4BAAoB,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAC;IAC1F,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAC,UAA0B,EAAE,aAAqB,EAAE,gBAAwB;QACjH,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACtE,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAC9E,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,wBAAwB,CAAC,UAA0B,EAAE,UAAkB;QAClF,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gGAAgG,EAC/G,UAAU,CAAC,gBAAgB,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC3E,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,GAAY,EAAE,UAAkB;QAC7D,IAAI,CAAC,GAAG,CAAC,aAAa;YAAE,OAAO;QAC/B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAsB,GAAG,CAAC,aAAa,CAAC,CAAC;QAC5G,IAAI,CAAC,aAAa;YAAE,OAAO;QAC3B,aAAa,CAAC,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8EAA8E,EAC7F,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,UAA0B;QACnE,mBAAmB;QACnB,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;YAC3D,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC;YACxD,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC;YACtD,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC;SACpD,CAAC,CAAC;QACH,yBAAyB;QACzB,MAAM,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAChE,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,GAAY;QACxC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACpF,sBAAsB;QACtB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,GAAG,CAAC,SAAS,sBAAsB,CAAC,CAAC;YACvG,OAAO;SACR;QACD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;SACrD;QACD,qEAAqE;QACrE,MAAM,eAAe,GAAG;YACtB,GAAG,EAAE,GAAG,CAAC,QAAQ;YACjB,IAAI,EAAE,GAAG,CAAC,QAAQ;YAClB,IAAI,EAAE;gBACJ,OAAO,EAAE,GAAG,CAAC,SAAS;gBACtB,QAAQ,EAAE,GAAG,CAAC,SAAS;gBACvB,WAAW,EAAE,IAAI,IAAI,EAAE;aACxB;YACD,sDAAsD;YACtD,0HAA0H;YAC1H,WAAW,EAAE,EAAE;SAChB,CAAC;QACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,aAAc,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAC9E,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,gBAAiB,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QACjF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,2BAAmB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,GAAY,EAAE,UAA0B,EAAE,2BAA2B,GAAG,KAAK;QAC7G,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC5F,0CAA0C;QAC1C,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,OAAO,EAAE;YAC7E,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;YACjC,OAAO;SACR;QACD,+BAA+B;QAC/B,MAAM,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,IAAI,SAA6B,CAAC;YAClC,8BAA8B;YAC9B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YACvF,IAAI,SAAS,EAAE,OAAO,KAAK,UAAU,CAAC,OAAO,EAAE;gBAC7C,wBAAwB;gBACxB,kEAAkE;gBAClE,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,gBAAM,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC/D,IAAI,aAAa,EAAE;oBACjB,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC;oBAC1B,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;iBACpE;aACF;YACD,IAAI,2BAA2B,KAAK,IAAI,EAAE;gBACxC,MAAM,IAAI,CAAC,mCAAmC,CAAC,GAAG,EAAE,SAAS,EAAE,CAAE,UAAU,CAAC,OAAO,CAAE,CAAC,CAAC;gBACvF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,+BAAuB,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;aAC1F;YACD,OAAO;SACR;IACH,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,GAAY,EAAE,GAAW,EAAE,OAAe,EAAE,SAAS,GAAG,KAAK;QACvF,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAChF,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,uBAAU,CAAC,MAAM,CAAC;gBAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,GAAG;gBACH,OAAO;aACR,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACvD,MAAM,IAAI,CAAC,+CAA+C,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAC7E,IAAI,CAAC,SAAS,EAAE;gBACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,yBAAiB,EAAE,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;aACpE;YACD,OAAO,IAAI,CAAC;SACb;QACD,IAAI,SAAS,CAAC,OAAO,KAAK,OAAO,EAAE;YACjC,iBAAiB;YACjB,OAAO,KAAK,CAAC;SACd;QACD,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;QAC5B,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,+CAA+C,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC7E,IAAI,CAAC,SAAS,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,2BAAmB,EAAE,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;SACtE;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,GAAY,EAAE,GAAW;QACrD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAClF,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAC7B,MAAM,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,+CAA+C,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC7E,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,2BAAmB,EAAE,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,mCAAmC,CAAC,GAAY,EAAE,cAAyB,EAAE,cAAyB;QACjH,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE;YAC/D,OAAO,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;SACxD;QACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAsB,GAAG,CAAC,aAAa,CAAC,CAAC;QAC5G,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAiC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACjI,IAAI,CAAC,aAAa,EAAE,QAAQ,IAAI,CAAC,oBAAoB,EAAE,QAAQ,EAAE;YAC/D,oCAAoC;YACpC,OAAO,MAAM,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;SACxD;QAED,IAAI,cAAc,EAAE;YAClB,sFAAsF;YACtF,mFAAmF;YACnF,wFAAwF;YACxF,oDAAoD;YACpD,IAAI,iBAA0C,CAAC;YAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,EAAE;gBAClD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACpG,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC9B,iBAAiB,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;iBAClE;aACF;YACD,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE;gBACpC,IAAI,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE;oBACnC,0GAA0G;oBAC1G,OAAO,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBACvC,IAAI,aAAa,CAAC,IAAI;wBAAE,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC3D,OAAO,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC9C,SAAS;iBACV;gBACD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAC/F,IAAI,cAAc,EAAE;oBAClB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAkB,cAAc,CAAC,YAAY,CAAC,CAAC;oBAC7G,IAAI,CAAC,QAAQ;wBAAE,SAAS;oBACxB,IAAI,QAAQ,IAAI,QAAQ,EAAE;wBACxB,OAAO,QAAQ,CAAC,MAAM,CAAC;qBACxB;oBACD,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;oBAC1D,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,WAAW,CAAC;oBAExE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAA6B,cAAc,CAAC,eAAe,CAAC,CAAC;oBACtI,IAAI,mBAAmB,EAAE;wBACvB,oBAAoB,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC;qBAC7E;iBACF;aACF;SACF;QACD,IAAI,cAAc,EAAE;YAClB,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE;gBACpC,OAAO,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACvC,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnC,OAAO,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aAC/C;SACF;QAED,mBAAmB;QACnB,MAAM,IAAI,CAAC,iCAAiC,CAAC,GAAG,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;QACvF,oBAAoB;QACpB,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAY;QAClC,IAAI,QAAyB,CAAC;QAC9B,IAAI,GAAG,CAAC,UAAU,EAAE;YAClB,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;SAC/E;aAAM;YACL,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,EAAE,CAAC;SACtE;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,GAAY;QAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzE,MAAM,QAAQ,GAA8B,EAAE,CAAC;QAE/C,8CAA8C;QAC9C,IAAI,iBAA0C,CAAC;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,EAAE;YAClD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpG,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC9B,iBAAiB,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;aAClE;SACF;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,iDAAiD;YACjD,IAAI,GAAG,CAAC,GAAG,KAAK,QAAQ,IAAI,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC/D,sCAAsC;gBACtC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACpF,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,iBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;gBACpF,IAAI,iBAAiB,EAAE;oBACrB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,OAAO,CAAC;iBAC/C;gBACD,wDAAwD;aACzD;iBAAM;gBACL,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;aACjC;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,kEAAkE;IAC1D,KAAK,CAAC,+BAA+B,CAAC,GAAY;QACxD,MAAM,CACJ,aAAa,EACb,oBAAoB,EACrB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpB,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC;YACzC,MAAM,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC;SACjD,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;IACtF,CAAC;IAED,kEAAkE;IAC1D,KAAK,CAAC,+CAA+C,CAAC,GAAY,EAAE,WAAwC;QAClH,IAAI,WAAW,KAAK,aAAa,EAAE;YACjC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAsB,GAAG,CAAC,aAAc,CAAC,CAAC;YAC7G,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;YAC5D,IAAI,aAAa,EAAE;gBACjB,aAAa,CAAC,WAAW,GAAG,WAAW,CAAC;gBACxC,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;aACrE;SACF;aAAM,IAAI,WAAW,KAAK,WAAW,EAAE;YACtC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAsB,GAAG,CAAC,aAAc,CAAC,CAAC;YAC7G,IAAI,aAAa,EAAE;gBACjB,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAiC,GAAG,CAAC,gBAAiB,CAAC,CAAC;gBAClI,IAAI,oBAAoB,EAAE;oBACxB,MAAM,IAAI,CAAC,iCAAiC,CAAC,GAAG,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;iBACxF;gBACD,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,aAAa,EAAE,oBAAoB,IAAI,IAAI,CAAC,CAAC;aAC7F;SACF;IACH,CAAC;IAEO,0BAA0B,CAAC,aAAkC,EAAE,cAAsC;QAC3G,IAAI,CAAC,cAAc;YAAE,OAAO;QAC5B,sGAAsG;QACtG,MAAM,wBAAwB,GAAG;YAC/B,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS;YAClF,gBAAgB,EAAE,YAAY;SACtB,CAAC;QACX,2BAA2B;QAC3B,KAAK,MAAM,KAAK,IAAI,wBAAwB,EAAE;YAC5C,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE;gBACxB,aAAyC,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;aAC3E;SACF;IACH,CAAC;IAGO,KAAK,CAAC,iCAAiC,CAAC,GAAY,EAAE,aAAkC,EAAE,oBAAoD;QACpJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YACvG,IAAI,cAAc,EAAE;gBAClB,aAAa,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;gBAClG,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAkB,cAAc,CAAC,YAAY,CAAC,CAAC;gBACnH,IAAI,CAAC,0BAA0B,CAAC,aAAa,EAAE,cAAc,IAAI,IAAI,CAAC,CAAC;aACxE;SACF;QACD,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC;QACtC,oBAAoB,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,YAAkB,EAAE,SAAe,EAAE,WAAiB;QACrF,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAsB,YAAY,CAAC,CAAC;QAChG,IAAI,SAAS,IAAI,QAAQ,EAAE;YACzB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;SACpC;QACD,IAAI,WAAW,EAAE;YACf,QAAQ,GAAG,WAAW,CAAC;SACxB;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC5D,MAAM,iBAAiB,GAAG,MAAM,IAAA,gCAAkB,EAAC,aAAa,CAAC,CAAC;QAClE,YAAY,CAAC,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC;QACzC,YAAY,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC;QAC/C,YAAY,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;QACrD,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAAC,GAAY,EAAE,aAAyC,EAAE,oBAA2D;QAC/J,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;QAC5B,IAAI,aAAa,EAAE;YACjB,aAAa,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACvC,eAAe;YACf,MAAM,sBAAsB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;YAC1E,MAAM,0BAA0B,GAAG,MAAM,IAAA,gCAAkB,EAAC,sBAAsB,CAAC,CAAC;YACpF,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE;gBAC7B,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,sBAAsB,CAAC,MAAM,CAAC;gBACvD,GAAG,CAAC,aAAa,CAAC,MAAM,GAAG,0BAA0B,CAAC,MAAM,CAAC;gBAC7D,GAAG,CAAC,aAAa,CAAC,SAAS,GAAG,0BAA0B,CAAC,SAAS,CAAC;aACpE;iBAAM;gBACL,GAAG,CAAC,aAAa,GAAG,GAAG,CAAC,mBAAmB,CAAC;oBAC1C,IAAI,EAAE,sBAAsB,CAAC,MAAM;oBACnC,MAAM,EAAE,0BAA0B,CAAC,MAAM;oBACzC,SAAS,EAAE,0BAA0B,CAAC,SAAS;iBAChD,CAAC,CAAC;aACJ;YACD,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC;YAC9E,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SACzD;QACD,IAAI,oBAAoB,EAAE;YACxB,oBAAoB,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACzC,MAAM,6BAA6B,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC;YACxF,MAAM,iCAAiC,GAAG,MAAM,IAAA,gCAAkB,EAAC,6BAA6B,CAAC,CAAC;YAClG,IAAI,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE;gBAChC,GAAG,CAAC,gBAAgB,CAAC,IAAI,GAAG,6BAA6B,CAAC,MAAM,CAAC;gBACjE,GAAG,CAAC,gBAAgB,CAAC,MAAM,GAAG,iCAAiC,CAAC,MAAM,CAAC;gBACvE,GAAG,CAAC,gBAAgB,CAAC,SAAS,GAAG,iCAAiC,CAAC,SAAS,CAAC;aAC9E;iBAAM;gBACL,GAAG,CAAC,gBAAgB,GAAG,GAAG,CAAC,0BAA0B,CAAC;oBACpD,IAAI,EAAE,6BAA6B,CAAC,MAAM;oBAC1C,MAAM,EAAE,iCAAiC,CAAC,MAAM;oBAChD,SAAS,EAAE,iCAAiC,CAAC,SAAS;iBACvD,CAAC,CAAC;aACJ;YACD,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,EAAE,6BAA6B,CAAC,CAAC;YACxF,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SAC1D;IACH,CAAC;IAEO,KAAK,CAAC,sCAAsC,CAAiE,KAAa,EAAE,IAAY,EAAE,eAAwB,EAAE,MAAe;QACzL,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAEnD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvF,IAAI,KAAK,EAAE;YACT,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC;SAC5B;QAED,IAAI,UAAkC,CAAC;QACvC,0CAA0C;QAC1C,IAAI,CAAC,MAAM,EAAE;YACX,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC;SAC3D;QACD,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE1C,IAAI,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC;QACtE,iBAAiB;QACjB,IAAI,IAAI,EAAE,MAAM,EAAE;YAChB,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YAC1B,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAM,CAAC;YACxE,IAAI,UAAU,EAAE;gBACd,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;aACzF;YACD,iDAAiD;YACjD,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,qBAAqB,GAAG,QAAQ,EAAE,IAAI,CAAC;aAC7C;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,MAAM,aAAa,GAAG,MAAM,IAAA,gCAAkB,EAAC,SAAS,CAAC,CAAC;YAC1D,IAAI,GAAG,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;YACnC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;SACpC;QAED,qBAAqB;QACrB,MAAM,aAAa,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACzF,MAAM,oBAAoB,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,CAAC;QACvG,IAAI,CAAC,aAAa,IAAI,CAAC,oBAAoB,EAAE;YAC3C,aAAa;YACb,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;SAC1C;QACD,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;QACpF,MAAM,SAAS,GAAG,CAAC,aAAa,IAAI,oBAAoB,CAAO,CAAC;QAChE,sBAAsB;QACtB,IAAI,UAAU,EAAE;YACd,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,UAAU,EAAE,QAAQ,EAAG,SAAiB,CAAC,QAAQ,CAAC,CAAC;YACtG,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,MAAM,IAAA,gCAAkB,EAAC,SAAS,CAAC,CAAC;YAC1D,IAAI,GAAG,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;SACpC;aAAM;YACL,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC;YAClE,IAAI,GAAG,IAAI,IAAK,CAAC,MAAM,GAAG,CAAC;SAC5B;QACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IAChD,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,GAAY;QAChD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC/E,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,GAAY;QAClD,2BAA2B;QAC3B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9C,6CAA6C;QAC7C,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5C,MAAM,gBAAgB,GAA2B,EAAE,CAAC;QACpD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,EAAE;YAClD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpG,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;gBAC5C,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBAC9C,gBAAgB,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC;aAClE;SACF;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,sGAAsG;QACtG,MAAM,IAAI,GAAwB;YAChC,GAAG,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE;YACtB,IAAI,EAAE,GAAG,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,SAAS,EAAE;YAClC,WAAW,EAAE,QAAQ;YACrB,mBAAmB;YACnB,IAAI,EAAE,GAAG,CAAC,QAAQ;YAClB,+FAA+F;YAC/F,IAAI,EAAE;gBACJ,uCAAuC;gBACvC,OAAO,EAAE,GAAG,CAAC,SAAS;gBACtB,QAAQ,EAAE,GAAG,CAAC,SAAS;aACxB;YACD,gEAAgE;YAChE,QAAQ,EAAE,EAAE;YACZ,2GAA2G;YAC3G,eAAe;YACf,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,QAAQ,EAAE,SAAS;YACnB,QAAQ,EAAE,SAAS;YACnB,+CAA+C;YAC/C,OAAO,EAAE,SAAS;YAClB,iHAAiH;YACjH,WAAW;YACX,uCAAuC;YACvC,0FAA0F;YAC1F,MAAM,EAAE,EAAE;YACV,4DAA4D;YAC5D,cAAc,EAAE,SAAS;YACzB,mDAAmD;YACnD,UAAU,EAAE,SAAS;YACrB,6FAA6F;YAC7F,qBAAqB,EAAE,QAAQ,EAAE,IAAI;SACtC,CAAC;QAEF,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC;SACpC;QAED,IAAI,cAAmB,CAAC;QACxB,IAAI,oBAAoB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QAC9C,kGAAkG;QAClG,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;YAC5C,8CAA8C;YAC9C,IAAI,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;gBACjD,SAAS;aACV;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAkB,cAAc,CAAC,YAAY,CAAC,CAAC;YAC7G,IAAI,CAAC,QAAQ;gBAAE,SAAS;YACxB,sBAAsB;YACtB,IAAI,QAAQ,IAAI,QAAQ,EAAE;gBACxB,OAAO,QAAQ,CAAC,MAAM,CAAC;aACxB;YACD,IAAI,gBAAgB,IAAI,cAAc,CAAC,OAAO,KAAK,gBAAgB,EAAE;gBACnE,cAAc,GAAG,QAAQ,CAAC;gBAC1B,oBAAoB,GAAG,cAAc,CAAC;aACvC;YACD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;YACjD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,WAAW,CAAC;SAChE;QACD,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC/F,IAAI,CAAC,cAAc,EAAE;YACnB,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEtD,4DAA4D;QAC5D,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5C,IAAI,CAAC,aAAa,GAAG,gBAAgB,CAAC;SACvC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,gCAAgC,CAAC,GAAY;QACzD,2BAA2B;QAC3B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9C,6CAA6C;QAC7C,IAAI,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC1C,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,EAAE;YAClD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpG,iBAAiB,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;SAClE;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACtD,kGAAkG;QAClG,6EAA6E;QAC7E,MAAM,IAAI,GAAmC;YAC3C,WAAW,EAAE,QAAQ;YACrB,QAAQ,EAAE,GAAG,CAAC,SAAS;YACvB,IAAI,EAAE,GAAG,CAAC,QAAQ;YAClB,QAAQ,EAAE,EAAE;SACb,CAAC;QAEF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;YAC5C,8CAA8C;YAC9C,IAAI,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;gBACjD,SAAS;aACV;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAA6B,cAAc,CAAC,eAAe,CAAC,CAAC;YAC3H,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;aAClD;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,OAAwB;QAC7D,mBAAmB;QACnB,0EAA0E;QAC1E,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QACjC,MAAM,IAAA,eAAI,EAAC,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAE,QAAQ,EAAE,IAAI,CAAE,EAAE,EAAE;YAC1E,IAAI;gBACF,MAAM,UAAU,GAAG,IAAA,yBAAG,EAAC,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC;gBAC9C,mCAAmC;gBACnC,IAAI,CAAC,CAAE,OAAO,EAAE,KAAK,EAAE,SAAS,CAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAC5D,OAAO;iBACR;gBACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,IAAA,yBAAG,EAAC,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC3F,IAAA,oBAAM,EAAC,UAAU,CAAC,CAAC;aACpB;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,4BAAe,CAAC,QAAQ,QAAQ,IAAI,IAAI,YAAY,CAAC,CAAC;aACjE;QACH,CAAC,EAAE;YACD,WAAW,EAAE,EAAE;SAChB,CAAC,CAAC;IACL,CAAC;;AA5sCU,sDAAqB;AAkBjB,sCAAgB,GAAG,EAAE,AAAL,CAAM;AAhBpB;IADhB,IAAA,aAAM,GAAE;;uDAC2B;AAEnB;IADhB,IAAA,aAAM,GAAE;8BAC2B,qCAAiB;gEAAC;AAErC;IADhB,IAAA,aAAM,GAAE;8BACuC,6DAA6B;4EAAC;AAE7D;IADhB,IAAA,aAAM,GAAE;8BAC0C,mEAAgC;+EAAC;AAEnE;IADhB,IAAA,aAAM,GAAE;8BAC2B,qCAAiB;gEAAC;AAErC;IADhB,IAAA,aAAM,GAAE;8BACwB,+BAAc;6DAAC;AAE/B;IADhB,IAAA,aAAM,GAAE;8BACgC,+CAAsB;qEAAC;AAE/C;IADhB,IAAA,aAAM,GAAE;8BAC+B,6CAAqB;oEAAC;gCAhBnD,qBAAqB;IAHjC,IAAA,qBAAc,EAAC;QACd,WAAW,EAAE,kBAAW,CAAC,MAAM;KAChC,CAAC;GACW,qBAAqB,CA6sCjC"}
|
|
@@ -180,6 +180,27 @@ export type CnpmcoreConfig = {
|
|
|
180
180
|
* default is false
|
|
181
181
|
*/
|
|
182
182
|
enableBlockPackageVersion?: boolean;
|
|
183
|
+
/**
|
|
184
|
+
* enable dependency isolation (buffer) zone
|
|
185
|
+
* when enabled, a newly synced version is held invisible for `dependencyIsolationDuration`
|
|
186
|
+
* before being auto-released, giving deployments a window to run out-of-band validation.
|
|
187
|
+
* requires `enableBlockPackageVersion`. default is false (behavior identical to today).
|
|
188
|
+
* see RFC: https://github.com/cnpm/cnpmcore/issues/1057
|
|
189
|
+
*/
|
|
190
|
+
enableDependencyIsolation?: boolean;
|
|
191
|
+
/**
|
|
192
|
+
* dependency isolation buffer duration in milliseconds, analogous to pnpm `minimumReleaseAge`.
|
|
193
|
+
* a synced version stays invisible until `gmt_create + dependencyIsolationDuration`.
|
|
194
|
+
* default is 6 hours. only effective when `enableDependencyIsolation` is true.
|
|
195
|
+
*/
|
|
196
|
+
dependencyIsolationDuration?: number;
|
|
197
|
+
/**
|
|
198
|
+
* dependency isolation allowlist, analogous to pnpm `minimumReleaseAgeExclude`.
|
|
199
|
+
* matched packages skip the buffer zone (released immediately).
|
|
200
|
+
* supports exact package name and scope wildcard, e.g. `lodash`, `@scope/*`, `@scope/pkg`.
|
|
201
|
+
* default is empty.
|
|
202
|
+
*/
|
|
203
|
+
dependencyIsolationExclude?: string[];
|
|
183
204
|
/**
|
|
184
205
|
* database config
|
|
185
206
|
*/
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare const DEPENDENCY_ISOLATION_RELEASE_QUEUE = "dependency_isolation_release";
|
|
2
|
+
export declare class BufferReleaseDispatcher {
|
|
3
|
+
private readonly packageVersionBlockRepository;
|
|
4
|
+
private readonly queueAdapter;
|
|
5
|
+
private readonly cacheAdapter;
|
|
6
|
+
private readonly logger;
|
|
7
|
+
subscribe(): Promise<void>;
|
|
8
|
+
}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.BufferReleaseDispatcher = exports.DEPENDENCY_ISOLATION_RELEASE_QUEUE = void 0;
|
|
13
|
+
const schedule_1 = require("@eggjs/tegg/schedule");
|
|
14
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
15
|
+
const CacheAdapter_1 = require("../../common/adapter/CacheAdapter");
|
|
16
|
+
const PackageVersionBlockRepository_1 = require("../../repository/PackageVersionBlockRepository");
|
|
17
|
+
// dependency isolation release work queue: https://github.com/cnpm/cnpmcore/issues/1057
|
|
18
|
+
exports.DEPENDENCY_ISOLATION_RELEASE_QUEUE = 'dependency_isolation_release';
|
|
19
|
+
// Dispatcher: lightweight single-instance scan of expired buffer records, grouped by
|
|
20
|
+
// package and pushed to the release queue. The heavy unblock work is done by
|
|
21
|
+
// BufferReleaseWorker (ScheduleType.ALL) so it is distributed across the cluster.
|
|
22
|
+
// The DB rows are the source of truth — a dropped queue message is re-enqueued on the
|
|
23
|
+
// next run, and the batch release is idempotent.
|
|
24
|
+
let BufferReleaseDispatcher = class BufferReleaseDispatcher {
|
|
25
|
+
async subscribe() {
|
|
26
|
+
// intentionally NOT gated on enableDependencyIsolation: the flag only gates *new* isolation
|
|
27
|
+
// decisions at publish; existing buffer rows must still be drained/released even after the
|
|
28
|
+
// flag is turned off (e.g. rollback), otherwise those versions stay blocked forever.
|
|
29
|
+
// lock TTL is kept comfortably larger than the schedule interval (60s) so a slow scan/enqueue
|
|
30
|
+
// run cannot let the lock expire mid-run and a parallel node re-scan + double-enqueue.
|
|
31
|
+
await this.cacheAdapter.usingLock('BufferReleaseDispatcher', 120, async () => {
|
|
32
|
+
// per-cycle batch cap: bounds backlog catch-up / re-enqueue churn (indexed query, cheap)
|
|
33
|
+
const expiredBlocks = await this.packageVersionBlockRepository.findExpiredBufferedVersions(500);
|
|
34
|
+
if (expiredBlocks.length === 0)
|
|
35
|
+
return;
|
|
36
|
+
// group by package so the worker rebuilds each package's manifest only once
|
|
37
|
+
const versionsByPackageId = new Map();
|
|
38
|
+
for (const block of expiredBlocks) {
|
|
39
|
+
const versions = versionsByPackageId.get(block.packageId) ?? [];
|
|
40
|
+
versions.push(block.version);
|
|
41
|
+
versionsByPackageId.set(block.packageId, versions);
|
|
42
|
+
}
|
|
43
|
+
for (const [packageId, versions] of versionsByPackageId) {
|
|
44
|
+
await this.queueAdapter.push(exports.DEPENDENCY_ISOLATION_RELEASE_QUEUE, { packageId, versions });
|
|
45
|
+
}
|
|
46
|
+
this.logger.info('[BufferReleaseDispatcher:subscribe] enqueued %d packages, %d versions', versionsByPackageId.size, expiredBlocks.length);
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
exports.BufferReleaseDispatcher = BufferReleaseDispatcher;
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, tegg_1.Inject)(),
|
|
53
|
+
__metadata("design:type", PackageVersionBlockRepository_1.PackageVersionBlockRepository)
|
|
54
|
+
], BufferReleaseDispatcher.prototype, "packageVersionBlockRepository", void 0);
|
|
55
|
+
__decorate([
|
|
56
|
+
(0, tegg_1.Inject)(),
|
|
57
|
+
__metadata("design:type", Object)
|
|
58
|
+
], BufferReleaseDispatcher.prototype, "queueAdapter", void 0);
|
|
59
|
+
__decorate([
|
|
60
|
+
(0, tegg_1.Inject)(),
|
|
61
|
+
__metadata("design:type", CacheAdapter_1.CacheAdapter)
|
|
62
|
+
], BufferReleaseDispatcher.prototype, "cacheAdapter", void 0);
|
|
63
|
+
__decorate([
|
|
64
|
+
(0, tegg_1.Inject)(),
|
|
65
|
+
__metadata("design:type", Object)
|
|
66
|
+
], BufferReleaseDispatcher.prototype, "logger", void 0);
|
|
67
|
+
exports.BufferReleaseDispatcher = BufferReleaseDispatcher = __decorate([
|
|
68
|
+
(0, schedule_1.Schedule)({
|
|
69
|
+
type: schedule_1.ScheduleType.WORKER,
|
|
70
|
+
scheduleData: {
|
|
71
|
+
interval: 60000,
|
|
72
|
+
},
|
|
73
|
+
}, {
|
|
74
|
+
immediate: process.env.NODE_ENV !== 'test',
|
|
75
|
+
})
|
|
76
|
+
], BufferReleaseDispatcher);
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQnVmZmVyUmVsZWFzZURpc3BhdGNoZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9zY2hlZHVsZS9CdWZmZXJSZWxlYXNlRGlzcGF0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFDQSxtREFBOEU7QUFDOUUsc0NBQXFDO0FBRXJDLG9FQUFpRTtBQUNqRSxrR0FBK0Y7QUFFL0Ysd0ZBQXdGO0FBQzNFLFFBQUEsa0NBQWtDLEdBQUcsOEJBQThCLENBQUM7QUFFakYscUZBQXFGO0FBQ3JGLDZFQUE2RTtBQUM3RSxrRkFBa0Y7QUFDbEYsc0ZBQXNGO0FBQ3RGLGlEQUFpRDtBQVMxQyxJQUFNLHVCQUF1QixHQUE3QixNQUFNLHVCQUF1QjtJQWFsQyxLQUFLLENBQUMsU0FBUztRQUNiLDRGQUE0RjtRQUM1RiwyRkFBMkY7UUFDM0YscUZBQXFGO1FBQ3JGLDhGQUE4RjtRQUM5Rix1RkFBdUY7UUFDdkYsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyx5QkFBeUIsRUFBRSxHQUFHLEVBQUUsS0FBSyxJQUFJLEVBQUU7WUFDM0UseUZBQXlGO1lBQ3pGLE1BQU0sYUFBYSxHQUFHLE1BQU0sSUFBSSxDQUFDLDZCQUE2QixDQUFDLDJCQUEyQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2hHLElBQUksYUFBYSxDQUFDLE1BQU0sS0FBSyxDQUFDO2dCQUFFLE9BQU87WUFDdkMsNEVBQTRFO1lBQzVFLE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxHQUFHLEVBQW9CLENBQUM7WUFDeEQsS0FBSyxNQUFNLEtBQUssSUFBSSxhQUFhLEVBQUU7Z0JBQ2pDLE1BQU0sUUFBUSxHQUFHLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUNoRSxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDN0IsbUJBQW1CLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUM7YUFDcEQ7WUFDRCxLQUFLLE1BQU0sQ0FBRSxTQUFTLEVBQUUsUUFBUSxDQUFFLElBQUksbUJBQW1CLEVBQUU7Z0JBQ3pELE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsMENBQWtDLEVBQUUsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQzthQUMzRjtZQUNELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHVFQUF1RSxFQUN0RixtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3BELENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUE7QUFyQ1ksMERBQXVCO0FBRWpCO0lBRGhCLElBQUEsYUFBTSxHQUFFOzhCQUN1Qyw2REFBNkI7OEVBQUM7QUFHN0Q7SUFEaEIsSUFBQSxhQUFNLEdBQUU7OzZEQUNtQztBQUczQjtJQURoQixJQUFBLGFBQU0sR0FBRTs4QkFDc0IsMkJBQVk7NkRBQUM7QUFHM0I7SUFEaEIsSUFBQSxhQUFNLEdBQUU7O3VEQUMwQjtrQ0FYeEIsdUJBQXVCO0lBUm5DLElBQUEsbUJBQVEsRUFBaUI7UUFDeEIsSUFBSSxFQUFFLHVCQUFZLENBQUMsTUFBTTtRQUN6QixZQUFZLEVBQUU7WUFDWixRQUFRLEVBQUUsS0FBSztTQUNoQjtLQUNGLEVBQUU7UUFDRCxTQUFTLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEtBQUssTUFBTTtLQUMzQyxDQUFDO0dBQ1csdUJBQXVCLENBcUNuQyJ9
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.BufferReleaseWorker = void 0;
|
|
13
|
+
const schedule_1 = require("@eggjs/tegg/schedule");
|
|
14
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
15
|
+
const PackageManagerService_1 = require("../../core/service/PackageManagerService");
|
|
16
|
+
const BufferReleaseDispatcher_1 = require("./BufferReleaseDispatcher");
|
|
17
|
+
// re-entrancy guard: each release job does a full manifest rebuild + storage write, which can
|
|
18
|
+
// exceed the 1s interval; without this the scheduler would run overlapping drains on the same
|
|
19
|
+
// node (same pattern as SyncPackageWorker / TriggerHookWorker).
|
|
20
|
+
let executing = false;
|
|
21
|
+
// Worker: runs on every node (ScheduleType.ALL) and pops release jobs enqueued by
|
|
22
|
+
// BufferReleaseDispatcher, then performs the heavy per-package batch unblock. The queue
|
|
23
|
+
// pop is atomic, so each job is handled by a single node and the unblock load (manifest
|
|
24
|
+
// rebuild + storage write) is distributed across the cluster — same model as SyncPackageWorker.
|
|
25
|
+
let BufferReleaseWorker = class BufferReleaseWorker {
|
|
26
|
+
async subscribe() {
|
|
27
|
+
// intentionally NOT gated on enableDependencyIsolation: must keep draining/releasing buffer
|
|
28
|
+
// rows enqueued before the flag was turned off. when no rows are buffered the queue is empty,
|
|
29
|
+
// so this is a cheap no-op pop.
|
|
30
|
+
// skip this tick if a previous drain on this node is still running
|
|
31
|
+
if (executing)
|
|
32
|
+
return;
|
|
33
|
+
executing = true;
|
|
34
|
+
try {
|
|
35
|
+
let job = await this.queueAdapter.pop(BufferReleaseDispatcher_1.DEPENDENCY_ISOLATION_RELEASE_QUEUE);
|
|
36
|
+
while (job) {
|
|
37
|
+
try {
|
|
38
|
+
await this.packageManagerService.releaseBufferedVersions(job.packageId, job.versions);
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
this.logger.error('[BufferReleaseWorker:subscribe] release packageId: %s failed: %s', job.packageId, err);
|
|
42
|
+
}
|
|
43
|
+
job = await this.queueAdapter.pop(BufferReleaseDispatcher_1.DEPENDENCY_ISOLATION_RELEASE_QUEUE);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
executing = false;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
exports.BufferReleaseWorker = BufferReleaseWorker;
|
|
52
|
+
__decorate([
|
|
53
|
+
(0, tegg_1.Inject)(),
|
|
54
|
+
__metadata("design:type", Object)
|
|
55
|
+
], BufferReleaseWorker.prototype, "queueAdapter", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
(0, tegg_1.Inject)(),
|
|
58
|
+
__metadata("design:type", PackageManagerService_1.PackageManagerService)
|
|
59
|
+
], BufferReleaseWorker.prototype, "packageManagerService", void 0);
|
|
60
|
+
__decorate([
|
|
61
|
+
(0, tegg_1.Inject)(),
|
|
62
|
+
__metadata("design:type", Object)
|
|
63
|
+
], BufferReleaseWorker.prototype, "logger", void 0);
|
|
64
|
+
exports.BufferReleaseWorker = BufferReleaseWorker = __decorate([
|
|
65
|
+
(0, schedule_1.Schedule)({
|
|
66
|
+
type: schedule_1.ScheduleType.ALL,
|
|
67
|
+
scheduleData: {
|
|
68
|
+
interval: 1000,
|
|
69
|
+
},
|
|
70
|
+
})
|
|
71
|
+
], BufferReleaseWorker);
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQnVmZmVyUmVsZWFzZVdvcmtlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9wb3J0L3NjaGVkdWxlL0J1ZmZlclJlbGVhc2VXb3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQ0EsbURBQThFO0FBQzlFLHNDQUFxQztBQUVyQyxvRkFBaUY7QUFDakYsdUVBQStFO0FBTy9FLDhGQUE4RjtBQUM5Riw4RkFBOEY7QUFDOUYsZ0VBQWdFO0FBQ2hFLElBQUksU0FBUyxHQUFHLEtBQUssQ0FBQztBQUV0QixrRkFBa0Y7QUFDbEYsd0ZBQXdGO0FBQ3hGLHdGQUF3RjtBQUN4RixnR0FBZ0c7QUFPekYsSUFBTSxtQkFBbUIsR0FBekIsTUFBTSxtQkFBbUI7SUFVOUIsS0FBSyxDQUFDLFNBQVM7UUFDYiw0RkFBNEY7UUFDNUYsOEZBQThGO1FBQzlGLGdDQUFnQztRQUNoQyxtRUFBbUU7UUFDbkUsSUFBSSxTQUFTO1lBQUUsT0FBTztRQUN0QixTQUFTLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUk7WUFDRixJQUFJLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFhLDREQUFrQyxDQUFDLENBQUM7WUFDdEYsT0FBTyxHQUFHLEVBQUU7Z0JBQ1YsSUFBSTtvQkFDRixNQUFNLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztpQkFDdkY7Z0JBQUMsT0FBTyxHQUFHLEVBQUU7b0JBQ1osSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsa0VBQWtFLEVBQUUsR0FBRyxDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQztpQkFDM0c7Z0JBQ0QsR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQWEsNERBQWtDLENBQUMsQ0FBQzthQUNuRjtTQUNGO2dCQUFTO1lBQ1IsU0FBUyxHQUFHLEtBQUssQ0FBQztTQUNuQjtJQUNILENBQUM7Q0FDRixDQUFBO0FBL0JZLGtEQUFtQjtBQUViO0lBRGhCLElBQUEsYUFBTSxHQUFFOzt5REFDbUM7QUFHM0I7SUFEaEIsSUFBQSxhQUFNLEdBQUU7OEJBQytCLDZDQUFxQjtrRUFBQztBQUc3QztJQURoQixJQUFBLGFBQU0sR0FBRTs7bURBQzBCOzhCQVJ4QixtQkFBbUI7SUFOL0IsSUFBQSxtQkFBUSxFQUFpQjtRQUN4QixJQUFJLEVBQUUsdUJBQVksQ0FBQyxHQUFHO1FBQ3RCLFlBQVksRUFBRTtZQUNaLFFBQVEsRUFBRSxJQUFJO1NBQ2Y7S0FDRixDQUFDO0dBQ1csbUJBQW1CLENBK0IvQiJ9
|
|
@@ -8,6 +8,8 @@ export declare class PackageVersionBlockRepository extends AbstractRepository {
|
|
|
8
8
|
findPackageVersionBlock(packageId: string, version: string): Promise<PackageVersionBlockEntity | null>;
|
|
9
9
|
listPackageVersionBlocks(packageId: string): Promise<import("leoric").Collection<PackageVersionBlockModel>>;
|
|
10
10
|
removePackageVersionBlock(packageVersionBlockId: string): Promise<void>;
|
|
11
|
+
removeBufferBlock(packageVersionBlockId: string): Promise<boolean>;
|
|
12
|
+
findExpiredBufferedVersions(limit: number): Promise<PackageVersionBlockEntity[]>;
|
|
11
13
|
findPackageVersionBlockExact(packageId: string, version: string): Promise<PackageVersionBlockEntity | null>;
|
|
12
14
|
isVersionBlocked(packageId: string, version: string): Promise<{
|
|
13
15
|
blocked: boolean;
|
|
@@ -43,6 +43,25 @@ let PackageVersionBlockRepository = class PackageVersionBlockRepository extends
|
|
|
43
43
|
const removeCount = await this.PackageVersionBlock.remove({ packageVersionBlockId });
|
|
44
44
|
this.logger.info('[PackageVersionBlockRepository:removePackageVersionBlock:remove] %d rows, packageVersionBlockId: %s', removeCount, packageVersionBlockId);
|
|
45
45
|
}
|
|
46
|
+
// Atomically remove a row only while it is still a buffer record (type='buffer'). A concurrent
|
|
47
|
+
// permanent block sets type=null, so this single conditional delete won't clobber it. Returns
|
|
48
|
+
// true only when a buffer row was actually removed.
|
|
49
|
+
async removeBufferBlock(packageVersionBlockId) {
|
|
50
|
+
const removeCount = await this.PackageVersionBlock.remove({
|
|
51
|
+
packageVersionBlockId,
|
|
52
|
+
type: PackageVersionBlock_1.PACKAGE_VERSION_BLOCK_TYPE_BUFFER,
|
|
53
|
+
});
|
|
54
|
+
return removeCount > 0;
|
|
55
|
+
}
|
|
56
|
+
// Dependency isolation: list buffer records whose hold has expired (ready to release).
|
|
57
|
+
// Indexed by (type, expired_at); ordered oldest-first so the most overdue release first.
|
|
58
|
+
async findExpiredBufferedVersions(limit) {
|
|
59
|
+
const models = await this.PackageVersionBlock.find({
|
|
60
|
+
type: PackageVersionBlock_1.PACKAGE_VERSION_BLOCK_TYPE_BUFFER,
|
|
61
|
+
expiredAt: { $lte: new Date() },
|
|
62
|
+
}).order('expiredAt', 'asc').limit(limit);
|
|
63
|
+
return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, PackageVersionBlock_1.PackageVersionBlock));
|
|
64
|
+
}
|
|
46
65
|
// Find a specific version block (not '*')
|
|
47
66
|
async findPackageVersionBlockExact(packageId, version) {
|
|
48
67
|
const model = await this.PackageVersionBlock.findOne({ packageId, version });
|
|
@@ -91,4 +110,4 @@ exports.PackageVersionBlockRepository = PackageVersionBlockRepository = __decora
|
|
|
91
110
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
92
111
|
})
|
|
93
112
|
], PackageVersionBlockRepository);
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25CbG9ja1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9QYWNrYWdlVmVyc2lvbkJsb2NrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBa0U7QUFDbEUsMERBQXVEO0FBRXZELDRFQUF5STtBQUN6SSw2REFBMEQ7QUFLbkQsSUFBTSw2QkFBNkIsR0FBbkMsTUFBTSw2QkFBOEIsU0FBUSx1Q0FBa0I7SUFJbkUsS0FBSyxDQUFDLHVCQUF1QixDQUFDLEtBQWdDO1FBQzVELElBQUksS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUNaLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RSxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDdEQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7WUFDekYsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsK0ZBQStGLEVBQzlHLEtBQUssQ0FBQyxFQUFFLEVBQUUsS0FBSyxDQUFDLHFCQUFxQixDQUFDLENBQUM7U0FDMUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQWlCO1FBQ3RDLE9BQU8sTUFBTSxJQUFJLENBQUMsdUJBQXVCLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxLQUFLLENBQUMsdUJBQXVCLENBQUMsU0FBaUIsRUFBRSxPQUFlO1FBQzlELE1B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
|
|
@@ -48,7 +48,15 @@ __decorate([
|
|
|
48
48
|
(0, orm_1.Attribute)(leoric_1.DataTypes.TEXT(leoric_1.LENGTH_VARIANTS.long)),
|
|
49
49
|
__metadata("design:type", String)
|
|
50
50
|
], PackageVersionBlock.prototype, "reason", void 0);
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.STRING(16), { allowNull: true }),
|
|
53
|
+
__metadata("design:type", Object)
|
|
54
|
+
], PackageVersionBlock.prototype, "type", void 0);
|
|
55
|
+
__decorate([
|
|
56
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.DATE, { allowNull: true }),
|
|
57
|
+
__metadata("design:type", Object)
|
|
58
|
+
], PackageVersionBlock.prototype, "expiredAt", void 0);
|
|
51
59
|
exports.PackageVersionBlock = PackageVersionBlock = __decorate([
|
|
52
60
|
(0, orm_1.Model)()
|
|
53
61
|
], PackageVersionBlock);
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25CbG9jay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L21vZGVsL1BhY2thZ2VWZXJzaW9uQmxvY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEseUNBQW1EO0FBQ25ELG1DQUEwRDtBQUduRCxJQUFNLG1CQUFtQixHQUF6QixNQUFNLG1CQUFvQixTQUFRLGFBQUk7Q0FtQzVDLENBQUE7QUFuQ1ksa0RBQW1CO0FBSzlCO0lBSkMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLEVBQUU7UUFDM0IsT0FBTyxFQUFFLElBQUk7UUFDYixhQUFhLEVBQUUsSUFBSTtLQUNwQixDQUFDOzsrQ0FDUztBQUdYO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLENBQUM7OEJBQ3ZDLElBQUk7c0RBQUM7QUFHaEI7SUFEQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLElBQUksRUFBRSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsQ0FBQzs4QkFDekMsSUFBSTtzREFBQztBQUdoQjtJQURDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDOztzREFDZDtBQUtsQjtJQUhDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFO1FBQy9CLE1BQU0sRUFBRSxJQUFJO0tBQ2IsQ0FBQzs7a0VBQzRCO0FBRzlCO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7O29EQUNqQjtBQUdoQjtJQURDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsSUFBSSxDQUFDLHdCQUFlLENBQUMsSUFBSSxDQUFDLENBQUM7O21EQUNqQztBQUtmO0lBREMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUM7O2lEQUNqQztBQUlwQjtJQURDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsSUFBSSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDOztzREFDeEI7OEJBbENaLG1CQUFtQjtJQUQvQixJQUFBLFdBQUssR0FBRTtHQUNLLG1CQUFtQixDQW1DL0IifQ==
|
|
@@ -66,6 +66,9 @@ exports.cnpmcoreConfig = {
|
|
|
66
66
|
strictValidateTarballPkg: false,
|
|
67
67
|
strictValidatePackageDeps: false,
|
|
68
68
|
enableBlockPackageVersion: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_BLOCK_PACKAGE_VERSION', 'boolean', false),
|
|
69
|
+
enableDependencyIsolation: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_ENABLE_DEPENDENCY_ISOLATION', 'boolean', false),
|
|
70
|
+
dependencyIsolationDuration: (0, EnvUtil_1.env)('CNPMCORE_CONFIG_DEPENDENCY_ISOLATION_DURATION', 'number', 6 * 3600 * 1000),
|
|
71
|
+
dependencyIsolationExclude: [],
|
|
69
72
|
database: {
|
|
70
73
|
type: database_1.database.type,
|
|
71
74
|
},
|
|
@@ -210,4 +213,4 @@ exports.default = (appInfo) => {
|
|
|
210
213
|
}
|
|
211
214
|
return config;
|
|
212
215
|
};
|
|
213
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../config/config.default.ts"],"names":[],"mappings":"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"}
|