expo-file-system 18.0.3 → 18.0.5

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 18.0.5 — 2024-12-10
+
+### 🐛 Bug fixes
+
+- [macOS][next]: Add availability checks ([#33504](https://github.com/expo/expo/pull/33504) by [@hassankhan](https://github.com/hassankhan))
+
+## 18.0.4 — 2024-11-19
+
+### 🎉 New features
+
+- [next] Added `.bytes()` and writing a `Uint8Array`. ([#33020](https://github.com/expo/expo/pull/33020) by [@aleqsio](https://github.com/aleqsio))
+
 ## 18.0.3 — 2024-11-13
 
 ### 🎉 New features

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '18.0.3'
+version = '18.0.5'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.filesystem"
   defaultConfig {
     versionCode 30
-    versionName "18.0.3"
+    versionName "18.0.5"
   }
 }
 

package/android/src/main/java/expo/modules/filesystem/next/FileSystemFile.kt

@@ -53,7 +53,7 @@ class FileSystemFile(file: File) : FileSystemPath(file) {
       create()
     }
     FileOutputStream(file).use {
-      it.write(content.toDirectBuffer().array())
+      it.channel.write(content.toDirectBuffer())
     }
   }
 
@@ -74,6 +74,12 @@ class FileSystemFile(file: File) : FileSystemPath(file) {
     return Base64.encodeToString(file.readBytes(), Base64.NO_WRAP)
   }
 
+  fun bytes(): ByteArray {
+    validateType()
+    validatePermission(Permission.READ)
+    return file.readBytes()
+  }
+
   @OptIn(ExperimentalStdlibApi::class)
   val md5: String get() {
     validatePermission(Permission.READ)

package/android/src/main/java/expo/modules/filesystem/next/FileSystemNextModule.kt

@@ -102,6 +102,10 @@ class FileSystemNextModule : Module() {
         file.base64()
       }
 
+      Function("bytes") { file: FileSystemFile ->
+        file.bytes()
+      }
+
       Property("exists") { file: FileSystemFile ->
         file.exists
       }

package/build/next/ExpoFileSystem.types.d.ts

@@ -85,11 +85,16 @@ export declare class File {
      * @returns The contents of the file as a base64 string.
      */
     base64(): string;
+    /**
+     * Retrieves byte content of the entire file.
+     * @returns The contents of the file as a Uint8Array.
+     */
+    bytes(): Uint8Array;
     /**
      * Writes content to the file.
      * @param content - The content to write into the file.
      */
-    write(content: string): void;
+    write(content: string | Uint8Array): void;
     /**
      * Deletes a file.
      *

package/build/next/ExpoFileSystem.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoFileSystem.types.d.ts","sourceRoot":"","sources":["../../src/next/ExpoFileSystem.types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B;;;;;;;OAOG;gBACS,GAAG,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE;IAElD;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,IAAI,IAAI;IAEpB;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAEd;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAEd;;OAEG;IACH,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI;IAElC;;OAEG;IACH,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI;IAElC;;;;OAIG;IACH,aAAa,IAAI;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE;IAExD;;OAEG;IACH,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE;CAC7B;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACvB;;;;OAIG;gBACS,GAAG,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE;IAElD;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,IAAI,IAAI;IAEpB;;;OAGG;IACH,IAAI,IAAI,MAAM;IAEd;;;OAGG;IACH,MAAM,IAAI,MAAM;IAEhB;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAE5B;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAEd;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAEd;;OAEG;IACH,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI;IAElC;;OAEG;IACH,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI;IAElC;;;OAGG;IACH,IAAI,IAAI,UAAU;IAElB;;;;;;;;;OASG;IACH,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAEnF;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpB;;OAEG;IACH,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,OAAO,UAAU;IAI7B,KAAK,IAAI,IAAI;IAKb,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU;IAKrC,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAMnC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAItB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB"}
+{"version":3,"file":"ExpoFileSystem.types.d.ts","sourceRoot":"","sources":["../../src/next/ExpoFileSystem.types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B;;;;;;;OAOG;gBACS,GAAG,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE;IAElD;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,IAAI,IAAI;IAEpB;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAEd;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAEd;;OAEG;IACH,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI;IAElC;;OAEG;IACH,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI;IAElC;;;;OAIG;IACH,aAAa,IAAI;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE;IAExD;;OAEG;IACH,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE;CAC7B;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACvB;;;;OAIG;gBACS,GAAG,IAAI,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE;IAElD;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,IAAI,IAAI;IAEpB;;;OAGG;IACH,IAAI,IAAI,MAAM;IAEd;;;OAGG;IACH,MAAM,IAAI,MAAM;IAEhB;;;OAGG;IACH,KAAK,IAAI,UAAU;IAEnB;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAEzC;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAEd;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,MAAM,IAAI,IAAI;IAEd;;OAEG;IACH,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI;IAElC;;OAEG;IACH,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI;IAElC;;;OAGG;IACH,IAAI,IAAI,UAAU;IAElB;;;;;;;;;OASG;IACH,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAEnF;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpB;;OAEG;IACH,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,OAAO,UAAU;IAI7B,KAAK,IAAI,IAAI;IAKb,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU;IAKrC,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAMnC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAItB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB"}

package/ios/FileSystemHelpers.swift

@@ -102,7 +102,7 @@ internal func copyPHAsset(fromUrl: URL, toUrl: URL, with resourceManager: PHAsse
 }
 
 internal func isPhotoLibraryStatusAuthorized() -> Bool {
-  if #available(iOS 14, tvOS 14, *) {
+  if #available(iOS 14, macOS 11, tvOS 14, *) {
     let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
     return status == .authorized || status == .limited
   }

package/ios/Next/FileSystemFile.swift

@@ -73,8 +73,11 @@ internal final class FileSystemFile: FileSystemPath {
     try content.write(to: url, atomically: false, encoding: .utf8) // TODO: better error handling
   }
 
-  // TODO: typedarray, blobs, others support
+  // TODO: blob support
   func write(_ content: TypedArray) throws {
+    try validateType()
+    try validatePermission(.write)
+    try Data(bytes: content.rawPointer, count: content.byteLength).write(to: url)
   }
 
   func text() throws -> String {
@@ -83,6 +86,12 @@ internal final class FileSystemFile: FileSystemPath {
     return try String(contentsOf: url)
   }
 
+  func bytes() throws -> Data {
+    try validateType()
+    try validatePermission(.read)
+    return try Data(contentsOf: url)
+  }
+
   func base64() throws -> String {
     try validatePermission(.read)
     return try Data(contentsOf: url).base64EncodedString()

package/ios/Next/FileSystemFileHandle.swift

@@ -1,6 +1,7 @@
 import Foundation
 import ExpoModulesCore
 
+@available(iOS 14, macOS 11, tvOS 14, *)
 internal final class FileSystemFileHandle: SharedRef<FileHandle> {
   let file: FileSystemFile
   let handle: FileHandle

package/ios/Next/FileSystemNextModule.swift

@@ -2,6 +2,7 @@
 
 import ExpoModulesCore
 
+@available(iOS 14, macOS 11, tvOS 14, *)
 public final class FileSystemNextModule: Module {
   public func definition() -> ModuleDefinition {
     Name("FileSystemNext")
@@ -72,6 +73,10 @@ public final class FileSystemNextModule: Module {
         return try file.base64()
       }
 
+      Function("bytes") { file in
+        return try file.bytes()
+      }
+
       Function("open") { file in
         return try FileSystemFileHandle(file: file)
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-file-system",
-  "version": "18.0.3",
+  "version": "18.0.5",
   "description": "Provides access to the local file system on the device.",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -45,5 +45,5 @@
   "dependencies": {
     "web-streams-polyfill": "^3.3.2"
   },
-  "gitHead": "c4999f5aa407155a170830a0fa17e3e3ca1fcbee"
+  "gitHead": "1faceb8d22bebee4571ef3a2f9578bec33dc26b1"
 }

package/src/next/ExpoFileSystem.types.ts

@@ -97,11 +97,17 @@ export declare class File {
    */
   base64(): string;
 
+  /**
+   * Retrieves byte content of the entire file.
+   * @returns The contents of the file as a Uint8Array.
+   */
+  bytes(): Uint8Array;
+
   /**
    * Writes content to the file.
    * @param content - The content to write into the file.
    */
-  write(content: string): void;
+  write(content: string | Uint8Array): void;
 
   /**
    * Deletes a file.