fix: fix tests

Author: stevenle

packages/root/src/core/core.ts

@@ -21,4 +21,4 @@ export {RequestContext, useRequestContext} from './hooks/useRequestContext.js';
 export {useTranslations} from './hooks/useTranslations.js';
 export * from './plugin.js';
 export * from './types.js';
-export {replaceParams} from '../render/router.js';
+export * from '../utils/url-path-params.js';

packages/root/src/render/render.tsx

@@ -32,11 +32,12 @@ import {
 import type {ElementGraph} from '../node/element-graph.js';
 import {parseTagNames} from '../utils/elements.js';
 import {toHrefLang} from '../utils/i18n.js';
+import {replaceParams} from '../utils/url-path-params.js';
 import {AssetMap} from './asset-map/asset-map.js';
 import {htmlMinify} from './html-minify.js';
 import {htmlPretty} from './html-pretty.js';
 import {getFallbackLocales} from './i18n-fallbacks.js';
-import {normalizeUrlPath, replaceParams, Router} from './router.js';
+import {normalizeUrlPath, Router} from './router.js';
 
 const CONTENT_TYPES: Record<string, string> = {
   html: 'text/html',

packages/root/src/render/router.ts

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import {RootConfig} from '../core/config.js';
 import {Route, RouteModule} from '../core/types.js';
+import {replaceParams, testPathHasParams} from '../utils/url-path-params.js';
 import {RouteTrie} from './route-trie.js';
 
 const ROUTES_FILES = import.meta.glob<RouteModule>(
@@ -138,15 +139,9 @@ export class Router {
           }
         );
       }
-    } else if (
-      routeModule.getStaticProps &&
-      !pathHasParams
-    ) {
+    } else if (routeModule.getStaticProps && !pathHasParams) {
       urlPaths.push({urlPath: normalizeUrlPath(urlPathFormat), params: {}});
-    } else if (
-      !routeModule.handle &&
-      !pathHasParams
-    ) {
+    } else if (!routeModule.handle && !pathHasParams) {
       urlPaths.push({urlPath: normalizeUrlPath(urlPathFormat), params: {}});
     } else if (
       pathHasParams &&
@@ -166,23 +161,6 @@ export class Router {
   }
 }
 
-export function replaceParams(
-  urlPathFormat: string,
-  params: Record<string, string>
-) {
-  const urlPath = urlPathFormat.replaceAll(
-    /\[\[?(\.\.\.)?([\w\-_]*)\]?\]/g,
-    (match: string, _wildcard: string, key: string) => {
-      const val = params[key];
-      if (!val) {
-        throw new Error(`unreplaced param ${match} in url: ${urlPathFormat}`);
-      }
-      return val;
-    }
-  );
-  return urlPath;
-}
-
 export function normalizeUrlPath(
   urlPath: string,
   options?: {trailingSlash?: boolean}
@@ -192,11 +170,9 @@ export function normalizeUrlPath(
   // Remove trailing slash.
   if (
     testPathHasFileExt(urlPath) ||
-    (
-      options?.trailingSlash === false &&
+    (options?.trailingSlash === false &&
       urlPath !== '/' &&
-      urlPath.endsWith('/')
-    )
+      urlPath.endsWith('/'))
   ) {
     urlPath = removeTrailingSlash(urlPath);
   }
@@ -219,13 +195,6 @@ export function normalizeUrlPath(
   return urlPath;
 }
 
-function testPathHasParams(urlPath: string) {
-  const segments = urlPath.split('/');
-  return segments.some((segment) => {
-    return segment.startsWith('[') && segment.includes(']');
-  });
-}
-
 function testPathHasFileExt(urlPath: string) {
   const basename = path.basename(removeTrailingSlash(urlPath));
   return basename.includes('.');

packages/root/src/render/router.test.ts renamed to packages/root/src/utils/url-path-params.test.ts

@@ -1,6 +1,6 @@
 import {assert, test} from 'vitest';
 
-import {replaceParams} from './router.js';
+import {replaceParams} from './url-path-params.js';
 
 test('replace params', () => {
   assert.equal(replaceParams('/foo', {foo: 'bar'}), '/foo');

packages/root/src/utils/url-path-params.ts

@@ -0,0 +1,23 @@
+export function replaceParams(
+  urlPathFormat: string,
+  params: Record<string, string>
+) {
+  const urlPath = urlPathFormat.replaceAll(
+    /\[\[?(\.\.\.)?([\w\-_]*)\]?\]/g,
+    (match: string, _wildcard: string, key: string) => {
+      const val = params[key];
+      if (!val) {
+        throw new Error(`unreplaced param ${match} in url: ${urlPathFormat}`);
+      }
+      return val;
+    }
+  );
+  return urlPath;
+}
+
+export function testPathHasParams(urlPath: string) {
+  const segments = urlPath.split('/');
+  return segments.some((segment) => {
+    return segment.startsWith('[') && segment.includes(']');
+  });
+}