framer-code-link 0.4.5 → 0.4.7

package/dist/index.mjs

@@ -81,11 +81,11 @@ const firstCharacterRegex = /^[a-zA-Z$_]/;
 const remainingCharactersRegex = /[^a-zA-Z0-9$_]/g;
 const onlyDotsRegex = /^\.+$/;
 const tsxExtension = ".tsx";
-var NameType = /* @__PURE__ */ function(NameType$1) {
-	NameType$1["Variable"] = "Variable";
-	NameType$1["Selector"] = "Selector";
-	NameType$1["Directory"] = "Directory";
-	return NameType$1;
+var NameType = /* @__PURE__ */ function(NameType) {
+	NameType["Variable"] = "Variable";
+	NameType["Selector"] = "Selector";
+	NameType["Directory"] = "Directory";
+	return NameType;
 }(NameType || {});
 function sanitizedName(type, name) {
 	if (!name) return null;
@@ -139,7 +139,7 @@ function pathJoin(...parts) {
 	});
 	return res;
 }
-function normalizePath(filePath) {
+function normalizePath$1(filePath) {
 	if (!filePath) return "";
 	const isAbsolute = filePath.startsWith("/");
 	const segments = filePath.replace(/\\/g, "/").split("/");
@@ -156,6 +156,13 @@ function normalizePath(filePath) {
 	if (isAbsolute) return `/${normalized}`;
 	return normalized;
 }
+function normalizeCodeFilePath(filePath) {
+	const normalized = normalizePath$1(filePath);
+	return normalized.startsWith("/") ? normalized.slice(1) : normalized;
+}
+function canonicalFileName(filePath) {
+	return normalizeCodeFilePath(filePath);
+}
 function sanitizeFilePath(input, capitalizeReactComponent = true) {
 	const trimmed = input.trim();
 	const [inputName, extension] = splitExtension(filename(trimmed));
@@ -170,10 +177,17 @@ function sanitizeFilePath(input, capitalizeReactComponent = true) {
 		extension
 	};
 }
-function isSupportedExtension(filePath) {
+function isSupportedExtension$1(filePath) {
 	return /\.(tsx?|jsx?|json)$/i.test(filePath);
 }
 /**
+* Returns a normalized, lowercase key for case-insensitive file lookups.
+* Use this for Map keys on operating systems where "File.tsx" and "file.tsx" are the same file.
+*/
+function fileKeyForLookup(filePath) {
+	return canonicalFileName(filePath).toLowerCase();
+}
+/**
 * Pluralize a word based on count
 * @example pluralize(1, "file") => "1 file"
 * @example pluralize(3, "file") => "3 files"
@@ -275,12 +289,12 @@ var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region src/utils/logging.ts
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
-let LogLevel = /* @__PURE__ */ function(LogLevel$1) {
-	LogLevel$1[LogLevel$1["DEBUG"] = 0] = "DEBUG";
-	LogLevel$1[LogLevel$1["INFO"] = 1] = "INFO";
-	LogLevel$1[LogLevel$1["WARN"] = 2] = "WARN";
-	LogLevel$1[LogLevel$1["ERROR"] = 3] = "ERROR";
-	return LogLevel$1;
+let LogLevel = /* @__PURE__ */ function(LogLevel) {
+	LogLevel[LogLevel["DEBUG"] = 0] = "DEBUG";
+	LogLevel[LogLevel["INFO"] = 1] = "INFO";
+	LogLevel[LogLevel["WARN"] = 2] = "WARN";
+	LogLevel[LogLevel["ERROR"] = 3] = "ERROR";
+	return LogLevel;
 }({});
 let currentLevel = LogLevel.INFO;
 let lastMessage = "";
@@ -325,9 +339,9 @@ function logWithDedupe(message, writer) {
 /**
 * Print the startup banner - one colored line
 */
-function banner(version$1, port) {
+function banner(version, port) {
 	console.log();
-	let message = `  ${import_picocolors.default.cyan(import_picocolors.default.bold("⚡ Code Link"))} ${import_picocolors.default.dim(`v${version$1}`)}`;
+	let message = `  ${import_picocolors.default.cyan(import_picocolors.default.bold("⚡ Code Link"))} ${import_picocolors.default.dim(`v${version}`)}`;
 	if (currentLevel <= LogLevel.DEBUG) message += `  ${import_picocolors.default.dim("Port")} ${import_picocolors.default.yellow(port)}`;
 	console.log(message);
 	console.log();
@@ -597,7 +611,7 @@ function getRelativePath(projectDir, absolutePath) {
 * - Resolving . and .. segments
 * - Removing duplicate slashes
 */
-function normalizePath$1(filePath) {
+function normalizePath(filePath) {
 	if (!filePath) return "";
 	const isAbsolute = filePath.startsWith("/");
 	const segments = filePath.replace(/\\/g, "/").split("/");
@@ -635,7 +649,7 @@ const SUPPORTED_EXTENSIONS$1 = [
 ];
 const DEFAULT_EXTENSION$1 = ".tsx";
 function normalizePersistedFileName(fileName) {
-	let normalized = normalizePath$1(fileName.trim());
+	let normalized = normalizePath(fileName.trim());
 	if (!SUPPORTED_EXTENSIONS$1.some((ext) => normalized.toLowerCase().endsWith(ext))) normalized = `${normalized}${DEFAULT_EXTENSION$1}`;
 	return normalized;
 }
@@ -713,10 +727,6 @@ const SUPPORTED_EXTENSIONS = [
 ];
 const DEFAULT_EXTENSION = ".tsx";
 const DEFAULT_REMOTE_DRIFT_MS = 2e3;
-/** Normalize file name for case-insensitive comparison (macOS/Windows compat) */
-function normalizeForComparison(fileName) {
-	return fileName.toLowerCase();
-}
 /**
 * Lists all supported files in the files directory
 */
@@ -730,8 +740,8 @@ async function listFiles(filesDir) {
 				await walk(entryPath);
 				continue;
 			}
-			if (!isSupportedExtension$1(entry.name)) continue;
-			const sanitizedPath = sanitizeFilePath(normalizePath(path.relative(filesDir, entryPath)), false).path;
+			if (!isSupportedExtension(entry.name)) continue;
+			const sanitizedPath = sanitizeFilePath(normalizePath$1(path.relative(filesDir, entryPath)), false).path;
 			try {
 				const [content, stats] = await Promise.all([fs.readFile(entryPath, "utf-8"), fs.stat(entryPath)]);
 				files.push({
@@ -759,17 +769,17 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 	const detect = options.detectConflicts ?? true;
 	const preferRemote = options.preferRemote ?? false;
 	const persistedState = options.persistedState;
-	const getPersistedState = (fileName) => persistedState?.get(normalizeForComparison(fileName)) ?? persistedState?.get(fileName);
+	const getPersistedState = (fileName) => persistedState?.get(fileKeyForLookup(fileName));
 	debug(`Detecting conflicts for ${String(remoteFiles.length)} remote files`);
 	const localFiles = await listFiles(filesDir);
-	const localFileMap = new Map(localFiles.map((f) => [normalizeForComparison(f.name), f]));
+	const localFileMap = new Map(localFiles.map((f) => [fileKeyForLookup(f.name), f]));
 	const remoteFileMap = new Map(remoteFiles.map((f) => {
-		return [normalizeForComparison(resolveRemoteReference(filesDir, f.name).relativePath), f];
+		return [fileKeyForLookup(resolveRemoteReference(filesDir, f.name).relativePath), f];
 	}));
 	const processedFiles = /* @__PURE__ */ new Set();
 	for (const remote of remoteFiles) {
 		const normalized = resolveRemoteReference(filesDir, remote.name);
-		const normalizedKey = normalizeForComparison(normalized.relativePath);
+		const normalizedKey = fileKeyForLookup(normalized.relativePath);
 		const local = localFileMap.get(normalizedKey);
 		processedFiles.add(normalizedKey);
 		const persisted = getPersistedState(normalized.relativePath);
@@ -820,7 +830,7 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 		});
 	}
 	for (const local of localFiles) {
-		const localKey = normalizeForComparison(local.name);
+		const localKey = fileKeyForLookup(local.name);
 		if (!processedFiles.has(localKey)) {
 			const persisted = getPersistedState(local.name);
 			if (persisted) {
@@ -841,8 +851,8 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 			});
 		}
 	}
-	if (persistedState) for (const [fileName] of persistedState) {
-		const normalizedKey = normalizeForComparison(fileName);
+	if (persistedState) for (const fileName of persistedState.keys()) {
+		const normalizedKey = fileKeyForLookup(fileName);
 		const inLocal = localFileMap.has(normalizedKey);
 		const inRemote = remoteFileMap.has(normalizedKey);
 		if (!inLocal && !inRemote) debug(`[AUTO-RESOLVE] ${fileName}: deleted on both sides, no conflict`);
@@ -855,7 +865,7 @@ async function detectConflicts(remoteFiles, filesDir, options = {}) {
 	};
 }
 function autoResolveConflicts(conflicts, versions, options = {}) {
-	const versionMap = new Map(versions.map((version$1) => [version$1.fileName, version$1.latestRemoteVersionMs]));
+	const versionMap = new Map(versions.map((version) => [version.fileName, version.latestRemoteVersionMs]));
 	const remoteDriftMs = options.remoteDriftMs ?? DEFAULT_REMOTE_DRIFT_MS;
 	const autoResolvedLocal = [];
 	const autoResolvedRemote = [];
@@ -875,28 +885,31 @@ function autoResolveConflicts(conflicts, versions, options = {}) {
 			}
 			continue;
 		}
+		if (localClean) {
+			debug(`  Local clean -> REMOTE (safe to overwrite)`);
+			autoResolvedRemote.push(conflict);
+			continue;
+		}
 		if (!latestRemoteVersionMs) {
-			debug(`  No remote version data, keeping conflict`);
+			debug(`  Local modified, no remote version data -> conflict`);
 			remainingConflicts.push(conflict);
 			continue;
 		}
 		if (!lastSyncedAt) {
-			debug(`  No last sync timestamp, keeping conflict`);
+			debug(`  Local modified, no sync timestamp -> conflict`);
 			remainingConflicts.push(conflict);
 			continue;
 		}
 		debug(`  Remote: ${new Date(latestRemoteVersionMs).toISOString()}`);
 		debug(`  Synced: ${new Date(lastSyncedAt).toISOString()}`);
 		const remoteUnchanged = latestRemoteVersionMs <= lastSyncedAt + remoteDriftMs;
-		if (remoteUnchanged && !localClean) {
+		const driftMargin = latestRemoteVersionMs - lastSyncedAt;
+		if (remoteUnchanged) {
 			debug(`  Remote unchanged, local changed -> LOCAL`);
+			if (driftMargin > 0) debug(`    (within drift tolerance: ${driftMargin}ms < ${remoteDriftMs}ms threshold)`);
 			autoResolvedLocal.push(conflict);
-		} else if (localClean && !remoteUnchanged) {
-			debug(`  Local unchanged, remote changed -> REMOTE`);
-			autoResolvedRemote.push(conflict);
-		} else if (remoteUnchanged && localClean) debug(`  Both unchanged, skipping`);
-		else {
-			debug(`  Both changed, real conflict`);
+		} else {
+			debug(`  Both changed -> conflict (remote ahead by ${driftMargin}ms, threshold: ${remoteDriftMs}ms)`);
 			remainingConflicts.push(conflict);
 		}
 	}
@@ -973,15 +986,15 @@ function resolveRemoteReference(filesDir, rawName) {
 	};
 }
 function sanitizeRelativePath(relativePath) {
-	const trimmed = normalizePath(relativePath.trim());
+	const trimmed = normalizePath$1(relativePath.trim());
 	const sanitized = sanitizeFilePath(SUPPORTED_EXTENSIONS.some((ext) => trimmed.toLowerCase().endsWith(ext)) ? trimmed : `${trimmed}${DEFAULT_EXTENSION}`, false);
-	const normalized = normalizePath(sanitized.path);
+	const normalized = normalizePath$1(sanitized.path);
 	return {
 		relativePath: normalized,
 		extension: sanitized.extension || path.extname(normalized) || DEFAULT_EXTENSION
 	};
 }
-function isSupportedExtension$1(fileName) {
+function isSupportedExtension(fileName) {
 	const lower = fileName.toLowerCase();
 	return SUPPORTED_EXTENSIONS.some((ext) => lower.endsWith(ext));
 }
@@ -1082,8 +1095,8 @@ var Installer = class {
 				finished: (files) => {
 					if (files.size > 0) debug("ATA: type acquisition complete");
 				},
-				errorMessage: (message, error$1) => {
-					warn(`ATA warning: ${message}`, error$1);
+				errorMessage: (message, error) => {
+					warn(`ATA warning: ${message}`, error);
 				},
 				receivedFile: (code, receivedPath) => {
 					(async () => {
@@ -1204,9 +1217,9 @@ var Installer = class {
 			const response = await fetch(`https://registry.npmjs.org/${pkgName}`);
 			if (!response.ok) return;
 			const npmData = await response.json();
-			const version$1 = npmData["dist-tags"]?.latest;
-			if (!version$1 || !npmData.versions?.[version$1]) return;
-			const pkg = npmData.versions[version$1];
+			const version = npmData["dist-tags"]?.latest;
+			if (!version || !npmData.versions?.[version]) return;
+			const pkg = npmData.versions[version];
 			if (pkg.exports) for (const key of Object.keys(pkg.exports)) pkg.exports[key] = fixExportTypes(pkg.exports[key]);
 			await fs.mkdir(pkgDir, { recursive: true });
 			await fs.writeFile(pkgJsonPath, JSON.stringify(pkg, null, 2));
@@ -1314,11 +1327,11 @@ declare module "*.json"
 		if (await this.hasTypePackage(reactDomDir, REACT_DOM_TYPES_VERSION, reactDomFiles)) debug("📦 React DOM types (from cache)");
 		else await this.downloadTypePackage("@types/react-dom", REACT_DOM_TYPES_VERSION, reactDomDir, reactDomFiles);
 	}
-	async hasTypePackage(destinationDir, version$1, files) {
+	async hasTypePackage(destinationDir, version, files) {
 		try {
 			const pkgJsonPath = path.join(destinationDir, "package.json");
 			const pkgJson = await fs.readFile(pkgJsonPath, "utf-8");
-			if (JSON.parse(pkgJson).version !== version$1) return false;
+			if (JSON.parse(pkgJson).version !== version) return false;
 			for (const file of files) {
 				if (file === "package.json") continue;
 				await fs.access(path.join(destinationDir, file));
@@ -1328,8 +1341,8 @@ declare module "*.json"
 			return false;
 		}
 	}
-	async downloadTypePackage(pkgName, version$1, destinationDir, files) {
-		const baseUrl = `https://unpkg.com/${pkgName}@${version$1}`;
+	async downloadTypePackage(pkgName, version, destinationDir, files) {
+		const baseUrl = `https://unpkg.com/${pkgName}@${version}`;
 		await fs.mkdir(destinationDir, { recursive: true });
 		await Promise.all(files.map(async (file) => {
 			const destination = path.join(destinationDir, file);
@@ -1388,17 +1401,17 @@ async function fetchWithRetry(url, init, retries = MAX_FETCH_RETRIES) {
 			return response;
 		} catch (err) {
 			clearTimeout(timeout);
-			const error$1 = err;
-			const isRetryable = error$1.cause?.code === "ECONNRESET" || error$1.cause?.code === "ETIMEDOUT" || error$1.cause?.code === "UND_ERR_CONNECT_TIMEOUT" || error$1.message.includes("timeout");
+			const error = err;
+			const isRetryable = error.cause?.code === "ECONNRESET" || error.cause?.code === "ETIMEDOUT" || error.cause?.code === "UND_ERR_CONNECT_TIMEOUT" || error.message.includes("timeout");
 			if (isRetryable) checkFatalFailure(urlString);
 			if (attempt < retries && isRetryable) {
 				const delay = attempt * 1e3;
-				warn(`Fetch failed (${error$1.cause?.code ?? error$1.message}) for ${urlString}, retrying in ${delay}ms...`);
+				warn(`Fetch failed (${error.cause?.code ?? error.message}) for ${urlString}, retrying in ${delay}ms...`);
 				await new Promise((resolve) => setTimeout(resolve, delay));
 				continue;
 			}
-			warn(`Fetch failed for ${urlString}`, error$1);
-			throw error$1;
+			warn(`Fetch failed for ${urlString}`, error);
+			throw error;
 		}
 	}
 	throw new Error(`Max retries exceeded for ${urlString}`);
@@ -1561,8 +1574,8 @@ function initWatcher(filesDir) {
 	});
 	debug(`Watching directory: ${filesDir}`);
 	const emitEvent = async (kind, absolutePath) => {
-		if (!isSupportedExtension(absolutePath)) return;
-		const rawRelativePath = normalizePath(getRelativePath(filesDir, absolutePath));
+		if (!isSupportedExtension$1(absolutePath)) return;
+		const rawRelativePath = normalizePath$1(getRelativePath(filesDir, absolutePath));
 		const relativePath = sanitizeFilePath(rawRelativePath, false).path;
 		let effectiveAbsolutePath = absolutePath;
 		if (relativePath !== rawRelativePath && kind === "add") {
@@ -1624,7 +1637,7 @@ var FileMetadataCache = class {
 		const loaded = await loadPersistedState(projectDir);
 		this.persisted = loaded;
 		this.metadata = /* @__PURE__ */ new Map();
-		for (const [fileName, state] of loaded.entries()) this.metadata.set(fileName, {
+		for (const [fileName, state] of loaded.entries()) this.metadata.set(fileKeyForLookup(fileName), {
 			localHash: state.contentHash,
 			lastSyncedHash: state.contentHash,
 			lastRemoteTimestamp: state.timestamp
@@ -1632,10 +1645,10 @@ var FileMetadataCache = class {
 		this.initialized = true;
 	}
 	get(fileName) {
-		return this.metadata.get(fileName);
+		return this.metadata.get(fileKeyForLookup(fileName));
 	}
 	has(fileName) {
-		return this.metadata.has(fileName);
+		return this.metadata.has(fileKeyForLookup(fileName));
 	}
 	size() {
 		return this.metadata.size;
@@ -1644,33 +1657,36 @@ var FileMetadataCache = class {
 		return this.persisted;
 	}
 	recordRemoteWrite(fileName, content, remoteModifiedAt) {
+		const key = fileKeyForLookup(fileName);
 		const contentHash = hashFileContent(content);
-		this.metadata.set(fileName, {
+		this.metadata.set(key, {
 			localHash: contentHash,
 			lastSyncedHash: contentHash,
 			lastRemoteTimestamp: remoteModifiedAt
 		});
-		this.persisted.set(fileName, {
+		this.persisted.set(key, {
 			contentHash,
 			timestamp: remoteModifiedAt
 		});
 		this.schedulePersist();
 	}
 	recordSyncedSnapshot(fileName, contentHash, remoteModifiedAt) {
-		this.metadata.set(fileName, {
+		const key = fileKeyForLookup(fileName);
+		this.metadata.set(key, {
 			localHash: contentHash,
 			lastSyncedHash: contentHash,
 			lastRemoteTimestamp: remoteModifiedAt
 		});
-		this.persisted.set(fileName, {
+		this.persisted.set(key, {
 			contentHash,
 			timestamp: remoteModifiedAt
 		});
 		this.schedulePersist();
 	}
 	recordDelete(fileName) {
-		this.metadata.delete(fileName);
-		this.persisted.delete(fileName);
+		const key = fileKeyForLookup(fileName);
+		this.metadata.delete(key);
+		this.persisted.delete(key);
 		this.schedulePersist();
 	}
 	async flush() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framer-code-link",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "CLI tool for syncing Framer code components - controller-centric architecture",
   "main": "dist/index.mjs",
   "type": "module",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@typescript/ata": "^0.9.8",
     "chokidar": "^5.0.0",
-    "commander": "^14.0.2",
+    "commander": "^14.0.3",
     "prettier": "^3.7.4",
     "typescript": "^5.9.3",
     "ws": "^8.18.3"
@@ -33,7 +33,7 @@
     "@code-link/shared": "1.0.0",
     "@types/node": "^22.19.2",
     "@types/ws": "^8.18.1",
-    "tsdown": "^0.17.4",
+    "tsdown": "^0.20.1",
     "tsx": "^4.21.0",
     "vitest": "^4.0.15"
   }