framer-code-link 0.5.1 → 0.7.0

package/dist/index.mjs

@@ -1440,33 +1440,33 @@ var PluginUserPromptCoordinator = class {
 		});
 	}
 	/**
-	* Sends the delete request to the plugin and awaits the user's decision
+	* Sends the delete request to the plugin and awaits the user's decision.
+	* Returns the list of fileNames that were confirmed for deletion.
 	*/
-	async requestDeleteDecision(socket, { fileName, requireConfirmation }) {
+	async requestDeleteDecision(socket, { fileNames, requireConfirmation }) {
 		if (!socket) throw new Error("Cannot request delete decision: plugin not connected");
+		if (fileNames.length === 0) return [];
 		if (requireConfirmation) {
-			const confirmationPromise = this.awaitAction(`delete:${fileName}`, "delete confirmation");
-			await sendMessage(socket, {
-				type: "file-delete",
-				fileNames: [fileName],
-				requireConfirmation: true
-			});
-			try {
-				return await confirmationPromise;
-			} catch (err) {
+			const confirmationPromises = fileNames.map((fileName) => this.awaitAction(`delete:${fileName}`, "delete confirmation").then((confirmed) => confirmed ? fileName : null).catch((err) => {
 				if (err instanceof PluginDisconnectedError) {
 					debug(`Plugin disconnected while waiting for delete confirmation: ${fileName}`);
-					return false;
+					return null;
 				}
 				throw err;
-			}
+			}));
+			await sendMessage(socket, {
+				type: "file-delete",
+				fileNames,
+				requireConfirmation: true
+			});
+			return (await Promise.all(confirmationPromises)).filter((name) => name !== null);
 		}
 		await sendMessage(socket, {
 			type: "file-delete",
-			fileNames: [fileName],
+			fileNames,
 			requireConfirmation: false
 		});
-		return true;
+		return fileNames;
 	}
 	/**
 	* Sends conflicts to the plugin and awaits user resolutions
@@ -1990,12 +1990,9 @@ function transition(state, event) {
 		case "REMOTE_FILE_CHANGE": {
 			const validation = validateIncomingChange(event.fileMeta, state.mode);
 			if (validation.action === "queue") {
-				effects.push(log("debug", `Queueing file change: ${event.file.name} (${validation.reason})`));
+				effects.push(log("debug", `Ignoring file change during sync: ${event.file.name}`));
 				return {
-					state: {
-						...state,
-						pendingRemoteChanges: [...state.pendingRemoteChanges, event.file]
-					},
+					state,
 					effects
 				};
 			}
@@ -2079,13 +2076,8 @@ function transition(state, event) {
 				});
 				effects.push(log("success", "Keeping Framer changes"));
 			} else {
-				for (const conflict of state.pendingConflicts) if (conflict.localContent === null) effects.push({
-					type: "SEND_MESSAGE",
-					payload: {
-						type: "file-delete",
-						fileNames: [conflict.fileName]
-					}
-				});
+				const localDeletes = [];
+				for (const conflict of state.pendingConflicts) if (conflict.localContent === null) localDeletes.push(conflict.fileName);
 				else effects.push({
 					type: "SEND_MESSAGE",
 					payload: {
@@ -2094,6 +2086,10 @@ function transition(state, event) {
 						content: conflict.localContent
 					}
 				});
+				if (localDeletes.length > 0) effects.push({
+					type: "LOCAL_INITIATED_FILE_DELETE",
+					fileNames: localDeletes
+				});
 				effects.push(log("success", "Keeping local changes"));
 			}
 			effects.push({ type: "PERSIST_STATE" }, {
@@ -2139,7 +2135,7 @@ function transition(state, event) {
 				case "delete":
 					effects.push(log("debug", `Local delete detected: ${relativePath}`), {
 						type: "LOCAL_INITIATED_FILE_DELETE",
-						fileName: relativePath
+						fileNames: [relativePath]
 					});
 					break;
 			}
@@ -2159,18 +2155,17 @@ function transition(state, event) {
 			const { autoResolvedLocal, autoResolvedRemote, remainingConflicts } = autoResolveConflicts(state.pendingConflicts, event.versions);
 			if (autoResolvedLocal.length > 0) {
 				effects.push(log("debug", `Auto-resolved ${autoResolvedLocal.length} local changes`));
-				for (const conflict of autoResolvedLocal) if (conflict.localContent === null) effects.push({
-					type: "SEND_MESSAGE",
-					payload: {
-						type: "file-delete",
-						fileNames: [conflict.fileName]
-					}
-				});
+				const localDeletes = [];
+				for (const conflict of autoResolvedLocal) if (conflict.localContent === null) localDeletes.push(conflict.fileName);
 				else effects.push({
 					type: "SEND_LOCAL_CHANGE",
 					fileName: conflict.fileName,
 					content: conflict.localContent
 				});
+				if (localDeletes.length > 0) effects.push({
+					type: "LOCAL_INITIATED_FILE_DELETE",
+					fileNames: localDeletes
+				});
 			}
 			if (autoResolvedRemote.length > 0) {
 				effects.push(log("debug", `Auto-resolved ${autoResolvedRemote.length} remote changes`));
@@ -2349,27 +2344,31 @@ async function executeEffect(effect, context) {
 			}
 			return [];
 		}
-		case "LOCAL_INITIATED_FILE_DELETE":
-			if (hashTracker.shouldSkipDelete(effect.fileName)) {
-				hashTracker.clearDelete(effect.fileName);
-				return [];
-			}
+		case "LOCAL_INITIATED_FILE_DELETE": {
+			const filesToDelete = effect.fileNames.filter((fileName) => {
+				const shouldSkip = hashTracker.shouldSkipDelete(fileName);
+				if (shouldSkip) hashTracker.clearDelete(fileName);
+				return !shouldSkip;
+			});
+			if (filesToDelete.length === 0) return [];
 			try {
-				if (await userActions.requestDeleteDecision(syncState.socket, {
-					fileName: effect.fileName,
+				const confirmedFiles = await userActions.requestDeleteDecision(syncState.socket, {
+					fileNames: filesToDelete,
 					requireConfirmation: !config.dangerouslyAutoDelete
-				})) {
-					hashTracker.forget(effect.fileName);
-					fileMetadataCache.recordDelete(effect.fileName);
-					if (syncState.socket) await sendMessage(syncState.socket, {
-						type: "file-delete",
-						fileNames: [effect.fileName]
-					});
+				});
+				for (const fileName of confirmedFiles) {
+					hashTracker.forget(fileName);
+					fileMetadataCache.recordDelete(fileName);
 				}
+				if (confirmedFiles.length > 0 && syncState.socket) await sendMessage(syncState.socket, {
+					type: "file-delete",
+					fileNames: confirmedFiles
+				});
 			} catch (err) {
-				console.warn(`Failed to handle deletion for ${effect.fileName}:`, err);
+				console.warn(`Failed to handle deletion for ${filesToDelete.join(", ")}:`, err);
 			}
 			return [];
+		}
 		case "PERSIST_STATE":
 			await fileMetadataCache.flush();
 			return [];
@@ -2411,9 +2410,7 @@ async function start(config) {
 	let syncState = {
 		mode: "disconnected",
 		socket: null,
-		pendingRemoteChanges: [],
-		pendingOperations: /* @__PURE__ */ new Map(),
-		nextOperationId: 1
+		pendingRemoteChanges: []
 	};
 	const userActions = new PluginUserPromptCoordinator();
 	async function processEvent(event) {
@@ -2516,7 +2513,7 @@ async function start(config) {
 					await processEvent({
 						type: "LOCAL_DELETE_REJECTED",
 						fileName: file.fileName,
-						content: file.content ?? ""
+						content: file.content
 					});
 				}
 				return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framer-code-link",
-  "version": "0.5.1",
+  "version": "0.7.0",
   "description": "CLI tool for syncing Framer code components - controller-centric architecture",
   "main": "dist/index.mjs",
   "type": "module",