@atlaskit/media-client 37.2.36 → 37.3.0

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

@@ -1,40 +1,5 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { isClientBasedAuth } from '@atlaskit/media-core';
-import { getRandomTelemetryId } from '@atlaskit/media-common';
-import { mapAuthToQueryParameters } from '../../models/auth-query-parameters';
-import { RequestError, isRequestError } from './errors';
-var getStatusCode = function getStatusCode(error) {
-  var _error$metadata;
-  return isRequestError(error) && ((_error$metadata = error.metadata) === null || _error$metadata === void 0 ? void 0 : _error$metadata.statusCode) && error.metadata.statusCode;
-};
-export function waitPromise(timeout) {
-  return new Promise(function (resolve) {
-    return setTimeout(resolve, timeout);
-  });
-}
-export function isAbortedRequestError(err) {
-  return err instanceof Error && err.message === 'request_cancelled' || !!err && err.name === 'AbortError';
-}
+/* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
 
-// fetch throws TypeError for network errors
-export function isFetchNetworkError(err) {
-  return err instanceof TypeError;
-}
-export function isRateLimitedError(error) {
-  var statusCode = error && getStatusCode(error);
-  return statusCode === 429 || !!error && !!error.message && error.message.includes('429');
-}
-export var extendTraceContext = function extendTraceContext(traceContext) {
-  return traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
-    spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomTelemetryId()
-  }) : undefined;
-};
 export var ZipkinHeaderKeys = {
   traceId: 'x-b3-traceid',
   spanId: 'x-b3-spanid',
@@ -42,110 +7,6 @@ export var ZipkinHeaderKeys = {
   sampled: 'x-b3-sampled',
   flags: 'x-b3-flags'
 };
-var mapTraceIdToRequestHeaders = function mapTraceIdToRequestHeaders(traceContext) {
-  return traceContext ? _defineProperty(_defineProperty({}, ZipkinHeaderKeys.traceId, traceContext.traceId), ZipkinHeaderKeys.spanId, traceContext.spanId) : {};
-};
-export function mapAuthToRequestHeaders(auth) {
-  if (!auth) {
-    return {};
-  }
-  if (isClientBasedAuth(auth)) {
-    return {
-      'X-Client-Id': auth.clientId,
-      Authorization: "Bearer ".concat(auth.token)
-    };
-  }
-  return {
-    'X-Issuer': auth.asapIssuer,
-    Authorization: "Bearer ".concat(auth.token)
-  };
-}
-export function createUrl(url, _ref2) {
-  var params = _ref2.params,
-    auth = _ref2.auth;
-  var parsedUrl = new URL(url, auth === null || auth === void 0 ? void 0 : auth.baseUrl);
-  var authParams = auth && mapAuthToQueryParameters(auth) || {};
-  var paramsToAppend = _objectSpread(_objectSpread({}, params), authParams);
-  Object.entries(paramsToAppend).filter(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-      _ = _ref4[0],
-      value = _ref4[1];
-    return value != null;
-  }).forEach(function (pair) {
-    var _parsedUrl$searchPara;
-    (_parsedUrl$searchPara = parsedUrl.searchParams).set.apply(_parsedUrl$searchPara, _toConsumableArray(pair));
-  });
-  parsedUrl.searchParams.sort();
-  return parsedUrl.toString();
-}
-export function extendHeaders(headers, auth, traceContext) {
-  if (!auth && !traceContext && !headers) {
-    return undefined;
-  }
-  return _objectSpread(_objectSpread(_objectSpread({}, headers !== null && headers !== void 0 ? headers : {}), mapAuthToRequestHeaders(auth)), mapTraceIdToRequestHeaders(traceContext));
-}
-export function createMapResponseToJson(metadata) {
-  return /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
-      var _t;
-      return _regeneratorRuntime.wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 1;
-            return response.json();
-          case 1:
-            return _context.abrupt("return", _context.sent);
-          case 2:
-            _context.prev = 2;
-            _t = _context["catch"](0);
-            throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
-              statusCode: response.status
-            }), _t instanceof Error ? _t : undefined);
-          case 3:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 2]]);
-    }));
-    return function (_x) {
-      return _ref5.apply(this, arguments);
-    };
-  }();
-}
-export function createMapResponseToBlob(metadata) {
-  return /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(response) {
-      var _t2;
-      return _regeneratorRuntime.wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.prev = 0;
-            _context2.next = 1;
-            return response.blob();
-          case 1:
-            return _context2.abrupt("return", _context2.sent);
-          case 2:
-            _context2.prev = 2;
-            _t2 = _context2["catch"](0);
-            throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
-              statusCode: response.status
-            }), _t2 instanceof Error ? _t2 : undefined);
-          case 3:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, null, [[0, 2]]);
-    }));
-    return function (_x2) {
-      return _ref6.apply(this, arguments);
-    };
-  }();
-}
-export var defaultShouldRetryError = function defaultShouldRetryError(err) {
-  var statusCode = getStatusCode(err);
-  return isFetchNetworkError(err) || (statusCode ? statusCode >= 500 : false);
-};
 export var DEFAULT_RETRY_OPTIONS = {
   startTimeoutInMs: 1000,
   // 1 second is generally a good timeout to start
@@ -153,159 +14,76 @@ export var DEFAULT_RETRY_OPTIONS = {
   // Current test delay is 60s, so retries should finish before if a promise takes < 1s
   factor: 2 // Good for polling, which is out main use case
 };
-export function cloneRequestError(error, extraMetadata) {
-  var reason = error.reason,
-    metadata = error.metadata,
-    innerError = error.innerError;
-  return new RequestError(reason, _objectSpread(_objectSpread({}, metadata), extraMetadata), innerError);
-}
-export function fetchRetry(_x3, _x4) {
-  return _fetchRetry.apply(this, arguments);
-}
-function _fetchRetry() {
-  _fetchRetry = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(functionToRetry, metadata) {
-    var overwriteOptions,
-      options,
-      startTimeoutInMs,
-      maxAttempts,
-      factor,
-      _options$shouldRetryE,
-      shouldRetryError,
-      attempts,
-      timeoutInMs,
-      lastError,
-      waitAndBumpTimeout,
-      _args4 = arguments,
-      _t3;
-    return _regeneratorRuntime.wrap(function (_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          overwriteOptions = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : {};
-          options = _objectSpread(_objectSpread({}, DEFAULT_RETRY_OPTIONS), overwriteOptions);
-          startTimeoutInMs = options.startTimeoutInMs, maxAttempts = options.maxAttempts, factor = options.factor, _options$shouldRetryE = options.shouldRetryError, shouldRetryError = _options$shouldRetryE === void 0 ? defaultShouldRetryError : _options$shouldRetryE;
-          attempts = 0;
-          timeoutInMs = startTimeoutInMs;
-          waitAndBumpTimeout = /*#__PURE__*/function () {
-            var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-              return _regeneratorRuntime.wrap(function (_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
-                  case 0:
-                    _context3.next = 1;
-                    return waitPromise(timeoutInMs);
-                  case 1:
-                    timeoutInMs *= factor;
-                    attempts += 1;
-                  case 2:
-                  case "end":
-                    return _context3.stop();
-                }
-              }, _callee3);
-            }));
-            return function waitAndBumpTimeout() {
-              return _ref7.apply(this, arguments);
-            };
-          }();
-        case 1:
-          if (!(attempts < maxAttempts)) {
-            _context4.next = 8;
-            break;
-          }
-          _context4.prev = 2;
-          _context4.next = 3;
-          return functionToRetry();
-        case 3:
-          return _context4.abrupt("return", _context4.sent);
-        case 4:
-          _context4.prev = 4;
-          _t3 = _context4["catch"](2);
-          lastError = _t3;
 
