cafe-utility 9.5.0 → 9.7.0

package/index.d.ts

@@ -160,6 +160,7 @@ declare function resolveVariableWithDefaultSyntax(string: string, key: string, v
 declare function resolveRemainingVariablesWithDefaults(string: string, prefix?: string, separator?: string): string;
 declare function resolveMarkdownLinks(string: string, transformer: (label: string, link: string) => string): string;
 declare function toQueryString(object: Record<string, any>, questionMark?: boolean): string;
+declare function buildUrl(baseUrl?: string | null, path?: string | null, query?: Record<string, any> | null): string;
 declare function parseCsv(string: string, delimiter?: string, quote?: string): string[];
 declare function humanizeProgress(state: Progress): string;
 declare function waitFor(predicate: () => Promise<boolean>, waitLength: number, maxWaits: number): Promise<boolean>;
@@ -210,7 +211,7 @@ declare function getPreLine(string: string): string;
 declare function containsWord(string: string, word: string): boolean;
 declare function containsWords(string: string, words: string[]): boolean;
 declare function getCached<T>(key: string, ttlMillis: number, handler: () => Promise<T>): Promise<T>;
-declare function joinUrl(...parts: string[]): string;
+declare function joinUrl(...parts: unknown[]): string;
 declare function sortObject<T>(object: CafeObject<T>): CafeObject<T>;
 declare function sortArray<T>(array: T[]): T[];
 declare function sortAny(any: unknown): unknown;
@@ -543,6 +544,7 @@ export declare const Strings: {
     linesMatchInOrder: typeof linesMatchInOrder;
     represent: typeof represent;
     resolveMarkdownLinks: typeof resolveMarkdownLinks;
+    buildUrl: typeof buildUrl;
 };
 export declare const Assertions: {
     asEqual: typeof asEqual;

package/index.js

@@ -1140,6 +1140,10 @@ function toQueryString(object, questionMark = true) {
     return queryString ? (questionMark ? '?' : '') + queryString : ''
 }
 
+function buildUrl(baseUrl, path, query) {
+    return joinUrl(baseUrl, path) + toQueryString(query || {})
+}
+
 function parseCsv(string, delimiter = ',', quote = '"') {
     const items = []
     let buffer = ''
@@ -1390,16 +1394,10 @@ async function getCached(key, ttlMillis, handler) {
 }
 
 function joinUrl(...parts) {
-    let url = parts[0][parts[0].length - 1] === '/' ? parts[0].slice(0, -1) : parts[0]
-    for (let i = 1; i < parts.length; i++) {
-        const part = parts[i]
-        if (part === '/') {
-            continue
-        }
-        const starts = part[0] === '/'
-        const ends = part[part.length - 1] === '/'
-        url += '/' + part.slice(starts ? 1 : 0, ends ? -1 : undefined)
-    }
+    const url = parts
+        .filter(part => part && isString(part))
+        .join('/')
+        .replace(/([^:]\/)\/+/g, '$1')
     return url
 }
 
@@ -2496,7 +2494,8 @@ exports.Strings = {
     lineMatches,
     linesMatchInOrder,
     represent,
-    resolveMarkdownLinks
+    resolveMarkdownLinks,
+    buildUrl
 }
 
 exports.Assertions = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cafe-utility",
-    "version": "9.5.0",
+    "version": "9.7.0",
     "description": "",
     "main": "index.js",
     "exports": {