@parhelia/core 0.2.12772 → 0.2.12775

package/dist/editor/reviews/applySuggestedEditActions.js

@@ -0,0 +1,242 @@
+import { enqueueSuggestedEditFieldTask } from "../client/suggestedEditFieldQueue";
+import { createOrUpdateSuggestedEdit } from "../services/suggestedEditsService";
+import { getPendingFieldSuggestions, getSuggestedEditItemLanguage, getSuggestedEditItemVersion, getSuggestionFieldIdentityKey, getSuggestionSelectionKey, } from "./suggestionDisplayValue";
+import { isSuggestedEditRemoved, upsertSuggestedEdit, } from "./suggestedEditState";
+import { applySuggestionPatchToValue } from "./suggestionPatch";
+function getActionKey(suggestion) {
+    return getSuggestionFieldIdentityKey({
+        itemId: suggestion.itemId,
+        language: getSuggestedEditItemLanguage(suggestion),
+        version: getSuggestedEditItemVersion(suggestion),
+        fieldId: suggestion.fieldId,
+    });
+}
+function findFreshSuggestion(editContext, id) {
+    return editContext.getCurrentSuggestedEdits().find((edit) => edit.id === id);
+}
+function upsertFromServer(editContext, suggestion, expectedNewValue) {
+    editContext.setSuggestedEdits((current) => upsertSuggestedEdit(current, suggestion, {
+        source: "save-ack",
+        expectedNewValue,
+    }));
+}
+export async function sha256SuggestedEditFieldValue(value) {
+    const bytes = new TextEncoder().encode(value);
+    const hash = await crypto.subtle.digest("SHA-256", bytes);
+    return Array.from(new Uint8Array(hash))
+        .map((byte) => byte.toString(16).padStart(2, "0"))
+        .join("");
+}
+async function persistRebasedSibling({ sibling, baseValue, editContext, }) {
+    let current = sibling;
+    let currentBase = baseValue;
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+        const rebased = currentBase === current.newValue
+            ? currentBase
+            : applySuggestionPatchToValue(currentBase, current.oldValue, current.newValue);
+        if (rebased === false || typeof rebased !== "string")
+            return false;
+        const subsumed = rebased === currentBase;
+        const candidate = subsumed
+            ? { ...current, status: "applied" }
+            : {
+                ...current,
+                oldValue: currentBase,
+                newValue: rebased,
+                updated: new Date().toISOString(),
+                updatedBy: editContext.user?.name || "unknown",
+            };
+        const result = await createOrUpdateSuggestedEdit(candidate, {
+            expectedUpdated: current.updated,
+            expectedFieldHash: await sha256SuggestedEditFieldValue(currentBase),
+        });
+        if (result.type === "success" && result.data) {
+            upsertFromServer(editContext, result.data, subsumed ? current.newValue : rebased);
+            return true;
+        }
+        if (result.type !== "conflict")
+            return false;
+        if (result.suggestion)
+            upsertFromServer(editContext, result.suggestion);
+        if (result.suggestion?.status !== "pending" ||
+            typeof result.fieldValue !== "string") {
+            return true;
+        }
+        current = result.suggestion;
+        currentBase = result.fieldValue;
+    }
+    return false;
+}
+async function rebaseSiblingSuggestions({ appliedEdit, newFieldValue, fieldItem, editContext, }) {
+    const itemId = fieldItem?.id ?? appliedEdit.itemId;
+    const itemLanguage = fieldItem?.language ?? getSuggestedEditItemLanguage(appliedEdit);
+    const itemVersion = fieldItem?.version ?? getSuggestedEditItemVersion(appliedEdit);
+    const siblings = getPendingFieldSuggestions(editContext.getCurrentSuggestedEdits(), {
+        fieldId: appliedEdit.fieldId,
+        itemId,
+        language: itemLanguage,
+        version: itemVersion,
+        pageItemId: appliedEdit.mainItemId,
+        pageItemLanguage: appliedEdit.mainItemLanguage,
+        pageItemVersion: appliedEdit.mainItemVersion > 0
+            ? appliedEdit.mainItemVersion
+            : undefined,
+    }).filter((candidate) => candidate.id !== appliedEdit.id && !isSuggestedEditRemoved(candidate.id));
+    let failures = 0;
+    for (const sibling of siblings) {
+        const fresh = findFreshSuggestion(editContext, sibling.id);
+        if (!fresh ||
+            fresh.status !== "pending" ||
+            isSuggestedEditRemoved(fresh.id)) {
+            continue;
+        }
+        try {
+            if (!(await persistRebasedSibling({
+                sibling: fresh,
+                baseValue: newFieldValue,
+                editContext,
+            }))) {
+                failures += 1;
+            }
+        }
+        catch (error) {
+            failures += 1;
+            console.warn("Failed to rebase sibling suggestion", error);
+        }
+    }
+    const selectionKey = getSuggestionSelectionKey({
+        itemId,
+        language: itemLanguage,
+        fieldId: appliedEdit.fieldId,
+    });
+    editContext.setSuggestionVariantSelection((current) => {
+        if (!(selectionKey in current))
+            return current;
+        const next = { ...current };
+        delete next[selectionKey];
+        return next;
+    });
+    if (failures > 0) {
+        editContext.showErrorToast({
+            summary: "Some suggestions could not be rebased",
+            details: "They remain available as conflict variants.",
+        });
+    }
+}
+async function applyOrReplaceSuggestedEdit({ suggestion, editContext, replace, allowRejected, }) {
+    return enqueueSuggestedEditFieldTask(getActionKey(suggestion), async () => {
+        const fresh = findFreshSuggestion(editContext, suggestion.id);
+        const canApplyFreshSuggestion = fresh?.status === "pending" ||
+            (allowRejected && fresh?.status === "rejected");
+        if (!fresh ||
+            !canApplyFreshSuggestion ||
+            isSuggestedEditRemoved(fresh.id)) {
+            editContext.showErrorToast({
+                summary: "Suggestion is no longer pending",
+            });
+            return { type: "missing" };
+        }
+        const itemDescriptor = {
+            id: fresh.itemId,
+            language: getSuggestedEditItemLanguage(fresh),
+            version: getSuggestedEditItemVersion(fresh),
+        };
+        const field = await editContext.itemsRepository.getField({
+            item: itemDescriptor,
+            fieldId: fresh.fieldId,
+        });
+        if (!field)
+            return { type: "missing" };
+        const resolvedItemDescriptor = field.descriptor?.item ?? itemDescriptor;
+        const currentValue = field.rawValue || "";
+        const patchedCandidate = replace
+            ? fresh.newValue
+            : applySuggestionPatchToValue(currentValue, fresh.oldValue, fresh.newValue);
+        if (patchedCandidate === false || typeof patchedCandidate !== "string") {
+            return { type: "patch-conflict" };
+        }
+        await editContext.operations.editField({
+            field: { fieldId: fresh.fieldId, item: resolvedItemDescriptor },
+            value: patchedCandidate,
+            rawValue: patchedCandidate,
+            forceMode: "edit",
+            refresh: "immediate",
+        });
+        const result = await createOrUpdateSuggestedEdit({ ...fresh, status: "applied" }, { expectedUpdated: fresh.updated });
+        let actionResult;
+        if (result.type === "success" && result.data) {
+            upsertFromServer(editContext, result.data, fresh.newValue);
+            actionResult = { type: "success", suggestion: result.data };
+        }
+        else if (result.type === "conflict") {
+            if (result.suggestion)
+                upsertFromServer(editContext, result.suggestion);
+            actionResult = { type: "conflict", suggestion: result.suggestion };
+        }
+        else {
+            editContext.showErrorToast({
+                summary: result.summary ||
+                    "Suggestion was applied but its status could not be saved",
+                details: result.details,
+            });
+            actionResult = { type: "error" };
+        }
+        await rebaseSiblingSuggestions({
+            appliedEdit: fresh,
+            newFieldValue: patchedCandidate,
+            fieldItem: resolvedItemDescriptor,
+            editContext,
+        });
+        return actionResult;
+    });
+}
+export function applySuggestedEditPatch(suggestion, editContext) {
+    return applyOrReplaceSuggestedEdit({
+        suggestion,
+        editContext,
+        replace: false,
+        allowRejected: false,
+    });
+}
+export function applyRejectedSuggestedEditPatch(suggestion, editContext) {
+    return applyOrReplaceSuggestedEdit({
+        suggestion,
+        editContext,
+        replace: false,
+        allowRejected: true,
+    });
+}
+export function replaceSuggestedEditCompletely(suggestion, editContext) {
+    return applyOrReplaceSuggestedEdit({
+        suggestion,
+        editContext,
+        replace: true,
+        allowRejected: false,
+    });
+}
+export function rejectSuggestedEditAction(suggestion, editContext) {
+    return enqueueSuggestedEditFieldTask(getActionKey(suggestion), async () => {
+        const fresh = findFreshSuggestion(editContext, suggestion.id);
+        if (!fresh ||
+            fresh.status !== "pending" ||
+            isSuggestedEditRemoved(fresh.id)) {
+            return { type: "missing" };
+        }
+        const result = await createOrUpdateSuggestedEdit({ ...fresh, status: "rejected" }, { expectedUpdated: fresh.updated });
+        if (result.type === "success" && result.data) {
+            upsertFromServer(editContext, result.data, fresh.newValue);
+            return { type: "success", suggestion: result.data };
+        }
+        if (result.type === "conflict") {
+            if (result.suggestion)
+                upsertFromServer(editContext, result.suggestion);
+            return { type: "conflict", suggestion: result.suggestion };
+        }
+        editContext.showErrorToast({
+            summary: result.summary || "Failed to reject suggestion",
+            details: result.details,
+        });
+        return { type: "error" };
+    });
+}
+//# sourceMappingURL=applySuggestedEditActions.js.map