-          // don't retry if request was aborted by user
-          if (!isAbortedRequestError(_t3)) {
-            _context4.next = 5;
-            break;
-          }
-          throw new RequestError('clientAbortedRequest', metadata, _t3);
-        case 5:
-          if (shouldRetryError(_t3)) {
-            _context4.next = 6;
-            break;
-          }
-          throw _t3;
-        case 6:
-          _context4.next = 7;
-          return waitAndBumpTimeout();
-        case 7:
-          _context4.next = 1;
-          break;
-        case 8:
-          if (!isRequestError(lastError)) {
-            _context4.next = 9;
-            break;
-          }
-          throw cloneRequestError(lastError, {
-            attempts: attempts,
-            clientExhaustedRetries: true
-          });
-        case 9:
-          throw new RequestError('serverUnexpectedError', _objectSpread(_objectSpread({}, metadata), {}, {
-            attempts: attempts,
-            clientExhaustedRetries: true
-          }), lastError);
-        case 10:
-        case "end":
-          return _context4.stop();
-      }
-    }, _callee4, null, [[2, 4]]);
-  }));
-  return _fetchRetry.apply(this, arguments);
-}
-export function createRequestErrorReason(statusCode) {
-  switch (statusCode) {
-    case 400:
-      return 'serverBadRequest';
-    case 401:
-      return 'serverUnauthorized';
-    case 403:
-      return 'serverForbidden';
-    case 404:
-      return 'serverNotFound';
-    case 422:
-      return 'serverUnprocessableEntity';
-    case 423:
-      return 'serverEntityLocked';
-    case 429:
-      return 'serverRateLimited';
-    case 500:
-      return 'serverInternalError';
-    case 502:
-      return 'serverBadGateway';
-    default:
-      return 'serverUnexpectedError';
-  }
-}
-export function createRequestErrorFromResponse(metadata, response) {
-  var statusCode = response.status;
-  var reason = createRequestErrorReason(statusCode);
-  return new RequestError(reason, _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
-    statusCode: statusCode
-  }));
-}
-export function createProcessFetchResponse(metadata) {
-  return function (response) {
-    if (response.ok || response.status < 400) {
-      return response;
-    }
-    var requestError = createRequestErrorFromResponse(metadata, response);
-    throw requestError;
-  };
-}
-export function extractMediaHeaders(response) {
-  var headers = response.headers;
-  var mediaRegion = headers.get('x-media-region') || 'unknown';
-  var mediaEnv = headers.get('x-media-env') || 'unknown';
-  return {
-    mediaRegion: mediaRegion,
-    mediaEnv: mediaEnv
-  };
-}
+/**
+ * @deprecated Use `import { waitPromise } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { waitPromise } from './waitPromise';
+/**
+ * @deprecated Use `import { isAbortedRequestError } from '@atlaskit/media-client'` instead.
+ */
+export { isAbortedRequestError } from './isAbortedRequestError';
+/**
+ * @deprecated Use `import { isFetchNetworkError } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { isFetchNetworkError } from './isFetchNetworkError';
+/**
+ * @deprecated Use `import { isRateLimitedError } from '@atlaskit/media-client/request'` instead.
+ */
+export { isRateLimitedError } from './isRateLimitedError';
+/**
+ * @deprecated Use `import { extendTraceContext } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { extendTraceContext } from './extendTraceContext';
+/**
+ * @deprecated Use `import { mapAuthToRequestHeaders } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { mapAuthToRequestHeaders } from './mapAuthToRequestHeaders';
+/**
+ * @deprecated Use `import { createUrl } from '@atlaskit/media-client'` instead.
+ */
+export { createUrl } from './createUrl';
+/**
+ * @deprecated Use `import { extendHeaders } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { extendHeaders } from './extendHeaders';
+/**
+ * @deprecated Use `import { createMapResponseToJson } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { createMapResponseToJson } from './createMapResponseToJson';
+/**
+ * @deprecated Use `import { createMapResponseToBlob } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { createMapResponseToBlob } from './createMapResponseToBlob';
+/**
+ * @deprecated Use `import { defaultShouldRetryError } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { defaultShouldRetryError } from './defaultShouldRetryError';
+/**
+ * @deprecated Use `import { cloneRequestError } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { cloneRequestError } from './cloneRequestError';
+/**
+ * @deprecated Use `import { fetchRetry } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { fetchRetry } from './fetchRetry';
+/**
+ * @deprecated Use `import { createRequestErrorReason } from '@atlaskit/media-client/request'` instead.
+ */
+export { createRequestErrorReason } from './createRequestErrorReason';
+/**
+ * @deprecated Use `import { createRequestErrorFromResponse } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { createRequestErrorFromResponse } from './createRequestErrorFromResponse';
+/**
+ * @deprecated Use `import { createProcessFetchResponse } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { createProcessFetchResponse } from './createProcessFetchResponse';
+/**
+ * @deprecated Use `import { extractMediaHeaders } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { extractMediaHeaders } from './extractMediaHeaders';
+/**
+ * @deprecated Use `import { getStatusCode } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { getStatusCode } from './getStatusCode';

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

@@ -3,12 +3,33 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-export { RequestError, isRequestError } from './errors';
-export { isRateLimitedError, createRequestErrorReason } from './helpers';
-import { createUrl, fetchRetry, createProcessFetchResponse, extendHeaders, isFetchNetworkError, defaultShouldRetryError } from './helpers';
+/* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
+
+/**
+ * @deprecated Use `import { RequestError } from '@atlaskit/media-client/request/errors'` instead.
+ */
+export { RequestError } from './RequestError';
+/**
+ * @deprecated Use `import { isRequestError } from '@atlaskit/media-client/request/errors'` instead.
+ */
+export { isRequestError } from './isRequestError';
+/**
+ * @deprecated Use `import { createRequestErrorReason } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { createRequestErrorReason } from './createRequestErrorReason';
+/**
+ * @deprecated Use `import { isRateLimitedError } from '@atlaskit/media-client/request/helpers'` instead.
+ */
+export { isRateLimitedError } from './isRateLimitedError';
+import { createProcessFetchResponse } from './createProcessFetchResponse';
+import { createUrl } from './createUrl';
+import { defaultShouldRetryError } from './defaultShouldRetryError';
+import { extendHeaders } from './extendHeaders';
+import { fetchRetry } from './fetchRetry';
+import { isFetchNetworkError } from './isFetchNetworkError';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { mapRetryUrlToPathBasedUrl } from '../pathBasedUrl';
 import getNavigator from '../getNavigator';
