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

package/dist/index.browser.js

@@ -264,6 +264,13 @@ var getFormData = () => new FormData();
 const isReactNativeUri = (uri) => {
     return uri.startsWith('file:') || uri.startsWith('content:');
 };
+const isReactNativeAsset = (asset) => {
+    return (typeof asset === 'object' &&
+        !!asset &&
+        'uri' in asset &&
+        typeof asset.uri === 'string' &&
+        isReactNativeUri(asset.uri));
+};
 
 /**
  * FileData type guard.
@@ -273,7 +280,8 @@ const isFileData = (data) => {
         ((typeof Blob !== 'undefined' && data instanceof Blob) ||
             (typeof File !== 'undefined' && data instanceof File) ||
             (typeof Buffer !== 'undefined' && data instanceof Buffer) ||
-            (typeof data === 'string' && isReactNativeUri(data))));
+            (typeof data === 'string' && isReactNativeUri(data)) ||
+            (typeof data === 'object' && isReactNativeAsset(data))));
 };
 /**
  * Uuid type guard.
@@ -450,10 +458,6 @@ 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.
@@ -466,7 +470,6 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
         }),
         headers: {
             'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent }),
-            'content-type': 'multipart/form-data'
         },
         data: buildFormData({
             file: {
@@ -475,10 +478,10 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
                 contentType
             },
             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,
@@ -494,6 +497,10 @@ 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

@@ -288,6 +288,13 @@ var getFormData = () => new NodeFormData();
 const isReactNativeUri = (uri) => {
     return uri.startsWith('file:') || uri.startsWith('content:');
 };
+const isReactNativeAsset = (asset) => {
+    return (typeof asset === 'object' &&
+        !!asset &&
+        'uri' in asset &&
+        typeof asset.uri === 'string' &&
+        isReactNativeUri(asset.uri));
+};
 
 /**
  * FileData type guard.
@@ -297,7 +304,8 @@ const isFileData = (data) => {
         ((typeof Blob !== 'undefined' && data instanceof Blob) ||
             (typeof File !== 'undefined' && data instanceof File) ||
             (typeof Buffer !== 'undefined' && data instanceof Buffer) ||
-            (typeof data === 'string' && isReactNativeUri(data))));
+            (typeof data === 'string' && isReactNativeUri(data)) ||
+            (typeof data === 'object' && isReactNativeAsset(data))));
 };
 /**
  * Uuid type guard.
@@ -474,10 +482,6 @@ 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.
@@ -490,7 +494,6 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
         }),
         headers: {
             'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent }),
-            'content-type': 'multipart/form-data'
         },
         data: buildFormData({
             file: {
@@ -499,10 +502,10 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
                 contentType
             },
             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,
@@ -518,6 +521,10 @@ 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

@@ -256,15 +256,25 @@ const request = ({ method, url, data, headers = {}, signal, onProgress }) => new
 const isReactNativeUri = (uri) => {
     return uri.startsWith('file:') || uri.startsWith('content:');
 };
+const isReactNativeAsset = (asset) => {
+    return (typeof asset === 'object' &&
+        !!asset &&
+        'uri' in asset &&
+        typeof asset.uri === 'string' &&
+        isReactNativeUri(asset.uri));
+};
 
 const getFileOptions = ({ name }) => name ? [name] : [];
 const transformFile = (file, name, contentType) => {
     if (typeof file === 'string' && isReactNativeUri(file)) {
+        return { uri: file, name, type: contentType };
+    }
+    if (isReactNativeAsset(file)) {
         return file;
     }
-    // const uri = URL.createObjectURL(file as BrowserFile)
-    // const type = contentType || (file as BrowserFile).type
-    return file;
+    const uri = URL.createObjectURL(file);
+    const type = contentType || file.type;
+    return { uri, name, type };
 };
 var getFormData = () => new FormData();
 
@@ -276,7 +286,8 @@ const isFileData = (data) => {
         ((typeof Blob !== 'undefined' && data instanceof Blob) ||
             (typeof File !== 'undefined' && data instanceof File) ||
             (typeof Buffer !== 'undefined' && data instanceof Buffer) ||
-            (typeof data === 'string' && isReactNativeUri(data))));
+            (typeof data === 'string' && isReactNativeUri(data)) ||
+            (typeof data === 'object' && isReactNativeAsset(data))));
 };
 /**
  * Uuid type guard.
@@ -312,7 +323,7 @@ const isFileValue = (value) => !!value &&
 function collectParams(params, inputKey, inputValue) {
     if (isFileValue(inputValue)) {
         const { name, contentType } = inputValue;
-        const file = transformFile(inputValue.data); // lgtm [js/superfluous-trailing-arguments]
+        const file = transformFile(inputValue.data, name, contentType); // lgtm [js/superfluous-trailing-arguments]
         const options = getFileOptions({ name, contentType });
         params.push([inputKey, file, ...options]);
     }
@@ -453,10 +464,6 @@ 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.
@@ -469,7 +476,6 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
         }),
         headers: {
             'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent }),
-            'content-type': 'multipart/form-data'
         },
         data: buildFormData({
             file: {
@@ -478,10 +484,10 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
                 contentType
             },
             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,6 +503,10 @@ 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.5",
+  "version": "6.0.1-alpha.6",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
   "module": "./dist/index.node.js",