feat: added types and handler fallback

uploadcare · Sep 2, 2024 · f928e6a · f928e6a
1 parent e13e3b8
commit f928e6a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/abstract/UploaderBlock.js b/abstract/UploaderBlock.js
@@ -15,6 +15,7 @@ import { TypedCollection } from './TypedCollection.js';
 import { UploaderPublicApi } from './UploaderPublicApi.js';
 import { ValidationManager } from './ValidationManager.js';
 import { uploadEntrySchema } from './uploadEntrySchema.js';
+import { ExternalUploadSource, UploadSource } from '../blocks/utils/UploadSource.js';
 
 export class UploaderBlock extends ActivityBlock {
   /** @protected */
@@ -426,27 +427,13 @@ export class UploaderBlock extends ActivityBlock {
  * @enum {String}
  */
 UploaderBlock.extSrcList = Object.freeze({
-  FACEBOOK: 'facebook',
-  DROPBOX: 'dropbox',
-  GDRIVE: 'gdrive',
-  GPHOTOS: 'gphotos',
-  INSTAGRAM: 'instagram',
-  FLICKR: 'flickr',
-  VK: 'vk',
-  EVERNOTE: 'evernote',
-  BOX: 'box',
-  ONEDRIVE: 'onedrive',
-  HUDDLE: 'huddle',
+  ...ExternalUploadSource,
 });
 
 /**
  * @deprecated Use list sources UploadSource from from blocks/utils/UploadSource.js
  * @enum {String}
  */
 UploaderBlock.sourceTypes = Object.freeze({
-  LOCAL: 'local',
-  URL: 'url',
-  CAMERA: 'camera',
-  DRAW: 'draw',
-  ...UploaderBlock.extSrcList,
+  ...UploadSource,
 });
diff --git a/blocks/FileItem/FileItem.js b/blocks/FileItem/FileItem.js
@@ -392,7 +392,7 @@ export class FileItem extends UploaderBlock {
         cdnUrl: entry.getValue('cdnUrl') ?? fileInfo.cdnUrl,
         cdnUrlModifiers: entry.getValue('cdnUrlModifiers') ?? '',
         uploadProgress: 100,
-        source: entry.getValue('source') ?? '',
+        source: entry.getValue('source') ?? null,
       });
 
       if (entry === this._entry) {

diff --git a/blocks/utils/UploadSource.js b/blocks/utils/UploadSource.js
@@ -24,4 +24,4 @@ export const UploadSource = Object.freeze({
   ...ExternalUploadSource,
 });
 
-/** @typedef {typeof UploadSource} SourceTypes */
+/** @typedef {(typeof UploadSource)[keyof typeof UploadSource]} SourceTypes */
diff --git a/types/exported.d.ts b/types/exported.d.ts
@@ -5,6 +5,8 @@ import type { FuncFileValidator, FuncCollectionValidator } from '../abstract/Val
 export type { FuncFileValidator, FuncCollectionValidator } from '../abstract/ValidationManager';
 export type { UploaderPublicApi } from '../abstract/UploaderPublicApi';
 
+export type { SourceTypes } from '../blocks/utils/UploadSource'
+
 export type UploadError = import('@uploadcare/upload-client').UploadError;
 export type UploadcareFile = import('@uploadcare/upload-client').UploadcareFile;
 export type NetworkError = import('@uploadcare/upload-client').NetworkError;
@@ -168,6 +170,7 @@ export type OutputFileEntry<TStatus extends OutputFileStatus = OutputFileStatus>
   externalUrl: string | null;
   uploadProgress: number;
   fullPath: string | null;
+  source: SourceTypes;
 } & (
     | {
       status: 'success';