cafe-utility 9.5.0 → 9.6.0

package/index.d.ts

@@ -210,7 +210,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;

package/index.js

@@ -1390,16 +1390,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
 }
 

package/package.json

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