@sourcey/catalog-verifier 1.1.1 → 1.1.3

package/dist/modules/catalog-admission/src/admission-conflicts.js

@@ -1,8 +1,8 @@
+import { canonicalJson, compareCanonicalStrings, digest } from "provenry/primitives";
 import { canonicalEntityIdentity, entityAuthoringSchema, entityIdentityAuthoringSchema, } from "../../../contracts/authoring/src/index.js";
 import { rootSetSchema } from "../../../contracts/authority/src/index.js";
 import { catalogAdmissionCandidateSchema, catalogAdmissionConflictLookupRequestSchema, catalogAdmissionConflictLookupResponseCoreSchema, catalogAdmissionConflictLookupResponseSchema, catalogAdmissionKeyDigestsSchema, catalogAdmissionKeyKindSchema, catalogAdmissionKeyMatchSchema, catalogAdmissionKeySchema, catalogVerifierIdentityContextCoreSchema, catalogVerifierIdentityContextPacketSchema, MAXIMUM_CATALOG_ADMISSION_KEYS, MAXIMUM_CATALOG_ADMISSION_MATCHES, MAXIMUM_PENDING_ADMISSION_KEYS, openPullRequestAdmissionCandidateSchema, openPullRequestAdmissionKeySchema, } from "../../../contracts/catalog-verifier/src/index.js";
 import { validateCatalogVerifierIdentityContext, validateSignerRegistry, } from "../../authority/src/index.js";
