@atlaskit/media-client 20.0.0 → 20.0.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/media-client
 
+## 20.0.1
+
+### Patch Changes
+
+- [`90f6203e794`](https://bitbucket.org/atlassian/atlassian-frontend/commits/90f6203e794) - Media Client now fetch remote file state regardless of file browser support (behind feature flag)
+- Updated dependencies
+
 ## 20.0.0
 
 ### Major Changes

package/dist/cjs/client/file-fetcher/index.js

@@ -83,12 +83,14 @@ var _polling = require("../../utils/polling");
 
 var _detectEmptyFile = require("../../utils/detectEmptyFile");
 
+var _mediaCommon = require("@atlaskit/media-common");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var FileFetcherImpl = /*#__PURE__*/function () {
-  function FileFetcherImpl(mediaStore) {
+  function FileFetcherImpl(mediaStore, featureFlags) {
     var _this = this;
 
     (0, _classCallCheck2.default)(this, FileFetcherImpl);
@@ -161,7 +163,47 @@ var FileFetcherImpl = /*#__PURE__*/function () {
       })));
       return subject;
     });
+    (0, _defineProperty2.default)(this, "getUploadingFileStateBase", function (file, upfrontId) {
+      // TODO: DO not modify the input parameter 'content' attribute
+      if (typeof file.content === 'string') {
+        file.content = (0, _convertBase64ToBlob.convertBase64ToBlob)(file.content);
+      }
+
+      var content = file.content,
+          _file$name = file.name,
+          name = _file$name === void 0 ? '' : _file$name;
+      var id = upfrontId.id,
+          occurrenceKey = upfrontId.occurrenceKey;
+      var preview; // TODO [MSW-796]: get file size for base64
+
+      var size = 0;
+      var mimeType = '';
+
+      if (content instanceof Blob) {
+        size = content.size;
+        mimeType = content.type;
+
+        if ((0, _mediaTypeUtils.isMimeTypeSupportedByBrowser)(content.type)) {
+          preview = {
+            value: content,
+            origin: 'local'
+          };
+        }
+      }
+
+      var mediaType = (0, _getMediaTypeFromUploadableFile.getMediaTypeFromUploadableFile)(file);
+      return {
+        id: id,
+        occurrenceKey: occurrenceKey,
+        name: name,
+        size: size,
+        mediaType: mediaType,
+        mimeType: mimeType,
+        preview: preview
+      };
+    });
     this.mediaStore = mediaStore;
+    this.featureFlags = featureFlags;
     this.dataloader = (0, _createFileDataLoader.createFileDataloader)(mediaStore);
   }
 
