@atlaskit/media-client 20.2.1 → 21.1.0

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

@@ -95,26 +95,24 @@ export function mapResponseToJson(_x) {
 function _mapResponseToJson() {
   _mapResponseToJson = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(response) {
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            // eslint-disable-next-line no-console
-            console.warn('Helper is deprecated and will be remove in the next major version');
-            _context3.prev = 1;
-            _context3.next = 4;
-            return response.json();
-          case 4:
-            return _context3.abrupt("return", _context3.sent);
-          case 7:
-            _context3.prev = 7;
-            _context3.t0 = _context3["catch"](1);
-            throw new RequestError('serverInvalidBody', {
-              statusCode: response.status
-            }, _context3.t0 instanceof Error ? _context3.t0 : undefined);
-          case 10:
-          case "end":
-            return _context3.stop();
-        }
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          // eslint-disable-next-line no-console
+          console.warn('Helper is deprecated and will be remove in the next major version');
+          _context3.prev = 1;
+          _context3.next = 4;
+          return response.json();
+        case 4:
+          return _context3.abrupt("return", _context3.sent);
+        case 7:
+          _context3.prev = 7;
+          _context3.t0 = _context3["catch"](1);
+          throw new RequestError('serverInvalidBody', {
+            statusCode: response.status
+          }, _context3.t0 instanceof Error ? _context3.t0 : undefined);
+        case 10:
+        case "end":
+          return _context3.stop();
       }
     }, _callee3, null, [[1, 7]]);
   }));
@@ -131,26 +129,24 @@ export function mapResponseToBlob(_x2) {
 function _mapResponseToBlob() {
   _mapResponseToBlob = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(response) {
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            // eslint-disable-next-line no-console
-            console.warn('Helper is deprecated and will be remove in the next major version');
-            _context4.prev = 1;
-            _context4.next = 4;
-            return response.blob();
-          case 4:
-            return _context4.abrupt("return", _context4.sent);
-          case 7:
-            _context4.prev = 7;
-            _context4.t0 = _context4["catch"](1);
-            throw new RequestError('serverInvalidBody', {
-              statusCode: response.status
-            }, _context4.t0 instanceof Error ? _context4.t0 : undefined);
-          case 10:
-          case "end":
-            return _context4.stop();
-        }
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          // eslint-disable-next-line no-console
+          console.warn('Helper is deprecated and will be remove in the next major version');
+          _context4.prev = 1;
+          _context4.next = 4;
+          return response.blob();
+        case 4:
+          return _context4.abrupt("return", _context4.sent);
+        case 7:
+          _context4.prev = 7;
+          _context4.t0 = _context4["catch"](1);
+          throw new RequestError('serverInvalidBody', {
+            statusCode: response.status
+          }, _context4.t0 instanceof Error ? _context4.t0 : undefined);
+        case 10:
+        case "end":
+          return _context4.stop();
       }
     }, _callee4, null, [[1, 7]]);
   }));
@@ -165,24 +161,22 @@ export function createMapResponseToJson(metadata) {
   return /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.prev = 0;
-              _context.next = 3;
-              return response.json();
-            case 3:
-              return _context.abrupt("return", _context.sent);
-            case 6:
-              _context.prev = 6;
-              _context.t0 = _context["catch"](0);
-              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
-                statusCode: response.status
-              }), _context.t0 instanceof Error ? _context.t0 : undefined);
-            case 9:
-            case "end":
-              return _context.stop();
-          }
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return response.json();
+          case 3:
+            return _context.abrupt("return", _context.sent);
+          case 6:
+            _context.prev = 6;
+            _context.t0 = _context["catch"](0);
+            throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
+              statusCode: response.status
+            }), _context.t0 instanceof Error ? _context.t0 : undefined);
+          case 9:
+          case "end":
+            return _context.stop();
         }
       }, _callee, null, [[0, 6]]);
     }));
@@ -195,24 +189,22 @@ export function createMapResponseToBlob(metadata) {
   return /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(response) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.prev = 0;
-              _context2.next = 3;
-              return response.blob();
-            case 3:
-              return _context2.abrupt("return", _context2.sent);
-            case 6:
-              _context2.prev = 6;
-              _context2.t0 = _context2["catch"](0);
-              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
-                statusCode: response.status
-              }), _context2.t0 instanceof Error ? _context2.t0 : undefined);
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            _context2.next = 3;
+            return response.blob();
+          case 3:
+            return _context2.abrupt("return", _context2.sent);
+          case 6:
+            _context2.prev = 6;
+            _context2.t0 = _context2["catch"](0);
+            throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
+              statusCode: response.status
+            }), _context2.t0 instanceof Error ? _context2.t0 : undefined);
+          case 9:
+          case "end":
+            return _context2.stop();
         }
       }, _callee2, null, [[0, 6]]);
     }));
