@sourcey/catalog-verifier 1.1.14 → 1.1.15
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/SBOM.cdx.json +7 -7
- package/SOURCEY-CLOSURE.json +4 -4
- package/THIRD_PARTY_NOTICES.json +3 -3
- package/dist/modules/catalog-admission/src/admission-conflicts.d.ts.map +1 -1
- package/dist/modules/catalog-admission/src/admission-conflicts.js +45 -54
- package/dist/modules/catalog-admission/src/admission-conflicts.js.map +1 -1
- package/package.json +2 -2
package/SBOM.cdx.json
CHANGED
|
@@ -99,25 +99,25 @@
|
|
|
99
99
|
},
|
|
100
100
|
{
|
|
101
101
|
"type": "library",
|
|
102
|
-
"bom-ref": "pkg:npm/provenry@0.2.
|
|
102
|
+
"bom-ref": "pkg:npm/provenry@0.2.2",
|
|
103
103
|
"name": "provenry",
|
|
104
104
|
"licenses": [
|
|
105
105
|
{
|
|
106
106
|
"expression": "MIT"
|
|
107
107
|
}
|
|
108
108
|
],
|
|
109
|
-
"version": "0.2.
|
|
110
|
-
"purl": "pkg:npm/provenry@0.2.
|
|
109
|
+
"version": "0.2.2",
|
|
110
|
+
"purl": "pkg:npm/provenry@0.2.2",
|
|
111
111
|
"hashes": [
|
|
112
112
|
{
|
|
113
113
|
"alg": "SHA-512",
|
|
114
|
-
"content": "
|
|
114
|
+
"content": "29f7b712498b45438146dfce8258889f9c120e330c3991a4d4a243f28bed25e572fdbaf13672f6be4226d44d6c54324a60870c34ba7f0a53d1494436d46aceb5"
|
|
115
115
|
}
|
|
116
116
|
],
|
|
117
117
|
"externalReferences": [
|
|
118
118
|
{
|
|
119
119
|
"type": "distribution",
|
|
120
|
-
"url": "https://registry.npmjs.org/provenry/-/provenry-0.2.
|
|
120
|
+
"url": "https://registry.npmjs.org/provenry/-/provenry-0.2.2.tgz"
|
|
121
121
|
}
|
|
122
122
|
]
|
|
123
123
|
},
|
|
@@ -222,7 +222,7 @@
|
|
|
222
222
|
{
|
|
223
223
|
"ref": "urn:sourcey:code-distribution:catalog-verifier",
|
|
224
224
|
"dependsOn": [
|
|
225
|
-
"pkg:npm/provenry@0.2.
|
|
225
|
+
"pkg:npm/provenry@0.2.2",
|
|
226
226
|
"pkg:npm/tldts@7.4.16",
|
|
227
227
|
"pkg:npm/yaml@2.9.1",
|
|
228
228
|
"pkg:npm/zod@4.6.5"
|
|
@@ -239,7 +239,7 @@
|
|
|
239
239
|
]
|
|
240
240
|
},
|
|
241
241
|
{
|
|
242
|
-
"ref": "pkg:npm/provenry@0.2.
|
|
242
|
+
"ref": "pkg:npm/provenry@0.2.2",
|
|
243
243
|
"dependsOn": [
|
|
244
244
|
"pkg:npm/parse5@8.0.1",
|
|
245
245
|
"pkg:npm/zod@4.6.5"
|
package/SOURCEY-CLOSURE.json
CHANGED
|
@@ -1448,15 +1448,15 @@
|
|
|
1448
1448
|
},
|
|
1449
1449
|
{
|
|
1450
1450
|
"path": "dist/modules/catalog-admission/src/admission-conflicts.d.ts.map",
|
|
1451
|
-
"sha256": "sha256:
|
|
1451
|
+
"sha256": "sha256:3bdb2ee0b4e371f8cad7f4e451d13ce7f4ce191a8fdaf7444786419bf70f38fa"
|
|
1452
1452
|
},
|
|
1453
1453
|
{
|
|
1454
1454
|
"path": "dist/modules/catalog-admission/src/admission-conflicts.js",
|
|
1455
|
-
"sha256": "sha256:
|
|
1455
|
+
"sha256": "sha256:2c58d2a54aa14466819bb30bc41111570f89bfa04c025d8262d3360cfebaead9"
|
|
1456
1456
|
},
|
|
1457
1457
|
{
|
|
1458
1458
|
"path": "dist/modules/catalog-admission/src/admission-conflicts.js.map",
|
|
1459
|
-
"sha256": "sha256:
|
|
1459
|
+
"sha256": "sha256:f927d1d8f9fe3d1644d6e639dab8d9e785bf84a7c33d249fcb2f99c308aac72f"
|
|
1460
1460
|
},
|
|
1461
1461
|
{
|
|
1462
1462
|
"path": "dist/modules/catalog-admission/src/change-analysis.d.ts",
|
|
@@ -2483,5 +2483,5 @@
|
|
|
2483
2483
|
"sha256": "sha256:cec1e15c14a9958a061bcea4ac0bad33e10242994c25556c1ec952b52ef2735e"
|
|
2484
2484
|
}
|
|
2485
2485
|
],
|
|
2486
|
-
"closure_digest": "sha256:
|
|
2486
|
+
"closure_digest": "sha256:6d1a93b6fa0f4b6d0856f5e4dc1ec72d65735b3e92fe23cc073edb70c24efe70"
|
|
2487
2487
|
}
|
package/THIRD_PARTY_NOTICES.json
CHANGED
|
@@ -37,10 +37,10 @@
|
|
|
37
37
|
},
|
|
38
38
|
{
|
|
39
39
|
"name": "provenry",
|
|
40
|
-
"version": "0.2.
|
|
40
|
+
"version": "0.2.2",
|
|
41
41
|
"license": "MIT",
|
|
42
|
-
"resolved": "https://registry.npmjs.org/provenry/-/provenry-0.2.
|
|
43
|
-
"integrity": "sha512-
|
|
42
|
+
"resolved": "https://registry.npmjs.org/provenry/-/provenry-0.2.2.tgz",
|
|
43
|
+
"integrity": "sha512-Kfe3EkmLRUOBRt/OgliIn5wSDjMMOZGk1KJD8ovtJeVy/brxNnL2vkIm1E1sVDJKYIcMNLp/ClPRSUQ21GrOtQ==",
|
|
44
44
|
"lock_path": "node_modules/provenry",
|
|
45
45
|
"license_files": [
|
|
46
46
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admission-conflicts.d.ts","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/admission-conflicts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"admission-conflicts.d.ts","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/admission-conflicts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { evaluateIdentityConflicts } from "provenry/identity";
|
|
1
2
|
import { canonicalJson, compareCanonicalStrings, digest } from "provenry/primitives";
|
|
2
3
|
import { canonicalEntityIdentity, entityAuthoringSchema, entityIdentityAuthoringSchema, } from "../../../contracts/authoring/src/index.js";
|
|
3
4
|
import { rootSetSchema } from "../../../contracts/authority/src/index.js";
|
|
@@ -299,66 +300,37 @@ function uniqueAdmissionKeys(keys) {
|
|
|
299
300
|
compareCanonicalStrings(left.normalizedValue, right.normalizedValue));
|
|
300
301
|
}
|
|
301
302
|
export function evaluateCatalogAdmissionConflicts(input) {
|
|
302
|
-
const
|
|
303
|
-
if (keys.
|
|
304
|
-
throw new Error("Catalog admission
|
|
303
|
+
const { candidate } = input;
|
|
304
|
+
if (input.keys.some((key) => key.kind === "entity_id" && !key.candidateIdentityDigest)) {
|
|
305
|
+
throw new Error("A Catalog Entity ID admission key must carry its identity digest.");
|
|
305
306
|
}
|
|
306
|
-
const
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
input.candidate.kind === "git_pull_request" &&
|
|
317
|
-
match.source.repository === input.candidate.repository) {
|
|
318
|
-
if (match.source.pullRequestNumber === input.candidate.pullRequestNumber) {
|
|
319
|
-
if (match.source.headSha !== input.candidate.headSha) {
|
|
320
|
-
throw new Error("Catalog admission conflict result includes a stale candidate PR head.");
|
|
321
|
-
}
|
|
322
|
-
continue;
|
|
307
|
+
const catalogMatches = new Map(input.matches.map((match) => [identityConflictMatch(match), match]));
|
|
308
|
+
const conflicts = evaluateIdentityConflicts({
|
|
309
|
+
keys: input.keys,
|
|
310
|
+
matches: [...catalogMatches.keys()],
|
|
311
|
+
candidate: candidate.kind === "git_pull_request"
|
|
312
|
+
? {
|
|
313
|
+
kind: "pull_request",
|
|
314
|
+
repository: candidate.repository,
|
|
315
|
+
pullRequestNumber: candidate.pullRequestNumber,
|
|
316
|
+
headSha: candidate.headSha,
|
|
323
317
|
}
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
throw new Error("Catalog admission conflict result includes a rebound detached candidate.");
|
|
335
|
-
}
|
|
336
|
-
continue;
|
|
337
|
-
}
|
|
338
|
-
if ((match.source.kind === "current_catalog" || match.source.kind === "pending_git_lineage") &&
|
|
339
|
-
match.targetReference === key.candidateReference) {
|
|
340
|
-
if (key.kind === "entity_id" && match.targetIdentityDigest !== key.candidateIdentityDigest) {
|
|
341
|
-
const current = grouped.get(match.keyDigest) ?? [];
|
|
342
|
-
current.push(match);
|
|
343
|
-
grouped.set(match.keyDigest, current);
|
|
344
|
-
}
|
|
345
|
-
continue;
|
|
346
|
-
}
|
|
347
|
-
const current = grouped.get(match.keyDigest) ?? [];
|
|
348
|
-
current.push(match);
|
|
349
|
-
grouped.set(match.keyDigest, current);
|
|
350
|
-
}
|
|
351
|
-
return [...grouped.entries()]
|
|
352
|
-
.map(([keyDigest, matches]) => {
|
|
318
|
+
: {
|
|
319
|
+
kind: "detached",
|
|
320
|
+
candidateReference: candidate.candidateReference,
|
|
321
|
+
candidateDigest: candidate.candidateDigest,
|
|
322
|
+
},
|
|
323
|
+
liveParentId: input.liveParentReleaseId,
|
|
324
|
+
});
|
|
325
|
+
const keys = new Map(input.keys.map((key) => [key.keyDigest, key]));
|
|
326
|
+
return conflicts
|
|
327
|
+
.map(({ keyDigest, matches: held, identityChanged }) => {
|
|
353
328
|
const key = keys.get(keyDigest);
|
|
354
329
|
if (!key)
|
|
355
330
|
throw new Error("Catalog admission conflict key disappeared.");
|
|
331
|
+
const matches = held.map((match) => catalogMatches.get(match));
|
|
356
332
|
return {
|
|
357
|
-
kind: key.kind === "entity_id" &&
|
|
358
|
-
matches.some((match) => (match.source.kind === "current_catalog" ||
|
|
359
|
-
match.source.kind === "pending_git_lineage") &&
|
|
360
|
-
match.targetReference === key.candidateReference &&
|
|
361
|
-
match.targetIdentityDigest !== key.candidateIdentityDigest)
|
|
333
|
+
kind: key.kind === "entity_id" && identityChanged
|
|
362
334
|
? "identity"
|
|
363
335
|
: matches.some(({ source }) => source.kind === "open_pull_request")
|
|
364
336
|
? "open_pull_request"
|
|
@@ -376,6 +348,25 @@ export function evaluateCatalogAdmissionConflicts(input) {
|
|
|
376
348
|
.sort((left, right) => compareCanonicalStrings(left.kind, right.kind) ||
|
|
377
349
|
compareCanonicalStrings(left.keyDigest, right.keyDigest));
|
|
378
350
|
}
|
|
351
|
+
/** A Catalog match in the shared rule's terms. */
|
|
352
|
+
function identityConflictMatch(match) {
|
|
353
|
+
const { source } = match;
|
|
354
|
+
return {
|
|
355
|
+
keyDigest: match.keyDigest,
|
|
356
|
+
targetReference: match.targetReference,
|
|
357
|
+
targetIdentityDigest: match.targetIdentityDigest,
|
|
358
|
+
source: source.kind === "current_catalog"
|
|
359
|
+
? { kind: "live", parentId: source.liveParentReleaseId }
|
|
360
|
+
: source.kind === "pending_git_lineage"
|
|
361
|
+
? {
|
|
362
|
+
kind: "merged_lineage",
|
|
363
|
+
repository: source.repository,
|
|
364
|
+
liveSourceCommit: source.liveSourceCommit,
|
|
365
|
+
targetCommit: source.targetCommit,
|
|
366
|
+
}
|
|
367
|
+
: source,
|
|
368
|
+
};
|
|
369
|
+
}
|
|
379
370
|
/**
|
|
380
371
|
* Exact identity-envelope digest shared by admission projection and verifier
|
|
381
372
|
* context. Retained Catalog documents and authoring files order aliases and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admission-conflicts.js","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/admission-conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAe,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElG,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,6BAA6B,GAC9B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAIL,+BAA+B,EAC/B,2CAA2C,EAC3C,gDAAgD,EAChD,4CAA4C,EAC5C,gCAAgC,EAChC,6BAA6B,EAC7B,8BAA8B,EAC9B,yBAAyB,EACzB,wCAAwC,EACxC,0CAA0C,EAC1C,8BAA8B,EAC9B,iCAAiC,EACjC,8BAA8B,EAC9B,uCAAuC,EACvC,iCAAiC,GAClC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EACL,sCAAsC,EACtC,sBAAsB,GACvB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EACL,+BAA+B,EAC/B,2CAA2C,EAC3C,4CAA4C,EAC5C,gCAAgC,EAChC,6BAA6B,EAC7B,8BAA8B,EAC9B,yBAAyB,EACzB,8BAA8B,EAC9B,iCAAiC,EACjC,8BAA8B,EAC9B,uCAAuC,EACvC,iCAAiC,GAClC,CAAC;AAEF,MAAM,UAAU,4CAA4C,CAAC,KAG5D;IACC,MAAM,KAAK,GAAG,2CAA2C,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,gDAAgD,CAAC,KAAK,CAAC;QAClE,iBAAiB,EAAE,sDAAsD;QACzE,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC;QAC3B,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC;KAC5B,CAAC,CAAC;IACH,OAAO,4CAA4C,CAAC,KAAK,CAAC;QACxD,GAAG,IAAI;QACP,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,4CAA4C,CAAC,KAG5D;IACC,MAAM,KAAK,GAAG,2CAA2C,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7E,MAAM,QAAQ,GAAG,4CAA4C,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpF,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC;IAC9D,IAAI,QAAQ,CAAC,YAAY,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,cAAc,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/E,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;IAC1F,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,wCAAwC,CAAC,KAMxD;IACC,MAAM,KAAK,GAAG,2CAA2C,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7E,MAAM,QAAQ,GAAG,4CAA4C,CAAC;QAC5D,KAAK;QACL,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAC;IACH,OAAO,wCAAwC,CAAC,KAAK,CAAC;QACpD,gBAAgB,EAAE,oDAAoD;QACtE,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC;QAC3B,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,sBAAsB,EAAE,KAAK,CAAC,mBAAmB;QACjD,4BAA4B,EAAE,KAAK,CAAC,yBAAyB;QAC7D,SAAS,EAAE,KAAK,CAAC,QAAQ;QACzB,UAAU,EAAE,KAAK,CAAC,SAAS;KAC5B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0CAA0C,CAAC,KAK1D;IACC,OAAO,0CAA0C,CAAC,KAAK,CAAC;QACtD,eAAe,EAAE,2DAA2D;QAC5E,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,eAAe,EAAE,KAAK,CAAC,cAAc;KACtC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0CAA0C,CAAC,KAK1D;IACC,MAAM,MAAM,GAAG,0CAA0C,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAC5F,CAAC;IACD,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IACzE,MAAM,KAAK,GAAG,2CAA2C,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9E,MAAM,QAAQ,GAAG,4CAA4C,CAAC;QAC5D,KAAK;QACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,sCAAsC,CACpD,MAAM,CAAC,OAAO,EACd,QAAQ,EACR,KAAK,CAAC,UAAU,CACjB,CAAC;IACF,IACE,OAAO,CAAC,YAAY,KAAK,MAAM,CAAC,KAAK,CAAC;QACtC,OAAO,CAAC,eAAe,KAAK,QAAQ,CAAC,eAAe;QACpD,OAAO,CAAC,sBAAsB,KAAK,KAAK,CAAC,mBAAmB,EAC5D,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAC;IAC/F,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC9C,CAAC;AAkED,MAAM,UAAU,2CAA2C,CAAC,KAI3D;IACC,MAAM,IAAI,GAAG,mBAAmB,CAC9B,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,wCAAwC,CAAC,QAAQ,CAAC,CAAC,CAC3F,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,GAAG,8BAA8B,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;IACvF,CAAC;IACD,OAAO,2CAA2C,CAAC,KAAK,CAAC;QACvD,cAAc,EAAE,mDAAmD;QACnE,IAAI;QACJ,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;AACL,CAAC;AAOD,2FAA2F;AAC3F,MAAM,UAAU,kCAAkC,CAAC,KAGlD;IACC,MAAM,QAAQ,GAAG,sCAAsC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpE,IAAI,IAAoC,CAAC;IACzC,IAAI,CAAC;QACH,IAAI,GAAG,0BAA0B,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,yEAAyE;QACzE,0EAA0E;QAC1E,IAAI,GAAG,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACtB,iCAAiC,CAAC,KAAK,CAAC;QACtC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,eAAe,EAAE,GAAG,CAAC,kBAAkB;QACvC,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9F,CAAC,CACH,CAAC;AACJ,CAAC;AA2BD;;;GAGG;AACH,MAAM,OAAO,4CAA4C;IAC9C,OAAO,CAA0C;IACjD,wBAAwB,CAAS;IACjC,mBAAmB,CAEd;IAEd,YAAY,aAAwE;QAClF,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,wBAAwB,GAAG,aAAa,CAAC,uBAAuB,IAAI,IAAI,CAAC;QAC9E,IAAI,CAAC,mBAAmB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,KAA0E;QAE1E,MAAM,UAAU,GACd,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,kBAAkB;YACzC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU;YAC5B,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,cAAc,KAAK,KAAK,CAAC,SAAS,CAAC,cAAc;gBAC3E,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU;gBACrC,CAAC,CAAC,SAAS,CAAC;QAClB,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,gCAAgC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CACrF,CAAC;QACF,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,sCAAsC,CAAC,UAAU,EAAE;YACzF,GAAG,SAAS;SACb,CAAC,CAAC;QACH,IAAI,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;QACxF,CAAC;QACD,MAAM,OAAO,GAA+B,EAAE,CAAC;QAC/C,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,uCAAuC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzE,IACE,WAAW,CAAC,UAAU,KAAK,UAAU;gBACrC,WAAW,CAAC,IAAI,CAAC,MAAM,GAAG,iCAAiC,EAC3D,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;YAC5F,CAAC;YACD,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;gBACnC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;oBAClC,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;gBACxF,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC;oBACX,GAAG,GAAG;oBACN,MAAM,EAAE;wBACN,IAAI,EAAE,mBAAmB;wBACzB,UAAU,EAAE,WAAW,CAAC,UAAU;wBAClC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;wBAChD,OAAO,EAAE,WAAW,CAAC,OAAO;qBAC7B;iBACF,CAAC,CAAC;gBACH,IAAI,OAAO,CAAC,MAAM,GAAG,iCAAiC,EAAE,CAAC;oBACvD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;gBAC9E,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAoC,CAAC;QAC3D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;YAC5B,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAmB;gBAAE,SAAS;YAClD,MAAM,CAAC,GAAG,CACR,GAAG,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,eAAe,KAAK,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,iBAAiB,KAAK,MAAM,CAAC,OAAO,EAAE,EACpH,KAAK,CACN,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAC9B,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC;YACxD,uBAAuB,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,eAAe,CAAC;YACpE,uBAAuB,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC,CACzF,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,sCAAsC;IACpB,OAAO;IAApC,YAA6B,OAAiD;uBAAjD,OAAO;QAClC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,KAA0E;QAE1E,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACtF,IAAI,EAAE;aACN,IAAI,CACH,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC;YACxD,uBAAuB,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,eAAe,CAAC;YACpE,uBAAuB,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC,CACzF,CAAC;IACN,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,UAAU,wCAAwC,CACtD,KAAc;IAEd,MAAM,QAAQ,GAAG,6BAA6B,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5D,MAAM,IAAI,GAA0B,EAAE,CAAC;IACvC,MAAM,GAAG,GAAG,CAAC,IAA6B,EAAE,KAAa,EAAE,kBAA0B,EAAE,EAAE;QACvF,MAAM,eAAe,GAAG,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC;YACR,IAAI;YACJ,eAAe;YACf,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC;YAC9D,kBAAkB;YAClB,GAAG,CAAC,IAAI,KAAK,WAAW;gBACtB,CAAC,CAAC,EAAE,uBAAuB,EAAE,2BAA2B,CAAC,QAAQ,CAAC,EAAE;gBACpE,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,eAAe,GAAG,UAAU,QAAQ,CAAC,SAAS,EAAE,CAAC;IACvD,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACtD,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACnD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,YAAY;QAAE,GAAG,CAAC,aAAa,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;IACtF,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACnD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS;YAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,qFAAqF;AACrF,SAAS,sCAAsC,CAAC,IAAY;IAC1D,MAAM,KAAK,GAAG,qDAAqD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,eAAe,GAAG,qBAAqB,CAAC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChF,OAAO;QACL;YACE,IAAI,EAAE,aAAa;YACnB,eAAe;YACf,SAAS,EAAE,MAAM,CAAC;gBAChB,IAAI,EAAE,aAAa;gBACnB,gBAAgB,EAAE,eAAe;aAClC,CAAC;YACF,kBAAkB,EAAE,QAAQ,IAAI,EAAE;SACnC;KACF,CAAC;AACJ,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,0BAA0B,CAAC,KAAc;IACvD,MAAM,MAAM,GAAG,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,IAAI,GAA0B,CAAC,GAAG,wCAAwC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACjG,MAAM,GAAG,GAAG,CAAC,IAA6B,EAAE,KAAa,EAAE,kBAA0B,EAAE,EAAE;QACvF,MAAM,eAAe,GAAG,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC;YACR,IAAI;YACJ,eAAe;YACf,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC;YAC9D,kBAAkB;SACnB,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,eAAe,GAAG,UAAU,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IAC5D,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAC9D,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACjC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACnE,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO;QAAE,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IACtF,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,WAAW,OAAO,CAAC,UAAU,EAAE,CAAC;QAClD,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACjD,GAAG,CAAC,cAAc,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,OAAO,CAAC,YAAY,EAAE,EAAE,SAAS,CAAC,CAAC;QACrF,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;YACjD,GAAG,CAAC,cAAc,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAU,CAAC,CAC/E,CAAC;IACF,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,SAAS,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC5C,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3C,GAAG,CAAC,YAAY,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,CAAC,CAAC;QAC/E,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;YAC7C,GAAG,CAAC,YAAY,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YACrB,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YAC9C,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACrC,IAAI,GAAG;gBAAE,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,GAAG,CACD,gBAAgB,EAChB,aAAa,CAAC;YACZ,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI;SACnC,CAAC,EACF,SAAS,CACV,CAAC;IACJ,CAAC;IACD,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAoC;IAC/D,MAAM,MAAM,GAAG,IAAI,GAAG,EAA+B,CAAC;IACtD,KAAK,MAAM,GAAG,IAAI,IAAI;QAAE,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/E,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAC9B,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;QAC9C,uBAAuB,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,eAAe,CAAC,CACvE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,KAKjD;IACC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACpE,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAC/E,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAsC,CAAC;IAC9D,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACzF,IACE,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,iBAAiB;YACvC,KAAK,CAAC,MAAM,CAAC,mBAAmB,KAAK,KAAK,CAAC,mBAAmB,EAC9D,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;QACpF,CAAC;QACD,IACE,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,mBAAmB;YACzC,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,kBAAkB;YAC3C,KAAK,CAAC,MAAM,CAAC,UAAU,KAAK,KAAK,CAAC,SAAS,CAAC,UAAU,EACtD,CAAC;YACD,IAAI,KAAK,CAAC,MAAM,CAAC,iBAAiB,KAAK,KAAK,CAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC;gBACzE,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;oBACrD,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;gBAC3F,CAAC;gBACD,SAAS;YACX,CAAC;YACD,qEAAqE;YACrE,qEAAqE;YACrE,sEAAsE;YACtE,IAAI,KAAK,CAAC,MAAM,CAAC,iBAAiB,GAAG,KAAK,CAAC,SAAS,CAAC,iBAAiB;gBAAE,SAAS;QACnF,CAAC;QACD,IACE,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,oBAAoB;YAC1C,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,UAAU;YACnC,KAAK,CAAC,MAAM,CAAC,kBAAkB,KAAK,KAAK,CAAC,SAAS,CAAC,kBAAkB,EACtE,CAAC;YACD,IAAI,KAAK,CAAC,MAAM,CAAC,eAAe,KAAK,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;gBACrE,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;YAC9F,CAAC;YACD,SAAS;QACX,CAAC;QACD,IACE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,iBAAiB,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,qBAAqB,CAAC;YACxF,KAAK,CAAC,eAAe,KAAK,GAAG,CAAC,kBAAkB,EAChD,CAAC;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,oBAAoB,KAAK,GAAG,CAAC,uBAAuB,EAAE,CAAC;gBAC3F,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACnD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACxC,CAAC;YACD,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACnD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,EAA4B,EAAE;QACtD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACzE,OAAO;YACL,IAAI,EACF,GAAG,CAAC,IAAI,KAAK,WAAW;gBACxB,OAAO,CAAC,IAAI,CACV,CAAC,KAAK,EAAE,EAAE,CACR,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,iBAAiB;oBACtC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,qBAAqB,CAAC;oBAC9C,KAAK,CAAC,eAAe,KAAK,GAAG,CAAC,kBAAkB;oBAChD,KAAK,CAAC,oBAAoB,KAAK,GAAG,CAAC,uBAAuB,CAC7D;gBACC,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,mBAAmB,CAAC;oBACjE,CAAC,CAAC,mBAAmB;oBACrB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,qBAAqB,CAAC;wBACnE,CAAC,CAAC,qBAAqB;wBACvB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,oBAAoB,CAAC;4BAClE,CAAC,CAAC,oBAAoB;4BACtB,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;YAClC,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC;YACpC,SAAS;YACT,gBAAgB,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CACxF,uBAAuB,CACxB;YACD,gBAAgB,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,IAAI,CACvE,uBAAuB,CACxB;SACF,CAAC;IACJ,CAAC,CAAC;SACD,IAAI,CACH,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACd,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;QAC9C,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAC3D,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CAAC,QAAiB;IAC3D,OAAO,MAAM,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,uBAAuB,CAAC,KAA+B;IAC9D,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC5C,OAAO,WAAW,KAAK,CAAC,MAAM,CAAC,mBAAmB,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;IAChF,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;QAChD,OAAO,OAAO,KAAK,CAAC,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,CAAC,gBAAgB,KAAK,KAAK,CAAC,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;IAClI,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAC/C,OAAO,cAAc,KAAK,CAAC,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;IAClH,CAAC;IACD,OAAO,UAAU,KAAK,CAAC,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,CAAC,iBAAiB,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;AAChI,CAAC;AAED,SAAS,qBAAqB,CAAC,IAA6B,EAAE,KAAa;IACzE,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC/F,IAAI,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QAC7E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3B,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC1C,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG;YAAE,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3E,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IACD,IAAI,IAAI,KAAK,aAAa;QAAE,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAChF,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,YAAY,CAAC,IAA6B;IACjD,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACvC,IAAI,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAC3F,IAAI,IAAI,KAAK,aAAa;QAAE,OAAO,MAAM,CAAC;IAC1C,IAAI,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,cAAc;QAAE,OAAO,SAAS,CAAC;IACvE,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,YAAY;QAAE,OAAO,OAAO,CAAC;IACjE,IAAI,IAAI,KAAK,gBAAgB;QAAE,OAAO,gBAAgB,CAAC;IACvD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAA6B;IACrD,OAAO,IAAI,KAAK,aAAa,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,WAAW;QAC9E,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,OAAO,CAAC;AACd,CAAC"}
|
|
1
|
+
{"version":3,"file":"admission-conflicts.js","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/admission-conflicts.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sourcey/catalog-verifier",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.15",
|
|
4
4
|
"description": "Validate Sourcey data contributions and verify immutable Sourcey Catalog releases.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"sourcey",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"test": "node --test test/*.test.mjs"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"provenry": "0.2.
|
|
55
|
+
"provenry": "0.2.2",
|
|
56
56
|
"tldts": "7.4.16",
|
|
57
57
|
"yaml": "2.9.1",
|
|
58
58
|
"zod": "4.6.5"
|