@uploadcare/upload-client 3.1.1 → 3.1.2-alpha.0

package/dist/index.browser.cjs

@@ -176,6 +176,10 @@ function identity(obj) {
     return obj;
 }
 
+var getFileOptions = function (_a) {
+    var name = _a.name;
+    return name ? [name] : [];
+};
 var transformFile = identity;
 var getFormData = (function () { return new FormData(); });
 
@@ -223,9 +227,10 @@ var isFileValue = function (value) {
 };
 function collectParams(params, inputKey, inputValue) {
     if (isFileValue(inputValue)) {
-        var name_1 = inputValue.name;
+        var name_1 = inputValue.name, contentType = inputValue.contentType;
         var file = transformFile(inputValue.data); // lgtm [js/superfluous-trailing-arguments]
-        params.push(name_1 ? [inputKey, file, name_1] : [inputKey, file]);
+        var options = getFileOptions({ name: name_1, contentType: contentType });
+        params.push(__spreadArrays([inputKey, file], options));
     }
     else if (isObjectValue(inputValue)) {
         for (var _i = 0, _a = Object.entries(inputValue); _i < _a.length; _i++) {
@@ -249,10 +254,12 @@ function getFormDataParams(options) {
 }
 function buildFormData(options) {
     var formData = getFormData();
-    var params = getFormDataParams(options);
-    for (var _i = 0, params_1 = params; _i < params_1.length; _i++) {
-        var param = params_1[_i];
-        formData.append.apply(formData, param);
+    var paramsList = getFormDataParams(options);
+    for (var _i = 0, paramsList_1 = paramsList; _i < paramsList_1.length; _i++) {
+        var params = paramsList_1[_i];
+        var key = params[0], value = params[1], options_1 = params.slice(2);
+        // node form-data has another signature for append
+        formData.append.apply(formData, __spreadArrays([key, value], options_1));
     }
     return formData;
 }
@@ -435,7 +442,7 @@ function getStoreValue(store) {
  * Can be canceled and has progress.
  */
 function base(file, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, _c = _a.source, source = _c === void 0 ? 'local' : _c, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d, metadata = _a.metadata;
+    var publicKey = _a.publicKey, fileName = _a.fileName, contentType = _a.contentType, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, _c = _a.source, source = _c === void 0 ? 'local' : _c, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d, metadata = _a.metadata;
     return retryIfThrottled(function () {
         var _a;
         return request({
@@ -449,7 +456,8 @@ function base(file, _a) {
             data: buildFormData({
                 file: {
                     data: file,
-                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename
+                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename,
+                    contentType: contentType
                 },
                 UPLOADCARE_PUB_KEY: publicKey,
                 UPLOADCARE_STORE: getStoreValue(store),
@@ -853,10 +861,11 @@ function isReadyPoll(_a) {
 }
 
 var uploadFromObject = function (file, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, baseCDN = _a.baseCDN, metadata = _a.metadata;
+    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, contentType = _a.contentType, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, baseCDN = _a.baseCDN, metadata = _a.metadata;
     return base(file, {
         publicKey: publicKey,
         fileName: fileName,
+        contentType: contentType,
         baseURL: baseURL,
         secureSignature: secureSignature,
         secureExpire: secureExpire,
@@ -1481,6 +1490,7 @@ function uploadFile(data, _a) {
         return uploadFromObject(data, {
             publicKey: publicKey,
             fileName: fileName,
+            contentType: contentType,
             baseURL: baseURL,
             secureSignature: secureSignature,
             secureExpire: secureExpire,

package/dist/index.browser.js

@@ -117,6 +117,7 @@ function identity(obj) {
     return obj;
 }
 
+const getFileOptions = ({ name }) => name ? [name] : [];
 const transformFile = identity;
 var getFormData = () => new FormData();
 
@@ -162,9 +163,10 @@ const isFileValue = (value) => !!value &&
     isFileData(value.data);
 function collectParams(params, inputKey, inputValue) {
     if (isFileValue(inputValue)) {
-        const name = inputValue.name;
+        const { name, contentType } = inputValue;
         const file = transformFile(inputValue.data); // lgtm [js/superfluous-trailing-arguments]
-        params.push(name ? [inputKey, file, name] : [inputKey, file]);
+        const options = getFileOptions({ name, contentType });
+        params.push([inputKey, file, ...options]);
     }
     else if (isObjectValue(inputValue)) {
         for (const [key, value] of Object.entries(inputValue)) {
@@ -186,9 +188,11 @@ function getFormDataParams(options) {
 }
 function buildFormData(options) {
     const formData = getFormData();
-    const params = getFormDataParams(options);
-    for (const param of params) {
-        formData.append(...param);
+    const paramsList = getFormDataParams(options);
+    for (const params of paramsList) {
+        const [key, value, ...options] = params;
+        // node form-data has another signature for append
+        formData.append(key, value, ...options);
     }
     return formData;
 }
@@ -350,7 +354,7 @@ function getStoreValue(store) {
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
  */
-function base(file, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, metadata }) {
+function base(file, { publicKey, fileName, contentType, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, metadata }) {
     return retryIfThrottled(() => {
         var _a;
         return request({
@@ -364,7 +368,8 @@ function base(file, { publicKey, fileName, baseURL = defaultSettings.baseURL, se
             data: buildFormData({
                 file: {
                     data: file,
-                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename
+                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename,
+                    contentType
                 },
                 UPLOADCARE_PUB_KEY: publicKey,
                 UPLOADCARE_STORE: getStoreValue(store),
@@ -726,10 +731,11 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent,
     });
 }
 
-const uploadFromObject = (file, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN, metadata }) => {
+const uploadFromObject = (file, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, contentType, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN, metadata }) => {
     return base(file, {
         publicKey,
         fileName,
+        contentType,
         baseURL,
         secureSignature,
         secureExpire,
@@ -1307,6 +1313,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
         return uploadFromObject(data, {
             publicKey,
             fileName,
+            contentType,
             baseURL,
             secureSignature,
             secureExpire,

package/dist/index.cjs

@@ -215,6 +215,15 @@ function identity(obj) {
     return obj;
 }
 
+var getFileOptions = function (_a) {
+    var name = _a.name, contentType = _a.contentType;
+    return [
+        {
+            filename: name,
+            contentType: contentType
+        }
+    ];
+};
 var transformFile = identity;
 var getFormData = (function () { return new NodeFormData__default["default"](); });
 
@@ -262,9 +271,10 @@ var isFileValue = function (value) {
 };
 function collectParams(params, inputKey, inputValue) {
     if (isFileValue(inputValue)) {
-        var name_1 = inputValue.name;
+        var name_1 = inputValue.name, contentType = inputValue.contentType;
         var file = transformFile(inputValue.data); // lgtm [js/superfluous-trailing-arguments]
-        params.push(name_1 ? [inputKey, file, name_1] : [inputKey, file]);
+        var options = getFileOptions({ name: name_1, contentType: contentType });
+        params.push(__spreadArrays([inputKey, file], options));
     }
     else if (isObjectValue(inputValue)) {
         for (var _i = 0, _a = Object.entries(inputValue); _i < _a.length; _i++) {
@@ -288,10 +298,12 @@ function getFormDataParams(options) {
 }
 function buildFormData(options) {
     var formData = getFormData();
-    var params = getFormDataParams(options);
-    for (var _i = 0, params_1 = params; _i < params_1.length; _i++) {
-        var param = params_1[_i];
-        formData.append.apply(formData, param);
+    var paramsList = getFormDataParams(options);
+    for (var _i = 0, paramsList_1 = paramsList; _i < paramsList_1.length; _i++) {
+        var params = paramsList_1[_i];
+        var key = params[0], value = params[1], options_1 = params.slice(2);
+        // node form-data has another signature for append
+        formData.append.apply(formData, __spreadArrays([key, value], options_1));
     }
     return formData;
 }
@@ -474,7 +486,7 @@ function getStoreValue(store) {
  * Can be canceled and has progress.
  */
 function base(file, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, _c = _a.source, source = _c === void 0 ? 'local' : _c, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d, metadata = _a.metadata;
+    var publicKey = _a.publicKey, fileName = _a.fileName, contentType = _a.contentType, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, _c = _a.source, source = _c === void 0 ? 'local' : _c, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d, metadata = _a.metadata;
     return retryIfThrottled(function () {
         var _a;
         return request({
@@ -488,7 +500,8 @@ function base(file, _a) {
             data: buildFormData({
                 file: {
                     data: file,
-                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename
+                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename,
+                    contentType: contentType
                 },
                 UPLOADCARE_PUB_KEY: publicKey,
                 UPLOADCARE_STORE: getStoreValue(store),
@@ -892,10 +905,11 @@ function isReadyPoll(_a) {
 }
 
 var uploadFromObject = function (file, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, baseCDN = _a.baseCDN, metadata = _a.metadata;
+    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, contentType = _a.contentType, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, baseCDN = _a.baseCDN, metadata = _a.metadata;
     return base(file, {
         publicKey: publicKey,
         fileName: fileName,
+        contentType: contentType,
         baseURL: baseURL,
         secureSignature: secureSignature,
         secureExpire: secureExpire,
@@ -1510,6 +1524,7 @@ function uploadFile(data, _a) {
         return uploadFromObject(data, {
             publicKey: publicKey,
             fileName: fileName,
+            contentType: contentType,
             baseURL: baseURL,
             secureSignature: secureSignature,
             secureExpire: secureExpire,

package/dist/index.js

@@ -144,6 +144,12 @@ function identity(obj) {
     return obj;
 }
 
+const getFileOptions = ({ name, contentType }) => [
+    {
+        filename: name,
+        contentType
+    }
+];
 const transformFile = identity;
 var getFormData = () => new NodeFormData();
 
@@ -189,9 +195,10 @@ const isFileValue = (value) => !!value &&
     isFileData(value.data);
 function collectParams(params, inputKey, inputValue) {
     if (isFileValue(inputValue)) {
-        const name = inputValue.name;
+        const { name, contentType } = inputValue;
         const file = transformFile(inputValue.data); // lgtm [js/superfluous-trailing-arguments]
-        params.push(name ? [inputKey, file, name] : [inputKey, file]);
+        const options = getFileOptions({ name, contentType });
+        params.push([inputKey, file, ...options]);
     }
     else if (isObjectValue(inputValue)) {
         for (const [key, value] of Object.entries(inputValue)) {
@@ -213,9 +220,11 @@ function getFormDataParams(options) {
 }
 function buildFormData(options) {
     const formData = getFormData();
-    const params = getFormDataParams(options);
-    for (const param of params) {
-        formData.append(...param);
+    const paramsList = getFormDataParams(options);
+    for (const params of paramsList) {
+        const [key, value, ...options] = params;
+        // node form-data has another signature for append
+        formData.append(key, value, ...options);
     }
     return formData;
 }
@@ -377,7 +386,7 @@ function getStoreValue(store) {
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
  */
-function base(file, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, metadata }) {
+function base(file, { publicKey, fileName, contentType, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, metadata }) {
     return retryIfThrottled(() => {
         var _a;
         return request({
@@ -391,7 +400,8 @@ function base(file, { publicKey, fileName, baseURL = defaultSettings.baseURL, se
             data: buildFormData({
                 file: {
                     data: file,
-                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename
+                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename,
+                    contentType
                 },
                 UPLOADCARE_PUB_KEY: publicKey,
                 UPLOADCARE_STORE: getStoreValue(store),
@@ -753,10 +763,11 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent,
     });
 }
 
-const uploadFromObject = (file, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN, metadata }) => {
+const uploadFromObject = (file, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, contentType, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN, metadata }) => {
     return base(file, {
         publicKey,
         fileName,
+        contentType,
         baseURL,
         secureSignature,
         secureExpire,
@@ -1324,6 +1335,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
         return uploadFromObject(data, {
             publicKey,
             fileName,
+            contentType,
             baseURL,
             secureSignature,
             secureExpire,

package/dist/types.d.ts

@@ -152,6 +152,7 @@ export declare type BaseOptions = {
 	secureSignature?: string;
 	secureExpire?: string;
 	store?: boolean;
+	contentType?: string;
 	signal?: AbortSignal;
 	onProgress?: ProgressCallback;
 	source?: string;
@@ -160,7 +161,7 @@ export declare type BaseOptions = {
 	retryThrottledRequestMaxTimes?: number;
 	metadata?: Metadata;
 };
-declare function base(file: NodeFile | BrowserFile, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, metadata }: BaseOptions): Promise<BaseResponse>;
+declare function base(file: NodeFile | BrowserFile, { publicKey, fileName, contentType, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, metadata }: BaseOptions): Promise<BaseResponse>;
 declare enum TypeEnum {
 	Token = "token",
 	FileInfo = "file_info"
@@ -332,6 +333,7 @@ export declare type FromObjectOptions = {
 	secureSignature?: string;
 	secureExpire?: string;
 	store?: boolean;
+	contentType?: string;
 	signal?: AbortSignal;
 	onProgress?: ProgressCallback;
 	source?: string;
@@ -341,7 +343,7 @@ export declare type FromObjectOptions = {
 	baseCDN?: string;
 	metadata?: Metadata;
 };
-declare const uploadFromObject: (file: NodeFile | BrowserFile, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN, metadata }: FromObjectOptions) => Promise<UploadcareFile>;
+declare const uploadFromObject: (file: NodeFile | BrowserFile, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, contentType, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN, metadata }: FromObjectOptions) => Promise<UploadcareFile>;
 export declare type UploadFromUrlOptions = {
 	baseCDN?: string;
 	onProgress?: ProgressCallback;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "3.1.1",
+  "version": "3.1.2-alpha.0",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
   "main": "dist/index.cjs",