@hyperspan/framework 1.0.0-alpha.11 → 1.0.0-alpha.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/framework",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.12",
   "description": "Hyperspan Web Framework",
   "main": "src/server.ts",
   "types": "src/server.ts",

package/src/server.test.ts

@@ -113,7 +113,7 @@ test('createContext() can get and set cookies', () => {
   expect(setCookieHeader).toBeTruthy();
   expect(setCookieHeader).toContain('newCookie=newValue');
 
-  // Test setting a cookie with options (this will overwrite the previous Set-Cookie header)
+  // Test setting a cookie with options (this should NOT overwrite the previous Set-Cookie header)
   context.res.cookies.set('secureCookie', 'secureValue', {
     httpOnly: true,
     secure: true,
@@ -125,13 +125,7 @@ test('createContext() can get and set cookies', () => {
   setCookieHeader = context.res.headers.get('Set-Cookie');
   expect(setCookieHeader).toBeTruthy();
   expect(setCookieHeader).toContain('secureCookie=secureValue');
-  expect(setCookieHeader).toContain('HttpOnly');
-  expect(setCookieHeader).toContain('Secure');
-  expect(setCookieHeader).toContain('SameSite=Strict');
-  expect(setCookieHeader).toContain('Max-Age=3600');
-
-  // Verify the previous cookie was overwritten
-  expect(setCookieHeader).not.toContain('newCookie=newValue');
+  expect(setCookieHeader).toContain('newCookie=newValue');
 
   // Test deleting a cookie
   context.res.cookies.delete('sessionId');

package/src/server.ts

@@ -39,7 +39,15 @@ export function createContext(req: Request, route?: HS.Route): HS.Context {
   const headers = new Headers(req.headers);
   const path = route?._path() || '/';
   // @ts-ignore - Bun will put 'params' on the Request object even though it's not standardized
-  const params: HS.RouteParamsParser<path> = req?.params || {};
+  const params: HS.RouteParamsParser<path> & Record<string, string | undefined> = Object.assign({}, req?.params || {}, route?._config.params || {});
+
+  // Replace catch-all param with the value from the URL path
+  const catchAllParam = Object.keys(params).find(key => key.startsWith('...'));
+  if (catchAllParam && path.includes('/*')) {
+    const catchAllValue = url.pathname.split(path.replace('/*', '/')).pop();
+    params[catchAllParam.replace('...', '')] = catchAllValue;
+    delete params[catchAllParam];
+  }
 
   const merge = (response: Response) => {
     // Convert headers to plain objects and merge (response headers override context headers)

package/src/types.ts

@@ -77,11 +77,7 @@ export namespace Hyperspan {
 
   export interface Context {
     vars: Record<string, any>;
-    route: {
-      path: string;
-      params: Record<string, string>;
-      cssImports?: string[];
-    }
+    route: RouteConfig;
     req: HSRequest;
     res: HSResponse;
   };
@@ -94,6 +90,7 @@ export namespace Hyperspan {
   export type RouteConfig = {
     name?: string;
     path?: string;
+    params?: Record<string, string | undefined>;
     cssImports?: string[];
   };
   export type RouteHandler = (context: Hyperspan.Context) => unknown;

package/src/utils.test.ts

@@ -149,13 +149,13 @@ describe('parsePath', () => {
   test('parsePath handles catch-all param with spread', () => {
     const result = parsePath('users/[...slug]');
     expect(result.path).toBe('/users/*');
-    expect(result.params).toEqual(['slug']);
+    expect(result.params).toEqual(['...slug']);
   });
 
   test('parsePath handles catch-all param at root', () => {
     const result = parsePath('[...slug]');
     expect(result.path).toBe('/*');
-    expect(result.params).toEqual(['slug']);
+    expect(result.params).toEqual(['...slug']);
   });
 
   test('parsePath preserves param names in path but converts format', () => {

package/src/utils.ts

@@ -33,7 +33,7 @@ export function parsePath(urlPath: string): { path: string, params: string[] } {
   // Dynamic params
   if (ROUTE_SEGMENT_REGEX.test(urlPath)) {
     urlPath = urlPath.replace(ROUTE_SEGMENT_REGEX, (match: string) => {
-      const paramName = match.replace(/[^a-zA-Z_\.]+/g, '').replace('...', '');
+      const paramName = match.replace(/[^a-zA-Z_\.]+/g, '');
       params.push(paramName);
 
       if (match.includes('...')) {