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

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/branching/merge/applyMergeChange.ts"],"sourcesContent":["import type { ArrayField, BlocksField, Field } from '../../fields/config/types.js'\nimport type { Payload, PayloadRequest } from '../../types/index.js'\nimport type { ResolvedChange } from '../effectiveOperations.js'\nimport type { AppliedChangeResult, SourceRecoveryOutcome } from './utilities.js'\n\nimport {\n  type BranchMergeUploadDataContext,\n  branchMergeUploadDataContextKey,\n  updateByIDOperationForBranchMerge,\n} from '../../collections/operations/updateByID.js'\nimport { copyDataWithFreshRowIDs } from '../../collections/operations/utilities/copyDataWithFreshRowIDs.js'\nimport { tabHasName } from '../../fields/config/types.js'\nimport { getVersionsMax } from '../../utilities/getVersionsConfig.js'\nimport { traverseForLocalizedFields } from '../../utilities/traverseForLocalizedFields.js'\nimport {\n  enforceMaxVersions,\n  skipEnforceMaxVersionsContextKey,\n} from '../../versions/enforceMaxVersions.js'\nimport { coalesceLatestVersionContextKey } from '../../versions/updateLatestVersion.js'\nimport {\n  getGlobalMergeLocales,\n  readBranchGlobalWrite,\n  resolveGlobalMergeWrites,\n} from '../globalMergeWrites.js'\nimport { readLocalizedBranchWrite } from '../readLocalizedBranchWrite.js'\nimport { isolateBranchState, withoutBranch } from '../resolveBranch.js'\nimport { stripBranchMergeData, stripBranchMergeGlobalData } from '../stripBranchMergeData.js'\nimport { branchField, branchParentField, MAIN_BRANCH } from '../types.js'\nimport { createMainBranchRequest } from '../validation.js'\nimport { deleteBranchGlobalVersionChain, deleteBranchVersionChain } from '../versions.js'\nimport { getGlobalSourceRevision, getTimestamp } from './utilities.js'\n\nconst forMain = ({\n  collectionSlug,\n  data,\n  payload,\n}: {\n  collectionSlug: string\n  data: Record<string, unknown>\n  payload: Payload\n}): Record<string, unknown> =>\n  copyDataWithFreshRowIDs({\n    config: payload.config,\n    data: stripBranchMergeData({\n      data,\n      fields: payload.collections[collectionSlug]!.config.fields,\n    }),\n    existingDoc: {},\n    fields: payload.collections[collectionSlug]!.config.fields,\n  })\n\ntype NestedRowIDMap = Map<ArrayField | BlocksField, Map<string, number | string>>\n\n/**\n * Reuses IDs that main minted for the same source branch rows during an earlier write.\n * The field key scopes row IDs to the nested table that owns them.\n */\nconst applyMappedNestedRowIDs = ({\n  data,\n  fields,\n  mainRowIDsBySource,\n  payload,\n  sourceData,\n}: {\n  data: Record<string, unknown>\n  fields: Field[]\n  mainRowIDsBySource: NestedRowIDMap\n  payload: Payload\n  sourceData: Record<string, unknown>\n}): Record<string, unknown> => {\n  visitNestedRows({\n    data,\n    fields,\n    payload,\n    sourceData,\n    visitRow: ({ field, row, sourceRow }) => {\n      const sourceRowID = sourceRow.id\n\n      if (typeof sourceRowID !== 'string' && typeof sourceRowID !== 'number') {\n        return\n      }\n\n      const mappedRowID = mainRowIDsBySource.get(field)?.get(String(sourceRowID))\n\n      if (mappedRowID !== undefined) {\n        row.id = mappedRowID\n      }\n    },\n  })\n\n  return data\n}\n\n/** Records the main ID for each source branch row after a write succeeds. */\nconst recordNestedRowIDs = ({\n  fields,\n  mainRowIDsBySource,\n  mergedData,\n  payload,\n  sourceData,\n}: {\n  fields: Field[]\n  mainRowIDsBySource: NestedRowIDMap\n  mergedData: Record<string, unknown>\n  payload: Payload\n  sourceData: Record<string, unknown>\n}): void => {\n  visitNestedRows({\n    data: mergedData,\n    fields,\n    payload,\n    sourceData,\n    visitRow: ({ field, row, sourceRow }) => {\n      const mergedRowID = row.id\n      const sourceRowID = sourceRow.id\n\n      if (\n        (typeof mergedRowID !== 'string' && typeof mergedRowID !== 'number') ||\n        (typeof sourceRowID !== 'string' && typeof sourceRowID !== 'number')\n      ) {\n        return\n      }\n\n      let fieldRowIDs = mainRowIDsBySource.get(field)\n\n      if (!fieldRowIDs) {\n        fieldRowIDs = new Map()\n        mainRowIDsBySource.set(field, fieldRowIDs)\n      }\n\n      fieldRowIDs.set(String(sourceRowID), mergedRowID)\n    },\n  })\n}\n\nconst visitNestedRows = ({\n  data,\n  fields,\n  payload,\n  sourceData,\n  visitRow,\n}: {\n  data: Record<string, unknown>\n  fields: Field[]\n  payload: Payload\n  sourceData: Record<string, unknown>\n  visitRow: (args: {\n    field: ArrayField | BlocksField\n    row: Record<string, unknown>\n    sourceRow: Record<string, unknown>\n  }) => void\n}): void => {\n  for (const field of fields) {\n    if (field.type === 'row' || field.type === 'collapsible') {\n      visitNestedRows({ data, fields: field.fields, payload, sourceData, visitRow })\n      continue\n    }\n\n    if (field.type === 'tabs') {\n      for (const tab of field.tabs) {\n        if (!tabHasName(tab)) {\n          visitNestedRows({ data, fields: tab.fields, payload, sourceData, visitRow })\n          continue\n        }\n\n        const nestedData = data[tab.name]\n        const nestedSourceData = sourceData[tab.name]\n\n        if (\n          nestedData &&\n          typeof nestedData === 'object' &&\n          !Array.isArray(nestedData) &&\n          nestedSourceData &&\n          typeof nestedSourceData === 'object' &&\n          !Array.isArray(nestedSourceData)\n        ) {\n          visitNestedRows({\n            data: nestedData as Record<string, unknown>,\n            fields: tab.fields,\n            payload,\n            sourceData: nestedSourceData as Record<string, unknown>,\n            visitRow,\n          })\n        }\n      }\n\n      continue\n    }\n\n    if (field.type === 'group') {\n      if (!('name' in field) || !field.name) {\n        visitNestedRows({ data, fields: field.fields, payload, sourceData, visitRow })\n        continue\n      }\n\n      const nestedData = data[field.name]\n      const nestedSourceData = sourceData[field.name]\n\n      if (\n        nestedData &&\n        typeof nestedData === 'object' &&\n        !Array.isArray(nestedData) &&\n        nestedSourceData &&\n        typeof nestedSourceData === 'object' &&\n        !Array.isArray(nestedSourceData)\n      ) {\n        visitNestedRows({\n          data: nestedData as Record<string, unknown>,\n          fields: field.fields,\n          payload,\n          sourceData: nestedSourceData as Record<string, unknown>,\n          visitRow,\n        })\n      }\n\n      continue\n    }\n\n    if ((field.type !== 'array' && field.type !== 'blocks') || !field.name) {\n      continue\n    }\n\n    const rows = data[field.name]\n    const sourceRows = sourceData[field.name]\n\n    if (!Array.isArray(rows) || !Array.isArray(sourceRows)) {\n      continue\n    }\n\n    for (const [index, row] of rows.entries()) {\n      const sourceRow = sourceRows[index]\n\n      if (\n        !row ||\n        typeof row !== 'object' ||\n        Array.isArray(row) ||\n        !sourceRow ||\n        typeof sourceRow !== 'object' ||\n        Array.isArray(sourceRow)\n      ) {\n        continue\n      }\n\n      const rowData = row as Record<string, unknown>\n      const sourceRowData = sourceRow as Record<string, unknown>\n\n      visitRow({ field, row: rowData, sourceRow: sourceRowData })\n\n      const nestedFields =\n        field.type === 'array'\n          ? field.fields\n          : resolveBlockFields({\n              field,\n              payload,\n              row: rowData,\n            })\n\n      visitNestedRows({\n        data: rowData,\n        fields: nestedFields,\n        payload,\n        sourceData: sourceRowData,\n        visitRow,\n      })\n    }\n  }\n}\n\nconst resolveBlockFields = ({\n  field,\n  payload,\n  row,\n}: {\n  field: BlocksField\n  payload: Payload\n  row: Record<string, unknown>\n}): Field[] => {\n  const blockType = row.blockType\n\n  if (typeof blockType !== 'string') {\n    return []\n  }\n\n  const block =\n    payload.config.blocks?.find(({ slug }) => slug === blockType) ??\n    field.blocks.find((candidate) => typeof candidate !== 'string' && candidate.slug === blockType)\n\n  return typeof block === 'string' || !block ? [] : block.fields\n}\n\nexport const applyChange = async ({\n  hasTransaction,\n  overrideAccess,\n  payload,\n  req,\n  resolved,\n  targetReq,\n}: {\n  hasTransaction: boolean\n  overrideAccess: boolean\n  payload: Payload\n  req: PayloadRequest\n  resolved: ResolvedChange\n  targetReq: PayloadRequest\n}): Promise<AppliedChangeResult> => {\n  const { change, collectionSlug, docID, shadow, writes } = resolved\n\n  if (!shadow) {\n    return { cleanup: () => Promise.resolve('completed') }\n  }\n\n  const shadowID = shadow.id as number | string\n  const branch = change.branch as string\n  const mainWriteReq = createMainBranchRequest({ req: targetReq })\n\n  mainWriteReq.file = undefined\n  mainWriteReq.payloadUploadSizes = undefined\n  mainWriteReq.query = { ...mainWriteReq.query }\n  delete mainWriteReq.query.uploadEdits\n  delete (mainWriteReq.context as Record<string, unknown>)._payloadCloudStorage\n  const sourceTimestamp = getTimestamp({ value: shadow.updatedAt })\n  const sourceIdentity = {\n    sourceID: String(shadowID),\n    sourceUpdatedAt:\n      sourceTimestamp === undefined ? undefined : new Date(sourceTimestamp).toISOString(),\n  }\n\n  // The chain goes with the row. It hangs off the shadow row's primary key rather\n  // than the canonical ID, so nothing addressing the document cascades to it, and a\n  // chain left behind keeps the merged document in the branch's drafts list a second\n  // time alongside main's copy.\n  const dropVersionChain = () =>\n    deleteBranchVersionChain({ branch, collectionSlug, payload, req, rowID: shadowID })\n\n  const dropShadowRow = async () => {\n    const currentShadow = (await payload.db.findOne({\n      branch: false,\n      collection: collectionSlug,\n      req,\n      where: { id: { equals: shadowID } },\n    })) as null | Record<string, unknown>\n\n    const currentUpdatedAt = getTimestamp({ value: currentShadow?.updatedAt })\n    const mergedSourceUpdatedAt = getTimestamp({ value: shadow.updatedAt })\n\n    if (\n      currentUpdatedAt !== undefined &&\n      mergedSourceUpdatedAt !== undefined &&\n      currentUpdatedAt !== mergedSourceUpdatedAt\n    ) {\n      return 'superseded' as const\n    }\n\n    await dropVersionChain()\n\n    await payload.db.deleteOne({\n      branch: false,\n      collection: collectionSlug,\n      req,\n      where: { id: { equals: shadowID } },\n    })\n\n    return 'completed' as const\n  }\n\n  const updateMainDocument = async ({\n    id,\n    coalesceLatestVersion,\n    data,\n    draft,\n    locale,\n  }: {\n    coalesceLatestVersion?: boolean\n    data: Record<string, unknown>\n    draft: boolean\n    id: number | string\n    locale?: string\n  }): Promise<Record<string, unknown>> => {\n    const reqContext = mainWriteReq.context as Record<PropertyKey, unknown>\n    const previousBranchMergeUploadData = reqContext[branchMergeUploadDataContextKey]\n    const previousCoalesceLatestVersion = reqContext[coalesceLatestVersionContextKey]\n    const branchMergeUploadData: BranchMergeUploadDataContext = {\n      id,\n      collectionSlug,\n      data,\n    }\n\n    reqContext[branchMergeUploadDataContextKey] = branchMergeUploadData\n\n    if (coalesceLatestVersion) {\n      reqContext[coalesceLatestVersionContextKey] = true\n    } else {\n      delete reqContext[coalesceLatestVersionContextKey]\n    }\n\n    try {\n      return (await payload.update({\n        id,\n        collection: collectionSlug,\n        data: data as never,\n        draft,\n        locale,\n        overrideAccess,\n        req: mainWriteReq,\n        trash: includesTrashState(data),\n      })) as Record<string, unknown>\n    } finally {\n      if (previousBranchMergeUploadData === undefined) {\n        delete reqContext[branchMergeUploadDataContextKey]\n      } else {\n        reqContext[branchMergeUploadDataContextKey] = previousBranchMergeUploadData\n      }\n\n      if (previousCoalesceLatestVersion === undefined) {\n        delete reqContext[coalesceLatestVersionContextKey]\n      } else {\n        reqContext[coalesceLatestVersionContextKey] = previousCoalesceLatestVersion\n      }\n    }\n  }\n\n  if (change.operation === 'delete') {\n    await payload.delete({\n      id: docID,\n      collection: collectionSlug,\n      overrideAccess,\n      req: targetReq,\n    })\n\n    return { cleanup: dropShadowRow, ...sourceIdentity }\n  }\n\n  // A fork that was never edited afterwards. Nothing happened to the document on\n  // this branch, so writing main would only bump `updatedAt` and re-run hooks for\n  // a no-op — the shadow row is simply discarded.\n  if (!writes.length) {\n    return { cleanup: dropShadowRow, ...sourceIdentity }\n  }\n\n  const fields = payload.collections[collectionSlug]!.config.fields\n\n  if (change.operation === 'create') {\n    const actionableWrites = writes.filter((write) => write.trashState !== 'access')\n    const [rowWrite, ...laterWrites] = actionableWrites\n    const localization = payload.config.localization\n    const hasLocalizedFields = traverseForLocalizedFields(\n      payload.collections[collectionSlug]!.config.fields,\n    )\n    const localeCodes = localization && hasLocalizedFields ? localization.localeCodes : undefined\n    let localizedWrites: Map<string, Record<string, unknown>>[] | undefined\n\n    if (localeCodes?.length) {\n      localizedWrites = []\n\n      for (const write of actionableWrites) {\n        const documentsByLocale = new Map<string, Record<string, unknown>>()\n\n        for (const locale of localeCodes) {\n          const branchDoc = await readLocalizedBranchWrite({\n            branch,\n            collectionSlug,\n            docID,\n            draft: write.draft,\n            locale,\n            payload,\n            req,\n          })\n\n          if (branchDoc) {\n            documentsByLocale.set(locale, branchDoc)\n          }\n        }\n\n        localizedWrites.push(documentsByLocale)\n      }\n    }\n\n    const applyCreateWrites = async () => {\n      const branchMergeStorageReq = withoutBranch(req)\n      const createTargetReq = mainWriteReq\n\n      // Updated in place rather than recreated. The row already holds the ID that\n      // inbound relationships point at, and deleting it would cascade those\n      // relationship rows away — rebuilding the row does not bring them back.\n      // The branch-merge operation still reports it as a create, because from\n      // main's point of view the document is new.\n      if (localeCodes?.length) {\n        const defaultLocale = localization && localization.defaultLocale\n        const createLocale =\n          defaultLocale && localeCodes.includes(defaultLocale) ? defaultLocale : localeCodes[0]!\n        const branchDoc = localizedWrites?.[0]?.get(createLocale)\n\n        if (branchDoc) {\n          const data = stripBranchMergeData({ data: branchDoc, fields })\n\n          await updateByIDOperationForBranchMerge({\n            id: shadowID,\n            branchMergeStorageReq,\n            collection: payload.collections[collectionSlug]!,\n            data: data as never,\n            draft: rowWrite!.draft,\n            overrideAccess,\n            req: withLocale({ locale: createLocale, req: createTargetReq }),\n            trash: includesTrashState(data),\n          })\n        }\n      } else {\n        const data = stripBranchMergeData({ data: rowWrite!.data, fields })\n\n        await updateByIDOperationForBranchMerge({\n          id: shadowID,\n          branchMergeStorageReq,\n          collection: payload.collections[collectionSlug]!,\n          data: data as never,\n          overrideAccess,\n          req: createTargetReq,\n          trash: includesTrashState(data),\n        })\n      }\n\n      // The branch left a draft above what it published. Applied as its own write so\n      // main passes through both states it genuinely went through.\n      for (const [writeIndex, write] of laterWrites.entries()) {\n        if (localeCodes?.length) {\n          for (const locale of localeCodes) {\n            const branchDoc = localizedWrites?.[writeIndex + 1]?.get(locale)\n\n            if (!branchDoc) {\n              continue\n            }\n\n            const data = stripBranchMergeData({ data: branchDoc, fields })\n\n            await updateMainDocument({\n              id: shadowID,\n              data,\n              draft: true,\n              locale,\n            })\n          }\n        } else {\n          const data = stripBranchMergeData({ data: write.data, fields })\n\n          await updateMainDocument({\n            id: shadowID,\n            data,\n            draft: true,\n          })\n        }\n      }\n    }\n\n    if (hasTransaction) {\n      // Before the promotion, not after: the write below records main's first version\n      // for this row, and clearing the chain afterwards could take it with it — which\n      // would drop a published document out of main's own drafts list.\n      await dropVersionChain()\n\n      await payload.db.updateOne({\n        id: shadowID,\n        branch: false,\n        collection: collectionSlug,\n        data: { [branchField]: MAIN_BRANCH },\n        req,\n      })\n\n      await applyCreateWrites()\n\n      return { cleanup: () => Promise.resolve('completed'), ...sourceIdentity }\n    }\n\n    const appliedCreate = await applyBranchCreateWithoutTransaction({\n      applyCreateWrites,\n      branch,\n      collectionSlug,\n      payload,\n      req,\n      shadow,\n      shadowID,\n    })\n\n    return { ...appliedCreate, ...sourceIdentity }\n  }\n\n  const localization = payload.config.localization\n  const hasLocalizedFields = traverseForLocalizedFields(fields)\n  const localeCodes = localization && hasLocalizedFields ? localization.localeCodes : undefined\n  const mainRowIDsBySource: NestedRowIDMap = new Map()\n\n  for (const write of writes) {\n    if (write.trashState === 'access') {\n      continue\n    }\n\n    if (write.trashState === 'apply') {\n      await payload.update({\n        id: docID,\n        collection: collectionSlug,\n        data: { deletedAt: write.data.deletedAt ?? null } as never,\n        draft: false,\n        overrideAccess,\n        req: targetReq,\n        trash: true,\n      })\n\n      continue\n    }\n\n    // With localization off there is one value per field, so the shadow row is the write.\n    if (!localeCodes?.length) {\n      const data = applyMappedNestedRowIDs({\n        data: forMain({ collectionSlug, data: write.data, payload }),\n        fields,\n        mainRowIDsBySource,\n        payload,\n        sourceData: write.data,\n      })\n\n      const mergedData = await updateMainDocument({\n        id: docID,\n        data,\n        // A draft-only branch edit must stay a draft on main: main's published row\n        // is not what the branch changed, and publishing it would push work the\n        // author never published live.\n        draft: write.draft,\n      })\n\n      recordNestedRowIDs({\n        fields,\n        mainRowIDsBySource,\n        mergedData,\n        payload,\n        sourceData: write.data,\n      })\n\n      continue\n    }\n\n    // One write per locale, each reading the branch's document *in* that locale.\n    //\n    // The shadow row cannot be written directly here. A raw row holds every locale at\n    // once, in a shape that differs by adapter, and Payload has no write that takes all\n    // locales together — so passing it through resolved a single locale and silently\n    // dropped the branch's edits to every other one. Reading per locale through the Local\n    // API is the same thing a person editing main by hand would do.\n    for (const [localeIndex, locale] of localeCodes.entries()) {\n      const branchDoc = await readLocalizedBranchWrite({\n        branch,\n        collectionSlug,\n        docID,\n        draft: write.draft,\n        locale,\n        payload,\n        req,\n      })\n\n      if (!branchDoc) {\n        continue\n      }\n\n      const data = applyMappedNestedRowIDs({\n        data: forMain({\n          collectionSlug,\n          data: branchDoc,\n          payload,\n        }),\n        fields,\n        mainRowIDsBySource,\n        payload,\n        sourceData: branchDoc,\n      })\n\n      const mergedData = await updateMainDocument({\n        id: docID,\n        coalesceLatestVersion: localeIndex > 0,\n        data,\n        draft: write.draft,\n        locale,\n      })\n\n      recordNestedRowIDs({\n        fields,\n        mainRowIDsBySource,\n        mergedData,\n        payload,\n        sourceData: branchDoc,\n      })\n    }\n  }\n\n  return { cleanup: dropShadowRow, ...sourceIdentity }\n}\n\nconst includesTrashState = (data: Record<string, unknown>): boolean =>\n  Object.prototype.hasOwnProperty.call(data, 'deletedAt')\n\nconst withLocale = ({\n  coalesceLatestVersion,\n  locale,\n  req,\n}: {\n  coalesceLatestVersion?: boolean\n  locale: string\n  req: PayloadRequest\n}): PayloadRequest => {\n  const isolated = isolateBranchState(req)\n\n  isolated.locale = locale\n\n  if (coalesceLatestVersion) {\n    ;(isolated.context as Record<PropertyKey, unknown>)[coalesceLatestVersionContextKey] = true\n  }\n\n  return isolated\n}\n\ntype RawCollectionVersion = {\n  id: number | string\n  latest?: boolean\n  version?: Record<string, unknown>\n} & Record<string, unknown>\n\nconst applyBranchCreateWithoutTransaction = async ({\n  applyCreateWrites,\n  branch,\n  collectionSlug,\n  payload,\n  req,\n  shadow,\n  shadowID,\n}: {\n  applyCreateWrites: () => Promise<void>\n  branch: string\n  collectionSlug: string\n  payload: Payload\n  req: PayloadRequest\n  shadow: Record<string, unknown>\n  shadowID: number | string\n}): Promise<AppliedChangeResult> => {\n  const existingVersions = await readRawDocumentVersions({\n    collectionSlug,\n    docID: shadowID,\n    payload,\n    req,\n  })\n  const existingVersionIDs = new Set(existingVersions.map(({ id }) => String(id)))\n  const existingLatestVersions = existingVersions.filter(({ latest }) => latest === true)\n  let preparedVersions: RawCollectionVersion[] = []\n  const reqContext = req.context as Record<PropertyKey, unknown>\n  const previousSkipEnforceMaxVersions = reqContext[skipEnforceMaxVersionsContextKey]\n\n  const recover = async (): Promise<SourceRecoveryOutcome> => {\n    await restoreBranchCreatedShadow({\n      branch,\n      collectionSlug,\n      payload,\n      req,\n      shadow,\n      shadowID,\n    })\n\n    await deleteVersionsByID({\n      collectionSlug,\n      ids: preparedVersions.map(({ id }) => id),\n      payload,\n      req,\n    })\n\n    for (const originalVersion of existingVersions) {\n      await setVersionLatest({\n        collectionSlug,\n        isLatest: originalVersion.latest === true,\n        payload,\n        req,\n        version: originalVersion,\n      })\n    }\n\n    return 'deleted'\n  }\n\n  try {\n    for (const version of existingLatestVersions) {\n      await setVersionLatest({ collectionSlug, isLatest: false, payload, req, version })\n    }\n\n    // The row keeps its branch identity while project access, hooks and validation\n    // run. A rejected write therefore cannot become visible on main when the\n    // adapter has no transaction support.\n    reqContext[skipEnforceMaxVersionsContextKey] = { id: shadowID, collectionSlug }\n\n    try {\n      await applyCreateWrites()\n    } finally {\n      if (previousSkipEnforceMaxVersions === undefined) {\n        delete reqContext[skipEnforceMaxVersionsContextKey]\n      } else {\n        reqContext[skipEnforceMaxVersionsContextKey] = previousSkipEnforceMaxVersions\n      }\n    }\n\n    const versionsAfterWrite = await readRawDocumentVersions({\n      collectionSlug,\n      docID: shadowID,\n      payload,\n      req,\n    })\n\n    preparedVersions = versionsAfterWrite.filter(({ id }) => !existingVersionIDs.has(String(id)))\n\n    for (const version of preparedVersions) {\n      await promotePreparedVersion({ collectionSlug, payload, req, version })\n    }\n\n    // The document promotion is the final visibility change. Every operation that\n    // can reject user data has completed before this trusted adapter write.\n    await payload.db.updateOne({\n      id: shadowID,\n      branch: false,\n      collection: collectionSlug,\n      data: { [branchField]: MAIN_BRANCH },\n      req,\n    })\n  } catch (error) {\n    const versionsAfterFailure = await readRawDocumentVersions({\n      collectionSlug,\n      docID: shadowID,\n      payload,\n      req,\n    })\n\n    preparedVersions = versionsAfterFailure.filter(({ id }) => !existingVersionIDs.has(String(id)))\n\n    await recover()\n\n    throw error\n  }\n\n  return {\n    cleanup: async () => {\n      await deleteVersionsByID({\n        collectionSlug,\n        ids: [...existingVersionIDs],\n        payload,\n        req,\n      })\n\n      const collection = payload.collections[collectionSlug]!.config\n      const maxVersions = getVersionsMax(collection)\n\n      if (maxVersions > 0) {\n        await enforceMaxVersions({\n          id: shadowID,\n          collection,\n          max: maxVersions,\n          payload,\n          req,\n        })\n      }\n\n      return 'completed'\n    },\n    recover,\n    sourceVersionIDs: [...existingVersionIDs],\n  }\n}\n\nconst readRawDocumentVersions = 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<RawCollectionVersion[]> => {\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: { parent: { equals: docID } },\n  })\n\n  return docs as RawCollectionVersion[]\n}\n\nconst setVersionLatest = async ({\n  collectionSlug,\n  isLatest,\n  payload,\n  req,\n  version,\n}: {\n  collectionSlug: string\n  isLatest: boolean\n  payload: Payload\n  req: PayloadRequest\n  version: RawCollectionVersion\n}): Promise<void> => {\n  await payload.db.updateVersion({\n    id: version.id,\n    collection: collectionSlug,\n    req,\n    versionData: {\n      latest: isLatest,\n      version: version.version ?? {},\n    },\n  })\n}\n\nconst promotePreparedVersion = async ({\n  collectionSlug,\n  payload,\n  req,\n  version,\n}: {\n  collectionSlug: string\n  payload: Payload\n  req: PayloadRequest\n  version: RawCollectionVersion\n}): Promise<void> => {\n  const documentVersion =\n    version.version && typeof version.version === 'object' ? version.version : {}\n\n  await payload.db.updateVersion({\n    id: version.id,\n    collection: collectionSlug,\n    req,\n    versionData: {\n      [branchField]: MAIN_BRANCH,\n      [branchParentField]: null,\n      version: {\n        ...documentVersion,\n        [branchField]: MAIN_BRANCH,\n      },\n    } as never,\n  })\n}\n\nexport const deleteVersionsByID = async ({\n  collectionSlug,\n  ids,\n  payload,\n  req,\n}: {\n  collectionSlug: string\n  ids: (number | string)[]\n  payload: Payload\n  req: PayloadRequest\n}): Promise<void> => {\n  if (!ids.length) {\n    return\n  }\n\n  await payload.db.deleteVersions({\n    collection: collectionSlug,\n    req,\n    where: { id: { in: ids } },\n  })\n}\n\nconst restoreBranchCreatedShadow = async ({\n  branch,\n  collectionSlug,\n  payload,\n  req,\n  shadow,\n  shadowID,\n}: {\n  branch: string\n  collectionSlug: string\n  payload: Payload\n  req: PayloadRequest\n  shadow: Record<string, unknown>\n  shadowID: number | string\n}): Promise<void> => {\n  const { id: _id, ...originalData } = shadow\n\n  await payload.db.updateOne({\n    id: shadowID,\n    branch: false,\n    collection: collectionSlug,\n    data: {\n      ...originalData,\n      [branchField]: branch,\n    },\n    req,\n  })\n}\n\n/** Applies the latest stored state of a branch global to main. */\nexport const applyGlobalChange = async ({\n  branch,\n  globalSlug,\n  overrideAccess,\n  payload,\n  req,\n  targetReq,\n}: {\n  branch: string\n  globalSlug: string\n  overrideAccess: boolean\n  payload: Payload\n  req: PayloadRequest\n  targetReq: PayloadRequest\n}): Promise<AppliedChangeResult> => {\n  const writes = await resolveGlobalMergeWrites({ branch, globalSlug, payload, req })\n\n  if (!writes.length) {\n    throw new Error(`Branch \"${branch}\" has no stored copy of global \"${globalSlug}\" to merge.`)\n  }\n\n  if (!payload.db.deleteBranchGlobal) {\n    throw new Error(\n      `The database adapter cannot remove a branch's copy of a global, so \"${globalSlug}\" cannot be merged.`,\n    )\n  }\n\n  const globalConfig = payload.globals.config.find(({ slug }) => slug === globalSlug)\n\n  if (!globalConfig) {\n    throw new Error(`Global \"${globalSlug}\" is not configured.`)\n  }\n\n  const locales = getGlobalMergeLocales({ globalSlug, payload, req })\n  const appliedSourceStates: {\n    data: string\n    draft: boolean\n    locale: string\n  }[] = []\n\n  for (const write of writes) {\n    for (const [localeIndex, locale] of locales.entries()) {\n      const data = await readBranchGlobalWrite({\n        branch,\n        draft: write.draft,\n        globalSlug,\n        locale,\n        payload,\n        req,\n      })\n\n      if (!data) {\n        throw new Error(\n          `Branch \"${branch}\" has no stored ${write.draft ? 'draft' : 'published'} state of global \"${globalSlug}\" to merge.`,\n        )\n      }\n\n      appliedSourceStates.push({ data: JSON.stringify(data), draft: write.draft, locale })\n\n      await payload.updateGlobal({\n        slug: globalSlug,\n        data: stripBranchMergeGlobalData({ data, fields: globalConfig.fields }) as never,\n        draft: write.draft,\n        locale,\n        overrideAccess,\n        req: withLocale({\n          coalesceLatestVersion: localeIndex > 0,\n          locale,\n          req: targetReq,\n        }),\n      })\n    }\n  }\n\n  return {\n    cleanup: async () => {\n      for (const sourceState of appliedSourceStates) {\n        const currentData = await readBranchGlobalWrite({\n          branch,\n          draft: sourceState.draft,\n          globalSlug,\n          locale: sourceState.locale,\n          payload,\n          req,\n        })\n\n        if (currentData && JSON.stringify(currentData) !== sourceState.data) {\n          return 'superseded'\n        }\n      }\n\n      await deleteBranchGlobalVersionChain({ branch, globalSlug, payload, req })\n      await payload.db.deleteBranchGlobal!({ branch, globalSlug, req })\n\n      return 'completed'\n    },\n    sourceRevision: getGlobalSourceRevision({ sourceStates: appliedSourceStates }),\n  }\n}\n"],"names":["branchMergeUploadDataContextKey","updateByIDOperationForBranchMerge","copyDataWithFreshRowIDs","tabHasName","getVersionsMax","traverseForLocalizedFields","enforceMaxVersions","skipEnforceMaxVersionsContextKey","coalesceLatestVersionContextKey","getGlobalMergeLocales","readBranchGlobalWrite","resolveGlobalMergeWrites","readLocalizedBranchWrite","isolateBranchState","withoutBranch","stripBranchMergeData","stripBranchMergeGlobalData","branchField","branchParentField","MAIN_BRANCH","createMainBranchRequest","deleteBranchGlobalVersionChain","deleteBranchVersionChain","getGlobalSourceRevision","getTimestamp","forMain","collectionSlug","data","payload","config","fields","collections","existingDoc","applyMappedNestedRowIDs","mainRowIDsBySource","sourceData","visitNestedRows","visitRow","field","row","sourceRow","sourceRowID","id","mappedRowID","get","String","undefined","recordNestedRowIDs","mergedData","mergedRowID","fieldRowIDs","Map","set","type","tab","tabs","nestedData","name","nestedSourceData","Array","isArray","rows","sourceRows","index","entries","rowData","sourceRowData","nestedFields","resolveBlockFields","blockType","block","blocks","find","slug","candidate","applyChange","hasTransaction","overrideAccess","req","resolved","targetReq","change","docID","shadow","writes","cleanup","Promise","resolve","shadowID","branch","mainWriteReq","file","payloadUploadSizes","query","uploadEdits","context","_payloadCloudStorage","sourceTimestamp","value","updatedAt","sourceIdentity","sourceID","sourceUpdatedAt","Date","toISOString","dropVersionChain","rowID","dropShadowRow","currentShadow","db","findOne","collection","where","equals","currentUpdatedAt","mergedSourceUpdatedAt","deleteOne","updateMainDocument","coalesceLatestVersion","draft","locale","reqContext","previousBranchMergeUploadData","previousCoalesceLatestVersion","branchMergeUploadData","update","trash","includesTrashState","operation","delete","length","actionableWrites","filter","write","trashState","rowWrite","laterWrites","localization","hasLocalizedFields","localeCodes","localizedWrites","documentsByLocale","branchDoc","push","applyCreateWrites","branchMergeStorageReq","createTargetReq","defaultLocale","createLocale","includes","withLocale","writeIndex","updateOne","appliedCreate","applyBranchCreateWithoutTransaction","deletedAt","localeIndex","Object","prototype","hasOwnProperty","call","isolated","existingVersions","readRawDocumentVersions","existingVersionIDs","Set","map","existingLatestVersions","latest","preparedVersions","previousSkipEnforceMaxVersions","recover","restoreBranchCreatedShadow","deleteVersionsByID","ids","originalVersion","setVersionLatest","isLatest","version","versionsAfterWrite","has","promotePreparedVersion","error","versionsAfterFailure","maxVersions","max","sourceVersionIDs","versions","docs","findVersions","limit","pagination","parent","updateVersion","versionData","documentVersion","deleteVersions","in","_id","originalData","applyGlobalChange","globalSlug","Error","deleteBranchGlobal","globalConfig","globals","locales","appliedSourceStates","JSON","stringify","updateGlobal","sourceState","currentData","sourceRevision","sourceStates"],"mappings":"AAKA,SAEEA,+BAA+B,EAC/BC,iCAAiC,QAC5B,6CAA4C;AACnD,SAASC,uBAAuB,QAAQ,oEAAmE;AAC3G,SAASC,UAAU,QAAQ,+BAA8B;AACzD,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,0BAA0B,QAAQ,gDAA+C;AAC1F,SACEC,kBAAkB,EAClBC,gCAAgC,QAC3B,uCAAsC;AAC7C,SAASC,+BAA+B,QAAQ,wCAAuC;AACvF,SACEC,qBAAqB,EACrBC,qBAAqB,EACrBC,wBAAwB,QACnB,0BAAyB;AAChC,SAASC,wBAAwB,QAAQ,iCAAgC;AACzE,SAASC,kBAAkB,EAAEC,aAAa,QAAQ,sBAAqB;AACvE,SAASC,oBAAoB,EAAEC,0BAA0B,QAAQ,6BAA4B;AAC7F,SAASC,WAAW,EAAEC,iBAAiB,EAAEC,WAAW,QAAQ,cAAa;AACzE,SAASC,uBAAuB,QAAQ,mBAAkB;AAC1D,SAASC,8BAA8B,EAAEC,wBAAwB,QAAQ,iBAAgB;AACzF,SAASC,uBAAuB,EAAEC,YAAY,QAAQ,iBAAgB;AAEtE,MAAMC,UAAU,CAAC,EACfC,cAAc,EACdC,IAAI,EACJC,OAAO,EAKR,GACC1B,wBAAwB;QACtB2B,QAAQD,QAAQC,MAAM;QACtBF,MAAMZ,qBAAqB;YACzBY;YACAG,QAAQF,QAAQG,WAAW,CAACL,eAAe,CAAEG,MAAM,CAACC,MAAM;QAC5D;QACAE,aAAa,CAAC;QACdF,QAAQF,QAAQG,WAAW,CAACL,eAAe,CAAEG,MAAM,CAACC,MAAM;IAC5D;AAIF;;;CAGC,GACD,MAAMG,0BAA0B,CAAC,EAC/BN,IAAI,EACJG,MAAM,EACNI,kBAAkB,EAClBN,OAAO,EACPO,UAAU,EAOX;IACCC,gBAAgB;QACdT;QACAG;QACAF;QACAO;QACAE,UAAU,CAAC,EAAEC,KAAK,EAAEC,GAAG,EAAEC,SAAS,EAAE;YAClC,MAAMC,cAAcD,UAAUE,EAAE;YAEhC,IAAI,OAAOD,gBAAgB,YAAY,OAAOA,gBAAgB,UAAU;gBACtE;YACF;YAEA,MAAME,cAAcT,mBAAmBU,GAAG,CAACN,QAAQM,IAAIC,OAAOJ;YAE9D,IAAIE,gBAAgBG,WAAW;gBAC7BP,IAAIG,EAAE,GAAGC;YACX;QACF;IACF;IAEA,OAAOhB;AACT;AAEA,2EAA2E,GAC3E,MAAMoB,qBAAqB,CAAC,EAC1BjB,MAAM,EACNI,kBAAkB,EAClBc,UAAU,EACVpB,OAAO,EACPO,UAAU,EAOX;IACCC,gBAAgB;QACdT,MAAMqB;QACNlB;QACAF;QACAO;QACAE,UAAU,CAAC,EAAEC,KAAK,EAAEC,GAAG,EAAEC,SAAS,EAAE;YAClC,MAAMS,cAAcV,IAAIG,EAAE;YAC1B,MAAMD,cAAcD,UAAUE,EAAE;YAEhC,IACE,AAAC,OAAOO,gBAAgB,YAAY,OAAOA,gBAAgB,YAC1D,OAAOR,gBAAgB,YAAY,OAAOA,gBAAgB,UAC3D;gBACA;YACF;YAEA,IAAIS,cAAchB,mBAAmBU,GAAG,CAACN;YAEzC,IAAI,CAACY,aAAa;gBAChBA,cAAc,IAAIC;gBAClBjB,mBAAmBkB,GAAG,CAACd,OAAOY;YAChC;YAEAA,YAAYE,GAAG,CAACP,OAAOJ,cAAcQ;QACvC;IACF;AACF;AAEA,MAAMb,kBAAkB,CAAC,EACvBT,IAAI,EACJG,MAAM,EACNF,OAAO,EACPO,UAAU,EACVE,QAAQ,EAWT;IACC,KAAK,MAAMC,SAASR,OAAQ;QAC1B,IAAIQ,MAAMe,IAAI,KAAK,SAASf,MAAMe,IAAI,KAAK,eAAe;YACxDjB,gBAAgB;gBAAET;gBAAMG,QAAQQ,MAAMR,MAAM;gBAAEF;gBAASO;gBAAYE;YAAS;YAC5E;QACF;QAEA,IAAIC,MAAMe,IAAI,KAAK,QAAQ;YACzB,KAAK,MAAMC,OAAOhB,MAAMiB,IAAI,CAAE;gBAC5B,IAAI,CAACpD,WAAWmD,MAAM;oBACpBlB,gBAAgB;wBAAET;wBAAMG,QAAQwB,IAAIxB,MAAM;wBAAEF;wBAASO;wBAAYE;oBAAS;oBAC1E;gBACF;gBAEA,MAAMmB,aAAa7B,IAAI,CAAC2B,IAAIG,IAAI,CAAC;gBACjC,MAAMC,mBAAmBvB,UAAU,CAACmB,IAAIG,IAAI,CAAC;gBAE7C,IACED,cACA,OAAOA,eAAe,YACtB,CAACG,MAAMC,OAAO,CAACJ,eACfE,oBACA,OAAOA,qBAAqB,YAC5B,CAACC,MAAMC,OAAO,CAACF,mBACf;oBACAtB,gBAAgB;wBACdT,MAAM6B;wBACN1B,QAAQwB,IAAIxB,MAAM;wBAClBF;wBACAO,YAAYuB;wBACZrB;oBACF;gBACF;YACF;YAEA;QACF;QAEA,IAAIC,MAAMe,IAAI,KAAK,SAAS;YAC1B,IAAI,CAAE,CAAA,UAAUf,KAAI,KAAM,CAACA,MAAMmB,IAAI,EAAE;gBACrCrB,gBAAgB;oBAAET;oBAAMG,QAAQQ,MAAMR,MAAM;oBAAEF;oBAASO;oBAAYE;gBAAS;gBAC5E;YACF;YAEA,MAAMmB,aAAa7B,IAAI,CAACW,MAAMmB,IAAI,CAAC;YACnC,MAAMC,mBAAmBvB,UAAU,CAACG,MAAMmB,IAAI,CAAC;YAE/C,IACED,cACA,OAAOA,eAAe,YACtB,CAACG,MAAMC,OAAO,CAACJ,eACfE,oBACA,OAAOA,qBAAqB,YAC5B,CAACC,MAAMC,OAAO,CAACF,mBACf;gBACAtB,gBAAgB;oBACdT,MAAM6B;oBACN1B,QAAQQ,MAAMR,MAAM;oBACpBF;oBACAO,YAAYuB;oBACZrB;gBACF;YACF;YAEA;QACF;QAEA,IAAI,AAACC,MAAMe,IAAI,KAAK,WAAWf,MAAMe,IAAI,KAAK,YAAa,CAACf,MAAMmB,IAAI,EAAE;YACtE;QACF;QAEA,MAAMI,OAAOlC,IAAI,CAACW,MAAMmB,IAAI,CAAC;QAC7B,MAAMK,aAAa3B,UAAU,CAACG,MAAMmB,IAAI,CAAC;QAEzC,IAAI,CAACE,MAAMC,OAAO,CAACC,SAAS,CAACF,MAAMC,OAAO,CAACE,aAAa;YACtD;QACF;QAEA,KAAK,MAAM,CAACC,OAAOxB,IAAI,IAAIsB,KAAKG,OAAO,GAAI;YACzC,MAAMxB,YAAYsB,UAAU,CAACC,MAAM;YAEnC,IACE,CAACxB,OACD,OAAOA,QAAQ,YACfoB,MAAMC,OAAO,CAACrB,QACd,CAACC,aACD,OAAOA,cAAc,YACrBmB,MAAMC,OAAO,CAACpB,YACd;gBACA;YACF;YAEA,MAAMyB,UAAU1B;YAChB,MAAM2B,gBAAgB1B;YAEtBH,SAAS;gBAAEC;gBAAOC,KAAK0B;gBAASzB,WAAW0B;YAAc;YAEzD,MAAMC,eACJ7B,MAAMe,IAAI,KAAK,UACXf,MAAMR,MAAM,GACZsC,mBAAmB;gBACjB9B;gBACAV;gBACAW,KAAK0B;YACP;YAEN7B,gBAAgB;gBACdT,MAAMsC;gBACNnC,QAAQqC;gBACRvC;gBACAO,YAAY+B;gBACZ7B;YACF;QACF;IACF;AACF;AAEA,MAAM+B,qBAAqB,CAAC,EAC1B9B,KAAK,EACLV,OAAO,EACPW,GAAG,EAKJ;IACC,MAAM8B,YAAY9B,IAAI8B,SAAS;IAE/B,IAAI,OAAOA,cAAc,UAAU;QACjC,OAAO,EAAE;IACX;IAEA,MAAMC,QACJ1C,QAAQC,MAAM,CAAC0C,MAAM,EAAEC,KAAK,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASJ,cACnD/B,MAAMiC,MAAM,CAACC,IAAI,CAAC,CAACE,YAAc,OAAOA,cAAc,YAAYA,UAAUD,IAAI,KAAKJ;IAEvF,OAAO,OAAOC,UAAU,YAAY,CAACA,QAAQ,EAAE,GAAGA,MAAMxC,MAAM;AAChE;AAEA,OAAO,MAAM6C,cAAc,OAAO,EAChCC,cAAc,EACdC,cAAc,EACdjD,OAAO,EACPkD,GAAG,EACHC,QAAQ,EACRC,SAAS,EAQV;IACC,MAAM,EAAEC,MAAM,EAAEvD,cAAc,EAAEwD,KAAK,EAAEC,MAAM,EAAEC,MAAM,EAAE,GAAGL;IAE1D,IAAI,CAACI,QAAQ;QACX,OAAO;YAAEE,SAAS,IAAMC,QAAQC,OAAO,CAAC;QAAa;IACvD;IAEA,MAAMC,WAAWL,OAAOzC,EAAE;IAC1B,MAAM+C,SAASR,OAAOQ,MAAM;IAC5B,MAAMC,eAAetE,wBAAwB;QAAE0D,KAAKE;IAAU;IAE9DU,aAAaC,IAAI,GAAG7C;IACpB4C,aAAaE,kBAAkB,GAAG9C;IAClC4C,aAAaG,KAAK,GAAG;QAAE,GAAGH,aAAaG,KAAK;IAAC;IAC7C,OAAOH,aAAaG,KAAK,CAACC,WAAW;IACrC,OAAO,AAACJ,aAAaK,OAAO,CAA6BC,oBAAoB;IAC7E,MAAMC,kBAAkBzE,aAAa;QAAE0E,OAAOf,OAAOgB,SAAS;IAAC;IAC/D,MAAMC,iBAAiB;QACrBC,UAAUxD,OAAO2C;QACjBc,iBACEL,oBAAoBnD,YAAYA,YAAY,IAAIyD,KAAKN,iBAAiBO,WAAW;IACrF;IAEA,gFAAgF;IAChF,kFAAkF;IAClF,mFAAmF;IACnF,8BAA8B;IAC9B,MAAMC,mBAAmB,IACvBnF,yBAAyB;YAAEmE;YAAQ/D;YAAgBE;YAASkD;YAAK4B,OAAOlB;QAAS;IAEnF,MAAMmB,gBAAgB;QACpB,MAAMC,gBAAiB,MAAMhF,QAAQiF,EAAE,CAACC,OAAO,CAAC;YAC9CrB,QAAQ;YACRsB,YAAYrF;YACZoD;YACAkC,OAAO;gBAAEtE,IAAI;oBAAEuE,QAAQzB;gBAAS;YAAE;QACpC;QAEA,MAAM0B,mBAAmB1F,aAAa;YAAE0E,OAAOU,eAAeT;QAAU;QACxE,MAAMgB,wBAAwB3F,aAAa;YAAE0E,OAAOf,OAAOgB,SAAS;QAAC;QAErE,IACEe,qBAAqBpE,aACrBqE,0BAA0BrE,aAC1BoE,qBAAqBC,uBACrB;YACA,OAAO;QACT;QAEA,MAAMV;QAEN,MAAM7E,QAAQiF,EAAE,CAACO,SAAS,CAAC;YACzB3B,QAAQ;YACRsB,YAAYrF;YACZoD;YACAkC,OAAO;gBAAEtE,IAAI;oBAAEuE,QAAQzB;gBAAS;YAAE;QACpC;QAEA,OAAO;IACT;IAEA,MAAM6B,qBAAqB,OAAO,EAChC3E,EAAE,EACF4E,qBAAqB,EACrB3F,IAAI,EACJ4F,KAAK,EACLC,MAAM,EAOP;QACC,MAAMC,aAAa/B,aAAaK,OAAO;QACvC,MAAM2B,gCAAgCD,UAAU,CAACzH,gCAAgC;QACjF,MAAM2H,gCAAgCF,UAAU,CAACjH,gCAAgC;QACjF,MAAMoH,wBAAsD;YAC1DlF;YACAhB;YACAC;QACF;QAEA8F,UAAU,CAACzH,gCAAgC,GAAG4H;QAE9C,IAAIN,uBAAuB;YACzBG,UAAU,CAACjH,gCAAgC,GAAG;QAChD,OAAO;YACL,OAAOiH,UAAU,CAACjH,gCAAgC;QACpD;QAEA,IAAI;YACF,OAAQ,MAAMoB,QAAQiG,MAAM,CAAC;gBAC3BnF;gBACAqE,YAAYrF;gBACZC,MAAMA;gBACN4F;gBACAC;gBACA3C;gBACAC,KAAKY;gBACLoC,OAAOC,mBAAmBpG;YAC5B;QACF,SAAU;YACR,IAAI+F,kCAAkC5E,WAAW;gBAC/C,OAAO2E,UAAU,CAACzH,gCAAgC;YACpD,OAAO;gBACLyH,UAAU,CAACzH,gCAAgC,GAAG0H;YAChD;YAEA,IAAIC,kCAAkC7E,WAAW;gBAC/C,OAAO2E,UAAU,CAACjH,gCAAgC;YACpD,OAAO;gBACLiH,UAAU,CAACjH,gCAAgC,GAAGmH;YAChD;QACF;IACF;IAEA,IAAI1C,OAAO+C,SAAS,KAAK,UAAU;QACjC,MAAMpG,QAAQqG,MAAM,CAAC;YACnBvF,IAAIwC;YACJ6B,YAAYrF;YACZmD;YACAC,KAAKE;QACP;QAEA,OAAO;YAAEK,SAASsB;YAAe,GAAGP,cAAc;QAAC;IACrD;IAEA,+EAA+E;IAC/E,gFAAgF;IAChF,gDAAgD;IAChD,IAAI,CAAChB,OAAO8C,MAAM,EAAE;QAClB,OAAO;YAAE7C,SAASsB;YAAe,GAAGP,cAAc;QAAC;IACrD;IAEA,MAAMtE,SAASF,QAAQG,WAAW,CAACL,eAAe,CAAEG,MAAM,CAACC,MAAM;IAEjE,IAAImD,OAAO+C,SAAS,KAAK,UAAU;QACjC,MAAMG,mBAAmB/C,OAAOgD,MAAM,CAAC,CAACC,QAAUA,MAAMC,UAAU,KAAK;QACvE,MAAM,CAACC,UAAU,GAAGC,YAAY,GAAGL;QACnC,MAAMM,eAAe7G,QAAQC,MAAM,CAAC4G,YAAY;QAChD,MAAMC,qBAAqBrI,2BACzBuB,QAAQG,WAAW,CAACL,eAAe,CAAEG,MAAM,CAACC,MAAM;QAEpD,MAAM6G,cAAcF,gBAAgBC,qBAAqBD,aAAaE,WAAW,GAAG7F;QACpF,IAAI8F;QAEJ,IAAID,aAAaT,QAAQ;YACvBU,kBAAkB,EAAE;YAEpB,KAAK,MAAMP,SAASF,iBAAkB;gBACpC,MAAMU,oBAAoB,IAAI1F;gBAE9B,KAAK,MAAMqE,UAAUmB,YAAa;oBAChC,MAAMG,YAAY,MAAMlI,yBAAyB;wBAC/C6E;wBACA/D;wBACAwD;wBACAqC,OAAOc,MAAMd,KAAK;wBAClBC;wBACA5F;wBACAkD;oBACF;oBAEA,IAAIgE,WAAW;wBACbD,kBAAkBzF,GAAG,CAACoE,QAAQsB;oBAChC;gBACF;gBAEAF,gBAAgBG,IAAI,CAACF;YACvB;QACF;QAEA,MAAMG,oBAAoB;YACxB,MAAMC,wBAAwBnI,cAAcgE;YAC5C,MAAMoE,kBAAkBxD;YAExB,4EAA4E;YAC5E,sEAAsE;YACtE,wEAAwE;YACxE,wEAAwE;YACxE,4CAA4C;YAC5C,IAAIiD,aAAaT,QAAQ;gBACvB,MAAMiB,gBAAgBV,gBAAgBA,aAAaU,aAAa;gBAChE,MAAMC,eACJD,iBAAiBR,YAAYU,QAAQ,CAACF,iBAAiBA,gBAAgBR,WAAW,CAAC,EAAE;gBACvF,MAAMG,YAAYF,iBAAiB,CAAC,EAAE,EAAEhG,IAAIwG;gBAE5C,IAAIN,WAAW;oBACb,MAAMnH,OAAOZ,qBAAqB;wBAAEY,MAAMmH;wBAAWhH;oBAAO;oBAE5D,MAAM7B,kCAAkC;wBACtCyC,IAAI8C;wBACJyD;wBACAlC,YAAYnF,QAAQG,WAAW,CAACL,eAAe;wBAC/CC,MAAMA;wBACN4F,OAAOgB,SAAUhB,KAAK;wBACtB1C;wBACAC,KAAKwE,WAAW;4BAAE9B,QAAQ4B;4BAActE,KAAKoE;wBAAgB;wBAC7DpB,OAAOC,mBAAmBpG;oBAC5B;gBACF;YACF,OAAO;gBACL,MAAMA,OAAOZ,qBAAqB;oBAAEY,MAAM4G,SAAU5G,IAAI;oBAAEG;gBAAO;gBAEjE,MAAM7B,kCAAkC;oBACtCyC,IAAI8C;oBACJyD;oBACAlC,YAAYnF,QAAQG,WAAW,CAACL,eAAe;oBAC/CC,MAAMA;oBACNkD;oBACAC,KAAKoE;oBACLpB,OAAOC,mBAAmBpG;gBAC5B;YACF;YAEA,+EAA+E;YAC/E,6DAA6D;YAC7D,KAAK,MAAM,CAAC4H,YAAYlB,MAAM,IAAIG,YAAYxE,OAAO,GAAI;gBACvD,IAAI2E,aAAaT,QAAQ;oBACvB,KAAK,MAAMV,UAAUmB,YAAa;wBAChC,MAAMG,YAAYF,iBAAiB,CAACW,aAAa,EAAE,EAAE3G,IAAI4E;wBAEzD,IAAI,CAACsB,WAAW;4BACd;wBACF;wBAEA,MAAMnH,OAAOZ,qBAAqB;4BAAEY,MAAMmH;4BAAWhH;wBAAO;wBAE5D,MAAMuF,mBAAmB;4BACvB3E,IAAI8C;4BACJ7D;4BACA4F,OAAO;4BACPC;wBACF;oBACF;gBACF,OAAO;oBACL,MAAM7F,OAAOZ,qBAAqB;wBAAEY,MAAM0G,MAAM1G,IAAI;wBAAEG;oBAAO;oBAE7D,MAAMuF,mBAAmB;wBACvB3E,IAAI8C;wBACJ7D;wBACA4F,OAAO;oBACT;gBACF;YACF;QACF;QAEA,IAAI3C,gBAAgB;YAClB,gFAAgF;YAChF,gFAAgF;YAChF,iEAAiE;YACjE,MAAM6B;YAEN,MAAM7E,QAAQiF,EAAE,CAAC2C,SAAS,CAAC;gBACzB9G,IAAI8C;gBACJC,QAAQ;gBACRsB,YAAYrF;gBACZC,MAAM;oBAAE,CAACV,YAAY,EAAEE;gBAAY;gBACnC2D;YACF;YAEA,MAAMkE;YAEN,OAAO;gBAAE3D,SAAS,IAAMC,QAAQC,OAAO,CAAC;gBAAc,GAAGa,cAAc;YAAC;QAC1E;QAEA,MAAMqD,gBAAgB,MAAMC,oCAAoC;YAC9DV;YACAvD;YACA/D;YACAE;YACAkD;YACAK;YACAK;QACF;QAEA,OAAO;YAAE,GAAGiE,aAAa;YAAE,GAAGrD,cAAc;QAAC;IAC/C;IAEA,MAAMqC,eAAe7G,QAAQC,MAAM,CAAC4G,YAAY;IAChD,MAAMC,qBAAqBrI,2BAA2ByB;IACtD,MAAM6G,cAAcF,gBAAgBC,qBAAqBD,aAAaE,WAAW,GAAG7F;IACpF,MAAMZ,qBAAqC,IAAIiB;IAE/C,KAAK,MAAMkF,SAASjD,OAAQ;QAC1B,IAAIiD,MAAMC,UAAU,KAAK,UAAU;YACjC;QACF;QAEA,IAAID,MAAMC,UAAU,KAAK,SAAS;YAChC,MAAM1G,QAAQiG,MAAM,CAAC;gBACnBnF,IAAIwC;gBACJ6B,YAAYrF;gBACZC,MAAM;oBAAEgI,WAAWtB,MAAM1G,IAAI,CAACgI,SAAS,IAAI;gBAAK;gBAChDpC,OAAO;gBACP1C;gBACAC,KAAKE;gBACL8C,OAAO;YACT;YAEA;QACF;QAEA,sFAAsF;QACtF,IAAI,CAACa,aAAaT,QAAQ;YACxB,MAAMvG,OAAOM,wBAAwB;gBACnCN,MAAMF,QAAQ;oBAAEC;oBAAgBC,MAAM0G,MAAM1G,IAAI;oBAAEC;gBAAQ;gBAC1DE;gBACAI;gBACAN;gBACAO,YAAYkG,MAAM1G,IAAI;YACxB;YAEA,MAAMqB,aAAa,MAAMqE,mBAAmB;gBAC1C3E,IAAIwC;gBACJvD;gBACA,2EAA2E;gBAC3E,wEAAwE;gBACxE,+BAA+B;gBAC/B4F,OAAOc,MAAMd,KAAK;YACpB;YAEAxE,mBAAmB;gBACjBjB;gBACAI;gBACAc;gBACApB;gBACAO,YAAYkG,MAAM1G,IAAI;YACxB;YAEA;QACF;QAEA,6EAA6E;QAC7E,EAAE;QACF,kFAAkF;QAClF,oFAAoF;QACpF,iFAAiF;QACjF,sFAAsF;QACtF,gEAAgE;QAChE,KAAK,MAAM,CAACiI,aAAapC,OAAO,IAAImB,YAAY3E,OAAO,GAAI;YACzD,MAAM8E,YAAY,MAAMlI,yBAAyB;gBAC/C6E;gBACA/D;gBACAwD;gBACAqC,OAAOc,MAAMd,KAAK;gBAClBC;gBACA5F;gBACAkD;YACF;YAEA,IAAI,CAACgE,WAAW;gBACd;YACF;YAEA,MAAMnH,OAAOM,wBAAwB;gBACnCN,MAAMF,QAAQ;oBACZC;oBACAC,MAAMmH;oBACNlH;gBACF;gBACAE;gBACAI;gBACAN;gBACAO,YAAY2G;YACd;YAEA,MAAM9F,aAAa,MAAMqE,mBAAmB;gBAC1C3E,IAAIwC;gBACJoC,uBAAuBsC,cAAc;gBACrCjI;gBACA4F,OAAOc,MAAMd,KAAK;gBAClBC;YACF;YAEAzE,mBAAmB;gBACjBjB;gBACAI;gBACAc;gBACApB;gBACAO,YAAY2G;YACd;QACF;IACF;IAEA,OAAO;QAAEzD,SAASsB;QAAe,GAAGP,cAAc;IAAC;AACrD,EAAC;AAED,MAAM2B,qBAAqB,CAACpG,OAC1BkI,OAAOC,SAAS,CAACC,cAAc,CAACC,IAAI,CAACrI,MAAM;AAE7C,MAAM2H,aAAa,CAAC,EAClBhC,qBAAqB,EACrBE,MAAM,EACN1C,GAAG,EAKJ;IACC,MAAMmF,WAAWpJ,mBAAmBiE;IAEpCmF,SAASzC,MAAM,GAAGA;IAElB,IAAIF,uBAAuB;;QACvB2C,SAASlE,OAAO,AAAiC,CAACvF,gCAAgC,GAAG;IACzF;IAEA,OAAOyJ;AACT;AAQA,MAAMP,sCAAsC,OAAO,EACjDV,iBAAiB,EACjBvD,MAAM,EACN/D,cAAc,EACdE,OAAO,EACPkD,GAAG,EACHK,MAAM,EACNK,QAAQ,EAST;IACC,MAAM0E,mBAAmB,MAAMC,wBAAwB;QACrDzI;QACAwD,OAAOM;QACP5D;QACAkD;IACF;IACA,MAAMsF,qBAAqB,IAAIC,IAAIH,iBAAiBI,GAAG,CAAC,CAAC,EAAE5H,EAAE,EAAE,GAAKG,OAAOH;IAC3E,MAAM6H,yBAAyBL,iBAAiB9B,MAAM,CAAC,CAAC,EAAEoC,MAAM,EAAE,GAAKA,WAAW;IAClF,IAAIC,mBAA2C,EAAE;IACjD,MAAMhD,aAAa3C,IAAIiB,OAAO;IAC9B,MAAM2E,iCAAiCjD,UAAU,CAAClH,iCAAiC;IAEnF,MAAMoK,UAAU;QACd,MAAMC,2BAA2B;YAC/BnF;YACA/D;YACAE;YACAkD;YACAK;YACAK;QACF;QAEA,MAAMqF,mBAAmB;YACvBnJ;YACAoJ,KAAKL,iBAAiBH,GAAG,CAAC,CAAC,EAAE5H,EAAE,EAAE,GAAKA;YACtCd;YACAkD;QACF;QAEA,KAAK,MAAMiG,mBAAmBb,iBAAkB;YAC9C,MAAMc,iBAAiB;gBACrBtJ;gBACAuJ,UAAUF,gBAAgBP,MAAM,KAAK;gBACrC5I;gBACAkD;gBACAoG,SAASH;YACX;QACF;QAEA,OAAO;IACT;IAEA,IAAI;QACF,KAAK,MAAMG,WAAWX,uBAAwB;YAC5C,MAAMS,iBAAiB;gBAAEtJ;gBAAgBuJ,UAAU;gBAAOrJ;gBAASkD;gBAAKoG;YAAQ;QAClF;QAEA,+EAA+E;QAC/E,yEAAyE;QACzE,sCAAsC;QACtCzD,UAAU,CAAClH,iCAAiC,GAAG;YAAEmC,IAAI8C;YAAU9D;QAAe;QAE9E,IAAI;YACF,MAAMsH;QACR,SAAU;YACR,IAAI0B,mCAAmC5H,WAAW;gBAChD,OAAO2E,UAAU,CAAClH,iCAAiC;YACrD,OAAO;gBACLkH,UAAU,CAAClH,iCAAiC,GAAGmK;YACjD;QACF;QAEA,MAAMS,qBAAqB,MAAMhB,wBAAwB;YACvDzI;YACAwD,OAAOM;YACP5D;YACAkD;QACF;QAEA2F,mBAAmBU,mBAAmB/C,MAAM,CAAC,CAAC,EAAE1F,EAAE,EAAE,GAAK,CAAC0H,mBAAmBgB,GAAG,CAACvI,OAAOH;QAExF,KAAK,MAAMwI,WAAWT,iBAAkB;YACtC,MAAMY,uBAAuB;gBAAE3J;gBAAgBE;gBAASkD;gBAAKoG;YAAQ;QACvE;QAEA,8EAA8E;QAC9E,wEAAwE;QACxE,MAAMtJ,QAAQiF,EAAE,CAAC2C,SAAS,CAAC;YACzB9G,IAAI8C;YACJC,QAAQ;YACRsB,YAAYrF;YACZC,MAAM;gBAAE,CAACV,YAAY,EAAEE;YAAY;YACnC2D;QACF;IACF,EAAE,OAAOwG,OAAO;QACd,MAAMC,uBAAuB,MAAMpB,wBAAwB;YACzDzI;YACAwD,OAAOM;YACP5D;YACAkD;QACF;QAEA2F,mBAAmBc,qBAAqBnD,MAAM,CAAC,CAAC,EAAE1F,EAAE,EAAE,GAAK,CAAC0H,mBAAmBgB,GAAG,CAACvI,OAAOH;QAE1F,MAAMiI;QAEN,MAAMW;IACR;IAEA,OAAO;QACLjG,SAAS;YACP,MAAMwF,mBAAmB;gBACvBnJ;gBACAoJ,KAAK;uBAAIV;iBAAmB;gBAC5BxI;gBACAkD;YACF;YAEA,MAAMiC,aAAanF,QAAQG,WAAW,CAACL,eAAe,CAAEG,MAAM;YAC9D,MAAM2J,cAAcpL,eAAe2G;YAEnC,IAAIyE,cAAc,GAAG;gBACnB,MAAMlL,mBAAmB;oBACvBoC,IAAI8C;oBACJuB;oBACA0E,KAAKD;oBACL5J;oBACAkD;gBACF;YACF;YAEA,OAAO;QACT;QACA6F;QACAe,kBAAkB;eAAItB;SAAmB;IAC3C;AACF;AAEA,MAAMD,0BAA0B,OAAO,EACrCzI,cAAc,EACdwD,KAAK,EACLtD,OAAO,EACPkD,GAAG,EAMJ;IACC,IAAI,CAAClD,QAAQG,WAAW,CAACL,eAAe,EAAEG,OAAO8J,UAAU;QACzD,OAAO,EAAE;IACX;IAEA,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMhK,QAAQiF,EAAE,CAACgF,YAAY,CAAC;QAC7CpG,QAAQ;QACRsB,YAAYrF;QACZoK,OAAO;QACPC,YAAY;QACZjH;QACAkC,OAAO;YAAEgF,QAAQ;gBAAE/E,QAAQ/B;YAAM;QAAE;IACrC;IAEA,OAAO0G;AACT;AAEA,MAAMZ,mBAAmB,OAAO,EAC9BtJ,cAAc,EACduJ,QAAQ,EACRrJ,OAAO,EACPkD,GAAG,EACHoG,OAAO,EAOR;IACC,MAAMtJ,QAAQiF,EAAE,CAACoF,aAAa,CAAC;QAC7BvJ,IAAIwI,QAAQxI,EAAE;QACdqE,YAAYrF;QACZoD;QACAoH,aAAa;YACX1B,QAAQS;YACRC,SAASA,QAAQA,OAAO,IAAI,CAAC;QAC/B;IACF;AACF;AAEA,MAAMG,yBAAyB,OAAO,EACpC3J,cAAc,EACdE,OAAO,EACPkD,GAAG,EACHoG,OAAO,EAMR;IACC,MAAMiB,kBACJjB,QAAQA,OAAO,IAAI,OAAOA,QAAQA,OAAO,KAAK,WAAWA,QAAQA,OAAO,GAAG,CAAC;IAE9E,MAAMtJ,QAAQiF,EAAE,CAACoF,aAAa,CAAC;QAC7BvJ,IAAIwI,QAAQxI,EAAE;QACdqE,YAAYrF;QACZoD;QACAoH,aAAa;YACX,CAACjL,YAAY,EAAEE;YACf,CAACD,kBAAkB,EAAE;YACrBgK,SAAS;gBACP,GAAGiB,eAAe;gBAClB,CAAClL,YAAY,EAAEE;YACjB;QACF;IACF;AACF;AAEA,OAAO,MAAM0J,qBAAqB,OAAO,EACvCnJ,cAAc,EACdoJ,GAAG,EACHlJ,OAAO,EACPkD,GAAG,EAMJ;IACC,IAAI,CAACgG,IAAI5C,MAAM,EAAE;QACf;IACF;IAEA,MAAMtG,QAAQiF,EAAE,CAACuF,cAAc,CAAC;QAC9BrF,YAAYrF;QACZoD;QACAkC,OAAO;YAAEtE,IAAI;gBAAE2J,IAAIvB;YAAI;QAAE;IAC3B;AACF,EAAC;AAED,MAAMF,6BAA6B,OAAO,EACxCnF,MAAM,EACN/D,cAAc,EACdE,OAAO,EACPkD,GAAG,EACHK,MAAM,EACNK,QAAQ,EAQT;IACC,MAAM,EAAE9C,IAAI4J,GAAG,EAAE,GAAGC,cAAc,GAAGpH;IAErC,MAAMvD,QAAQiF,EAAE,CAAC2C,SAAS,CAAC;QACzB9G,IAAI8C;QACJC,QAAQ;QACRsB,YAAYrF;QACZC,MAAM;YACJ,GAAG4K,YAAY;YACf,CAACtL,YAAY,EAAEwE;QACjB;QACAX;IACF;AACF;AAEA,gEAAgE,GAChE,OAAO,MAAM0H,oBAAoB,OAAO,EACtC/G,MAAM,EACNgH,UAAU,EACV5H,cAAc,EACdjD,OAAO,EACPkD,GAAG,EACHE,SAAS,EAQV;IACC,MAAMI,SAAS,MAAMzE,yBAAyB;QAAE8E;QAAQgH;QAAY7K;QAASkD;IAAI;IAEjF,IAAI,CAACM,OAAO8C,MAAM,EAAE;QAClB,MAAM,IAAIwE,MAAM,CAAC,QAAQ,EAAEjH,OAAO,gCAAgC,EAAEgH,WAAW,WAAW,CAAC;IAC7F;IAEA,IAAI,CAAC7K,QAAQiF,EAAE,CAAC8F,kBAAkB,EAAE;QAClC,MAAM,IAAID,MACR,CAAC,oEAAoE,EAAED,WAAW,mBAAmB,CAAC;IAE1G;IAEA,MAAMG,eAAehL,QAAQiL,OAAO,CAAChL,MAAM,CAAC2C,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASgI;IAExE,IAAI,CAACG,cAAc;QACjB,MAAM,IAAIF,MAAM,CAAC,QAAQ,EAAED,WAAW,oBAAoB,CAAC;IAC7D;IAEA,MAAMK,UAAUrM,sBAAsB;QAAEgM;QAAY7K;QAASkD;IAAI;IACjE,MAAMiI,sBAIA,EAAE;IAER,KAAK,MAAM1E,SAASjD,OAAQ;QAC1B,KAAK,MAAM,CAACwE,aAAapC,OAAO,IAAIsF,QAAQ9I,OAAO,GAAI;YACrD,MAAMrC,OAAO,MAAMjB,sBAAsB;gBACvC+E;gBACA8B,OAAOc,MAAMd,KAAK;gBAClBkF;gBACAjF;gBACA5F;gBACAkD;YACF;YAEA,IAAI,CAACnD,MAAM;gBACT,MAAM,IAAI+K,MACR,CAAC,QAAQ,EAAEjH,OAAO,gBAAgB,EAAE4C,MAAMd,KAAK,GAAG,UAAU,YAAY,kBAAkB,EAAEkF,WAAW,WAAW,CAAC;YAEvH;YAEAM,oBAAoBhE,IAAI,CAAC;gBAAEpH,MAAMqL,KAAKC,SAAS,CAACtL;gBAAO4F,OAAOc,MAAMd,KAAK;gBAAEC;YAAO;YAElF,MAAM5F,QAAQsL,YAAY,CAAC;gBACzBzI,MAAMgI;gBACN9K,MAAMX,2BAA2B;oBAAEW;oBAAMG,QAAQ8K,aAAa9K,MAAM;gBAAC;gBACrEyF,OAAOc,MAAMd,KAAK;gBAClBC;gBACA3C;gBACAC,KAAKwE,WAAW;oBACdhC,uBAAuBsC,cAAc;oBACrCpC;oBACA1C,KAAKE;gBACP;YACF;QACF;IACF;IAEA,OAAO;QACLK,SAAS;YACP,KAAK,MAAM8H,eAAeJ,oBAAqB;gBAC7C,MAAMK,cAAc,MAAM1M,sBAAsB;oBAC9C+E;oBACA8B,OAAO4F,YAAY5F,KAAK;oBACxBkF;oBACAjF,QAAQ2F,YAAY3F,MAAM;oBAC1B5F;oBACAkD;gBACF;gBAEA,IAAIsI,eAAeJ,KAAKC,SAAS,CAACG,iBAAiBD,YAAYxL,IAAI,EAAE;oBACnE,OAAO;gBACT;YACF;YAEA,MAAMN,+BAA+B;gBAAEoE;gBAAQgH;gBAAY7K;gBAASkD;YAAI;YACxE,MAAMlD,QAAQiF,EAAE,CAAC8F,kBAAkB,CAAE;gBAAElH;gBAAQgH;gBAAY3H;YAAI;YAE/D,OAAO;QACT;QACAuI,gBAAgB9L,wBAAwB;YAAE+L,cAAcP;QAAoB;IAC9E;AACF,EAAC"}

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

@@ -0,0 +1,12 @@
+import type { Payload, PayloadRequest } from '../../types/index.js';
+export declare const beginBranchMerge: ({ branchDocID, payload, req, }: {
+    branchDocID: number | string;
+    payload: Payload;
+    req: PayloadRequest;
+}) => Promise<void>;
+export declare const restoreBranchAfterMerge: ({ branchDocID, payload, req, }: {
+    branchDocID: number | string;
+    payload: Payload;
+    req: PayloadRequest;
+}) => Promise<void>;
+//# sourceMappingURL=branchMergeStatus.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"branchMergeStatus.d.ts","sourceRoot":"","sources":["../../../src/branching/merge/branchMergeStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAcnE,eAAO,MAAM,gBAAgB,mCAI1B;IACD,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CAef,CAAA;AAED,eAAO,MAAM,uBAAuB,mCAIjC;IACD,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,IAAI,CAWf,CAAA"}

package/dist/branching/merge/branchMergeStatus.js

@@ -0,0 +1,74 @@
+import { APIError } from '../../errors/index.js';
+import { isolateObjectProperty } from '../../utilities/isolateObjectProperty.js';
+import { branchesCollectionSlug } from '../types.js';
+const createBranchStatusRequest = ({ req })=>{
+    const statusReq = isolateObjectProperty(req, 'transactionID');
+    delete statusReq.transactionID;
+    return statusReq;
+};
+export const beginBranchMerge = async ({ branchDocID, payload, req })=>{
+    const updatedBranch = await payload.db.updateOne({
+        branch: false,
+        collection: branchesCollectionSlug,
+        data: {
+            status: 'merging',
+            updatedAt: new Date().toISOString()
+        },
+        options: {
+            atomic: true
+        },
+        req: createBranchStatusRequest({
+            req
+        }),
+        where: {
+            and: [
+                {
+                    id: {
+                        equals: branchDocID
+                    }
+                },
+                {
+                    status: {
+                        equals: 'open'
+                    }
+                }
+            ]
+        }
+    });
+    if (!updatedBranch) {
+        throw new APIError('This branch is already being merged or is not open.', 409);
+    }
+};
+export const restoreBranchAfterMerge = async ({ branchDocID, payload, req })=>{
+    await payload.db.updateOne({
+        branch: false,
+        collection: branchesCollectionSlug,
+        data: {
+            mergedAt: null,
+            status: 'open',
+            updatedAt: new Date().toISOString()
+        },
+        options: {
+            atomic: true
+        },
+        req: createBranchStatusRequest({
+            req
+        }),
+        where: {
+            and: [
+                {
+                    id: {
+                        equals: branchDocID
+                    }
+                },
+                {
+                    status: {
+                        equals: 'merging'
+                    }
+                }
+            ]
+        }
+    });
+};
+
+//# sourceMappingURL=branchMergeStatus.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/branching/merge/branchMergeStatus.ts"],"sourcesContent":["import type { Payload, PayloadRequest } from '../../types/index.js'\n\nimport { APIError } from '../../errors/index.js'\nimport { isolateObjectProperty } from '../../utilities/isolateObjectProperty.js'\nimport { branchesCollectionSlug } from '../types.js'\n\nconst createBranchStatusRequest = ({ req }: { req: PayloadRequest }): PayloadRequest => {\n  const statusReq = isolateObjectProperty(req, 'transactionID')\n\n  delete statusReq.transactionID\n\n  return statusReq\n}\n\nexport const beginBranchMerge = async ({\n  branchDocID,\n  payload,\n  req,\n}: {\n  branchDocID: number | string\n  payload: Payload\n  req: PayloadRequest\n}): Promise<void> => {\n  const updatedBranch = await payload.db.updateOne({\n    branch: false,\n    collection: branchesCollectionSlug,\n    data: { status: 'merging', updatedAt: new Date().toISOString() },\n    options: { atomic: true },\n    req: createBranchStatusRequest({ req }),\n    where: {\n      and: [{ id: { equals: branchDocID } }, { status: { equals: 'open' } }],\n    },\n  })\n\n  if (!updatedBranch) {\n    throw new APIError('This branch is already being merged or is not open.', 409)\n  }\n}\n\nexport const restoreBranchAfterMerge = async ({\n  branchDocID,\n  payload,\n  req,\n}: {\n  branchDocID: number | string\n  payload: Payload\n  req: PayloadRequest\n}): Promise<void> => {\n  await payload.db.updateOne({\n    branch: false,\n    collection: branchesCollectionSlug,\n    data: { mergedAt: null, status: 'open', updatedAt: new Date().toISOString() },\n    options: { atomic: true },\n    req: createBranchStatusRequest({ req }),\n    where: {\n      and: [{ id: { equals: branchDocID } }, { status: { equals: 'merging' } }],\n    },\n  })\n}\n"],"names":["APIError","isolateObjectProperty","branchesCollectionSlug","createBranchStatusRequest","req","statusReq","transactionID","beginBranchMerge","branchDocID","payload","updatedBranch","db","updateOne","branch","collection","data","status","updatedAt","Date","toISOString","options","atomic","where","and","id","equals","restoreBranchAfterMerge","mergedAt"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,wBAAuB;AAChD,SAASC,qBAAqB,QAAQ,2CAA0C;AAChF,SAASC,sBAAsB,QAAQ,cAAa;AAEpD,MAAMC,4BAA4B,CAAC,EAAEC,GAAG,EAA2B;IACjE,MAAMC,YAAYJ,sBAAsBG,KAAK;IAE7C,OAAOC,UAAUC,aAAa;IAE9B,OAAOD;AACT;AAEA,OAAO,MAAME,mBAAmB,OAAO,EACrCC,WAAW,EACXC,OAAO,EACPL,GAAG,EAKJ;IACC,MAAMM,gBAAgB,MAAMD,QAAQE,EAAE,CAACC,SAAS,CAAC;QAC/CC,QAAQ;QACRC,YAAYZ;QACZa,MAAM;YAAEC,QAAQ;YAAWC,WAAW,IAAIC,OAAOC,WAAW;QAAG;QAC/DC,SAAS;YAAEC,QAAQ;QAAK;QACxBjB,KAAKD,0BAA0B;YAAEC;QAAI;QACrCkB,OAAO;YACLC,KAAK;gBAAC;oBAAEC,IAAI;wBAAEC,QAAQjB;oBAAY;gBAAE;gBAAG;oBAAEQ,QAAQ;wBAAES,QAAQ;oBAAO;gBAAE;aAAE;QACxE;IACF;IAEA,IAAI,CAACf,eAAe;QAClB,MAAM,IAAIV,SAAS,uDAAuD;IAC5E;AACF,EAAC;AAED,OAAO,MAAM0B,0BAA0B,OAAO,EAC5ClB,WAAW,EACXC,OAAO,EACPL,GAAG,EAKJ;IACC,MAAMK,QAAQE,EAAE,CAACC,SAAS,CAAC;QACzBC,QAAQ;QACRC,YAAYZ;QACZa,MAAM;YAAEY,UAAU;YAAMX,QAAQ;YAAQC,WAAW,IAAIC,OAAOC,WAAW;QAAG;QAC5EC,SAAS;YAAEC,QAAQ;QAAK;QACxBjB,KAAKD,0BAA0B;YAAEC;QAAI;QACrCkB,OAAO;YACLC,KAAK;gBAAC;oBAAEC,IAAI;wBAAEC,QAAQjB;oBAAY;gBAAE;gBAAG;oBAAEQ,QAAQ;wBAAES,QAAQ;oBAAU;gBAAE;aAAE;QAC3E;IACF;AACF,EAAC"}

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

@@ -0,0 +1,22 @@
+import type { Payload, PayloadRequest } from '../../types/index.js';
+import type { MergeResult } from '../merge.js';
+import type { MergeableChange, MergeProgress } from '../types.js';
+import type { PreparedBranchChange } from './prepareMerge.js';
+export declare const unknownMergeCommitResultContextKey: unique symbol;
+export declare const executeMerge: ({ applicable, applicableGlobals, branch, branchDoc, closeBranch, incomingReq, mergeable, onProgress, overrideAccess, payload, req, result, }: {
+    applicable: PreparedBranchChange[];
+    applicableGlobals: PreparedBranchChange[];
+    branch: string;
+    branchDoc: {
+        id: number | string;
+    };
+    closeBranch: boolean;
+    incomingReq?: PayloadRequest;
+    mergeable: MergeableChange[];
+    onProgress?: (progress: MergeProgress, req: PayloadRequest) => Promise<void> | void;
+    overrideAccess: boolean;
+    payload: Payload;
+    req: PayloadRequest;
+    result: MergeResult;
+}) => Promise<MergeResult>;
+//# sourceMappingURL=executeMerge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"executeMerge.d.ts","sourceRoot":"","sources":["../../../src/branching/merge/executeMerge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,KAAK,EAAmB,eAAe,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAElF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AA0C7D,eAAO,MAAM,kCAAkC,eAAqC,CAAA;AA0JpF,eAAO,MAAM,YAAY,iJAatB;IACD,UAAU,EAAE,oBAAoB,EAAE,CAAA;IAClC,iBAAiB,EAAE,oBAAoB,EAAE,CAAA;IACzC,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,SAAS,EAAE,eAAe,EAAE,CAAA;IAC5B,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACnF,cAAc,EAAE,OAAO,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,WAAW,CAAA;CACpB,KAAG,OAAO,CAAC,WAAW,CA+dtB,CAAA"}