feat: implement support for mime type on Android, fix: types (#46)

grabbou · grabbou · commit 30d12347ea11 · 2024-11-12T23:27:17.000+04:00
diff --git a/example/tests/filesystem.tsx b/example/tests/filesystem.tsx
@@ -1,12 +1,17 @@
 import React, { useState } from 'react'
 import { StyleSheet, Text, TouchableOpacity, View } from 'react-native'
-import { CompressionStream, fetch, showOpenFilePicker } from 'react-native-fast-io'
+import {
+  CompressionStream,
+  fetch,
+  OpenFilePickerOptions,
+  showOpenFilePicker,
+} from 'react-native-fast-io'
 
 export function FileSystemUI() {
   const [file, setFile] = useState<File | null>(null)
 
-  const pickFile = async () => {
-    const [fileHandle] = await showOpenFilePicker()
+  const pickFile = async (options?: OpenFilePickerOptions) => {
+    const [fileHandle] = await showOpenFilePicker(options)
     const file = await fileHandle.getFile()
     // @ts-ignore
     setFile(file)
@@ -35,8 +40,15 @@ export function FileSystemUI() {
     <View>
       <Text style={styles.header}>File System Test</Text>
 
-      <TouchableOpacity style={styles.button} onPress={pickFile}>
-        <Text style={styles.buttonText}>Pick File</Text>
+      <TouchableOpacity style={styles.button} onPress={() => pickFile()}>
+        <Text style={styles.buttonText}>Pick any file</Text>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        style={styles.button}
+        onPress={() => pickFile({ types: [{ accept: { 'image/*': ['.png', '.jpg', '.jpeg'] } }] })}
+      >
+        <Text style={styles.buttonText}>Pick image</Text>
       </TouchableOpacity>
 
       {file && (
diff --git a/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridFileSystem.kt b/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridFileSystem.kt
@@ -69,8 +69,9 @@ class HybridFileSystem : HybridFileSystemSpec() {
                     type = "*/*"
                     addCategory(Intent.CATEGORY_OPENABLE)
 
-                    // tbd: handle file extensions - must pass mime type 
-                    // on Android, will require updating code on iOS
+                    if (options?.mimeTypes != null) {
+                        putExtra(Intent.EXTRA_MIME_TYPES, options.mimeTypes)
+                    }
 
                     if (options?.multiple == true) {
                         putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
diff --git a/packages/react-native-fast-io/nitrogen/generated/android/c++/JNativeFilePickerOptions.hpp b/packages/react-native-fast-io/nitrogen/generated/android/c++/JNativeFilePickerOptions.hpp
@@ -38,6 +38,8 @@ namespace margelo::nitro::fastio {
       jni::local_ref<jni::JString> startIn = this->getFieldValue(fieldStartIn);
       static const auto fieldExtensions = clazz->getField<jni::JArrayClass<jni::JString>>("extensions");
       jni::local_ref<jni::JArrayClass<jni::JString>> extensions = this->getFieldValue(fieldExtensions);
+      static const auto fieldMimeTypes = clazz->getField<jni::JArrayClass<jni::JString>>("mimeTypes");
+      jni::local_ref<jni::JArrayClass<jni::JString>> mimeTypes = this->getFieldValue(fieldMimeTypes);
       return NativeFilePickerOptions(
         multiple != nullptr ? std::make_optional(static_cast<bool>(multiple->value())) : std::nullopt,
         startIn != nullptr ? std::make_optional(startIn->toStdString()) : std::nullopt,
@@ -50,6 +52,16 @@ namespace margelo::nitro::fastio {
             __vector.push_back(__element->toStdString());
           }
           return __vector;
+        }()) : std::nullopt,
+        mimeTypes != nullptr ? std::make_optional([&]() {
+          size_t __size = mimeTypes->size();
+          std::vector<std::string> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = mimeTypes->getElement(__i);
+            __vector.push_back(__element->toStdString());
+          }
+          return __vector;
         }()) : std::nullopt
       );
     }
@@ -71,6 +83,15 @@ namespace margelo::nitro::fastio {
             __array->setElement(__i, *jni::make_jstring(__element));
           }
           return __array;
+        }() : nullptr,
+        value.mimeTypes.has_value() ? [&]() {
+          size_t __size = value.mimeTypes.value().size();
+          jni::local_ref<jni::JArrayClass<jni::JString>> __array = jni::JArrayClass<jni::JString>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = value.mimeTypes.value()[__i];
+            __array->setElement(__i, *jni::make_jstring(__element));
+          }
+          return __array;
         }() : nullptr
       );
     }
diff --git a/packages/react-native-fast-io/nitrogen/generated/android/kotlin/com/margelo/nitro/fastio/NativeFilePickerOptions.kt b/packages/react-native-fast-io/nitrogen/generated/android/kotlin/com/margelo/nitro/fastio/NativeFilePickerOptions.kt
@@ -19,5 +19,6 @@ import com.margelo.nitro.core.*
 data class NativeFilePickerOptions(
   val multiple: Boolean?,
   val startIn: String?,
-  val extensions: Array<String>?
+  val extensions: Array<String>?,
+  val mimeTypes: Array<String>?
 )
diff --git a/packages/react-native-fast-io/nitrogen/generated/ios/swift/NativeFilePickerOptions.swift b/packages/react-native-fast-io/nitrogen/generated/ios/swift/NativeFilePickerOptions.swift
@@ -18,7 +18,7 @@ public extension NativeFilePickerOptions {
   /**
    * Create a new instance of `NativeFilePickerOptions`.
    */
-  init(multiple: Bool?, startIn: String?, extensions: [String]?) {
+  init(multiple: Bool?, startIn: String?, extensions: [String]?, mimeTypes: [String]?) {
     self.init({ () -> bridge.std__optional_bool_ in
       if let __unwrappedValue = multiple {
         return bridge.create_std__optional_bool_(__unwrappedValue)
@@ -43,6 +43,18 @@ public extension NativeFilePickerOptions {
       } else {
         return .init()
       }
+    }(), { () -> bridge.std__optional_std__vector_std__string__ in
+      if let __unwrappedValue = mimeTypes {
+        return bridge.create_std__optional_std__vector_std__string__({ () -> bridge.std__vector_std__string_ in
+          var __vector = bridge.create_std__vector_std__string_(__unwrappedValue.count)
+          for __item in __unwrappedValue {
+            __vector.push_back(std.string(__item))
+          }
+          return __vector
+        }())
+      } else {
+        return .init()
+      }
     }())
   }
 
@@ -114,4 +126,33 @@ public extension NativeFilePickerOptions {
       }()
     }
   }
+  
+  var mimeTypes: [String]? {
+    @inline(__always)
+    get {
+      return { () -> [String]? in
+        if let __unwrapped = self.__mimeTypes.value {
+          return __unwrapped.map({ __item in String(__item) })
+        } else {
+          return nil
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__mimeTypes = { () -> bridge.std__optional_std__vector_std__string__ in
+        if let __unwrappedValue = newValue {
+          return bridge.create_std__optional_std__vector_std__string__({ () -> bridge.std__vector_std__string_ in
+            var __vector = bridge.create_std__vector_std__string_(__unwrappedValue.count)
+            for __item in __unwrappedValue {
+              __vector.push_back(std.string(__item))
+            }
+            return __vector
+          }())
+        } else {
+          return .init()
+        }
+      }()
+    }
+  }
 }
diff --git a/packages/react-native-fast-io/nitrogen/generated/shared/c++/NativeFilePickerOptions.hpp b/packages/react-native-fast-io/nitrogen/generated/shared/c++/NativeFilePickerOptions.hpp
@@ -34,9 +34,10 @@ namespace margelo::nitro::fastio {
     std::optional<bool> multiple     SWIFT_PRIVATE;
     std::optional<std::string> startIn     SWIFT_PRIVATE;
     std::optional<std::vector<std::string>> extensions     SWIFT_PRIVATE;
+    std::optional<std::vector<std::string>> mimeTypes     SWIFT_PRIVATE;
 
   public:
-    explicit NativeFilePickerOptions(std::optional<bool> multiple, std::optional<std::string> startIn, std::optional<std::vector<std::string>> extensions): multiple(multiple), startIn(startIn), extensions(extensions) {}
+    explicit NativeFilePickerOptions(std::optional<bool> multiple, std::optional<std::string> startIn, std::optional<std::vector<std::string>> extensions, std::optional<std::vector<std::string>> mimeTypes): multiple(multiple), startIn(startIn), extensions(extensions), mimeTypes(mimeTypes) {}
   };
 
 } // namespace margelo::nitro::fastio
@@ -53,14 +54,16 @@ namespace margelo::nitro {
       return NativeFilePickerOptions(
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "multiple")),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "startIn")),
-        JSIConverter<std::optional<std::vector<std::string>>>::fromJSI(runtime, obj.getProperty(runtime, "extensions"))
+        JSIConverter<std::optional<std::vector<std::string>>>::fromJSI(runtime, obj.getProperty(runtime, "extensions")),
+        JSIConverter<std::optional<std::vector<std::string>>>::fromJSI(runtime, obj.getProperty(runtime, "mimeTypes"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const NativeFilePickerOptions& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "multiple", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.multiple));
       obj.setProperty(runtime, "startIn", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.startIn));
       obj.setProperty(runtime, "extensions", JSIConverter<std::optional<std::vector<std::string>>>::toJSI(runtime, arg.extensions));
