@uploadcare/upload-client 6.0.1-alpha.6 → 6.0.1-alpha.8

package/dist/index.browser.js

@@ -262,11 +262,15 @@ const transformFile = identity;
 var getFormData = () => new FormData();
 
 const isReactNativeUri = (uri) => {
+    if (typeof uri !== 'string') {
+        return false;
+    }
     return uri.startsWith('file:') || uri.startsWith('content:');
 };
 const isReactNativeAsset = (asset) => {
-    return (typeof asset === 'object' &&
-        !!asset &&
+    return (!!asset &&
+        typeof asset === 'object' &&
+        !Array.isArray(asset) &&
         'uri' in asset &&
         typeof asset.uri === 'string' &&
         isReactNativeUri(asset.uri));
@@ -458,6 +462,10 @@ function retryIfFailed(fn, options) {
     }));
 }
 
+function getStoreValue(store) {
+    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
+}
+
 /**
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
@@ -475,13 +483,13 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
             file: {
                 data: file,
                 name: fileName ?? file?.name ?? defaultFilename,
-                contentType
+                contentType: contentType ?? file?.type ?? defaultContentType
             },
             UPLOADCARE_PUB_KEY: publicKey,
-            // UPLOADCARE_STORE: getStoreValue(store),
-            // signature: secureSignature,
-            // expire: secureExpire,
-            // source: source,
+            UPLOADCARE_STORE: getStoreValue(store),
+            signature: secureSignature,
+            expire: secureExpire,
+            source: source,
             metadata
         }),
         signal,
@@ -497,10 +505,6 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
     }), { retryNetworkErrorMaxTimes, retryThrottledRequestMaxTimes });
 }
 
-function getStoreValue(store) {
-    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
-}
-
 var TypeEnum;
 (function (TypeEnum) {
     TypeEnum["Token"] = "token";

package/dist/index.node.js

@@ -286,11 +286,15 @@ const transformFile = identity;
 var getFormData = () => new NodeFormData();
 
 const isReactNativeUri = (uri) => {
+    if (typeof uri !== 'string') {
+        return false;
+    }
     return uri.startsWith('file:') || uri.startsWith('content:');
 };
 const isReactNativeAsset = (asset) => {
-    return (typeof asset === 'object' &&
-        !!asset &&
+    return (!!asset &&
+        typeof asset === 'object' &&
+        !Array.isArray(asset) &&
         'uri' in asset &&
         typeof asset.uri === 'string' &&
         isReactNativeUri(asset.uri));
@@ -482,6 +486,10 @@ function retryIfFailed(fn, options) {
     }));
 }
 
+function getStoreValue(store) {
+    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
+}
+
 /**
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
@@ -499,13 +507,13 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
             file: {
                 data: file,
                 name: fileName ?? file?.name ?? defaultFilename,
-                contentType
+                contentType: contentType ?? file?.type ?? defaultContentType
             },
             UPLOADCARE_PUB_KEY: publicKey,
-            // UPLOADCARE_STORE: getStoreValue(store),
-            // signature: secureSignature,
-            // expire: secureExpire,
-            // source: source,
+            UPLOADCARE_STORE: getStoreValue(store),
+            signature: secureSignature,
+            expire: secureExpire,
+            source: source,
             metadata
         }),
         signal,
@@ -521,10 +529,6 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
     }), { retryNetworkErrorMaxTimes, retryThrottledRequestMaxTimes });
 }
 
-function getStoreValue(store) {
-    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
-}
-
 var TypeEnum;
 (function (TypeEnum) {
     TypeEnum["Token"] = "token";

package/dist/index.react-native.js

@@ -254,11 +254,15 @@ const request = ({ method, url, data, headers = {}, signal, onProgress }) => new
 });
 
 const isReactNativeUri = (uri) => {
+    if (typeof uri !== 'string') {
+        return false;
+    }
     return uri.startsWith('file:') || uri.startsWith('content:');
 };
 const isReactNativeAsset = (asset) => {
-    return (typeof asset === 'object' &&
-        !!asset &&
+    return (!!asset &&
+        typeof asset === 'object' &&
+        !Array.isArray(asset) &&
         'uri' in asset &&
         typeof asset.uri === 'string' &&
         isReactNativeUri(asset.uri));
@@ -266,15 +270,18 @@ const isReactNativeAsset = (asset) => {
 
 const getFileOptions = ({ name }) => name ? [name] : [];
 const transformFile = (file, name, contentType) => {
-    if (typeof file === 'string' && isReactNativeUri(file)) {
+    if (isReactNativeUri(file)) {
         return { uri: file, name, type: contentType };
     }
     if (isReactNativeAsset(file)) {
-        return file;
+        return {
+            uri: file.uri,
+            name: file.name || name,
+            type: file.type || contentType
+        };
     }
     const uri = URL.createObjectURL(file);
-    const type = contentType || file.type;
-    return { uri, name, type };
+    return { uri, name, type: contentType };
 };
 var getFormData = () => new FormData();
 
@@ -464,6 +471,10 @@ function retryIfFailed(fn, options) {
     }));
 }
 
+function getStoreValue(store) {
+    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
+}
+
 /**
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
@@ -481,13 +492,13 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
             file: {
                 data: file,
                 name: fileName ?? file?.name ?? defaultFilename,
-                contentType
+                contentType: contentType ?? file?.type ?? defaultContentType
             },
             UPLOADCARE_PUB_KEY: publicKey,
-            // UPLOADCARE_STORE: getStoreValue(store),
-            // signature: secureSignature,
-            // expire: secureExpire,
-            // source: source,
+            UPLOADCARE_STORE: getStoreValue(store),
+            signature: secureSignature,
+            expire: secureExpire,
+            source: source,
             metadata
         }),
         signal,
@@ -503,10 +514,6 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
     }), { retryNetworkErrorMaxTimes, retryThrottledRequestMaxTimes });
 }
 
-function getStoreValue(store) {
-    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
-}
-
 var TypeEnum;
 (function (TypeEnum) {
     TypeEnum["Token"] = "token";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "6.0.1-alpha.6",
+  "version": "6.0.1-alpha.8",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
   "module": "./dist/index.node.js",