@ckeditor/ckeditor5-upload 36.0.1 → 37.0.0-alpha.1

package/src/filerepository.d.ts

@@ -0,0 +1,342 @@
+/**
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+/**
+ * @module upload/filerepository
+ */
+import { Plugin, type PluginDependencies } from '@ckeditor/ckeditor5-core';
+import { Collection } from '@ckeditor/ckeditor5-utils';
+/**
+ * File repository plugin. A central point for managing file upload.
+ *
+ * To use it, first you need an upload adapter. Upload adapter's job is to handle communication with the server
+ * (sending the file and handling server's response). You can use one of the existing plugins introducing upload adapters
+ * (e.g. {@link module:easy-image/cloudservicesuploadadapter~CloudServicesUploadAdapter} or
+ * {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter}) or write your own one – see
+ * the {@glink framework/deep-dive/upload-adapter Custom image upload adapter deep-dive} guide.
+ *
+ * Then, you can use {@link module:upload/filerepository~FileRepository#createLoader `createLoader()`} and the returned
+ * {@link module:upload/filerepository~FileLoader} instance to load and upload files.
+ */
+export default class FileRepository extends Plugin {
+    /**
+     * Collection of loaders associated with this repository.
+     */
+    loaders: Collection<FileLoader>;
+    /**
+     * A factory function which should be defined before using `FileRepository`.
+     *
+     * It should return a new instance of {@link module:upload/filerepository~UploadAdapter} that will be used to upload files.
+     * {@link module:upload/filerepository~FileLoader} instance associated with the adapter
+     * will be passed to that function.
+     *
+     * For more information and example see {@link module:upload/filerepository~UploadAdapter}.
+     */
+    createUploadAdapter?: (loader: FileLoader) => UploadAdapter;
+    /**
+     * Loaders mappings used to retrieve loaders references.
+     */
+    private _loadersMap;
+    /**
+     * Reference to a pending action registered in a {@link module:core/pendingactions~PendingActions} plugin
+     * while upload is in progress. When there is no upload then value is `null`.
+     */
+    private _pendingAction;
+    /**
+     * Number of bytes uploaded.
+     *
+     * @readonly
+     * @observable
+     */
+    uploaded: number;
+    /**
+     * Number of total bytes to upload.
+     *
+     * It might be different than the file size because of headers and additional data.
+     * It contains `null` if value is not available yet, so it's better to use {@link #uploadedPercent} to monitor
+     * the progress.
+     *
+     * @readonly
+     * @observable
+     */
+    uploadTotal: number | null;
+    /**
+     * Upload progress in percents.
+     *
+     * @readonly
+     * @observable
+     */
+    uploadedPercent: number;
+    /**
+     * @inheritDoc
+     */
+    static get pluginName(): 'FileRepository';
+    /**
+     * @inheritDoc
+     */
+    static get requires(): PluginDependencies;
+    /**
+     * @inheritDoc
+     */
+    init(): void;
+    /**
+     * Returns the loader associated with specified file or promise.
+     *
+     * To get loader by id use `fileRepository.loaders.get( id )`.
+     *
+     * @param fileOrPromise Native file or promise handle.
+     */
+    getLoader(fileOrPromise: File | Promise<File>): FileLoader | null;
+    /**
+     * Creates a loader instance for the given file.
+     *
+     * Requires {@link #createUploadAdapter} factory to be defined.
+     *
+     * @param fileOrPromise Native File object or native Promise object which resolves to a File.
+     */
+    createLoader(fileOrPromise: File | Promise<File>): FileLoader | null;
+    /**
+     * Destroys the given loader.
+     *
+     * @param fileOrPromiseOrLoader File or Promise associated with that loader or loader itself.
+     */
+    destroyLoader(fileOrPromiseOrLoader: File | Promise<File> | FileLoader): void;
+    /**
+     * Registers or deregisters pending action bound with upload progress.
+     */
+    private _updatePendingAction;
+}
+declare const FileLoader_base: {
+    new (): import("@ckeditor/ckeditor5-utils").Observable;
+    prototype: import("@ckeditor/ckeditor5-utils").Observable;
+};
+/**
+ * File loader class.
+ *
+ * It is used to control the process of reading the file and uploading it using the specified upload adapter.
+ */
+declare class FileLoader extends FileLoader_base {
+    /**
+     * Unique id of FileLoader instance.
+     *
+     * @readonly
+     */
+    readonly id: string;
+    /**
+     * Additional wrapper over the initial file promise passed to this loader.
+     */
+    private _filePromiseWrapper;
+    /**
+     * Adapter instance associated with this file loader.
+     */
+    private _adapter;
+    /**
+     * FileReader used by FileLoader.
+     */
+    private _reader;
+    /**
+     * Current status of FileLoader. It can be one of the following:
+     *
+     * * 'idle',
+     * * 'reading',
+     * * 'uploading',
+     * * 'aborted',
+     * * 'error'.
+     *
+     * When reading status can change in a following way:
+     *
+     * `idle` -> `reading` -> `idle`
+     * `idle` -> `reading -> `aborted`
+     * `idle` -> `reading -> `error`
+     *
+     * When uploading status can change in a following way:
+     *
+     * `idle` -> `uploading` -> `idle`
+     * `idle` -> `uploading` -> `aborted`
+     * `idle` -> `uploading` -> `error`
+     *
+     * @readonly
+     * @observable
+     */
+    status: 'idle' | 'reading' | 'uploading' | 'aborted' | 'error';
+    /**
+     * Number of bytes uploaded.
+     *
+     * @readonly
+     * @observable
+     */
+    uploaded: number;
+    /**
+     * Number of total bytes to upload.
+     *
+     * @readonly
+     * @observable
+     */
+    uploadTotal: number | null;
+    /**
+     * Upload progress in percents.
+     *
+     * @readonly
+     * @observable
+     */
+    uploadedPercent: number;
+    /**
+     * Response of the upload.
+     *
+     * @readonly
+     * @observable
+     */
+    uploadResponse?: UploadResponse | null;
+    /**
+     * Creates a new instance of `FileLoader`.
+     *
+     * @param filePromise A promise which resolves to a file instance.
+     * @param uploadAdapterCreator The function which returns {@link module:upload/filerepository~UploadAdapter} instance.
+     */
+    constructor(filePromise: Promise<File>, uploadAdapterCreator: (loader: FileLoader) => UploadAdapter);
+    /**
+     * A `Promise` which resolves to a `File` instance associated with this file loader.
+     */
+    get file(): Promise<File | null>;
+    /**
+     * Returns the file data. To read its data, you need for first load the file
+     * by using the {@link module:upload/filerepository~FileLoader#read `read()`} method.
+     */
+    get data(): string | undefined;
+    /**
+     * Reads file using {@link module:upload/filereader~FileReader}.
+     *
+     * Throws {@link module:utils/ckeditorerror~CKEditorError CKEditorError} `filerepository-read-wrong-status` when status
+     * is different than `idle`.
+     *
+     * Example usage:
+     *
+     * ```ts
+     * fileLoader.read()
+     * 	.then( data => { ... } )
+     * 	.catch( err => {
+     * 		if ( err === 'aborted' ) {
+     * 			console.log( 'Reading aborted.' );
+     * 		} else {
+     * 			console.log( 'Reading error.', err );
+     * 		}
+     * 	} );
+     * ```
+     *
+     * @returns Returns promise that will be resolved with read data. Promise will be rejected if error
+     * occurs or if read process is aborted.
+     */
+    read(): Promise<string>;
+    /**
+     * Reads file using the provided {@link module:upload/filerepository~UploadAdapter}.
+     *
+     * Throws {@link module:utils/ckeditorerror~CKEditorError CKEditorError} `filerepository-upload-wrong-status` when status
+     * is different than `idle`.
+     * Example usage:
+     *
+     * ```ts
+     * fileLoader.upload()
+     * 	.then( data => { ... } )
+     * 	.catch( e => {
+     * 		if ( e === 'aborted' ) {
+     * 			console.log( 'Uploading aborted.' );
+     * 		} else {
+     * 			console.log( 'Uploading error.', e );
+     * 		}
+     * 	} );
+     * ```
+     *
+     * @returns Returns promise that will be resolved with response data. Promise will be rejected if error
+     * occurs or if read process is aborted.
+     */
+    upload(): Promise<UploadResponse>;
+    /**
+     * Aborts loading process.
+     */
+    abort(): void;
+    /**
+     * Performs cleanup.
+     *
+     * @internal
+     */
+    _destroy(): void;
+    /**
+     * Wraps a given file promise into another promise giving additional
+     * control (resolving, rejecting, checking if fulfilled) over it.
+     *
+     * @param filePromise The initial file promise to be wrapped.
+     */
+    private _createFilePromiseWrapper;
+}
+export type { FileLoader };
+/**
+ * Upload adapter interface used by the {@link module:upload/filerepository~FileRepository file repository}
+ * to handle file upload. An upload adapter is a bridge between the editor and server that handles file uploads.
+ * It should contain a logic necessary to initiate an upload process and monitor its progress.
+ *
+ * Learn how to develop your own upload adapter for CKEditor 5 in the
+ * {@glink framework/deep-dive/upload-adapter "Custom upload adapter"} guide.
+ *
+ * @interface UploadAdapter
+ */
+export interface UploadAdapter {
+    /**
+     * Executes the upload process.
+     * This method should return a promise that will resolve when data will be uploaded to server. Promise should be
+     * resolved with an object containing information about uploaded file:
+     *
+     * ```json
+     * {
+     * 	default: 'http://server/default-size.image.png'
+     * }
+     * ```
+     *
+     * Additionally, other image sizes can be provided:
+     *
+     * ```json
+     * {
+     * 	default: 'http://server/default-size.image.png',
+     * 	'160': 'http://server/size-160.image.png',
+     * 	'500': 'http://server/size-500.image.png',
+     * 	'1000': 'http://server/size-1000.image.png',
+     * 	'1052': 'http://server/default-size.image.png'
+     * }
+     * ```
+     *
+     * You can also pass additional properties from the server. In this case you need to wrap URLs
+     * in the `urls` object and pass additional properties along the `urls` property.
+     *
+     * ```json
+     * {
+     * 	myCustomProperty: 'foo',
+     * 	urls: {
+     * 		default: 'http://server/default-size.image.png',
+     * 		'160': 'http://server/size-160.image.png',
+     * 		'500': 'http://server/size-500.image.png',
+     * 		'1000': 'http://server/size-1000.image.png',
+     * 		'1052': 'http://server/default-size.image.png'
+     * 	}
+     * }
+     * ```
+     *
+     * NOTE: When returning multiple images, the widest returned one should equal the default one. It is essential to
+     * correctly set `width` attribute of the image. See this discussion:
+     * https://github.com/ckeditor/ckeditor5-easy-image/issues/4 for more information.
+     *
+     * Take a look at {@link module:upload/filerepository~UploadAdapter example Adapter implementation} and
+     * {@link module:upload/filerepository~FileRepository#createUploadAdapter createUploadAdapter method}.
+     *
+     * @returns Promise that should be resolved when data is uploaded.
+     */
+    upload(): Promise<UploadResponse>;
+    /**
+     * Aborts the upload process.
+     * After aborting it should reject promise returned from {@link #upload upload()}.
+     *
+     * Take a look at {@link module:upload/filerepository~UploadAdapter example Adapter implementation} and
+     * {@link module:upload/filerepository~FileRepository#createUploadAdapter createUploadAdapter method}.
+     */
+    abort?(): void;
+}
+export type UploadResponse = Record<string, unknown>;

