framer-code-link 0.4.6 → 0.4.8

package/dist/index.mjs

@@ -156,6 +156,13 @@ function normalizePath$1(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));
@@ -174,6 +181,13 @@ 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"
@@ -712,11 +726,7 @@ const SUPPORTED_EXTENSIONS = [
 	".json"
 ];
 const DEFAULT_EXTENSION = ".tsx";
-const DEFAULT_REMOTE_DRIFT_MS = 2500;
-/** Normalize file name for case-insensitive comparison (macOS/Windows compat) */
-function normalizeForComparison(fileName) {
-	return fileName.toLowerCase();
-}
+const DEFAULT_REMOTE_DRIFT_MS = 2e3;
 /**
 * Lists all supported files in the files directory
 */
@@ -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));
+	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`);
@@ -1615,13 +1625,6 @@ function initWatcher(filesDir) {
 
 //#endregion
 //#region src/utils/file-metadata-cache.ts
-/**
-* In-memory cache on top of state-persistence.
-*/
-/** Normalize file name for case-insensitive lookup (macOS/Windows compat) */
-function normalizeKey(fileName) {
-	return fileName.toLowerCase();
-}
 var FileMetadataCache = class {
 	metadata = /* @__PURE__ */ new Map();
 	persisted = /* @__PURE__ */ new Map();
@@ -1634,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(normalizeKey(fileName), {
+		for (const [fileName, state] of loaded.entries()) this.metadata.set(fileKeyForLookup(fileName), {
 			localHash: state.contentHash,
 			lastSyncedHash: state.contentHash,
 			lastRemoteTimestamp: state.timestamp
@@ -1642,10 +1645,10 @@ var FileMetadataCache = class {
 		this.initialized = true;
 	}
 	get(fileName) {
-		return this.metadata.get(normalizeKey(fileName));
+		return this.metadata.get(fileKeyForLookup(fileName));
 	}
 	has(fileName) {
-		return this.metadata.has(normalizeKey(fileName));
+		return this.metadata.has(fileKeyForLookup(fileName));
 	}
 	size() {
 		return this.metadata.size;
@@ -1654,7 +1657,7 @@ var FileMetadataCache = class {
 		return this.persisted;
 	}
 	recordRemoteWrite(fileName, content, remoteModifiedAt) {
-		const key = normalizeKey(fileName);
+		const key = fileKeyForLookup(fileName);
 		const contentHash = hashFileContent(content);
 		this.metadata.set(key, {
 			localHash: contentHash,
@@ -1668,7 +1671,7 @@ var FileMetadataCache = class {
 		this.schedulePersist();
 	}
 	recordSyncedSnapshot(fileName, contentHash, remoteModifiedAt) {
-		const key = normalizeKey(fileName);
+		const key = fileKeyForLookup(fileName);
 		this.metadata.set(key, {
 			localHash: contentHash,
 			lastSyncedHash: contentHash,
@@ -1681,7 +1684,7 @@ var FileMetadataCache = class {
 		this.schedulePersist();
 	}
 	recordDelete(fileName) {
-		const key = normalizeKey(fileName);
+		const key = fileKeyForLookup(fileName);
 		this.metadata.delete(key);
 		this.persisted.delete(key);
 		this.schedulePersist();

package/package.json

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