+      obj.setProperty(runtime, "mimeTypes", JSIConverter<std::optional<std::vector<std::string>>>::toJSI(runtime, arg.mimeTypes));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -71,6 +74,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "multiple"))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "startIn"))) return false;
       if (!JSIConverter<std::optional<std::vector<std::string>>>::canConvert(runtime, obj.getProperty(runtime, "extensions"))) return false;
+      if (!JSIConverter<std::optional<std::vector<std::string>>>::canConvert(runtime, obj.getProperty(runtime, "mimeTypes"))) return false;
       return true;
     }
   };
diff --git a/packages/react-native-fast-io/src/index.ts b/packages/react-native-fast-io/src/index.ts
@@ -1,3 +1,4 @@
+export * from './types/fs'
 export * from './w3c/blob'
 export * from './w3c/fs'
 export * from './w3c/network'
diff --git a/packages/react-native-fast-io/src/native/fs.nitro.ts b/packages/react-native-fast-io/src/native/fs.nitro.ts
@@ -14,7 +14,9 @@ type WellKnownDirectory = 'desktop' | 'documents' | 'downloads' | 'music' | 'pic
 export type NativeFilePickerOptions = {
   multiple?: boolean
   startIn?: string
+
   extensions?: string[]
+  mimeTypes?: string[]
 }
 
 interface FileSystem extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
