bruce-models 5.3.4 → 5.3.5

package/dist/bruce-models.umd.js

@@ -1032,51 +1032,11 @@
                 if ((params === null || params === void 0 ? void 0 : params.cdn) && this.cdnBaseUrl) {
                     return this.ConstructCdnUrl(params.url, params.urlParams);
                 }
-                const tmp = new URL(this.baseUrl);
-                if (params === null || params === void 0 ? void 0 : params.urlParams) {
-                    if (params.urlParams instanceof URLSearchParams) {
-                        params.urlParams.forEach((value, key) => {
-                            tmp.searchParams.append(key, value);
-                        });
-                    }
-                    else {
-                        for (const key in params.urlParams) {
-                            tmp.searchParams.append(key, params.urlParams[key]);
-                        }
-                    }
-                }
-                // Ensure the url ends with a slash.
-                if (!tmp.pathname.endsWith("/")) {
-                    tmp.pathname += "/";
-                }
-                let split;
-                if (params === null || params === void 0 ? void 0 : params.url) {
-                    // Ensure we're only adding the path.
-                    // The baseUrl could have included query params so have this extra logic.
-                    split = params.url.split("?");
-                    // Ensure the url does not start with a slash.
-                    // This is because the base url already has a slash at the end.
-                    let path = split[0];
-                    if (path.startsWith("/")) {
-                        path = path.substring(1);
-                    }
-                    tmp.pathname += path;
-                }
-                let full = tmp.toString();
-                // Append the query string if any exist.
-                if (split && split.length > 1) {
-                    const query = split[1].split("&");
-                    for (let q of query) {
-                        if (full.includes("?")) {
-                            full += "&";
-                        }
-                        else {
-                            full += "?";
-                        }
-                        full += q;
-                    }
-                }
-                return full;
+                return exports.UrlUtils.ConstructUrl({
+                    existing: this.baseUrl,
+                    url: params === null || params === void 0 ? void 0 : params.url,
+                    urlParams: params === null || params === void 0 ? void 0 : params.urlParams
+                });
             }
             /**
              * Returns a url routed through the API's CDN.
@@ -1089,51 +1049,11 @@
                 if (!this.cdnBaseUrl) {
                     return null;
                 }
-                const tmp = new URL(this.cdnBaseUrl);
-                if (urlParams) {
-                    if (urlParams instanceof URLSearchParams) {
-                        urlParams.forEach((value, key) => {
-                            tmp.searchParams.append(key, value);
-                        });
-                    }
-                    else {
-                        for (const key in urlParams) {
-                            tmp.searchParams.append(key, urlParams[key]);
-                        }
-                    }
-                }
-                // Ensure the url ends with a slash.
-                if (!tmp.pathname.endsWith("/")) {
-                    tmp.pathname += "/";
-                }
-                let split;
-                if (url) {
-                    // Ensure we're only adding the path.
-                    // The baseUrl could have included query params so have this extra logic.
-                    split = url.split("?");
-                    // Ensure the url does not start with a slash.
-                    // This is because the base url already has a slash at the end.
-                    let path = split[0];
-                    if (path.startsWith("/")) {
-                        path = url.substring(1);
-                    }
-                    tmp.pathname += path;
-                }
-                let full = tmp.toString();
-                // Append the query string if any exist.
-                if (split && split.length > 1) {
-                    const query = split[1].split("&");
-                    for (let q of query) {
-                        if (full.includes("?")) {
-                            full += "&";
-                        }
-                        else {
-                            full += "?";
-                        }
-                        full += q;
-                    }
-                }
-                return full;
+                return exports.UrlUtils.ConstructUrl({
+                    existing: this.cdnBaseUrl,
+                    url: url,
+                    urlParams: urlParams
+                });
             }
             /**
              * Warning: This will cancel the init process.
@@ -13242,6 +13162,58 @@
             return urlObj.toString();
         }
         UrlUtils.AddQueryParam = AddQueryParam;
+        /**
+         * Returns a url with the provided url appended to the provided existing url.
+         * @param params
+         */
+        function ConstructUrl(params) {
+            const tmp = new URL(params.existing);
+            if (params === null || params === void 0 ? void 0 : params.urlParams) {
+                if (params.urlParams instanceof URLSearchParams) {
+                    params.urlParams.forEach((value, key) => {
+                        tmp.searchParams.append(key, value);
+                    });
+                }
+                else {
+                    for (const key in params.urlParams) {
+                        tmp.searchParams.append(key, params.urlParams[key]);
+                    }
+                }
+            }
+            // Ensure the url ends with a slash.
+            if (!tmp.pathname.endsWith("/")) {
+                tmp.pathname += "/";
+            }
+            let split;
+            if (params === null || params === void 0 ? void 0 : params.url) {
+                // Ensure we're only adding the path.
+                // 'existing' could have included query params so have this extra logic.
+                split = params.url.split("?");
+                // Ensure the url does not start with a slash.
+                // This is because the existing url already has a slash at the end.
+                let path = split[0];
+                if (path.startsWith("/")) {
+                    path = path.substring(1);
+                }
+                tmp.pathname += path;
+            }
+            let full = tmp.toString();
+            // Append the query string if any exist.
+            if (split && split.length > 1) {
+                const query = split[1].split("&");
+                for (let q of query) {
+                    if (full.includes("?")) {
+                        full += "&";
+                    }
+                    else {
+                        full += "?";
+                    }
+                    full += q;
+                }
+            }
+            return full;
+        }
+        UrlUtils.ConstructUrl = ConstructUrl;
     })(exports.UrlUtils || (exports.UrlUtils = {}));
 
     (function (DataLab) {
@@ -14465,7 +14437,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "5.3.4";
+    const VERSION = "5.3.5";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;