package/dist/editor/reviews/applySuggestedEditActions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"applySuggestedEditActions.js","sourceRoot":"","sources":["../../../src/editor/reviews/applySuggestedEditActions.ts"],"names":[],"mappings":"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"}

package/dist/editor/reviews/feedbackScrollTarget.js

@@ -1,5 +1,6 @@
 import * as DiffLib from "diff";
 import { COMMENT_TRANSIENT_ELEMENT_KEY, } from "./commentTransientSelection";
+import { getSuggestedEditItemLanguage, getSuggestedEditItemVersion, } from "./suggestionDisplayValue";
 export function getCommentTextRangeKey(comment) {
     return `comment:${comment.id}`;
 }
@@ -70,8 +71,8 @@ export function getSuggestedEditFieldDescriptor(suggestion) {
 export function getSuggestedEditItemDescriptor(suggestion) {
     return {
         id: suggestion.itemId,
-        language: suggestion.mainItemLanguage,
-        version: suggestion.mainItemVersion,
+        language: getSuggestedEditItemLanguage(suggestion),
+        version: getSuggestedEditItemVersion(suggestion),
     };
 }
 export function getSuggestionRangeData(oldValue, newValue) {

package/dist/editor/reviews/feedbackScrollTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"feedbackScrollTarget.js","sourceRoot":"","sources":["../../../src/editor/reviews/feedbackScrollTarget.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"feedbackScrollTarget.js","sourceRoot":"","sources":["../../../src/editor/reviews/feedbackScrollTarget.ts"],"names":[],"mappings":"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"}

package/dist/editor/reviews/suggestedEditState.js

@@ -1,3 +1,4 @@
+import { getSuggestedEditItemLanguage, getSuggestedEditItemVersion, } from "./suggestionDisplayValue";
 const locallyEditedSuggestedEdits = new Map();
 // Suggestions removed locally (reverted to a no-op or deleted) while related
 // async work — debounced saves, save-acks, socket echoes, refetches — may still
@@ -31,6 +32,8 @@ function rememberLocalSuggestedEdit(edit) {
         itemId: edit.itemId,
         mainItemLanguage: edit.mainItemLanguage,
         mainItemVersion: edit.mainItemVersion,
+        itemLanguage: edit.itemLanguage,
+        itemVersion: edit.itemVersion,
         newValue: edit.newValue,
     });
 }
@@ -53,7 +56,11 @@ function hasNewerLocalSuggestionValue(current, incoming, options) {
         incoming.fieldId === local.fieldId &&
         incoming.itemId === local.itemId &&
         incoming.mainItemLanguage === local.mainItemLanguage &&
-        incoming.mainItemVersion === local.mainItemVersion);
+        incoming.mainItemVersion === local.mainItemVersion &&
+        getSuggestedEditItemLanguage(incoming) ===
+            (local.itemLanguage ?? local.mainItemLanguage) &&
+        getSuggestedEditItemVersion(incoming) ===
+            (local.itemVersion ?? local.mainItemVersion));
 }
 function shouldAcceptSuggestedEditUpdate(current, incoming, options) {
     if (!current)
@@ -102,6 +109,10 @@ export function replacePendingSuggestionForSameField(suggestedEdits, incoming) {
             edit.mainItemLanguage === incoming.mainItemLanguage &&
             edit.mainItemVersion === incoming.mainItemVersion &&
             edit.itemId === incoming.itemId &&
+            getSuggestedEditItemLanguage(edit) ===
+                getSuggestedEditItemLanguage(incoming) &&
+            getSuggestedEditItemVersion(edit) ===
+                getSuggestedEditItemVersion(incoming) &&
             edit.fieldId === incoming.fieldId &&
             edit.author === incoming.author)),
         incoming,

