@bytescale/sdk 3.0.0-alpha.1 → 3.0.0-alpha.4

package/dist/browser/cjs/main.js

@@ -42,7 +42,7 @@ __lib_require__.d(__lib_exports__, {
   "AuthManager": function() { return /* reexport */ AuthManager; },
   "BaseAPI": function() { return /* reexport */ BaseAPI; },
   "BinaryResult": function() { return /* reexport */ BinaryResult; },
-  "BytescaleApiClientConfigResolver": function() { return /* reexport */ BytescaleApiClientConfigResolver; },
+  "BytescaleApiClientConfigUtils": function() { return /* reexport */ BytescaleApiClientConfigUtils; },
   "BytescaleApiError": function() { return /* reexport */ BytescaleApiError; },
   "CancelledError": function() { return /* reexport */ CancelledError; },
   "CommonTypesNoOp": function() { return /* reexport */ CommonTypesNoOp; },
@@ -118,21 +118,21 @@ function runtime_createClass(Constructor, protoProps, staticProps) { if (protoPr
 function runtime_toPropertyKey(arg) { var key = runtime_toPrimitive(arg, "string"); return runtime_typeof(key) === "symbol" ? key : String(key); }
 function runtime_toPrimitive(input, hint) { if (runtime_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (runtime_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 
-var BytescaleApiClientConfigResolver = /*#__PURE__*/function () {
-  function BytescaleApiClientConfigResolver() {
-    runtime_classCallCheck(this, BytescaleApiClientConfigResolver);
+var BytescaleApiClientConfigUtils = /*#__PURE__*/function () {
+  function BytescaleApiClientConfigUtils() {
+    runtime_classCallCheck(this, BytescaleApiClientConfigUtils);
   }
-  runtime_createClass(BytescaleApiClientConfigResolver, null, [{
+  runtime_createClass(BytescaleApiClientConfigUtils, null, [{
     key: "getApiUrl",
     value: function getApiUrl(config) {
       var _a;
-      return (_a = config.apiUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultApiUrl;
+      return (_a = config.apiUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultApiUrl;
     }
   }, {
     key: "getCdnUrl",
     value: function getCdnUrl(config) {
       var _a;
-      return (_a = config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultCdnUrl;
+      return (_a = config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultCdnUrl;
     }
   }, {
     key: "getFetchApi",
@@ -140,11 +140,48 @@ var BytescaleApiClientConfigResolver = /*#__PURE__*/function () {
       var _a;
       return (_a = config.fetchApi) !== null && _a !== void 0 ? _a : fetch;
     }
+  }, {
+    key: "getAccountId",
+    value: function getAccountId(config) {
+      var _a, _b;
+      var accountId;
+      if (BytescaleApiClientConfigUtils.specialApiKeys.includes(config.apiKey)) {
+        accountId = BytescaleApiClientConfigUtils.specialApiKeyAccountId;
+      } else {
+        accountId = (_b = (_a = config.apiKey.split("_")[1]) === null || _a === void 0 ? void 0 : _a.substr(0, BytescaleApiClientConfigUtils.accountIdLength)) !== null && _b !== void 0 ? _b : "";
+        if (accountId.length !== BytescaleApiClientConfigUtils.accountIdLength) {
+          throw new Error("Invalid Bytescale API key.");
+        }
+      }
+      return accountId;
+    }
+  }, {
+    key: "validate",
+    value: function validate(config) {
+      var _a;
+      // Defensive programming, for users not using TypeScript. Mainly because this is used by UploadWidget users.
+      if ((config !== null && config !== void 0 ? config : undefined) === undefined) {
+        throw new Error("Config parameter required.");
+      }
+      if (((_a = config.apiKey) !== null && _a !== void 0 ? _a : undefined) === undefined) {
+        throw new Error("Please provide an API key via the 'apiKey' config parameter.");
+      }
+      if (config.apiKey.trim() !== config.apiKey) {
+        // We do not support API keys with whitespace (by trimming ourselves) because otherwise we'd need to support this
+        // everywhere in perpetuity (since removing the trimming would be a breaking change).
+        throw new Error("API key needs trimming (whitespace detected).");
+      }
+      // This performs futher validation on the API key...
+      BytescaleApiClientConfigUtils.getAccountId(config);
+    }
   }]);
-  return BytescaleApiClientConfigResolver;
+  return BytescaleApiClientConfigUtils;
 }();
-BytescaleApiClientConfigResolver.defaultApiUrl = "https://api.bytescale.com";
-BytescaleApiClientConfigResolver.defaultCdnUrl = "https://upcdn.io";
+BytescaleApiClientConfigUtils.defaultApiUrl = "https://api.bytescale.com";
+BytescaleApiClientConfigUtils.defaultCdnUrl = "https://upcdn.io";
+BytescaleApiClientConfigUtils.specialApiKeys = ["free", "demo"];
+BytescaleApiClientConfigUtils.specialApiKeyAccountId = "W142hJk";
+BytescaleApiClientConfigUtils.accountIdLength = 7; // Sync with: upload/shared/**/AccountIdUtils
 /**
  * This is the base class for all generated API classes.
  */
@@ -152,6 +189,7 @@ var BaseAPI = /*#__PURE__*/function () {
   function BaseAPI(config) {
     runtime_classCallCheck(this, BaseAPI);
     this.config = config;
+    BytescaleApiClientConfigUtils.validate(config);
   }
   runtime_createClass(BaseAPI, [{
     key: "request",
@@ -166,7 +204,7 @@ var BaseAPI = /*#__PURE__*/function () {
         }
         // Key: any possible value for 'baseUrlOverride'
         // Value: user-overridden value for that base URL from the config.
-        var nonDefaultBasePaths = _defineProperty({}, BytescaleApiClientConfigResolver.defaultCdnUrl, BytescaleApiClientConfigResolver.getCdnUrl(_this2.config));
+        var nonDefaultBasePaths = _defineProperty({}, BytescaleApiClientConfigUtils.defaultCdnUrl, BytescaleApiClientConfigUtils.getCdnUrl(_this2.config));
         return _await(_this2.createFetchParams(context, initOverrides, baseUrlOverride === undefined ? undefined : (_b = nonDefaultBasePaths[baseUrlOverride]) !== null && _b !== void 0 ? _b : baseUrlOverride), function (_ref) {
           var url = _ref.url,
             init = _ref.init;
@@ -188,7 +226,7 @@ var BaseAPI = /*#__PURE__*/function () {
         var _a, _b;
         var response;
         return _continue(_catch(function () {
-          return _await(BytescaleApiClientConfigResolver.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+          return _await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -242,7 +280,7 @@ var BaseAPI = /*#__PURE__*/function () {
     value: function createFetchParams(context, initOverrides, baseUrlOverride) {
       try {
         var _this6 = this;
-        var url = (baseUrlOverride !== null && baseUrlOverride !== void 0 ? baseUrlOverride : BytescaleApiClientConfigResolver.getApiUrl(_this6.config)) + context.path;
+        var url = (baseUrlOverride !== null && baseUrlOverride !== void 0 ? baseUrlOverride : BytescaleApiClientConfigUtils.getApiUrl(_this6.config)) + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
           // only add the querystring to the URL if there are query parameters.
           // this is done to avoid urls ending with a "?" character which buggy webservers
@@ -286,9 +324,6 @@ var BaseAPI = /*#__PURE__*/function () {
   }]);
   return BaseAPI;
 }();
-BaseAPI.specialApiKeys = ["free", "demo"];
-BaseAPI.specialApiKeyAccountId = "W142hJk";
-BaseAPI.accountIdLength = 7; // Sync with: upload/shared/**/AccountIdUtils
 var CancelledError = /*#__PURE__*/function (_Error) {
   _inherits(CancelledError, _Error);
   var _super = _createSuper(CancelledError);
@@ -446,9 +481,6 @@ function FileApi_getPrototypeOf(o) { FileApi_getPrototypeOf = Object.setPrototyp
  */
 // @ts-ignore
 
-/**
- *
- */
 var FileApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   FileApi_inherits(FileApi, _runtime$BaseAPI);
   var _super = FileApi_createSuper(FileApi);
@@ -747,9 +779,6 @@ function FolderApi_getPrototypeOf(o) { FolderApi_getPrototypeOf = Object.setProt
  */
 // @ts-ignore
 
-/**
- *
- */
 var FolderApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   FolderApi_inherits(FolderApi, _runtime$BaseAPI);
   var _super = FolderApi_createSuper(FolderApi);
@@ -1007,9 +1036,6 @@ function JobApi_getPrototypeOf(o) { JobApi_getPrototypeOf = Object.setPrototypeO
  */
 // @ts-ignore
 
-/**
- *
- */
 var JobApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   JobApi_inherits(JobApi, _runtime$BaseAPI);
   var _super = JobApi_createSuper(JobApi);
@@ -1142,9 +1168,6 @@ function UploadApi_getPrototypeOf(o) { UploadApi_getPrototypeOf = Object.setProt
  */
 // @ts-ignore
 
-/**
- *
- */
 var UploadApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   UploadApi_inherits(UploadApi, _runtime$BaseAPI);
   var _super = UploadApi_createSuper(UploadApi);
@@ -1340,7 +1363,7 @@ var UrlBuilder = /*#__PURE__*/function () {
   function UrlBuilder(config) {
     UrlBuilder_classCallCheck(this, UrlBuilder);
     var _a;
-    this.cdnUrl = (_a = config === null || config === void 0 ? void 0 : config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultCdnUrl;
+    this.cdnUrl = (_a = config === null || config === void 0 ? void 0 : config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultCdnUrl;
   }
   /**
    * Builds a URL to either a raw file or a transformed file.
@@ -1365,7 +1388,7 @@ var UrlBuilder = /*#__PURE__*/function () {
     key: "url",
     value: function url(params) {
       var _a;
-      return ((_a = params.options) === null || _a === void 0 ? void 0 : _a.transformation) === undefined ? this.raw(params) : this.transformation(params, params.options.transformation);
+      return ((_a = params.options) === null || _a === void 0 ? void 0 : _a.transformation) === undefined ? this.raw(params) : this.transformation(params, params.options);
     }
   }, {
     key: "raw",
@@ -1379,18 +1402,25 @@ var UrlBuilder = /*#__PURE__*/function () {
     key: "transformation",
     value: function transformation(params, trans) {
       var _a;
-      var baseUrl = this.getBaseUrl(params, trans.type === "preset" ? trans.preset : trans.type);
-      var transParams = this.getTransformationParams(trans, {
-        cachePermanently: "cache_perm"
-      });
+      var baseUrl = this.getBaseUrl(params, trans.transformation === "preset" ? trans.transformationPreset : trans.transformation);
+      var transParams = trans.transformation === "preset" ? [] : this.getTransformationParams(trans);
       var commonParams = this.getCommonQueryParams((_a = params.options) !== null && _a !== void 0 ? _a : {});
-      return this.addQueryParams(baseUrl, [].concat(_toConsumableArray(commonParams), _toConsumableArray(transParams)));
+      var transCommonParams = this.getCommonTransformationQueryParams(trans);
+      // This format puts "artifact" at the end, which isn't required, but is convention.
+      return this.addQueryParams(baseUrl, [].concat(_toConsumableArray(transParams), _toConsumableArray(commonParams), _toConsumableArray(transCommonParams)));
     }
   }, {
     key: "getBaseUrl",
     value: function getBaseUrl(params, prefix) {
       return "".concat(this.cdnUrl, "/").concat(params.accountId, "/").concat(prefix).concat(params.filePath);
     }
+  }, {
+    key: "getCommonTransformationQueryParams",
+    value: function getCommonTransformationQueryParams(trans) {
+      return this.makeQueryParams(["cachePermanently", "large", "artifact"], {
+        cachePermanently: "cache_perm"
+      })(trans);
+    }
   }, {
     key: "getCommonQueryParams",
     value: function getCommonQueryParams(params) {
@@ -1416,8 +1446,9 @@ var UrlBuilder = /*#__PURE__*/function () {
     }
   }, {
     key: "getTransformationParams",
-    value: function getTransformationParams(trans, keyRewrites) {
-      if (trans.params === undefined) {
+    value: function getTransformationParams(trans) {
+      var params = trans.transformationParams;
+      if (params === undefined) {
         return [];
       }
       var serializeObj = function serializeObj(obj) {
@@ -1425,11 +1456,10 @@ var UrlBuilder = /*#__PURE__*/function () {
           var _ref2 = _slicedToArray(_ref, 2),
             key = _ref2[0],
             value = _ref2[1];
-          var _a;
-          return [(_a = keyRewrites[key]) !== null && _a !== void 0 ? _a : key, value.toString()];
+          return [key, value.toString()];
         });
       };
-      return Array.isArray(trans.params) ? trans.params.flatMap(serializeObj) : serializeObj(trans.params);
+      return Array.isArray(params) ? params.flatMap(serializeObj) : serializeObj(params);
     }
   }, {
     key: "addQueryParams",
@@ -2446,7 +2476,6 @@ var AuthManager = /*#__PURE__*/function (_BaseAPI) {
   function AuthManager(config) {
     var _this;
     AuthManagerBrowser_classCallCheck(this, AuthManager);
-    var _a, _b;
     _this = _super.call(this, config);
     _this.authSessionMutex = new Mutex();
     _this.contentType = "content-type";
@@ -2455,16 +2484,9 @@ var AuthManager = /*#__PURE__*/function (_BaseAPI) {
     _this.minJwtTtlSeconds = 10;
     _this.retryAuthAfterErrorSeconds = 5;
     _this.refreshBeforeExpirySeconds = 20;
-    var accountId;
-    if (BaseAPI.specialApiKeys.includes(config.apiKey)) {
-      accountId = BaseAPI.specialApiKeyAccountId;
-    } else {
-      accountId = (_b = (_a = config.apiKey.split("_")[1]) === null || _a === void 0 ? void 0 : _a.substr(0, BaseAPI.accountIdLength)) !== null && _b !== void 0 ? _b : "";
-      if (accountId.length !== BaseAPI.accountIdLength) {
-        throw new Error("Invalid Bytescale API key.");
-      }
-    }
-    _this.accessTokenUrl = "".concat(BytescaleApiClientConfigResolver.getCdnUrl(config), "/api/v1/access_tokens/").concat(accountId);
+    var cdnUrl = BytescaleApiClientConfigUtils.getCdnUrl(config);
+    var accountId = BytescaleApiClientConfigUtils.getAccountId(config);
+    _this.accessTokenUrl = "".concat(cdnUrl, "/api/v1/access_tokens/").concat(accountId);
     return _this;
   }
   AuthManagerBrowser_createClass(AuthManager, [{

package/dist/node/cjs/main.js

@@ -64,7 +64,7 @@ __lib_require__.d(__lib_exports__, {
   "AuthManager": function() { return /* reexport */ AuthManager; },
   "BaseAPI": function() { return /* reexport */ BaseAPI; },
   "BinaryResult": function() { return /* reexport */ BinaryResult; },
-  "BytescaleApiClientConfigResolver": function() { return /* reexport */ BytescaleApiClientConfigResolver; },
+  "BytescaleApiClientConfigUtils": function() { return /* reexport */ BytescaleApiClientConfigUtils; },
   "BytescaleApiError": function() { return /* reexport */ BytescaleApiError; },
   "CancelledError": function() { return /* reexport */ CancelledError; },
   "CommonTypesNoOp": function() { return /* reexport */ CommonTypesNoOp; },
@@ -140,21 +140,21 @@ function runtime_createClass(Constructor, protoProps, staticProps) { if (protoPr
 function runtime_toPropertyKey(arg) { var key = runtime_toPrimitive(arg, "string"); return runtime_typeof(key) === "symbol" ? key : String(key); }
 function runtime_toPrimitive(input, hint) { if (runtime_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (runtime_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 
-var BytescaleApiClientConfigResolver = /*#__PURE__*/function () {
-  function BytescaleApiClientConfigResolver() {
-    runtime_classCallCheck(this, BytescaleApiClientConfigResolver);
+var BytescaleApiClientConfigUtils = /*#__PURE__*/function () {
+  function BytescaleApiClientConfigUtils() {
+    runtime_classCallCheck(this, BytescaleApiClientConfigUtils);
   }
-  runtime_createClass(BytescaleApiClientConfigResolver, null, [{
+  runtime_createClass(BytescaleApiClientConfigUtils, null, [{
     key: "getApiUrl",
     value: function getApiUrl(config) {
       var _a;
-      return (_a = config.apiUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultApiUrl;
+      return (_a = config.apiUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultApiUrl;
     }
   }, {
     key: "getCdnUrl",
     value: function getCdnUrl(config) {
       var _a;
-      return (_a = config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultCdnUrl;
+      return (_a = config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultCdnUrl;
     }
   }, {
     key: "getFetchApi",
@@ -162,11 +162,48 @@ var BytescaleApiClientConfigResolver = /*#__PURE__*/function () {
       var _a;
       return (_a = config.fetchApi) !== null && _a !== void 0 ? _a : fetch;
     }
+  }, {
+    key: "getAccountId",
+    value: function getAccountId(config) {
+      var _a, _b;
+      var accountId;
+      if (BytescaleApiClientConfigUtils.specialApiKeys.includes(config.apiKey)) {
+        accountId = BytescaleApiClientConfigUtils.specialApiKeyAccountId;
+      } else {
+        accountId = (_b = (_a = config.apiKey.split("_")[1]) === null || _a === void 0 ? void 0 : _a.substr(0, BytescaleApiClientConfigUtils.accountIdLength)) !== null && _b !== void 0 ? _b : "";
+        if (accountId.length !== BytescaleApiClientConfigUtils.accountIdLength) {
+          throw new Error("Invalid Bytescale API key.");
+        }
+      }
+      return accountId;
+    }
+  }, {
+    key: "validate",
+    value: function validate(config) {
+      var _a;
+      // Defensive programming, for users not using TypeScript. Mainly because this is used by UploadWidget users.
+      if ((config !== null && config !== void 0 ? config : undefined) === undefined) {
+        throw new Error("Config parameter required.");
+      }
+      if (((_a = config.apiKey) !== null && _a !== void 0 ? _a : undefined) === undefined) {
+        throw new Error("Please provide an API key via the 'apiKey' config parameter.");
+      }
+      if (config.apiKey.trim() !== config.apiKey) {
+        // We do not support API keys with whitespace (by trimming ourselves) because otherwise we'd need to support this
+        // everywhere in perpetuity (since removing the trimming would be a breaking change).
+        throw new Error("API key needs trimming (whitespace detected).");
+      }
+      // This performs futher validation on the API key...
+      BytescaleApiClientConfigUtils.getAccountId(config);
+    }
   }]);
-  return BytescaleApiClientConfigResolver;
+  return BytescaleApiClientConfigUtils;
 }();
-BytescaleApiClientConfigResolver.defaultApiUrl = "https://api.bytescale.com";
-BytescaleApiClientConfigResolver.defaultCdnUrl = "https://upcdn.io";
+BytescaleApiClientConfigUtils.defaultApiUrl = "https://api.bytescale.com";
+BytescaleApiClientConfigUtils.defaultCdnUrl = "https://upcdn.io";
+BytescaleApiClientConfigUtils.specialApiKeys = ["free", "demo"];
+BytescaleApiClientConfigUtils.specialApiKeyAccountId = "W142hJk";
+BytescaleApiClientConfigUtils.accountIdLength = 7; // Sync with: upload/shared/**/AccountIdUtils
 /**
  * This is the base class for all generated API classes.
  */
@@ -174,6 +211,7 @@ var BaseAPI = /*#__PURE__*/function () {
   function BaseAPI(config) {
     runtime_classCallCheck(this, BaseAPI);
     this.config = config;
+    BytescaleApiClientConfigUtils.validate(config);
   }
   runtime_createClass(BaseAPI, [{
     key: "request",
@@ -188,7 +226,7 @@ var BaseAPI = /*#__PURE__*/function () {
         }
         // Key: any possible value for 'baseUrlOverride'
         // Value: user-overridden value for that base URL from the config.
-        var nonDefaultBasePaths = _defineProperty({}, BytescaleApiClientConfigResolver.defaultCdnUrl, BytescaleApiClientConfigResolver.getCdnUrl(_this2.config));
+        var nonDefaultBasePaths = _defineProperty({}, BytescaleApiClientConfigUtils.defaultCdnUrl, BytescaleApiClientConfigUtils.getCdnUrl(_this2.config));
         return _await(_this2.createFetchParams(context, initOverrides, baseUrlOverride === undefined ? undefined : (_b = nonDefaultBasePaths[baseUrlOverride]) !== null && _b !== void 0 ? _b : baseUrlOverride), function (_ref) {
           var url = _ref.url,
             init = _ref.init;
@@ -210,7 +248,7 @@ var BaseAPI = /*#__PURE__*/function () {
         var _a, _b;
         var response;
         return _continue(_catch(function () {
-          return _await(BytescaleApiClientConfigResolver.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
+          return _await(BytescaleApiClientConfigUtils.getFetchApi(_this4.config)(url, init), function (_BytescaleApiClientCo) {
             response = _BytescaleApiClientCo;
           });
         }, function (e) {
@@ -264,7 +302,7 @@ var BaseAPI = /*#__PURE__*/function () {
     value: function createFetchParams(context, initOverrides, baseUrlOverride) {
       try {
         var _this6 = this;
-        var url = (baseUrlOverride !== null && baseUrlOverride !== void 0 ? baseUrlOverride : BytescaleApiClientConfigResolver.getApiUrl(_this6.config)) + context.path;
+        var url = (baseUrlOverride !== null && baseUrlOverride !== void 0 ? baseUrlOverride : BytescaleApiClientConfigUtils.getApiUrl(_this6.config)) + context.path;
         if (context.query !== undefined && Object.keys(context.query).length !== 0) {
           // only add the querystring to the URL if there are query parameters.
           // this is done to avoid urls ending with a "?" character which buggy webservers
@@ -308,9 +346,6 @@ var BaseAPI = /*#__PURE__*/function () {
   }]);
   return BaseAPI;
 }();
-BaseAPI.specialApiKeys = ["free", "demo"];
-BaseAPI.specialApiKeyAccountId = "W142hJk";
-BaseAPI.accountIdLength = 7; // Sync with: upload/shared/**/AccountIdUtils
 var CancelledError = /*#__PURE__*/function (_Error) {
   _inherits(CancelledError, _Error);
   var _super = _createSuper(CancelledError);
@@ -468,9 +503,6 @@ function FileApi_getPrototypeOf(o) { FileApi_getPrototypeOf = Object.setPrototyp
  */
 // @ts-ignore
 
-/**
- *
- */
 var FileApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   FileApi_inherits(FileApi, _runtime$BaseAPI);
   var _super = FileApi_createSuper(FileApi);
@@ -769,9 +801,6 @@ function FolderApi_getPrototypeOf(o) { FolderApi_getPrototypeOf = Object.setProt
  */
 // @ts-ignore
 
-/**
- *
- */
 var FolderApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   FolderApi_inherits(FolderApi, _runtime$BaseAPI);
   var _super = FolderApi_createSuper(FolderApi);
@@ -1029,9 +1058,6 @@ function JobApi_getPrototypeOf(o) { JobApi_getPrototypeOf = Object.setPrototypeO
  */
 // @ts-ignore
 
-/**
- *
- */
 var JobApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   JobApi_inherits(JobApi, _runtime$BaseAPI);
   var _super = JobApi_createSuper(JobApi);
@@ -1164,9 +1190,6 @@ function UploadApi_getPrototypeOf(o) { UploadApi_getPrototypeOf = Object.setProt
  */
 // @ts-ignore
 
-/**
- *
- */
 var UploadApi = /*#__PURE__*/function (_runtime$BaseAPI) {
   UploadApi_inherits(UploadApi, _runtime$BaseAPI);
   var _super = UploadApi_createSuper(UploadApi);
@@ -1362,7 +1385,7 @@ var UrlBuilder = /*#__PURE__*/function () {
   function UrlBuilder(config) {
     UrlBuilder_classCallCheck(this, UrlBuilder);
     var _a;
-    this.cdnUrl = (_a = config === null || config === void 0 ? void 0 : config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigResolver.defaultCdnUrl;
+    this.cdnUrl = (_a = config === null || config === void 0 ? void 0 : config.cdnUrl) !== null && _a !== void 0 ? _a : BytescaleApiClientConfigUtils.defaultCdnUrl;
   }
   /**
    * Builds a URL to either a raw file or a transformed file.
@@ -1387,7 +1410,7 @@ var UrlBuilder = /*#__PURE__*/function () {
     key: "url",
     value: function url(params) {
       var _a;
-      return ((_a = params.options) === null || _a === void 0 ? void 0 : _a.transformation) === undefined ? this.raw(params) : this.transformation(params, params.options.transformation);
+      return ((_a = params.options) === null || _a === void 0 ? void 0 : _a.transformation) === undefined ? this.raw(params) : this.transformation(params, params.options);
     }
   }, {
     key: "raw",
@@ -1401,18 +1424,25 @@ var UrlBuilder = /*#__PURE__*/function () {
     key: "transformation",
     value: function transformation(params, trans) {
       var _a;
-      var baseUrl = this.getBaseUrl(params, trans.type === "preset" ? trans.preset : trans.type);
-      var transParams = this.getTransformationParams(trans, {
-        cachePermanently: "cache_perm"
-      });
+      var baseUrl = this.getBaseUrl(params, trans.transformation === "preset" ? trans.transformationPreset : trans.transformation);
+      var transParams = trans.transformation === "preset" ? [] : this.getTransformationParams(trans);
       var commonParams = this.getCommonQueryParams((_a = params.options) !== null && _a !== void 0 ? _a : {});
-      return this.addQueryParams(baseUrl, [].concat(_toConsumableArray(commonParams), _toConsumableArray(transParams)));
+      var transCommonParams = this.getCommonTransformationQueryParams(trans);
+      // This format puts "artifact" at the end, which isn't required, but is convention.
+      return this.addQueryParams(baseUrl, [].concat(_toConsumableArray(transParams), _toConsumableArray(commonParams), _toConsumableArray(transCommonParams)));
     }
   }, {
     key: "getBaseUrl",
     value: function getBaseUrl(params, prefix) {
       return "".concat(this.cdnUrl, "/").concat(params.accountId, "/").concat(prefix).concat(params.filePath);
     }
+  }, {
+    key: "getCommonTransformationQueryParams",
+    value: function getCommonTransformationQueryParams(trans) {
+      return this.makeQueryParams(["cachePermanently", "large", "artifact"], {
+        cachePermanently: "cache_perm"
+      })(trans);
+    }
   }, {
     key: "getCommonQueryParams",
     value: function getCommonQueryParams(params) {
@@ -1438,8 +1468,9 @@ var UrlBuilder = /*#__PURE__*/function () {
     }
   }, {
     key: "getTransformationParams",
-    value: function getTransformationParams(trans, keyRewrites) {
-      if (trans.params === undefined) {
+    value: function getTransformationParams(trans) {
+      var params = trans.transformationParams;
+      if (params === undefined) {
         return [];
       }
       var serializeObj = function serializeObj(obj) {
@@ -1447,11 +1478,10 @@ var UrlBuilder = /*#__PURE__*/function () {
           var _ref2 = _slicedToArray(_ref, 2),
             key = _ref2[0],
             value = _ref2[1];
-          var _a;
-          return [(_a = keyRewrites[key]) !== null && _a !== void 0 ? _a : key, value.toString()];
+          return [key, value.toString()];
         });
       };
-      return Array.isArray(trans.params) ? trans.params.flatMap(serializeObj) : serializeObj(trans.params);
+      return Array.isArray(params) ? params.flatMap(serializeObj) : serializeObj(params);
     }
   }, {
     key: "addQueryParams",