@atlaskit/util-service-support 6.0.2 → 6.1.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/util-service-support
 
+## 6.1.0
+
+### Minor Changes
+
+- [`19d72473dfb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/19d72473dfb) - Remove unused polyfills
+
+## 6.0.5
+
+### Patch Changes
+
+- [`dfe01a5dad7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/dfe01a5dad7) - Added ability to ignore JSON payload on status.ok responses
+
+## 6.0.4
+
+### Patch Changes
+
+- [`0241ccdf088`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0241ccdf088) - Accept paths which already have a leading slash.
+
+## 6.0.3
+
+### Patch Changes
+
+- [`d3265f19be`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d3265f19be) - Transpile packages using babel rather than tsc
+
 ## 6.0.2
 
 ### Patch Changes

package/build/tsconfig.json

@@ -9,5 +9,9 @@
     "../src/**/*.ts",
     "../src/**/*.tsx"
   ],
-  "exclude": ["../src/**/__tests__/*"]
-}
+  "exclude": [
+    "../src/**/__tests__/*",
+    "../src/**/*.test.*",
+    "../src/**/test.*"
+  ]
+}

package/dist/cjs/index.js

@@ -1,9 +1,48 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  utils: true
+};
 exports.utils = void 0;
-var tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./types"), exports);
-tslib_1.__exportStar(require("./serviceResources"), exports);
-var serviceUtils = tslib_1.__importStar(require("./serviceUtils"));
-exports.utils = serviceUtils;
-//# sourceMappingURL=index.js.map
+
+var _types = require("./types");
+
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _types[key];
+    }
+  });
+});
+
+var _serviceResources = require("./serviceResources");
+
+Object.keys(_serviceResources).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _serviceResources[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _serviceResources[key];
+    }
+  });
+});
+
+var serviceUtils = _interopRequireWildcard(require("./serviceUtils"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var utils = serviceUtils;
+exports.utils = utils;

package/dist/cjs/serviceResources.js

@@ -1,47 +1,75 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.AbstractResource = void 0;
-var AbstractResource = /** @class */ (function () {
-    function AbstractResource() {
-        this.listeners = new Set();
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var AbstractResource = /*#__PURE__*/function () {
+  function AbstractResource() {
+    (0, _classCallCheck2.default)(this, AbstractResource);
+    (0, _defineProperty2.default)(this, "listeners", new Set());
+  }
+
+  (0, _createClass2.default)(AbstractResource, [{
+    key: "subscribe",
+    value: function subscribe(onChange) {
+      this.listeners.add(onChange);
+
+      if (this.lastResult) {
+        // Notify subscribe of last result (i.e. initial state)
+        onChange.result(this.lastResult);
+      }
     }
-    AbstractResource.prototype.subscribe = function (onChange) {
-        this.listeners.add(onChange);
-        if (this.lastResult) {
-            // Notify subscribe of last result (i.e. initial state)
-            onChange.result(this.lastResult);
+  }, {
+    key: "unsubscribe",
+    value: function unsubscribe(onChange) {
+      this.listeners.delete(onChange);
+    }
+  }, {
+    key: "notifyResult",
+    value: function notifyResult(result) {
+      this.listeners.forEach(function (onChange) {
+        onChange.result(result);
+      });
+    }
+  }, {
+    key: "notifyError",
+    value: function notifyError(error) {
+      this.listeners.forEach(function (onChange) {
+        if (onChange.error) {
+          onChange.error(error);
+        }
+      });
+    }
+  }, {
+    key: "notifyInfo",
+    value: function notifyInfo(info) {
+      this.listeners.forEach(function (onChange) {
+        if (onChange.info) {
+          onChange.info(info);
         }
-    };
-    AbstractResource.prototype.unsubscribe = function (onChange) {
-        this.listeners.delete(onChange);
-    };
-    AbstractResource.prototype.notifyResult = function (result) {
-        this.listeners.forEach(function (onChange) {
-            onChange.result(result);
-        });
-    };
-    AbstractResource.prototype.notifyError = function (error) {
-        this.listeners.forEach(function (onChange) {
-            if (onChange.error) {
-                onChange.error(error);
-            }
-        });
-    };
-    AbstractResource.prototype.notifyInfo = function (info) {
-        this.listeners.forEach(function (onChange) {
-            if (onChange.info) {
-                onChange.info(info);
-            }
-        });
-    };
-    AbstractResource.prototype.notifyNotReady = function () {
-        this.listeners.forEach(function (onChange) {
-            if (onChange.notReady) {
-                onChange.notReady();
-            }
-        });
-    };
-    return AbstractResource;
-}());
-exports.AbstractResource = AbstractResource;
-//# sourceMappingURL=serviceResources.js.map
+      });
+    }
+  }, {
+    key: "notifyNotReady",
+    value: function notifyNotReady() {
+      this.listeners.forEach(function (onChange) {
+        if (onChange.notReady) {
+          onChange.notReady();
+        }
+      });
+    }
+  }]);
+  return AbstractResource;
+}();
+
+exports.AbstractResource = AbstractResource;

package/dist/cjs/serviceUtils.js

@@ -1,106 +1,147 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.requestService = void 0;
-var tslib_1 = require("tslib");
-var URL = tslib_1.__importStar(require("url"));
-var url_search_params_1 = tslib_1.__importDefault(require("url-search-params")); // IE, Safari, Mobile Chrome, Mobile Safari
-var types_1 = require("./types");
-var URLSearchParams = url_search_params_1.default.default || url_search_params_1.default;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _types = require("./types");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var defaultRequestServiceOptions = {};
-var buildUrl = function (baseUrl, path, queryParams, secOptions) {
-    if (path === void 0) { path = ''; }
-    var searchParam = new URLSearchParams(URL.parse(baseUrl).search || undefined);
-    baseUrl = baseUrl.split('?')[0];
-    if (queryParams) {
-        for (var key in queryParams) {
-            if ({}.hasOwnProperty.call(queryParams, key)) {
-                searchParam.append(key, queryParams[key]);
-            }
-        }
+
+var buildUrl = function buildUrl(baseUrl) {
+  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var queryParams = arguments.length > 2 ? arguments[2] : undefined;
+  var secOptions = arguments.length > 3 ? arguments[3] : undefined;
+  var searchParam = new URLSearchParams( // For relative urls, the URL class requires base to be set. It's ignored if a url is not relative.
+  // Since we only care about search params it is fine to have any base url here.
+  new URL(baseUrl, 'https://BASE_FALLBACK').search || undefined);
+  baseUrl = baseUrl.split('?')[0];
+
+  if (queryParams) {
+    for (var key in queryParams) {
+      if ({}.hasOwnProperty.call(queryParams, key)) {
+        searchParam.append(key, queryParams[key]);
+      }
     }
-    if (secOptions && secOptions.params) {
-        for (var key in secOptions.params) {
-            if ({}.hasOwnProperty.call(secOptions.params, key)) {
-                var values = secOptions.params[key];
-                if (Array.isArray(values)) {
-                    for (var i = 0; i < values.length; i++) {
-                        searchParam.append(key, values[i]);
-                    }
-                }
-                else {
-                    searchParam.append(key, values);
-                }
-            }
+  }
+
+  if (secOptions && secOptions.params) {
+    for (var _key in secOptions.params) {
+      if ({}.hasOwnProperty.call(secOptions.params, _key)) {
+        var values = secOptions.params[_key];
+
+        if (Array.isArray(values)) {
+          for (var i = 0; i < values.length; i++) {
+            searchParam.append(_key, values[i]);
+          }
+        } else {
+          searchParam.append(_key, values);
         }
+      }
     }
-    var seperator = '';
-    if (path && baseUrl.substr(-1) !== '/') {
-        seperator = '/';
-    }
-    var params = searchParam.toString();
-    if (params) {
-        params = '?' + params;
-    }
-    return "" + baseUrl + seperator + path + params;
+  }
+
+  var separator = '';
+
+  if (path && baseUrl.substr(-1) !== '/' && !path.startsWith('/')) {
+    separator = '/';
+  }
+
+  var params = searchParam.toString();
+
+  if (params) {
+    params = '?' + params;
+  }
+
+  return "".concat(baseUrl).concat(separator).concat(path).concat(params);
 };
-var addToHeaders = function (headers, keyValues) {
-    if (keyValues) {
-        for (var key in keyValues) {
-            if ({}.hasOwnProperty.call(keyValues, key)) {
-                var values = keyValues[key];
-                if (Array.isArray(values)) {
-                    for (var i = 0; i < values.length; i++) {
-                        headers[key] = values[i];
-                    }
-                }
-                else {
-                    headers[key] = values;
-                }
-            }
+
+var addToHeaders = function addToHeaders(headers, keyValues) {
+  if (keyValues) {
+    for (var key in keyValues) {
+      if ({}.hasOwnProperty.call(keyValues, key)) {
+        var values = keyValues[key];
+
+        if (Array.isArray(values)) {
+          for (var i = 0; i < values.length; i++) {
+            headers[key] = values[i];
+          }
+        } else {
+          headers[key] = values;
         }
+      }
     }
+  }
 };
-var buildHeaders = function (secOptions, extraHeaders) {
-    var headers = {};
-    addToHeaders(headers, extraHeaders);
-    if (secOptions) {
-        addToHeaders(headers, secOptions.headers);
-    }
-    return headers;
+
+var buildHeaders = function buildHeaders(secOptions, extraHeaders) {
+  var headers = {};
+  addToHeaders(headers, extraHeaders);
+
+  if (secOptions) {
+    addToHeaders(headers, secOptions.headers);
+  }
+
+  return headers;
 };
 /**
  * @returns Promise containing the json response
  */
-exports.requestService = function (serviceConfig, options) {
-    var url = serviceConfig.url, securityProvider = serviceConfig.securityProvider, refreshedSecurityProvider = serviceConfig.refreshedSecurityProvider;
-    var _a = options || defaultRequestServiceOptions, path = _a.path, queryParams = _a.queryParams, requestInit = _a.requestInit;
-    var secOptions = securityProvider && securityProvider();
-    var requestUrl = buildUrl(url, path, queryParams, secOptions);
-    var headers = buildHeaders(secOptions, requestInit && requestInit.headers);
-    var credentials = types_1.buildCredentials(secOptions);
-    var requestOptions = tslib_1.__assign(tslib_1.__assign({}, requestInit), { headers: headers,
-        credentials: credentials });
-    return fetch(requestUrl, requestOptions).then(function (response) {
-        if (response.status === 204) {
-            return Promise.resolve();
-        }
-        else if (response.ok) {
-            return response.json();
-        }
-        else if (response.status === 401 && refreshedSecurityProvider) {
-            // auth issue - try once
-            return refreshedSecurityProvider().then(function (newSecOptions) {
-                var retryServiceConfig = {
-                    url: url,
-                    securityProvider: function () { return newSecOptions; },
-                };
-                return exports.requestService(retryServiceConfig, options);
-            });
-        }
-        return Promise.reject({
-            code: response.status,
-            reason: response.statusText,
-        });
+
+
+var requestService = function requestService(serviceConfig, options) {
+  var url = serviceConfig.url,
+      securityProvider = serviceConfig.securityProvider,
+      refreshedSecurityProvider = serviceConfig.refreshedSecurityProvider;
+
+  var _ref = options || defaultRequestServiceOptions,
+      path = _ref.path,
+      queryParams = _ref.queryParams,
+      requestInit = _ref.requestInit;
+
+  var secOptions = securityProvider && securityProvider();
+  var requestUrl = buildUrl(url, path, queryParams, secOptions);
+  var headers = buildHeaders(secOptions, requestInit && requestInit.headers);
+  var credentials = (0, _types.buildCredentials)(secOptions);
+  var ignoreResponsePayload = (options === null || options === void 0 ? void 0 : options.ignoreResponsePayload) || false;
+
+  var requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
+    headers: headers,
+    credentials: credentials
+  });
+
+  return fetch(requestUrl, requestOptions).then(function (response) {
+    if (response.status === 204) {
+      return Promise.resolve();
+    } else if (response.ok) {
+      return ignoreResponsePayload ? Promise.resolve() : response.json();
+    } else if (response.status === 401 && refreshedSecurityProvider) {
+      // auth issue - try once
+      return refreshedSecurityProvider().then(function (newSecOptions) {
+        var retryServiceConfig = {
+          url: url,
+          securityProvider: function securityProvider() {
+            return newSecOptions;
+          }
+        };
+        return requestService(retryServiceConfig, options);
+      });
+    }
+
+    return Promise.reject({
+      code: response.status,
+      reason: response.statusText
     });
+  });
 };
-//# sourceMappingURL=serviceUtils.js.map
+
+exports.requestService = requestService;

package/dist/cjs/types.js

@@ -1,7 +1,26 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.buildCredentials = void 0;
-exports.buildCredentials = function (secOptions) {
-    return secOptions && secOptions.omitCredentials ? 'omit' : 'include';
+
+/**
+ * Defines a typical Resource.
+ *
+ * Q = query type
+ * R = result type
+ * E = error type
+ * I = info type
+ * O = options that filter can accept
+ */
+var buildCredentials = function buildCredentials(secOptions) {
+  return secOptions && secOptions.omitCredentials ? 'omit' : 'include';
 };
-//# sourceMappingURL=types.js.map
+/**
+ * Returns a promise to a SecurityOptions that has just been forcibly refreshed with a
+ * new token. Will be used for single retry per request if a 401 is returned.
+ */
+
+
+exports.buildCredentials = buildCredentials;

package/dist/cjs/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/util-service-support",
-	"version": "6.0.2"
+	"version": "6.1.0"
 }

package/dist/es2019/index.js

@@ -1,5 +1,4 @@
 export * from './types';
 export * from './serviceResources';
 import * as serviceUtils from './serviceUtils';
-export const utils = serviceUtils;
-//# sourceMappingURL=index.js.map
+export const utils = serviceUtils;

package/dist/es2019/serviceResources.js

@@ -1,42 +1,50 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 export class AbstractResource {
-    constructor() {
-        this.listeners = new Set();
+  constructor() {
+    _defineProperty(this, "listeners", new Set());
+  }
+
+  subscribe(onChange) {
+    this.listeners.add(onChange);
+
+    if (this.lastResult) {
+      // Notify subscribe of last result (i.e. initial state)
+      onChange.result(this.lastResult);
     }
-    subscribe(onChange) {
-        this.listeners.add(onChange);
-        if (this.lastResult) {
-            // Notify subscribe of last result (i.e. initial state)
-            onChange.result(this.lastResult);
-        }
-    }
-    unsubscribe(onChange) {
-        this.listeners.delete(onChange);
-    }
-    notifyResult(result) {
-        this.listeners.forEach(onChange => {
-            onChange.result(result);
-        });
-    }
-    notifyError(error) {
-        this.listeners.forEach(onChange => {
-            if (onChange.error) {
-                onChange.error(error);
-            }
-        });
-    }
-    notifyInfo(info) {
-        this.listeners.forEach(onChange => {
-            if (onChange.info) {
-                onChange.info(info);
-            }
-        });
-    }
-    notifyNotReady() {
-        this.listeners.forEach(onChange => {
-            if (onChange.notReady) {
-                onChange.notReady();
-            }
-        });
-    }
-}
-//# sourceMappingURL=serviceResources.js.map
+  }
+
+  unsubscribe(onChange) {
+    this.listeners.delete(onChange);
+  }
+
+  notifyResult(result) {
+    this.listeners.forEach(onChange => {
+      onChange.result(result);
+    });
+  }
+
+  notifyError(error) {
+    this.listeners.forEach(onChange => {
+      if (onChange.error) {
+        onChange.error(error);
+      }
+    });
+  }
+
+  notifyInfo(info) {
+    this.listeners.forEach(onChange => {
+      if (onChange.info) {
+        onChange.info(info);
+      }
+    });
+  }
+
+  notifyNotReady() {
+    this.listeners.forEach(onChange => {
+      if (onChange.notReady) {
+        onChange.notReady();
+      }
+    });
+  }
+
+}