package/dist/editor/reviews/suggestedEditState.js.map

@@ -1 +1 @@
-{"version":3,"file":"suggestedEditState.js","sourceRoot":"","sources":["../../../src/editor/reviews/suggestedEditState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"suggestedEditState.js","sourceRoot":"","sources":["../../../src/editor/reviews/suggestedEditState.ts"],"names":[],"mappings":"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"}

package/dist/editor/reviews/suggestionDisplayValue.d.ts

@@ -7,6 +7,7 @@ export type SuggestionDisplayField = {
     language: string;
     version: number;
     pageItemId?: string;
+    pageItemLanguage?: string;
     pageItemVersion?: number | null;
 };
 export type SuggestionDisplayModifiedField = {
@@ -21,10 +22,37 @@ export type SuggestionDisplayModifiedField = {
 export type SuggestionDisplayResult = {
     baselineValue: string;
     mergedValue: string;
+    selectedValue: string;
     displayValue: string;
     suggestions: SuggestedEdit[];
     hasSuggestions: boolean;
+    variants: SuggestionVariant[];
+    conflicts: SuggestedEdit[];
+    selectedVariantId?: string;
 };
+export type SuggestionVariant = {
+    id: string;
+    value: string;
+    suggestion?: SuggestedEdit;
+};
+export type SuggestionMergeResult = {
+    mergedValue: string;
+    cleanSuggestions: SuggestedEdit[];
+    conflicts: SuggestedEdit[];
+};
+export declare function getSuggestedEditItemLanguage(suggestion: SuggestedEdit): string;
+export declare function getSuggestedEditItemVersion(suggestion: SuggestedEdit): number;
+export declare function getSuggestionFieldIdentityKey({ itemId, language, version, fieldId, }: {
+    itemId: string;
+    language: string;
+    version: number;
+    fieldId: string;
+}): string;
+export declare function getSuggestionSelectionKey({ itemId, language, fieldId, }: {
+    itemId: string;
+    language: string;
+    fieldId: string;
+}): string;
 export declare function getPendingFieldSuggestions(suggestedEdits: SuggestedEdit[], field: SuggestionDisplayField): SuggestedEdit[];
 export declare function getBaselineFieldValue({ repositoryValue, modifiedFields, field, }: {
     repositoryValue: string | null | undefined;
@@ -32,12 +60,21 @@ export declare function getBaselineFieldValue({ repositoryValue, modifiedFields,
     field: SuggestionDisplayField;
 }): string;
 export declare function mergePendingSuggestionValues(baselineValue: string, suggestions: SuggestedEdit[]): string;
+export declare function partitionPendingSuggestionValues(baselineValue: string, suggestions: SuggestedEdit[]): SuggestionMergeResult;
+/**
+ * Returns the pending suggestions that cannot coexist with the requested
+ * suggestion. Conflict membership is deliberately pairwise and symmetric:
+ * the suggestion chosen as the fold baseline must not appear conflict-free
+ * merely because it sorted first.
+ */
+export declare function getConflictingSuggestionPeers(suggestions: SuggestedEdit[], suggestionId: string): SuggestedEdit[];
 export declare function getSuggestionDiffHtml(baselineValue: string, mergedValue: string): string;
-export declare function getSuggestionDisplayValue({ repositoryValue, modifiedFields, suggestedEdits, field, mode, format, }: {
+export declare function getSuggestionDisplayValue({ repositoryValue, modifiedFields, suggestedEdits, field, mode, format, selectedVariantId: requestedVariantId, }: {
     repositoryValue: string | null | undefined;
     modifiedFields?: SuggestionDisplayModifiedField[];
     suggestedEdits: SuggestedEdit[];
     field: SuggestionDisplayField;
     mode: SuggestionDisplayMode;
     format?: SuggestionDisplayFormat;
+    selectedVariantId?: string;
 }): SuggestionDisplayResult;

package/dist/editor/reviews/suggestionDisplayValue.js

@@ -1,4 +1,29 @@
-import { applyPatch, createPatch, diffWords } from "diff";
+import { diffWords } from "diff";
+import { applySuggestionPatchToValue } from "./suggestionPatch";
+export function getSuggestedEditItemLanguage(suggestion) {
+    return suggestion.itemLanguage ?? suggestion.mainItemLanguage;
+}
+export function getSuggestedEditItemVersion(suggestion) {
+    return suggestion.itemVersion ?? suggestion.mainItemVersion;
+}
+function normalizeIdentityPart(value) {
+    return (value ?? "").trim().toLowerCase().replace(/[{}]/g, "");
+}
+export function getSuggestionFieldIdentityKey({ itemId, language, version, fieldId, }) {
+    return [
+        normalizeIdentityPart(itemId),
+        normalizeIdentityPart(language),
+        version,
+        normalizeIdentityPart(fieldId),
+    ].join(":");
+}
+export function getSuggestionSelectionKey({ itemId, language, fieldId, }) {
+    return [
+        normalizeIdentityPart(itemId),
+        normalizeIdentityPart(language),
+        normalizeIdentityPart(fieldId),
+    ].join(":");
+}
 function toTimestamp(value) {
     if (!value)
         return 0;
@@ -6,17 +31,20 @@ function toTimestamp(value) {
     return Number.isFinite(timestamp) ? timestamp : 0;
 }
 function matchesFieldSuggestion(suggestion, field) {
-    const pageVersion = field.pageItemVersion;
-    const versionMatches = pageVersion != null
-        ? suggestion.mainItemVersion === pageVersion ||
-            suggestion.mainItemVersion === 0
-        : suggestion.mainItemVersion === field.version;
+    const pageVersionMatches = field.pageItemVersion == null ||
+        suggestion.mainItemVersion === 0 ||
+        suggestion.mainItemVersion === field.pageItemVersion;
+    const itemVersion = getSuggestedEditItemVersion(suggestion);
+    const fieldVersionMatches = itemVersion === 0 || itemVersion === field.version;
     return (suggestion.status === "pending" &&
         suggestion.fieldId === field.fieldId &&
         suggestion.itemId === field.itemId &&
-        suggestion.mainItemLanguage === field.language &&
+        getSuggestedEditItemLanguage(suggestion) === field.language &&
         (!field.pageItemId || suggestion.mainItemId === field.pageItemId) &&
-        versionMatches);
+        (!field.pageItemLanguage ||
+            suggestion.mainItemLanguage === field.pageItemLanguage) &&
+        pageVersionMatches &&
+        fieldVersionMatches);
 }
 export function getPendingFieldSuggestions(suggestedEdits, field) {
     return suggestedEdits
@@ -34,16 +62,43 @@ export function getBaselineFieldValue({ repositoryValue, modifiedFields, field,
     return modifiedField ? (modifiedField.value ?? "") : (repositoryValue ?? "");
 }
 export function mergePendingSuggestionValues(baselineValue, suggestions) {
+    return partitionPendingSuggestionValues(baselineValue, suggestions)
+        .mergedValue;
+}
+export function partitionPendingSuggestionValues(baselineValue, suggestions) {
     let mergedValue = baselineValue;
+    const cleanSuggestions = [];
+    const conflicts = [];
     for (const suggestion of suggestions) {
-        const patch = createPatch("field", suggestion.oldValue, suggestion.newValue);
-        const patchedCandidate = applyPatch(mergedValue, patch);
-        mergedValue =
-            patchedCandidate !== false && typeof patchedCandidate === "string"
-                ? patchedCandidate
-                : suggestion.newValue;
+        const patchedCandidate = applySuggestionPatchToValue(mergedValue, suggestion.oldValue, suggestion.newValue);
+        if (patchedCandidate === false || typeof patchedCandidate !== "string") {
+            conflicts.push(suggestion);
+            continue;
+        }
+        mergedValue = patchedCandidate;
+        cleanSuggestions.push(suggestion);
     }
-    return mergedValue;
+    return { mergedValue, cleanSuggestions, conflicts };
+}
+/**
+ * Returns the pending suggestions that cannot coexist with the requested
+ * suggestion. Conflict membership is deliberately pairwise and symmetric:
+ * the suggestion chosen as the fold baseline must not appear conflict-free
+ * merely because it sorted first.
+ */
+export function getConflictingSuggestionPeers(suggestions, suggestionId) {
+    const suggestion = suggestions.find((candidate) => candidate.id === suggestionId);
+    if (!suggestion)
+        return [];
+    return suggestions.filter((candidate) => {
+        if (candidate.id === suggestion.id)
+            return false;
+        if (candidate.newValue === suggestion.newValue)
+            return false;
+        const candidateAfterSuggestion = applySuggestionPatchToValue(suggestion.newValue, candidate.oldValue, candidate.newValue);
+        const suggestionAfterCandidate = applySuggestionPatchToValue(candidate.newValue, suggestion.oldValue, suggestion.newValue);
+        return (candidateAfterSuggestion === false && suggestionAfterCandidate === false);
+    });
 }
 function escapeHtml(value) {
     return value
@@ -67,7 +122,7 @@ export function getSuggestionDiffHtml(baselineValue, mergedValue) {
     })
         .join("");
 }
-export function getSuggestionDisplayValue({ repositoryValue, modifiedFields, suggestedEdits, field, mode, format = "plain", }) {
+export function getSuggestionDisplayValue({ repositoryValue, modifiedFields, suggestedEdits, field, mode, format = "plain", selectedVariantId: requestedVariantId, }) {
     const baselineValue = getBaselineFieldValue({
         repositoryValue,
         modifiedFields,
@@ -76,18 +131,41 @@ export function getSuggestionDisplayValue({ repositoryValue, modifiedFields, sug
     const suggestions = mode === "suggestions"
         ? getPendingFieldSuggestions(suggestedEdits, field)
         : [];
-    const mergedValue = suggestions.length
-        ? mergePendingSuggestionValues(baselineValue, suggestions)
-        : baselineValue;
+    const partition = suggestions.length
+        ? partitionPendingSuggestionValues(baselineValue, suggestions)
+        : { mergedValue: baselineValue, cleanSuggestions: [], conflicts: [] };
+    const mergedValue = partition.mergedValue;
+    const variants = partition.conflicts.length
+        ? [
+            { id: "merged", value: mergedValue },
+            ...partition.conflicts.map((suggestion) => ({
+                id: suggestion.id,
+                value: suggestion.newValue,
+                suggestion,
+            })),
+        ]
+        : [];
+    const fallbackVariantId = partition.cleanSuggestions.length
+        ? "merged"
+        : partition.conflicts[0]?.id;
+    const selectedVariantId = variants.some((variant) => variant.id === requestedVariantId)
+        ? requestedVariantId
+        : fallbackVariantId;
+    const selectedValue = variants.find((variant) => variant.id === selectedVariantId)?.value ??
+        mergedValue;
     const displayValue = mode === "suggestions" && suggestions.length && format === "diff"
-        ? getSuggestionDiffHtml(baselineValue, mergedValue)
-        : mergedValue;
+        ? getSuggestionDiffHtml(baselineValue, selectedValue)
+        : selectedValue;
     return {
         baselineValue,
         mergedValue,
+        selectedValue,
         displayValue,
         suggestions,
         hasSuggestions: suggestions.length > 0,
+        variants,
+        conflicts: partition.conflicts,
+        selectedVariantId,
     };
 }
 //# sourceMappingURL=suggestionDisplayValue.js.map

package/dist/editor/reviews/suggestionDisplayValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"suggestionDisplayValue.js","sourceRoot":"","sources":["../../../src/editor/reviews/suggestionDisplayValue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"suggestionDisplayValue.js","sourceRoot":"","sources":["../../../src/editor/reviews/suggestionDisplayValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAiDhE,MAAM,UAAU,4BAA4B,CAAC,UAAyB;IACpE,OAAO,UAAU,CAAC,YAAY,IAAI,UAAU,CAAC,gBAAgB,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,UAAyB;IACnE,OAAO,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,eAAe,CAAC;AAC9D,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAyB;IACtD,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,EAC5C,MAAM,EACN,QAAQ,EACR,OAAO,EACP,OAAO,GAMR;IACC,OAAO;QACL,qBAAqB,CAAC,MAAM,CAAC;QAC7B,qBAAqB,CAAC,QAAQ,CAAC;QAC/B,OAAO;QACP,qBAAqB,CAAC,OAAO,CAAC;KAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,EACxC,MAAM,EACN,QAAQ,EACR,OAAO,GAKR;IACC,OAAO;QACL,qBAAqB,CAAC,MAAM,CAAC;QAC7B,qBAAqB,CAAC,QAAQ,CAAC;QAC/B,qBAAqB,CAAC,OAAO,CAAC;KAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,KAAyB;IAC5C,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,CAAC;IACrB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5C,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,sBAAsB,CAC7B,UAAyB,EACzB,KAA6B;IAE7B,MAAM,kBAAkB,GACtB,KAAK,CAAC,eAAe,IAAI,IAAI;QAC7B,UAAU,CAAC,eAAe,KAAK,CAAC;QAChC,UAAU,CAAC,eAAe,KAAK,KAAK,CAAC,eAAe,CAAC;IACvD,MAAM,WAAW,GAAG,2BAA2B,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,mBAAmB,GACvB,WAAW,KAAK,CAAC,IAAI,WAAW,KAAK,KAAK,CAAC,OAAO,CAAC;IAErD,OAAO,CACL,UAAU,CAAC,MAAM,KAAK,SAAS;QAC/B,UAAU,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;QACpC,UAAU,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;QAClC,4BAA4B,CAAC,UAAU,CAAC,KAAK,KAAK,CAAC,QAAQ;QAC3D,CAAC,CAAC,KAAK,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,CAAC;QACjE,CAAC,CAAC,KAAK,CAAC,gBAAgB;YACtB,UAAU,CAAC,gBAAgB,KAAK,KAAK,CAAC,gBAAgB,CAAC;QACzD,kBAAkB;QAClB,mBAAmB,CACpB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,cAA+B,EAC/B,KAA6B;IAE7B,OAAO,cAAc;SAClB,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,sBAAsB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;SACjE,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACzE,OAAO,SAAS,IAAI,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,EACpC,eAAe,EACf,cAAc,EACd,KAAK,GAKN;IACC,MAAM,aAAa,GAAG,cAAc,EAAE,IAAI,CACxC,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;QACnC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC,MAAM;QAClC,SAAS,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ;QAC1C,SAAS,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,CAC3C,CAAC;IAEF,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,aAAqB,EACrB,WAA4B;IAE5B,OAAO,gCAAgC,CAAC,aAAa,EAAE,WAAW,CAAC;SAChE,WAAW,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,aAAqB,EACrB,WAA4B;IAE5B,IAAI,WAAW,GAAG,aAAa,CAAC;IAChC,MAAM,gBAAgB,GAAoB,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAoB,EAAE,CAAC;IAEtC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,2BAA2B,CAClD,WAAW,EACX,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,QAAQ,CACpB,CAAC;QACF,IAAI,gBAAgB,KAAK,KAAK,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACvE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3B,SAAS;QACX,CAAC;QACD,WAAW,GAAG,gBAAgB,CAAC;QAC/B,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,6BAA6B,CAC3C,WAA4B,EAC5B,YAAoB;IAEpB,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CACjC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,YAAY,CAC7C,CAAC;IACF,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAE3B,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QACtC,IAAI,SAAS,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE;YAAE,OAAO,KAAK,CAAC;QACjD,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC;QAE7D,MAAM,wBAAwB,GAAG,2BAA2B,CAC1D,UAAU,CAAC,QAAQ,EACnB,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,QAAQ,CACnB,CAAC;QACF,MAAM,wBAAwB,GAAG,2BAA2B,CAC1D,SAAS,CAAC,QAAQ,EAClB,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,QAAQ,CACpB,CAAC;QAEF,OAAO,CACL,wBAAwB,KAAK,KAAK,IAAI,wBAAwB,KAAK,KAAK,CACzE,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK;SACT,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC;SACxB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;SACvB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;SACvB,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC;SACzB,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,aAAqB,EACrB,WAAmB;IAEnB,OAAO,SAAS,CAAC,aAAa,EAAE,WAAW,CAAC;SACzC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,IAAI,KAAK,GAAG,cAAc,CAAC;QAC3B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,KAAK,GAAG,eAAe,CAAC;QAC1B,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACxB,KAAK,GAAG,4CAA4C,CAAC;QACvD,CAAC;QACD,OAAO,gBAAgB,KAAK,KAAK,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IACnE,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,EACxC,eAAe,EACf,cAAc,EACd,cAAc,EACd,KAAK,EACL,IAAI,EACJ,MAAM,GAAG,OAAO,EAChB,iBAAiB,EAAE,kBAAkB,GAStC;IACC,MAAM,aAAa,GAAG,qBAAqB,CAAC;QAC1C,eAAe;QACf,cAAc;QACd,KAAK;KACN,CAAC,CAAC;IACH,MAAM,WAAW,GACf,IAAI,KAAK,aAAa;QACpB,CAAC,CAAC,0BAA0B,CAAC,cAAc,EAAE,KAAK,CAAC;QACnD,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM;QAClC,CAAC,CAAC,gCAAgC,CAAC,aAAa,EAAE,WAAW,CAAC;QAC9D,CAAC,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IACxE,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;IAC1C,MAAM,QAAQ,GAAwB,SAAS,CAAC,SAAS,CAAC,MAAM;QAC9D,CAAC,CAAC;YACE,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE;YACpC,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAC1C,EAAE,EAAE,UAAU,CAAC,EAAE;gBACjB,KAAK,EAAE,UAAU,CAAC,QAAQ;gBAC1B,UAAU;aACX,CAAC,CAAC;SACJ;QACH,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,iBAAiB,GAAG,SAAS,CAAC,gBAAgB,CAAC,MAAM;QACzD,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAC/B,MAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,CACrC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,kBAAkB,CAC/C;QACC,CAAC,CAAC,kBAAkB;QACpB,CAAC,CAAC,iBAAiB,CAAC;IACtB,MAAM,aAAa,GACjB,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,iBAAiB,CAAC,EAAE,KAAK;QACnE,WAAW,CAAC;IACd,MAAM,YAAY,GAChB,IAAI,KAAK,aAAa,IAAI,WAAW,CAAC,MAAM,IAAI,MAAM,KAAK,MAAM;QAC/D,CAAC,CAAC,qBAAqB,CAAC,aAAa,EAAE,aAAa,CAAC;QACrD,CAAC,CAAC,aAAa,CAAC;IAEpB,OAAO;QACL,aAAa;QACb,WAAW;QACX,aAAa;QACb,YAAY;QACZ,WAAW;QACX,cAAc,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC;QACtC,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,iBAAiB;KAClB,CAAC;AACJ,CAAC"}

package/dist/editor/reviews/suggestionPatch.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Applies a suggestion's line-based change to the current field value.
+ *
+ * Suggestion compatibility is determined by the lines the suggestion actually
+ * changes. Including diff's default surrounding context makes independent
+ * edits conflict on short fields (for example, changing line one and line
+ * three of a three-line value), because every unchanged line becomes part of
+ * both patches.
+ */
+export declare function applySuggestionPatchToValue(currentValue: string, oldValue: string, newValue: string): string | false;