expo-tiddlywiki-filesystem-android-external-storage 2.1.1 → 2.2.1

package/android/src/main/java/expo/modules/externalstorage/ExternalStorageModule.kt

@@ -590,6 +590,8 @@ class ExternalStorageModule : Module() {
       val changes = JSONArray()
       val indexPaths = mutableSetOf<String>()
 
+      var modifiedCount = 0
+      var deletedCount = 0
       for (entry in indexEntries) {
         indexPaths.add(entry.path)
         val workFile = File(root, entry.path)
@@ -599,6 +601,7 @@ class ExternalStorageModule : Module() {
           obj.put("path", entry.path)
           obj.put("type", "delete")
           changes.put(obj)
+          deletedCount++
         } else {
           // Check stat cache: size and mtime
           val diskSize = workFile.length()
@@ -608,20 +611,30 @@ class ExternalStorageModule : Module() {
             obj.put("path", entry.path)
             obj.put("type", "modify")
             changes.put(obj)
+            modifiedCount++
+            if (modifiedCount <= 3) {
+              android.util.Log.i("GitStatus", "  modify: ${entry.path} disk(size=$diskSize,mtime=$diskMtime) vs index(size=${entry.size},mtime=${entry.mtimeSeconds})")
+            }
           }
         }
       }
 
       // 4. Files on disk but not in index → added
+      var addedCount = 0
       for (path in workdirFiles) {
         if (path !in indexPaths) {
           val obj = JSONObject()
           obj.put("path", path)
           obj.put("type", "add")
           changes.put(obj)
+          addedCount++
+          if (addedCount <= 5) {
+            android.util.Log.i("GitStatus", "  add: $path")
+          }
         }
       }
 
+      android.util.Log.i("GitStatus", "Result: ${changes.length()} changes (add=$addedCount, modify=$modifiedCount, delete=$deletedCount), indexEntries=${indexEntries.size}, workdirFiles=${workdirFiles.size}")
       changes.toString()
     }
 
@@ -832,27 +845,46 @@ class ExternalStorageModule : Module() {
     val companionFile = File(companionPath)
 
     if (companionFile.exists()) {
-      if (companionPath.endsWith(".json")) {
-        // .meta + .json pair: the .json IS the text content (e.g. plugin bundles).
-        // Must include text so the tiddler is complete.
+      val tiddlerType = json.optString("type", "text/vnd.tiddlywiki")
+      val hasModuleType = json.has("module-type")
+      val hasPluginType = json.has("plugin-type")
+
+      // Determine whether this companion is a text file whose content
+      // should be loaded as the tiddler's "text" field.
+      // JS modules, CSS, JSON, and other text-based companions need their content.
+      // Binary companions (images, pdfs, etc.) should NOT have their content loaded;
+      // they use _canonical_uri instead (handled later by JS).
+      val isTextCompanion = companionPath.endsWith(".json") ||
+        companionPath.endsWith(".js") ||
+        companionPath.endsWith(".css") ||
+        companionPath.endsWith(".svg") ||
+        companionPath.endsWith(".txt") ||
+        companionPath.endsWith(".html") ||
+        companionPath.endsWith(".htm") ||
+        tiddlerType.startsWith("text/") ||
+        tiddlerType == "application/javascript" ||
+        tiddlerType == "application/json" ||
+        tiddlerType == "application/x-tiddler-dictionary"
+
+      if (isTextCompanion) {
         val shouldIncludeText = if (quickLoadMode) {
           shouldPreserveFullTextInQuickLoad(
             json.optString("title", ""),
-            json.optString("type", ""),
-            json.has("module-type"),
-            json.has("plugin-type"),
+            tiddlerType,
+            hasModuleType,
+            hasPluginType,
           )
         } else {
           true
         }
         if (shouldIncludeText) {
-          val jsonContent = companionFile.readText(Charsets.UTF_8)
-          json.put("text", jsonContent)
+          val textContent = companionFile.readText(Charsets.UTF_8)
+          json.put("text", textContent)
         } else {
           json.put("_is_skinny", "yes")
         }
       }
-      // For non-JSON companions (images, etc.), we don't set _canonical_uri here —
+      // For binary companions (images, etc.), we don't set _canonical_uri here —
       // that requires knowing the workspace base path. JS side handles it.
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-tiddlywiki-filesystem-android-external-storage",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "description": "Expo native module for TidGi-Mobile: external storage I/O + TiddlyWiki .tid/.meta/.json batch parsing in Kotlin",
   "main": "build/index.js",
   "types": "build/index.d.ts",