@hubert ber/blob tests

apps/test-suite/TestModules.js

@@ -76,6 +76,7 @@ export function getTestModules() {
 
   if (['android', 'ios'].includes(Platform.OS)) {
     modules.push(require('./tests/FileSystemNext'));
+    modules.push(require('./tests/Blob'));
   }
 
   if (Platform.OS === 'android') {

packages/expo-blob/android/build/.transforms/4b06e88cbc20d0207e8f18ecaa322547/results.bin

@@ -0,0 +1 @@
+o/classes

packages/expo-blob/android/build/.transforms/8f8a6c2346678f20ad35dd488b88f140/results.bin

@@ -0,0 +1 @@
+o/classes

packages/expo-blob/android/src/main/java/expo/modules/blob/Blob.kt

@@ -51,6 +51,9 @@ class Blob() : SharedObject() {
     }
 
     fun slice(start: Int, end: Int, contentType: String): Blob {
+        if (start >= end) {
+          return Blob(listOf(), contentType)
+        }
         var i: Int = 0
         val bps: MutableList<InternalBlobPart> = mutableListOf()
 

packages/expo-blob/android/src/main/java/expo/modules/blob/BlobModule.kt

@@ -2,16 +2,18 @@ package expo.modules.blob
 
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
+import kotlin.math.max
+import kotlin.math.min
 
 class BlobModule : Module() {
     override fun definition() = ModuleDefinition {
         Name("ExpoBlob")
 
         Class(Blob::class) {
-            Constructor() { blobParts: List<BlobPart>, options: BlobOptionsBag? ->
+            Constructor() { blobParts: List<BlobPart>?, options: BlobOptionsBag? ->
                 val type = options?.type ?: DEFAULT_TYPE
                 val endings = options?.endings ?: EndingType.TRANSPARENT
-                Blob(blobParts.internal(endings == EndingType.NATIVE), type)
+                Blob((blobParts ?: listOf()).internal(endings == EndingType.NATIVE), type)
             }
 
             Property("size") { blob: Blob ->
@@ -24,12 +26,16 @@ class BlobModule : Module() {
 
             Function("slice") { blob: Blob, start: Int?, end: Int?, contentType: String? ->
                 var sliceStart: Int = start ?: 0
-                var sliceEnd: Int = end ?: 0
+                var sliceEnd: Int = end ?: blob.size
                 if (sliceStart < 0) {
-                    sliceStart = blob.size + sliceStart
+                    sliceStart = max(blob.size + sliceStart, 0)
+                } else {
+                  sliceStart = min(sliceStart, blob.size)
                 }
                 if (sliceEnd < 0) {
-                    sliceEnd = blob.size + sliceEnd
+                    sliceEnd = max(blob.size + sliceEnd, 0)
+                } else {
+                  sliceEnd = min(sliceEnd, blob.size)
                 }
                 blob.slice(sliceStart, sliceEnd, contentType ?: "")
             }

packages/expo-blob/src/BlobModule.ts

@@ -18,12 +18,21 @@ declare class ExpoBlobModule extends NativeModule {
 const NativeBlobModule = requireNativeModule<ExpoBlobModule>("ExpoBlob");
 
 export class ExpoBlob extends NativeBlobModule.Blob implements Blob {
-	constructor(blobParts?: any[], options?: BlobPropertyBag) {
-		super(blobParts?.flat(Infinity), options);
+	constructor(blobParts?: any[] | Iterable<any>, options?: BlobPropertyBag) {
+		if (options) {
+			options.type = normalizedContentType(options.type)
+		}
+		if (!blobParts) {
+			super([], options);
+		} else if (blobParts instanceof Array) {
+			super(blobParts.flat(Infinity), options);
+		} else {
+			super(Array.from(blobParts).flat(Infinity), options);
+		}
 	}
 
 	slice(start?: number, end?: number, contentType?: string): ExpoBlob {
-		const normalizedType = contentType ?? normalizedContentType(contentType);
+		const normalizedType = contentType ? normalizedContentType(contentType) : "";
 		const slicedBlob = super.slice(start, end, normalizedType);
 		Object.setPrototypeOf(slicedBlob, ExpoBlob.prototype);
 		return slicedBlob;