Feedback

Author: huntercaron

packages/code-link-cli/src/helpers/watcher.test.ts

@@ -112,6 +112,53 @@ describe("initWatcher", () => {
         await watcher.close()
         await fs.rm(tmpDir, { recursive: true, force: true })
     })
+
+    it("keeps using the raw path after sanitization rename fails", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "framer-watcher-"))
+        const events: WatcherEvent[] = []
+        const watcher: Watcher = initWatcher(tmpDir)
+        watcher.on("change", event => events.push(event))
+        const rawWatcher = createdWatchers.at(-1)
+        if (!rawWatcher) throw new Error("No watcher created")
+
+        const rawPath = path.join(tmpDir, "bad name!.tsx")
+        await fs.writeFile(rawPath, "export const Version = 1", "utf-8")
+
+        const renameSpy = vi.spyOn(fs, "rename").mockRejectedValueOnce(new Error("rename failed"))
+        await rawWatcher.__emit("add", rawPath)
+        await waitForBuffer()
+
+        await fs.writeFile(rawPath, "export const Version = 2", "utf-8")
+        await rawWatcher.__emit("change", rawPath)
+
+        const renamedPath = path.join(tmpDir, "GoodName.tsx")
+        await fs.rename(rawPath, renamedPath)
+        await rawWatcher.__emit("unlink", rawPath)
+        await rawWatcher.__emit("add", renamedPath)
+
+        expect(events).toEqual([
+            {
+                kind: "add",
+                relativePath: "bad name!.tsx",
+                content: "export const Version = 1",
+            },
+            {
+                kind: "change",
+                relativePath: "bad name!.tsx",
+                content: "export const Version = 2",
+            },
+            {
+                kind: "rename",
+                relativePath: "GoodName.tsx",
+                oldRelativePath: "bad name!.tsx",
+                content: "export const Version = 2",
+            },
+        ])
+
+        renameSpy.mockRestore()
+        await watcher.close()
+        await fs.rm(tmpDir, { recursive: true, force: true })
+    })
 })
 
 describe("rename detection", () => {

packages/code-link-cli/src/helpers/watcher.ts

@@ -151,8 +151,8 @@ export function initWatcher(filesDir: string): Watcher {
     }
 
     /**
-     * Resolves the sanitized relative path for a given absolute path.
-     * On "add", renames files on disk if they don't match sanitization rules.
+     * Resolves the relative path identity for a watcher event.
+     * Only "add" may rewrite that identity by successfully sanitizing on disk.
      */
     const resolveRelativePath = async (
         kind: "add" | "change" | "delete",
@@ -163,28 +163,32 @@ export function initWatcher(filesDir: string): Watcher {
         }
 
         const rawRelativePath = normalizePath(getRelativePath(filesDir, absolutePath))
-        const sanitized = sanitizeFilePath(rawRelativePath, false)
-        const relativePath = sanitized.path
+        let relativePath = rawRelativePath
 
         let effectiveAbsolutePath = absolutePath
-        if (relativePath !== rawRelativePath && kind === "add") {
-            const newAbsolutePath = path.join(filesDir, relativePath)
-            try {
-                await fs.mkdir(path.dirname(newAbsolutePath), { recursive: true })
-                await fs.rename(absolutePath, newAbsolutePath)
-                debug(`Renamed ${rawRelativePath} -> ${relativePath}`)
-                effectiveAbsolutePath = newAbsolutePath
-
-                // Suppress the echo events chokidar will fire for this rename
-                recentSanitizations.add(rawRelativePath) // upcoming unlink echo
-                recentSanitizations.add(relativePath) // upcoming add echo
-                setTimeout(() => {
-                    recentSanitizations.delete(rawRelativePath)
-                    recentSanitizations.delete(relativePath)
-                }, RENAME_BUFFER_MS * 3)
-            } catch (err) {
-                warn(`Failed to rename ${rawRelativePath}`, err)
-                return { relativePath: rawRelativePath, effectiveAbsolutePath: absolutePath }
+        if (kind === "add") {
+            const sanitized = sanitizeFilePath(rawRelativePath, false)
+            if (sanitized.path !== rawRelativePath) {
+                const nextRelativePath = sanitized.path
+                const newAbsolutePath = path.join(filesDir, nextRelativePath)
+                try {
+                    await fs.mkdir(path.dirname(newAbsolutePath), { recursive: true })
+                    await fs.rename(absolutePath, newAbsolutePath)
+                    debug(`Renamed ${rawRelativePath} -> ${nextRelativePath}`)
+                    relativePath = nextRelativePath
+                    effectiveAbsolutePath = newAbsolutePath
+
+                    // Suppress the echo events chokidar will fire for this rename
+                    recentSanitizations.add(rawRelativePath) // upcoming unlink echo
+                    recentSanitizations.add(nextRelativePath) // upcoming add echo
+                    setTimeout(() => {
+                        recentSanitizations.delete(rawRelativePath)
+                        recentSanitizations.delete(nextRelativePath)
+                    }, RENAME_BUFFER_MS * 3)
+                } catch (err) {
+                    warn(`Failed to rename ${rawRelativePath}`, err)
+                    return { relativePath: rawRelativePath, effectiveAbsolutePath: absolutePath }
+                }
             }
         }