@@ -251,87 +243,83 @@ function _fetchRetry() {
       waitAndBumpTimeout,
       _args6 = arguments;
     return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-      while (1) {
-        switch (_context6.prev = _context6.next) {
-          case 0:
-            overwriteOptions = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : {};
-            options = _objectSpread(_objectSpread({}, DEFAULT_RETRY_OPTIONS), overwriteOptions);
-            startTimeoutInMs = options.startTimeoutInMs, maxAttempts = options.maxAttempts, factor = options.factor;
-            attempts = 0;
-            timeoutInMs = startTimeoutInMs;
-            waitAndBumpTimeout = /*#__PURE__*/function () {
-              var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-                return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-                  while (1) {
-                    switch (_context5.prev = _context5.next) {
-                      case 0:
-                        _context5.next = 2;
-                        return waitPromise(timeoutInMs);
-                      case 2:
-                        timeoutInMs *= factor;
-                        attempts += 1;
-                      case 4:
-                      case "end":
-                        return _context5.stop();
-                    }
-                  }
-                }, _callee5);
-              }));
-              return function waitAndBumpTimeout() {
-                return _ref7.apply(this, arguments);
-              };
-            }();
-          case 6:
-            if (!(attempts < maxAttempts)) {
-              _context6.next = 24;
-              break;
-            }
-            _context6.prev = 7;
-            _context6.next = 10;
-            return functionToRetry();
-          case 10:
-            return _context6.abrupt("return", _context6.sent);
-          case 13:
-            _context6.prev = 13;
-            _context6.t0 = _context6["catch"](7);
-            lastError = _context6.t0;
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          overwriteOptions = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : {};
+          options = _objectSpread(_objectSpread({}, DEFAULT_RETRY_OPTIONS), overwriteOptions);
+          startTimeoutInMs = options.startTimeoutInMs, maxAttempts = options.maxAttempts, factor = options.factor;
+          attempts = 0;
+          timeoutInMs = startTimeoutInMs;
+          waitAndBumpTimeout = /*#__PURE__*/function () {
+            var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+              return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+                while (1) switch (_context5.prev = _context5.next) {
+                  case 0:
+                    _context5.next = 2;
+                    return waitPromise(timeoutInMs);
+                  case 2:
+                    timeoutInMs *= factor;
+                    attempts += 1;
+                  case 4:
+                  case "end":
+                    return _context5.stop();
+                }
+              }, _callee5);
+            }));
+            return function waitAndBumpTimeout() {
+              return _ref7.apply(this, arguments);
+            };
+          }();
+        case 6:
+          if (!(attempts < maxAttempts)) {
+            _context6.next = 24;
+            break;
+          }
+          _context6.prev = 7;
+          _context6.next = 10;
+          return functionToRetry();
+        case 10:
+          return _context6.abrupt("return", _context6.sent);
+        case 13:
+          _context6.prev = 13;
+          _context6.t0 = _context6["catch"](7);
+          lastError = _context6.t0;
 
-            // don't retry if request was aborted by user
-            if (!isAbortedRequestError(_context6.t0)) {
-              _context6.next = 18;
-              break;
-            }
-            throw new RequestError('clientAbortedRequest', metadata, _context6.t0);
-          case 18:
-            if (!(!isFetchNetworkError(_context6.t0) && !isRequestError(_context6.t0) || isRequestError(_context6.t0) && (!_context6.t0.metadata || !_context6.t0.metadata.statusCode || _context6.t0.metadata.statusCode < 500))) {
-              _context6.next = 20;
-              break;
-            }
-            throw _context6.t0;
-          case 20:
-            _context6.next = 22;
-            return waitAndBumpTimeout();
-          case 22:
-            _context6.next = 6;
+          // don't retry if request was aborted by user
+          if (!isAbortedRequestError(_context6.t0)) {
+            _context6.next = 18;
             break;
-          case 24:
-            if (!isRequestError(lastError)) {
-              _context6.next = 26;
-              break;
-            }
-            throw cloneRequestError(lastError, {
-              attempts: attempts,
-              clientExhaustedRetries: true
-            });
-          case 26:
-            throw new RequestError('serverUnexpectedError', _objectSpread(_objectSpread({}, metadata), {}, {
-              attempts: attempts,
-              clientExhaustedRetries: true
-            }), lastError);
-          case 27:
-          case "end":
-            return _context6.stop();
-        }
+          }
+          throw new RequestError('clientAbortedRequest', metadata, _context6.t0);
+        case 18:
+          if (!(!isFetchNetworkError(_context6.t0) && !isRequestError(_context6.t0) || isRequestError(_context6.t0) && (!_context6.t0.metadata || !_context6.t0.metadata.statusCode || _context6.t0.metadata.statusCode < 500))) {
+            _context6.next = 20;
+            break;
+          }
+          throw _context6.t0;
+        case 20:
+          _context6.next = 22;
+          return waitAndBumpTimeout();
+        case 22:
+          _context6.next = 6;
+          break;
+        case 24:
+          if (!isRequestError(lastError)) {
+            _context6.next = 26;
+            break;
+          }
+          throw cloneRequestError(lastError, {
+            attempts: attempts,
+            clientExhaustedRetries: true
+          });
+        case 26:
+          throw new RequestError('serverUnexpectedError', _objectSpread(_objectSpread({}, metadata), {}, {
+            attempts: attempts,
+            clientExhaustedRetries: true
+          }), lastError);
+        case 27:
+        case "end":
+          return _context6.stop();
       }
     }, _callee6, null, [[7, 13]]);
   }));

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

