@atlaskit/media-client 14.4.0 → 15.1.1

package/CHANGELOG.md

@@ -1,5 +1,112 @@
 # @atlaskit/media-client
 
+## 15.1.1
+
+### Patch Changes
+
+- [`a424e62b264`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a424e62b264) - Changes to support Node 16 Typescript definitions from `@types/node`.
+
+## 15.1.0
+
+### Minor Changes
+
+- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Export `WithMediaClient` type to resolve a deep import path d.ts reference
+
+### Patch Changes
+
+- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Upgrade to TypeScript 4.2.4
+- Updated dependencies
+
+## 15.0.0
+
+### Major Changes
+
+- [`fdc41ee7a0b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fdc41ee7a0b) - Stop exposing observableToPromise from media client API.
+  mediaSubscribableToPromise is used internally.
+- [`118f3af101f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/118f3af101f) - Media Client APIs has been updated to use MediaSubscribable which provides subscription functionality (similar to RxJs observables).
+  It exposes subscribe method that is called with MediaObserver as an argument and returns MediaSubscription.
+  MediaSubscription exposes unsubscribe method.
+
+  getFileState:
+  The returned type of this function has changed from RxJs ReplaySubject to MediaSubscribable.
+
+  ```
+  import { MediaClient, MediaObserver, MediaSubscribable, MediaSubscription } from '@atlaskit/media-client';
+
+  const mediaClient = new MediaClient({ authProvider });
+
+  const fileStateSubscribable: MediaSubscribable<FileState> = mediaClient.file.getFileState(id);
+
+  const mediaObserver: MediaObserver<FileState> = {
+    next: (fileState) => {
+      nextCallback(fileState)
+    },
+    error: (error) => {
+      errorCallback(error)
+    },
+  };
+
+  const subscription: MediaSubscription = fileStateSubscribable.subscribe(mediaObserver);
+
+  subscription.unsubscribe();
+  ```
+
+  upload:
+  The returned type of this function has changed from RxJs ReplaySubject to MediaSubscribable.
+
+  ```
+  import { MediaClient, MediaObserver, MediaSubscribable, MediaSubscription } from '@atlaskit/media-client';
+
+  const mediaClient = new MediaClient({ authProvider });
+
+  const uploadFileSubscribable: MediaSubscribable<FileState> = mediaClient.file.upload(uploadableFile);
+
+  const mediaObserver: MediaObserver<FileState> = {
+    next: (fileState) => {
+      nextCallback(fileState)
+    },
+    error: (error) => {
+      errorCallback(error)
+    },
+  };
+
+  const subscription: MediaSubscription = uploadFileSubscribable.subscribe(mediaObserver);
+
+  subscription.unsubscribe();
+  ```
+
+  getItems:
+  The returned type of this function has changed from RxJs ReplaySubject to MediaSubscribable.
+
+  ```
+  import { MediaClient, MediaObserver, MediaSubscribable, MediaSubscription } from '@atlaskit/media-client';
+
+  const mediaClient = new MediaClient({ authProvider });
+
+  const collectionItemsSubscribable: MediaSubscribable<MediaCollectionItem[]> = mediaClient.collection.getItems(collectionName);
+
+  const mediaObserver: MediaObserver<MediaCollectionItem[]> = {
+    next: (items) => {
+      nextCallback(items)
+    },
+    error: (error) => {
+      errorCallback(error)
+    },
+  };
+
+  const subscription: MediaSubscription = collectionItemsSubscribable.subscribe(mediaObserver);
+
+  subscription.unsubscribe();
+  ```
+
+### Minor Changes
+
+- [`f862d5ae7aa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f862d5ae7aa) - remove RxJs peer dependency
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.4.0
 
 ### Minor Changes

package/dist/cjs/client/collection-fetcher.js

@@ -25,6 +25,8 @@ var _fileStreamsCache = require("../file-streams-cache");
 
 var _fileState = require("../models/file-state");
 
+var _toMediaSubscribable = require("../utils/toMediaSubscribable");
+
 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; }
@@ -114,7 +116,7 @@ var CollectionFetcher = /*#__PURE__*/function () {
       }).catch(function (error) {
         return subject.error(error);
       });
-      return subject;
+      return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
     }
   }, {
     key: "removeFile",

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

@@ -69,11 +69,11 @@ var _overrideMediaTypeIfUnknown = require("../../utils/overrideMediaTypeIfUnknow
 
 var _convertBase64ToBlob = require("../../utils/convertBase64ToBlob");
 
-var _observableToPromise = require("../../utils/observableToPromise");
+var _mediaSubscribableToPromise = require("../../utils/mediaSubscribableToPromise");
 
 var _getDimensionsFromBlob = require("../../utils/getDimensionsFromBlob");
 
-var _createFileStateSubject = require("../../utils/createFileStateSubject");
+var _createMediaSubject = require("../../utils/createMediaSubject");
 
 var _mediaTypeUtils = require("@atlaskit/media-common/mediaTypeUtils");
 
@@ -83,6 +83,8 @@ var _polling = require("../../utils/polling");
 
 var _detectEmptyFile = require("../../utils/detectEmptyFile");
 
+var _toMediaSubscribable = require("../../utils/toMediaSubscribable");
+
 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; }
@@ -93,7 +95,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
 
     (0, _classCallCheck2.default)(this, FileFetcherImpl);
     (0, _defineProperty2.default)(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey) {
-      var subject = (0, _createFileStateSubject.createFileStateSubject)();
+      var subject = (0, _createMediaSubject.createMediaSubject)();
       var poll = new _polling.PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
 
       poll.onError = function (error) {
@@ -175,22 +177,22 @@ var FileFetcherImpl = /*#__PURE__*/function () {
           occurrenceKey = options.occurrenceKey;
 
       if (!(0, _uuidValidate.default)(id)) {
-        var subject = (0, _createFileStateSubject.createFileStateSubject)();
+        var subject = (0, _createMediaSubject.createMediaSubject)();
         subject.error(new _error.FileFetcherError('invalidFileId', id, {
           collectionName: collectionName,
           occurrenceKey: occurrenceKey
         }));
-        return subject;
+        return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
       }
 
-      return (0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
+      return (0, _toMediaSubscribable.toMediaSubscribable)((0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
         return _this2.createDownloadFileStream(id, collectionName);
-      });
+      }));
     }
   }, {
     key: "getCurrentState",
     value: function getCurrentState(id, options) {
-      return (0, _observableToPromise.observableToPromise)(this.getFileState(id, options));
+      return (0, _mediaSubscribableToPromise.mediaSubscribableToPromise)(this.getFileState(id, options));
     }
   }, {
     key: "getArtifactURL",
@@ -246,7 +248,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
               case 0:
                 uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
                 id = uploadableFileUpfrontIds.id, occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
-                subject = (0, _createFileStateSubject.createFileStateSubject)();
+                subject = (0, _createMediaSubject.createMediaSubject)();
                 deferredBlob = fetch(url).then(function (response) {
                   return response.blob();
                 }).catch(function () {
@@ -408,7 +410,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
       var preview; // TODO [MSW-796]: get file size for base64
 
       var mediaType = (0, _getMediaTypeFromUploadableFile.getMediaTypeFromUploadableFile)(file);
-      var subject = (0, _createFileStateSubject.createFileStateSubject)();
+      var subject = (0, _createMediaSubject.createMediaSubject)();
       var processingSubscription = new _Subscription.Subscription();
 
       if (content instanceof Blob) {
@@ -480,7 +482,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
         });
       }
 
-      return subject;
+      return (0, _toMediaSubscribable.toMediaSubscribable)(subject);
     }
   }, {
     key: "downloadBinary",
@@ -610,7 +612,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                   data: copiedFileWithMimeType
                 });
                 fileCache = cache.get(copiedId);
-                subject = fileCache || (0, _createFileStateSubject.createFileStateSubject)(); // if we were passed a "preview", we propagate it into the copiedFileState
+                subject = fileCache || (0, _createMediaSubject.createMediaSubject)(); // if we were passed a "preview", we propagate it into the copiedFileState
 
                 previewOverride = !(0, _fileState.isErrorFileState)(copiedFileState) && !!preview ? {
                   preview: preview
@@ -678,7 +680,7 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                     _fileCache.error(_context6.t3);
                   } else {
                     // Create a new subject with the error state for new subscriptions
-                    cache.set(id, (0, _createFileStateSubject.createFileStateSubject)(_context6.t3));
+                    cache.set(id, (0, _createMediaSubject.createMediaSubject)(_context6.t3));
                   }
                 }
 

package/dist/cjs/index.js

@@ -99,10 +99,16 @@ Object.defineProperty(exports, "checkWebpSupport", {
     return _checkWebpSupport.checkWebpSupport;
   }
 });
-Object.defineProperty(exports, "createFileStateSubject", {
+Object.defineProperty(exports, "createMediaSubject", {
   enumerable: true,
   get: function get() {
-    return _createFileStateSubject.createFileStateSubject;
+    return _createMediaSubject.createMediaSubject;
+  }
+});
+Object.defineProperty(exports, "createMediaSubscribable", {
+  enumerable: true,
+  get: function get() {
+    return _toMediaSubscribable.createMediaSubscribable;
   }
 });
 Object.defineProperty(exports, "createUrl", {
@@ -328,12 +334,6 @@ Object.defineProperty(exports, "objectToQueryString", {
     return _url.objectToQueryString;
   }
 });
-Object.defineProperty(exports, "observableToPromise", {
-  enumerable: true,
-  get: function get() {
-    return _observableToPromise.observableToPromise;
-  }
-});
 Object.defineProperty(exports, "request", {
   enumerable: true,
   get: function get() {
@@ -346,12 +346,6 @@ Object.defineProperty(exports, "safeUnsubscribe", {
     return _safeUnsubscribe.safeUnsubscribe;
   }
 });
-Object.defineProperty(exports, "toMediaSubscribable", {
-  enumerable: true,
-  get: function get() {
-    return _toMediaSubscribable.toMediaSubscribable;
-  }
-});
 Object.defineProperty(exports, "uploadFile", {
   enumerable: true,
   get: function get() {
@@ -403,11 +397,9 @@ var _isImageRemote = require("./utils/isImageRemote");
 
 var _checkWebpSupport = require("./utils/checkWebpSupport");
 
-var _observableToPromise = require("./utils/observableToPromise");
-
 var _getDimensionsFromBlob = require("./utils/getDimensionsFromBlob");
 
-var _createFileStateSubject = require("./utils/createFileStateSubject");
+var _createMediaSubject = require("./utils/createMediaSubject");
 
 var _safeUnsubscribe = require("./utils/safeUnsubscribe");
 
@@ -425,6 +417,7 @@ var _constants = require("./constants");
 
 var _mediaTypeUtils = require("@atlaskit/media-common/mediaTypeUtils");
 
+// TODO: remove access to media file stream cache https://product-fabric.atlassian.net/browse/MEX-1417
 // TODO MEX-659 Remove these exports when all the usages from media-client are replaced with media-common.
 
 /**

package/dist/cjs/utils/{createFileStateSubject.js → createMediaSubject.js}

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createFileStateSubject = void 0;
+exports.createMediaSubject = createMediaSubject;
 
 var _ReplaySubject = require("rxjs/ReplaySubject");
 
-var createFileStateSubject = function createFileStateSubject(initialState) {
+function createMediaSubject(initialState) {
   var subject = new _ReplaySubject.ReplaySubject(1);
 
   if (initialState instanceof Error) {
@@ -17,6 +17,4 @@ var createFileStateSubject = function createFileStateSubject(initialState) {
   }
 
   return subject;
-};
-
-exports.createFileStateSubject = createFileStateSubject;
+}

package/dist/cjs/utils/{observableToPromise.js → mediaSubscribableToPromise.js}

@@ -3,21 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.observableToPromise = void 0;
+exports.mediaSubscribableToPromise = void 0;
 
 var _Subscription = require("rxjs/Subscription");
 
 /**
- * We're using this custom helper in place of ".toPromise()" to transform the first value emitted by an Observable or Subject into a Promise.
- * Note that in RxJS 7 ".toPromise()" is deprecated and replaced by "firstValueFrom()/.lastValueFrom()"
+ * This is a helper to transform the first value emitted by an MediaSubscribable into a Promise.
  *
- * @param observable a given Observable<T> or Subject<T>
+ * @param mediaSubscribable a given MediaSubscribable<MediaSubscribableItem>
  * @param subscription a default Subscription (this parameter exists for testing purpose)
  */
-var observableToPromise = function observableToPromise(observable) {
+var mediaSubscribableToPromise = function mediaSubscribableToPromise(mediaSubscribable) {
   var subscription = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new _Subscription.Subscription();
   return new Promise(function (resolve, reject) {
-    return subscription.add(observable.subscribe({
+    return subscription.add(mediaSubscribable.subscribe({
       next: function next(state) {
         resolve(state);
         subscription.unsubscribe();
@@ -30,4 +29,4 @@ var observableToPromise = function observableToPromise(observable) {
   });
 };
 
-exports.observableToPromise = observableToPromise;
+exports.mediaSubscribableToPromise = mediaSubscribableToPromise;

package/dist/cjs/utils/mobileUpload/helpers.js

@@ -19,7 +19,7 @@ var _map = require("rxjs/operators/map");
 
 var _fileState = require("../../models/file-state");
 
-var _createFileStateSubject = require("../createFileStateSubject");
+var _createMediaSubject = require("../createMediaSubject");
 
 var _detectEmptyFile = require("../detectEmptyFile");
 
@@ -38,7 +38,7 @@ var createMobileFileStateSubject = function createMobileFileStateSubject(service
 exports.createMobileFileStateSubject = createMobileFileStateSubject;
 
 var createMobileDownloadFileStream = function createMobileDownloadFileStream(dataloader, id, collectionName, occurrenceKey) {
-  var subject = (0, _createFileStateSubject.createFileStateSubject)();
+  var subject = (0, _createMediaSubject.createMediaSubject)();
   var poll = new _polling.PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
 
   poll.onError = function (error) {

package/dist/cjs/utils/toMediaSubscribable.js

@@ -3,9 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.createMediaSubscribable = createMediaSubscribable;
 exports.toMediaSubscribable = toMediaSubscribable;
 
-// Each of these makes one of the PartialObserver attrs required:
+var _createMediaSubject = require("./createMediaSubject");
+
 function toMediaSubscribable(observable) {
   return {
     subscribe: function subscribe(observer) {
@@ -19,4 +21,8 @@ function toMediaSubscribable(observable) {
       };
     }
   };
+}
+
+function createMediaSubscribable(mediaSubscribableItem) {
+  return toMediaSubscribable((0, _createMediaSubject.createMediaSubject)(mediaSubscribableItem));
 }

package/dist/cjs/version.json

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

package/dist/es2019/client/collection-fetcher.js

@@ -1,6 +1,7 @@
 import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { getFileStreamsCache } from '../file-streams-cache';
 import { mapMediaFileToFileState } from '../models/file-state';
+import { toMediaSubscribable } from '../utils/toMediaSubscribable';
 export const collectionCache = {};
 
 const createCacheEntry = () => ({
@@ -66,7 +67,7 @@ export class CollectionFetcher {
       collection.nextInclusiveStartKey = nextInclusiveStartKey;
       subject.next(collection.items);
     }).catch(error => subject.error(error));
-    return subject;
+    return toMediaSubscribable(subject);
   }
 
   async removeFile(id, collectionName, occurrenceKey) {

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

@@ -21,18 +21,19 @@ import { createFileDataloader } from '../../utils/createFileDataLoader';
 import { getMediaTypeFromUploadableFile } from '../../utils/getMediaTypeFromUploadableFile';
 import { overrideMediaTypeIfUnknown } from '../../utils/overrideMediaTypeIfUnknown';
 import { convertBase64ToBlob } from '../../utils/convertBase64ToBlob';
-import { observableToPromise } from '../../utils/observableToPromise';
+import { mediaSubscribableToPromise } from '../../utils/mediaSubscribableToPromise';
 import { getDimensionsFromBlob } from '../../utils/getDimensionsFromBlob';
-import { createFileStateSubject } from '../../utils/createFileStateSubject';
+import { createMediaSubject } from '../../utils/createMediaSubject';
 import { isMimeTypeSupportedByBrowser, getMediaTypeFromMimeType } from '@atlaskit/media-common/mediaTypeUtils';
 import { shouldFetchRemoteFileStates, shouldFetchRemoteFileStatesObservable } from '../../utils/shouldFetchRemoteFileStates';
 import { PollingFunction } from '../../utils/polling';
 import { isEmptyFile } from '../../utils/detectEmptyFile';
+import { toMediaSubscribable } from '../../utils/toMediaSubscribable';
 export { isFileFetcherError, FileFetcherError } from './error';
 export class FileFetcherImpl {
   constructor(mediaStore) {
     _defineProperty(this, "createDownloadFileStream", (id, collectionName, occurrenceKey) => {
-      const subject = createFileStateSubject();
+      const subject = createMediaSubject();
       const poll = new PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
 
       poll.onError = error => subject.error(error);
@@ -85,19 +86,19 @@ export class FileFetcherImpl {
     } = options;
 
     if (!isValidId(id)) {
-      const subject = createFileStateSubject();
+      const subject = createMediaSubject();
       subject.error(new FileFetcherError('invalidFileId', id, {
         collectionName,
         occurrenceKey
       }));
-      return subject;
+      return toMediaSubscribable(subject);
     }
 
-    return getFileStreamsCache().getOrInsert(id, () => this.createDownloadFileStream(id, collectionName));
+    return toMediaSubscribable(getFileStreamsCache().getOrInsert(id, () => this.createDownloadFileStream(id, collectionName)));
   }
 
   getCurrentState(id, options) {
-    return observableToPromise(this.getFileState(id, options));
+    return mediaSubscribableToPromise(this.getFileState(id, options));
   }
 
   getArtifactURL(artifacts, artifactName, collectionName) {
@@ -140,7 +141,7 @@ export class FileFetcherImpl {
       id,
       occurrenceKey
     } = uploadableFileUpfrontIds;
-    const subject = createFileStateSubject();
+    const subject = createMediaSubject();
     const deferredBlob = fetch(url).then(response => response.blob()).catch(() => undefined);
     const preview = new Promise(async (resolve, reject) => {
       const blob = await deferredBlob;
@@ -231,7 +232,7 @@ export class FileFetcherImpl {
     let preview; // TODO [MSW-796]: get file size for base64
 
     const mediaType = getMediaTypeFromUploadableFile(file);
-    const subject = createFileStateSubject();
+    const subject = createMediaSubject();
     const processingSubscription = new Subscription();
 
     if (content instanceof Blob) {
@@ -306,7 +307,7 @@ export class FileFetcherImpl {
       });
     }
 
-    return subject;
+    return toMediaSubscribable(subject);
   }
 
   async downloadBinary(id, name = 'download', collectionName) {
@@ -379,7 +380,7 @@ export class FileFetcherImpl {
         data: copiedFileWithMimeType
       });
       const fileCache = cache.get(copiedId);
-      const subject = fileCache || createFileStateSubject(); // if we were passed a "preview", we propagate it into the copiedFileState
+      const subject = fileCache || createMediaSubject(); // if we were passed a "preview", we propagate it into the copiedFileState
 
       const previewOverride = !isErrorFileState(copiedFileState) && !!preview ? {
         preview
@@ -423,7 +424,7 @@ export class FileFetcherImpl {
           fileCache.error(error);
         } else {
           // Create a new subject with the error state for new subscriptions
-          cache.set(id, createFileStateSubject(error));
+          cache.set(id, createMediaSubject(error));
         }
       }
 

package/dist/es2019/index.js

@@ -4,6 +4,7 @@ export { isPreviewableType, isMediaCollectionItemFullDetails } from './models/me
 export { getArtifactUrl } from './models/artifacts';
 export { isMediaClientError, getMediaClientErrorReason } from './models/errors';
 export { isUploadingFileState, isProcessingFileState, isProcessedFileState, isErrorFileState, isPreviewableFileState, isFinalFileState, isImageRepresentationReady, mapMediaFileToFileState, mapMediaItemToFileState } from './models/file-state';
+// TODO: remove access to media file stream cache https://product-fabric.atlassian.net/browse/MEX-1417
 export { getFileStreamsCache, StreamsCache } from './file-streams-cache';
 export { uploadFile } from './uploader';
 export { request, RequestError, isRequestError, isRateLimitedError } from './utils/request';
@@ -17,15 +18,14 @@ export { MediaClient } from './client/media-client';
 export { StargateClient } from './client/stargate-client';
 export { isImageRemote } from './utils/isImageRemote';
 export { checkWebpSupport } from './utils/checkWebpSupport';
-export { observableToPromise } from './utils/observableToPromise';
 export { getDimensionsFromBlob } from './utils/getDimensionsFromBlob';
-export { createFileStateSubject } from './utils/createFileStateSubject';
+export { createMediaSubject } from './utils/createMediaSubject';
 export { safeUnsubscribe } from './utils/safeUnsubscribe';
 export { isFileIdentifier, isExternalImageIdentifier, isDifferentIdentifier } from './identifier';
 export { withMediaClient, getMediaClient } from './utils/with-media-client-hoc';
 export { globalMediaEventEmitter } from './globalMediaEventEmitter';
 export { isMediaBlobUrl, getAttrsFromUrl, addFileAttrsToUrl, objectToQueryString } from './utils/url';
-export { toMediaSubscribable } from './utils/toMediaSubscribable';
+export { createMediaSubscribable } from './utils/toMediaSubscribable';
 export { RECENTS_COLLECTION, MAX_RESOLUTION } from './constants'; // TODO MEX-659 Remove these exports when all the usages from media-client are replaced with media-common.
 
 import { getMediaTypeFromMimeType as _getMediaTypeFromMimeType, isImageMimeTypeSupportedByBrowser as _isImageMimeTypeSupportedByBrowser, isDocumentMimeTypeSupportedByBrowser as _isDocumentMimeTypeSupportedByBrowser, isMimeTypeSupportedByBrowser as _isMimeTypeSupportedByBrowser, isImageMimeTypeSupportedByServer as _isImageMimeTypeSupportedByServer, isDocumentMimeTypeSupportedByServer as _isDocumentMimeTypeSupportedByServer, isAudioMimeTypeSupportedByServer as _isAudioMimeTypeSupportedByServer, isVideoMimeTypeSupportedByServer as _isVideoMimeTypeSupportedByServer, isUnknownMimeTypeSupportedByServer as _isUnknownMimeTypeSupportedByServer, isMimeTypeSupportedByServer as _isMimeTypeSupportedByServer } from '@atlaskit/media-common/mediaTypeUtils';

package/dist/es2019/utils/{createFileStateSubject.js → createMediaSubject.js}

@@ -1,5 +1,5 @@
 import { ReplaySubject } from 'rxjs/ReplaySubject';
-export const createFileStateSubject = initialState => {
+export function createMediaSubject(initialState) {
   const subject = new ReplaySubject(1);
 
   if (initialState instanceof Error) {
@@ -9,4 +9,4 @@ export const createFileStateSubject = initialState => {
   }
 
   return subject;
-};
+}

package/dist/es2019/utils/mediaSubscribableToPromise.js

@@ -0,0 +1,20 @@
+import { Subscription } from 'rxjs/Subscription';
+
+/**
+ * This is a helper to transform the first value emitted by an MediaSubscribable into a Promise.
+ *
+ * @param mediaSubscribable a given MediaSubscribable<MediaSubscribableItem>
+ * @param subscription a default Subscription (this parameter exists for testing purpose)
+ */
+export const mediaSubscribableToPromise = (mediaSubscribable, subscription = new Subscription()) => {
+  return new Promise((resolve, reject) => subscription.add(mediaSubscribable.subscribe({
+    next: state => {
+      resolve(state);
+      subscription.unsubscribe();
+    },
+    error: error => {
+      reject(error);
+      subscription.unsubscribe();
+    }
+  })));
+};

package/dist/es2019/utils/mobileUpload/helpers.js

@@ -2,7 +2,7 @@ import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { from } from 'rxjs/observable/from';
 import { map } from 'rxjs/operators/map';
 import { mapMediaItemToFileState } from '../../models/file-state';
-import { createFileStateSubject } from '../createFileStateSubject';
+import { createMediaSubject } from '../createMediaSubject';
 import { isEmptyFile } from '../detectEmptyFile';
 import { PollingFunction } from '../polling';
 import { MobileUploadError } from './error';
@@ -12,7 +12,7 @@ export const createMobileFileStateSubject = service => {
   return subject;
 };
 export const createMobileDownloadFileStream = (dataloader, id, collectionName, occurrenceKey) => {
-  const subject = createFileStateSubject();
+  const subject = createMediaSubject();
   const poll = new PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
 
   poll.onError = error => subject.error(error);

package/dist/es2019/utils/toMediaSubscribable.js

@@ -1,4 +1,4 @@
-// Each of these makes one of the PartialObserver attrs required:
+import { createMediaSubject } from './createMediaSubject';
 export function toMediaSubscribable(observable) {
   return {
     subscribe: observer => {
@@ -12,4 +12,7 @@ export function toMediaSubscribable(observable) {
       };
     }
   };
+}
+export function createMediaSubscribable(mediaSubscribableItem) {
+  return toMediaSubscribable(createMediaSubject(mediaSubscribableItem));
 }

package/dist/es2019/version.json

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

package/dist/esm/client/collection-fetcher.js

@@ -12,6 +12,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { getFileStreamsCache } from '../file-streams-cache';
 import { mapMediaFileToFileState } from '../models/file-state';
+import { toMediaSubscribable } from '../utils/toMediaSubscribable';
 export var collectionCache = {};
 
 var createCacheEntry = function createCacheEntry() {
@@ -97,7 +98,7 @@ export var CollectionFetcher = /*#__PURE__*/function () {
       }).catch(function (error) {
         return subject.error(error);
       });
-      return subject;
+      return toMediaSubscribable(subject);
     }
   }, {
     key: "removeFile",

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

@@ -30,13 +30,14 @@ import { createFileDataloader } from '../../utils/createFileDataLoader';
 import { getMediaTypeFromUploadableFile } from '../../utils/getMediaTypeFromUploadableFile';
 import { overrideMediaTypeIfUnknown } from '../../utils/overrideMediaTypeIfUnknown';
 import { convertBase64ToBlob } from '../../utils/convertBase64ToBlob';
-import { observableToPromise } from '../../utils/observableToPromise';
+import { mediaSubscribableToPromise } from '../../utils/mediaSubscribableToPromise';
 import { getDimensionsFromBlob } from '../../utils/getDimensionsFromBlob';
-import { createFileStateSubject } from '../../utils/createFileStateSubject';
+import { createMediaSubject } from '../../utils/createMediaSubject';
 import { isMimeTypeSupportedByBrowser, getMediaTypeFromMimeType } from '@atlaskit/media-common/mediaTypeUtils';
 import { shouldFetchRemoteFileStates, shouldFetchRemoteFileStatesObservable } from '../../utils/shouldFetchRemoteFileStates';
 import { PollingFunction } from '../../utils/polling';
 import { isEmptyFile } from '../../utils/detectEmptyFile';
+import { toMediaSubscribable } from '../../utils/toMediaSubscribable';
 export { isFileFetcherError, FileFetcherError } from './error';
 export var FileFetcherImpl = /*#__PURE__*/function () {
   function FileFetcherImpl(mediaStore) {
@@ -45,7 +46,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
     _classCallCheck(this, FileFetcherImpl);
 
     _defineProperty(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey) {
-      var subject = createFileStateSubject();
+      var subject = createMediaSubject();
       var poll = new PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
 
       poll.onError = function (error) {
@@ -128,22 +129,22 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
           occurrenceKey = options.occurrenceKey;
 
       if (!isValidId(id)) {
-        var subject = createFileStateSubject();
+        var subject = createMediaSubject();
         subject.error(new FileFetcherError('invalidFileId', id, {
           collectionName: collectionName,
           occurrenceKey: occurrenceKey
         }));
-        return subject;
+        return toMediaSubscribable(subject);
       }
 
-      return getFileStreamsCache().getOrInsert(id, function () {
+      return toMediaSubscribable(getFileStreamsCache().getOrInsert(id, function () {
         return _this2.createDownloadFileStream(id, collectionName);
-      });
+      }));
     }
   }, {
     key: "getCurrentState",
     value: function getCurrentState(id, options) {
-      return observableToPromise(this.getFileState(id, options));
+      return mediaSubscribableToPromise(this.getFileState(id, options));
     }
   }, {
     key: "getArtifactURL",
@@ -199,7 +200,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               case 0:
                 uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
                 id = uploadableFileUpfrontIds.id, occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
-                subject = createFileStateSubject();
+                subject = createMediaSubject();
                 deferredBlob = fetch(url).then(function (response) {
                   return response.blob();
                 }).catch(function () {
@@ -361,7 +362,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       var preview; // TODO [MSW-796]: get file size for base64
 
       var mediaType = getMediaTypeFromUploadableFile(file);
-      var subject = createFileStateSubject();
+      var subject = createMediaSubject();
       var processingSubscription = new Subscription();
 
       if (content instanceof Blob) {
@@ -433,7 +434,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         });
       }
 
-      return subject;
+      return toMediaSubscribable(subject);
     }
   }, {
     key: "downloadBinary",
@@ -562,7 +563,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   data: copiedFileWithMimeType
                 });
                 fileCache = cache.get(copiedId);
-                subject = fileCache || createFileStateSubject(); // if we were passed a "preview", we propagate it into the copiedFileState
+                subject = fileCache || createMediaSubject(); // if we were passed a "preview", we propagate it into the copiedFileState
 
                 previewOverride = !isErrorFileState(copiedFileState) && !!preview ? {
                   preview: preview
@@ -630,7 +631,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                     _fileCache.error(_context6.t3);
                   } else {
                     // Create a new subject with the error state for new subscriptions
-                    cache.set(id, createFileStateSubject(_context6.t3));
+                    cache.set(id, createMediaSubject(_context6.t3));
                   }
                 }
 

package/dist/esm/index.js

@@ -4,6 +4,7 @@ export { isPreviewableType, isMediaCollectionItemFullDetails } from './models/me
 export { getArtifactUrl } from './models/artifacts';
 export { isMediaClientError, getMediaClientErrorReason } from './models/errors';
 export { isUploadingFileState, isProcessingFileState, isProcessedFileState, isErrorFileState, isPreviewableFileState, isFinalFileState, isImageRepresentationReady, mapMediaFileToFileState, mapMediaItemToFileState } from './models/file-state';
+// TODO: remove access to media file stream cache https://product-fabric.atlassian.net/browse/MEX-1417
 export { getFileStreamsCache, StreamsCache } from './file-streams-cache';
 export { uploadFile } from './uploader';
 export { request, RequestError, isRequestError, isRateLimitedError } from './utils/request';
@@ -17,15 +18,14 @@ export { MediaClient } from './client/media-client';
 export { StargateClient } from './client/stargate-client';
 export { isImageRemote } from './utils/isImageRemote';
 export { checkWebpSupport } from './utils/checkWebpSupport';
-export { observableToPromise } from './utils/observableToPromise';
 export { getDimensionsFromBlob } from './utils/getDimensionsFromBlob';
-export { createFileStateSubject } from './utils/createFileStateSubject';
+export { createMediaSubject } from './utils/createMediaSubject';
 export { safeUnsubscribe } from './utils/safeUnsubscribe';
 export { isFileIdentifier, isExternalImageIdentifier, isDifferentIdentifier } from './identifier';
 export { withMediaClient, getMediaClient } from './utils/with-media-client-hoc';
 export { globalMediaEventEmitter } from './globalMediaEventEmitter';
 export { isMediaBlobUrl, getAttrsFromUrl, addFileAttrsToUrl, objectToQueryString } from './utils/url';
-export { toMediaSubscribable } from './utils/toMediaSubscribable';
+export { createMediaSubscribable } from './utils/toMediaSubscribable';
 export { RECENTS_COLLECTION, MAX_RESOLUTION } from './constants'; // TODO MEX-659 Remove these exports when all the usages from media-client are replaced with media-common.
 
 import { getMediaTypeFromMimeType as _getMediaTypeFromMimeType, isImageMimeTypeSupportedByBrowser as _isImageMimeTypeSupportedByBrowser, isDocumentMimeTypeSupportedByBrowser as _isDocumentMimeTypeSupportedByBrowser, isMimeTypeSupportedByBrowser as _isMimeTypeSupportedByBrowser, isImageMimeTypeSupportedByServer as _isImageMimeTypeSupportedByServer, isDocumentMimeTypeSupportedByServer as _isDocumentMimeTypeSupportedByServer, isAudioMimeTypeSupportedByServer as _isAudioMimeTypeSupportedByServer, isVideoMimeTypeSupportedByServer as _isVideoMimeTypeSupportedByServer, isUnknownMimeTypeSupportedByServer as _isUnknownMimeTypeSupportedByServer, isMimeTypeSupportedByServer as _isMimeTypeSupportedByServer } from '@atlaskit/media-common/mediaTypeUtils';

package/dist/esm/utils/{createFileStateSubject.js → createMediaSubject.js}

@@ -1,5 +1,5 @@
 import { ReplaySubject } from 'rxjs/ReplaySubject';
-export var createFileStateSubject = function createFileStateSubject(initialState) {
+export function createMediaSubject(initialState) {
   var subject = new ReplaySubject(1);
 
   if (initialState instanceof Error) {
@@ -9,4 +9,4 @@ export var createFileStateSubject = function createFileStateSubject(initialState
   }
 
   return subject;
-};
+}

package/dist/esm/utils/{observableToPromise.js → mediaSubscribableToPromise.js}

@@ -1,16 +1,15 @@
 import { Subscription } from 'rxjs/Subscription';
+
 /**
- * We're using this custom helper in place of ".toPromise()" to transform the first value emitted by an Observable or Subject into a Promise.
- * Note that in RxJS 7 ".toPromise()" is deprecated and replaced by "firstValueFrom()/.lastValueFrom()"
+ * This is a helper to transform the first value emitted by an MediaSubscribable into a Promise.
  *
- * @param observable a given Observable<T> or Subject<T>
+ * @param mediaSubscribable a given MediaSubscribable<MediaSubscribableItem>
  * @param subscription a default Subscription (this parameter exists for testing purpose)
  */
-
-export var observableToPromise = function observableToPromise(observable) {
+export var mediaSubscribableToPromise = function mediaSubscribableToPromise(mediaSubscribable) {
   var subscription = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new Subscription();
   return new Promise(function (resolve, reject) {
-    return subscription.add(observable.subscribe({
+    return subscription.add(mediaSubscribable.subscribe({
       next: function next(state) {
         resolve(state);
         subscription.unsubscribe();

package/dist/esm/utils/mobileUpload/helpers.js

@@ -4,7 +4,7 @@ import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { from } from 'rxjs/observable/from';
 import { map } from 'rxjs/operators/map';
 import { mapMediaItemToFileState } from '../../models/file-state';
-import { createFileStateSubject } from '../createFileStateSubject';
+import { createMediaSubject } from '../createMediaSubject';
 import { isEmptyFile } from '../detectEmptyFile';
 import { PollingFunction } from '../polling';
 import { MobileUploadError } from './error';
@@ -16,7 +16,7 @@ export var createMobileFileStateSubject = function createMobileFileStateSubject(
   return subject;
 };
 export var createMobileDownloadFileStream = function createMobileDownloadFileStream(dataloader, id, collectionName, occurrenceKey) {
-  var subject = createFileStateSubject();
+  var subject = createMediaSubject();
   var poll = new PollingFunction(); // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
 
   poll.onError = function (error) {

package/dist/esm/utils/toMediaSubscribable.js

@@ -1,4 +1,4 @@
-// Each of these makes one of the PartialObserver attrs required:
+import { createMediaSubject } from './createMediaSubject';
 export function toMediaSubscribable(observable) {
   return {
     subscribe: function subscribe(observer) {
@@ -12,4 +12,7 @@ export function toMediaSubscribable(observable) {
       };
     }
   };
+}
+export function createMediaSubscribable(mediaSubscribableItem) {
+  return toMediaSubscribable(createMediaSubject(mediaSubscribableItem));
 }

package/dist/esm/version.json

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

package/dist/types/client/collection-fetcher.d.ts

@@ -2,6 +2,7 @@ import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { FileDetails, FileItem } from '../models/item';
 import { MediaCollectionItem } from '../models/media';
 import { MediaStore, MediaStoreGetCollectionItemsParams } from './media-store';
+import { MediaSubscribable } from '../utils/toMediaSubscribable';
 export interface MediaCollectionFileItemDetails extends FileDetails {
     occurrenceKey: string;
 }
@@ -28,7 +29,7 @@ export declare class CollectionFetcher {
     private createFileStateObserver;
     private populateCache;
     private removeFromCache;
-    getItems(collectionName: string, params?: MediaStoreGetCollectionItemsParams): ReplaySubject<MediaCollectionItem[]>;
+    getItems(collectionName: string, params?: MediaStoreGetCollectionItemsParams): MediaSubscribable<MediaCollectionItem[]>;
     removeFile(id: string, collectionName: string, occurrenceKey?: string): Promise<void>;
     loadNextPage(collectionName: string, params?: MediaStoreGetCollectionItemsParams): Promise<void>;
 }

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

@@ -1,4 +1,3 @@
-import { ReplaySubject } from 'rxjs/ReplaySubject';
 import 'setimmediate';
 import { AuthProvider } from '@atlaskit/media-core';
 import { MediaStore, MediaStoreCopyFileWithTokenParams, TouchedFiles, TouchFileDescriptor } from '../media-store';
@@ -8,6 +7,7 @@ import { UploadableFile, UploadableFileUpfrontIds } from '../../uploader';
 import { MediaFileArtifacts } from '../../models/artifacts';
 import { UploadController } from '../../upload-controller';
 import { Dimensions } from '../../utils/getDimensionsFromBlob';
+import { MediaSubscribable } from '../../utils/toMediaSubscribable';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason, } from './error';
 export { isFileFetcherError, FileFetcherError } from './error';
 export interface CopySourceFile {
@@ -28,10 +28,10 @@ export declare type ExternalUploadPayload = {
     dimensions: Dimensions;
 };
 export interface FileFetcher {
-    getFileState(id: string, options?: GetFileOptions): ReplaySubject<FileState>;
+    getFileState(id: string, options?: GetFileOptions): MediaSubscribable<FileState>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     touchFiles(descriptors: TouchFileDescriptor[], collection?: string): Promise<TouchedFiles>;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds): ReplaySubject<FileState>;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds): MediaSubscribable<FileState>;
     uploadExternal(url: string, collection?: string): Promise<ExternalUploadPayload>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
@@ -42,7 +42,7 @@ export declare class FileFetcherImpl implements FileFetcher {
     private readonly mediaStore;
     private readonly dataloader;
     constructor(mediaStore: MediaStore);
-    getFileState(id: string, options?: GetFileOptions): ReplaySubject<FileState>;
+    getFileState(id: string, options?: GetFileOptions): MediaSubscribable<FileState>;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     getFileBinaryURL(id: string, collectionName?: string): Promise<string>;
@@ -50,7 +50,7 @@ export declare class FileFetcherImpl implements FileFetcher {
     touchFiles(descriptors: TouchFileDescriptor[], collection?: string): Promise<TouchedFiles>;
     private generateUploadableFileUpfrontIds;
     uploadExternal(url: string, collection?: string): Promise<ExternalUploadPayload>;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds): ReplaySubject<FileState>;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds): MediaSubscribable<FileState>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions): Promise<MediaFile>;
 }

package/dist/types/client/media-store/resolveAuth.d.ts

@@ -1,4 +1,4 @@
 import { Auth, AuthContext, AuthProvider } from '@atlaskit/media-core';
 export declare const DEFAULT_AUTH_PROVIDER_TIMEOUT = 10000;
 export declare const resolveAuth: (authProvider: AuthProvider, authContext?: AuthContext | undefined, authProviderTimeout?: number) => Promise<Auth>;
-export declare const resolveInitialAuth: (auth?: import("@atlaskit/media-core").ClientBasedAuth | import("@atlaskit/media-core").AsapBasedAuth | undefined) => Auth;
+export declare const resolveInitialAuth: (auth?: Auth | undefined) => Auth;

package/dist/types/globalMediaEventEmitter.d.ts

@@ -1,6 +1,6 @@
 import { UploadEventPayloadMap, EventPayloadListener } from './client/events';
 export declare const globalMediaEventEmitter: {
-    on<E extends "file-added" | "media-viewed">(event: E, listener: EventPayloadListener<UploadEventPayloadMap, E, any>): void;
-    off<E_1 extends "file-added" | "media-viewed">(event: E_1, listener: EventPayloadListener<UploadEventPayloadMap, E_1, any>): void;
-    emit<E_2 extends "file-added" | "media-viewed">(event: E_2, payload: UploadEventPayloadMap[E_2]): boolean | undefined;
+    on<E extends keyof UploadEventPayloadMap>(event: E, listener: EventPayloadListener<UploadEventPayloadMap, E, any>): void;
+    off<E_1 extends keyof UploadEventPayloadMap>(event: E_1, listener: EventPayloadListener<UploadEventPayloadMap, E_1, any>): void;
+    emit<E_2 extends keyof UploadEventPayloadMap>(event: E_2, payload: UploadEventPayloadMap[E_2]): boolean | undefined;
 };

package/dist/types/index.d.ts

@@ -33,21 +33,20 @@ export { StargateClient } from './client/stargate-client';
 export type { EdgeData } from './client/stargate-client';
 export { isImageRemote } from './utils/isImageRemote';
 export { checkWebpSupport } from './utils/checkWebpSupport';
-export { observableToPromise } from './utils/observableToPromise';
 export { getDimensionsFromBlob } from './utils/getDimensionsFromBlob';
 export type { Dimensions } from './utils/getDimensionsFromBlob';
-export { createFileStateSubject } from './utils/createFileStateSubject';
+export { createMediaSubject } from './utils/createMediaSubject';
 export { safeUnsubscribe } from './utils/safeUnsubscribe';
 export { isFileIdentifier, isExternalImageIdentifier, isDifferentIdentifier, } from './identifier';
 export type { Identifier, FileIdentifier, ExternalImageIdentifier, } from './identifier';
 export type { EventPayloadListener, UploadEventPayloadMap, MediaViewedEventPayload, } from './client/events';
 export { withMediaClient, getMediaClient } from './utils/with-media-client-hoc';
-export type { WithMediaClientConfig, WithMediaClientConfigProps, WithMediaClientFunction, } from './utils/with-media-client-hoc';
+export type { WithMediaClientConfig, WithMediaClientConfigProps, WithMediaClientFunction, WithMediaClient, } from './utils/with-media-client-hoc';
 export { globalMediaEventEmitter } from './globalMediaEventEmitter';
 export { isMediaBlobUrl, getAttrsFromUrl, addFileAttrsToUrl, objectToQueryString, } from './utils/url';
 export type { MediaBlobUrlAttrs } from './utils/url';
-export { toMediaSubscribable } from './utils/toMediaSubscribable';
-export type { MediaSubscribable, MediaSubscription, } from './utils/toMediaSubscribable';
+export { createMediaSubscribable } from './utils/toMediaSubscribable';
+export type { MediaSubscribable, MediaSubscription, MediaObserver, } from './utils/toMediaSubscribable';
 export { RECENTS_COLLECTION, MAX_RESOLUTION } from './constants';
 /**
  * @deprecated This export will be removed. Please use one from @atlaskit/media-common or @atlaskit/media-common/mediaTypeUtils

package/dist/types/models/file-state.d.ts

@@ -84,7 +84,7 @@ export declare const isUploadingFileState: (fileState: FileState) => fileState i
 export declare const isProcessingFileState: (fileState: FileState) => fileState is ProcessingFileState;
 export declare const isProcessedFileState: (fileState: FileState) => fileState is ProcessedFileState;
 export declare const isErrorFileState: (fileState: FileState) => fileState is ErrorFileState;
-export declare const isPreviewableFileState: (fileState: FileState) => fileState is (UploadingFileState & PreviewableFileState) | (ProcessingFileState & PreviewableFileState) | (ProcessedFileState & PreviewableFileState) | (ProcessingFailedState & PreviewableFileState);
+export declare const isPreviewableFileState: (fileState: FileState) => fileState is (UploadingFileState | ProcessingFileState | ProcessedFileState | ProcessingFailedState) & PreviewableFileState;
 export declare const isFinalFileState: (fileState: FileState) => fileState is ProcessedFileState | ProcessingFailedState | ErrorFileState;
 export declare const isImageRepresentationReady: (fileState: FileState) => boolean;
 export declare const mapMediaFileToFileState: (mediaFile: MediaStoreResponse<MediaFile>) => FileState;

package/dist/types/utils/createMediaSubject.d.ts

@@ -0,0 +1,3 @@
+import { ReplaySubject } from 'rxjs/ReplaySubject';
+import { MediaSubscribableItem } from '../models/media-subscribable';
+export declare function createMediaSubject<T extends MediaSubscribableItem>(initialState?: T | Error): ReplaySubject<T>;

package/dist/types/utils/imageResizeModeToFileImageMode.d.ts

@@ -1,3 +1,3 @@
 import { MediaStoreGetFileImageParams } from '../client/media-store';
 export declare type ImageResizeMode = 'crop' | 'fit' | 'full-fit' | 'stretchy-fit';
-export declare const imageResizeModeToFileImageMode: (resizeMode?: "crop" | "fit" | "full-fit" | "stretchy-fit" | undefined) => MediaStoreGetFileImageParams['mode'];
+export declare const imageResizeModeToFileImageMode: (resizeMode?: ImageResizeMode | undefined) => MediaStoreGetFileImageParams['mode'];

package/dist/types/utils/mediaSubscribableToPromise.d.ts

@@ -0,0 +1,10 @@
+import { Subscription } from 'rxjs/Subscription';
+import { MediaSubscribable } from './toMediaSubscribable';
+import { MediaSubscribableItem } from '../models/media-subscribable';
+/**
+ * This is a helper to transform the first value emitted by an MediaSubscribable into a Promise.
+ *
+ * @param mediaSubscribable a given MediaSubscribable<MediaSubscribableItem>
+ * @param subscription a default Subscription (this parameter exists for testing purpose)
+ */
+export declare const mediaSubscribableToPromise: <T extends MediaSubscribableItem>(mediaSubscribable: MediaSubscribable<T>, subscription?: Subscription) => Promise<T>;

package/dist/types/utils/overrideMediaTypeIfUnknown.d.ts

@@ -1,5 +1,5 @@
 import { FileState } from '../models/file-state';
 import { MediaType } from '../models/media';
-export declare const overrideMediaTypeIfUnknown: (fileState: FileState, mediaType?: "doc" | "audio" | "video" | "image" | "archive" | "unknown" | undefined) => {
-    mediaType?: "doc" | "audio" | "video" | "image" | "archive" | "unknown" | undefined;
+export declare const overrideMediaTypeIfUnknown: (fileState: FileState, mediaType?: MediaType | undefined) => {
+    mediaType?: MediaType | undefined;
 };

package/dist/types/utils/request/errors.d.ts

@@ -7,7 +7,7 @@ export declare class RequestError extends BaseMediaClientError<RequestErrorAttri
     constructor(reason: RequestErrorReason, metadata?: RequestErrorMetadata | undefined, innerError?: Error | undefined);
     get attributes(): {
         reason: RequestErrorReason;
-        method: "GET" | "POST" | "PUT" | "DELETE" | undefined;
+        method: import("./types").RequestMethod | undefined;
         endpoint: string | undefined;
         attempts: number | undefined;
         clientExhaustedRetries: boolean | undefined;

package/dist/types/utils/safeUnsubscribe.d.ts

@@ -1,2 +1,2 @@
-import { Subscription } from 'rxjs/Subscription';
-export declare const safeUnsubscribe: (subscription: Subscription) => void;
+import { MediaSubscription } from './toMediaSubscribable';
+export declare const safeUnsubscribe: (subscription: MediaSubscription) => void;

package/dist/types/utils/toMediaSubscribable.d.ts

@@ -6,12 +6,15 @@ export declare type MediaSubscription = {
 declare type PartialObserver<T extends MediaSubscribableItem> = {
     next?: (value: T) => void;
     error?: (err: any) => void;
+    complete?: () => void;
 };
 declare type NextObserver<T extends MediaSubscribableItem> = PartialObserver<T> & Required<Pick<PartialObserver<T>, 'next'>>;
 declare type ErrorObserver<T extends MediaSubscribableItem> = PartialObserver<T> & Required<Pick<PartialObserver<T>, 'error'>>;
-export declare type MediaObserver<T extends MediaSubscribableItem> = NextObserver<T> | ErrorObserver<T> | ((value: T) => void);
+declare type CompletionObserver<T extends MediaSubscribableItem> = PartialObserver<T> & Required<Pick<PartialObserver<T>, 'complete'>>;
+export declare type MediaObserver<T extends MediaSubscribableItem> = NextObserver<T> | ErrorObserver<T> | CompletionObserver<T> | ((value: T) => void);
 export declare type MediaSubscribable<T extends MediaSubscribableItem> = {
     subscribe(observer?: MediaObserver<T>): MediaSubscription;
 };
 export declare function toMediaSubscribable<T extends MediaSubscribableItem>(observable: ReplaySubject<T>): MediaSubscribable<T>;
+export declare function createMediaSubscribable<T extends MediaSubscribableItem>(mediaSubscribableItem?: T | Error): MediaSubscribable<T>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "14.4.0",
+  "version": "15.1.1",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -27,8 +27,8 @@
     }
   },
   "dependencies": {
-    "@atlaskit/chunkinator": "^3.0.0",
-    "@atlaskit/media-common": "^2.11.0",
+    "@atlaskit/chunkinator": "^3.1.0",
+    "@atlaskit/media-common": "^2.12.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
@@ -36,6 +36,7 @@
     "lru-fast": "^0.2.2",
     "query-string": "^6.14.1",
     "rusha": "^0.8.13",
+    "rxjs": "^5.5.0",
     "setimmediate": "^1.0.5",
     "uuid": "^3.1.0",
     "uuid-validate": "^0.0.3",
@@ -43,16 +44,15 @@
     "xstate": "^4.20.0"
   },
   "peerDependencies": {
-    "@atlaskit/media-core": "^32.2.0",
-    "react": "^16.8.0",
-    "rxjs": "^5.5.0"
+    "@atlaskit/media-core": "^32.3.1",
+    "react": "^16.8.0"
   },
   "devDependencies": {
-    "@atlaskit/button": "^16.2.0",
+    "@atlaskit/button": "^16.3.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^73.3.0",
-    "@atlaskit/media-core": "^32.2.0",
-    "@atlaskit/media-test-helpers": "^29.2.0",
+    "@atlaskit/media-card": "^73.5.0",
+    "@atlaskit/media-core": "^32.3.0",
+    "@atlaskit/media-test-helpers": "^29.4.0",
     "@atlaskit/ssr": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@types/deep-equal": "^1.0.1",
@@ -60,12 +60,10 @@
     "@types/uuid-validate": "^0.0.0",
     "enzyme": "^3.10.0",
     "fetch-mock": "^8.0.0",
-    "jest-fetch-mock": "^3.0.3",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
-    "rxjs": "^5.5.0",
     "styled-components": "^3.2.6",
-    "typescript": "3.9.6"
+    "typescript": "4.2.4"
   },
   "resolutions": {
     "lru-fast": "0.2.2"

package/dist/es2019/utils/observableToPromise.js

@@ -1,21 +0,0 @@
-import { Subscription } from 'rxjs/Subscription';
-/**
- * We're using this custom helper in place of ".toPromise()" to transform the first value emitted by an Observable or Subject into a Promise.
- * Note that in RxJS 7 ".toPromise()" is deprecated and replaced by "firstValueFrom()/.lastValueFrom()"
- *
- * @param observable a given Observable<T> or Subject<T>
- * @param subscription a default Subscription (this parameter exists for testing purpose)
- */
-
-export const observableToPromise = (observable, subscription = new Subscription()) => {
-  return new Promise((resolve, reject) => subscription.add(observable.subscribe({
-    next: state => {
-      resolve(state);
-      subscription.unsubscribe();
-    },
-    error: error => {
-      reject(error);
-      subscription.unsubscribe();
-    }
-  })));
-};

package/dist/types/utils/createFileStateSubject.d.ts

@@ -1,3 +0,0 @@
-import { ReplaySubject } from 'rxjs/ReplaySubject';
-import { FileState } from '../models/file-state';
-export declare const createFileStateSubject: (initialState?: Error | import("../models/file-state").UploadingFileState | import("../models/file-state").ProcessingFileState | import("../models/file-state").ProcessedFileState | import("../models/file-state").ProcessingFailedState | import("../models/file-state").ErrorFileState | undefined) => ReplaySubject<FileState>;

package/dist/types/utils/observableToPromise.d.ts

@@ -1,10 +0,0 @@
-import { Observable } from 'rxjs/Observable';
-import { Subscription } from 'rxjs/Subscription';
-/**
- * We're using this custom helper in place of ".toPromise()" to transform the first value emitted by an Observable or Subject into a Promise.
- * Note that in RxJS 7 ".toPromise()" is deprecated and replaced by "firstValueFrom()/.lastValueFrom()"
- *
- * @param observable a given Observable<T> or Subject<T>
- * @param subscription a default Subscription (this parameter exists for testing purpose)
- */
-export declare const observableToPromise: <T>(observable: Observable<T>, subscription?: Subscription) => Promise<T>;