@parhelia/core 0.3.12763 → 0.3.12768

package/dist/editor/reviews/reviewListPresentation.js

@@ -30,6 +30,17 @@ export function reviewIncludesUser(review, user) {
         .map(normalizeReviewIdentity)
         .some((identity) => identity && userIdentities.has(identity)));
 }
+export function getReviewDecisionProgressStatus(review) {
+    const decisionsCount = review.currentUserDecisionsCount;
+    if (decisionsCount == null)
+        return null;
+    if (decisionsCount <= 0)
+        return "open";
+    if (review.pagesCount > 0 && decisionsCount >= review.pagesCount) {
+        return "completed";
+    }
+    return "in-progress";
+}
 export function getReviewLanguages(review) {
     const detailedLanguages = (review.languages ?? []).filter((language) => language && language !== "*");
     if (detailedLanguages.length > 0)

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

@@ -1 +1 @@
-{"version":3,"file":"reviewListPresentation.js","sourceRoot":"","sources":["../../../src/editor/reviews/reviewListPresentation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reviewListPresentation.js","sourceRoot":"","sources":["../../../src/editor/reviews/reviewListPresentation.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":"AAkBA,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAAmC,CAAC;AAE/E,6EAA6E;AAC7E,gFAAgF;AAChF,0EAA0E;AAC1E,4EAA4E;AAC5E,8EAA8E;AAC9E,mEAAmE;AACnE,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAU,CAAC;AAElD,MAAM,UAAU,wBAAwB,CAAC,EAAU;IACjD,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChC,2BAA2B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EAAU;IAC/C,OAAO,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,MAAM,CAAC,KAAyB;IACvC,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,eAAe,CAAC,OAAsB,EAAE,QAAuB;IACtE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,WAAW,GAAG,CAAC,IAAI,YAAY,GAAG,CAAC,IAAI,WAAW,GAAG,YAAY,CAAC;AAC3E,CAAC;AAED,SAAS,0BAA0B,CAAC,IAAmB;IACrD,2BAA2B,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ;KACxB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAmB;IACnD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,2BAA2B,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAED,SAAS,4BAA4B,CACnC,OAAsB,EACtB,QAAuB,EACvB,OAAmC;IAEnC,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE9C,MAAM,KAAK,GAAG,2BAA2B,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC3D,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEvD,OAAO,CACL,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ;QACnC,QAAQ,CAAC,MAAM,KAAK,SAAS;QAC7B,QAAQ,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;QAChC,QAAQ,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;QAClC,QAAQ,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;QAChC,QAAQ,CAAC,gBAAgB,KAAK,KAAK,CAAC,gBAAgB;QACpD,QAAQ,CAAC,eAAe,KAAK,KAAK,CAAC,eAAe,CACnD,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CACtC,OAAkC,EAClC,QAAuB,EACvB,OAAmC;IAEnC,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAE1B,IAAI,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;QAC7D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IACE,OAAO,CAAC,gBAAgB,KAAK,SAAS;QACtC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,gBAAgB,EAC7C,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,cAA+B,EAC/B,QAAuB,EACvB,UAAsC,EAAE;IAExC,IAAI,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QACxC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE1E,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,MAAM,YAAY,GAAG,+BAA+B,CAClD,cAAc,CAAC,KAAK,CAAC,EACrB,QAAQ,EACR,OAAO,CACR,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,MAAM,OAAO,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC;QACpC,OAAO,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;QAC1B,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC/B,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC/B,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,CAAC,GAAG,cAAc,EAAE,QAAQ,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,oCAAoC,CAClD,cAA+B,EAC/B,QAAuB;IAEvB,IAAI,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QACxC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,OAAO;QACL,GAAG,cAAc,CAAC,MAAM,CACtB,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,CACC,IAAI,CAAC,MAAM,KAAK,SAAS;YACzB,IAAI,CAAC,UAAU,KAAK,QAAQ,CAAC,UAAU;YACvC,IAAI,CAAC,gBAAgB,KAAK,QAAQ,CAAC,gBAAgB;YACnD,IAAI,CAAC,eAAe,KAAK,QAAQ,CAAC,eAAe;YACjD,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;YAC/B,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO;YACjC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,CAChC,CACJ;QACD,QAAQ;KACT,CAAC;AACJ,CAAC"}
+{"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;

package/dist/editor/reviews/suggestionPatch.js

@@ -0,0 +1,17 @@
+import { applyPatch, createPatch } from "diff";
+/**
+ * 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 function applySuggestionPatchToValue(currentValue, oldValue, newValue) {
+    const patch = createPatch("field", oldValue, newValue, undefined, undefined, {
+        context: 0,
+    });
+    return applyPatch(currentValue, patch);
+}
+//# sourceMappingURL=suggestionPatch.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"suggestionPatch.js","sourceRoot":"","sources":["../../../src/editor/reviews/suggestionPatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,UAAU,2BAA2B,CACzC,YAAoB,EACpB,QAAgB,EAChB,QAAgB;IAEhB,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE;QAC3E,OAAO,EAAE,CAAC;KACX,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;AACzC,CAAC"}

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

@@ -1,7 +1,6 @@
 import { ReviewListItem, ReviewWithPages, ReviewAssignment, CreateReviewRequest, ReviewerInfo, ItemWithSubtree } from "../../types";
 import { ItemDescriptor } from "../pageModel";
-export declare function useMultiReview({ language, addSocketMessageListener, socketConnectionVersion, }: {
-    language?: string;
+export declare function useMultiReview({ addSocketMessageListener, socketConnectionVersion, }: {
     addSocketMessageListener: (callback: (message: {
         type: string;
         payload: any;

package/dist/editor/reviews/useMultiReview.js

@@ -1,6 +1,35 @@
 import { useEffect, useState, useMemo, useCallback, useRef } from "react";
 import { getAllReviews, getReviewStatus, createReview, addReviewers, removeReviewer, sendInvitations, setItemDecision, setFinalDecision, addPagesToReview, removePagesFromReview, } from "../services/reviewsService";
-export function useMultiReview({ language = "en", addSocketMessageListener, socketConnectionVersion, }) {
+async function sendInvitationsOrThrow(assignmentIds) {
+    const result = await sendInvitations(assignmentIds);
+    if (result.type === "error") {
+        const errorMessage = result.details || result.summary || "Failed to send invitations";
+        throw new Error(typeof errorMessage === "string"
+            ? errorMessage
+            : JSON.stringify(errorMessage));
+    }
+    if (result.data &&
+        typeof result.data === "object" &&
+        "errors" in result.data &&
+        Array.isArray(result.data.errors) &&
+        result.data.errors.length > 0) {
+        const responseData = result.data;
+        const errorMap = new Map();
+        responseData.errors.forEach((invitationError) => {
+            const message = invitationError.message || JSON.stringify(invitationError);
+            if (invitationError.assignmentId) {
+                errorMap.set(invitationError.assignmentId, String(message));
+            }
+        });
+        const allFailed = responseData.successfulCount === 0;
+        const error = new Error(allFailed
+            ? Array.from(errorMap.values()).join("; ")
+            : "Some invitations failed to send");
+        error.assignmentErrors = errorMap;
+        throw error;
+    }
+}
+export function useMultiReview({ addSocketMessageListener, socketConnectionVersion, }) {
     const [reviews, setReviews] = useState([]);
     const [selectedReviewId, setSelectedReviewId] = useState(null);
     const [reviewDetail, setReviewDetail] = useState(null);
@@ -13,7 +42,13 @@ export function useMultiReview({ language = "en", addSocketMessageListener, sock
                 setLoading(true);
                 setError(null);
             }
-            const result = await getAllReviews(language);
+            const result = await getAllReviews();
+            // get() reports failures as error-typed results instead of throwing;
+            // rethrow so failures reach the catch below instead of leaving the
+            // list silently stuck on stale (or empty) data.
+            if (result.type !== "success") {
+                throw new Error(result.details || result.summary || "Failed to load reviews");
+            }
             if (result.data) {
                 setReviews(result.data);
             }
@@ -28,7 +63,7 @@ export function useMultiReview({ language = "en", addSocketMessageListener, sock
                 setLoading(false);
             }
         }
-    }, [language]);
+    }, []);
     const loadReviewDetail = useCallback(async (reviewId, options) => {
         const silent = options?.silent === true;
         try {
@@ -37,6 +72,9 @@ export function useMultiReview({ language = "en", addSocketMessageListener, sock
                 setError(null);
             }
             const result = await getReviewStatus(reviewId);
+            if (result.type !== "success") {
+                throw new Error(result.details || result.summary || "Failed to load review");
+            }
             if (result.data) {
                 setReviewDetail(result.data);
             }
@@ -101,19 +139,46 @@ export function useMultiReview({ language = "en", addSocketMessageListener, sock
         }
     }, [selectedReviewId, loadReviews]);
     const addReviewersToReview = useCallback(async (reviewId, reviewers) => {
+        let reviewersAdded = false;
         try {
             setLoading(true);
             setError(null);
-            await addReviewers(reviewId, reviewers);
-            if (selectedReviewId === reviewId) {
-                await loadReviewDetail(reviewId);
+            const addResult = await addReviewers(reviewId, reviewers);
+            if (addResult.type !== "success") {
+                throw new Error(addResult.details ||
+                    addResult.summary ||
+                    "Failed to add reviewers");
+            }
+            reviewersAdded = true;
+            const statusResult = await getReviewStatus(reviewId);
+            if (statusResult.type !== "success" || !statusResult.data) {
+                throw new Error(statusResult.details ||
+                    statusResult.summary ||
+                    "Failed to load added reviewers");
+            }
+            const addedEmails = new Set(reviewers.map((reviewer) => reviewer.email.trim().toLowerCase()));
+            const assignmentIds = statusResult.data.assignments
+                .filter((assignment) => !assignment.invitationSentDate &&
+                addedEmails.has(assignment.reviewerEmail.trim().toLowerCase()))
+                .map((assignment) => assignment.assignmentId) ?? [];
+            if (assignmentIds.length > 0) {
+                await sendInvitationsOrThrow(assignmentIds);
             }
-            await loadReviews();
         }
         catch (err) {
-            setError(err instanceof Error ? err.message : "Failed to add reviewers");
+            setError(err instanceof Error
+                ? err.message
+                : reviewersAdded
+                    ? "Reviewer added, but the invitation could not be sent"
+                    : "Failed to add reviewers");
         }
         finally {
+            if (reviewersAdded) {
+                if (selectedReviewId === reviewId) {
+                    await loadReviewDetail(reviewId);
+                }
+                await loadReviews();
+            }
             setLoading(false);
         }
     }, [selectedReviewId, loadReviewDetail, loadReviews]);
@@ -138,63 +203,7 @@ export function useMultiReview({ language = "en", addSocketMessageListener, sock
         try {
             setLoading(true);
             setError(null);
-            const result = await sendInvitations(assignmentIds);
-            // Check if the service returned an error response
-            if (result.type === "error") {
-                let errorMessage = result.details || result.summary || "Failed to send invitations";
-                // Ensure we have a string, not a JSON object
-                if (typeof errorMessage !== "string") {
-                    // Try to extract message from object
-                    if (errorMessage && typeof errorMessage === "object") {
-                        errorMessage =
-                            errorMessage.message ||
-                                errorMessage.error ||
-                                errorMessage.summary ||
-                                String(errorMessage);
-                    }
-                    else {
-                        errorMessage = String(errorMessage);
-                    }
-                }
-                const error = new Error(errorMessage);
-                setError(errorMessage);
-                throw error;
-            }
-            // Check if the response contains errors for individual assignments
-            if (result.data &&
-                typeof result.data === "object" &&
-                result.data !== null &&
-                "errors" in result.data &&
-                Array.isArray(result.data.errors) &&
-                result.data.errors.length > 0) {
-                // Type guard: result.data is an object with errors property
-                const responseData = result.data;
-                // Create a map of assignmentId -> error message
-                const errorMap = new Map();
-                responseData.errors.forEach((err) => {
-                    // Handle both object format and ensure message is a string
-                    let message = err.message || JSON.stringify(err);
-                    if (typeof message !== "string") {
-                        message = String(message);
-                    }
-                    const assignmentId = err.assignmentId;
-                    if (assignmentId) {
-                        errorMap.set(assignmentId, message);
-                    }
-                });
-                // If all assignments failed, throw a general error
-                if (responseData.successfulCount === 0) {
-                    const errorMessages = Array.from(errorMap.values()).join("; ");
-                    const error = new Error(errorMessages);
-                    setError(errorMessages);
-                    throw error;
-                }
-                // If some succeeded and some failed, throw an error with the error map
-                // We'll attach it as a custom property so the UI can access it
-                const error = new Error("Some invitations failed to send");
-                error.assignmentErrors = errorMap;
-                throw error;
-            }
+            await sendInvitationsOrThrow(assignmentIds);
             if (selectedReviewId) {
                 await loadReviewDetail(selectedReviewId);
             }