+import { mapRetryUrlToPathBasedUrl } from '../mapRetryUrlToPathBasedUrl';
 export function request(_x) {
   return _request.apply(this, arguments);
 }

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

@@ -0,0 +1,3 @@
+export function isAbortedRequestError(err) {
+  return err instanceof Error && err.message === 'request_cancelled' || !!err && err.name === 'AbortError';
+}

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

@@ -0,0 +1,4 @@
+// fetch throws TypeError for network errors
+export function isFetchNetworkError(err) {
+  return err instanceof TypeError;
+}

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

@@ -0,0 +1,5 @@
+import { getStatusCode } from './getStatusCode';
+export function isRateLimitedError(error) {
+  var statusCode = error && getStatusCode(error);
+  return statusCode === 429 || !!error && !!error.message && error.message.includes('429');
+}

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

@@ -0,0 +1,4 @@
+import { RequestError } from './RequestError';
+export function isRequestError(err) {
+  return err instanceof RequestError;
+}

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

@@ -0,0 +1,16 @@
+import { isClientBasedAuth } from '@atlaskit/media-core';
+export function mapAuthToRequestHeaders(auth) {
+  if (!auth) {
+    return {};
+  }
+  if (isClientBasedAuth(auth)) {
+    return {
+      'X-Client-Id': auth.clientId,
+      Authorization: "Bearer ".concat(auth.token)
+    };
+  }
+  return {
+    'X-Issuer': auth.asapIssuer,
+    Authorization: "Bearer ".concat(auth.token)
+  };
+}

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