-import { canonicalJson, compareCanonicalStrings, digest, } from "../../primitives/src/index.js";
 export { catalogAdmissionCandidateSchema, catalogAdmissionConflictLookupRequestSchema, catalogAdmissionConflictLookupResponseSchema, catalogAdmissionKeyDigestsSchema, catalogAdmissionKeyKindSchema, catalogAdmissionKeyMatchSchema, catalogAdmissionKeySchema, MAXIMUM_CATALOG_ADMISSION_KEYS, MAXIMUM_CATALOG_ADMISSION_MATCHES, MAXIMUM_PENDING_ADMISSION_KEYS, openPullRequestAdmissionCandidateSchema, openPullRequestAdmissionKeySchema, };
 export function createCatalogAdmissionConflictLookupResponse(input) {
     const query = catalogAdmissionConflictLookupRequestSchema.parse(input.query);
@@ -314,12 +314,18 @@ export function evaluateCatalogAdmissionConflicts(input) {
         }
         if (match.source.kind === "open_pull_request" &&
             input.candidate.kind === "git_pull_request" &&
-            match.source.repository === input.candidate.repository &&
-            match.source.pullRequestNumber === input.candidate.pullRequestNumber) {
-            if (match.source.headSha !== input.candidate.headSha) {
-                throw new Error("Catalog admission conflict result includes a stale candidate PR head.");
+            match.source.repository === input.candidate.repository) {
+            if (match.source.pullRequestNumber === input.candidate.pullRequestNumber) {
+                if (match.source.headSha !== input.candidate.headSha) {
+                    throw new Error("Catalog admission conflict result includes a stale candidate PR head.");
+                }
+                continue;
             }
-            continue;
+            // The first open pull request for an identity is the one reviewed. A
+            // later one, whether a duplicate or a copy, cannot hold it back; the
+            // later one still meets this one and waits until it merges or closes.
+            if (match.source.pullRequestNumber > input.candidate.pullRequestNumber)
+                continue;
         }
         if (match.source.kind === "pending_submission" &&
             input.candidate.kind === "detached" &&

package/dist/modules/catalog-admission/src/admission-conflicts.js.map

@@ -1 +1 @@
-{"version":3,"file":"admission-conflicts.js","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/admission-conflicts.ts"],"names":[],"mappings":"AACA,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;AACtC,OAAO,EACL,aAAa,EACb,uBAAuB,EAEvB,MAAM,GACP,MAAM,+BAA+B,CAAC;AAGvC,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;IAA7B,YAA6B,OAAiD;QAAjD,YAAO,GAAP,OAAO,CAA0C;QAC5E,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,MAAM,UAAU,sCAAsC,CACpD,IAAY;IAEZ,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;YACtD,KAAK,CAAC,MAAM,CAAC,iBAAiB,KAAK,KAAK,CAAC,SAAS,CAAC,iBAAiB,EACpE,CAAC;YACD,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBACrD,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;YAC3F,CAAC;YACD,SAAS;QACX,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"}
+{"version":3,"file":"admission-conflicts.js","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/admission-conflicts.ts"],"names":[],"mappings":"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"}

package/dist/modules/catalog-admission/src/change-analysis.d.ts

@@ -1,9 +1,9 @@
+import { type Digest } from "provenry/primitives";
 import type { CatalogSubmissionAuthoringFile, CatalogSubmissionWorkItem } from "../../../contracts/api/src/index.js";
 import type { EntityAuthoring } from "../../../contracts/authoring/src/index.js";
 import type { CatalogPublicationCurrentState } from "../../../contracts/publication/src/index.js";
 import type { CompiledEntityFacts } from "../../catalog-model/src/index.js";
 import { type CompiledCatalogFacts } from "../../compiler/src/index.js";
-import { type Digest } from "../../primitives/src/index.js";
 export interface CatalogChangedEntity {
     readonly entity: CompiledEntityFacts;
     readonly currentAuthoring: EntityAuthoring;
@@ -45,6 +45,11 @@ export declare function analyzeCatalogSubmissionWorkItem(input: {
     readonly currentState: CatalogPublicationCurrentState;
     readonly reviewedAuthoringFiles?: readonly CatalogSubmissionAuthoringFile[];
 }): CatalogChangeAnalysis;
+/** Compare compiled candidates with the exact live authoring slice, regardless of ingress. */
+export declare function catalogChangedEntitiesFromCurrent(input: {
+    readonly currentEntities: readonly EntityAuthoring[];
+    readonly candidates: CompiledCatalogFacts;
+}): CatalogChangedEntity[];
 export declare function catalogChangedRevisions(changes: readonly CatalogChangedEntity[]): CatalogChangedRevision[];
 export declare function canonicalChangedEntityIds(changes: readonly CatalogChangedEntity[]): readonly string[];
 //# sourceMappingURL=change-analysis.d.ts.map

package/dist/modules/catalog-admission/src/change-analysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-analysis.d.ts","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/change-analysis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAC9B,yBAAyB,EAC1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,6CAA6C,CAAC;AAClG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,KAAK,oBAAoB,EAA4B,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAA2B,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAWrF,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IACrC,QAAQ,CAAC,gBAAgB,EAAE,eAAe,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,eAAe,GAAG,IAAI,CAAC;IAChD,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;IAC9C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,oGAAoG;IACpG,QAAQ,CAAC,kBAAkB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/C,QAAQ,CAAC,eAAe,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC7D,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE;IACtD,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,CAAC;IAC7C,QAAQ,CAAC,SAAS,EAAE,8BAA8B,CAAC;IACnD,QAAQ,CAAC,YAAY,EAAE,8BAA8B,CAAC;IACtD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,8BAA8B,EAAE,CAAC;CAC7E,GAAG,qBAAqB,CA8DxB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,oBAAoB,EAAE,GACvC,sBAAsB,EAAE,CAyC1B;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,SAAS,oBAAoB,EAAE,GACvC,SAAS,MAAM,EAAE,CAEnB"}
+{"version":3,"file":"change-analysis.d.ts","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/change-analysis.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EACV,8BAA8B,EAC9B,yBAAyB,EAC1B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,6CAA6C,CAAC;AAClG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,KAAK,oBAAoB,EAA4B,MAAM,6BAA6B,CAAC;AAWlG,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IACrC,QAAQ,CAAC,gBAAgB,EAAE,eAAe,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,eAAe,GAAG,IAAI,CAAC;IAChD,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;IAC9C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,oGAAoG;IACpG,QAAQ,CAAC,kBAAkB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/C,QAAQ,CAAC,eAAe,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAC7D,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE;IACtD,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,CAAC;IAC7C,QAAQ,CAAC,SAAS,EAAE,8BAA8B,CAAC;IACnD,QAAQ,CAAC,YAAY,EAAE,8BAA8B,CAAC;IACtD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,8BAA8B,EAAE,CAAC;CAC7E,GAAG,qBAAqB,CAoCxB;AAED,8FAA8F;AAC9F,wBAAgB,iCAAiC,CAAC,KAAK,EAAE;IACvD,QAAQ,CAAC,eAAe,EAAE,SAAS,eAAe,EAAE,CAAC;IACrD,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;CAC3C,GAAG,oBAAoB,EAAE,CAiCzB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,oBAAoB,EAAE,GACvC,sBAAsB,EAAE,CAyC1B;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,SAAS,oBAAoB,EAAE,GACvC,SAAS,MAAM,EAAE,CAEnB"}

package/dist/modules/catalog-admission/src/change-analysis.js

@@ -1,5 +1,5 @@
+import { compareCanonicalStrings } from "provenry/primitives";
 import { compileAuthoringEntities } from "../../compiler/src/index.js";
-import { compareCanonicalStrings } from "../../primitives/src/index.js";
 import { analyzeCatalogCandidateChanges } from "./publication.js";
 import { catalogSubmissionCandidates, catalogSubmissionReviewCandidates, verifyCatalogSubmissionWorkItem, } from "./submission-input.js";
 import { verifyCatalogSubmissionPublicationState } from "./submission-state.js";
@@ -28,17 +28,35 @@ export function analyzeCatalogSubmissionWorkItem(input) {
     const closure = compileAuthoringEntities(candidateEntities, {
         allowExternalRoleEntities: true,
     });
-    const currentAuthoring = new Map(currentState.current_entities.map((entity) => [entity.entity.entity_id, entity]));
-    const candidateAuthoring = new Map(closure.authoring.map((entity) => [entity.entity.entity_id, entity]));
-    const semantic = analyzeCatalogCandidateChanges({
+    const changedEntities = catalogChangedEntitiesFromCurrent({
         currentEntities: currentState.current_entities,
-        candidateEntities: closure.authoring,
+        candidates: closure,
+    });
+    return {
+        baseRevision: workItem.live_parent_release_id,
+        entityFiles: (input.reviewedAuthoringFiles ?? workItem.request.authoring_files).map(({ path }) => path.slice(`${CATALOG_ENTITY_ROOT}/`.length)),
+        unsupportedChanges: [],
+        changedEntities,
+        changedRevisions: catalogChangedRevisions(changedEntities),
+        closure,
+        entities: closure.entities.length,
+        programs: closure.entities.flatMap((entity) => entity.programs).length,
+        offers: closure.entities.flatMap((entity) => entity.offers).length,
+    };
+}
+/** Compare compiled candidates with the exact live authoring slice, regardless of ingress. */
+export function catalogChangedEntitiesFromCurrent(input) {
+    const currentAuthoring = new Map(input.currentEntities.map((entity) => [entity.entity.entity_id, entity]));
+    const candidateAuthoring = new Map(input.candidates.authoring.map((entity) => [entity.entity.entity_id, entity]));
+    const semantic = analyzeCatalogCandidateChanges({
+        currentEntities: input.currentEntities.filter((entity) => candidateAuthoring.has(entity.entity.entity_id)),
+        candidateEntities: input.candidates.authoring,
     });
-    const changedEntities = closure.entities.map((entity) => {
+    return input.candidates.entities.map((entity) => {
         const entityId = entity.revision.entity_id;
         const current = candidateAuthoring.get(entityId);
         if (!current)
-            throw new Error(`Compiled submission Entity '${entityId}' has no authoring.`);
+            throw new Error(`Compiled Entity '${entityId}' has no authoring.`);
         const changes = semantic.revisionChanges.filter(({ entity_id: changedEntityId }) => changedEntityId === entityId);
         return {
             entity,
@@ -53,17 +71,6 @@ export function analyzeCatalogSubmissionWorkItem(input) {
                 .map(({ target_id: targetId }) => targetId),
         };
     });
-    return {
-        baseRevision: workItem.live_parent_release_id,
-        entityFiles: (input.reviewedAuthoringFiles ?? workItem.request.authoring_files).map(({ path }) => path.slice(`${CATALOG_ENTITY_ROOT}/`.length)),
-        unsupportedChanges: [],
-        changedEntities,
-        changedRevisions: catalogChangedRevisions(changedEntities),
-        closure,
-        entities: closure.entities.length,
-        programs: closure.entities.flatMap((entity) => entity.programs).length,
-        offers: closure.entities.flatMap((entity) => entity.offers).length,
-    };
 }
 export function catalogChangedRevisions(changes) {
     return changes.flatMap(({ entity, entityChanged, changedProgramIds, changedOfferIds }) => [

package/dist/modules/catalog-admission/src/change-analysis.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-analysis.js","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/change-analysis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"change-analysis.js","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/change-analysis.ts"],"names":[],"mappings":"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"}

package/dist/modules/catalog-admission/src/index.d.ts

@@ -1,7 +1,9 @@
+import { type Digest } from "provenry/primitives";
 import type { AssetBindingProjection, EntityAssetProposal } from "../../../contracts/assets/src/index.js";
-import { type EntityAuthoring } from "../../../contracts/authoring/src/index.js";
+import type { EntityAuthoring } from "../../../contracts/authoring/src/index.js";
+import type { CatalogPublicationCurrentState } from "../../../contracts/publication/src/index.js";
 import { type CatalogTaxonomy } from "../../../contracts/taxonomy/src/index.js";
-import { type Digest } from "../../primitives/src/index.js";
+import { type CompiledCatalogFacts } from "../../compiler/src/index.js";
 import { type CatalogChangeAnalysis } from "./change-analysis.js";
 import { type CatalogPublicationImpactIndex, type CatalogPublicationPlanningInput, type CatalogPublicationPolicyReference } from "./publication.js";
 export { validateCatalogCandidateSources } from "../../catalog-authoring-validation/src/index.js";
@@ -33,10 +35,11 @@ export declare function validateCatalogPrTree(input: {
     readonly programs: number;
     readonly offers: number;
 }>;
+/** Enforce the public contribution policy over the one shared PR analysis. */
+export declare function assertCatalogContributionAnalysis(analysis: CatalogChangeAnalysis): void;
 /**
- * Validate explicit non-Git candidate bytes through the same compiler,
- * taxonomy, path, and role-closure rules used by changed-repository intake.
- * Transport-specific Git checks remain in validateCatalogPrTree.
+ * Validate strict changed-head authoring and Git scope for public PR intake.
+ * Historical Git supplies file identity only, never the semantic parent.
  */
 export declare function inspectCatalogPrTree(input: {
     readonly repositoryRoot: string;
@@ -46,49 +49,36 @@ export declare function inspectCatalogPrTree(input: {
 }): Promise<{
     readonly baseRevision: string;
     readonly entityFiles: readonly string[];
+    readonly identities: readonly EntityAuthoring["entity"][];
     readonly entities: number;
     readonly programs: number;
     readonly offers: number;
 }>;
-/**
- * The one exact pull-request analysis used by changed-closure validation,
- * private review preparation, and tree-bound admission. It reads only the
- * changed Entity files, their identity dependencies, and the corresponding
- * base versions of those same files.
- */
-export declare function analyzeCatalogPrTree(input: {
-    readonly repositoryRoot: string;
-    readonly baseRevision: string;
-    readonly headRevision: string;
-    readonly taxonomy: CatalogTaxonomy;
-}): Promise<CatalogChangeAnalysis>;
-/**
- * Release construction uses the same changed-file and revision analysis as PR
- * validation while permitting unrelated documentation and workflow commits
- * that do not belong to Catalog data.
- */
-export declare function analyzeCatalogReleaseTree(input: {
+/** Read the strict head authoring and its identity closure without interpreting old Git YAML. */
+export declare function inspectCatalogReleaseHead(input: {
     readonly repositoryRoot: string;
     readonly baseRevision: string;
     readonly headRevision: string;
     readonly taxonomy: CatalogTaxonomy;
-}): Promise<CatalogChangeAnalysis>;
+}): Promise<{
+    entityFiles: string[];
+    unsupportedChanges: string[];
+    changedAuthoring: CompiledCatalogFacts;
+    identityClosure: CompiledCatalogFacts;
+}>;
 /**
- * Analyze a data PR for admission against the release that is actually live.
- *
- * The PR comparison remains authoritative for its mutation boundary: it must
- * be data-only and identify every vendor the contributor changed. When main is
- * ahead of the live release, the release-relative comparison supplies the
- * complete final revisions that will be admitted. This permits a follow-up PR
- * to correct an unshipped version of the same vendor and permits independently
- * admitted vendor paths to advance without expanding this PR's authority.
+ * Private PR admission compares the strict head with the materialized live
+ * authoring slice. Git supplies scope and file identity, not the semantic parent.
  */
-export declare function analyzeCatalogPrAdmissionTree(input: {
+export declare function analyzeCatalogPrAgainstCurrent(input: {
+    readonly repositoryId: string;
     readonly repositoryRoot: string;
     readonly liveRevision: string;
+    readonly liveParentReleaseId: Digest;
     readonly pullRequestBaseRevision: string;
     readonly pullRequestHeadRevision: string;
     readonly taxonomy: CatalogTaxonomy;
+    readonly readCurrentState: (entityIds: readonly string[]) => Promise<CatalogPublicationCurrentState>;
 }): Promise<CatalogChangeAnalysis>;
 /**
  * Git is one immutable ingress adapter over the canonical publication port.
@@ -112,18 +102,22 @@ export declare function planCatalogGitPublication(input: {
     readonly targetContractAuthorityDigest: Digest;
     readonly impactIndex?: CatalogPublicationImpactIndex;
 }): Promise<{
+    proposal: import("../../../contracts/publication/src/index.js").CatalogPublicationProposal;
+    changeSet: import("../../../contracts/publication/src/index.js").CatalogPublicationChangeSet;
     analysis: CatalogChangeAnalysis;
     ingressReceipt: {
+        proposal_digest: string;
+        semantic_input_digest: string;
         kind: "git";
         repository_id: string;
         base_commit: string;
         head_commit: string;
         head_tree: string;
         changed_tree: string;
-        proposal_digest: string;
-        semantic_input_digest: string;
         receipt_digest: string;
     } | {
+        proposal_digest: string;
+        semantic_input_digest: string;
         kind: "authenticated_form";
         submission_work_item_digest: string;
         schema_digest: string;
@@ -132,10 +126,10 @@ export declare function planCatalogGitPublication(input: {
         authorization_digest: string;
         operator_admission_digest: string | null;
         idempotency_key: string;
-        proposal_digest: string;
-        semantic_input_digest: string;
         receipt_digest: string;
     } | {
+        proposal_digest: string;
+        semantic_input_digest: string;
         kind: "paid_agent";
         submission_work_item_digest: string;
         schema_digest: string;
@@ -145,10 +139,10 @@ export declare function planCatalogGitPublication(input: {
         operator_admission_digest: string | null;
         request_id: string;
         idempotency_key: string;
-        proposal_digest: string;
-        semantic_input_digest: string;
         receipt_digest: string;
     } | {
+        proposal_digest: string;
+        semantic_input_digest: string;
         kind: "governed_ops";
         submission_work_item_digest: string | null;
         command_digest: string;
@@ -158,37 +152,33 @@ export declare function planCatalogGitPublication(input: {
         authentication_digest: string;
         authorization_digest: string;
         idempotency_key: string;
-        proposal_digest: string;
-        semantic_input_digest: string;
         receipt_digest: string;
     } | {
+        proposal_digest: string;
+        semantic_input_digest: string;
         kind: "scanner";
         inventory_digest: string;
         run_receipt_digest: string;
         idempotency_key: string;
-        proposal_digest: string;
-        semantic_input_digest: string;
         receipt_digest: string;
     } | {
+        proposal_digest: string;
+        semantic_input_digest: string;
         kind: "operator_job";
         job_input_digest: string;
         authority_digest: string;
         run_receipt_digest: string;
         idempotency_key: string;
-        proposal_digest: string;
-        semantic_input_digest: string;
         receipt_digest: string;
     } | {
+        proposal_digest: string;
+        semantic_input_digest: string;
         kind: "policy_transition";
         intent_digest: string;
         configuration_digest: string;
         idempotency_key: string;
-        proposal_digest: string;
-        semantic_input_digest: string;
         receipt_digest: string;
     };
-    proposal: import("../../../contracts/publication/src/index.js").CatalogPublicationProposal;
-    changeSet: import("../../../contracts/publication/src/index.js").CatalogPublicationChangeSet;
 }>;
 export declare function catalogPullRequestComparisonBase(input: {
     readonly repositoryRoot: string;

package/dist/modules/catalog-admission/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../modules/catalog-admission/src/index.ts"],"names":[],"mappings":"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"}