@uploadcare/file-uploader 1.15.0-alpha.12 → 1.15.0-alpha.13

package/blocks/ProgressBar/ProgressBar.js

@@ -1,63 +1,65 @@
+// @ts-check
 import { Block } from '../../abstract/Block.js';
 
 export class ProgressBar extends Block {
   /** @type {Number} */
   _value = 0;
 
+  /** @type {Number} */
+  _prevValue = 0;
+
   /** @type {Boolean} */
   _visible = true;
 
-  init$ = {
-    ...this.init$,
-    width: 0,
-    opacity: 0,
-  };
+  constructor() {
+    super();
+    this.init$ = {
+      ...this.init$,
+      width: 0,
+      opacity: 0,
+    };
+  }
 
   initCallback() {
     super.initCallback();
-    this.defineAccessor('value', (value) => {
-      if (value === undefined || value === null) return;
-      const prevValue = this._value;
-      this._value = value;
-      if (!this._visible) return;
-      if (value === 100) {
-        this.ref.realProgressLine.addEventListener(
-          'transitionend',
-          () => {
-            this.classList.add('uc-progress-bar--hidden');
-            this.ref.realProgressLine.classList.toggle('uc-progress--hidden', true);
-          },
-          {
-            once: true,
-          },
-        );
-      }
 
-      this.ref.fakeProgressLine.classList.toggle('uc-fake-progress--hidden', value !== 0);
+    this.ref.fakeProgressLine.addEventListener('animationiteration', () => {
+      if (this._value === 0) return;
+      this.ref.fakeProgressLine.classList.toggle('uc-fake-progress--hidden', true);
+    });
 
-      if (value === 0 && prevValue > 0) {
-        this.ref.realProgressLine.addEventListener(
-          'transitionend',
-          () => {
-            this.style.setProperty('--l-progress-value', this._value.toString());
-          },
-          {
-            once: true,
-          },
-        );
-        return;
+    this.ref.realProgressLine.addEventListener('transitionend', () => {
+      if (this._value === 100) {
+        this.classList.add('uc-progress-bar--hidden');
+        this.ref.realProgressLine.classList.toggle('uc-progress--hidden', true);
+      }
+      if (this._value === 0 && this._prevValue > 0) {
+        this.style.setProperty('--l-progress-value', this._value.toString());
       }
-
-      this.style.setProperty('--l-progress-value', this._value.toString());
     });
 
-    this.defineAccessor('visible', (visible) => {
-      this._visible = visible;
+    this.defineAccessor(
+      'value',
+      /** @param {number} value */ (value) => {
+        if (value === undefined || value === null) return;
+        this._prevValue = this._value;
+        this._value = value;
 
-      this.classList.toggle('uc-progress-bar--hidden', !visible);
-      this.ref.realProgressLine.classList.toggle('uc-progress--hidden', !visible);
-      this.ref.fakeProgressLine.classList.toggle('uc-fake-progress--hidden', !visible);
-    });
+        if (!this._visible) return;
+        this.style.setProperty('--l-progress-value', this._value.toString());
+      },
+    );
+
+    this.defineAccessor(
+      'visible',
+      /** @param {boolean} visible */ (visible) => {
+        this._visible = visible;
+
+        this.classList.toggle('uc-progress-bar--hidden', !visible);
+        this.ref.realProgressLine.classList.toggle('uc-progress--hidden', !visible);
+        this.ref.fakeProgressLine.classList.toggle('uc-fake-progress--hidden', !visible);
+      },
+    );
   }
 }
 

package/blocks/Range/Range.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Range.d.ts","sourceRoot":"","sources":["Range.js"],"names":[],"mappings":"AAEA;IAqC0C,cAAgB;IApCxD;;;;;MAUE;IAIA,+BAA+B;IAC/B,qCAA4B;CAe/B;;;;8BAjC6B,sBAAsB"}
+{"version":3,"file":"Range.d.ts","sourceRoot":"","sources":["Range.js"],"names":[],"mappings":"AAEA;;IACE;;;;;MAUE;IAIA,+BAA+B;IAC/B,qCAA4B;CAe/B;;;;8BAjC6B,sBAAsB"}

package/blocks/SimpleBtn/SimpleBtn.d.ts

@@ -6,8 +6,8 @@ export class SimpleBtn extends UploaderBlock {
         '*commonProgress': number;
         '*uploadList': never[];
         '*uploadQueue': import("@uploadcare/upload-client").Queue;
-        '*collectionErrors': any[];
-        '*collectionState': import("../../index.js").OutputCollectionState<import("../../index.js").OutputCollectionStatus, "maybe-has-group"> | null;
+        '*collectionErrors': ReturnType<import("../../index.js").OutputErrorCollection>[];
+        '*collectionState': import("../../index.js").OutputCollectionState | null;
         '*groupInfo': import("@uploadcare/upload-client").UploadcareGroup | null;
         '*uploadTrigger': Set<string>;
         '*secureUploadsManager': import("../../abstract/SecureUploadsManager.js").SecureUploadsManager | null;

package/blocks/SimpleBtn/SimpleBtn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleBtn.d.ts","sourceRoot":"","sources":["SimpleBtn.js"],"names":[],"mappings":"AAIA;IAMI;;;;;;;;;;;;;;;;;MAOC;CAoBJ;;;;8BApC6B,iCAAiC"}
+{"version":3,"file":"SimpleBtn.d.ts","sourceRoot":"","sources":["SimpleBtn.js"],"names":[],"mappings":"AAIA;IAMI;;;;;;;+CAmBI,gBACH;mCAGgB,gBAAU;6BAE3B,2BAIO;;wCAGD,wCAA2B;;;;;;MAzBhC;CAoBJ;;;;8BApC6B,iCAAiC"}

package/blocks/SourceBtn/SourceBtn.d.ts

@@ -22,11 +22,8 @@ export class SourceBtn extends UploaderBlock {
         '*commonProgress': number;
         '*uploadList': never[];
         '*uploadQueue': import("@uploadcare/upload-client").Queue;
-        '*collectionErrors': any[]; /**
-         * @private
-         * @type {Record<string, TConfig>}
-         */
-        '*collectionState': import("../../index.js").OutputCollectionState<import("../../index.js").OutputCollectionStatus, "maybe-has-group"> | null;
+        '*collectionErrors': ReturnType<import("../../index.js" /** @type {string | undefined} */).OutputErrorCollection>[];
+        '*collectionState': import("../../index.js").OutputCollectionState | null;
         '*groupInfo': import("@uploadcare/upload-client").UploadcareGroup | null;
         '*uploadTrigger': Set<string>;
         '*secureUploadsManager': import("../../abstract/SecureUploadsManager.js").SecureUploadsManager | null;

package/blocks/SourceBtn/SourceBtn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceBtn.d.ts","sourceRoot":"","sources":["SourceBtn.js"],"names":[],"mappings":"AASA;;;;;;;;;GASG;AAEH;IAEE,iCAAiC;IACjC,MADW,MAAM,GAAG,SAAS,CACZ;IACjB;;;OAGG;IACH,yBAAsB;IAKpB;;;;;;oCATF;;;WAGG;;;;;;;;;;MAUA;IAGH,kBA2DC;IAkBD,kCAAkC;IAClC,yBADY,OAAO,QAGlB;IAED,2BAA2B;IAC3B,cADY,MAAM,WAGjB;IAED,iBAgBC;IAED,2BAA2B;IAC3B,gBADY,MAAM,QAcjB;CACF;;;;sBAtJY;IACZ,IAAQ,EAAE,MAAM,CAAC;IACjB,QAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAY,CAAC,EAAE,MAAM,OAAO,CAAC;IAC7B,cAAkB,CAAC,EAAE,OAAO,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;8BAhB0B,iCAAiC"}
+{"version":3,"file":"SourceBtn.d.ts","sourceRoot":"","sources":["SourceBtn.js"],"names":[],"mappings":"AASA;;;;;;;;;GASG;AAEH;IAEE,iCAAiC;IACjC,MADW,MAAM,GAAG,SAAS,CACZ;IACjB;;;OAGG;IACH,yBAAsB;IAKpB;;;;;;+CAZc,gBACjB,CAAC,iCAAiC;mCAIhC,gBAAU;6BAKJ,2BAGN;;wCAQS,wCACL;;;;;;MANF;IAGH,kBA2DC;IAkBD,kCAAkC;IAClC,yBADY,OAAO,QAGlB;IAED,2BAA2B;IAC3B,cADY,MAAM,WAGjB;IAED,iBAgBC;IAED,2BAA2B;IAC3B,gBADY,MAAM,QAcjB;CACF;;;;sBAtJY;IACR,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;8BAf0B,iCAAiC"}

package/blocks/SourceBtn/SourceBtn.js

@@ -1,9 +1,9 @@
 // @ts-check
-import { UploaderBlock } from '../../abstract/UploaderBlock.js';
 import { ActivityBlock } from '../../abstract/ActivityBlock.js';
-import { ExternalUploadSource, UploadSource, UploadSourceMobile } from '../utils/UploadSource.js';
+import { UploaderBlock } from '../../abstract/UploaderBlock.js';
+import { browserFeatures } from '../../utils/browser-info.js';
 import { CameraSourceTypes } from '../CameraSource/constants.js';
-import { isSupportCapture } from '../utils/supportCapture.js';
+import { ExternalUploadSource, UploadSource, UploadSourceMobile } from '../utils/UploadSource.js';
 
 const L10N_PREFIX = 'src-type-';
 
@@ -55,7 +55,7 @@ export class SourceBtn extends UploaderBlock {
       type: UploadSource.CAMERA,
       activity: ActivityBlock.activities.CAMERA,
       activate: () => {
-        const supportsCapture = isSupportCapture();
+        const supportsCapture = browserFeatures.htmlMediaCapture;
 
         if (supportsCapture) {
           this.api.openSystemDialog({ captureCamera: true });
@@ -75,7 +75,7 @@ export class SourceBtn extends UploaderBlock {
         type: mobileSourceType,
         activity: ActivityBlock.activities.CAMERA,
         activate: () => {
-          const supportsCapture = isSupportCapture();
+          const supportsCapture = browserFeatures.htmlMediaCapture;
           if (supportsCapture) {
             this.api.openSystemDialog({
               captureCamera: true,

package/blocks/SourceList/SourceList.js

@@ -1,8 +1,8 @@
 // @ts-check
 import { Block } from '../../abstract/Block.js';
+import { browserFeatures } from '../../utils/browser-info.js';
 import { stringToArray } from '../../utils/stringToArray.js';
 import { deserializeCsv } from '../utils/comma-separated.js';
-import { isSupportCapture } from '../utils/supportCapture.js';
 
 export class SourceList extends Block {
   initCallback() {
@@ -22,7 +22,7 @@ export class SourceList extends Block {
           return;
         }
 
-        if (srcName === 'camera' && isSupportCapture()) {
+        if (srcName === 'camera' && browserFeatures.htmlMediaCapture) {
           this.subConfigValue('cameraModes', (/** @type {String} */ val) => {
             const cameraModes = deserializeCsv(val);
 

package/blocks/Spinner/Spinner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Spinner.d.ts","sourceRoot":"","sources":["Spinner.js"],"names":[],"mappings":"AAEA;IAGq5B,cAAgB;CAHx3B;;;;8BAFf,sBAAsB"}
+{"version":3,"file":"Spinner.d.ts","sourceRoot":"","sources":["Spinner.js"],"names":[],"mappings":"AAEA;;CAA6C;;;;8BAFf,sBAAsB"}

package/blocks/Thumb/Thumb.d.ts

@@ -1,7 +1,9 @@
 export class Thumb extends UploaderBlock {
+    /** @private */
+    private _entrySubs;
     /**
      * @private
-     * @type {any} TODO: Add types for upload entry
+     * @type {import('../../abstract/uploadEntrySchema.js').UploadEntryTypedData | null}
      */
     private _entry;
     /**
@@ -9,10 +11,21 @@ export class Thumb extends UploaderBlock {
      * @type {IntersectionObserverEntry['boundingClientRect'] | null}
      */
     private _thumbRect;
-    _debouncedGenerateThumb: (() => Promise<void>) & {
-        cancel: () => void;
-    };
     _isIntersecting: boolean;
+    /**
+     * @private
+     * @template {any[]} A
+     * @template {(entry: import('../../abstract/uploadEntrySchema.js').UploadEntryTypedData, ...args: A) => any} T
+     * @param {T} fn
+     * @returns {(...args: A) => ReturnType<T>}
+     */
+    private _withEntry;
+    /**
+     * @template {import('../../abstract/uploadEntrySchema.js').UploadEntryKeys} K
+     * @param {K} prop_
+     * @param {(value: import('../../abstract/uploadEntrySchema.js').UploadEntryData[K]) => void} handler_
+     */
+    _subEntry: (prop_: K, handler_: (value: import("../../abstract/uploadEntrySchema.js").UploadEntryData[K]) => void) => void;
     init$: {
         thumbUrl: string;
         badgeIcon: string;
@@ -20,8 +33,8 @@ export class Thumb extends UploaderBlock {
         '*commonProgress': number;
         '*uploadList': never[];
         '*uploadQueue': import("@uploadcare/upload-client").Queue;
-        '*collectionErrors': any[];
-        '*collectionState': import("../../index.js").OutputCollectionState<import("../../index.js").OutputCollectionStatus, "maybe-has-group"> | null;
+        '*collectionErrors': ReturnType<import("../../index.js").OutputErrorCollection>[];
+        '*collectionState': import("../../index.js").OutputCollectionState | null;
         '*groupInfo': import("@uploadcare/upload-client").UploadcareGroup | null;
         '*uploadTrigger': Set<string>;
         '*secureUploadsManager': import("../../abstract/SecureUploadsManager.js").SecureUploadsManager | null;
@@ -34,6 +47,9 @@ export class Thumb extends UploaderBlock {
     _calculateThumbSize(): number;
     /** @private */
     private _generateThumbnail;
+    _debouncedGenerateThumb: ((...args: any[]) => Promise<void>) & {
+        cancel: () => void;
+    };
     /**
      * @private
      * @param {IntersectionObserverEntry[]} entries

package/blocks/Thumb/Thumb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Thumb.d.ts","sourceRoot":"","sources":["Thumb.js"],"names":[],"mappings":"AAMA;IACE;;;OAGG;IACH,eAAc;IAEd;;;OAGG;IACH,mBAAkB;IAElB;;MAA4E;IAE5E,yBAAwB;IAKtB;;;;;;;;;;;;;;;;;MAKC;IAGH,8BAYC;IAED,eAAe;IACf,2BAqCC;IAED;;;OAGG;IACH,0BAaC;IAqCC,4CAAuG;CAW1G;;;;8BAzJ6B,iCAAiC"}
+{"version":3,"file":"Thumb.d.ts","sourceRoot":"","sources":["Thumb.js"],"names":[],"mappings":"AAQA;IACE,eAAe;IACf,mBAAuB;IAEvB;;;OAGG;IACH,eAAc;IAEd;;;OAGG;IACH,mBAAkB;IAElB,yBAAwB;IAExB;;;;;;OAMG;IACH,mBAYC;IAED;;;;OAIG;IACH,YAAa,OAHF,CAGO,EAAE,UAFT,CAAC,KAAK,EAAE,OAAO,qCAAqC,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,IAE5D,UAgBP;IAKnB;;;;;;;+CAnDI,gBAAU;mCAOf,gBAAQ;6BAAmF,2BACvF;;wCAI0C,wCAC3C;;;;;;MA2CD;IAGH,8BAYC;IAED,eAAe;IACf,2BAuCG;IAEH;;MAA4E;IAE5E;;;OAGG;IACH,0BAaC;IAqCC,4CAAuG;CAY1G;;;;8BA3M6B,iCAAiC"}

package/blocks/Thumb/Thumb.js

@@ -1,3 +1,5 @@
+//@ts-check
+
 import { UploaderBlock } from '../../abstract/UploaderBlock.js';
 import { createCdnUrl, createCdnUrlModifiers, createOriginalUrl } from '../../utils/cdn-utils.js';
 import { fileCssBg } from '../svg-backgrounds/svg-backgrounds.js';
@@ -5,9 +7,12 @@ import { debounce } from '../utils/debounce.js';
 import { generateThumb } from '../utils/resizeImage.js';
 
 export class Thumb extends UploaderBlock {
+  /** @private */
+  _entrySubs = new Set();
+
   /**
    * @private
-   * @type {any} TODO: Add types for upload entry
+   * @type {import('../../abstract/uploadEntrySchema.js').UploadEntryTypedData | null}
    */
   _entry = null;
 
@@ -17,10 +22,52 @@ export class Thumb extends UploaderBlock {
    */
   _thumbRect = null;
 
-  _debouncedGenerateThumb = debounce(this._generateThumbnail.bind(this), 100);
-
   _isIntersecting = false;
 
+  /**
+   * @private
+   * @template {any[]} A
+   * @template {(entry: import('../../abstract/uploadEntrySchema.js').UploadEntryTypedData, ...args: A) => any} T
+   * @param {T} fn
+   * @returns {(...args: A) => ReturnType<T>}
+   */
+  _withEntry(fn) {
+    const wrapperFn = /** @type {(...args: A) => ReturnType<T>} */ (
+      (...args) => {
+        const entry = this._entry;
+        if (!entry) {
+          console.warn('No entry found');
+          return;
+        }
+        return fn(entry, ...args);
+      }
+    );
+    return wrapperFn;
+  }
+
+  /**
+   * @template {import('../../abstract/uploadEntrySchema.js').UploadEntryKeys} K
+   * @param {K} prop_
+   * @param {(value: import('../../abstract/uploadEntrySchema.js').UploadEntryData[K]) => void} handler_
+   */
+  _subEntry = (prop_, handler_) =>
+    this._withEntry(
+      /**
+       * @template {import('../../abstract/uploadEntrySchema.js').UploadEntryKeys} K
+       * @param {import('../../abstract/uploadEntrySchema.js').UploadEntryTypedData} entry
+       * @param {K} prop
+       * @param {(value: import('../../abstract/uploadEntrySchema.js').UploadEntryData[K]) => void} handler
+       */
+      (entry, prop, handler) => {
+        let sub = entry.subscribe(prop, (value) => {
+          if (this.isConnected) {
+            handler(value);
+          }
+        });
+        this._entrySubs.add(sub);
+      },
+    )(prop_, handler_);
+
   constructor() {
     super();
 
@@ -47,19 +94,17 @@ export class Thumb extends UploaderBlock {
   }
 
   /** @private */
-  async _generateThumbnail() {
-    if (!this._entry) {
-      return;
-    }
-    let entry = this._entry;
-
-    if (entry.getValue('fileInfo') && entry.getValue('isImage')) {
-      let size = this._calculateThumbSize();
+  _generateThumbnail = this._withEntry(async (entry) => {
+    const fileInfo = entry.getValue('fileInfo');
+    const isImage = entry.getValue('isImage');
+    const uuid = entry.getValue('uuid');
+    let size = this._calculateThumbSize();
 
+    if (fileInfo && isImage && uuid) {
       let thumbUrl = await this.proxyUrl(
         createCdnUrl(
-          createOriginalUrl(this.cfg.cdnCname, this._entry.getValue('uuid')),
-          createCdnUrlModifiers(entry.getValue('cdnUrlModifiers'), `scale_crop/${size}x${size}/center/-/preview/`),
+          createOriginalUrl(this.cfg.cdnCname, uuid),
+          createCdnUrlModifiers(entry.getValue('cdnUrlModifiers'), `scale_crop/${size}x${size}/center`),
         ),
       );
       let currentThumbUrl = entry.getValue('thumbUrl');
@@ -70,11 +115,15 @@ export class Thumb extends UploaderBlock {
       return;
     }
 
-    if (entry.getValue('file')?.type.includes('image')) {
-      try {
-        let size = this._calculateThumbSize();
+    if (entry.getValue('thumbUrl')) {
+      return;
+    }
+
+    const file = entry.getValue('file');
 
-        let thumbUrl = await generateThumb(entry.getValue('file'), size);
+    if (file?.type.includes('image')) {
+      try {
+        let thumbUrl = await generateThumb(file, size);
         entry.setValue('thumbUrl', thumbUrl);
       } catch (err) {
         let color = window.getComputedStyle(this).getPropertyValue('--uc-muted-foreground');
@@ -84,7 +133,9 @@ export class Thumb extends UploaderBlock {
       let color = window.getComputedStyle(this).getPropertyValue('--uc-muted-foreground');
       entry.setValue('thumbUrl', fileCssBg(color));
     }
-  }
+  });
+
+  _debouncedGenerateThumb = debounce(this._generateThumbnail.bind(this), 100);
 
   /**
    * @private
@@ -118,17 +169,17 @@ export class Thumb extends UploaderBlock {
       this._entry = this.uploadCollection.read(value);
     });
 
-    this._entry?.subscribe('fileInfo', (fileInfo) => {
+    this._subEntry('fileInfo', (fileInfo) => {
       if (fileInfo?.isImage && this._isIntersecting) {
         this._debouncedGenerateThumb();
       }
     });
 
-    this._entry?.subscribe('thumbUrl', (thumbUrl) => {
+    this._subEntry('thumbUrl', (thumbUrl) => {
       this.$.thumbUrl = thumbUrl ? `url(${thumbUrl})` : '';
     });
 
-    this._entry?.subscribe('cdnUrlModifiers', () => {
+    this._subEntry('cdnUrlModifiers', () => {
       if (this._isIntersecting) {
         this._debouncedGenerateThumb();
       }
@@ -148,6 +199,7 @@ export class Thumb extends UploaderBlock {
   disconnectedCallback() {
     super.disconnectedCallback();
 
+    this._entrySubs = new Set();
     this._debouncedGenerateThumb.cancel();
     this._observer?.disconnect();
   }

package/blocks/UploadCtxProvider/EventEmitter.d.ts

@@ -61,9 +61,9 @@ export class EventEmitter {
      */
     private _debugPrint;
     /** @param {import('../../abstract/Block.js').Block} target */
-    bindTarget(target: import('../../abstract/Block.js').Block): void;
+    bindTarget(target: import("../../abstract/Block.js").Block): void;
     /** @param {import('../../abstract/Block.js').Block} target */
-    unbindTarget(target: import('../../abstract/Block.js').Block): void;
+    unbindTarget(target: import("../../abstract/Block.js").Block): void;
     /**
      * @private
      * @template {(typeof EventType)[keyof typeof EventType]} T
@@ -78,30 +78,30 @@ export class EventEmitter {
      * @param {TDebounce extends false | undefined ? unknown : () => unknown} [payload]
      * @param {{ debounce?: TDebounce }} [options]
      */
-    emit<T extends "change" | "file-added" | "file-removed" | "file-upload-start" | "file-upload-progress" | "file-upload-success" | "file-upload-failed" | "file-url-changed" | "modal-open" | "modal-close" | "done-click" | "upload-click" | "activity-change" | "common-upload-start" | "common-upload-progress" | "common-upload-success" | "common-upload-failed" | "group-created", TDebounce extends number | boolean | undefined>(type: T, payload?: (TDebounce extends false | undefined ? unknown : () => unknown) | undefined, { debounce }?: {
-        debounce?: TDebounce | undefined;
-    } | undefined): void;
+    emit<T extends (typeof EventType)[keyof typeof EventType], TDebounce extends boolean | number | undefined>(type: T, payload?: TDebounce extends false | undefined ? unknown : () => unknown, { debounce }?: {
+        debounce?: TDebounce;
+    }): void;
 }
 export type EventPayload = {
-    [EventType.FILE_ADDED]: import('../../index.js').OutputFileEntry<'idle'>;
-    [EventType.FILE_REMOVED]: import('../../index.js').OutputFileEntry<'removed'>;
-    [EventType.FILE_UPLOAD_START]: import('../../index.js').OutputFileEntry<'uploading'>;
-    [EventType.FILE_UPLOAD_PROGRESS]: import('../../index.js').OutputFileEntry<'uploading'>;
-    [EventType.FILE_UPLOAD_SUCCESS]: import('../../index.js').OutputFileEntry<'success'>;
-    [EventType.FILE_UPLOAD_FAILED]: import('../../index.js').OutputFileEntry<'failed'>;
-    [EventType.FILE_URL_CHANGED]: import('../../index.js').OutputFileEntry<'success'>;
+    [EventType.FILE_ADDED]: import("../../index.js").OutputFileEntry<"idle">;
+    [EventType.FILE_REMOVED]: import("../../index.js").OutputFileEntry<"removed">;
+    [EventType.FILE_UPLOAD_START]: import("../../index.js").OutputFileEntry<"uploading">;
+    [EventType.FILE_UPLOAD_PROGRESS]: import("../../index.js").OutputFileEntry<"uploading">;
+    [EventType.FILE_UPLOAD_SUCCESS]: import("../../index.js").OutputFileEntry<"success">;
+    [EventType.FILE_UPLOAD_FAILED]: import("../../index.js").OutputFileEntry<"failed">;
+    [EventType.FILE_URL_CHANGED]: import("../../index.js").OutputFileEntry<"success">;
     [EventType.MODAL_OPEN]: void;
     [EventType.MODAL_CLOSE]: void;
     [EventType.ACTIVITY_CHANGE]: {
-        activity: import('../../abstract/ActivityBlock.js').ActivityType;
+        activity: import("../../abstract/ActivityBlock.js").ActivityType;
     };
     [EventType.UPLOAD_CLICK]: void;
-    [EventType.DONE_CLICK]: import('../../index.js').OutputCollectionState;
-    [EventType.COMMON_UPLOAD_START]: import('../../index.js').OutputCollectionState<'uploading'>;
-    [EventType.COMMON_UPLOAD_PROGRESS]: import('../../index.js').OutputCollectionState<'uploading'>;
-    [EventType.COMMON_UPLOAD_SUCCESS]: import('../../index.js').OutputCollectionState<'success'>;
-    [EventType.COMMON_UPLOAD_FAILED]: import('../../index.js').OutputCollectionState<'failed'>;
-    [EventType.CHANGE]: import('../../index.js').OutputCollectionState;
-    [EventType.GROUP_CREATED]: import('../../index.js').OutputCollectionState<'success', 'has-group'>;
+    [EventType.DONE_CLICK]: import("../../index.js").OutputCollectionState;
+    [EventType.COMMON_UPLOAD_START]: import("../../index.js").OutputCollectionState<"uploading">;
+    [EventType.COMMON_UPLOAD_PROGRESS]: import("../../index.js").OutputCollectionState<"uploading">;
+    [EventType.COMMON_UPLOAD_SUCCESS]: import("../../index.js").OutputCollectionState<"success">;
+    [EventType.COMMON_UPLOAD_FAILED]: import("../../index.js").OutputCollectionState<"failed">;
+    [EventType.CHANGE]: import("../../index.js").OutputCollectionState;
+    [EventType.GROUP_CREATED]: import("../../index.js").OutputCollectionState<"success", "has-group">;
 };
 //# sourceMappingURL=EventEmitter.d.ts.map

package/blocks/UploadCtxProvider/EventEmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventEmitter.d.ts","sourceRoot":"","sources":["EventEmitter.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;GAsBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;IAmBE,uDAAuD;IACvD,kCADsB,OAAO,EAAE,KAAK,IAAI,EAGvC;IArBD;;;OAGG;IACH,sBAA0B;IAE1B;;;OAGG;IACH,iBAAqB;IAErB;;;OAGG;IACH,oBAAmB;IAOnB,8DAA8D;IAC9D,mBADY,OAAO,yBAAyB,EAAE,KAAK,QAGlD;IAED,8DAA8D;IAC9D,qBADY,OAAO,yBAAyB,EAAE,KAAK,QAGlD;IAED;;;;;OAKG;IACH,kBAaC;IAED;;;;;;OAMG;IACH,ifAHiE,OAAO;;yBAkBvE;CACF;2BAtGY;IACZ,CAAK,UAAU,UAAU,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAK,UAAU,YAAY,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAClF,CAAK,UAAU,iBAAiB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;IACzF,CAAK,UAAU,oBAAoB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;IAC5F,CAAK,UAAU,mBAAmB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IACzF,CAAK,UAAU,kBAAkB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;IACvF,CAAK,UAAU,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IACtF,CAAK,UAAU,UAAU,CAAC,EAAE,IAAI,CAAC;IACjC,CAAK,UAAU,WAAW,CAAC,EAAE,IAAI,CAAC;IAClC,CAAK,UAAU,eAAe,CAAC,EAAE;QACjC,QAAc,EAAE,OAAO,iCAAiC,EAAE,YAAY,CAAC;KAClE,CAAC;IACN,CAAK,UAAU,YAAY,CAAC,EAAE,IAAI,CAAC;IACnC,CAAK,UAAU,UAAU,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC;IAC3E,CAAK,UAAU,mBAAmB,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACjG,CAAK,UAAU,sBAAsB,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACpG,CAAK,UAAU,qBAAqB,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACjG,CAAK,UAAU,oBAAoB,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAC/F,CAAK,UAAU,MAAM,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC;IACvE,CAAK,UAAU,aAAa,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;CACnG"}
+{"version":3,"file":"EventEmitter.d.ts","sourceRoot":"","sources":["EventEmitter.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;GAsBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;IAmBE,uDAAuD;IACvD,wBADY,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,EAGvC;IArBD;;;OAGG;IACH,sBAA0B;IAE1B;;;OAGG;IACH,iBAAqB;IAErB;;;OAGG;IACH,oBAAmB;IAOnB,8DAA8D;IAC9D,mBADY,OAAO,yBAAyB,EAAE,KAAK,QAGlD;IAED,8DAA8D;IAC9D,qBADY,OAAO,yBAAyB,EAAE,KAAK,QAGlD;IAED;;;;;OAKG;IACH,kBAaC;IAED;;;;;;OAMG;IACH,KAN0D,CAAC,SAA9C,CAAE,OAAO,SAAS,EAAE,MAAM,OAAO,SAAS,CAAE,EACb,SAAS,SAAvC,OAAO,GAAG,MAAM,GAAG,SAAU,QAChC,CAAC,YACD,SAAS,SAAS,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,OAAO,iBAC7D;QAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,QAiBlC;CACF;2BAtGY;IACZ,CAAK,SAAS,CAAC,UAAU,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAK,SAAS,CAAC,YAAY,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAClF,CAAK,SAAS,CAAC,iBAAiB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;IACzF,CAAK,SAAS,CAAC,oBAAoB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;IAC5F,CAAK,SAAS,CAAC,mBAAmB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IACzF,CAAK,SAAS,CAAC,kBAAkB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;IACvF,CAAK,SAAS,CAAC,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IACtF,CAAK,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC;IACjC,CAAK,SAAS,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC;IAClC,CAAK,SAAS,CAAC,eAAe,CAAC,EAAE;QAC3B,QAAQ,EAAE,OAAO,iCAAiC,EAAE,YAAY,CAAC;KAClE,CAAC;IACN,CAAK,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC;IACnC,CAAK,SAAS,CAAC,UAAU,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC;IAC3E,CAAK,SAAS,CAAC,mBAAmB,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACjG,CAAK,SAAS,CAAC,sBAAsB,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACpG,CAAK,SAAS,CAAC,qBAAqB,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACjG,CAAK,SAAS,CAAC,oBAAoB,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAC/F,CAAK,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC;IACvE,CAAK,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,gBAAgB,EAAE,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;CACnG"}

package/blocks/UploadCtxProvider/UploadCtxProvider.d.ts

@@ -1,7 +1,7 @@
-export type UploadCtxProvider = (new () => {
-    addEventListener<T extends "change" | "file-added" | "file-removed" | "file-upload-start" | "file-upload-progress" | "file-upload-success" | "file-upload-failed" | "file-url-changed" | "modal-open" | "modal-close" | "done-click" | "upload-click" | "activity-change" | "common-upload-start" | "common-upload-progress" | "common-upload-success" | "common-upload-failed" | "group-created">(type: T, listener: (e: CustomEvent<import("./EventEmitter.js").EventPayload[T]>) => void, options?: boolean | AddEventListenerOptions): void;
-    removeEventListener<T_1 extends "change" | "file-added" | "file-removed" | "file-upload-start" | "file-upload-progress" | "file-upload-success" | "file-upload-failed" | "file-url-changed" | "modal-open" | "modal-close" | "done-click" | "upload-click" | "activity-change" | "common-upload-start" | "common-upload-progress" | "common-upload-success" | "common-upload-failed" | "group-created">(type: T_1, listener: (e: CustomEvent<import("./EventEmitter.js").EventPayload[T_1]>) => void, options?: boolean | EventListenerOptions): void;
-} & UploadCtxProviderClass) & Omit<typeof UploadCtxProviderClass, "new">;
+export type UploadCtxProvider = import("../../utils/mixinClass.js").MixinClass<typeof UploadCtxProviderClass, {
+    addEventListener<T extends (typeof import("./EventEmitter.js").EventType)[keyof typeof import("./EventEmitter.js").EventType]>(type: T, listener: (e: CustomEvent<import("./EventEmitter.js").EventPayload[T]>) => void, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<T extends (typeof import("./EventEmitter.js").EventType)[keyof typeof import("./EventEmitter.js").EventType]>(type: T, listener: (e: CustomEvent<import("./EventEmitter.js").EventPayload[T]>) => void, options?: boolean | EventListenerOptions): void;
+}>;
 /**
  * @typedef {import('../../utils/mixinClass.js').MixinClass<
  *   typeof UploadCtxProviderClass,

package/blocks/UploadCtxProvider/UploadCtxProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploadCtxProvider.d.ts","sourceRoot":"","sources":["UploadCtxProvider.js"],"names":[],"mappings":";2dA8BoF,IAAI,YACrE,OAAO,GAAG,uBAAuB,GAC1C,IAAI;oeAKsE,IAAI,YACrE,OAAO,GAAG,oBAAoB,GACvC,IAAI;;AAjBd;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,kDAAoH;AAxCpH;CAcC;;;;8BAhB6B,iCAAiC;0BACrC,mBAAmB"}
+{"version":3,"file":"UploadCtxProvider.d.ts","sourceRoot":"","sources":["UploadCtxProvider.js"],"names":[],"mappings":"gCAuBa,OAAO,2BAA2B,EAAE,UAAU,CAC1D,OAAW,sBAAsB,EACjC;IACM,gBAAgB,CACd,CAAC,SAAS,CAAC,cAAc,mBAAmB,EAAE,SAAS,CAAC,CAAC,MAAM,cAAc,mBAAmB,EAAE,SAAS,CAAC,EAE5G,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,mBAAmB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAC/E,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB,GAC1C,IAAI,CAAC;IACR,mBAAmB,CACjB,CAAC,SAAS,CAAC,cAAc,mBAAmB,EAAE,SAAS,CAAC,CAAC,MAAM,cAAc,mBAAmB,EAAE,SAAS,CAAC,EAE5G,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,mBAAmB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAC/E,OAAO,CAAC,EAAE,OAAO,GAAG,oBAAoB,GACvC,IAAI,CAAC;CACT,CACF;AAnBJ;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,gCAA4C,iBAAiB,CAAuD;AAxCpH;CAcC;;;;8BAhB6B,iCAAiC;0BACrC,mBAAmB"}

package/blocks/UploadList/UploadList.d.ts

@@ -25,8 +25,8 @@ export class UploadList extends UploaderBlock {
         '*commonProgress': number;
         '*uploadList': never[];
         '*uploadQueue': import("@uploadcare/upload-client").Queue;
-        '*collectionErrors': any[];
-        '*collectionState': import("../../types").OutputCollectionState<import("../../types").OutputCollectionStatus, "maybe-has-group"> | null;
+        '*collectionErrors': ReturnType<import("../../types").OutputErrorCollection>[];
+        '*collectionState': import("../../types").OutputCollectionState | null;
         '*groupInfo': import("@uploadcare/upload-client").UploadcareGroup | null;
         '*uploadTrigger': Set<string>;
         '*secureUploadsManager': import("../../abstract/SecureUploadsManager.js").SecureUploadsManager | null;
@@ -49,7 +49,7 @@ export class UploadList extends UploaderBlock {
 export namespace UploadList {
     let template: string;
 }
-export type FilesViewMode = 'grid' | 'list';
+export type FilesViewMode = "grid" | "list";
 export type Summary = {
     total: number;
     succeed: number;

package/blocks/UploadList/UploadList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploadList.d.ts","sourceRoot":"","sources":["UploadList.js"],"names":[],"mappings":"AAMA,+CAA+C;AAE/C;;;;;;;GAOG;AAEH;IAKE,4BAAoD;IAKlD;;;;;;;;;;;;;;;;;;;;;;;;;;MA0BC;IAGH,eAAe;IACf,yCASQ;IAER,eAAe;IACf,4BAuCC;IAED;;;OAGG;IACH,uBAmBC;CAwEF;;;;4BAvMa,MAAM,GAAG,MAAM;sBAGhB;IACZ,KAAS,EAAE,MAAM,CAAC;IAClB,OAAW,EAAE,MAAM,CAAC;IACpB,SAAa,EAAE,MAAM,CAAC;IACtB,MAAU,EAAE,MAAM,CAAC;CAChB;8BAZ0B,iCAAiC"}
+{"version":3,"file":"UploadList.d.ts","sourceRoot":"","sources":["UploadList.js"],"names":[],"mappings":"AAMA,+CAA+C;AAE/C;;;;;;;GAOG;AAEH;IAKE,4BAAoD;IAKlD;;;;;;;;;;;;;;;;+CALwC,aAAU;mCAOhD,aAAQ;6BAGN,2BACL;;wCAMK,wCAAwB;;;;;;MAc3B;IAGH,eAAe;IACf,yCASQ;IAER,eAAe;IACf,4BAuCC;IAED;;;OAGG;IACH,uBAmBC;CAwEF;;;;4BAvMa,MAAM,GAAG,MAAM;sBAGhB;IACR,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;8BAZ0B,iCAAiC"}

package/blocks/svg-backgrounds/svg-backgrounds.d.ts

@@ -3,15 +3,15 @@
  * @param {String} [color2]
  * @returns {String}
  */
-export function checkerboardCssBg(color1?: string | undefined, color2?: string | undefined): string;
+export function checkerboardCssBg(color1?: string, color2?: string): string;
 /**
  * @param {String} [color]
  * @returns {String}
  */
-export function strokesCssBg(color?: string | undefined): string;
+export function strokesCssBg(color?: string): string;
 /**
  * @param {String} [color]
  * @returns {String}
  */
-export function fileCssBg(color?: string | undefined, width?: number, height?: number): string;
+export function fileCssBg(color?: string, width?: number, height?: number): string;
 //# sourceMappingURL=svg-backgrounds.d.ts.map

package/blocks/svg-backgrounds/svg-backgrounds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svg-backgrounds.d.ts","sourceRoot":"","sources":["svg-backgrounds.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,oGAMC;AAED;;;GAGG;AACH,iEAIC;AAED;;;GAGG;AACH,+FAMC"}
+{"version":3,"file":"svg-backgrounds.d.ts","sourceRoot":"","sources":["svg-backgrounds.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,4EAMC;AAED;;;GAGG;AACH,qDAIC;AAED;;;GAGG;AACH,mFAMC"}

package/blocks/themes/uc-basic/svg-sprite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svg-sprite.d.ts","sourceRoot":"","sources":["svg-sprite.js"],"names":[],"mappings":""}
+{"version":3,"file":"svg-sprite.d.ts","sourceRoot":"","sources":["svg-sprite.js"],"names":[],"mappings":"wBAAe,kztBAAkztB"}

package/blocks/utils/UploadSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploadSource.d.ts","sourceRoot":"","sources":["UploadSource.js"],"names":[],"mappings":"AACA;;;;;;;;;;;GAWG;AAEH;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;GAWG;0BAEW,CAAC,mBAAmB,CAAC,CAAC,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"UploadSource.d.ts","sourceRoot":"","sources":["UploadSource.js"],"names":[],"mappings":"AACA;;;;;;;;;;;GAWG;AAEH;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;GAWG;0BAEW,CAAC,OAAO,YAAY,EAAE,MAAM,OAAO,YAAY,CAAC"}

package/blocks/utils/debounce.d.ts

@@ -4,7 +4,9 @@
  * @param {number} wait
  * @returns {T & { cancel: () => void }} }
  */
-export function debounce<T extends (...args: any[]) => any>(callback: T, wait: number): T & {
+export function debounce<T extends {
+    (...args: any[]): any;
+}>(callback: T, wait: number): T & {
     cancel: () => void;
 };
 //# sourceMappingURL=debounce.d.ts.map

package/blocks/utils/debounce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debounce.d.ts","sourceRoot":"","sources":["debounce.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,6CAL0B,GAAG,EAAE,KAAG,GAAG,qBAE1B,MAAM;YACU,MAAM,IAAI;EAepC"}
+{"version":3,"file":"debounce.d.ts","sourceRoot":"","sources":["debounce.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,yBALyC,CAAC,SAA7B;IAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;CAAG,YAC7B,CAAC,QACD,MAAM,GACJ,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAetC"}

package/blocks/utils/resizeImage.d.ts

@@ -2,5 +2,5 @@
  * @param {File} imgFile
  * @param {Number} [size]
  */
-export function generateThumb(imgFile: File, size?: number | undefined): string | Promise<any>;
+export function generateThumb(imgFile: File, size?: number): string | Promise<any>;
 //# sourceMappingURL=resizeImage.d.ts.map

package/blocks/utils/resizeImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resizeImage.d.ts","sourceRoot":"","sources":["resizeImage.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH,uCAHW,IAAI,oDAsCd"}
+{"version":3,"file":"resizeImage.d.ts","sourceRoot":"","sources":["resizeImage.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH,uCAHW,IAAI,wCAsCd"}