@uploadcare/upload-client 4.0.1 → 4.2.1

package/dist/index.react-native.js

@@ -29,7 +29,7 @@ const onCancel = (signal, callback) => {
 
 const request = ({ method, url, data, headers = {}, signal, onProgress }) => new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
-    const requestMethod = (method === null || method === void 0 ? void 0 : method.toUpperCase()) || 'GET';
+    const requestMethod = method?.toUpperCase() || 'GET';
     let aborted = false;
     xhr.open(requestMethod, url);
     if (headers) {
@@ -200,34 +200,36 @@ function buildFormData(options) {
     return formData;
 }
 
-const serializePair = (key, value) => typeof value !== 'undefined' ? `${key}=${encodeURIComponent(value)}` : null;
-// TODO: generalize value transforming logic and use it here and inside `buildFormData`
-const createQuery = (query) => Object.entries(query)
-    .reduce((params, [key, value]) => {
-    let param;
-    if (typeof value === 'object' && !Array.isArray(value)) {
-        param = Object.entries(value)
-            .filter((entry) => typeof entry[1] !== 'undefined')
-            .map((entry) => serializePair(`${key}[${entry[0]}]`, String(entry[1])));
-    }
-    else if (Array.isArray(value)) {
-        param = value.map((val) => serializePair(`${key}[]`, val));
+const buildSearchParams = (query) => {
+    const searchParams = new URLSearchParams();
+    for (const [key, value] of Object.entries(query)) {
+        if (value && typeof value === 'object' && !Array.isArray(value)) {
+            Object.entries(value)
+                .filter((entry) => entry[1] ?? false)
+                .forEach((entry) => searchParams.set(`${key}[${entry[0]}]`, String(entry[1])));
+        }
+        else if (Array.isArray(value)) {
+            value.forEach((val) => {
+                searchParams.append(`${key}[]`, val);
+            });
+        }
+        else if (typeof value === 'string' && value) {
+            searchParams.set(key, value);
+        }
+        else if (typeof value === 'number') {
+            searchParams.set(key, value.toString());
+        }
     }
-    else {
-        param = serializePair(key, value);
+    return searchParams.toString();
+};
+const getUrl = (base, path, query) => {
+    const url = new URL(base);
+    url.pathname = path;
+    if (query) {
+        url.search = buildSearchParams(query);
     }
-    return params.concat(param);
-}, [])
-    .filter((x) => !!x)
-    .join('&');
-const getUrl = (base, path, query) => [
-    base,
-    path,
-    query && Object.keys(query).length > 0 ? '?' : '',
-    query && createQuery(query)
-]
-    .filter(Boolean)
-    .join('');
+    return url.toString();
+};
 
 /*
   Settings for future support:
@@ -249,14 +251,59 @@ const defaultSettings = {
 const defaultContentType = 'application/octet-stream';
 const defaultFilename = 'original';
 
-var version = '4.0.1';
+var version = '4.2.1';
+
+function isObject(o) {
+    return Object.prototype.toString.call(o) === '[object Object]';
+}
+
+const SEPARATOR = /\W|_/g;
+function camelizeString(text) {
+    return text
+        .split(SEPARATOR)
+        .map((word, index) => word.charAt(0)[index > 0 ? 'toUpperCase' : 'toLowerCase']() +
+        word.slice(1))
+        .join('');
+}
+function camelizeArrayItems(array, { ignoreKeys } = { ignoreKeys: [] }) {
+    if (!Array.isArray(array)) {
+        return array;
+    }
+    return array.map((item) => camelizeKeys(item, { ignoreKeys }));
+}
+function camelizeKeys(source, { ignoreKeys } = { ignoreKeys: [] }) {
+    if (Array.isArray(source)) {
+        return camelizeArrayItems(source, { ignoreKeys });
+    }
+    if (!isObject(source)) {
+        return source;
+    }
+    const result = {};
+    for (const key of Object.keys(source)) {
+        let value = source[key];
+        if (ignoreKeys.includes(key)) {
+            result[key] = value;
+            continue;
+        }
+        if (isObject(value)) {
+            value = camelizeKeys(value, { ignoreKeys });
+        }
+        else if (Array.isArray(value)) {
+            value = camelizeArrayItems(value, { ignoreKeys });
+        }
+        result[camelizeString(key)] = value;
+    }
+    return result;
+}
 
 /**
- * Returns User Agent based on version and settings.
+ * setTimeout as Promise.
+ *
+ * @param {number} ms Timeout in milliseconds.
  */
-function getUserAgent({ userAgent, publicKey = '', integration = '' } = {}) {
-    const libraryName = 'UploadcareUploadClient';
-    const libraryVersion = version;
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+function getUserAgent$1({ libraryName, libraryVersion, userAgent, publicKey = '', integration = '' }) {
     const languageName = 'JavaScript';
     if (typeof userAgent === 'string') {
         return userAgent;
@@ -277,39 +324,6 @@ function getUserAgent({ userAgent, publicKey = '', integration = '' } = {}) {
     return `${mainInfo} (${additionInfo})`;
 }
 
-const SEPARATOR = /\W|_/g;
-/**
- * Transforms a string to camelCased.
- */
-function camelize(text) {
-    return text
-        .split(SEPARATOR)
-        .map((word, index) => word.charAt(0)[index > 0 ? 'toUpperCase' : 'toLowerCase']() +
-        word.slice(1))
-        .join('');
-}
-/**
- * Transforms keys of an object to camelCased recursively.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function camelizeKeys(source) {
-    if (!source || typeof source !== 'object') {
-        return source;
-    }
-    return Object.keys(source).reduce((accumulator, key) => {
-        accumulator[camelize(key)] =
-            typeof source[key] === 'object' ? camelizeKeys(source[key]) : source[key];
-        return accumulator;
-    }, {});
-}
-
-/**
- * setTimeout as Promise.
- *
- * @param {number} ms Timeout in milliseconds.
- */
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-
 const defaultOptions = {
     factor: 2,
     time: 100
@@ -317,8 +331,8 @@ const defaultOptions = {
 function retrier(fn, options = defaultOptions) {
     let attempts = 0;
     function runAttempt(fn) {
-        const defaultDelayTime = Math.round(options.time * Math.pow(options.factor, attempts));
-        const retry = (ms) => delay(ms !== null && ms !== void 0 ? ms : defaultDelayTime).then(() => {
+        const defaultDelayTime = Math.round(options.time * options.factor ** attempts);
+        const retry = (ms) => delay(ms ?? defaultDelayTime).then(() => {
             attempts += 1;
             return runAttempt(fn);
         });
@@ -330,6 +344,16 @@ function retrier(fn, options = defaultOptions) {
     return runAttempt(fn);
 }
 
+const LIBRARY_NAME = 'UploadcareUploadClient';
+const LIBRARY_VERSION = version;
+function getUserAgent(options) {
+    return getUserAgent$1({
+        libraryName: LIBRARY_NAME,
+        libraryVersion: LIBRARY_VERSION,
+        ...options
+    });
+}
+
 const REQUEST_WAS_THROTTLED_CODE = 'RequestThrottledError';
 const DEFAULT_RETRY_AFTER_TIMEOUT = 15000;
 function getTimeoutFromThrottledRequest(error) {
@@ -341,7 +365,7 @@ function getTimeoutFromThrottledRequest(error) {
 function retryIfThrottled(fn, retryThrottledMaxTimes) {
     return retrier(({ attempt, retry }) => fn().catch((error) => {
         if ('response' in error &&
-            (error === null || error === void 0 ? void 0 : error.code) === REQUEST_WAS_THROTTLED_CODE &&
+            error?.code === REQUEST_WAS_THROTTLED_CODE &&
             attempt < retryThrottledMaxTimes) {
             return retry(getTimeoutFromThrottledRequest(error));
         }
@@ -358,41 +382,38 @@ function getStoreValue(store) {
  * Can be canceled and has progress.
  */
 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({
-            method: 'POST',
-            url: getUrl(baseURL, '/base/', {
-                jsonerrors: 1
-            }),
-            headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
+    return retryIfThrottled(() => request({
+        method: 'POST',
+        url: getUrl(baseURL, '/base/', {
+            jsonerrors: 1
+        }),
+        headers: {
+            'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
+        },
+        data: buildFormData({
+            file: {
+                data: file,
+                name: fileName ?? file.name ?? defaultFilename,
+                contentType
             },
-            data: buildFormData({
-                file: {
-                    data: file,
-                    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),
-                signature: secureSignature,
-                expire: secureExpire,
-                source: source,
-                metadata
-            }),
-            signal,
-            onProgress
-        }).then(({ data, headers, request }) => {
-            const response = camelizeKeys(JSON.parse(data));
-            if ('error' in response) {
-                throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
-            }
-            else {
-                return response;
-            }
-        });
-    }, retryThrottledRequestMaxTimes);
+            UPLOADCARE_PUB_KEY: publicKey,
+            UPLOADCARE_STORE: getStoreValue(store),
+            signature: secureSignature,
+            expire: secureExpire,
+            source: source,
+            metadata
+        }),
+        signal,
+        onProgress
+    }).then(({ data, headers, request }) => {
+        const response = camelizeKeys(JSON.parse(data));
+        if ('error' in response) {
+            throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
+        }
+        else {
+            return response;
+        }
+    }), retryThrottledRequestMaxTimes);
 }
 
 var TypeEnum;
@@ -571,9 +592,9 @@ function multipartStart(size, { publicKey, contentType, fileName, multipartChunk
             'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
         },
         data: buildFormData({
-            filename: fileName !== null && fileName !== void 0 ? fileName : defaultFilename,
+            filename: fileName ?? defaultFilename,
             size: size,
-            content_type: contentType !== null && contentType !== void 0 ? contentType : defaultContentType,
+            content_type: contentType ?? defaultContentType,
             part_size: multipartChunkSize,
             UPLOADCARE_STORE: getStoreValue(store),
             UPLOADCARE_PUB_KEY: publicKey,
@@ -675,9 +696,9 @@ class UploadcareFile {
         this.mimeType = fileInfo.mimeType;
         this.cdnUrl = cdnUrl;
         this.originalFilename = fileInfo.originalFilename;
-        this.imageInfo = camelizeKeys(fileInfo.imageInfo);
-        this.videoInfo = camelizeKeys(fileInfo.videoInfo);
-        this.contentInfo = camelizeKeys(fileInfo.contentInfo);
+        this.imageInfo = fileInfo.imageInfo;
+        this.videoInfo = fileInfo.videoInfo;
+        this.contentInfo = fileInfo.contentInfo;
         this.metadata = fileInfo.metadata || null;
         this.s3Bucket = s3Bucket || null;
         this.s3Url = s3Url;
@@ -805,8 +826,7 @@ class Events {
         this.events = Object.create({});
     }
     emit(event, data) {
-        var _a;
-        (_a = this.events[event]) === null || _a === void 0 ? void 0 : _a.forEach((fn) => fn(data));
+        this.events[event]?.forEach((fn) => fn(data));
     }
     on(event, callback) {
         this.events[event] = this.events[event] || [];
@@ -824,12 +844,12 @@ class Events {
 
 const response = (type, data) => {
     if (type === 'success') {
-        return Object.assign({ status: Status.Success }, data);
+        return { status: Status.Success, ...data };
     }
     if (type === 'progress') {
-        return Object.assign({ status: Status.Progress }, data);
+        return { status: Status.Progress, ...data };
     }
-    return Object.assign({ status: Status.Error }, data);
+    return { status: Status.Error, ...data };
 };
 class Pusher {
     constructor(pusherKey, disconnectTime = 30000) {
@@ -877,8 +897,7 @@ class Pusher {
     }
     disconnect() {
         const actualDisconect = () => {
-            var _a;
-            (_a = this.ws) === null || _a === void 0 ? void 0 : _a.close();
+            this.ws?.close();
             this.ws = undefined;
             this.isConnected = false;
         };
@@ -892,9 +911,8 @@ class Pusher {
         }
     }
     send(event, data) {
-        var _a;
         const str = JSON.stringify({ event, data });
-        (_a = this.ws) === null || _a === void 0 ? void 0 : _a.send(str);
+        this.ws?.send(str);
     }
     subscribe(token, handler) {
         this.subscribers += 1;
@@ -1061,7 +1079,7 @@ const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, check
 }))
     .catch((error) => {
     const pusher = getPusher(pusherKey);
-    pusher === null || pusher === void 0 ? void 0 : pusher.disconnect();
+    pusher?.disconnect();
     return Promise.reject(error);
 })
     .then((urlResponse) => {
@@ -1154,7 +1172,7 @@ const sliceChunk = (file, index, fileSize, chunkSize) => {
  * being deallocated until uploading complete. Access to deallocated blob
  * causes app crash.
  *
- * See https://github.com/uploadcare/uploadcare-upload-client/issues/306
+ * See https://github.com/uploadcare/uploadcare-js-api-clients/issues/306
  * and https://github.com/facebook/react-native/issues/27543
  */
 function prepareChunks(file, fileSize, chunkSize) {
@@ -1234,7 +1252,7 @@ const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureS
     return multipartStart(size, {
         publicKey,
         contentType,
-        fileName: fileName !== null && fileName !== void 0 ? fileName : file.name,
+        fileName: fileName ?? file.name,
         baseURL,
         secureSignature,
         secureExpire,
@@ -1486,7 +1504,10 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
 /**
  * Populate options with settings.
  */
-const populateOptionsWithSettings = (options, settings) => (Object.assign(Object.assign({}, settings), options));
+const populateOptionsWithSettings = (options, settings) => ({
+    ...settings,
+    ...options
+});
 class UploadClient {
     constructor(settings) {
         this.settings = Object.assign({}, defaultSettings, settings);

package/dist/types.d.ts

@@ -1,7 +1,16 @@
-// Generated by dts-bundle-generator v6.9.0
+// Generated by dts-bundle-generator v6.12.0
 
 import NodeFormData from 'form-data';
 
+export declare type CustomUserAgentOptions = {
+	publicKey: string;
+	libraryName: string;
+	libraryVersion: string;
+	languageName: string;
+	integration?: string;
+};
+export declare type CustomUserAgentFn = (options: CustomUserAgentOptions) => string;
+export declare type CustomUserAgent = string | CustomUserAgentFn;
 export declare type GeoLocation = {
 	latitude: number;
 	longitude: number;
@@ -39,16 +48,15 @@ export declare type VideoInfo = {
 		codec: string;
 	};
 };
+export declare type MimeInfo = {
+	mime: string;
+	type: string;
+	subtype: string;
+};
 export declare type ContentInfo = {
-	content_info: {
-		mime?: {
-			mime: string;
-			type: string;
-			subtype: string;
-		};
-		image?: ImageInfo;
-		video?: VideoInfo;
-	};
+	mime?: MimeInfo;
+	image?: ImageInfo;
+	video?: VideoInfo;
 };
 export declare type FileInfo = {
 	size: number;
@@ -92,42 +100,6 @@ export declare type ProgressCallback<T = ComputableProgressInfo | UnknownProgres
 export declare type Metadata = {
 	[key: string]: string;
 };
-export interface DefaultSettings {
-	baseCDN: string;
-	baseURL: string;
-	maxContentLength: number;
-	retryThrottledRequestMaxTimes: number;
-	multipartMinFileSize: number;
-	multipartChunkSize: number;
-	multipartMinLastPartSize: number;
-	maxConcurrentRequests: number;
-	multipartMaxAttempts: number;
-	pollingTimeoutMilliseconds: number;
-	pusherKey: string;
-}
-export interface Settings extends Partial<DefaultSettings> {
-	publicKey: string;
-	fileName?: string;
-	contentType?: string;
-	store?: boolean;
-	secureSignature?: string;
-	secureExpire?: string;
-	integration?: string;
-	userAgent?: CustomUserAgent;
-	checkForUrlDuplicates?: boolean;
-	saveUrlForRecurrentUploads?: boolean;
-	source?: string;
-	jsonpCallback?: string;
-}
-export declare type CustomUserAgentOptions = {
-	publicKey: string;
-	libraryName: string;
-	libraryVersion: string;
-	languageName: string;
-	integration?: string;
-};
-export declare type CustomUserAgentFn = (options: CustomUserAgentOptions) => string;
-export declare type CustomUserAgent = string | CustomUserAgentFn;
 export declare type Headers = {
 	[key: string]: string | string[] | undefined;
 };
@@ -454,6 +426,33 @@ export declare type GroupFromOptions = {
 	jsonpCallback?: string;
 };
 export function uploadFileGroup(data: (NodeFile | BrowserFile)[] | Url[] | Uuid[], { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, contentType, multipartChunkSize, baseCDN, jsonpCallback }: FileFromOptions & GroupFromOptions): Promise<UploadcareGroup>;
+export interface DefaultSettings {
+	baseCDN: string;
+	baseURL: string;
+	maxContentLength: number;
+	retryThrottledRequestMaxTimes: number;
+	multipartMinFileSize: number;
+	multipartChunkSize: number;
+	multipartMinLastPartSize: number;
+	maxConcurrentRequests: number;
+	multipartMaxAttempts: number;
+	pollingTimeoutMilliseconds: number;
+	pusherKey: string;
+}
+export interface Settings extends Partial<DefaultSettings> {
+	publicKey: string;
+	fileName?: string;
+	contentType?: string;
+	store?: boolean;
+	secureSignature?: string;
+	secureExpire?: string;
+	integration?: string;
+	userAgent?: CustomUserAgent;
+	checkForUrlDuplicates?: boolean;
+	saveUrlForRecurrentUploads?: boolean;
+	source?: string;
+	jsonpCallback?: string;
+}
 export declare class UploadClient {
 	private settings;
 	constructor(settings: Settings);

package/package.json

@@ -1,41 +1,46 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "4.0.1",
+  "version": "4.2.1",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
-  "main": "dist/index.node.js",
-  "module": "dist/index.node.js",
-  "browser": "dist/index.browser.js",
-  "react-native": "dist/index.react-native.js",
-  "types": "dist/types.d.ts",
+  "main": "./dist/index.node.js",
+  "module": "./dist/index.node.js",
+  "browser": "./dist/index.browser.js",
+  "react-native": "./dist/index.react-native.js",
+  "types": "./dist/types.d.ts",
+  "exports": {
+    ".": {
+      "node": "./dist/index.node.js",
+      "browser": "./dist/index.browser.js"
+    }
+  },
   "sideEffects": false,
-  "files": [
-    "dist/*"
-  ],
+  "files": ["dist/*", "README.md", "LICENSE"],
+  "engines": {
+    "node": ">=16"
+  },
   "scripts": {
-    "check-env-vars": "node ./checkvars.js",
-    "mock:start": "node --loader ts-node/esm ./mock-server/server.ts --silent",
+    "prepack": "cp ../../LICENSE ./LICENSE",
+    "mock:start": "ts-node-esm --experimentalSpecifierResolution node ./mock-server/server.ts --silent",
     "clean": "rimraf dist",
-    "lint": "eslint ./src ./mock-server --ext=ts",
     "test": "start-server-and-test mock:start :3000 test:jest",
-    "test:production": "npm run check-env-vars && TEST_ENV=production jest",
-    "test:jest": "jest",
+    "test:production": "TEST_ENV=production npm run test:jest",
+    "test:jest": "node --experimental-vm-modules ../../node_modules/jest/bin/jest.js",
     "prebuild": "npm run clean",
     "build": "npm run build:types && npm run build:compile",
     "build:types": "dts-bundle-generator --project tsconfig.dts.json -o dist/types.d.ts src/index.ts",
-    "build:compile": "rollup -c",
-    "release": "shipjs prepare"
+    "build:compile": "rollup -c"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/uploadcare/uploadcare-upload-client.git"
+    "url": "git+https://github.com/uploadcare/uploadcare-js-api-clients.git"
   },
   "author": "Uploadcare",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/uploadcare/uploadcare-upload-client/issues"
+    "url": "https://github.com/uploadcare/uploadcare-js-api-clients/issues"
   },
-  "homepage": "https://github.com/uploadcare/uploadcare-upload-client#readme",
+  "homepage": "https://github.com/uploadcare/uploadcare-js-api-clients#readme",
   "keywords": [
     "uploadcare",
     "file",
@@ -48,43 +53,20 @@
   "devDependencies": {
     "@koa/cors": "3.3.0",
     "@koa/router": "10.1.1",
-    "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "@rollup/plugin-typescript": "^8.3.2",
     "@types/express-serve-static-core": "^4.17.28",
-    "@types/form-data": "2.5.0",
-    "@types/jest": "27.0.0",
     "@types/koa": "2.13.4",
-    "@types/node": "17.0.38",
-    "@types/promise": "7.1.30",
     "@types/ws": "8.5.3",
-    "@typescript-eslint/eslint-plugin": "5.27.0",
-    "@typescript-eslint/parser": "5.27.0",
-    "chalk": "4.1.0",
     "data-uri-to-buffer": "3.0.1",
     "dataurl-to-blob": "0.0.1",
-    "dotenv": "8.2.0",
-    "dts-bundle-generator": "6.9.0",
-    "eslint": "8.2.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-prettier": "4.0.0",
-    "jest": "^28.1.0",
     "jest-environment-jsdom": "28.1.0",
     "jest-websocket-mock": "2.3.0",
     "koa": "2.13.4",
     "koa-add-trailing-slashes": "2.0.1",
     "koa-body": "5.0.0",
     "mock-socket": "9.0.3",
-    "prettier": "2.2.1",
-    "prettier-config-standard": "4.0.0",
-    "rimraf": "3.0.2",
-    "rollup": "^2.75.5",
-    "shipjs": "0.24.0",
-    "start-server-and-test": "1.11.7",
-    "ts-jest": "28.0.3",
-    "ts-node": "^10.8.0",
-    "tslib": "^2.4.0",
-    "typescript": "^4.7.2"
+    "start-server-and-test": "1.14.0",
+    "@uploadcare/api-client-utils": "^4.2.1",
+    "chalk": "^4.1.2"
   },
   "dependencies": {
     "form-data": "^4.0.0",