@cratis/arc 22.27.1 → 22.27.2

package/for_joinPaths/when_joining_paths.ts

@@ -0,0 +1,20 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { joinPaths } from '../joinPaths.js';
+
+describe('when joining paths', () => {
+    it('should join ordinary segments', () => joinPaths('api', 'orders').should.equal('api/orders'));
+    it('should preserve a leading slash', () => joinPaths('/workbench', 'api').should.equal('/workbench/api'));
+    it('should collapse repeated slashes at each boundary', () => joinPaths('/workbench//', '///api//', '//orders').should.equal('/workbench/api/orders'));
+    it('should leave slashes within a segment alone', () => joinPaths('/a//b', 'c//d').should.equal('/a//b/c//d'));
+    it('should preserve an https scheme', () => joinPaths('https://example.com/', '/api').should.equal('https://example.com/api'));
+    it('should preserve an http scheme', () => joinPaths('http://example.com', '/api').should.equal('http://example.com/api'));
+    it('should preserve a scheme supplied as its own segment', () => joinPaths('https://', 'example.com', '/api').should.equal('https://example.com/api'));
+    it('should handle an empty first segment', () => joinPaths('', '/api').should.equal('/api'));
+    it('should handle empty middle segments', () => joinPaths('/api', '', 'orders').should.equal('/api/orders'));
+    it('should preserve the separator between two empty segments', () => joinPaths('', '').should.equal('/'));
+    it('should handle no segments', () => joinPaths().should.equal(''));
+    it('should preserve a trailing slash', () => joinPaths('/api/', 'orders/').should.equal('/api/orders/'));
+    it('should preserve a trailing slash for an empty final segment', () => joinPaths('/api', '').should.equal('/api/'));
+});

package/joinPaths.ts

@@ -1,7 +1,28 @@
 // Copyright (c) Cratis. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-export function joinPaths(...paths) {
-    const joined = paths.join('/');
-    return joined.replace('//', '/');
-}
+function trimTrailingSlashes(path: string): string {
+    let end = path.length;
+    while (end > 0 && path[end - 1] === '/') {
+        end--;
+    }
+    return path.slice(0, end);
+}
+
+function trimLeadingSlashes(path: string): string {
+    let start = 0;
+    while (start < path.length && path[start] === '/') {
+        start++;
+    }
+    return path.slice(start);
+}
+
+export function joinPaths(...paths: string[]): string {
+    let joined = paths[0] ?? '';
+    for (const path of paths.slice(1)) {
+        const base = joined.endsWith('://') ? joined : trimTrailingSlashes(joined);
+        const segment = trimLeadingSlashes(path);
+        joined = `${base}${base.endsWith('://') ? '' : '/'}${segment}`;
+    }
+    return joined;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "@cratis/arc",
-    "version": "22.27.1",
+    "version": "22.27.2",
     "description": "TypeScript command, query, validation, identity, and messaging runtime for Cratis Arc — the CQRS application framework for ASP.NET Core — used by generated proxies.",
     "keywords": [
         "cratis",