@@ -383,17 +425,68 @@ var FileFetcherImpl = /*#__PURE__*/function () {
       return uploadExternal;
     }()
   }, {
-    key: "upload",
-    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
+    key: "uploadAwlaysPullFileStates",
+    value: // TODO: make this the public upload method when the FF is removed
+    function uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext) {
       var _this4 = this;
 
+      var collection = file.collection;
+      var upfrontId = uploadableFileUpfrontIds || this.generateUploadableFileUpfrontIds(collection, traceContext);
+      var id = upfrontId.id,
+          occurrenceKey = upfrontId.occurrenceKey;
+      var stateBase = this.getUploadingFileStateBase(file, upfrontId);
+      var subject = (0, _createMediaSubject.createMediaSubject)();
+      (0, _fileStreamsCache.getFileStreamsCache)().set(id, subject);
+
+      var onProgress = function onProgress(progress) {
+        subject.next(_objectSpread(_objectSpread({
+          status: 'uploading'
+        }, stateBase), {}, {
+          progress: progress
+        }));
+      };
+
+      var processingSubscription = new _Subscription.Subscription();
+
+      var onUploadFinish = function onUploadFinish(error) {
+        if (error) {
+          return subject.error(error);
+        }
+
+        processingSubscription = _this4.createDownloadFileStream(id, collection, occurrenceKey).pipe((0, _map.map)(function (remoteFileState) {
+          return _objectSpread(_objectSpread(_objectSpread({}, stateBase), remoteFileState), (0, _overrideMediaTypeIfUnknown.overrideMediaTypeIfUnknown)(remoteFileState, stateBase.mediaType));
+        })).subscribe(subject);
+      };
+
+      var _uploadFile = (0, _uploader.uploadFile)(file, this.mediaStore, upfrontId, {
+        onUploadFinish: onUploadFinish,
+        onProgress: onProgress
+      }, traceContext),
+          cancel = _uploadFile.cancel;
+
+      controller === null || controller === void 0 ? void 0 : controller.setAbort(function () {
+        cancel(); // TODO: filestate should turn to "Aborted" or something.
+        // Consider canceling an upload that is already finished
+
+        processingSubscription.unsubscribe();
+      }); // We should report progress asynchronously, since this is what consumer expects
+      // (otherwise in newUploadService file-converting event will be emitted before files-added)
+
+      setTimeout(onProgress, 0, 0);
+      return (0, _mediaSubscribable.fromObservable)(subject);
+    }
+  }, {
+    key: "uploadConditionallyPullFileStates",
+    value: function uploadConditionallyPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext) {
+      var _this5 = this;
+
       if (typeof file.content === 'string') {
         file.content = (0, _convertBase64ToBlob.convertBase64ToBlob)(file.content);
       }
 
       var content = file.content,
-          _file$name = file.name,
-          name = _file$name === void 0 ? '' : _file$name,
+          _file$name2 = file.name,
+          name = _file$name2 === void 0 ? '' : _file$name2,
           collection = file.collection;
 
       if (!uploadableFileUpfrontIds) {
@@ -447,7 +540,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
 
         processingSubscription.add((0, _shouldFetchRemoteFileStates.shouldFetchRemoteFileStatesObservable)(mediaType, mimeType, preview).pipe((0, _concatMap.concatMap)(function (shouldFetchRemoteFileStates) {
           if (shouldFetchRemoteFileStates) {
-            return _this4.createDownloadFileStream(id, collection, occurrenceKey).pipe((0, _map.map)(function (remoteFileState) {
+            return _this5.createDownloadFileStream(id, collection, occurrenceKey).pipe((0, _map.map)(function (remoteFileState) {
               return _objectSpread(_objectSpread(_objectSpread({}, stateBase), remoteFileState), (0, _overrideMediaTypeIfUnknown.overrideMediaTypeIfUnknown)(remoteFileState, mediaType));
             }));
           }
@@ -459,11 +552,11 @@ var FileFetcherImpl = /*#__PURE__*/function () {
         })).subscribe(subject));
       };
 
-      var _uploadFile = (0, _uploader.uploadFile)(file, this.mediaStore, uploadableFileUpfrontIds, {
+      var _uploadFile2 = (0, _uploader.uploadFile)(file, this.mediaStore, uploadableFileUpfrontIds, {
         onUploadFinish: onUploadFinish,
         onProgress: onProgress
       }, traceContext),
-          cancel = _uploadFile.cancel;
+          cancel = _uploadFile2.cancel;
 
       (0, _fileStreamsCache.getFileStreamsCache)().set(id, subject); // We should report progress asynchronously, since this is what consumer expects
       // (otherwise in newUploadService file-converting event will be emitted before files-added)
@@ -480,6 +573,17 @@ var FileFetcherImpl = /*#__PURE__*/function () {
       }
 
       return (0, _mediaSubscribable.fromObservable)(subject);
+    }
+  }, {
+    key: "upload",
+    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
+      var shouldAlwaysFetchFileState = (0, _mediaCommon.getMediaFeatureFlag)('fetchFileStateAfterUpload', this.featureFlags);
+
+      if (shouldAlwaysFetchFileState) {
+        return this.uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
+      }
+
+      return this.uploadConditionallyPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
     } // TODO: ----- ADD TICKET
 
   }, {

package/dist/cjs/client/media-client.js

@@ -44,7 +44,7 @@ var MediaClient = /*#__PURE__*/function () {
     }, featureFlags);
     this.config = mediaClientConfig;
     this.collection = new _collectionFetcher.CollectionFetcher(this.mediaStore);
-    this.file = new _fileFetcher.FileFetcherImpl(this.mediaStore);
+    this.file = new _fileFetcher.FileFetcherImpl(this.mediaStore, featureFlags);
     this.eventEmitter = new _eventemitter.EventEmitter2();
     this.stargate = new _stargateClient.StargateClient(mediaClientConfig.stargateBaseUrl);
   }

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "20.0.0",
+	"version": "20.0.1",
 	"sideEffects": false
 }

package/dist/es2019/client/file-fetcher/index.js

@@ -28,9 +28,10 @@ import { isMimeTypeSupportedByBrowser, getMediaTypeFromMimeType } from '@atlaski
 import { shouldFetchRemoteFileStates, shouldFetchRemoteFileStatesObservable } from '../../utils/shouldFetchRemoteFileStates';
 import { PollingFunction } from '../../utils/polling';
 import { isEmptyFile } from '../../utils/detectEmptyFile';
+import { getMediaFeatureFlag } from '@atlaskit/media-common';
 export { isFileFetcherError, FileFetcherError } from './error';
 export class FileFetcherImpl {
-  constructor(mediaStore) {
+  constructor(mediaStore, featureFlags) {
     _defineProperty(this, "createDownloadFileStream", (id, collectionName, occurrenceKey) => {
       const subject = createMediaSubject();
       const poll = new PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
@@ -74,7 +75,52 @@ export class FileFetcherImpl {
       return subject;
     });
 
+    _defineProperty(this, "getUploadingFileStateBase", (file, upfrontId) => {
+      // TODO: DO not modify the input parameter 'content' attribute
+      if (typeof file.content === 'string') {
+        file.content = convertBase64ToBlob(file.content);
+      }
+
+      const {
+        content,
+        name = '' // name property is not available in base64 image
+
+      } = file;
+      const {
+        id,
+        occurrenceKey
+      } = upfrontId;
+      let preview; // TODO [MSW-796]: get file size for base64
+
+      let size = 0;
+      let mimeType = '';
+
+      if (content instanceof Blob) {
+        size = content.size;
+        mimeType = content.type;
+
+        if (isMimeTypeSupportedByBrowser(content.type)) {
+          preview = {
+            value: content,
+            origin: 'local'
+          };
+        }
+      }
+
+      const mediaType = getMediaTypeFromUploadableFile(file);
+      return {
+        id,
+        occurrenceKey,
+        name,
+        size,
+        mediaType,
+        mimeType,
+        preview
+      };
+    });
+
     this.mediaStore = mediaStore;
+    this.featureFlags = featureFlags;
     this.dataloader = createFileDataloader(mediaStore);
   }
 
@@ -209,7 +255,61 @@ export class FileFetcherImpl {
     });
   }
 
-  upload(file, controller, uploadableFileUpfrontIds, traceContext) {
+  // TODO: make this the public upload method when the FF is removed
+  uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext) {
+    const {
+      collection
+    } = file;
+    const upfrontId = uploadableFileUpfrontIds || this.generateUploadableFileUpfrontIds(collection, traceContext);
+    const {
+      id,
+      occurrenceKey
+    } = upfrontId;
+    const stateBase = this.getUploadingFileStateBase(file, upfrontId);
+    const subject = createMediaSubject();
+    getFileStreamsCache().set(id, subject);
+
+    const onProgress = progress => {
+      subject.next({
+        status: 'uploading',
+        ...stateBase,
+        progress
+      });
+    };
+
+    let processingSubscription = new Subscription();
+
+    const onUploadFinish = error => {
+      if (error) {
+        return subject.error(error);
+      }
+
+      processingSubscription = this.createDownloadFileStream(id, collection, occurrenceKey).pipe(map(remoteFileState => ({ // merges base state with remote state
+        ...stateBase,
+        ...remoteFileState,
+        ...overrideMediaTypeIfUnknown(remoteFileState, stateBase.mediaType)
+      }))).subscribe(subject);
+    };
+
+    const {
+      cancel
+    } = uploadFile(file, this.mediaStore, upfrontId, {
+      onUploadFinish,
+      onProgress
+    }, traceContext);
+    controller === null || controller === void 0 ? void 0 : controller.setAbort(() => {
+      cancel(); // TODO: filestate should turn to "Aborted" or something.
+      // Consider canceling an upload that is already finished
+
+      processingSubscription.unsubscribe();
+    }); // We should report progress asynchronously, since this is what consumer expects
+    // (otherwise in newUploadService file-converting event will be emitted before files-added)
+
+    setTimeout(onProgress, 0, 0);
+    return fromObservable(subject);
+  }
+
+  uploadConditionallyPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext) {
     if (typeof file.content === 'string') {
       file.content = convertBase64ToBlob(file.content);
     }
@@ -308,6 +408,16 @@ export class FileFetcherImpl {
     }
 
     return fromObservable(subject);
+  }
+
+  upload(file, controller, uploadableFileUpfrontIds, traceContext) {
+    const shouldAlwaysFetchFileState = getMediaFeatureFlag('fetchFileStateAfterUpload', this.featureFlags);
+
+    if (shouldAlwaysFetchFileState) {
+      return this.uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
+    }
+
+    return this.uploadConditionallyPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
   } // TODO: ----- ADD TICKET
 
 

package/dist/es2019/client/media-client.js

@@ -15,7 +15,7 @@ export class MediaClient {
     }, featureFlags);
     this.config = mediaClientConfig;
     this.collection = new CollectionFetcher(this.mediaStore);
-    this.file = new FileFetcherImpl(this.mediaStore);
+    this.file = new FileFetcherImpl(this.mediaStore, featureFlags);
     this.eventEmitter = new EventEmitter2();
     this.stargate = new StargateClient(mediaClientConfig.stargateBaseUrl);
   }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "20.0.0",
