feat: allow relative urls to be localized and parsed

namecheap · Feb 4, 2025 · 04edf2d · 04edf2d
1 parent b8ed63a
commit 04edf2d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 14 deletions.
diff --git a/src/app/utils/localizeUrl.ts b/src/app/utils/localizeUrl.ts
@@ -14,10 +14,6 @@ export function localizeUrl(config: IntlAdapterConfig, url: string, configOverri
 
     const { path, origin } = parseAsFullyQualifiedURI(url);
 
-    if (!path.startsWith('/')) {
-        throw new Error(`Localization of relative URLs is not supported. Received: "${url}"`);
-    }
-
     const { cleanUrl } = parseUrl(config, path);
 
     const receivedLocale = configOverride.locale ?? config.default.locale;
@@ -32,5 +28,7 @@ export function localizeUrl(config: IntlAdapterConfig, url: string, configOverri
         return origin + cleanUrl;
     }
 
-    return `${origin}/${getShortenedLocale(locale, config.supported.locale)}${cleanUrl}`;
+    const separator = cleanUrl.startsWith('/') ? '' : '/';
+
+    return `${origin}/${getShortenedLocale(locale, config.supported.locale)}${separator}${cleanUrl}`;
 }
diff --git a/src/app/utils/parseAsFullyQualifiedURI.ts b/src/app/utils/parseAsFullyQualifiedURI.ts
@@ -8,7 +8,7 @@ export function parseAsFullyQualifiedURI(uri: string): ParsedUri {
         // Normalize multiple slashes to a single slash, but don't affect the initial "http://" or "https://"
         const normalizedUri = uri.replace(/([^:])\/{2,}/g, '$1/');
 
-        if (normalizedUri.startsWith('/')) {
+        if (!normalizedUri.startsWith('http://') && !normalizedUri.startsWith('https://')) {
             return { origin: '', path: normalizedUri };
         }
 

diff --git a/src/app/utils/parseUrl.ts b/src/app/utils/parseUrl.ts
@@ -17,12 +17,9 @@ export function parseUrl(config: IntlAdapterConfig, url: string): ParsedUrl {
     }
 
     const { path, origin } = parseAsFullyQualifiedURI(url);
+    const trimmedPath = path.charAt(0) === '/' ? path.slice(1) : path;
 
-    if (!path.startsWith('/')) {
-        throw new Error(`Localization of relative URLs is not supported. Received: "${url}"`);
-    }
-
-    const [, langPart, ...unlocalizedPath] = path.split('/');
+    const [langPart, ...unlocalizedPath] = trimmedPath.split('/');
     const locale = getCanonicalLocale(langPart, config.supported.locale);
 
     if (locale !== null && config.supported.locale.indexOf(locale) !== -1) {

diff --git a/test/app/IlcIntl.spec.ts b/test/app/IlcIntl.spec.ts
@@ -180,6 +180,13 @@ describe('IlcIntl', () => {
             expect(IlcIntl.localizeUrl(baseConfig, 'http://tst.com', { locale: 'es-ES' })).to.eq('http://tst.com/es/');
             expect(IlcIntl.localizeUrl(baseConfig, 'http://tst.com/', { locale: 'es-ES' })).to.eq('http://tst.com/es/');
         });
+        it('handles relative URI cases', () => {
+            expect(IlcIntl.localizeUrl(baseConfig, 'path/1')).to.eq('path/1');
+            expect(IlcIntl.localizeUrl(baseConfig, 'path/1/')).to.eq('path/1/');
+
+            expect(IlcIntl.localizeUrl(baseConfig, 'path/1', { locale: 'es-ES' })).to.eq('/es/path/1');
+            expect(IlcIntl.localizeUrl(baseConfig, 'path/1/', { locale: 'es-ES' })).to.eq('/es/path/1/');
+        });
 
         it('handles multiple slashes in the URL correctly', () => {
             expect(IlcIntl.localizeUrl(baseConfig, 'http://tst.com/es///google.com', { locale: 'es-ES' })).to.eq(
@@ -212,8 +219,10 @@ describe('IlcIntl', () => {
             expect(IlcIntl.localizeUrl(baseConfig, 'javascript:void(0)', { locale: 'es-ES' })).to.equal(
                 'javascript:void(0)',
             );
+        });
 
-            expect(() => IlcIntl.localizeUrl(baseConfig, 'tst', { locale: 'es-ES' })).throws(Error);
+        it('fallbacks to original value on invalid urls', () => {
+            expect(IlcIntl.localizeUrl(baseConfig, 'http://:')).to.equal('http://:');
         });
     });
 
@@ -257,6 +266,25 @@ describe('IlcIntl', () => {
             });
         });
 
+        it('handles relative url cases', () => {
+            expect(IlcIntl.parseUrl(baseConfig, 'path/1')).to.eql({
+                cleanUrl: 'path/1',
+                locale: baseConfig.default.locale,
+            });
+            expect(IlcIntl.parseUrl(baseConfig, 'path/1/')).to.eql({
+                cleanUrl: 'path/1/',
+                locale: baseConfig.default.locale,
+            });
+            expect(IlcIntl.parseUrl(baseConfig, 'es/path/1')).to.eql({
+                cleanUrl: '/path/1',
+                locale: 'es-ES',
+            });
+            expect(IlcIntl.parseUrl(baseConfig, 'es/path/1/')).to.eql({
+                cleanUrl: '/path/1/',
+                locale: 'es-ES',
+            });
+        });
+
         it('handles multiple slashes in the URL correctly', () => {
             expect(IlcIntl.parseUrl(baseConfig, 'http://tst.com/es///google.com')).to.eql({
                 cleanUrl: 'http://tst.com/google.com',
@@ -306,8 +334,6 @@ describe('IlcIntl', () => {
                 cleanUrl: 'javascript:void(0)',
                 locale: baseConfig.default.locale,
             });
-
-            expect(() => IlcIntl.parseUrl(baseConfig, 'tst')).to.throw(Error);
         });
     });