package/src/filerepository.js

@@ -15,14 +15,28 @@ import FileReader from './filereader';
  * (sending the file and handling server's response). You can use one of the existing plugins introducing upload adapters
  * (e.g. {@link module:easy-image/cloudservicesuploadadapter~CloudServicesUploadAdapter} or
  * {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter}) or write your own one – see
- * the {@glink framework/guides/deep-dive/upload-adapter Custom image upload adapter deep-dive guide}.
+ * the {@glink framework/deep-dive/upload-adapter Custom image upload adapter deep-dive} guide.
  *
  * Then, you can use {@link module:upload/filerepository~FileRepository#createLoader `createLoader()`} and the returned
  * {@link module:upload/filerepository~FileLoader} instance to load and upload files.
- *
- * @extends module:core/plugin~Plugin
  */
 export default class FileRepository extends Plugin {
+    constructor() {
+        super(...arguments);
+        /**
+         * Collection of loaders associated with this repository.
+         */
+        this.loaders = new Collection();
+        /**
+         * Loaders mappings used to retrieve loaders references.
+         */
+        this._loadersMap = new Map();
+        /**
+         * Reference to a pending action registered in a {@link module:core/pendingactions~PendingActions} plugin
+         * while upload is in progress. When there is no upload then value is `null`.
+         */
+        this._pendingAction = null;
+    }
     /**
      * @inheritDoc
      */
@@ -39,67 +53,10 @@ export default class FileRepository extends Plugin {
      * @inheritDoc
      */
     init() {
-        /**
-         * Collection of loaders associated with this repository.
-         *
-         * @member {module:utils/collection~Collection} #loaders
-         */
-        this.loaders = new Collection();
         // Keeps upload in a sync with pending actions.
         this.loaders.on('change', () => this._updatePendingAction());
-        /**
-         * Loaders mappings used to retrieve loaders references.
-         *
-         * @private
-         * @member {Map<File|Promise, FileLoader>} #_loadersMap
-         */
-        this._loadersMap = new Map();
-        /**
-         * Reference to a pending action registered in a {@link module:core/pendingactions~PendingActions} plugin
-         * while upload is in progress. When there is no upload then value is `null`.
-         *
-         * @private
-         * @member {Object} #_pendingAction
-         */
-        this._pendingAction = null;
-        /**
-         * A factory function which should be defined before using `FileRepository`.
-         *
-         * It should return a new instance of {@link module:upload/filerepository~UploadAdapter} that will be used to upload files.
-         * {@link module:upload/filerepository~FileLoader} instance associated with the adapter
-         * will be passed to that function.
-         *
-         * For more information and example see {@link module:upload/filerepository~UploadAdapter}.
-         *
-         * @member {Function} #createUploadAdapter
-         */
-        /**
-         * Number of bytes uploaded.
-         *
-         * @readonly
-         * @observable
-         * @member {Number} #uploaded
-         */
         this.set('uploaded', 0);
-        /**
-         * Number of total bytes to upload.
-         *
-         * It might be different than the file size because of headers and additional data.
-         * It contains `null` if value is not available yet, so it's better to use {@link #uploadedPercent} to monitor
-         * the progress.
-         *
-         * @readonly
-         * @observable
-         * @member {Number|null} #uploadTotal
-         */
         this.set('uploadTotal', null);
-        /**
-         * Upload progress in percents.
-         *
-         * @readonly
-         * @observable
-         * @member {Number} #uploadedPercent
-         */
         this.bind('uploadedPercent').to(this, 'uploaded', this, 'uploadTotal', (uploaded, total) => {
             return total ? (uploaded / total * 100) : 0;
         });
@@ -109,8 +66,7 @@ export default class FileRepository extends Plugin {
      *
      * To get loader by id use `fileRepository.loaders.get( id )`.
      *
-     * @param {File|Promise.<File>} fileOrPromise Native file or promise handle.
-     * @returns {module:upload/filerepository~FileLoader|null}
+     * @param fileOrPromise Native file or promise handle.
      */
     getLoader(fileOrPromise) {
         return this._loadersMap.get(fileOrPromise) || null;
@@ -120,8 +76,7 @@ export default class FileRepository extends Plugin {
      *
      * Requires {@link #createUploadAdapter} factory to be defined.
      *
-     * @param {File|Promise.<File>} fileOrPromise Native File object or native Promise object which resolves to a File.
-     * @returns {module:upload/filerepository~FileLoader|null}
+     * @param fileOrPromise Native File object or native Promise object which resolves to a File.
      */
     createLoader(fileOrPromise) {
         if (!this.createUploadAdapter) {
@@ -129,7 +84,7 @@ export default class FileRepository extends Plugin {
              * You need to enable an upload adapter in order to be able to upload files.
              *
              * This warning shows up when {@link module:upload/filerepository~FileRepository} is being used
-             * without {@link #createUploadAdapter defining an upload adapter}.
+             * without {@link module:upload/filerepository~FileRepository#createUploadAdapter defining an upload adapter}.
              *
              * **If you see this warning when using one of the {@glink installation/getting-started/predefined-builds
              * CKEditor 5 Builds}**
@@ -144,7 +99,7 @@ export default class FileRepository extends Plugin {
              * You can choose one of the existing upload adapters listed in the
              * {@glink features/images/image-upload/image-upload "Image upload overview"}.
              *
-             * You can also implement your {@glink framework/guides/deep-dive/upload-adapter own image upload adapter}.
+             * You can also implement your {@glink framework/deep-dive/upload-adapter own image upload adapter}.
              *
              * @error filerepository-no-upload-adapter
              */
@@ -186,8 +141,7 @@ export default class FileRepository extends Plugin {
     /**
      * Destroys the given loader.
      *
-     * @param {File|Promise|module:upload/filerepository~FileLoader} fileOrPromiseOrLoader File or Promise associated
-     * with that loader or loader itself.
+     * @param fileOrPromiseOrLoader File or Promise associated with that loader or loader itself.
      */
     destroyLoader(fileOrPromiseOrLoader) {
         const loader = fileOrPromiseOrLoader instanceof FileLoader ? fileOrPromiseOrLoader : this.getLoader(fileOrPromiseOrLoader);
@@ -201,8 +155,6 @@ export default class FileRepository extends Plugin {
     }
     /**
      * Registers or deregisters pending action bound with upload progress.
-     *
-     * @private
      */
     _updatePendingAction() {
         const pendingActions = this.editor.plugins.get(PendingActions);
@@ -229,104 +181,25 @@ class FileLoader extends ObservableMixin() {
     /**
      * Creates a new instance of `FileLoader`.
      *
-     * @param {Promise.<File>} filePromise A promise which resolves to a file instance.
-     * @param {Function} uploadAdapterCreator The function which returns {@link module:upload/filerepository~UploadAdapter} instance.
+     * @param filePromise A promise which resolves to a file instance.
+     * @param uploadAdapterCreator The function which returns {@link module:upload/filerepository~UploadAdapter} instance.
      */
     constructor(filePromise, uploadAdapterCreator) {
         super();
-        /**
-         * Unique id of FileLoader instance.
-         *
-         * @readonly
-         * @member {Number}
-         */
         this.id = uid();
-        /**
-         * Additional wrapper over the initial file promise passed to this loader.
-         *
-         * @protected
-         * @member {module:upload/filerepository~FilePromiseWrapper}
-         */
         this._filePromiseWrapper = this._createFilePromiseWrapper(filePromise);
-        /**
-         * Adapter instance associated with this file loader.
-         *
-         * @private
-         * @member {module:upload/filerepository~UploadAdapter}
-         */
         this._adapter = uploadAdapterCreator(this);
-        /**
-         * FileReader used by FileLoader.
-         *
-         * @protected
-         * @member {module:upload/filereader~FileReader}
-         */
         this._reader = new FileReader();
-        /**
-         * Current status of FileLoader. It can be one of the following:
-         *
-         * * 'idle',
-         * * 'reading',
-         * * 'uploading',
-         * * 'aborted',
-         * * 'error'.
-         *
-         * When reading status can change in a following way:
-         *
-         * `idle` -> `reading` -> `idle`
-         * `idle` -> `reading -> `aborted`
-         * `idle` -> `reading -> `error`
-         *
-         * When uploading status can change in a following way:
-         *
-         * `idle` -> `uploading` -> `idle`
-         * `idle` -> `uploading` -> `aborted`
-         * `idle` -> `uploading` -> `error`
-         *
-         * @readonly
-         * @observable
-         * @member {String} #status
-         */
         this.set('status', 'idle');
-        /**
-         * Number of bytes uploaded.
-         *
-         * @readonly
-         * @observable
-         * @member {Number} #uploaded
-         */
         this.set('uploaded', 0);
-        /**
-         * Number of total bytes to upload.
-         *
-         * @readonly
-         * @observable
-         * @member {Number|null} #uploadTotal
-         */
         this.set('uploadTotal', null);
-        /**
-         * Upload progress in percents.
-         *
-         * @readonly
-         * @observable
-         * @member {Number} #uploadedPercent
-         */
         this.bind('uploadedPercent').to(this, 'uploaded', this, 'uploadTotal', (uploaded, total) => {
             return total ? (uploaded / total * 100) : 0;
         });
-        /**
-         * Response of the upload.
-         *
-         * @readonly
-         * @observable
-         * @member {Object|null} #uploadResponse
-         */
         this.set('uploadResponse', null);
     }
     /**
      * A `Promise` which resolves to a `File` instance associated with this file loader.
-     *
-     * @type {Promise.<File|null>}
      */
     get file() {
         if (!this._filePromiseWrapper) {
@@ -348,8 +221,6 @@ class FileLoader extends ObservableMixin() {
     /**
      * Returns the file data. To read its data, you need for first load the file
      * by using the {@link module:upload/filerepository~FileLoader#read `read()`} method.
-     *
-     * @type {File|undefined}
      */
     get data() {
         return this._reader.data;
@@ -362,17 +233,19 @@ class FileLoader extends ObservableMixin() {
      *
      * Example usage:
      *
-     *	fileLoader.read()
-     *		.then( data => { ... } )
-     *		.catch( err => {
-     *			if ( err === 'aborted' ) {
-     *				console.log( 'Reading aborted.' );
-     *			} else {
-     *				console.log( 'Reading error.', err );
-     *			}
-     *		} );
+     * ```ts
+     * fileLoader.read()
+     * 	.then( data => { ... } )
+     * 	.catch( err => {
+     * 		if ( err === 'aborted' ) {
+     * 			console.log( 'Reading aborted.' );
+     * 		} else {
+     * 			console.log( 'Reading error.', err );
+     * 		}
+     * 	} );
+     * ```
      *
-     * @returns {Promise.<String>} Returns promise that will be resolved with read data. Promise will be rejected if error
+     * @returns Returns promise that will be resolved with read data. Promise will be rejected if error
      * occurs or if read process is aborted.
      */
     read() {
@@ -412,17 +285,19 @@ class FileLoader extends ObservableMixin() {
      * is different than `idle`.
      * Example usage:
      *
-     *	fileLoader.upload()
-     *		.then( data => { ... } )
-     *		.catch( e => {
-     *			if ( e === 'aborted' ) {
-     *				console.log( 'Uploading aborted.' );
-     *			} else {
-     *				console.log( 'Uploading error.', e );
-     *			}
-     *		} );
+     * ```ts
+     * fileLoader.upload()
+     * 	.then( data => { ... } )
+     * 	.catch( e => {
+     * 		if ( e === 'aborted' ) {
+     * 			console.log( 'Uploading aborted.' );
+     * 		} else {
+     * 			console.log( 'Uploading error.', e );
+     * 		}
+     * 	} );
+     * ```
      *
-     * @returns {Promise.<Object>} Returns promise that will be resolved with response data. Promise will be rejected if error
+     * @returns Returns promise that will be resolved with response data. Promise will be rejected if error
      * occurs or if read process is aborted.
      */
     upload() {
@@ -486,9 +361,7 @@ class FileLoader extends ObservableMixin() {
      * Wraps a given file promise into another promise giving additional
      * control (resolving, rejecting, checking if fulfilled) over it.
      *
-     * @private
      * @param filePromise The initial file promise to be wrapped.
-     * @returns {module:upload/filerepository~FilePromiseWrapper}
      */
     _createFilePromiseWrapper(filePromise) {
         const wrapper = {};

package/src/index.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+/**
+ * @module upload
+ */
+export { default as FileRepository, type UploadAdapter, type UploadResponse, type FileLoader } from './filerepository';
+export { default as FileDialogButtonView } from './ui/filedialogbuttonview';
+export { default as Base64UploadAdapter } from './adapters/base64uploadadapter';
+export { default as SimpleUploadAdapter } from './adapters/simpleuploadadapter';
+export type { SimpleUploadConfig } from './uploadconfig';
+import './augmentation';