+	"version": "20.0.1",
 	"sideEffects": false
 }

package/dist/esm/client/file-fetcher/index.js

@@ -37,9 +37,10 @@ import { isMimeTypeSupportedByBrowser, getMediaTypeFromMimeType } from '@atlaski
 import { shouldFetchRemoteFileStates, shouldFetchRemoteFileStatesObservable } from '../../utils/shouldFetchRemoteFileStates';
 import { PollingFunction } from '../../utils/polling';
 import { isEmptyFile } from '../../utils/detectEmptyFile';
+import { getMediaFeatureFlag } from '@atlaskit/media-common';
 export { isFileFetcherError, FileFetcherError } from './error';
 export var FileFetcherImpl = /*#__PURE__*/function () {
-  function FileFetcherImpl(mediaStore) {
+  function FileFetcherImpl(mediaStore, featureFlags) {
     var _this = this;
 
     _classCallCheck(this, FileFetcherImpl);
@@ -114,7 +115,48 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       return subject;
     });
 
+    _defineProperty(this, "getUploadingFileStateBase", function (file, upfrontId) {
+      // TODO: DO not modify the input parameter 'content' attribute
+      if (typeof file.content === 'string') {
+        file.content = convertBase64ToBlob(file.content);
+      }
+
+      var content = file.content,
+          _file$name = file.name,
+          name = _file$name === void 0 ? '' : _file$name;
+      var id = upfrontId.id,
+          occurrenceKey = upfrontId.occurrenceKey;
+      var preview; // TODO [MSW-796]: get file size for base64
+
+      var size = 0;
+      var mimeType = '';
+
+      if (content instanceof Blob) {
+        size = content.size;
+        mimeType = content.type;
+
+        if (isMimeTypeSupportedByBrowser(content.type)) {
+          preview = {
+            value: content,
+            origin: 'local'
+          };
+        }
+      }
+
+      var mediaType = getMediaTypeFromUploadableFile(file);
+      return {
+        id: id,
+        occurrenceKey: occurrenceKey,
+        name: name,
+        size: size,
+        mediaType: mediaType,
+        mimeType: mimeType,
+        preview: preview
+      };
+    });
+
     this.mediaStore = mediaStore;
+    this.featureFlags = featureFlags;
     this.dataloader = createFileDataloader(mediaStore);
   }
 