@@ -25,33 +25,31 @@ function _request() {
       doFetch,
       _args = arguments;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
-            controller = _args.length > 2 ? _args[2] : undefined;
-            _options$method = options.method, method = _options$method === void 0 ? 'GET' : _options$method, endpoint = options.endpoint, auth = options.auth, params = options.params, headers = options.headers, body = options.body, _options$clientOption = options.clientOptions, clientOptions = _options$clientOption === void 0 ? {} : _options$clientOption, traceContext = options.traceContext;
-            retryOptions = clientOptions.retryOptions;
-            metadata = {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+          controller = _args.length > 2 ? _args[2] : undefined;
+          _options$method = options.method, method = _options$method === void 0 ? 'GET' : _options$method, endpoint = options.endpoint, auth = options.auth, params = options.params, headers = options.headers, body = options.body, _options$clientOption = options.clientOptions, clientOptions = _options$clientOption === void 0 ? {} : _options$clientOption, traceContext = options.traceContext;
+          retryOptions = clientOptions.retryOptions;
+          metadata = {
+            method: method,
+            endpoint: endpoint,
+            traceContext: traceContext
+          }; // TODO BMPT-918: add client timeout feature behing a FF (using clientOptions.clientTimeout + Promise.race)
+          doFetch = function doFetch() {
+            return fetch(createUrl(url, {
+              params: params
+            }), {
               method: method,
-              endpoint: endpoint,
-              traceContext: traceContext
-            }; // TODO BMPT-918: add client timeout feature behing a FF (using clientOptions.clientTimeout + Promise.race)
-            doFetch = function doFetch() {
-              return fetch(createUrl(url, {
-                params: params
-              }), {
-                method: method,
-                body: body,
-                headers: extendHeaders(headers, auth, traceContext),
-                signal: controller && controller.signal
-              }).then(createProcessFetchResponse(metadata));
-            };
-            return _context.abrupt("return", fetchRetry(doFetch, metadata, retryOptions));
-          case 7:
-          case "end":
-            return _context.stop();
-        }
+              body: body,
+              headers: extendHeaders(headers, auth, traceContext),
+              signal: controller && controller.signal
+            }).then(createProcessFetchResponse(metadata));
+          };
+          return _context.abrupt("return", fetchRetry(doFetch, metadata, retryOptions));
+        case 7:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));

package/dist/esm/utils/shouldFetchRemoteFileStates.js

@@ -22,47 +22,45 @@ function _shouldFetchRemoteFileStates() {
   _shouldFetchRemoteFileStates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(mediaType, mimeType, preview) {
     var content, _yield$getVideoDimens, width, height;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (!((mediaType === 'doc' || !isMimeTypeSupportedByBrowser(mimeType) || !preview) && isMimeTypeSupportedByServer(mimeType))) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return", true);
-          case 2:
-            if (!(mediaType === 'video' && !!preview)) {
-              _context.next = 20;
-              break;
-            }
-            _context.next = 5;
-            return preview;
-          case 5:
-            content = _context.sent.value;
-            if (content instanceof Blob) {
-              _context.next = 8;
-              break;
-            }
-            return _context.abrupt("return", false);
-          case 8:
-            _context.prev = 8;
-            _context.next = 11;
-            return getVideoDimensionsFromBlob(content);
-          case 11:
-            _yield$getVideoDimens = _context.sent;
-            width = _yield$getVideoDimens.width;
-            height = _yield$getVideoDimens.height;
-            return _context.abrupt("return", !width && !height);
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](8);
-            return _context.abrupt("return", true);
-          case 20:
-            return _context.abrupt("return", false);
-          case 21:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!((mediaType === 'doc' || !isMimeTypeSupportedByBrowser(mimeType) || !preview) && isMimeTypeSupportedByServer(mimeType))) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return", true);
+        case 2:
+          if (!(mediaType === 'video' && !!preview)) {
+            _context.next = 20;
+            break;
+          }
+          _context.next = 5;
+          return preview;
+        case 5:
+          content = _context.sent.value;
+          if (content instanceof Blob) {
+            _context.next = 8;
+            break;
+          }
+          return _context.abrupt("return", false);
+        case 8:
+          _context.prev = 8;
+          _context.next = 11;
+          return getVideoDimensionsFromBlob(content);
+        case 11:
+          _yield$getVideoDimens = _context.sent;
+          width = _yield$getVideoDimens.width;
+          height = _yield$getVideoDimens.height;
+          return _context.abrupt("return", !width && !height);
+        case 17:
+          _context.prev = 17;
+          _context.t0 = _context["catch"](8);
+          return _context.abrupt("return", true);
+        case 20:
+          return _context.abrupt("return", false);
+        case 21:
+        case "end":
+          return _context.stop();
       }
     }, _callee, null, [[8, 17]]);
   }));

