braid-text 0.2.69 → 0.2.71

package/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(node test/test.js:*)",
+      "Bash(node:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

package/index.js

@@ -1068,6 +1068,11 @@ function create_braid_text() {
                 }
             }
 
+            // Populate key_to_filename mapping from existing files
+            var files = (await fs.promises.readdir(braid_text.db_folder))
+                .filter(x => /\.\d+$/.test(x))
+            init_filename_mapping(files)
+
             done()
         })
         await db_folder_init.p
@@ -2202,26 +2207,61 @@ function create_braid_text() {
         return i
     }
 
-    function encode_filename(filename) {
-        // Swap all "!" and "/" characters
-        let swapped = filename.replace(/[!/]/g, (match) => (match === "!" ? "/" : "!"))
+    var {
+        encode_file_path_component, ensure_unique_case_insensitive_path_component
+    } = require('url-file-db/canonical_path')
+
+    // Mapping between keys and their encoded filenames
+    // Populated at init time, used to avoid re-encoding and handle case collisions
+    var key_to_filename = new Map()
+    var ifilenames = new Set()
+
+    function encode_filename(key) {
+        // Return cached encoding if we've seen this key before
+        if (key_to_filename.has(key)) {
+            return key_to_filename.get(key)
+        }
+
+        // Swap all "!" and "/" characters so paths are more readable on disk
+        var swapped = key.replace(/[!/]/g, (match) => (match === "!" ? "/" : "!"))
 
-        // Encode the filename using encodeURIComponent()
-        let encoded = encodeURIComponent(swapped)
+        // Encode unsafe filesystem characters
+        var encoded = encode_file_path_component(swapped)
+
+        // Resolve case collisions for case-insensitive filesystems (Mac/Windows)
+        encoded = ensure_unique_case_insensitive_path_component(encoded, ifilenames)
+
+        // Cache the mapping
+        key_to_filename.set(key, encoded)
+        ifilenames.add(encoded.toLowerCase())
 
         return encoded
     }
 
     function decode_filename(encodedFilename) {
-        // Decode the filename using decodeURIComponent()
-        let decoded = decodeURIComponent(encodedFilename)
+        // Decode the filename
+        var decoded = decodeURIComponent(encodedFilename)
 
-        // Swap all "/" and "!" characters
+        // Swap all "/" and "!" characters back
         decoded = decoded.replace(/[!/]/g, (match) => (match === "/" ? "!" : "/"))
 
         return decoded
     }
 
+    // Populate key_to_filename mapping from existing files on disk
+    function init_filename_mapping(files) {
+        for (var file of files) {
+            // Extract the encoded key (strip extension like .0, .1, etc.)
+            var encoded = file.replace(/\.\d+$/, '')
+            var key = decode_filename(encoded)
+
+            if (!key_to_filename.has(key)) {
+                key_to_filename.set(key, encoded)
+                ifilenames.add(encoded.toLowerCase())
+            } else throw new Error('filename conflict detected')
+        }
+    }
+
     function validate_version_array(x) {
         if (!Array.isArray(x)) throw new Error(`invalid version array: not an array`)
         x.sort()

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "braid-text",
-  "version": "0.2.69",
+  "version": "0.2.71",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-text",
   "homepage": "https://braid.org",
   "dependencies": {
     "@braid.org/diamond-types-node": "^2.0.0",
-    "braid-http": "~1.3.83"
+    "braid-http": "~1.3.83",
+    "url-file-db": "^0.0.10"
   }
 }