expo-tiddlywiki-filesystem-android-external-storage 2.1.0 → 2.2.0

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

@@ -556,9 +556,16 @@ class ExternalStorageModule : Module() {
 
       // 1. Parse the git index
       val indexEntries = parseGitIndex(indexFile)
+      android.util.Log.i("GitStatus", "Parsed ${indexEntries.size} entries from git index at $gitRootDir")
+      if (indexEntries.size <= 5) {
+        indexEntries.forEach { e -> android.util.Log.i("GitStatus", "  index: ${e.path} size=${e.size} mtime=${e.mtimeSeconds}") }
+      } else {
+        indexEntries.take(3).forEach { e -> android.util.Log.i("GitStatus", "  index: ${e.path} size=${e.size} mtime=${e.mtimeSeconds}") }
+        android.util.Log.i("GitStatus", "  ... and ${indexEntries.size - 3} more entries")
+      }
 
       // 2. Walk the working directory (skip .git, node_modules, etc.)
-      val skipDirs = setOf(".git", "node_modules", ".DS_Store", "output")
+      val skipDirs = setOf(".git", "node_modules", "output")
       val workdirFiles = mutableSetOf<String>()
       fun walkDir(dir: File, prefix: String) {
         val children = dir.listFiles() ?: return
@@ -574,6 +581,10 @@ class ExternalStorageModule : Module() {
         }
       }
       walkDir(root, "")
+      android.util.Log.i("GitStatus", "Found ${workdirFiles.size} files on disk")
+      // Log files in tiddlers/ dir specifically
+      val tiddlerFiles = workdirFiles.filter { it.startsWith("tiddlers/") }
+      android.util.Log.i("GitStatus", "  tiddlers/ count: ${tiddlerFiles.size}, sample: ${tiddlerFiles.take(5).joinToString()}")
 
       // 3. Compare index vs working directory
       val changes = JSONArray()
@@ -821,27 +832,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.0",
+  "version": "2.2.0",
   "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",