bruce-models 4.5.9 → 4.6.0

package/dist/bruce-models.umd.js

@@ -1046,9 +1046,6 @@
              * @param params
              */
             ConstructUrl(params) {
-                if (!(params === null || params === void 0 ? void 0 : params.url)) {
-                    return null;
-                }
                 if ((params === null || params === void 0 ? void 0 : params.cdn) && this.cdnBaseUrl) {
                     return this.ConstructCdnUrl(params.url, params.urlParams);
                 }
@@ -1070,12 +1067,24 @@
                     tmp.pathname += "/";
                 }
                 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.
+                    const 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.
-                    if (params.url.startsWith("/")) {
-                        params.url = params.url.substring(1);
+                    let path = split[0];
+                    if (path.startsWith("/")) {
+                        path = path.substring(1);
+                    }
+                    tmp.pathname += path;
+                    // Append the query string if any exist.
+                    if (split.length > 1) {
+                        const query = split[1].split("&");
+                        for (let q of query) {
+                            const parts = q.split("=");
+                            tmp.searchParams.append(parts[0], parts[1]);
+                        }
                     }
-                    tmp.pathname += params.url;
                 }
                 return tmp.toString();
             }
@@ -1108,12 +1117,24 @@
                     tmp.pathname += "/";
                 }
                 if (url) {
+                    // Ensure we're only adding the path.
+                    // The baseUrl could have included query params so have this extra logic.
+                    let 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.
-                    if (url.startsWith("/")) {
-                        url = url.substring(1);
+                    let path = split[0];
+                    if (path.startsWith("/")) {
+                        path = url.substring(1);
+                    }
+                    tmp.pathname += path;
+                    // Append the query string if any exist.
+                    if (split.length > 1) {
+                        const query = split[1].split("&");
+                        for (let q of query) {
+                            const parts = q.split("=");
+                            tmp.searchParams.append(parts[0], parts[1]);
+                        }
                     }
-                    tmp.pathname += url;
                 }
                 return tmp.toString();
             }
@@ -1125,8 +1146,14 @@
              */
             SetBaseUrl(url) {
                 this.baseUrl = url;
-                if (!this.baseUrl.endsWith("/")) {
-                    this.baseUrl += "/";
+                // If we're setting a valid URL then we'll ensure it ends with a slash.
+                if (this.baseUrl && (this.baseUrl.startsWith("http://") || this.baseUrl.startsWith("https://"))) {
+                    // Parsing into URL object to avoid adding a "/" after query params.
+                    const full = new URL(this.baseUrl);
+                    if (!full.pathname.endsWith("/")) {
+                        full.pathname += "/";
+                    }
+                    this.baseUrl = full.toString();
                 }
                 this.loadCancelled = true;
             }
@@ -13463,7 +13490,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.5.9";
+    const VERSION = "4.6.0";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;