package/dist/esm/version.json

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

package/dist/types/client/__mocks__/media-client.d.ts

@@ -1,10 +1,8 @@
 /// <reference types="jest" />
 import { MediaClientConfig } from '@atlaskit/media-core';
-import { CollectionFetcher } from '../collection-fetcher';
 import { FileFetcher } from '../file-fetcher';
 export declare class MediaClient {
     readonly config: MediaClientConfig;
-    readonly collection: CollectionFetcher;
     readonly file: FileFetcher;
     constructor(config: MediaClientConfig);
     getImage: jest.Mock<any, any>;

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

@@ -29,10 +29,10 @@ export declare type ExternalUploadPayload = {
     dimensions: Dimensions;
 };
 export interface FileFetcher {
-    getFileState(id: string, options?: GetFileOptions): MediaSubscribable<FileState>;
+    getFileState(id: string, options?: GetFileOptions): MediaSubscribable;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     touchFiles(descriptors: TouchFileDescriptor[], collection?: string, traceContext?: MediaTraceContext): Promise<TouchedFiles>;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable<FileState>;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable;
     uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
@@ -44,7 +44,7 @@ export declare class FileFetcherImpl implements FileFetcher {
     private readonly featureFlags?;
     private readonly dataloader;
     constructor(mediaStore: MediaStore, featureFlags?: MediaFeatureFlags | undefined);
-    getFileState(id: string, options?: GetFileOptions): MediaSubscribable<FileState>;
+    getFileState(id: string, options?: GetFileOptions): MediaSubscribable;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     getFileBinaryURL(id: string, collectionName?: string): Promise<string>;
@@ -55,7 +55,7 @@ export declare class FileFetcherImpl implements FileFetcher {
     private getUploadingFileStateBase;
     private uploadAwlaysPullFileStates;
     private uploadConditionallyPullFileStates;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable<FileState>;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext, featureFlags?: MediaFeatureFlags): MediaSubscribable;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions, traceContext?: MediaTraceContext): Promise<MediaFile>;
 }

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

@@ -1,7 +1,6 @@
 import { MediaClientConfig } from '@atlaskit/media-core';
 import { MediaFeatureFlags, MediaTraceContext } from '@atlaskit/media-common';
 import { MediaStore, MediaStoreGetFileImageParams, ImageMetadata } from './media-store';
-import { CollectionFetcher } from './collection-fetcher';
 import { FileFetcher } from './file-fetcher';
 import { UploadEventPayloadMap, EventPayloadListener } from './events';
 import { StargateClient } from './stargate-client';
@@ -10,7 +9,6 @@ export declare class MediaClient {
     readonly mediaClientConfig: MediaClientConfig;
     readonly featureFlags?: MediaFeatureFlags | undefined;
     readonly mediaStore: MediaStore;
-    readonly collection: CollectionFetcher;
     readonly file: FileFetcher;
     readonly stargate: StargateClient;
     private readonly eventEmitter;
@@ -22,6 +20,7 @@ export declare class MediaClient {
     getImageUrlSync(id: string, params?: MediaStoreGetFileImageParams): string;
     getImageMetadata(id: string, params?: MediaStoreGetFileImageParams): Promise<ImageMetadata>;
     mobileUploadPromise(): Promise<MobileUpload>;
+    removeFileFromCollection(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;
     on<E extends keyof UploadEventPayloadMap>(event: E, listener: EventPayloadListener<UploadEventPayloadMap, E>): void;
     off<E extends keyof UploadEventPayloadMap>(event: E, listener: EventPayloadListener<UploadEventPayloadMap, E>): void;
     emit<E extends keyof UploadEventPayloadMap>(event: E, payload: UploadEventPayloadMap[E]): boolean;