expo-file-system 15.2.0 → 15.2.1

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 15.2.1 — 2023-02-09
+
+### 🐛 Bug fixes
+
+- Add utf-8 uri support on iOS. ([#21098](https://github.com/expo/expo/pull/21098) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ## 15.2.0 — 2023-02-03
 
 ### 💡 Others

package/README.md

@@ -1,4 +1,11 @@
-# expo-file-system
+<p>
+  <a href="https://docs.expo.dev/versions/latest/sdk/filesystem/">
+    <img
+      src="../../.github/resources/expo-file-system.svg"
+      alt="expo-file-system"
+      height="64" />
+  </a>
+</p>
 
 Provides access to the local file system on the device.
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '15.2.0'
+version = '15.2.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -22,7 +22,7 @@ buildscript {
     if (ext.has("kotlinVersion")) {
       ext.kotlinVersion()
     } else {
-      ext.safeExtGet("kotlinVersion", "1.6.10")
+      ext.safeExtGet("kotlinVersion", "1.8.10")
     }
   }
 
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 30
-    versionName "15.2.0"
+    versionName "15.2.1"
   }
   lintOptions {
     abortOnError false

package/ios/EXFileSystem/EXFileSystem.m

@@ -179,11 +179,7 @@ EX_EXPORT_METHOD_AS(getInfoAsync,
                     resolver:(EXPromiseResolveBlock)resolve
                     rejecter:(EXPromiseRejectBlock)reject)
 {
-  NSURL *uri = [NSURL URLWithString:uriString];
-  // no scheme provided in uri, handle as a local path and add 'file://' scheme
-  if (!uri.scheme) {
-    uri = [NSURL fileURLWithPath:uriString isDirectory:false];
-  }
+  NSURL *uri = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:uriString]];
   if (!([self permissionsForURI:uri] & EXFileSystemPermissionRead)) {
     reject(@"ERR_FILESYSTEM_NO_PERMISSIONS",
            [NSString stringWithFormat:@"File '%@' isn't readable.", uri],
@@ -208,11 +204,7 @@ EX_EXPORT_METHOD_AS(readAsStringAsync,
                     resolver:(EXPromiseResolveBlock)resolve
                     rejecter:(EXPromiseRejectBlock)reject)
 {
-  NSURL *uri = [NSURL URLWithString:uriString];
-  // no scheme provided in uri, handle as a local path and add 'file://' scheme
-  if (!uri.scheme) {
-    uri = [NSURL fileURLWithPath:uriString isDirectory:false];
-  }
+  NSURL *uri = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:uriString]];
   if (!([self permissionsForURI:uri] & EXFileSystemPermissionRead)) {
     reject(@"ERR_FILESYSTEM_NO_PERMISSIONS",
            [NSString stringWithFormat:@"File '%@' isn't readable.", uri],
@@ -275,7 +267,7 @@ EX_EXPORT_METHOD_AS(writeAsStringAsync,
                     resolver:(EXPromiseResolveBlock)resolve
                     rejecter:(EXPromiseRejectBlock)reject)
 {
-  NSURL *uri = [NSURL URLWithString:uriString];
+  NSURL *uri = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:uriString]];
   if (!([self permissionsForURI:uri] & EXFileSystemPermissionWrite)) {
     reject(@"ERR_FILESYSTEM_NO_PERMISSIONS",
            [NSString stringWithFormat:@"File '%@' isn't writable.", uri],
@@ -335,7 +327,7 @@ EX_EXPORT_METHOD_AS(deleteAsync,
                     resolver:(EXPromiseResolveBlock)resolve
                     rejecter:(EXPromiseRejectBlock)reject)
 {
-  NSURL *uri = [NSURL URLWithString:uriString];
+  NSURL *uri = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:uriString]];
   if (!([self permissionsForURI:[uri URLByAppendingPathComponent:@".."]] & EXFileSystemPermissionWrite)) {
     reject(@"ERR_FILESYSTEM_NO_PERMISSIONS",
            [NSString stringWithFormat:@"Location '%@' isn't deletable.", uri],
@@ -472,7 +464,7 @@ EX_EXPORT_METHOD_AS(makeDirectoryAsync,
                     rejecter:(EXPromiseRejectBlock)reject)
 {
 
-  NSURL *uri = [NSURL URLWithString:uriString];
+  NSURL *uri = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:uriString]];
   if (!([self permissionsForURI:uri] & EXFileSystemPermissionWrite)) {
     reject(@"ERR_FILESYSTEM_NO_PERMISSIONS",
            [NSString stringWithFormat:@"Directory '%@' could not be created because the location isn't writable.", uri],
@@ -505,7 +497,7 @@ EX_EXPORT_METHOD_AS(readDirectoryAsync,
                     resolver:(EXPromiseResolveBlock)resolve
                     rejecter:(EXPromiseRejectBlock)reject)
 {
-  NSURL *uri = [NSURL URLWithString:uriString];
+  NSURL *uri = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:uriString] isDirectory:true];
   if (!([self permissionsForURI:uri] & EXFileSystemPermissionRead)) {
     reject(@"ERR_FILESYSTEM_NO_PERMISSIONS",
            [NSString stringWithFormat:@"Location '%@' isn't readable.", uri],
@@ -538,7 +530,7 @@ EX_EXPORT_METHOD_AS(downloadAsync,
                                 rejecter:(EXPromiseRejectBlock)reject)
 {
   NSURL *url = [NSURL URLWithString:urlString];
-  NSURL *localUri = [NSURL URLWithString:localUriString];
+  NSURL *localUri = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:localUriString]];
   if (!([self checkIfFileDirExists:localUri.path])) {
     reject(@"ERR_FILESYSTEM_WRONG_DESTINATION",
            [NSString stringWithFormat:@"Directory for '%@' doesn't exist. Please make sure directory '%@' exists before calling downloadAsync.", localUriString, [localUri.path stringByDeletingLastPathComponent]],
@@ -635,7 +627,7 @@ EX_EXPORT_METHOD_AS(uploadTaskStartAsync,
                                                options:(NSDictionary *)options
                                               rejecter:(EXPromiseRejectBlock)reject
 {
-  NSURL *fileUri = [NSURL URLWithString:fileUriString];
+  NSURL *fileUri = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:fileUriString]];
   NSString *httpMethod = options[@"httpMethod"];
   EXFileSystemUploadType type = [self _getUploadTypeFrom:options[@"uploadType"]];
   if (![fileUri.scheme isEqualToString:@"file"]) {
@@ -702,7 +694,7 @@ EX_EXPORT_METHOD_AS(downloadResumableStartAsync,
                                               rejecter:(EXPromiseRejectBlock)reject)
 {
   NSURL *url = [NSURL URLWithString:urlString];
-  NSURL *localUrl = [NSURL URLWithString:fileUri];
+  NSURL *localUrl = [NSURL fileURLWithPath:[self removeFileSchemefromURIString:fileUri]];
   if (!([self checkIfFileDirExists:localUrl.path])) {
     reject(@"ERR_FILESYSTEM_WRONG_DESTINATION",
            [NSString stringWithFormat:@"Directory for '%@' doesn't exist. Please make sure directory '%@' exists before calling downloadAsync.", fileUri, [localUrl.path stringByDeletingLastPathComponent]],
@@ -1012,6 +1004,15 @@ EX_EXPORT_METHOD_AS(getTotalDiskCapacityAsync, getTotalDiskCapacityAsyncWithReso
   return [self _checkIfFileExists:dir];
 }
 
+- (NSString *)removeFileSchemefromURIString:(NSString *)path
+{
+  if ([path hasPrefix:@"file:///"]) {
+    return [path substringFromIndex:7];
+  }
+
+  return [path copy];
+}
+
 #pragma mark - Class methods
 
 - (BOOL)ensureDirExistsWithPath:(NSString *)path

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-file-system",
-  "version": "15.2.0",
+  "version": "15.2.1",
   "description": "Provides access to the local file system on the device.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "1815e2eaad8c753588c7b1eb74420174a28e01f4"
+  "gitHead": "1f8a6a09570fd451378565ca34933018ce48454e"
 }