@@ -0,0 +1,5 @@
+export function waitPromise(timeout) {
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, timeout);
+  });
+}

package/dist/esm/utils/{setTimeoutPromise.js → resolveTimeout.js}

@@ -2,9 +2,4 @@ export var resolveTimeout = function resolveTimeout(timeout, resolveWith) {
   return new Promise(function (resolve, _reject) {
     setTimeout(resolve, timeout, resolveWith);
   });
-};
-export var rejectTimeout = function rejectTimeout(timeout, rejectWith) {
-  return new Promise(function (_resolve, reject) {
-    setTimeout(reject, timeout, rejectWith);
-  });
 };

package/dist/esm/utils/url.js

@@ -1,65 +1,18 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var mediaBlobUrlIdentifier = 'media-blob-url';
-export var isMediaBlobUrl = function isMediaBlobUrl(url) {
-  return url.indexOf("".concat(mediaBlobUrlIdentifier, "=true")) > -1;
-};
-var getNumberFromParams = function getNumberFromParams(params, name) {
-  var value = params.get(name);
-  return typeof value === 'string' && !isNaN(parseInt(value)) ? parseInt(value) : undefined;
-};
-var getStringFromParams = function getStringFromParams(params, name) {
-  var value = params.get(name);
-  if (!value) {
-    return;
-  }
-  return decodeURIComponent(value);
-};
-export var getAttrsFromUrl = function getAttrsFromUrl(blobUrl) {
-  var url = new URL(blobUrl);
-  var hash = url.hash.replace('#', '');
-  var params = new URLSearchParams(hash);
-  var id = params.get('id');
-  var contextId = params.get('contextId');
-  var clientId = params.get('clientId');
-  // check if we have the required params (clientId is optional for backwards compatibility)
-  if (!id || !contextId) {
-    return;
-  }
-  return {
-    id: id,
-    contextId: contextId,
-    clientId: clientId || undefined,
-    collection: getStringFromParams(params, 'collection'),
-    alt: getStringFromParams(params, 'alt'),
-    height: getNumberFromParams(params, 'height'),
-    width: getNumberFromParams(params, 'width'),
-    size: getNumberFromParams(params, 'size'),
-    name: getStringFromParams(params, 'name'),
-    mimeType: getStringFromParams(params, 'mimeType')
-  };
-};
-export var objectToQueryString = function objectToQueryString(json) {
-  return Object.keys(json).filter(function (attrName) {
-    return typeof json[attrName] !== 'undefined' && json[attrName] !== null;
-  }).map(function (key) {
-    var value = json[key];
-    if (typeof value === 'undefined' || value === null) {
-      return;
-    }
-    return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value.toString()));
-  }).join('&');
-};
-export var addFileAttrsToUrl = function addFileAttrsToUrl(url, fileAttrs) {
-  var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-  if (isSafari) {
-    return url;
-  }
-  var mediaIdentifierAttr = _defineProperty({}, mediaBlobUrlIdentifier, 'true');
-  var mergedAttrs = _objectSpread(_objectSpread({}, mediaIdentifierAttr), fileAttrs);
-  var queryAttrs = objectToQueryString(mergedAttrs);
-
-  // we can't use '?' separator for blob url params
-  return "".concat(url, "#").concat(queryAttrs);
-};
+/* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
+export var mediaBlobUrlIdentifier = 'media-blob-url';
+/**
+ * @deprecated Use `import { isMediaBlobUrl } from '@atlaskit/media-client'` instead.
+ */
+export { isMediaBlobUrl } from './isMediaBlobUrl';
+/**
+ * @deprecated Use `import { getAttrsFromUrl } from '@atlaskit/media-client'` instead.
+ */
+export { getAttrsFromUrl } from './getAttrsFromUrl';
+/**
+ * @deprecated Use `import { objectToQueryString } from '@atlaskit/media-client'` instead.
+ */
+export { objectToQueryString } from './objectToQueryString';
+/**
+ * @deprecated Use `import { addFileAttrsToUrl } from '@atlaskit/media-client'` instead.
+ */
+export { addFileAttrsToUrl } from './addFileAttrsToUrl';

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

