@kaito-http/core 4.0.0-beta.7 → 4.0.0-beta.9

package/dist/cors/cors.cjs

@@ -48,15 +48,25 @@ function experimental_createOriginMatcher(origins) {
   return (origin) => regex.test(origin);
 }
 function experimental_createCORSTransform(origins) {
-  const matcher = experimental_createOriginMatcher(origins);
-  return (request, response) => {
-    const origin = request.headers.get("Origin");
-    if (origin && matcher(origin)) {
-      response.headers.set("Access-Control-Allow-Origin", origin);
-      response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
-      response.headers.set("Access-Control-Allow-Headers", "Content-Type, Authorization");
-      response.headers.set("Access-Control-Max-Age", "86400");
-      response.headers.set("Access-Control-Allow-Credentials", "true");
+  let matcher = experimental_createOriginMatcher(origins);
+  return {
+    before: (request) => {
+      if (request.method === "OPTIONS") {
+        return new Response(null, { status: 204 });
+      }
+    },
+    transform: (request, response) => {
+      const origin = request.headers.get("Origin");
+      if (origin && matcher(origin)) {
+        response.headers.set("Access-Control-Allow-Origin", origin);
+        response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
+        response.headers.set("Access-Control-Allow-Headers", "Content-Type, Authorization");
+        response.headers.set("Access-Control-Max-Age", "86400");
+        response.headers.set("Access-Control-Allow-Credentials", "true");
+      }
+    },
+    setOrigins: (newOrigins) => {
+      matcher = experimental_createOriginMatcher(newOrigins);
     }
   };
 }

package/dist/cors/cors.d.cts

@@ -55,42 +55,57 @@
  */
 declare function experimental_createOriginMatcher(origins: string[]): (origin: string) => boolean;
 /**
- * Create a function to apply CORS headers with sane defaults for most apps.
+ * Create a CORS handler with sane defaults for most apps.
  *
  * **⚠️ This API is experimental and may change or even be removed in the future. ⚠️**
  *
- * @param options Options object
- * @returns A function that will mutate the Response object by applying the CORS headers
+ * @param origins Array of allowed origin patterns. Each pattern must include protocol (http:// or https://).
+ * Supports both exact matches and wildcard subdomain patterns. See {@link experimental_createOriginMatcher}
+ * for detailed pattern matching rules.
+ *
+ * @returns An object containing:
+ * - `before`: A handler for OPTIONS requests that returns a 204 response
+ * - `transform`: A function that applies CORS headers to the response if origin matches
+ * - `setOrigins`: A function to dynamically update the allowed origins
+ *
  * @example
  * ```ts
- * const cors = experimental_createCORSTransform([
- *  	// Exact matches
- *  	'https://example.com',
- *  	'http://localhost:3000',
+ * const corsHandler = experimental_createCORSTransform([
+ *   // Exact matches
+ *   'https://example.com',
+ *   'http://localhost:3000',
  *
- *  	// Wildcard subdomain matches
- *  	'https://*.myapp.com',      // matches https://dashboard.myapp.com
- *  	'http://*.myapp.com',       // matches http://dashboard.myapp.com
+ *   // Wildcard subdomain matches
+ *   'https://*.myapp.com',      // matches https://dashboard.myapp.com
+ *   'http://*.myapp.com',       // matches http://dashboard.myapp.com
  *
- *  	// Match both subdomain and root domain
- *  	'https://*.staging.com',    // matches https://app.staging.com
- *  	'https://staging.com'       // matches https://staging.com
- *  ]);
+ *   // Match both subdomain and root domain
+ *   'https://*.staging.com',    // matches https://app.staging.com
+ *   'https://staging.com'       // matches https://staging.com
+ * ]);
  *
  * const router = create({
- * 		before: async req => {
- * 			if (req.method === 'OPTIONS') {
- * 				// Return early to skip the router. This response still gets passed to `.transform()`
- * 				// So our CORS headers will still be applied
- * 				return new Response(null, {status: 204});
- * 			}
- * 		},
- * 		transform: async (request, response) => {
- * 			cors(request, response);
- * 		}
+ *   // Handle preflight requests
+ *   before: corsHandler.before,
+ *
+ *   // Or expanded
+ *   before: (request) => {
+ *     const res = cors.before(request);
+ *     if (res) return res;
+ *   },
+ *
+ *   // Apply CORS headers to all responses
+ *   transform: corsHandler.transform,
  * });
+ *
+ * // Optionally update allowed origins later
+ * corsHandler.setOrigins(['https://newdomain.com']);
  * ```
  */
-declare function experimental_createCORSTransform(origins: string[]): (request: Request, response: Response) => void;
+declare function experimental_createCORSTransform(origins: string[]): {
+    before: (request: Request) => Response | undefined;
+    transform: (request: Request, response: Response) => void;
+    setOrigins: (newOrigins: string[]) => void;
+};
 
 export { experimental_createCORSTransform, experimental_createOriginMatcher };

package/dist/cors/cors.d.ts

@@ -55,42 +55,57 @@
  */
 declare function experimental_createOriginMatcher(origins: string[]): (origin: string) => boolean;
 /**
- * Create a function to apply CORS headers with sane defaults for most apps.
+ * Create a CORS handler with sane defaults for most apps.
  *
  * **⚠️ This API is experimental and may change or even be removed in the future. ⚠️**
  *
- * @param options Options object
- * @returns A function that will mutate the Response object by applying the CORS headers
+ * @param origins Array of allowed origin patterns. Each pattern must include protocol (http:// or https://).
+ * Supports both exact matches and wildcard subdomain patterns. See {@link experimental_createOriginMatcher}
+ * for detailed pattern matching rules.
+ *
+ * @returns An object containing:
+ * - `before`: A handler for OPTIONS requests that returns a 204 response
+ * - `transform`: A function that applies CORS headers to the response if origin matches
+ * - `setOrigins`: A function to dynamically update the allowed origins
+ *
  * @example
  * ```ts
- * const cors = experimental_createCORSTransform([
- *  	// Exact matches
- *  	'https://example.com',
- *  	'http://localhost:3000',
+ * const corsHandler = experimental_createCORSTransform([
+ *   // Exact matches
+ *   'https://example.com',
+ *   'http://localhost:3000',
  *
- *  	// Wildcard subdomain matches
- *  	'https://*.myapp.com',      // matches https://dashboard.myapp.com
- *  	'http://*.myapp.com',       // matches http://dashboard.myapp.com
+ *   // Wildcard subdomain matches
+ *   'https://*.myapp.com',      // matches https://dashboard.myapp.com
+ *   'http://*.myapp.com',       // matches http://dashboard.myapp.com
  *
- *  	// Match both subdomain and root domain
- *  	'https://*.staging.com',    // matches https://app.staging.com
- *  	'https://staging.com'       // matches https://staging.com
- *  ]);
+ *   // Match both subdomain and root domain
+ *   'https://*.staging.com',    // matches https://app.staging.com
+ *   'https://staging.com'       // matches https://staging.com
+ * ]);
  *
  * const router = create({
- * 		before: async req => {
- * 			if (req.method === 'OPTIONS') {
- * 				// Return early to skip the router. This response still gets passed to `.transform()`
- * 				// So our CORS headers will still be applied
- * 				return new Response(null, {status: 204});
- * 			}
- * 		},
- * 		transform: async (request, response) => {
- * 			cors(request, response);
- * 		}
+ *   // Handle preflight requests
+ *   before: corsHandler.before,
+ *
+ *   // Or expanded
+ *   before: (request) => {
+ *     const res = cors.before(request);
+ *     if (res) return res;
+ *   },
+ *
+ *   // Apply CORS headers to all responses
+ *   transform: corsHandler.transform,
  * });
+ *
+ * // Optionally update allowed origins later
+ * corsHandler.setOrigins(['https://newdomain.com']);
  * ```
  */
-declare function experimental_createCORSTransform(origins: string[]): (request: Request, response: Response) => void;
+declare function experimental_createCORSTransform(origins: string[]): {
+    before: (request: Request) => Response | undefined;
+    transform: (request: Request, response: Response) => void;
+    setOrigins: (newOrigins: string[]) => void;
+};
 
 export { experimental_createCORSTransform, experimental_createOriginMatcher };

package/dist/cors/cors.js

@@ -23,15 +23,25 @@ function experimental_createOriginMatcher(origins) {
   return (origin) => regex.test(origin);
 }
 function experimental_createCORSTransform(origins) {
-  const matcher = experimental_createOriginMatcher(origins);
-  return (request, response) => {
-    const origin = request.headers.get("Origin");
-    if (origin && matcher(origin)) {
-      response.headers.set("Access-Control-Allow-Origin", origin);
-      response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
-      response.headers.set("Access-Control-Allow-Headers", "Content-Type, Authorization");
-      response.headers.set("Access-Control-Max-Age", "86400");
-      response.headers.set("Access-Control-Allow-Credentials", "true");
+  let matcher = experimental_createOriginMatcher(origins);
+  return {
+    before: (request) => {
+      if (request.method === "OPTIONS") {
+        return new Response(null, { status: 204 });
+      }
+    },
+    transform: (request, response) => {
+      const origin = request.headers.get("Origin");
+      if (origin && matcher(origin)) {
+        response.headers.set("Access-Control-Allow-Origin", origin);
+        response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
+        response.headers.set("Access-Control-Allow-Headers", "Content-Type, Authorization");
+        response.headers.set("Access-Control-Max-Age", "86400");
+        response.headers.set("Access-Control-Allow-Credentials", "true");
+      }
+    },
+    setOrigins: (newOrigins) => {
+      matcher = experimental_createOriginMatcher(newOrigins);
     }
   };
 }

package/dist/index.cjs

@@ -178,7 +178,10 @@ var Router = class _Router {
   merge = (pathPrefix, other) => {
     const newRoutes = [...other.state.routes].map((route) => ({
       ...route,
-      path: `${pathPrefix}${route.path}`
+      // handle pathPrefix = / & route.path = / case causing //
+      // we intentionally are replacing on the joining path and not the pathPrefix, in case of
+      // /named -> merged to -> / causing /named/ not /named
+      path: `${pathPrefix}${route.path === "/" ? "" : route.path}`
     }));
     return new _Router({
       ...this.state,
@@ -366,7 +369,7 @@ var Router = class _Router {
       const item = {
         description: route.openapi?.description ?? "Successful response",
         responses: {
-          default: {
+          200: {
             description: route.openapi?.description ?? "Successful response",
             content
           }

package/dist/index.d.cts

@@ -148,7 +148,7 @@ type Route<ContextTo, Result, Path extends string, AdditionalParams extends Reco
 };
 type AnyRoute = Route<any, any, any, any, any, any, any>;
 
-type PrefixRoutesPathInner<R extends AnyRoute, Prefix extends `/${string}`> = R extends Route<infer ContextTo, infer Result, infer Path, infer AdditionalParams, infer Method, infer Query, infer BodyOutput> ? Route<ContextTo, Result, `${Prefix}${Path}`, AdditionalParams, Method, Query, BodyOutput> : never;
+type PrefixRoutesPathInner<R extends AnyRoute, Prefix extends `/${string}`> = R extends Route<infer ContextTo, infer Result, infer Path, infer AdditionalParams, infer Method, infer Query, infer BodyOutput> ? Route<ContextTo, Result, `${Prefix}${Path extends '/' ? '' : Path}`, AdditionalParams, Method, Query, BodyOutput> : never;
 type PrefixRoutesPath<Prefix extends `/${string}`, R extends AnyRoute> = R extends R ? PrefixRoutesPathInner<R, Prefix> : never;
 type RouterState<ContextFrom, ContextTo, RequiredParams extends Record<string, unknown>, Routes extends AnyRoute> = {
     routes: Set<Routes>;

package/dist/index.d.ts

@@ -148,7 +148,7 @@ type Route<ContextTo, Result, Path extends string, AdditionalParams extends Reco
 };
 type AnyRoute = Route<any, any, any, any, any, any, any>;
 
-type PrefixRoutesPathInner<R extends AnyRoute, Prefix extends `/${string}`> = R extends Route<infer ContextTo, infer Result, infer Path, infer AdditionalParams, infer Method, infer Query, infer BodyOutput> ? Route<ContextTo, Result, `${Prefix}${Path}`, AdditionalParams, Method, Query, BodyOutput> : never;
+type PrefixRoutesPathInner<R extends AnyRoute, Prefix extends `/${string}`> = R extends Route<infer ContextTo, infer Result, infer Path, infer AdditionalParams, infer Method, infer Query, infer BodyOutput> ? Route<ContextTo, Result, `${Prefix}${Path extends '/' ? '' : Path}`, AdditionalParams, Method, Query, BodyOutput> : never;
 type PrefixRoutesPath<Prefix extends `/${string}`, R extends AnyRoute> = R extends R ? PrefixRoutesPathInner<R, Prefix> : never;
 type RouterState<ContextFrom, ContextTo, RequiredParams extends Record<string, unknown>, Routes extends AnyRoute> = {
     routes: Set<Routes>;

package/dist/index.js

@@ -148,7 +148,10 @@ var Router = class _Router {
   merge = (pathPrefix, other) => {
     const newRoutes = [...other.state.routes].map((route) => ({
       ...route,
-      path: `${pathPrefix}${route.path}`
+      // handle pathPrefix = / & route.path = / case causing //
+      // we intentionally are replacing on the joining path and not the pathPrefix, in case of
+      // /named -> merged to -> / causing /named/ not /named
+      path: `${pathPrefix}${route.path === "/" ? "" : route.path}`
     }));
     return new _Router({
       ...this.state,
@@ -336,7 +339,7 @@ var Router = class _Router {
       const item = {
         description: route.openapi?.description ?? "Successful response",
         responses: {
-          default: {
+          200: {
             description: route.openapi?.description ?? "Successful response",
             content
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaito-http/core",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.9",
   "author": "Alistair Smith <hi@alistair.sh>",
   "repository": "https://github.com/kaito-http/kaito",
   "devDependencies": {