@@ -336,17 +378,68 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       return uploadExternal;
     }()
   }, {
-    key: "upload",
-    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
+    key: "uploadAwlaysPullFileStates",
+    value: // TODO: make this the public upload method when the FF is removed
+    function uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext) {
       var _this4 = this;
 
+      var collection = file.collection;
+      var upfrontId = uploadableFileUpfrontIds || this.generateUploadableFileUpfrontIds(collection, traceContext);
+      var id = upfrontId.id,
+          occurrenceKey = upfrontId.occurrenceKey;
+      var stateBase = this.getUploadingFileStateBase(file, upfrontId);
+      var subject = createMediaSubject();
+      getFileStreamsCache().set(id, subject);
+
+      var onProgress = function onProgress(progress) {
+        subject.next(_objectSpread(_objectSpread({
+          status: 'uploading'
+        }, stateBase), {}, {
+          progress: progress
+        }));
+      };
+
+      var processingSubscription = new Subscription();
+
+      var onUploadFinish = function onUploadFinish(error) {
+        if (error) {
+          return subject.error(error);
+        }
+
+        processingSubscription = _this4.createDownloadFileStream(id, collection, occurrenceKey).pipe(map(function (remoteFileState) {
+          return _objectSpread(_objectSpread(_objectSpread({}, stateBase), remoteFileState), overrideMediaTypeIfUnknown(remoteFileState, stateBase.mediaType));
+        })).subscribe(subject);
+      };
+
+      var _uploadFile = uploadFile(file, this.mediaStore, upfrontId, {
+        onUploadFinish: onUploadFinish,
+        onProgress: onProgress
+      }, traceContext),
+          cancel = _uploadFile.cancel;
+
+      controller === null || controller === void 0 ? void 0 : controller.setAbort(function () {
+        cancel(); // TODO: filestate should turn to "Aborted" or something.
+        // Consider canceling an upload that is already finished
+
+        processingSubscription.unsubscribe();
+      }); // We should report progress asynchronously, since this is what consumer expects
+      // (otherwise in newUploadService file-converting event will be emitted before files-added)
+
+      setTimeout(onProgress, 0, 0);
+      return fromObservable(subject);
+    }
+  }, {
+    key: "uploadConditionallyPullFileStates",
+    value: function uploadConditionallyPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext) {
+      var _this5 = this;
+
       if (typeof file.content === 'string') {
         file.content = convertBase64ToBlob(file.content);
       }
 
       var content = file.content,
-          _file$name = file.name,
-          name = _file$name === void 0 ? '' : _file$name,
+          _file$name2 = file.name,
+          name = _file$name2 === void 0 ? '' : _file$name2,
           collection = file.collection;
 
       if (!uploadableFileUpfrontIds) {
@@ -400,7 +493,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
 
         processingSubscription.add(shouldFetchRemoteFileStatesObservable(mediaType, mimeType, preview).pipe(concatMap(function (shouldFetchRemoteFileStates) {
           if (shouldFetchRemoteFileStates) {
-            return _this4.createDownloadFileStream(id, collection, occurrenceKey).pipe(map(function (remoteFileState) {
+            return _this5.createDownloadFileStream(id, collection, occurrenceKey).pipe(map(function (remoteFileState) {
               return _objectSpread(_objectSpread(_objectSpread({}, stateBase), remoteFileState), overrideMediaTypeIfUnknown(remoteFileState, mediaType));
             }));
           }
@@ -412,11 +505,11 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         })).subscribe(subject));
       };
 
-      var _uploadFile = uploadFile(file, this.mediaStore, uploadableFileUpfrontIds, {
+      var _uploadFile2 = uploadFile(file, this.mediaStore, uploadableFileUpfrontIds, {
         onUploadFinish: onUploadFinish,
         onProgress: onProgress
       }, traceContext),
-          cancel = _uploadFile.cancel;
+          cancel = _uploadFile2.cancel;
 
       getFileStreamsCache().set(id, subject); // We should report progress asynchronously, since this is what consumer expects
       // (otherwise in newUploadService file-converting event will be emitted before files-added)
@@ -433,6 +526,17 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       }
 
       return fromObservable(subject);
+    }
+  }, {
+    key: "upload",
+    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
+      var shouldAlwaysFetchFileState = getMediaFeatureFlag('fetchFileStateAfterUpload', this.featureFlags);
+
+      if (shouldAlwaysFetchFileState) {
+        return this.uploadAwlaysPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
+      }
+
+      return this.uploadConditionallyPullFileStates(file, controller, uploadableFileUpfrontIds, traceContext);
     } // TODO: ----- ADD TICKET
 
   }, {

package/dist/esm/client/media-client.js

@@ -21,7 +21,7 @@ export var MediaClient = /*#__PURE__*/function () {
     }, featureFlags);
     this.config = mediaClientConfig;
     this.collection = new CollectionFetcher(this.mediaStore);
-    this.file = new FileFetcherImpl(this.mediaStore);
+    this.file = new FileFetcherImpl(this.mediaStore, featureFlags);
     this.eventEmitter = new EventEmitter2();
     this.stargate = new StargateClient(mediaClientConfig.stargateBaseUrl);
   }

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "20.0.0",
+	"version": "20.0.1",
 	"sideEffects": false
 }