@@ -0,0 +1,32 @@
+import { type MediaTraceContext } from '@atlaskit/media-common';
+import { BaseMediaClientError } from '../../models/errors/BaseMediaClientError';
+export declare class FileFetcherError extends BaseMediaClientError<FileFetcherErrorReason, FileFetcherErrorMetadata, undefined, FileFetcherErrorAttributes> {
+    readonly id: string;
+    constructor(reason: FileFetcherErrorReason, metadata: FileFetcherErrorMetadata);
+    /** Will be deprecated. Use the properties `reason` and `metadata` instead */
+    get attributes(): {
+        metadata?: {
+            traceContext: MediaTraceContext;
+        } | undefined;
+        reason: FileFetcherErrorReason;
+        id: string;
+        collectionName: string | undefined;
+        occurrenceKey: string | undefined;
+    };
+}
+export type FileFetcherErrorReason = 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName';
+export type FileFetcherErrorAttributes = {
+    readonly reason: FileFetcherErrorReason;
+    readonly id: string;
+    readonly metadata?: {
+        readonly collectionName?: string;
+        readonly occurrenceKey?: string;
+        readonly traceContext?: MediaTraceContext;
+    };
+};
+export type FileFetcherErrorMetadata = {
+    readonly id: string;
+    readonly collectionName?: string;
+    readonly occurrenceKey?: string;
+    readonly traceContext?: MediaTraceContext;
+};

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

