expo-tiddlywiki-filesystem-android-external-storage 2.12.0 → 2.12.2

package/README.md

@@ -122,7 +122,9 @@ Checks if the `MANAGE_EXTERNAL_STORAGE` permission is granted (Android 11+).
 
 This module bundles **JGit 6.2.x** (not the latest 6.10.x) for Android compatibility.
 
-Newer JGit versions (6.3+) call Java 9+ APIs (`InputStream.readNBytes`, `InputStream.transferTo`) that are **not available on Android at any API level** — Android's `desugar_jdk_libs` only backfills Java 8 language APIs, not these Java 9 I/O methods. This has been confirmed on Android 12 (API 31) and is expected to affect all current Android versions.
+Newer JGit versions (6.3+) call Java 9+ APIs (`InputStream.readNBytes`, `InputStream.transferTo`) that require `coreLibraryDesugaringEnabled` — Android's `desugar_jdk_libs` provides these at build time. The config plugin included in this package automatically enables desugaring in the generated `android/app/build.gradle`.
+
+If you encounter `NoSuchMethodError` for these methods at runtime, verify that the config plugin ran during `expo prebuild` (check that `android/app/build.gradle` contains `coreLibraryDesugaringEnabled true` and `desugar_jdk_libs`).
 
 JGit 6.2.x is the latest release that avoids these Java 9+ API calls while still providing all the Git primitives needed by this module (clone, fetch, push, status, diff, log, etc.). One API trade-off: `CloneCommand.setDepth()` (shallow clone) was introduced in JGit 6.3, so this module does not support `--depth` on clone.
 

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

@@ -15,9 +15,17 @@ internal object TiddlyWikiParser {
    * Returns a JSON array string ready for injection into TiddlyWiki boot store.
    */
   fun batchParseTidFiles(filePaths: List<String>, quickLoadMode: Boolean): String {
-    val results = filePaths.parallelStream().map { path ->
+    // Use sequential stream (not parallelStream) to preserve input order.
+    // The JS side relies on result ordering to map titles back to file paths
+    // when building the tiddler index.
+    val results = filePaths.stream().map { path ->
       try {
-        parseTiddlerFile(path, quickLoadMode)
+        val parsed = parseTiddlerFile(path, quickLoadMode)
+        // Tag result with filepath so JS side can map correctly regardless of order
+        when (parsed) {
+          is JSONObject -> parsed.put("_filepath", path)
+        }
+        parsed
       } catch (e: Exception) {
         null
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-tiddlywiki-filesystem-android-external-storage",
-  "version": "2.12.0",
+  "version": "2.12.2",
   "description": "Expo native module for TidGi-Mobile: filesystem I/O + TiddlyWiki .tid/.meta/.json batch parsing + git status in Kotlin (Android) and Swift (iOS)",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -9,7 +9,7 @@
     "build": "tsc -p tsconfig.json",
     "clean": "expo-module clean",
     "lint": "expo-module lint",
-    "test": "expo-module test",
+    "test": "jest --config jest.config.js",
     "prepack": "tsc -p tsconfig.json"
   },
   "keywords": [
@@ -27,13 +27,16 @@
     "react-native": "*"
   },
   "devDependencies": {
+    "@types/jest": "29.5.14",
     "@types/react": "^18.2.0",
     "@types/react-native": "^0.73.0",
     "expo": "^50.0.0",
     "expo-module-scripts": "^3.0.0",
     "expo-modules-core": "^1.11.0",
+    "jest": "29.7.0",
     "react": "^18.2.0",
     "react-native": "^0.73.0",
+    "ts-jest": "~29.0.5",
     "typescript": "^5.0.0"
   },
   "files": [

package/src/__tests__/index.test.ts

@@ -0,0 +1,57 @@
+type ExternalStorageModule = typeof import('../index');
+
+function loadModuleWithPlatform(
+  platformOS: string,
+  nativeModule: Record<string, unknown> = {},
+): { module: ExternalStorageModule; requireNativeModule: jest.Mock } {
+  jest.resetModules();
+  const requireNativeModule = jest.fn(() => nativeModule);
+
+  jest.doMock('react-native', () => ({
+    Platform: {
+      OS: platformOS,
+    },
+  }));
+  jest.doMock('expo-modules-core', () => ({
+    requireNativeModule,
+  }));
+
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const module = require('../index') as ExternalStorageModule;
+  return { module, requireNativeModule };
+}
+
+describe('toPlainPath', () => {
+  it('strips only the file URI scheme from filesystem paths', () => {
+    const { module } = loadModuleWithPlatform('android');
+
+    expect(module.toPlainPath('file:///storage/emulated/0/TidGi/wiki')).toBe('/storage/emulated/0/TidGi/wiki');
+    expect(module.toPlainPath('/storage/emulated/0/TidGi/wiki')).toBe('/storage/emulated/0/TidGi/wiki');
+    expect(module.toPlainPath('content://com.android.externalstorage.documents/tree/primary%3ATidGi')).toBe('content://com.android.externalstorage.documents/tree/primary%3ATidGi');
+  });
+});
+
+describe('ExternalStorage proxy', () => {
+  it('loads the native module lazily when a method is accessed', () => {
+    const nativeExists = jest.fn();
+    const nativeMkdir = jest.fn();
+    const { module, requireNativeModule } = loadModuleWithPlatform('android', {
+      exists: nativeExists,
+      mkdir: nativeMkdir,
+    });
+
+    expect(requireNativeModule).not.toHaveBeenCalled();
+    expect(module.ExternalStorage.exists).toBe(nativeExists);
+    expect(module.ExternalStorage.mkdir).toBe(nativeMkdir);
+    expect(requireNativeModule).toHaveBeenCalledTimes(1);
+    expect(requireNativeModule).toHaveBeenCalledWith('ExternalStorage');
+  });
+
+  it('throws only when the native proxy is accessed on unsupported platforms', () => {
+    const { module, requireNativeModule } = loadModuleWithPlatform('web');
+
+    expect(module.toPlainPath('file:///tmp/wiki')).toBe('/tmp/wiki');
+    expect(requireNativeModule).not.toHaveBeenCalled();
+    expect(() => module.ExternalStorage.exists).toThrow('ExternalStorage native module is only available on Android and iOS');
+  });
+});

package/tsconfig.json

@@ -4,5 +4,6 @@
     "outDir": "./build",
     "rootDir": "./src"
   },
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": ["src/**/__tests__/**", "src/**/*.test.ts"]
 }