package/dist/types/client/file-fetcher/index.d.ts

@@ -8,7 +8,7 @@ import { MediaFileArtifacts } from '../../models/artifacts';
 import { UploadController } from '../../upload-controller';
 import { MediaSubscribable } from '../../utils/mediaSubscribable';
 import { Dimensions } from '../../utils/getDimensionsFromBlob';
-import { MediaTraceContext } from '@atlaskit/media-common';
+import { MediaFeatureFlags, MediaTraceContext } from '@atlaskit/media-common';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason, } from './error';
 export { isFileFetcherError, FileFetcherError } from './error';
 export interface CopySourceFile {
@@ -41,8 +41,9 @@ export interface FileFetcher {
 }
 export declare class FileFetcherImpl implements FileFetcher {
     private readonly mediaStore;
+    private readonly featureFlags?;
     private readonly dataloader;
-    constructor(mediaStore: MediaStore);
+    constructor(mediaStore: MediaStore, featureFlags?: MediaFeatureFlags | undefined);
     getFileState(id: string, options?: GetFileOptions): MediaSubscribable<FileState>;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
@@ -51,6 +52,9 @@ export declare class FileFetcherImpl implements FileFetcher {
     touchFiles(descriptors: TouchFileDescriptor[], collection?: string, traceContext?: MediaTraceContext): Promise<TouchedFiles>;
     private generateUploadableFileUpfrontIds;
     uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
+    private getUploadingFileStateBase;
+    private uploadAwlaysPullFileStates;
+    private uploadConditionallyPullFileStates;
     upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable<FileState>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions, traceContext?: MediaTraceContext): Promise<MediaFile>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "20.0.0",
+  "version": "20.0.1",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@atlaskit/chunkinator": "^4.1.0",
-    "@atlaskit/media-common": "^2.18.0",
+    "@atlaskit/media-common": "^2.19.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@atlaskit/button": "^16.5.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^74.4.0",
+    "@atlaskit/media-card": "^74.5.0",
     "@atlaskit/media-core": "^34.0.0",
     "@atlaskit/media-test-helpers": "^30.1.0",
     "@atlaskit/ssr": "*",

package/report.api.md

@@ -361,7 +361,10 @@ export type FileFetcherErrorReason =
 
 // @public (undocumented)
 export class FileFetcherImpl implements FileFetcher {
-  constructor(mediaStore: MediaStore);
+  constructor(
+    mediaStore: MediaStore,
+    featureFlags?: MediaFeatureFlags | undefined,
+  );
   // (undocumented)
   copyFile(
     source: CopySourceFile,