feat: pass output entry to the metadata callback

uploadcare · Oct 26, 2023 · 9153826 · 9153826
1 parent 9e4707f
commit 9153826
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/abstract/UploaderBlock.js b/abstract/UploaderBlock.js
@@ -607,18 +607,22 @@ export class UploaderBlock extends ActivityBlock {
     }
   }
 
-  /** @private */
-  async getMetadata() {
+  /**
+   * @param {string} entryId
+   * @protected
+   */
+  async getMetadataFor(entryId) {
     const configValue = this.cfg.metadata ?? /** @type {import('../types').Metadata} */ (this.$['*uploadMetadata']);
     if (typeof configValue === 'function') {
-      const metadata = await configValue();
+      const outputFileEntry = this.getOutputItem(entryId);
+      const metadata = await configValue(outputFileEntry);
       return metadata;
     }
     return configValue;
   }
 
-  /** @returns {Promise<import('@uploadcare/upload-client').FileFromOptions>} */
-  async getUploadClientOptions() {
+  /** @returns {import('@uploadcare/upload-client').FileFromOptions} */
+  getUploadClientOptions() {
     let options = {
       store: this.cfg.store,
       publicKey: this.cfg.pubkey,
@@ -635,7 +639,6 @@ export class UploaderBlock extends ActivityBlock {
       multipartMaxAttempts: this.cfg.multipartMaxAttempts,
       checkForUrlDuplicates: !!this.cfg.checkForUrlDuplicates,
       saveUrlForRecurrentUploads: !!this.cfg.saveUrlForRecurrentUploads,
-      metadata: await this.getMetadata(),
     };
 
     return options;

diff --git a/blocks/DataOutput/DataOutput.js b/blocks/DataOutput/DataOutput.js
@@ -126,7 +126,7 @@ export class DataOutput extends UploaderBlock {
             };
             return;
           }
-          const uploadClientOptions = await this.getUploadClientOptions();
+          const uploadClientOptions = this.getUploadClientOptions();
           const resp = await uploadFileGroup(uuidList, uploadClientOptions);
           this.$.output = {
             groupData: resp,

diff --git a/blocks/FileItem/FileItem.js b/blocks/FileItem/FileItem.js
@@ -392,7 +392,7 @@ export class FileItem extends UploaderBlock {
       entry.setValue('abortController', abortController);
 
       const uploadTask = async () => {
-        const uploadClientOptions = await this.getUploadClientOptions();
+        const uploadClientOptions = this.getUploadClientOptions();
         return uploadFile(entry.getValue('file') || entry.getValue('externalUrl') || entry.getValue('uuid'), {
           ...uploadClientOptions,
           fileName: entry.getValue('fileName'),
@@ -405,6 +405,7 @@ export class FileItem extends UploaderBlock {
             this.$.progressUnknown = !progress.isComputable;
           },
           signal: abortController.signal,
+          metadata: await this.getMetadataFor(entry.uid),
         });
       };
 

diff --git a/types/exported.d.ts b/types/exported.d.ts
@@ -1,7 +1,7 @@
 import { UploadcareFile } from '@uploadcare/upload-client';
 
 export type Metadata = import('@uploadcare/upload-client').Metadata;
-export type MetadataCallback = () => Promise<Metadata>;
+export type MetadataCallback = (fileEntry: OutputFileEntry) => Promise<Metadata> | Metadata;
 export type ConfigType = {
   pubkey: string;
   multiple: boolean;