@atlaskit/media-client 14.3.1 → 15.0.0

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/error.js

@@ -5,8 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isMobileUploadError = isMobileUploadError;
 exports.MobileUploadError = void 0;
+exports.isMobileUploadError = isMobileUploadError;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createMobileDownloadFileStream = exports.createMobileFileStateSubject = void 0;
+exports.createMobileFileStateSubject = exports.createMobileDownloadFileStream = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -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/mobileUpload/index.js

@@ -3,22 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "isMobileUploadError", {
-  enumerable: true,
-  get: function get() {
-    return _error.isMobileUploadError;
-  }
-});
 Object.defineProperty(exports, "MobileUploadError", {
   enumerable: true,
   get: function get() {
     return _error.MobileUploadError;
   }
 });
-Object.defineProperty(exports, "createServicesCache", {
+Object.defineProperty(exports, "createMobileFileStateSubject", {
   enumerable: true,
   get: function get() {
-    return _servicesCache.createServicesCache;
+    return _helpers.createMobileFileStateSubject;
   }
 });
 Object.defineProperty(exports, "createMobileUploadService", {
@@ -33,10 +27,16 @@ Object.defineProperty(exports, "createMobileUploadStateMachine", {
     return _stateMachine.createMobileUploadStateMachine;
   }
 });
-Object.defineProperty(exports, "createMobileFileStateSubject", {
+Object.defineProperty(exports, "createServicesCache", {
   enumerable: true,
   get: function get() {
-    return _helpers.createMobileFileStateSubject;
+    return _servicesCache.createServicesCache;
+  }
+});
+Object.defineProperty(exports, "isMobileUploadError", {
+  enumerable: true,
+  get: function get() {
+    return _error.isMobileUploadError;
   }
 });
 

package/dist/cjs/utils/mobileUpload/stateMachine/states/uploading.js

@@ -13,9 +13,9 @@ var _xstate = require("xstate");
 
 var _fileState = require("../../../../models/file-state");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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 machineUploadingState = {
   // Events

package/dist/cjs/utils/polling/errors.js

@@ -5,8 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPollingError = isPollingError;
 exports.PollingError = void 0;
+exports.isPollingError = isPollingError;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 

package/dist/cjs/utils/polling/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PollingFunction = exports.defaultPollingOptions = void 0;
+exports.defaultPollingOptions = exports.PollingFunction = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -19,9 +19,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _errors = require("./errors");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 // default polling options without using feature flags
 var defaultPollingOptions = {

package/dist/cjs/utils/request/errors.js

@@ -5,8 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isRequestError = isRequestError;
 exports.RequestError = void 0;
+exports.isRequestError = isRequestError;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 

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

@@ -5,26 +5,26 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.DEFAULT_RETRY_OPTIONS = void 0;
 exports.clientTimeoutPromise = clientTimeoutPromise;
-exports.waitPromise = waitPromise;
+exports.cloneRequestError = cloneRequestError;
+exports.createMapResponseToBlob = createMapResponseToBlob;
+exports.createMapResponseToJson = createMapResponseToJson;
+exports.createProcessFetchResponse = createProcessFetchResponse;
+exports.createRequestErrorFromResponse = createRequestErrorFromResponse;
+exports.createRequestErrorReason = createRequestErrorReason;
+exports.createUrl = createUrl;
+exports.extract = extract;
+exports.fetchRetry = fetchRetry;
 exports.isAbortedRequestError = isAbortedRequestError;
 exports.isFetchNetworkError = isFetchNetworkError;
 exports.isRateLimitedError = isRateLimitedError;
-exports.extract = extract;
 exports.mapAuthToRequestHeaders = mapAuthToRequestHeaders;
-exports.createUrl = createUrl;
-exports.withAuth = withAuth;
-exports.mapResponseToJson = mapResponseToJson;
 exports.mapResponseToBlob = mapResponseToBlob;
+exports.mapResponseToJson = mapResponseToJson;
 exports.mapResponseToVoid = mapResponseToVoid;
-exports.createMapResponseToJson = createMapResponseToJson;
-exports.createMapResponseToBlob = createMapResponseToBlob;
-exports.cloneRequestError = cloneRequestError;
-exports.fetchRetry = fetchRetry;
-exports.createRequestErrorReason = createRequestErrorReason;
-exports.createRequestErrorFromResponse = createRequestErrorFromResponse;
-exports.createProcessFetchResponse = createProcessFetchResponse;
-exports.DEFAULT_RETRY_OPTIONS = void 0;
+exports.waitPromise = waitPromise;
+exports.withAuth = withAuth;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -40,9 +40,9 @@ var _authQueryParameters = require("../../models/auth-query-parameters");
 
 var _errors = require("./errors");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 function clientTimeoutPromise(timeout) {
   return new Promise(function (resolve, reject) {

package/dist/cjs/utils/request/index.js

@@ -5,25 +5,25 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.request = request;
 Object.defineProperty(exports, "RequestError", {
   enumerable: true,
   get: function get() {
     return _errors.RequestError;
   }
 });
-Object.defineProperty(exports, "isRequestError", {
+Object.defineProperty(exports, "isRateLimitedError", {
   enumerable: true,
   get: function get() {
-    return _errors.isRequestError;
+    return _helpers.isRateLimitedError;
   }
 });
-Object.defineProperty(exports, "isRateLimitedError", {
+Object.defineProperty(exports, "isRequestError", {
   enumerable: true,
   get: function get() {
-    return _helpers.isRateLimitedError;
+    return _errors.isRequestError;
   }
 });
+exports.request = request;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 

package/dist/cjs/utils/setTimeoutPromise.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.rejectTimeout = exports.resolveTimeout = void 0;
+exports.resolveTimeout = exports.rejectTimeout = void 0;
 
 var resolveTimeout = function resolveTimeout(timeout, resolveWith) {
   return new Promise(function (resolve, _reject) {

package/dist/cjs/utils/toMediaSubscribable.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createMediaSubscribable = createMediaSubscribable;
+exports.toMediaSubscribable = toMediaSubscribable;
+
+var _createMediaSubject = require("./createMediaSubject");
+
+function toMediaSubscribable(observable) {
+  return {
+    subscribe: function subscribe(observer) {
+      var subscription = // This is needed to handle "subscribe" function overload.
+      // It allows accepting a single "next" callback function as an argument.
+      observer instanceof Function ? observable.subscribe(observer) : observable.subscribe(observer);
+      return {
+        unsubscribe: function unsubscribe() {
+          subscription.unsubscribe();
+        }
+      };
+    }
+  };
+}
+
+function createMediaSubscribable(mediaSubscribableItem) {
+  return toMediaSubscribable((0, _createMediaSubject.createMediaSubject)(mediaSubscribableItem));
+}

package/dist/cjs/utils/url.js

@@ -5,13 +5,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.addFileAttrsToUrl = exports.objectToQueryString = exports.getAttrsFromUrl = exports.isMediaBlobUrl = void 0;
+exports.objectToQueryString = exports.isMediaBlobUrl = exports.getAttrsFromUrl = exports.addFileAttrsToUrl = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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 mediaBlobUrlIdentifier = 'media-blob-url';
 

package/dist/cjs/utils/with-media-client-hoc.js

@@ -25,6 +25,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _mediaClient = require("../client/media-client");
 
+var _excluded = ["mediaClientConfig"];
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -74,7 +76,7 @@ var withMediaClient = function withMediaClient(Component, featureFlags) {
         // TODO MPT-315: clean up after we move mediaClientConfig into FileIdentifier
         var _this$props = this.props,
             mediaClientConfig = _this$props.mediaClientConfig,
-            otherProps = (0, _objectWithoutProperties2.default)(_this$props, ["mediaClientConfig"]);
+            otherProps = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
         var mediaClient = !mediaClientConfig ? createEmptyMediaClient(featureFlags) : getMediaClient(mediaClientConfig, featureFlags);
         return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, otherProps, {
           mediaClient: mediaClient

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "14.3.1",
+	"version": "15.0.0",
 	"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,14 +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 { 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/models/media-subscribable.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,18 @@
+import { createMediaSubject } from './createMediaSubject';
+export function toMediaSubscribable(observable) {
+  return {
+    subscribe: observer => {
+      const subscription = // This is needed to handle "subscribe" function overload.
+      // It allows accepting a single "next" callback function as an argument.
+      observer instanceof Function ? observable.subscribe(observer) : observable.subscribe(observer);
+      return {
+        unsubscribe: () => {
+          subscription.unsubscribe();
+        }
+      };
+    }
+  };
+}
+export function createMediaSubscribable(mediaSubscribableItem) {
+  return toMediaSubscribable(createMediaSubject(mediaSubscribableItem));
+}

package/dist/es2019/version.json

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

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

@@ -5,13 +5,14 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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) { _defineProperty(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; }
 
 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",