payload 4.0.0-internal.e7d4ebc → 4.0.0-internal.ea6e8f8

package/dist/branching/merge/executeMerge.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/branching/merge/executeMerge.ts"],"sourcesContent":["import type { Payload, PayloadRequest } from '../../types/index.js'\nimport type { MergeResult } from '../merge.js'\nimport type { BranchOperation, MergeableChange, MergeProgress } from '../types.js'\nimport type { SourceCleanupPlan, UploadCleanupPlan } from './finalizeMerge.js'\nimport type { PreparedBranchChange } from './prepareMerge.js'\nimport type { AppliedChangeResult } from './utilities.js'\n\nimport { APIError, Forbidden } from '../../errors/index.js'\nimport { throwOnFieldAccessDeniedContextKey } from '../../fields/hooks/beforeValidate/throwOnAccessDenied.js'\nimport {\n  commitTransaction,\n  isUnknownTransactionCommitResult,\n} from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport {\n  beginDeferredCleanupScope,\n  clearDeferredCleanupScope,\n  flushDeferredCleanupScopeAfterOperation,\n  scheduleAfterTransactionCommit,\n  scheduleAfterTransactionRollback,\n} from '../../utilities/transactionCallbacks.js'\nimport {\n  type CaptureSavedVersionID,\n  captureSavedVersionIDContextKey,\n} from '../../versions/saveVersion.js'\nimport { resolveEffectiveOperations } from '../effectiveOperations.js'\nimport { type BranchMergeWriteGuard, branchMergeWriteGuardContextKey } from '../mergeWriteGuard.js'\nimport {\n  hasUnavailableBranchCreatedDependency,\n  resolveMergeDependencies,\n  runGlobalMergePreflight,\n  runMergeDependencyPreflight,\n  runMergePreflight,\n} from '../preflight.js'\nimport { readCollectionMergeSnapshot } from '../readMergeSnapshot.js'\nimport { refreshBranchState } from '../resolveBranch.js'\nimport { branchField, branchParentField, MAIN_BRANCH } from '../types.js'\nimport { createMainBranchRequest } from '../validation.js'\nimport { applyChange, applyGlobalChange } from './applyMergeChange.js'\nimport { finalizeMergeAfterCommit, recordMergeRollback } from './finalizeMerge.js'\nimport { createMergeLedger } from './mergeLedger.js'\nimport { recoverMergeFailure } from './recoverMerge.js'\nimport { changeDocID } from './utilities.js'\n\nconst mergeEventCheckpointBatchSize = 1_000\nexport const unknownMergeCommitResultContextKey = Symbol('unknownMergeCommitResult')\n\nconst findLatestTargetCollectionVersionID = async ({\n  collectionSlug,\n  docID,\n  payload,\n  req,\n}: {\n  collectionSlug: string\n  docID: number | string\n  payload: Payload\n  req: PayloadRequest\n}): Promise<string | undefined> => {\n  if (!payload.collections[collectionSlug]?.config.versions) {\n    return undefined\n  }\n\n  const { docs } = await payload.db.findVersions({\n    branch: false,\n    collection: collectionSlug,\n    limit: 1,\n    pagination: false,\n    req,\n    sort: '-updatedAt',\n    where: { parent: { equals: docID } },\n  })\n  const versionID = docs[0]?.id\n\n  return versionID === undefined ? undefined : String(versionID)\n}\n\nconst findLatestTargetGlobalVersionID = async ({\n  globalSlug,\n  payload,\n  req,\n}: {\n  globalSlug: string\n  payload: Payload\n  req: PayloadRequest\n}): Promise<string | undefined> => {\n  const globalConfig = payload.globals.config.find(({ slug }) => slug === globalSlug)\n\n  if (!globalConfig?.versions) {\n    return undefined\n  }\n\n  const { docs } = await payload.db.findGlobalVersions({\n    branch: false,\n    global: globalSlug,\n    limit: 1,\n    pagination: false,\n    req,\n    sort: '-updatedAt',\n    where: { [branchField]: { equals: MAIN_BRANCH } },\n  })\n  const versionID = docs[0]?.id\n\n  return versionID === undefined ? undefined : String(versionID)\n}\n\nconst readBranchUploadVersionDocuments = async ({\n  branch,\n  collectionSlug,\n  payload,\n  req,\n  rowID,\n}: {\n  branch: string\n  collectionSlug: string\n  payload: Payload\n  req: PayloadRequest\n  rowID: number | string\n}): Promise<Record<string, unknown>[]> => {\n  if (!payload.collections[collectionSlug]?.config.versions) {\n    return []\n  }\n\n  const { docs } = await payload.db.findVersions({\n    branch: false,\n    collection: collectionSlug,\n    limit: 0,\n    pagination: false,\n    req,\n    where: {\n      and: [\n        { parent: { equals: rowID } },\n        { [branchField]: { equals: branch } },\n        { [branchParentField]: { exists: true } },\n      ],\n    },\n  })\n\n  return docs.flatMap((version) =>\n    version.version && typeof version.version === 'object' && !Array.isArray(version.version)\n      ? [version.version as Record<string, unknown>]\n      : [],\n  )\n}\n\nconst orderChangesByDependencies = <TChange extends { id: unknown }>({\n  changes,\n  dependencyChangeIDsByChangeID,\n}: {\n  changes: TChange[]\n  dependencyChangeIDsByChangeID: Map<string, Set<string>>\n}): TChange[] => {\n  const changesByID = new Map(changes.map((change) => [String(change.id), change]))\n  const orderedChanges: TChange[] = []\n  const orderedChangeIDs = new Set<string>()\n  const visitingChangeIDs = new Set<string>()\n\n  const visitChange = (change: TChange): void => {\n    const changeID = String(change.id)\n\n    if (orderedChangeIDs.has(changeID) || visitingChangeIDs.has(changeID)) {\n      return\n    }\n\n    visitingChangeIDs.add(changeID)\n\n    for (const dependencyChangeID of dependencyChangeIDsByChangeID.get(changeID) ?? []) {\n      const dependencyChange = changesByID.get(dependencyChangeID)\n\n      if (dependencyChange) {\n        visitChange(dependencyChange)\n      }\n    }\n\n    visitingChangeIDs.delete(changeID)\n    orderedChangeIDs.add(changeID)\n    orderedChanges.push(change)\n  }\n\n  for (const change of changes) {\n    visitChange(change)\n  }\n\n  return orderedChanges\n}\n\nconst getSnapshotDocumentTitle = ({\n  after,\n  docID,\n  useAsTitle,\n}: {\n  after: null | Record<string, unknown> | undefined\n  docID: number | string\n  useAsTitle: string | undefined\n}): string => {\n  const title = useAsTitle ? after?.[useAsTitle] : undefined\n\n  return typeof title === 'number' || typeof title === 'string' ? String(title) : String(docID)\n}\n\nexport const executeMerge = async ({\n  applicable,\n  applicableGlobals,\n  branch,\n  branchDoc,\n  closeBranch,\n  incomingReq,\n  mergeable,\n  onProgress,\n  overrideAccess,\n  payload,\n  req,\n  result,\n}: {\n  applicable: PreparedBranchChange[]\n  applicableGlobals: PreparedBranchChange[]\n  branch: string\n  branchDoc: { id: number | string }\n  closeBranch: boolean\n  incomingReq?: PayloadRequest\n  mergeable: MergeableChange[]\n  onProgress?: (progress: MergeProgress, req: PayloadRequest) => Promise<void> | void\n  overrideAccess: boolean\n  payload: Payload\n  req: PayloadRequest\n  result: MergeResult\n}): Promise<MergeResult> => {\n  const ledger = await createMergeLedger({ branch, mergeable, payload, req })\n  // A request supplied by an HTTP caller does not yet have a transaction, so it\n  // must start one just as a Local API call would.\n  const shouldCommit = await initTransaction(req)\n  const transactionID = req.transactionID ? await req.transactionID : undefined\n  const hasTransaction = transactionID !== null && transactionID !== undefined\n  const cleanupScope = await beginDeferredCleanupScope({ req })\n\n  const uploadCleanupPlans: UploadCleanupPlan[] = []\n  const sourceCleanupPlans: SourceCleanupPlan[] = []\n  const appliedChangeIDs = new Set<string>()\n  const reqContext = req.context as Record<PropertyKey, unknown>\n  const previousBranchMergeWriteGuard = reqContext[branchMergeWriteGuardContextKey]\n  const previousThrowOnFieldAccessDenied = reqContext[throwOnFieldAccessDeniedContextKey]\n\n  reqContext[branchMergeWriteGuardContextKey] = (async ({\n    collectionSlug,\n    data,\n    globalSlug,\n    req: writeReq,\n  }) => {\n    if (\n      await hasUnavailableBranchCreatedDependency({\n        availableChangeIDs: appliedChangeIDs,\n        collectionSlug,\n        data,\n        globalSlug,\n        payload,\n        req: writeReq,\n      })\n    ) {\n      throw new APIError(\n        'This change refers to branch-created content that will not be available on main.',\n        409,\n      )\n    }\n  }) satisfies BranchMergeWriteGuard\n\n  if (!overrideAccess) {\n    reqContext[throwOnFieldAccessDeniedContextKey] = true\n  }\n\n  let activeChangeID: number | string | undefined\n  let isFinalCommitInProgress = false\n  let mergedAt: string | undefined\n\n  const finalizeAfterCommit = (): Promise<void> =>\n    finalizeMergeAfterCommit({\n      branch,\n      branchDoc,\n      closeBranch,\n      incomingReq,\n      ledger,\n      mergedAt,\n      payload,\n      req,\n      result,\n      sourceCleanupPlans,\n      uploadCleanupPlans,\n    })\n\n  const recordRollback = (): Promise<void> =>\n    recordMergeRollback({ branchDoc, incomingReq, ledger, payload, req })\n\n  try {\n    const writeTargetReq = createMainBranchRequest({ req })\n    const refreshedApplicable = await resolveEffectiveOperations({\n      branch,\n      changes: applicable,\n      payload,\n      req,\n    })\n    const dependencyPlan = await resolveMergeDependencies({\n      initiallyBlocked: [],\n      payload,\n      pending: refreshedApplicable,\n      pendingGlobals: applicableGlobals,\n      req,\n    })\n\n    if (dependencyPlan.blocked.length) {\n      throw new APIError(dependencyPlan.blocked[0]!.message, 409)\n    }\n\n    const applicableInWriteOrder = orderChangesByDependencies({\n      changes: applicable,\n      dependencyChangeIDsByChangeID: dependencyPlan.dependencyChangeIDsByChangeID,\n    })\n\n    for (\n      let batchStart = 0;\n      batchStart < applicableInWriteOrder.length;\n      batchStart += mergeEventCheckpointBatchSize\n    ) {\n      const changeBatch = applicableInWriteOrder.slice(\n        batchStart,\n        batchStart + mergeEventCheckpointBatchSize,\n      )\n      const changeBatchIDs = changeBatch.map(({ id }) => id)\n\n      ledger.updateChanges({\n        changeIDs: changeBatchIDs,\n        update: { applicationOutcome: 'attempted' },\n      })\n      await ledger.persist({ status: 'inProgress' })\n\n      for (const [batchIndex, change] of changeBatch.entries()) {\n        const index = batchStart + batchIndex\n\n        activeChangeID = change.id\n\n        await onProgress?.(\n          {\n            collectionSlug: change.collectionSlug as string,\n            current: index + 1,\n            docID: changeDocID(change),\n            operation: change.operation as BranchOperation,\n            total: applicableInWriteOrder.length,\n          },\n          req,\n        )\n\n        const [resolvedChange] = await resolveEffectiveOperations({\n          branch,\n          changes: [change],\n          payload,\n          req,\n        })\n\n        if (!resolvedChange) {\n          throw new Error(`Branch change ${String(change.id)} could not be resolved.`)\n        }\n\n        if (!overrideAccess) {\n          const blockedAtUse = await runMergePreflight({\n            payload,\n            pending: [resolvedChange],\n            req: writeTargetReq,\n          })\n\n          if (blockedAtUse.length) {\n            throw new Forbidden(req.t)\n          }\n        }\n\n        const collectionSlug = change.collectionSlug as string\n        const docID = changeDocID(change)\n        const collectionConfig = payload.collections[collectionSlug]!.config\n        const beforeVersionID =\n          change.operation === 'create'\n            ? undefined\n            : await findLatestTargetCollectionVersionID({\n                collectionSlug,\n                docID,\n                payload,\n                req: writeTargetReq,\n              })\n        let afterVersionID: string | undefined\n        const writeTargetContext = writeTargetReq.context as Record<PropertyKey, unknown>\n        const previousCaptureSavedVersionID = writeTargetContext[captureSavedVersionIDContextKey]\n\n        writeTargetContext[captureSavedVersionIDContextKey] = ((capturedVersion) => {\n          if (capturedVersion.collectionSlug === collectionSlug) {\n            afterVersionID = String(capturedVersion.versionID)\n          }\n        }) satisfies CaptureSavedVersionID\n        const uploadSourceDocs: Record<string, unknown>[] = []\n\n        if (collectionConfig.upload) {\n          if (change.operation === 'update') {\n            const mainDocument = (await payload.db.findOne({\n              branch: false,\n              collection: collectionSlug,\n              req,\n              where: {\n                and: [{ [branchField]: { equals: MAIN_BRANCH } }, { id: { equals: docID } }],\n              },\n            })) as null | Record<string, unknown>\n\n            if (mainDocument) {\n              uploadSourceDocs.push(mainDocument)\n            }\n          }\n\n          if (resolvedChange.shadow) {\n            uploadSourceDocs.push(\n              resolvedChange.shadow,\n              ...(await readBranchUploadVersionDocuments({\n                branch,\n                collectionSlug,\n                payload,\n                req,\n                rowID: resolvedChange.shadow.id as number | string,\n              })),\n            )\n          }\n        }\n\n        const dependencyBlockedAtUse = await runMergeDependencyPreflight({\n          availableChangeIDs: appliedChangeIDs,\n          initiallyBlocked: [],\n          payload,\n          pending: [resolvedChange],\n          pendingGlobals: [],\n          req: writeTargetReq,\n        })\n\n        if (dependencyBlockedAtUse.length) {\n          throw new APIError(dependencyBlockedAtUse[0]!.message, 409)\n        }\n\n        let appliedChange: AppliedChangeResult\n\n        try {\n          appliedChange = await applyChange({\n            hasTransaction,\n            overrideAccess,\n            payload,\n            req,\n            resolved: resolvedChange,\n            targetReq: writeTargetReq,\n          })\n        } finally {\n          if (previousCaptureSavedVersionID === undefined) {\n            delete writeTargetContext[captureSavedVersionIDContextKey]\n          } else {\n            writeTargetContext[captureSavedVersionIDContextKey] = previousCaptureSavedVersionID\n          }\n        }\n\n        sourceCleanupPlans.push({ changeID: change.id, ...appliedChange })\n        appliedChangeIDs.add(String(change.id))\n        ledger.updateChange({\n          changeID: change.id,\n          update: {\n            afterVersionID,\n            applicationOutcome: 'applied',\n            beforeVersionID,\n            sourceID: appliedChange.sourceID,\n            sourceUpdatedAt: appliedChange.sourceUpdatedAt,\n            sourceVersionIDs: appliedChange.sourceVersionIDs,\n          },\n        })\n\n        if (uploadSourceDocs.length) {\n          const retainedDoc = (await payload.db.findOne({\n            branch: false,\n            collection: collectionSlug,\n            req,\n            where: {\n              and: [{ [branchField]: { equals: MAIN_BRANCH } }, { id: { equals: docID } }],\n            },\n          })) as null | Record<string, unknown>\n\n          uploadCleanupPlans.push({\n            changeID: change.id,\n            collectionSlug,\n            retainedDoc,\n            sourceDocs: uploadSourceDocs,\n          })\n        }\n\n        const persistedTarget = await readCollectionMergeSnapshot({\n          collectionSlug,\n          docID,\n          payload,\n          req,\n        })\n\n        ledger.updateChange({\n          changeID: change.id,\n          update: {\n            docTitle: getSnapshotDocumentTitle({\n              after: persistedTarget,\n              docID,\n              useAsTitle: collectionConfig.admin?.useAsTitle,\n            }),\n          },\n        })\n\n        result.merged.push({\n          changeID: change.id,\n          collectionSlug: change.collectionSlug as string,\n          docID: changeDocID(change),\n          entityType: 'collection',\n          operation: change.operation as BranchOperation,\n        })\n        activeChangeID = undefined\n      }\n\n      await ledger.persistAppliedChanges({ changeIDs: changeBatchIDs })\n    }\n\n    // Globals, after the documents. Ordered that way because a global usually points at\n    // documents rather than the other way round, so merging it last means whatever it\n    // references is already on main.\n    for (const [index, change] of applicableGlobals.entries()) {\n      const globalSlug = change.globalSlug as string\n\n      activeChangeID = change.id\n      ledger.updateChange({\n        changeID: change.id,\n        update: { applicationOutcome: 'attempted' },\n      })\n      await ledger.persist({ status: 'inProgress' })\n\n      await onProgress?.(\n        {\n          collectionSlug: globalSlug,\n          current: applicableInWriteOrder.length + index + 1,\n          docID: globalSlug,\n          operation: 'update',\n          total: applicableInWriteOrder.length + applicableGlobals.length,\n        },\n        req,\n      )\n\n      if (!overrideAccess) {\n        const blockedAtUse = await runGlobalMergePreflight({\n          payload,\n          pending: [change],\n          req: writeTargetReq,\n        })\n\n        if (blockedAtUse.length) {\n          throw new Forbidden(req.t)\n        }\n      }\n\n      const beforeVersionID = await findLatestTargetGlobalVersionID({\n        globalSlug,\n        payload,\n        req: writeTargetReq,\n      })\n      let afterVersionID: string | undefined\n      const writeTargetContext = writeTargetReq.context as Record<PropertyKey, unknown>\n      const previousCaptureSavedVersionID = writeTargetContext[captureSavedVersionIDContextKey]\n\n      writeTargetContext[captureSavedVersionIDContextKey] = ((capturedVersion) => {\n        if (capturedVersion.globalSlug === globalSlug) {\n          afterVersionID = String(capturedVersion.versionID)\n        }\n      }) satisfies CaptureSavedVersionID\n\n      const dependencyBlockedAtUse = await runMergeDependencyPreflight({\n        availableChangeIDs: appliedChangeIDs,\n        initiallyBlocked: [],\n        payload,\n        pending: [],\n        pendingGlobals: [change],\n        req: writeTargetReq,\n      })\n\n      if (dependencyBlockedAtUse.length) {\n        throw new APIError(dependencyBlockedAtUse[0]!.message, 409)\n      }\n\n      let appliedGlobal: AppliedChangeResult\n\n      try {\n        appliedGlobal = await applyGlobalChange({\n          branch,\n          globalSlug,\n          overrideAccess,\n          payload,\n          req,\n          targetReq: writeTargetReq,\n        })\n      } finally {\n        if (previousCaptureSavedVersionID === undefined) {\n          delete writeTargetContext[captureSavedVersionIDContextKey]\n        } else {\n          writeTargetContext[captureSavedVersionIDContextKey] = previousCaptureSavedVersionID\n        }\n      }\n\n      sourceCleanupPlans.push({ changeID: change.id, ...appliedGlobal })\n      appliedChangeIDs.add(String(change.id))\n      ledger.updateChange({\n        changeID: change.id,\n        update: {\n          afterVersionID,\n          applicationOutcome: 'applied',\n          beforeVersionID,\n          sourceRevision: appliedGlobal.sourceRevision,\n        },\n      })\n      await ledger.persistAppliedChanges({ changeIDs: [change.id] })\n\n      const globalConfig = payload.globals?.config?.find((config) => config.slug === globalSlug)\n\n      ledger.updateChange({\n        changeID: change.id,\n        update: {\n          docTitle: typeof globalConfig?.label === 'string' ? globalConfig.label : globalSlug,\n        },\n      })\n\n      result.merged.push({\n        changeID: change.id,\n        entityType: 'global',\n        globalSlug,\n        operation: 'update',\n      })\n      activeChangeID = undefined\n    }\n\n    mergedAt = new Date().toISOString()\n\n    if (cleanupScope) {\n      await flushDeferredCleanupScopeAfterOperation({ req, scope: cleanupScope })\n    }\n\n    if (hasTransaction) {\n      await ledger.persist({ mergedAt, status: 'awaitingCommit' })\n      await scheduleAfterTransactionCommit({ callback: finalizeAfterCommit, req })\n      await scheduleAfterTransactionRollback({ callback: recordRollback, req })\n    }\n\n    if (shouldCommit) {\n      isFinalCommitInProgress = true\n      await commitTransaction(req)\n      isFinalCommitInProgress = false\n    }\n  } catch (error) {\n    const isCommitResultUnknown = isFinalCommitInProgress && isUnknownTransactionCommitResult(error)\n\n    if (isCommitResultUnknown) {\n      reqContext[unknownMergeCommitResultContextKey] = true\n    }\n\n    if (cleanupScope) {\n      clearDeferredCleanupScope({ req, scope: cleanupScope })\n    }\n\n    if (shouldCommit && !isCommitResultUnknown) {\n      await killTransaction(req)\n    }\n\n    await recoverMergeFailure({\n      activeChangeID,\n      didRollbackTransaction: shouldCommit && !isCommitResultUnknown,\n      error,\n      hasTransaction,\n      isTransactionOutcomeUnknown: isCommitResultUnknown,\n      ledger,\n      overrideAccess,\n      payload,\n      req,\n      sourceCleanupPlans,\n    })\n\n    throw error\n  } finally {\n    if (previousBranchMergeWriteGuard === undefined) {\n      delete reqContext[branchMergeWriteGuardContextKey]\n    } else {\n      reqContext[branchMergeWriteGuardContextKey] = previousBranchMergeWriteGuard\n    }\n\n    if (!overrideAccess) {\n      if (previousThrowOnFieldAccessDenied === undefined) {\n        delete reqContext[throwOnFieldAccessDeniedContextKey]\n      } else {\n        reqContext[throwOnFieldAccessDeniedContextKey] = previousThrowOnFieldAccessDenied\n      }\n    }\n\n    if (incomingReq) {\n      refreshBranchState(incomingReq)\n    }\n  }\n\n  if (!hasTransaction) {\n    await finalizeAfterCommit()\n  }\n\n  return result\n}\n"],"names":["APIError","Forbidden","throwOnFieldAccessDeniedContextKey","commitTransaction","isUnknownTransactionCommitResult","initTransaction","killTransaction","beginDeferredCleanupScope","clearDeferredCleanupScope","flushDeferredCleanupScopeAfterOperation","scheduleAfterTransactionCommit","scheduleAfterTransactionRollback","captureSavedVersionIDContextKey","resolveEffectiveOperations","branchMergeWriteGuardContextKey","hasUnavailableBranchCreatedDependency","resolveMergeDependencies","runGlobalMergePreflight","runMergeDependencyPreflight","runMergePreflight","readCollectionMergeSnapshot","refreshBranchState","branchField","branchParentField","MAIN_BRANCH","createMainBranchRequest","applyChange","applyGlobalChange","finalizeMergeAfterCommit","recordMergeRollback","createMergeLedger","recoverMergeFailure","changeDocID","mergeEventCheckpointBatchSize","unknownMergeCommitResultContextKey","Symbol","findLatestTargetCollectionVersionID","collectionSlug","docID","payload","req","collections","config","versions","undefined","docs","db","findVersions","branch","collection","limit","pagination","sort","where","parent","equals","versionID","id","String","findLatestTargetGlobalVersionID","globalSlug","globalConfig","globals","find","slug","findGlobalVersions","global","readBranchUploadVersionDocuments","rowID","and","exists","flatMap","version","Array","isArray","orderChangesByDependencies","changes","dependencyChangeIDsByChangeID","changesByID","Map","map","change","orderedChanges","orderedChangeIDs","Set","visitingChangeIDs","visitChange","changeID","has","add","dependencyChangeID","get","dependencyChange","delete","push","getSnapshotDocumentTitle","after","useAsTitle","title","executeMerge","applicable","applicableGlobals","branchDoc","closeBranch","incomingReq","mergeable","onProgress","overrideAccess","result","ledger","shouldCommit","transactionID","hasTransaction","cleanupScope","uploadCleanupPlans","sourceCleanupPlans","appliedChangeIDs","reqContext","context","previousBranchMergeWriteGuard","previousThrowOnFieldAccessDenied","data","writeReq","availableChangeIDs","activeChangeID","isFinalCommitInProgress","mergedAt","finalizeAfterCommit","recordRollback","writeTargetReq","refreshedApplicable","dependencyPlan","initiallyBlocked","pending","pendingGlobals","blocked","length","message","applicableInWriteOrder","batchStart","changeBatch","slice","changeBatchIDs","updateChanges","changeIDs","update","applicationOutcome","persist","status","batchIndex","entries","index","current","operation","total","resolvedChange","Error","blockedAtUse","t","collectionConfig","beforeVersionID","afterVersionID","writeTargetContext","previousCaptureSavedVersionID","capturedVersion","uploadSourceDocs","upload","mainDocument","findOne","shadow","dependencyBlockedAtUse","appliedChange","resolved","targetReq","updateChange","sourceID","sourceUpdatedAt","sourceVersionIDs","retainedDoc","sourceDocs","persistedTarget","docTitle","admin","merged","entityType","persistAppliedChanges","appliedGlobal","sourceRevision","label","Date","toISOString","scope","callback","error","isCommitResultUnknown","didRollbackTransaction","isTransactionOutcomeUnknown"],"mappings":"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"}

package/dist/branching/merge/finalizeMerge.d.ts

@@ -0,0 +1,40 @@
+import type { Payload, PayloadRequest } from '../../types/index.js';
+import type { MergeResult } from '../merge.js';
+import type { MergeLedger } from './mergeLedger.js';
+import type { SourceCleanupOutcome, SourceRecoveryOutcome } from './utilities.js';
+export type SourceCleanupPlan = {
+    changeID: number | string;
+    cleanup: () => Promise<SourceCleanupOutcome>;
+    recover?: () => Promise<SourceRecoveryOutcome>;
+};
+export type UploadCleanupPlan = {
+    changeID: number | string;
+    collectionSlug: string;
+    retainedDoc: null | Record<string, unknown>;
+    sourceDocs: Record<string, unknown>[];
+};
+export declare const finalizeMergeAfterCommit: ({ branch, branchDoc, closeBranch, incomingReq, ledger, mergedAt, payload, req, result, sourceCleanupPlans, uploadCleanupPlans, }: {
+    branch: string;
+    branchDoc: {
+        id: number | string;
+    };
+    closeBranch: boolean;
+    incomingReq?: PayloadRequest;
+    ledger: MergeLedger;
+    mergedAt?: string;
+    payload: Payload;
+    req: PayloadRequest;
+    result: MergeResult;
+    sourceCleanupPlans: SourceCleanupPlan[];
+    uploadCleanupPlans: UploadCleanupPlan[];
+}) => Promise<void>;
+export declare const recordMergeRollback: ({ branchDoc, incomingReq, ledger, payload, req, }: {
+    branchDoc: {
+        id: number | string;
+    };
+    incomingReq?: PayloadRequest;
+    ledger: MergeLedger;
+    payload: Payload;
+    req: PayloadRequest;
+}) => Promise<void>;
+//# sourceMappingURL=finalizeMerge.d.ts.map

package/dist/branching/merge/finalizeMerge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"finalizeMerge.d.ts","sourceRoot":"","sources":["../../../src/branching/merge/finalizeMerge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAE9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAYjF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,OAAO,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAA;IAC5C,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,WAAW,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC3C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;CACtC,CAAA;AAED,eAAO,MAAM,wBAAwB,qIAYlC;IACD,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAClC,WAAW,EAAE,OAAO,CAAA;IACpB,WAAW,CAAC,EAAE,cAAc,CAAA;IAC5B,MAAM,EAAE,WAAW,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,WAAW,CAAA;IACnB,kBAAkB,EAAE,iBAAiB,EAAE,CAAA;IACvC,kBAAkB,EAAE,iBAAiB,EAAE,CAAA;CACxC,KAAG,OAAO,CAAC,IAAI,CAqMf,CAAA;AAED,eAAO,MAAM,mBAAmB,sDAM7B;IACD,SAAS,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAClC,WAAW,CAAC,EAAE,cAAc,CAAA;IAC5B,MAAM,EAAE,WAAW,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CAiBf,CAAA"}

package/dist/branching/merge/finalizeMerge.js

@@ -0,0 +1,237 @@
+import { deleteUploadFilesExclusiveToDocument } from '../../uploads/deleteUploadFilesExclusiveToDocument.js';
+import { collectStoredFiles, scheduleUnreferencedFileCleanup } from '../../uploads/fileVersioning/cleanup.js';
+import { refreshBranchState } from '../resolveBranch.js';
+import { branchChangesCollectionSlug, branchesCollectionSlug } from '../types.js';
+import { restoreBranchAfterMerge } from './branchMergeStatus.js';
+import { getMergeErrorMessage } from './utilities.js';
+export const finalizeMergeAfterCommit = async ({ branch, branchDoc, closeBranch, incomingReq, ledger, mergedAt, payload, req, result, sourceCleanupPlans, uploadCleanupPlans })=>{
+    const cleanupErrors = [];
+    const uploadCleanupPlanByChangeID = new Map(uploadCleanupPlans.map((plan)=>[
+            String(plan.changeID),
+            plan
+        ]));
+    const recordCleanupOutcome = ({ changeID, cleanupError, cleanupOutcome })=>{
+        if (cleanupError) {
+            cleanupErrors.push(cleanupError);
+        }
+        ledger.updateChange({
+            changeID,
+            update: cleanupError ? {
+                cleanupError,
+                cleanupOutcome: 'failed'
+            } : {
+                cleanupError: undefined,
+                cleanupOutcome
+            }
+        });
+    };
+    ledger.mapChanges({
+        update: (change)=>({
+                ...change,
+                applicationOutcome: change.applicationOutcome === 'applied' ? 'committed' : change.applicationOutcome
+            })
+    });
+    await ledger.persist({
+        mergedAt,
+        status: 'inProgress'
+    });
+    const completedSourceCleanups = [];
+    for (const sourceCleanupPlan of sourceCleanupPlans){
+        const { changeID, cleanup } = sourceCleanupPlan;
+        try {
+            const cleanupOutcome = await cleanup();
+            if (cleanupOutcome === 'superseded') {
+                recordCleanupOutcome({
+                    changeID,
+                    cleanupOutcome
+                });
+                continue;
+            }
+            completedSourceCleanups.push(sourceCleanupPlan);
+        } catch (error) {
+            recordCleanupOutcome({
+                changeID,
+                cleanupError: getMergeErrorMessage({
+                    error
+                }),
+                cleanupOutcome: 'failed'
+            });
+        }
+    }
+    if (completedSourceCleanups.length) {
+        let registryCleanupResults;
+        try {
+            registryCleanupResults = await payload.db.batchProcessing({
+                operations: completedSourceCleanups.map(({ changeID })=>({
+                        args: {
+                            branch: false,
+                            collection: branchChangesCollectionSlug,
+                            returning: false,
+                            where: {
+                                id: {
+                                    equals: changeID
+                                }
+                            }
+                        },
+                        operation: 'deleteOne'
+                    })),
+                req
+            });
+        } catch (error) {
+            const cleanupError = getMergeErrorMessage({
+                error
+            });
+            for (const { changeID } of completedSourceCleanups){
+                recordCleanupOutcome({
+                    changeID,
+                    cleanupError,
+                    cleanupOutcome: 'failed'
+                });
+            }
+        }
+        const registryCleanupResultByIndex = new Map(registryCleanupResults?.map((cleanupResult)=>[
+                cleanupResult.index,
+                cleanupResult
+            ]));
+        for (const [index, { changeID }] of completedSourceCleanups.entries()){
+            if (!registryCleanupResults) {
+                continue;
+            }
+            const registryCleanupResult = registryCleanupResultByIndex.get(index);
+            let cleanupError;
+            if (!registryCleanupResult || registryCleanupResult.status === 'unattempted') {
+                cleanupError = 'Branch change registry cleanup was not attempted.';
+            } else if (registryCleanupResult.status === 'failed') {
+                cleanupError = getMergeErrorMessage({
+                    error: registryCleanupResult.error
+                });
+            }
+            if (!cleanupError) {
+                const uploadCleanupPlan = uploadCleanupPlanByChangeID.get(String(changeID));
+                if (uploadCleanupPlan) {
+                    try {
+                        const collectionConfig = payload.collections[uploadCleanupPlan.collectionSlug].config;
+                        for (const sourceDoc of uploadCleanupPlan.sourceDocs){
+                            const candidates = await collectStoredFiles({
+                                collection: collectionConfig,
+                                doc: sourceDoc,
+                                req
+                            });
+                            if (candidates.length) {
+                                await scheduleUnreferencedFileCleanup({
+                                    candidates,
+                                    collection: collectionConfig,
+                                    req
+                                });
+                            } else {
+                                await deleteUploadFilesExclusiveToDocument({
+                                    collectionConfig,
+                                    config: payload.config,
+                                    deleteFromAdapter: false,
+                                    req,
+                                    retainedDoc: uploadCleanupPlan.retainedDoc,
+                                    sourceDoc
+                                });
+                            }
+                        }
+                        const legacyCleanupSourceDoc = uploadCleanupPlan.sourceDocs[0];
+                        if (!collectionConfig.upload.fileOperations && legacyCleanupSourceDoc) {
+                            await collectionConfig.upload.deleteFiles?.({
+                                req,
+                                retainedDoc: uploadCleanupPlan.retainedDoc,
+                                sourceDoc: legacyCleanupSourceDoc
+                            });
+                        }
+                    } catch (error) {
+                        cleanupError = getMergeErrorMessage({
+                            error
+                        });
+                    }
+                }
+            }
+            recordCleanupOutcome({
+                changeID,
+                cleanupError,
+                cleanupOutcome: cleanupError ? 'failed' : 'completed'
+            });
+        }
+    }
+    try {
+        const remaining = await payload.count({
+            collection: branchChangesCollectionSlug,
+            overrideAccess: true,
+            req,
+            where: {
+                branch: {
+                    equals: branch
+                }
+            }
+        });
+        await payload.update({
+            id: branchDoc.id,
+            collection: branchesCollectionSlug,
+            data: remaining.totalDocs === 0 ? {
+                mergedAt,
+                status: closeBranch ? 'closed' : 'merged'
+            } : {
+                mergedAt: null,
+                status: 'open'
+            },
+            overrideAccess: true,
+            req
+        });
+    } catch (error) {
+        cleanupErrors.push(getMergeErrorMessage({
+            error
+        }));
+        try {
+            await restoreBranchAfterMerge({
+                branchDocID: branchDoc.id,
+                payload,
+                req
+            });
+        } catch (restoreError) {
+            cleanupErrors.push(getMergeErrorMessage({
+                error: restoreError
+            }));
+        }
+    }
+    const completedAt = new Date().toISOString();
+    await ledger.persist({
+        completedAt,
+        error: cleanupErrors.length ? cleanupErrors.join('\n') : undefined,
+        mergedAt: mergedAt ?? completedAt,
+        status: cleanupErrors.length ? 'cleanupFailed' : 'succeeded'
+    });
+    await payload.config.branching?.hooks?.afterMerge?.({
+        branch,
+        req,
+        results: result.merged
+    });
+    if (incomingReq) {
+        refreshBranchState(incomingReq);
+    }
+};
+export const recordMergeRollback = async ({ branchDoc, incomingReq, ledger, payload, req })=>{
+    ledger.mapChanges({
+        update: (change)=>change.applicationOutcome === 'applied' ? {
+                ...change,
+                applicationOutcome: 'rolledBack'
+            } : change
+    });
+    await ledger.persist({
+        completedAt: new Date().toISOString(),
+        error: 'Caller-owned transaction rolled back.',
+        status: 'failed'
+    });
+    await restoreBranchAfterMerge({
+        branchDocID: branchDoc.id,
+        payload,
+        req
+    });
+    if (incomingReq) {
+        refreshBranchState(incomingReq);
+    }
+};
+
+//# sourceMappingURL=finalizeMerge.js.map

package/dist/branching/merge/finalizeMerge.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/branching/merge/finalizeMerge.ts"],"sourcesContent":["import type { Payload, PayloadRequest } from '../../types/index.js'\nimport type { MergeResult } from '../merge.js'\nimport type { MergeEventChange } from '../types.js'\nimport type { MergeLedger } from './mergeLedger.js'\nimport type { SourceCleanupOutcome, SourceRecoveryOutcome } from './utilities.js'\n\nimport { deleteUploadFilesExclusiveToDocument } from '../../uploads/deleteUploadFilesExclusiveToDocument.js'\nimport {\n  collectStoredFiles,\n  scheduleUnreferencedFileCleanup,\n} from '../../uploads/fileVersioning/cleanup.js'\nimport { refreshBranchState } from '../resolveBranch.js'\nimport { branchChangesCollectionSlug, branchesCollectionSlug } from '../types.js'\nimport { restoreBranchAfterMerge } from './branchMergeStatus.js'\nimport { getMergeErrorMessage } from './utilities.js'\n\nexport type SourceCleanupPlan = {\n  changeID: number | string\n  cleanup: () => Promise<SourceCleanupOutcome>\n  recover?: () => Promise<SourceRecoveryOutcome>\n}\n\nexport type UploadCleanupPlan = {\n  changeID: number | string\n  collectionSlug: string\n  retainedDoc: null | Record<string, unknown>\n  sourceDocs: Record<string, unknown>[]\n}\n\nexport const finalizeMergeAfterCommit = async ({\n  branch,\n  branchDoc,\n  closeBranch,\n  incomingReq,\n  ledger,\n  mergedAt,\n  payload,\n  req,\n  result,\n  sourceCleanupPlans,\n  uploadCleanupPlans,\n}: {\n  branch: string\n  branchDoc: { id: number | string }\n  closeBranch: boolean\n  incomingReq?: PayloadRequest\n  ledger: MergeLedger\n  mergedAt?: string\n  payload: Payload\n  req: PayloadRequest\n  result: MergeResult\n  sourceCleanupPlans: SourceCleanupPlan[]\n  uploadCleanupPlans: UploadCleanupPlan[]\n}): Promise<void> => {\n  const cleanupErrors: string[] = []\n  const uploadCleanupPlanByChangeID = new Map(\n    uploadCleanupPlans.map((plan) => [String(plan.changeID), plan]),\n  )\n  const recordCleanupOutcome = ({\n    changeID,\n    cleanupError,\n    cleanupOutcome,\n  }: {\n    changeID: number | string\n    cleanupError?: string\n    cleanupOutcome: MergeEventChange['cleanupOutcome']\n  }): void => {\n    if (cleanupError) {\n      cleanupErrors.push(cleanupError)\n    }\n\n    ledger.updateChange({\n      changeID,\n      update: cleanupError\n        ? { cleanupError, cleanupOutcome: 'failed' }\n        : { cleanupError: undefined, cleanupOutcome },\n    })\n  }\n\n  ledger.mapChanges({\n    update: (change) => ({\n      ...change,\n      applicationOutcome:\n        change.applicationOutcome === 'applied' ? 'committed' : change.applicationOutcome,\n    }),\n  })\n  await ledger.persist({ mergedAt, status: 'inProgress' })\n\n  const completedSourceCleanups: SourceCleanupPlan[] = []\n\n  for (const sourceCleanupPlan of sourceCleanupPlans) {\n    const { changeID, cleanup } = sourceCleanupPlan\n\n    try {\n      const cleanupOutcome = await cleanup()\n\n      if (cleanupOutcome === 'superseded') {\n        recordCleanupOutcome({ changeID, cleanupOutcome })\n        continue\n      }\n\n      completedSourceCleanups.push(sourceCleanupPlan)\n    } catch (error) {\n      recordCleanupOutcome({\n        changeID,\n        cleanupError: getMergeErrorMessage({ error }),\n        cleanupOutcome: 'failed',\n      })\n    }\n  }\n\n  if (completedSourceCleanups.length) {\n    let registryCleanupResults: Awaited<ReturnType<typeof payload.db.batchProcessing>> | undefined\n\n    try {\n      registryCleanupResults = await payload.db.batchProcessing({\n        operations: completedSourceCleanups.map(({ changeID }) => ({\n          args: {\n            branch: false,\n            collection: branchChangesCollectionSlug,\n            returning: false,\n            where: { id: { equals: changeID } },\n          },\n          operation: 'deleteOne',\n        })),\n        req,\n      })\n    } catch (error) {\n      const cleanupError = getMergeErrorMessage({ error })\n\n      for (const { changeID } of completedSourceCleanups) {\n        recordCleanupOutcome({ changeID, cleanupError, cleanupOutcome: 'failed' })\n      }\n    }\n\n    const registryCleanupResultByIndex = new Map(\n      registryCleanupResults?.map((cleanupResult) => [cleanupResult.index, cleanupResult]),\n    )\n\n    for (const [index, { changeID }] of completedSourceCleanups.entries()) {\n      if (!registryCleanupResults) {\n        continue\n      }\n\n      const registryCleanupResult = registryCleanupResultByIndex.get(index)\n      let cleanupError: string | undefined\n\n      if (!registryCleanupResult || registryCleanupResult.status === 'unattempted') {\n        cleanupError = 'Branch change registry cleanup was not attempted.'\n      } else if (registryCleanupResult.status === 'failed') {\n        cleanupError = getMergeErrorMessage({ error: registryCleanupResult.error })\n      }\n\n      if (!cleanupError) {\n        const uploadCleanupPlan = uploadCleanupPlanByChangeID.get(String(changeID))\n\n        if (uploadCleanupPlan) {\n          try {\n            const collectionConfig = payload.collections[uploadCleanupPlan.collectionSlug]!.config\n\n            for (const sourceDoc of uploadCleanupPlan.sourceDocs) {\n              const candidates = await collectStoredFiles({\n                collection: collectionConfig,\n                doc: sourceDoc,\n                req,\n              })\n\n              if (candidates.length) {\n                await scheduleUnreferencedFileCleanup({\n                  candidates,\n                  collection: collectionConfig,\n                  req,\n                })\n              } else {\n                await deleteUploadFilesExclusiveToDocument({\n                  collectionConfig,\n                  config: payload.config,\n                  deleteFromAdapter: false,\n                  req,\n                  retainedDoc: uploadCleanupPlan.retainedDoc,\n                  sourceDoc,\n                })\n              }\n            }\n\n            const legacyCleanupSourceDoc = uploadCleanupPlan.sourceDocs[0]\n\n            if (!collectionConfig.upload.fileOperations && legacyCleanupSourceDoc) {\n              await collectionConfig.upload.deleteFiles?.({\n                req,\n                retainedDoc: uploadCleanupPlan.retainedDoc,\n                sourceDoc: legacyCleanupSourceDoc,\n              })\n            }\n          } catch (error) {\n            cleanupError = getMergeErrorMessage({ error })\n          }\n        }\n      }\n\n      recordCleanupOutcome({\n        changeID,\n        cleanupError,\n        cleanupOutcome: cleanupError ? 'failed' : 'completed',\n      })\n    }\n  }\n\n  try {\n    const remaining = await payload.count({\n      collection: branchChangesCollectionSlug,\n      overrideAccess: true,\n      req,\n      where: { branch: { equals: branch } },\n    })\n\n    await payload.update({\n      id: branchDoc.id,\n      collection: branchesCollectionSlug,\n      data:\n        remaining.totalDocs === 0\n          ? { mergedAt, status: closeBranch ? 'closed' : 'merged' }\n          : { mergedAt: null, status: 'open' },\n      overrideAccess: true,\n      req,\n    })\n  } catch (error) {\n    cleanupErrors.push(getMergeErrorMessage({ error }))\n\n    try {\n      await restoreBranchAfterMerge({ branchDocID: branchDoc.id, payload, req })\n    } catch (restoreError) {\n      cleanupErrors.push(getMergeErrorMessage({ error: restoreError }))\n    }\n  }\n\n  const completedAt = new Date().toISOString()\n\n  await ledger.persist({\n    completedAt,\n    error: cleanupErrors.length ? cleanupErrors.join('\\n') : undefined,\n    mergedAt: mergedAt ?? completedAt,\n    status: cleanupErrors.length ? 'cleanupFailed' : 'succeeded',\n  })\n\n  await payload.config.branching?.hooks?.afterMerge?.({ branch, req, results: result.merged })\n\n  if (incomingReq) {\n    refreshBranchState(incomingReq)\n  }\n}\n\nexport const recordMergeRollback = async ({\n  branchDoc,\n  incomingReq,\n  ledger,\n  payload,\n  req,\n}: {\n  branchDoc: { id: number | string }\n  incomingReq?: PayloadRequest\n  ledger: MergeLedger\n  payload: Payload\n  req: PayloadRequest\n}): Promise<void> => {\n  ledger.mapChanges({\n    update: (change) =>\n      change.applicationOutcome === 'applied'\n        ? { ...change, applicationOutcome: 'rolledBack' }\n        : change,\n  })\n  await ledger.persist({\n    completedAt: new Date().toISOString(),\n    error: 'Caller-owned transaction rolled back.',\n    status: 'failed',\n  })\n  await restoreBranchAfterMerge({ branchDocID: branchDoc.id, payload, req })\n\n  if (incomingReq) {\n    refreshBranchState(incomingReq)\n  }\n}\n"],"names":["deleteUploadFilesExclusiveToDocument","collectStoredFiles","scheduleUnreferencedFileCleanup","refreshBranchState","branchChangesCollectionSlug","branchesCollectionSlug","restoreBranchAfterMerge","getMergeErrorMessage","finalizeMergeAfterCommit","branch","branchDoc","closeBranch","incomingReq","ledger","mergedAt","payload","req","result","sourceCleanupPlans","uploadCleanupPlans","cleanupErrors","uploadCleanupPlanByChangeID","Map","map","plan","String","changeID","recordCleanupOutcome","cleanupError","cleanupOutcome","push","updateChange","update","undefined","mapChanges","change","applicationOutcome","persist","status","completedSourceCleanups","sourceCleanupPlan","cleanup","error","length","registryCleanupResults","db","batchProcessing","operations","args","collection","returning","where","id","equals","operation","registryCleanupResultByIndex","cleanupResult","index","entries","registryCleanupResult","get","uploadCleanupPlan","collectionConfig","collections","collectionSlug","config","sourceDoc","sourceDocs","candidates","doc","deleteFromAdapter","retainedDoc","legacyCleanupSourceDoc","upload","fileOperations","deleteFiles","remaining","count","overrideAccess","data","totalDocs","branchDocID","restoreError","completedAt","Date","toISOString","join","branching","hooks","afterMerge","results","merged","recordMergeRollback"],"mappings":"AAMA,SAASA,oCAAoC,QAAQ,wDAAuD;AAC5G,SACEC,kBAAkB,EAClBC,+BAA+B,QAC1B,0CAAyC;AAChD,SAASC,kBAAkB,QAAQ,sBAAqB;AACxD,SAASC,2BAA2B,EAAEC,sBAAsB,QAAQ,cAAa;AACjF,SAASC,uBAAuB,QAAQ,yBAAwB;AAChE,SAASC,oBAAoB,QAAQ,iBAAgB;AAerD,OAAO,MAAMC,2BAA2B,OAAO,EAC7CC,MAAM,EACNC,SAAS,EACTC,WAAW,EACXC,WAAW,EACXC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,GAAG,EACHC,MAAM,EACNC,kBAAkB,EAClBC,kBAAkB,EAanB;IACC,MAAMC,gBAA0B,EAAE;IAClC,MAAMC,8BAA8B,IAAIC,IACtCH,mBAAmBI,GAAG,CAAC,CAACC,OAAS;YAACC,OAAOD,KAAKE,QAAQ;YAAGF;SAAK;IAEhE,MAAMG,uBAAuB,CAAC,EAC5BD,QAAQ,EACRE,YAAY,EACZC,cAAc,EAKf;QACC,IAAID,cAAc;YAChBR,cAAcU,IAAI,CAACF;QACrB;QAEAf,OAAOkB,YAAY,CAAC;YAClBL;YACAM,QAAQJ,eACJ;gBAAEA;gBAAcC,gBAAgB;YAAS,IACzC;gBAAED,cAAcK;gBAAWJ;YAAe;QAChD;IACF;IAEAhB,OAAOqB,UAAU,CAAC;QAChBF,QAAQ,CAACG,SAAY,CAAA;gBACnB,GAAGA,MAAM;gBACTC,oBACED,OAAOC,kBAAkB,KAAK,YAAY,cAAcD,OAAOC,kBAAkB;YACrF,CAAA;IACF;IACA,MAAMvB,OAAOwB,OAAO,CAAC;QAAEvB;QAAUwB,QAAQ;IAAa;IAEtD,MAAMC,0BAA+C,EAAE;IAEvD,KAAK,MAAMC,qBAAqBtB,mBAAoB;QAClD,MAAM,EAAEQ,QAAQ,EAAEe,OAAO,EAAE,GAAGD;QAE9B,IAAI;YACF,MAAMX,iBAAiB,MAAMY;YAE7B,IAAIZ,mBAAmB,cAAc;gBACnCF,qBAAqB;oBAAED;oBAAUG;gBAAe;gBAChD;YACF;YAEAU,wBAAwBT,IAAI,CAACU;QAC/B,EAAE,OAAOE,OAAO;YACdf,qBAAqB;gBACnBD;gBACAE,cAAcrB,qBAAqB;oBAAEmC;gBAAM;gBAC3Cb,gBAAgB;YAClB;QACF;IACF;IAEA,IAAIU,wBAAwBI,MAAM,EAAE;QAClC,IAAIC;QAEJ,IAAI;YACFA,yBAAyB,MAAM7B,QAAQ8B,EAAE,CAACC,eAAe,CAAC;gBACxDC,YAAYR,wBAAwBhB,GAAG,CAAC,CAAC,EAAEG,QAAQ,EAAE,GAAM,CAAA;wBACzDsB,MAAM;4BACJvC,QAAQ;4BACRwC,YAAY7C;4BACZ8C,WAAW;4BACXC,OAAO;gCAAEC,IAAI;oCAAEC,QAAQ3B;gCAAS;4BAAE;wBACpC;wBACA4B,WAAW;oBACb,CAAA;gBACAtC;YACF;QACF,EAAE,OAAO0B,OAAO;YACd,MAAMd,eAAerB,qBAAqB;gBAAEmC;YAAM;YAElD,KAAK,MAAM,EAAEhB,QAAQ,EAAE,IAAIa,wBAAyB;gBAClDZ,qBAAqB;oBAAED;oBAAUE;oBAAcC,gBAAgB;gBAAS;YAC1E;QACF;QAEA,MAAM0B,+BAA+B,IAAIjC,IACvCsB,wBAAwBrB,IAAI,CAACiC,gBAAkB;gBAACA,cAAcC,KAAK;gBAAED;aAAc;QAGrF,KAAK,MAAM,CAACC,OAAO,EAAE/B,QAAQ,EAAE,CAAC,IAAIa,wBAAwBmB,OAAO,GAAI;YACrE,IAAI,CAACd,wBAAwB;gBAC3B;YACF;YAEA,MAAMe,wBAAwBJ,6BAA6BK,GAAG,CAACH;YAC/D,IAAI7B;YAEJ,IAAI,CAAC+B,yBAAyBA,sBAAsBrB,MAAM,KAAK,eAAe;gBAC5EV,eAAe;YACjB,OAAO,IAAI+B,sBAAsBrB,MAAM,KAAK,UAAU;gBACpDV,eAAerB,qBAAqB;oBAAEmC,OAAOiB,sBAAsBjB,KAAK;gBAAC;YAC3E;YAEA,IAAI,CAACd,cAAc;gBACjB,MAAMiC,oBAAoBxC,4BAA4BuC,GAAG,CAACnC,OAAOC;gBAEjE,IAAImC,mBAAmB;oBACrB,IAAI;wBACF,MAAMC,mBAAmB/C,QAAQgD,WAAW,CAACF,kBAAkBG,cAAc,CAAC,CAAEC,MAAM;wBAEtF,KAAK,MAAMC,aAAaL,kBAAkBM,UAAU,CAAE;4BACpD,MAAMC,aAAa,MAAMnE,mBAAmB;gCAC1CgD,YAAYa;gCACZO,KAAKH;gCACLlD;4BACF;4BAEA,IAAIoD,WAAWzB,MAAM,EAAE;gCACrB,MAAMzC,gCAAgC;oCACpCkE;oCACAnB,YAAYa;oCACZ9C;gCACF;4BACF,OAAO;gCACL,MAAMhB,qCAAqC;oCACzC8D;oCACAG,QAAQlD,QAAQkD,MAAM;oCACtBK,mBAAmB;oCACnBtD;oCACAuD,aAAaV,kBAAkBU,WAAW;oCAC1CL;gCACF;4BACF;wBACF;wBAEA,MAAMM,yBAAyBX,kBAAkBM,UAAU,CAAC,EAAE;wBAE9D,IAAI,CAACL,iBAAiBW,MAAM,CAACC,cAAc,IAAIF,wBAAwB;4BACrE,MAAMV,iBAAiBW,MAAM,CAACE,WAAW,GAAG;gCAC1C3D;gCACAuD,aAAaV,kBAAkBU,WAAW;gCAC1CL,WAAWM;4BACb;wBACF;oBACF,EAAE,OAAO9B,OAAO;wBACdd,eAAerB,qBAAqB;4BAAEmC;wBAAM;oBAC9C;gBACF;YACF;YAEAf,qBAAqB;gBACnBD;gBACAE;gBACAC,gBAAgBD,eAAe,WAAW;YAC5C;QACF;IACF;IAEA,IAAI;QACF,MAAMgD,YAAY,MAAM7D,QAAQ8D,KAAK,CAAC;YACpC5B,YAAY7C;YACZ0E,gBAAgB;YAChB9D;YACAmC,OAAO;gBAAE1C,QAAQ;oBAAE4C,QAAQ5C;gBAAO;YAAE;QACtC;QAEA,MAAMM,QAAQiB,MAAM,CAAC;YACnBoB,IAAI1C,UAAU0C,EAAE;YAChBH,YAAY5C;YACZ0E,MACEH,UAAUI,SAAS,KAAK,IACpB;gBAAElE;gBAAUwB,QAAQ3B,cAAc,WAAW;YAAS,IACtD;gBAAEG,UAAU;gBAAMwB,QAAQ;YAAO;YACvCwC,gBAAgB;YAChB9D;QACF;IACF,EAAE,OAAO0B,OAAO;QACdtB,cAAcU,IAAI,CAACvB,qBAAqB;YAAEmC;QAAM;QAEhD,IAAI;YACF,MAAMpC,wBAAwB;gBAAE2E,aAAavE,UAAU0C,EAAE;gBAAErC;gBAASC;YAAI;QAC1E,EAAE,OAAOkE,cAAc;YACrB9D,cAAcU,IAAI,CAACvB,qBAAqB;gBAAEmC,OAAOwC;YAAa;QAChE;IACF;IAEA,MAAMC,cAAc,IAAIC,OAAOC,WAAW;IAE1C,MAAMxE,OAAOwB,OAAO,CAAC;QACnB8C;QACAzC,OAAOtB,cAAcuB,MAAM,GAAGvB,cAAckE,IAAI,CAAC,QAAQrD;QACzDnB,UAAUA,YAAYqE;QACtB7C,QAAQlB,cAAcuB,MAAM,GAAG,kBAAkB;IACnD;IAEA,MAAM5B,QAAQkD,MAAM,CAACsB,SAAS,EAAEC,OAAOC,aAAa;QAAEhF;QAAQO;QAAK0E,SAASzE,OAAO0E,MAAM;IAAC;IAE1F,IAAI/E,aAAa;QACfT,mBAAmBS;IACrB;AACF,EAAC;AAED,OAAO,MAAMgF,sBAAsB,OAAO,EACxClF,SAAS,EACTE,WAAW,EACXC,MAAM,EACNE,OAAO,EACPC,GAAG,EAOJ;IACCH,OAAOqB,UAAU,CAAC;QAChBF,QAAQ,CAACG,SACPA,OAAOC,kBAAkB,KAAK,YAC1B;gBAAE,GAAGD,MAAM;gBAAEC,oBAAoB;YAAa,IAC9CD;IACR;IACA,MAAMtB,OAAOwB,OAAO,CAAC;QACnB8C,aAAa,IAAIC,OAAOC,WAAW;QACnC3C,OAAO;QACPJ,QAAQ;IACV;IACA,MAAMhC,wBAAwB;QAAE2E,aAAavE,UAAU0C,EAAE;QAAErC;QAASC;IAAI;IAExE,IAAIJ,aAAa;QACfT,mBAAmBS;IACrB;AACF,EAAC"}

package/dist/branching/merge/mergeLedger.d.ts

@@ -0,0 +1,40 @@
+import type { Payload, PayloadRequest } from '../../types/index.js';
+import type { MergeableChange, MergeEventChange } from '../types.js';
+type MergeEventStatus = 'awaitingCommit' | 'cleanupFailed' | 'failed' | 'inProgress' | 'succeeded';
+export type MergeLedger = {
+    findChange: (args: {
+        changeID: number | string;
+    }) => MergeEventChange | undefined;
+    getChanges: () => MergeEventChange[];
+    mapChanges: (args: {
+        update: (change: MergeEventChange) => MergeEventChange;
+    }) => MergeEventChange[];
+    persist: (args: {
+        completedAt?: string;
+        error?: string;
+        mergedAt?: string;
+        status: MergeEventStatus;
+    }) => Promise<void>;
+    persistAppliedChanges: (args: {
+        changeIDs: (number | string)[];
+    }) => Promise<void>;
+    persistRecovery: (args: {
+        changeID: number | string;
+    }) => Promise<boolean>;
+    updateChange: (args: {
+        changeID: number | string;
+        update: Partial<MergeEventChange>;
+    }) => MergeEventChange[];
+    updateChanges: (args: {
+        changeIDs: (number | string)[];
+        update: Partial<MergeEventChange>;
+    }) => MergeEventChange[];
+};
+export declare const createMergeLedger: ({ branch, mergeable, payload, req, }: {
+    branch: string;
+    mergeable: MergeableChange[];
+    payload: Payload;
+    req: PayloadRequest;
+}) => Promise<MergeLedger>;
+export {};
+//# sourceMappingURL=mergeLedger.d.ts.map

package/dist/branching/merge/mergeLedger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeLedger.d.ts","sourceRoot":"","sources":["../../../src/branching/merge/mergeLedger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAMpE,KAAK,gBAAgB,GAAG,gBAAgB,GAAG,eAAe,GAAG,QAAQ,GAAG,YAAY,GAAG,WAAW,CAAA;AAElG,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,KAAK,gBAAgB,GAAG,SAAS,CAAA;IACjF,UAAU,EAAE,MAAM,gBAAgB,EAAE,CAAA;IACpC,UAAU,EAAE,CAAC,IAAI,EAAE;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,gBAAgB,CAAA;KACvD,KAAK,gBAAgB,EAAE,CAAA;IACxB,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,MAAM,EAAE,gBAAgB,CAAA;KACzB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACnB,qBAAqB,EAAE,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClF,eAAe,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1E,YAAY,EAAE,CAAC,IAAI,EAAE;QACnB,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;QACzB,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAClC,KAAK,gBAAgB,EAAE,CAAA;IACxB,aAAa,EAAE,CAAC,IAAI,EAAE;QACpB,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;QAC9B,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAClC,KAAK,gBAAgB,EAAE,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,iBAAiB,yCAK3B;IACD,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,eAAe,EAAE,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,WAAW,CAsHtB,CAAA"}

package/dist/branching/merge/mergeLedger.js

@@ -0,0 +1,130 @@
+import { createPayloadRequest } from '../../utilities/createPayloadRequest.js';
+import { branchMergesCollectionSlug, MAIN_BRANCH } from '../types.js';
+import { getMergeErrorMessage } from './utilities.js';
+export const createMergeLedger = async ({ branch, mergeable, payload, req })=>{
+    const mergeEventReq = await createPayloadRequest({
+        branch: false,
+        payload,
+        user: req.user ?? undefined
+    });
+    let changes = mergeable.map((change)=>({
+            applicationOutcome: 'unattempted',
+            changeID: String(change.changeID),
+            cleanupOutcome: 'pending',
+            collectionSlug: change.collectionSlug,
+            docID: change.docID === undefined ? undefined : String(change.docID),
+            docTitle: String(change.docID ?? change.globalSlug),
+            globalSlug: change.globalSlug,
+            operation: change.operation,
+            recoveryOutcome: 'notNeeded',
+            targetID: change.docID === undefined ? change.globalSlug : String(change.docID)
+        }));
+    const changeIndexByID = new Map(changes.map((change, index)=>[
+            change.changeID,
+            index
+        ]));
+    const mergeEvent = await payload.create({
+        collection: branchMergesCollectionSlug,
+        data: {
+            branch,
+            changes,
+            mergedByCollection: req.user?.collection,
+            mergedByID: req.user?.id === undefined ? undefined : String(req.user.id),
+            mergedByLabel: req.user?.email,
+            startedAt: new Date().toISOString(),
+            status: 'inProgress',
+            targetBranch: MAIN_BRANCH
+        },
+        overrideAccess: true,
+        req: mergeEventReq
+    });
+    const updateChanges = ({ changeIDs, update })=>{
+        for (const changeID of changeIDs){
+            const changeIndex = changeIndexByID.get(String(changeID));
+            const change = changeIndex === undefined ? undefined : changes[changeIndex];
+            if (changeIndex !== undefined && change) {
+                changes[changeIndex] = {
+                    ...change,
+                    ...update
+                };
+            }
+        }
+        return changes;
+    };
+    const updateChange = ({ changeID, update })=>updateChanges({
+            changeIDs: [
+                changeID
+            ],
+            update
+        });
+    const persist = async ({ completedAt, error, mergedAt, status })=>{
+        await payload.update({
+            id: mergeEvent.id,
+            collection: branchMergesCollectionSlug,
+            data: {
+                changes,
+                completedAt,
+                error,
+                mergedAt,
+                status
+            },
+            overrideAccess: true,
+            req: mergeEventReq
+        });
+    };
+    const persistAppliedChanges = async ({ changeIDs })=>{
+        try {
+            await persist({
+                status: 'inProgress'
+            });
+        } catch (error) {
+            updateChanges({
+                changeIDs,
+                update: {
+                    applicationOutcome: 'unknown',
+                    error: getMergeErrorMessage({
+                        error
+                    }),
+                    recoveryOutcome: 'unknown'
+                }
+            });
+            throw error;
+        }
+    };
+    const persistRecovery = async ({ changeID })=>{
+        try {
+            await persist({
+                status: 'inProgress'
+            });
+            return true;
+        } catch (error) {
+            const recoveryError = getMergeErrorMessage({
+                error
+            });
+            const change = changes.find(({ changeID: candidateChangeID })=>candidateChangeID === String(changeID));
+            updateChange({
+                changeID,
+                update: {
+                    recoveryError: change?.recoveryError ? `${change.recoveryError}\n${recoveryError}` : recoveryError,
+                    recoveryOutcome: 'unknown'
+                }
+            });
+            return false;
+        }
+    };
+    return {
+        findChange: ({ changeID })=>changes.find(({ changeID: candidateChangeID })=>candidateChangeID === String(changeID)),
+        getChanges: ()=>changes,
+        mapChanges: ({ update })=>{
+            changes = changes.map(update);
+            return changes;
+        },
+        persist,
+        persistAppliedChanges,
+        persistRecovery,
+        updateChange,
+        updateChanges
+    };
+};
+
+//# sourceMappingURL=mergeLedger.js.map

package/dist/branching/merge/mergeLedger.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/branching/merge/mergeLedger.ts"],"sourcesContent":["import type { Payload, PayloadRequest } from '../../types/index.js'\nimport type { MergeableChange, MergeEventChange } from '../types.js'\n\nimport { createPayloadRequest } from '../../utilities/createPayloadRequest.js'\nimport { branchMergesCollectionSlug, MAIN_BRANCH } from '../types.js'\nimport { getMergeErrorMessage } from './utilities.js'\n\ntype MergeEventStatus = 'awaitingCommit' | 'cleanupFailed' | 'failed' | 'inProgress' | 'succeeded'\n\nexport type MergeLedger = {\n  findChange: (args: { changeID: number | string }) => MergeEventChange | undefined\n  getChanges: () => MergeEventChange[]\n  mapChanges: (args: {\n    update: (change: MergeEventChange) => MergeEventChange\n  }) => MergeEventChange[]\n  persist: (args: {\n    completedAt?: string\n    error?: string\n    mergedAt?: string\n    status: MergeEventStatus\n  }) => Promise<void>\n  persistAppliedChanges: (args: { changeIDs: (number | string)[] }) => Promise<void>\n  persistRecovery: (args: { changeID: number | string }) => Promise<boolean>\n  updateChange: (args: {\n    changeID: number | string\n    update: Partial<MergeEventChange>\n  }) => MergeEventChange[]\n  updateChanges: (args: {\n    changeIDs: (number | string)[]\n    update: Partial<MergeEventChange>\n  }) => MergeEventChange[]\n}\n\nexport const createMergeLedger = async ({\n  branch,\n  mergeable,\n  payload,\n  req,\n}: {\n  branch: string\n  mergeable: MergeableChange[]\n  payload: Payload\n  req: PayloadRequest\n}): Promise<MergeLedger> => {\n  const mergeEventReq = await createPayloadRequest({\n    branch: false,\n    payload,\n    user: req.user ?? undefined,\n  })\n  let changes: MergeEventChange[] = mergeable.map((change) => ({\n    applicationOutcome: 'unattempted',\n    changeID: String(change.changeID),\n    cleanupOutcome: 'pending',\n    collectionSlug: change.collectionSlug,\n    docID: change.docID === undefined ? undefined : String(change.docID),\n    docTitle: String(change.docID ?? change.globalSlug),\n    globalSlug: change.globalSlug,\n    operation: change.operation,\n    recoveryOutcome: 'notNeeded',\n    targetID: change.docID === undefined ? change.globalSlug : String(change.docID),\n  }))\n  const changeIndexByID = new Map(changes.map((change, index) => [change.changeID, index]))\n  const mergeEvent = await payload.create({\n    collection: branchMergesCollectionSlug,\n    data: {\n      branch,\n      changes,\n      mergedByCollection: req.user?.collection,\n      mergedByID: req.user?.id === undefined ? undefined : String(req.user.id),\n      mergedByLabel: (req.user as { email?: string } | null)?.email,\n      startedAt: new Date().toISOString(),\n      status: 'inProgress',\n      targetBranch: MAIN_BRANCH,\n    },\n    overrideAccess: true,\n    req: mergeEventReq,\n  })\n\n  const updateChanges: MergeLedger['updateChanges'] = ({ changeIDs, update }) => {\n    for (const changeID of changeIDs) {\n      const changeIndex = changeIndexByID.get(String(changeID))\n      const change = changeIndex === undefined ? undefined : changes[changeIndex]\n\n      if (changeIndex !== undefined && change) {\n        changes[changeIndex] = { ...change, ...update }\n      }\n    }\n\n    return changes\n  }\n\n  const updateChange: MergeLedger['updateChange'] = ({ changeID, update }) =>\n    updateChanges({ changeIDs: [changeID], update })\n\n  const persist: MergeLedger['persist'] = async ({ completedAt, error, mergedAt, status }) => {\n    await payload.update({\n      id: mergeEvent.id,\n      collection: branchMergesCollectionSlug,\n      data: { changes, completedAt, error, mergedAt, status },\n      overrideAccess: true,\n      req: mergeEventReq,\n    })\n  }\n\n  const persistAppliedChanges: MergeLedger['persistAppliedChanges'] = async ({ changeIDs }) => {\n    try {\n      await persist({ status: 'inProgress' })\n    } catch (error) {\n      updateChanges({\n        changeIDs,\n        update: {\n          applicationOutcome: 'unknown',\n          error: getMergeErrorMessage({ error }),\n          recoveryOutcome: 'unknown',\n        },\n      })\n\n      throw error\n    }\n  }\n\n  const persistRecovery: MergeLedger['persistRecovery'] = async ({ changeID }) => {\n    try {\n      await persist({ status: 'inProgress' })\n\n      return true\n    } catch (error) {\n      const recoveryError = getMergeErrorMessage({ error })\n      const change = changes.find(\n        ({ changeID: candidateChangeID }) => candidateChangeID === String(changeID),\n      )\n\n      updateChange({\n        changeID,\n        update: {\n          recoveryError: change?.recoveryError\n            ? `${change.recoveryError}\\n${recoveryError}`\n            : recoveryError,\n          recoveryOutcome: 'unknown',\n        },\n      })\n\n      return false\n    }\n  }\n\n  return {\n    findChange: ({ changeID }) =>\n      changes.find(({ changeID: candidateChangeID }) => candidateChangeID === String(changeID)),\n    getChanges: () => changes,\n    mapChanges: ({ update }) => {\n      changes = changes.map(update)\n\n      return changes\n    },\n    persist,\n    persistAppliedChanges,\n    persistRecovery,\n    updateChange,\n    updateChanges,\n  }\n}\n"],"names":["createPayloadRequest","branchMergesCollectionSlug","MAIN_BRANCH","getMergeErrorMessage","createMergeLedger","branch","mergeable","payload","req","mergeEventReq","user","undefined","changes","map","change","applicationOutcome","changeID","String","cleanupOutcome","collectionSlug","docID","docTitle","globalSlug","operation","recoveryOutcome","targetID","changeIndexByID","Map","index","mergeEvent","create","collection","data","mergedByCollection","mergedByID","id","mergedByLabel","email","startedAt","Date","toISOString","status","targetBranch","overrideAccess","updateChanges","changeIDs","update","changeIndex","get","updateChange","persist","completedAt","error","mergedAt","persistAppliedChanges","persistRecovery","recoveryError","find","candidateChangeID","findChange","getChanges","mapChanges"],"mappings":"AAGA,SAASA,oBAAoB,QAAQ,0CAAyC;AAC9E,SAASC,0BAA0B,EAAEC,WAAW,QAAQ,cAAa;AACrE,SAASC,oBAAoB,QAAQ,iBAAgB;AA4BrD,OAAO,MAAMC,oBAAoB,OAAO,EACtCC,MAAM,EACNC,SAAS,EACTC,OAAO,EACPC,GAAG,EAMJ;IACC,MAAMC,gBAAgB,MAAMT,qBAAqB;QAC/CK,QAAQ;QACRE;QACAG,MAAMF,IAAIE,IAAI,IAAIC;IACpB;IACA,IAAIC,UAA8BN,UAAUO,GAAG,CAAC,CAACC,SAAY,CAAA;YAC3DC,oBAAoB;YACpBC,UAAUC,OAAOH,OAAOE,QAAQ;YAChCE,gBAAgB;YAChBC,gBAAgBL,OAAOK,cAAc;YACrCC,OAAON,OAAOM,KAAK,KAAKT,YAAYA,YAAYM,OAAOH,OAAOM,KAAK;YACnEC,UAAUJ,OAAOH,OAAOM,KAAK,IAAIN,OAAOQ,UAAU;YAClDA,YAAYR,OAAOQ,UAAU;YAC7BC,WAAWT,OAAOS,SAAS;YAC3BC,iBAAiB;YACjBC,UAAUX,OAAOM,KAAK,KAAKT,YAAYG,OAAOQ,UAAU,GAAGL,OAAOH,OAAOM,KAAK;QAChF,CAAA;IACA,MAAMM,kBAAkB,IAAIC,IAAIf,QAAQC,GAAG,CAAC,CAACC,QAAQc,QAAU;YAACd,OAAOE,QAAQ;YAAEY;SAAM;IACvF,MAAMC,aAAa,MAAMtB,QAAQuB,MAAM,CAAC;QACtCC,YAAY9B;QACZ+B,MAAM;YACJ3B;YACAO;YACAqB,oBAAoBzB,IAAIE,IAAI,EAAEqB;YAC9BG,YAAY1B,IAAIE,IAAI,EAAEyB,OAAOxB,YAAYA,YAAYM,OAAOT,IAAIE,IAAI,CAACyB,EAAE;YACvEC,eAAgB5B,IAAIE,IAAI,EAAgC2B;YACxDC,WAAW,IAAIC,OAAOC,WAAW;YACjCC,QAAQ;YACRC,cAAcxC;QAChB;QACAyC,gBAAgB;QAChBnC,KAAKC;IACP;IAEA,MAAMmC,gBAA8C,CAAC,EAAEC,SAAS,EAAEC,MAAM,EAAE;QACxE,KAAK,MAAM9B,YAAY6B,UAAW;YAChC,MAAME,cAAcrB,gBAAgBsB,GAAG,CAAC/B,OAAOD;YAC/C,MAAMF,SAASiC,gBAAgBpC,YAAYA,YAAYC,OAAO,CAACmC,YAAY;YAE3E,IAAIA,gBAAgBpC,aAAaG,QAAQ;gBACvCF,OAAO,CAACmC,YAAY,GAAG;oBAAE,GAAGjC,MAAM;oBAAE,GAAGgC,MAAM;gBAAC;YAChD;QACF;QAEA,OAAOlC;IACT;IAEA,MAAMqC,eAA4C,CAAC,EAAEjC,QAAQ,EAAE8B,MAAM,EAAE,GACrEF,cAAc;YAAEC,WAAW;gBAAC7B;aAAS;YAAE8B;QAAO;IAEhD,MAAMI,UAAkC,OAAO,EAAEC,WAAW,EAAEC,KAAK,EAAEC,QAAQ,EAAEZ,MAAM,EAAE;QACrF,MAAMlC,QAAQuC,MAAM,CAAC;YACnBX,IAAIN,WAAWM,EAAE;YACjBJ,YAAY9B;YACZ+B,MAAM;gBAAEpB;gBAASuC;gBAAaC;gBAAOC;gBAAUZ;YAAO;YACtDE,gBAAgB;YAChBnC,KAAKC;QACP;IACF;IAEA,MAAM6C,wBAA8D,OAAO,EAAET,SAAS,EAAE;QACtF,IAAI;YACF,MAAMK,QAAQ;gBAAET,QAAQ;YAAa;QACvC,EAAE,OAAOW,OAAO;YACdR,cAAc;gBACZC;gBACAC,QAAQ;oBACN/B,oBAAoB;oBACpBqC,OAAOjD,qBAAqB;wBAAEiD;oBAAM;oBACpC5B,iBAAiB;gBACnB;YACF;YAEA,MAAM4B;QACR;IACF;IAEA,MAAMG,kBAAkD,OAAO,EAAEvC,QAAQ,EAAE;QACzE,IAAI;YACF,MAAMkC,QAAQ;gBAAET,QAAQ;YAAa;YAErC,OAAO;QACT,EAAE,OAAOW,OAAO;YACd,MAAMI,gBAAgBrD,qBAAqB;gBAAEiD;YAAM;YACnD,MAAMtC,SAASF,QAAQ6C,IAAI,CACzB,CAAC,EAAEzC,UAAU0C,iBAAiB,EAAE,GAAKA,sBAAsBzC,OAAOD;YAGpEiC,aAAa;gBACXjC;gBACA8B,QAAQ;oBACNU,eAAe1C,QAAQ0C,gBACnB,GAAG1C,OAAO0C,aAAa,CAAC,EAAE,EAAEA,eAAe,GAC3CA;oBACJhC,iBAAiB;gBACnB;YACF;YAEA,OAAO;QACT;IACF;IAEA,OAAO;QACLmC,YAAY,CAAC,EAAE3C,QAAQ,EAAE,GACvBJ,QAAQ6C,IAAI,CAAC,CAAC,EAAEzC,UAAU0C,iBAAiB,EAAE,GAAKA,sBAAsBzC,OAAOD;QACjF4C,YAAY,IAAMhD;QAClBiD,YAAY,CAAC,EAAEf,MAAM,EAAE;YACrBlC,UAAUA,QAAQC,GAAG,CAACiC;YAEtB,OAAOlC;QACT;QACAsC;QACAI;QACAC;QACAN;QACAL;IACF;AACF,EAAC"}

package/dist/branching/merge/prepareMerge.d.ts

@@ -0,0 +1,41 @@
+import type { Payload, PayloadRequest } from '../../types/index.js';
+import type { MergeResult } from '../merge.js';
+import type { MergeableChange } from '../types.js';
+import type { BranchMergeValidationError } from '../validation.js';
+export type PreparedBranchChange = {
+    doc?: unknown;
+    id: number | string;
+} & Record<string, unknown>;
+export type PreparedMerge = {
+    applicable: PreparedBranchChange[];
+    applicableGlobals: PreparedBranchChange[];
+    branchDoc: {
+        id: number | string;
+    };
+    mergeable: MergeableChange[];
+    req: PayloadRequest;
+    result: MergeResult;
+    retryableCleanups: MergeableChange[];
+};
+export declare const prepareMerge: ({ branch, dryRun, incomingReq, overrideAccess, payload, selected, user, }: {
+    branch: string;
+    dryRun: boolean;
+    incomingReq?: PayloadRequest;
+    overrideAccess: boolean;
+    payload: Payload;
+    selected?: (number | string)[];
+    user?: NonNullable<PayloadRequest['user']>;
+}) => Promise<PreparedMerge>;
+export declare const revalidatePreparedMerge: ({ applicable, applicableGlobals, branch, overrideAccess, payload, req, }: {
+    applicable: PreparedBranchChange[];
+    applicableGlobals: PreparedBranchChange[];
+    branch: string;
+    overrideAccess: boolean;
+    payload: Payload;
+    req: PayloadRequest;
+}) => Promise<{
+    blocked: MergeResult['blocked'];
+    isValid: boolean;
+    validationErrors: BranchMergeValidationError[];
+}>;
+//# sourceMappingURL=prepareMerge.d.ts.map