fix: param with escaped periods (#98)

close #97
yesmeck · May 19, 2024 · 3673f55 · 3673f55
1 parent 99edd20
commit 3673f55
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 3 deletions.
diff --git a/.changeset/wise-pans-smoke.md b/.changeset/wise-pans-smoke.md
@@ -0,0 +1,5 @@
+---
+"remix-routes": patch
+---
+
+fix: param with escaped periods
diff --git a/e2e/app/routes/api.$id[.]json.ts b/e2e/app/routes/api.$id[.]json.ts
@@ -0,0 +1,3 @@
+export type SearchParams = {
+
+}
diff --git a/packages/remix-routes/fixture/v2/app/routes/api.$id[.]json.ts b/packages/remix-routes/fixture/v2/app/routes/api.$id[.]json.ts
diff --git a/packages/remix-routes/src/__tests__/__snapshots__/build.test.ts.snap b/packages/remix-routes/src/__tests__/__snapshots__/build.test.ts.snap
@@ -619,7 +619,7 @@ exports[`build v2 routes 1`] = `
     "/api/:id.json": {
       params: {
       
-        id.json: string | number;
+        id: string | number;
       
       },
       query: ExportedQuery<import('../app/routes/api.$id[.]json').SearchParams>,

diff --git a/packages/remix-routes/src/__tests__/index.test.ts b/packages/remix-routes/src/__tests__/index.test.ts
@@ -9,6 +9,10 @@ test('$path + params', () => {
   expect($path('/posts/:id', { id: 1 })).toBe('/posts/1');
 });
 
+test('$path + params + escape periods', () => {
+  expect($path('/posts/:id.json', { id: 1 })).toBe('/posts/1.json');
+});
+
 test('$path + query', () => {
   expect($path('/posts', { order: 'desc' })).toBe('/posts?order=desc');
 });

diff --git a/packages/remix-routes/src/build.ts b/packages/remix-routes/src/build.ts
@@ -134,6 +134,7 @@ function parse(routes: ConfigRoute[]) {
         ...route.path
           .split('/')
           .filter((seg) => seg.startsWith(':') || seg == '*')
+          .map((param) => param.split('.')[0])
           .map((param) => param.replace(':', '').replace('*', '"*"')),
       )
     );

diff --git a/packages/remix-routes/src/index.ts b/packages/remix-routes/src/index.ts
@@ -19,9 +19,9 @@ export function $path(route: string, ...paramsOrQuery: Array<any>) {
         fragment = fragment.slice(0, -1);
       }
       if (fragment.indexOf(':') > -1) {
-        let paramName = fragment.slice(1);
+        let [paramName, extension] = fragment.slice(1).split('.');
         if (paramName in params && params[paramName] !== undefined) {
-          return params[paramName];
+          return params[paramName] + (extension ? '.' + extension : '');
         }
         return null
       }