diff --git a/packages/react-native-fast-io/src/types/fs.ts b/packages/react-native-fast-io/src/types/fs.ts
@@ -0,0 +1,56 @@
+/**
+ * Additional types for File System Access API that are currently not available in TypeScript.
+ * This is because they are not supported by more than one browser engine.
+ */
+
+export {}
+
+export type WellKnownDirectory =
+  | 'desktop'
+  | 'documents'
+  | 'downloads'
+  | 'music'
+  | 'pictures'
+  | 'videos'
+export type FileExtension = `.${string}`
+export type MIMEType = `${string}/${string}`
+
+export interface FilePickerAcceptType {
+  /**
+   * @default ""
+   */
+  description?: string | undefined
+  accept: Record<MIMEType, FileExtension | FileExtension[]> | undefined
+}
+
+export interface FilePickerOptions {
+  types?: FilePickerAcceptType[] | undefined
+  /**
+   * @default false
+   */
+  excludeAcceptAllOption?: boolean | undefined
+  startIn?: WellKnownDirectory | /* | FileSystemHandle */ undefined
+  id?: string | undefined
+}
+
+export interface OpenFilePickerOptions extends FilePickerOptions {
+  /**
+   * @default false
+   */
+  multiple?: boolean | undefined
+}
+
+export interface SaveFilePickerOptions extends FilePickerOptions {
+  suggestedName?: string | undefined
+}
+
+export type FileSystemPermissionMode = 'read' | 'readwrite'
+
+export interface DirectoryPickerOptions {
+  id?: string | undefined
+  startIn?: WellKnownDirectory /* | FileSystemHandle */ | undefined
+  /**
+   * @default "read"
+   */
+  mode?: FileSystemPermissionMode | undefined
+}
diff --git a/packages/react-native-fast-io/src/w3c/fs.d.ts b/packages/react-native-fast-io/src/w3c/fs.d.ts
diff --git a/packages/react-native-fast-io/src/w3c/fs.ts b/packages/react-native-fast-io/src/w3c/fs.ts
@@ -1,5 +1,11 @@
 import { FileSystem, Metadata, NativeFilePickerOptions } from '../native/fs.nitro'
 import { StreamFactory } from '../native/streams.nitro'
+import {
+  DirectoryPickerOptions,
+  FileExtension,
+  OpenFilePickerOptions,
+  SaveFilePickerOptions,
+} from '../types/fs'
 import { Blob } from './blob'
 import { toReadableStream } from './streams'
 
@@ -93,12 +99,13 @@ export async function showOpenFilePicker(
   }
 
   if (options.types) {
-    nativePickerOptions.extensions = options.types?.reduce<FileExtension[]>((acc, type) => {
+    nativePickerOptions.extensions = options.types.reduce<FileExtension[]>((acc, type) => {
       if (!type.accept) {
         return acc
       }
       return acc.concat(...Object.values(type.accept))
     }, [])
+    nativePickerOptions.mimeTypes = options.types.flatMap((type) => Object.keys(type.accept || {}))
   }
 
   const paths = await FileSystem.showOpenFilePicker(nativePickerOptions)

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@ import com.margelo.nitro.core.*`
`19`	`19`	`data class NativeFilePickerOptions(`
`20`	`20`	`val multiple: Boolean?,`
`21`	`21`	`val startIn: String?,`
`22`		`- val extensions: Array<String>?`
	`22`	`+ val extensions: Array<String>?,`
	`23`	`+ val mimeTypes: Array<String>?`
`23`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+export * from './types/fs'`
`1`	`2`	`export * from './w3c/blob'`
`2`	`3`	`export * from './w3c/fs'`
`3`	`4`	`export * from './w3c/network'`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@ type WellKnownDirectory = 'desktop' \| 'documents' \| 'downloads' \| 'music' \| 'pic`
`14`	`14`	`export type NativeFilePickerOptions = {`
`15`	`15`	`multiple?: boolean`
`16`	`16`	`startIn?: string`
	`17`	`+`
`17`	`18`	`extensions?: string[]`
	`19`	`+ mimeTypes?: string[]`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`interface FileSystem extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {`