@pantheon-systems/puck-css 0.12.0 → 0.13.0

package/dist/merge/components/merge-resolution/index.js

@@ -1,6 +1,3 @@
-/**
- * Merge Resolution Components - Barrel Export
- */
 export { MergeReviewPage } from './MergeReviewPage.js';
 export { MergeResolutionPage } from './MergeResolutionPage.js';
 export { DocumentResolutionList } from './DocumentResolutionList.js';

package/dist/merge/components/merge-resolution/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/merge/useMergeResolution.d.ts

@@ -3,7 +3,7 @@
  *
  * Central state machine for multi-document merge conflict resolution.
  * Manages document list, per-document strategy selection, cherry-pick
- * state, CRDT preview fetching, navigation, and merge execution.
+ * state, preview fetching, navigation, and merge execution.
  */
 import type { P1Client, PuckData, DocumentConflictType, MergeRequest } from '@pantheon-systems/css-client';
 import type { PuckFieldClassification } from './utils/puckFieldClassifier.js';

package/dist/merge/useMergeResolution.d.ts.map

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

package/dist/merge/useMergeResolution.js

@@ -1,21 +1,8 @@
-/**
- * useMergeResolution Hook
- *
- * Central state machine for multi-document merge conflict resolution.
- * Manages document list, per-document strategy selection, cherry-pick
- * state, CRDT preview fetching, navigation, and merge execution.
- */
 import { useState, useCallback, useMemo } from 'react';
 import { classifyPuckFields, buildMergedSnapshot, } from './utils/puckFieldClassifier.js';
-// =============================================================================
-// Helper: determine if a conflict type allows cherry-pick / CRDT
-// =============================================================================
 function isDeleteConflict(conflictType) {
     return conflictType === 'deleted-in-source' || conflictType === 'deleted-in-target';
 }
-// =============================================================================
-// Hook Implementation
-// =============================================================================
 export function useMergeResolution(options) {
     const { client, siteId, sourceBranchId, targetBranchId } = options;
     const [documents, setDocuments] = useState([]);
@@ -28,30 +15,21 @@ export function useMergeResolution(options) {
     const [mergeRequest, setMergeRequest] = useState(null);
     const [mergeRequestCreating, setMergeRequestCreating] = useState(false);
     const [mergeRequestError, setMergeRequestError] = useState(null);
-    // Derived state
     const currentDocument = useMemo(() => documents[currentIndex] ?? null, [documents, currentIndex]);
     const totalCount = documents.length;
     const resolvedCount = useMemo(() => documents.filter((d) => d.strategy !== 'unresolved').length, [documents]);
     const unresolvedCount = useMemo(() => documents.filter((d) => d.strategy === 'unresolved').length, [documents]);
     const allResolved = useMemo(() => documents.length > 0 && unresolvedCount === 0, [documents.length, unresolvedCount]);
-    // =========================================================================
-    // Load preview
-    // =========================================================================
     const loadPreview = useCallback(async () => {
         setPreviewLoading(true);
         setPreviewError(null);
         try {
             const preview = await client.merge.preview(siteId, sourceBranchId, targetBranchId, { includeContent: true, excludePathPrefixes: ['_registry/'] });
-            // Build conflict set for quick lookup
             const conflictDocIds = new Set(preview.conflicts.documentConflicts.map((c) => c.documentId));
             const conflictMap = new Map(preview.conflicts.documentConflicts.map((c) => [c.documentId, c]));
-            // Build source and target change sets
             const sourceChangeMap = new Map(preview.sourceChanges.map((c) => [c.documentId, c]));
             const targetChangeMap = new Map(preview.targetChanges.map((c) => [c.documentId, c]));
-            // Build diff map for quick lookup
             const diffMap = new Map((preview.documentDiffs ?? []).map((d) => [d.documentId, d]));
-            // Collect document IDs from conflicts and source (Draft) changes only.
-            // Target-only changes are already on Live and are not part of the merge.
             const allDocIds = new Set();
             for (const c of preview.conflicts.documentConflicts) {
                 allDocIds.add(c.documentId);
@@ -59,23 +37,14 @@ export function useMergeResolution(options) {
             for (const sc of preview.sourceChanges) {
                 allDocIds.add(sc.documentId);
             }
-            // Fetch snapshots for non-conflicting documents in parallel
             const snapshotFetches = new Map();
             for (const docId of allDocIds) {
-                // Skip fetching only when the conflict diff already has both snapshots.
-                // When a snapshot is missing from the diff (backend may return null for
-                // targetSnapshot even for both-modified conflicts), fall through so we
-                // can fetch it via getLatest as a fallback.
                 if (conflictDocIds.has(docId) && diffMap.has(docId)) {
                     const d = diffMap.get(docId);
                     if (d?.sourceSnapshot && d.targetSnapshot) {
                         continue;
                     }
                 }
-                // For non-conflicting docs (and conflicting docs with incomplete diff
-                // snapshots), fetch snapshots via versions API.
-                // Always try both branches — a doc may exist on the other branch
-                // via COW inheritance even if it wasn't changed there.
                 snapshotFetches.set(docId, (async () => {
                     const results = await Promise.allSettled([
                         client.versions.getLatest(siteId, sourceBranchId, docId),
@@ -93,7 +62,6 @@ export function useMergeResolution(options) {
                     };
                 })());
             }
-            // Wait for all snapshot fetches
             const fetchedSnapshots = new Map();
             for (const [docId, fetchPromise] of snapshotFetches) {
                 try {
@@ -103,7 +71,6 @@ export function useMergeResolution(options) {
                     fetchedSnapshots.set(docId, { source: null, target: null });
                 }
             }
-            // Build document resolutions for all documents
             const docs = [];
             for (const docId of allDocIds) {
                 const conflict = conflictMap.get(docId);
@@ -111,13 +78,11 @@ export function useMergeResolution(options) {
                 const inSource = sourceChangeMap.has(docId);
                 const inTarget = targetChangeMap.has(docId);
                 const isConflicting = conflictDocIds.has(docId);
-                // Determine change path info
                 const docPath = conflict?.documentPath
                     ?? diff?.documentPath
                     ?? sourceChangeMap.get(docId)?.documentPath
                     ?? targetChangeMap.get(docId)?.documentPath
                     ?? docId;
-                // Determine changeType, strategy, and conflictType
                 let changeType;
                 let strategy;
                 let conflictType;
@@ -135,39 +100,29 @@ export function useMergeResolution(options) {
                     const sourceChange = sourceChangeMap.get(docId);
                     const snapshots = fetchedSnapshots.get(docId);
                     if (sourceChange?.isDeleted) {
-                        // State 5: Document deleted on Draft
                         changeType = 'deleted-on-draft';
-                        strategy = 'accept-draft'; // Will delete on merge
+                        strategy = 'accept-draft';
                     }
                     else if (snapshots?.target === null) {
-                        // State 1: New document on Draft, doesn't exist on Live
                         changeType = 'new-on-draft';
                         strategy = 'accept-draft';
                     }
                     else {
-                        // State 3: Document changed on Draft, Live version is older
                         changeType = 'draft-changed';
                         strategy = 'accept-draft';
                     }
-                    conflictType = 'both-modified'; // Not actually a conflict
+                    conflictType = 'both-modified';
                 }
                 else {
-                    // In both sourceChanges and targetChanges but not in conflicts
-                    // (shouldn't normally happen, but handle gracefully as a source change)
                     changeType = 'draft-changed';
                     strategy = 'accept-draft';
                     conflictType = 'both-modified';
                 }
-                // Get snapshots
                 let sourceSnapshot = null;
                 let targetSnapshot = null;
                 if (isConflicting && diff) {
-                    // Use snapshots from documentDiffs for conflicting docs
                     sourceSnapshot = diff.sourceSnapshot ?? null;
                     targetSnapshot = diff.targetSnapshot ?? null;
-                    // Fall back to separately-fetched snapshots when the conflict diff is
-                    // missing one (backend may return null targetSnapshot even for
-                    // both-modified conflicts when the version isn't directly accessible).
                     const fetched = fetchedSnapshots.get(docId);
                     if (fetched) {
                         if (!sourceSnapshot)
@@ -177,24 +132,18 @@ export function useMergeResolution(options) {
                     }
                 }
                 else {
-                    // Use fetched snapshots for non-conflicting docs
                     const snapshots = fetchedSnapshots.get(docId);
                     if (snapshots) {
                         sourceSnapshot = snapshots.source;
                         targetSnapshot = snapshots.target;
                     }
                 }
-                // Skip conflicts where source and target content is identical —
-                // no user action needed, the merge can proceed with either version.
                 if (isConflicting &&
                     sourceSnapshot &&
                     targetSnapshot &&
                     JSON.stringify(sourceSnapshot) === JSON.stringify(targetSnapshot)) {
                     continue;
                 }
-                // Skip internal component registry documents — these are managed
-                // automatically by useComponentRegistry and must not appear in
-                // the merge resolution UI.
                 if (docPath.startsWith('_registry/')) {
                     continue;
                 }
@@ -211,7 +160,6 @@ export function useMergeResolution(options) {
                     classifiedFields: null,
                 });
             }
-            // Sort: conflicting first, then deleted-on-main, new, changed, deleted-on-draft
             const changeTypeOrder = {
                 conflicting: 0,
                 'deleted-on-main': 1,
@@ -231,9 +179,6 @@ export function useMergeResolution(options) {
             setPreviewLoading(false);
         }
     }, [client, siteId, sourceBranchId, targetBranchId]);
-    // =========================================================================
-    // Navigation
-    // =========================================================================
     const goToDocument = useCallback((index) => {
         if (index >= 0 && index < documents.length) {
             setCurrentIndex(index);
@@ -248,7 +193,6 @@ export function useMergeResolution(options) {
     const goToNextUnresolved = useCallback(() => {
         if (documents.length === 0)
             return;
-        // Search from currentIndex+1, wrapping around
         for (let i = 1; i <= documents.length; i++) {
             const idx = (currentIndex + i) % documents.length;
             if (documents[idx]?.strategy === 'unresolved') {
@@ -256,22 +200,16 @@ export function useMergeResolution(options) {
                 return;
             }
         }
-        // No unresolved documents found — stay put
     }, [documents, currentIndex]);
-    // =========================================================================
-    // Strategy selection
-    // =========================================================================
     const setStrategy = useCallback((documentId, strategy) => {
         setDocuments((prev) => prev.map((doc) => {
             if (doc.documentId !== documentId)
                 return doc;
-            // Disallow cherry-pick for delete conflicts
             if (isDeleteConflict(doc.conflictType) &&
                 strategy === 'cherry-pick') {
                 return doc;
             }
             const updates = { strategy };
-            // When switching to cherry-pick, populate classifiedFields
             if (strategy === 'cherry-pick' &&
                 doc.sourceSnapshot &&
                 doc.targetSnapshot) {
@@ -286,9 +224,6 @@ export function useMergeResolution(options) {
     const setRemainingStrategy = useCallback((strategy) => {
         setDocuments((prev) => prev.map((doc) => doc.strategy === 'unresolved' ? { ...doc, strategy } : doc));
     }, []);
-    // =========================================================================
-    // Cherry-pick
-    // =========================================================================
     const setCherryPickSelection = useCallback((documentId, componentId, propName, choice) => {
         setDocuments((prev) => prev.map((doc) => {
             if (doc.documentId !== documentId)
@@ -298,7 +233,6 @@ export function useMergeResolution(options) {
                 ...doc.cherryPickSelections,
                 [key]: choice,
             };
-            // Recompute merged snapshot
             let mergedSnapshot = null;
             if (doc.sourceSnapshot && doc.targetSnapshot && doc.classifiedFields) {
                 mergedSnapshot = buildMergedSnapshot(doc.sourceSnapshot, doc.targetSnapshot, doc.classifiedFields, newSelections);
@@ -334,9 +268,6 @@ export function useMergeResolution(options) {
             };
         }));
     }, []);
-    // =========================================================================
-    // Merge request lifecycle
-    // =========================================================================
     const createMergeRequest = useCallback(async (title) => {
         setMergeRequestCreating(true);
         setMergeRequestError(null);
@@ -367,9 +298,6 @@ export function useMergeResolution(options) {
             setMergeRequestError(err instanceof Error ? err.message : 'Failed to approve merge request');
         }
     }, [client, siteId, mergeRequest]);
-    // =========================================================================
-    // Merge execution (via merge request)
-    // =========================================================================
     const executeMerge = useCallback(async (_message) => {
         if (!mergeRequest) {
             setMergeError('No merge request created. Create and approve a merge request first.');
@@ -399,7 +327,10 @@ export function useMergeResolution(options) {
                         throw new Error(`Cannot execute merge: document "${doc.documentPath}" (${doc.documentId}) is still unresolved`);
                 }
             });
-            await client.merge.executeRequest(siteId, mergeRequest.id, { resolutions });
+            const result = await client.merge.executeRequest(siteId, mergeRequest.id, { resolutions });
+            if (result.jobId !== undefined && result.success !== true) {
+                await client.merge.waitForJob(siteId, result.jobId);
+            }
             setMergeSuccess(true);
             setMergeRequest((prev) => prev ? { ...prev, status: 'merged' } : null);
         }

package/dist/merge/useMergeResolution.js.map

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

package/dist/merge/utils/namespacePuckData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"namespacePuckData.d.ts","sourceRoot":"","sources":["../../../src/merge/utils/namespacePuckData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE7D;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAY1E"}
+{"version":3,"file":"namespacePuckData.d.ts","sourceRoot":"","sources":["../../../src/merge/utils/namespacePuckData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE7D;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAmB1E"}

package/dist/merge/utils/namespacePuckData.js

@@ -1,19 +1,19 @@
-/**
- * Deep-copies a PuckData snapshot and prefixes every component id with
- * `prefix`. This prevents Puck from sharing id-keyed internal state between
- * panels rendered in the same React tree (e.g. source vs target in merge
- * comparison views). Components that share an id across branches via CoW
- * inheritance would otherwise have their props bleed from one panel to another.
- */
 export function namespacePuckData(data, prefix) {
+    if (!data || !Array.isArray(data.content)) {
+        return data;
+    }
     const nsItem = (item) => ({
         ...item,
         props: { ...item.props, id: `${prefix}${item.props.id}` },
     });
+    const safeZones = data.zones && typeof data.zones === 'object' ? data.zones : {};
     return {
         ...data,
         content: data.content.map(nsItem),
-        zones: Object.fromEntries(Object.entries(data.zones ?? {}).map(([k, zone]) => [k, zone.map(nsItem)])),
+        zones: Object.fromEntries(Object.entries(safeZones).map(([k, zone]) => [
+            k,
+            (Array.isArray(zone) ? zone : []).map(nsItem),
+        ])),
     };
 }
 //# sourceMappingURL=namespacePuckData.js.map

package/dist/merge/utils/namespacePuckData.js.map

@@ -1 +1 @@
-{"version":3,"file":"namespacePuckData.js","sourceRoot":"","sources":["../../../src/merge/utils/namespacePuckData.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAc,EAAE,MAAc;IAC9D,MAAM,MAAM,GAAG,CAAC,IAAsD,EAAE,EAAE,CAAC,CAAC;QAC1E,GAAG,IAAI;QACP,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAY,EAAE,EAAE;KACpE,CAAC,CAAC;IACH,OAAO;QACL,GAAG,IAAI;QACP,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;QACjC,KAAK,EAAE,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAG,IAA4B,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CACpG;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"namespacePuckData.js","sourceRoot":"","sources":["../../../src/merge/utils/namespacePuckData.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,iBAAiB,CAAC,IAAc,EAAE,MAAc;IAC9D,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAE,IAA8B,CAAC,OAAO,CAAC,EAAE,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,IAAsD,EAAE,EAAE,CAAC,CAAC;QAC1E,GAAG,IAAI;QACP,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAY,EAAE,EAAE;KACpE,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACjF,OAAO;QACL,GAAG,IAAI;QACP,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;QACjC,KAAK,EAAE,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;YAC3C,CAAC;YACD,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;SAC9C,CAAC,CACH;KACF,CAAC;AACJ,CAAC"}