@uploadcare/upload-client 6.6.1 → 6.7.0

package/dist/esm/index.node.mjs

@@ -426,7 +426,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.6.1';
+var version = '6.7.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -800,6 +800,9 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent,
     });
 }
 
+function isGroupFileInfo(fileInfo) {
+    return 'defaultEffects' in fileInfo;
+}
 class UploadcareFile {
     uuid;
     name = null;
@@ -815,6 +818,7 @@ class UploadcareFile {
     contentInfo = null;
     metadata = null;
     s3Bucket = null;
+    defaultEffects = null;
     constructor(fileInfo, { baseCDN = defaultSettings.baseCDN, fileName } = {}) {
         const { uuid, s3Bucket } = fileInfo;
         const cdnUrl = getUrl(baseCDN, `${uuid}/`);
@@ -835,6 +839,9 @@ class UploadcareFile {
         this.metadata = fileInfo.metadata || null;
         this.s3Bucket = s3Bucket || null;
         this.s3Url = s3Url;
+        if (isGroupFileInfo(fileInfo)) {
+            this.defaultEffects = fileInfo.defaultEffects;
+        }
     }
 }
 
@@ -1513,14 +1520,16 @@ class UploadcareGroup {
     files;
     createdAt;
     storedAt = null;
-    constructor(groupInfo, files) {
+    constructor(groupInfo, { baseCDN = defaultSettings.baseCDN } = {}) {
         this.uuid = groupInfo.id;
         this.filesCount = groupInfo.filesCount;
-        this.totalSize = Object.values(groupInfo.files).reduce((acc, file) => acc + file.size, 0);
+        const groupFiles = groupInfo.files.filter(Boolean);
+        this.totalSize = Object.values(groupFiles).reduce((acc, file) => acc + file.size, 0);
         this.isStored = !!groupInfo.datetimeStored;
-        this.isImage = !!Object.values(groupInfo.files).filter((file) => file.isImage).length;
+        this.isImage = !!Object.values(groupFiles).filter((file) => file.isImage)
+            .length;
         this.cdnUrl = groupInfo.cdnUrl;
-        this.files = files;
+        this.files = groupFiles.map((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
         this.createdAt = groupInfo.datetimeCreated;
         this.storedAt = groupInfo.datetimeStored;
     }
@@ -1578,27 +1587,34 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             onProgress({ isComputable: true, value: normalize(progressValues) });
         };
     };
-    return Promise.all(data.map((file, index) => uploadFile(file, {
-        publicKey,
-        fileName,
-        baseURL,
-        secureSignature,
-        secureExpire,
-        store,
-        signal,
-        onProgress: createProgressHandler(filesCount, index),
-        source,
-        integration,
-        userAgent,
-        retryThrottledRequestMaxTimes,
-        retryNetworkErrorMaxTimes,
-        contentType,
-        multipartChunkSize,
-        baseCDN,
-        checkForUrlDuplicates,
-        saveUrlForRecurrentUploads
-    }))).then((files) => {
-        const uuids = files.map((file) => file.uuid);
+    return Promise.all(data.map((file, index) => {
+        if (isFileData(file) || isUrl(file)) {
+            return uploadFile(file, {
+                publicKey,
+                fileName,
+                baseURL,
+                secureSignature,
+                secureExpire,
+                store,
+                signal,
+                onProgress: createProgressHandler(filesCount, index),
+                source,
+                integration,
+                userAgent,
+                retryThrottledRequestMaxTimes,
+                retryNetworkErrorMaxTimes,
+                contentType,
+                multipartChunkSize,
+                baseCDN,
+                checkForUrlDuplicates,
+                saveUrlForRecurrentUploads
+            }).then((fileInfo) => fileInfo.uuid);
+        }
+        else {
+            // Do not request file info by uuid before creating group because this isn't necessary
+            return file;
+        }
+    })).then((uuids) => {
         return group(uuids, {
             publicKey,
             baseURL,
@@ -1612,7 +1628,7 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             retryThrottledRequestMaxTimes,
             retryNetworkErrorMaxTimes
         })
-            .then((groupInfo) => new UploadcareGroup(groupInfo, files))
+            .then((groupInfo) => new UploadcareGroup(groupInfo, { baseCDN }))
             .then((group) => {
             onProgress && onProgress({ isComputable: true, value: 1 });
             return group;
@@ -1683,32 +1699,32 @@ class UploadClient {
 }
 
 class Queue {
-    #concurrency = 1;
-    #pending = [];
-    #running = 0;
-    #resolvers = new WeakMap();
-    #rejectors = new WeakMap();
+    _concurrency = 1;
+    _pending = [];
+    _running = 0;
+    _resolvers = new Map();
+    _rejectors = new Map();
     constructor(concurrency) {
-        this.#concurrency = concurrency;
+        this._concurrency = concurrency;
     }
-    #run() {
-        const tasksLeft = this.#concurrency - this.#running;
+    _run() {
+        const tasksLeft = this._concurrency - this._running;
         for (let i = 0; i < tasksLeft; i++) {
-            const task = this.#pending.shift();
+            const task = this._pending.shift();
             if (!task) {
                 return;
             }
-            const resolver = this.#resolvers.get(task);
-            const rejector = this.#rejectors.get(task);
+            const resolver = this._resolvers.get(task);
+            const rejector = this._rejectors.get(task);
             if (!resolver || !rejector)
                 throw new Error('Unexpected behavior: resolver or rejector is undefined');
-            this.#running += 1;
+            this._running += 1;
             task()
                 .finally(() => {
-                this.#resolvers.delete(task);
-                this.#rejectors.delete(task);
-                this.#running -= 1;
-                this.#run();
+                this._resolvers.delete(task);
+                this._rejectors.delete(task);
+                this._running -= 1;
+                this._run();
             })
                 .then((value) => resolver(value))
                 .catch((error) => rejector(error));
@@ -1716,24 +1732,24 @@ class Queue {
     }
     add(task) {
         return new Promise((resolve, reject) => {
-            this.#resolvers.set(task, resolve);
-            this.#rejectors.set(task, reject);
-            this.#pending.push(task);
-            this.#run();
+            this._resolvers.set(task, resolve);
+            this._rejectors.set(task, reject);
+            this._pending.push(task);
+            this._run();
         });
     }
     get pending() {
-        return this.#pending.length;
+        return this._pending.length;
     }
     get running() {
-        return this.#running;
+        return this._running;
     }
     set concurrency(value) {
-        this.#concurrency = value;
-        this.#run();
+        this._concurrency = value;
+        this._run();
     }
     get concurrency() {
-        return this.#concurrency;
+        return this._concurrency;
     }
 }
 

package/dist/esm/index.react-native.d.mts

@@ -126,12 +126,15 @@ export type FileInfo = {
 	s3Bucket?: string;
 	metadata?: Metadata;
 };
+export type GroupFileInfo = FileInfo & {
+	defaultEffects: string;
+};
 export type GroupInfo = {
 	datetimeCreated: string;
 	datetimeStored: string | null;
 	filesCount: string;
 	cdnUrl: string;
-	files: FileInfo[];
+	files: (GroupFileInfo | null)[];
 	url: string;
 	id: GroupId;
 };
@@ -347,7 +350,8 @@ export declare class UploadcareFile {
 	readonly contentInfo: null | ContentInfo;
 	readonly metadata: null | Metadata;
 	readonly s3Bucket: null | string;
-	constructor(fileInfo: FileInfo, { baseCDN, fileName }?: {
+	readonly defaultEffects: null | string;
+	constructor(fileInfo: FileInfo | GroupFileInfo, { baseCDN, fileName }?: {
 		baseCDN?: string;
 		fileName?: string;
 	});
@@ -449,7 +453,9 @@ export declare class UploadcareGroup {
 	readonly files: UploadcareFile[];
 	readonly createdAt: string;
 	readonly storedAt: string | null;
-	constructor(groupInfo: GroupInfo, files: UploadcareFile[]);
+	constructor(groupInfo: GroupInfo, { baseCDN }?: {
+		baseCDN?: string;
+	});
 }
 export type GroupFromOptions = {
 	jsonpCallback?: string;
@@ -474,8 +480,13 @@ export declare class UploadClient {
 }
 export type Task<T = unknown> = () => Promise<T>;
 export declare class Queue {
-	#private;
+	private _concurrency;
+	private _pending;
+	private _running;
+	private _resolvers;
+	private _rejectors;
 	constructor(concurrency: number);
+	private _run;
 	add<T>(task: Task<T>): Promise<T>;
 	get pending(): number;
 	get running(): number;

package/dist/esm/index.react-native.mjs

@@ -403,7 +403,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.6.1';
+var version = '6.7.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -777,6 +777,9 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent,
     });
 }
 
+function isGroupFileInfo(fileInfo) {
+    return 'defaultEffects' in fileInfo;
+}
 class UploadcareFile {
     uuid;
     name = null;
@@ -792,6 +795,7 @@ class UploadcareFile {
     contentInfo = null;
     metadata = null;
     s3Bucket = null;
+    defaultEffects = null;
     constructor(fileInfo, { baseCDN = defaultSettings.baseCDN, fileName } = {}) {
         const { uuid, s3Bucket } = fileInfo;
         const cdnUrl = getUrl(baseCDN, `${uuid}/`);
@@ -812,6 +816,9 @@ class UploadcareFile {
         this.metadata = fileInfo.metadata || null;
         this.s3Bucket = s3Bucket || null;
         this.s3Url = s3Url;
+        if (isGroupFileInfo(fileInfo)) {
+            this.defaultEffects = fileInfo.defaultEffects;
+        }
     }
 }
 
@@ -1509,14 +1516,16 @@ class UploadcareGroup {
     files;
     createdAt;
     storedAt = null;
-    constructor(groupInfo, files) {
+    constructor(groupInfo, { baseCDN = defaultSettings.baseCDN } = {}) {
         this.uuid = groupInfo.id;
         this.filesCount = groupInfo.filesCount;
-        this.totalSize = Object.values(groupInfo.files).reduce((acc, file) => acc + file.size, 0);
+        const groupFiles = groupInfo.files.filter(Boolean);
+        this.totalSize = Object.values(groupFiles).reduce((acc, file) => acc + file.size, 0);
         this.isStored = !!groupInfo.datetimeStored;
-        this.isImage = !!Object.values(groupInfo.files).filter((file) => file.isImage).length;
+        this.isImage = !!Object.values(groupFiles).filter((file) => file.isImage)
+            .length;
         this.cdnUrl = groupInfo.cdnUrl;
-        this.files = files;
+        this.files = groupFiles.map((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
         this.createdAt = groupInfo.datetimeCreated;
         this.storedAt = groupInfo.datetimeStored;
     }
@@ -1574,27 +1583,34 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             onProgress({ isComputable: true, value: normalize(progressValues) });
         };
     };
-    return Promise.all(data.map((file, index) => uploadFile(file, {
-        publicKey,
-        fileName,
-        baseURL,
-        secureSignature,
-        secureExpire,
-        store,
-        signal,
-        onProgress: createProgressHandler(filesCount, index),
-        source,
-        integration,
-        userAgent,
-        retryThrottledRequestMaxTimes,
-        retryNetworkErrorMaxTimes,
-        contentType,
-        multipartChunkSize,
-        baseCDN,
-        checkForUrlDuplicates,
-        saveUrlForRecurrentUploads
-    }))).then((files) => {
-        const uuids = files.map((file) => file.uuid);
+    return Promise.all(data.map((file, index) => {
+        if (isFileData(file) || isUrl(file)) {
+            return uploadFile(file, {
+                publicKey,
+                fileName,
+                baseURL,
+                secureSignature,
+                secureExpire,
+                store,
+                signal,
+                onProgress: createProgressHandler(filesCount, index),
+                source,
+                integration,
+                userAgent,
+                retryThrottledRequestMaxTimes,
+                retryNetworkErrorMaxTimes,
+                contentType,
+                multipartChunkSize,
+                baseCDN,
+                checkForUrlDuplicates,
+                saveUrlForRecurrentUploads
+            }).then((fileInfo) => fileInfo.uuid);
+        }
+        else {
+            // Do not request file info by uuid before creating group because this isn't necessary
+            return file;
+        }
+    })).then((uuids) => {
         return group(uuids, {
             publicKey,
             baseURL,
@@ -1608,7 +1624,7 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             retryThrottledRequestMaxTimes,
             retryNetworkErrorMaxTimes
         })
-            .then((groupInfo) => new UploadcareGroup(groupInfo, files))
+            .then((groupInfo) => new UploadcareGroup(groupInfo, { baseCDN }))
             .then((group) => {
             onProgress && onProgress({ isComputable: true, value: 1 });
             return group;
@@ -1679,32 +1695,32 @@ class UploadClient {
 }
 
 class Queue {
-    #concurrency = 1;
-    #pending = [];
-    #running = 0;
-    #resolvers = new WeakMap();
-    #rejectors = new WeakMap();
+    _concurrency = 1;
+    _pending = [];
+    _running = 0;
+    _resolvers = new Map();
+    _rejectors = new Map();
     constructor(concurrency) {
-        this.#concurrency = concurrency;
+        this._concurrency = concurrency;
     }
-    #run() {
-        const tasksLeft = this.#concurrency - this.#running;
+    _run() {
+        const tasksLeft = this._concurrency - this._running;
         for (let i = 0; i < tasksLeft; i++) {
-            const task = this.#pending.shift();
+            const task = this._pending.shift();
             if (!task) {
                 return;
             }
-            const resolver = this.#resolvers.get(task);
-            const rejector = this.#rejectors.get(task);
+            const resolver = this._resolvers.get(task);
+            const rejector = this._rejectors.get(task);
             if (!resolver || !rejector)
                 throw new Error('Unexpected behavior: resolver or rejector is undefined');
-            this.#running += 1;
+            this._running += 1;
             task()
                 .finally(() => {
-                this.#resolvers.delete(task);
-                this.#rejectors.delete(task);
-                this.#running -= 1;
-                this.#run();
+                this._resolvers.delete(task);
+                this._rejectors.delete(task);
+                this._running -= 1;
+                this._run();
             })
                 .then((value) => resolver(value))
                 .catch((error) => rejector(error));
@@ -1712,24 +1728,24 @@ class Queue {
     }
     add(task) {
         return new Promise((resolve, reject) => {
-            this.#resolvers.set(task, resolve);
-            this.#rejectors.set(task, reject);
-            this.#pending.push(task);
-            this.#run();
+            this._resolvers.set(task, resolve);
+            this._rejectors.set(task, reject);
+            this._pending.push(task);
+            this._run();
         });
     }
     get pending() {
-        return this.#pending.length;
+        return this._pending.length;
     }
     get running() {
-        return this.#running;
+        return this._running;
     }
     set concurrency(value) {
-        this.#concurrency = value;
-        this.#run();
+        this._concurrency = value;
+        this._run();
     }
     get concurrency() {
-        return this.#concurrency;
+        return this._concurrency;
     }
 }
 

package/dist/index.d.ts

@@ -126,12 +126,15 @@ export type FileInfo = {
 	s3Bucket?: string;
 	metadata?: Metadata;
 };
+export type GroupFileInfo = FileInfo & {
+	defaultEffects: string;
+};
 export type GroupInfo = {
 	datetimeCreated: string;
 	datetimeStored: string | null;
 	filesCount: string;
 	cdnUrl: string;
-	files: FileInfo[];
+	files: (GroupFileInfo | null)[];
 	url: string;
 	id: GroupId;
 };
@@ -347,7 +350,8 @@ export declare class UploadcareFile {
 	readonly contentInfo: null | ContentInfo;
 	readonly metadata: null | Metadata;
 	readonly s3Bucket: null | string;
-	constructor(fileInfo: FileInfo, { baseCDN, fileName }?: {
+	readonly defaultEffects: null | string;
+	constructor(fileInfo: FileInfo | GroupFileInfo, { baseCDN, fileName }?: {
 		baseCDN?: string;
 		fileName?: string;
 	});
@@ -449,7 +453,9 @@ export declare class UploadcareGroup {
 	readonly files: UploadcareFile[];
 	readonly createdAt: string;
 	readonly storedAt: string | null;
-	constructor(groupInfo: GroupInfo, files: UploadcareFile[]);
+	constructor(groupInfo: GroupInfo, { baseCDN }?: {
+		baseCDN?: string;
+	});
 }
 export type GroupFromOptions = {
 	jsonpCallback?: string;
@@ -474,8 +480,13 @@ export declare class UploadClient {
 }
 export type Task<T = unknown> = () => Promise<T>;
 export declare class Queue {
-	#private;
+	private _concurrency;
+	private _pending;
+	private _running;
+	private _resolvers;
+	private _rejectors;
 	constructor(concurrency: number);
+	private _run;
 	add<T>(task: Task<T>): Promise<T>;
 	get pending(): number;
 	get running(): number;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "6.6.1",
+  "version": "6.7.0",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
   "module": "./dist/esm/index.node.mjs",
   "browser": "./dist/esm/index.browser.mjs",
-  "react-native": "./dist/index.react-native.js",
+  "react-native": "./dist/index.react-native.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
@@ -90,7 +90,7 @@
     "koa-body": "5.0.0",
     "mock-socket": "9.0.3",
     "start-server-and-test": "1.14.0",
-    "@uploadcare/api-client-utils": "^6.6.1",
+    "@uploadcare/api-client-utils": "^6.7.0",
     "chalk": "^4.1.2"
   },
   "dependencies": {