@@ -1,33 +1,9 @@
-import { BaseMediaClientError } from '../../models/errors';
-import { type MediaTraceContext } from '@atlaskit/media-common';
-export type FileFetcherErrorReason = 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName';
-export type FileFetcherErrorAttributes = {
-    readonly reason: FileFetcherErrorReason;
-    readonly id: string;
-    readonly metadata?: {
-        readonly collectionName?: string;
-        readonly occurrenceKey?: string;
-        readonly traceContext?: MediaTraceContext;
-    };
-};
-export type FileFetcherErrorMetadata = {
-    readonly id: string;
-    readonly collectionName?: string;
-    readonly occurrenceKey?: string;
-    readonly traceContext?: MediaTraceContext;
-};
-export declare class FileFetcherError extends BaseMediaClientError<FileFetcherErrorReason, FileFetcherErrorMetadata, undefined, FileFetcherErrorAttributes> {
-    readonly id: string;
-    constructor(reason: FileFetcherErrorReason, metadata: FileFetcherErrorMetadata);
-    /** Will be deprecated. Use the properties `reason` and `metadata` instead */
-    get attributes(): {
-        metadata?: {
-            traceContext: MediaTraceContext;
-        } | undefined;
-        reason: FileFetcherErrorReason;
-        id: string;
-        collectionName: string | undefined;
-        occurrenceKey: string | undefined;
-    };
-}
-export declare function isFileFetcherError(err: Error): err is FileFetcherError;
+/**
+ * @deprecated Use `import { FileFetcherError } from '@atlaskit/media-client/file-fetcher'` instead.
+ */
+export { FileFetcherError } from './FileFetcherError';
+export type { FileFetcherErrorReason, FileFetcherErrorAttributes, FileFetcherErrorMetadata, } from './FileFetcherError';
+/**
+ * @deprecated Use `import { isFileFetcherError } from '@atlaskit/media-client/file-fetcher'` instead.
+ */
+export { isFileFetcherError } from './isFileFetcherError';