@boon4681/giri 0.0.3-alpha-2 → 0.0.3-alpha-4

package/dist/index.d.ts

@@ -1,65 +1,6 @@
-import { M as Middleware, C as Context, H as HandlerResponse, V as ValidatedInput, S as Services, c as CookieJarFactory, d as StatusCode, R as ResponseFormat, T as TypedResponse, e as MiddlewareOptions, B as BodyContentType, a as GiriBodySchema, b as GiriInputSchema, i as inputSchemaBrand, f as RouteInput, g as HttpMethod, h as GiriConfig, j as GiriPaths, k as SecurityRequirement } from './types-BvRph0mx.js';
-export { l as CookieJar, m as CookieOptions, n as CookieSink, G as GiriAdapter, o as GiriFetchHandler, p as GiriRequest, q as GiriRouteRegistration, r as GiriServeOptions, s as GiriServer, t as GiriServerInfo, u as Handle, I as Infer, v as InferStackVars, w as InputValidationResult, J as JsonSchema, x as MergeStack, y as MiddlewareOpenApi, z as MiddlewareVarsOf, N as Next, A as RouteInputOf, D as RouteOpenApi, E as RouteOpenApiConfig, F as ValidBody, K as ValidQuery, L as VarsOf } from './types-BvRph0mx.js';
-
-interface CreateContextOptions<Params extends Record<string, string> = Record<string, string>, Input extends ValidatedInput = ValidatedInput> {
-    request: Request;
-    params?: Params;
-    validated?: Input;
-    app?: Services;
-    /** The adapter's native per-request context, stashed for backend-specific bridges. */
-    native?: unknown;
-    /** Secret for `c.signedCookie` / `c.req.signedCookie` (from `config.cookieSecret`). */
-    cookieSecret?: string;
-    /** The adapter's cookie jar, built from its runtime's native helpers. */
-    cookies?: CookieJarFactory;
-}
-declare function createTypedResponse<T, S extends StatusCode, F extends ResponseFormat>(data: T, status: S, format: F, headers?: HeadersInit): TypedResponse<T, S, F>;
-declare function isTypedResponse(value: unknown): value is TypedResponse<unknown>;
-declare function createContext<Params extends Record<string, string> = Record<string, string>, Input extends ValidatedInput = ValidatedInput>(options: CreateContextOptions<Params, Input>): Context<Params, Input>;
-declare function typedResponseToResponse(response: TypedResponse<unknown>): Response;
-/**
- * Convert a handler's return value to a real `Response`, then merge any headers set imperatively via
- * `c.header()` (the response's own headers win; pending ones fill the gaps). Pass the `context` so
- * those imperative headers are applied; without it the response is returned unchanged.
- */
-declare function toResponse(response: HandlerResponse, context?: Context): Response;
-declare function composeMiddleware(middleware: Middleware[], handle: (c: Context) => HandlerResponse | Promise<HandlerResponse>, context: Context): Promise<HandlerResponse>;
-type AnyMiddleware<Vars extends Record<string, unknown>> = Middleware<Record<string, string>, ValidatedInput, Vars>;
-declare function defineMiddleware<Vars extends Record<string, unknown> = {}>(middleware: AnyMiddleware<Vars>): AnyMiddleware<Vars>;
-declare function defineMiddleware<Vars extends Record<string, unknown> = {}>(options: MiddlewareOptions, middleware: AnyMiddleware<Vars>): AnyMiddleware<Vars>;
-/**
- * Group middleware into an ordered stack, preserving each element's type as a tuple so
- * the injected context vars (`defineMiddleware<Vars>` / `Middleware<…, Vars>`) propagate
- * to downstream handlers. Use it for `+shared.ts` and verb `middleware` exports:
- * `export const middleware = stack(auth, requireAdmin)`.
- */
-declare function stack<T extends Middleware<Record<string, string>, ValidatedInput, any>[]>(...middleware: T): T;
-
-interface PreparedInput {
-    ok: true;
-    validated: ValidatedInput;
-}
-interface FailedInput {
-    ok: false;
-    response: TypedResponse<{
-        message: string;
-        issues: unknown;
-    }, 400 | 415, 'json'>;
-}
-type PreparedRequestInput = PreparedInput | FailedInput;
-/**
- * Build a giri input schema from a `validate` + `toJsonSchema` pair. Vendor adapters use
- * this; you can call it directly to make a custom validator. The brand is a global symbol,
- * so a hand-rolled `{ [Symbol.for("giri.input-schema")]: true, validate, toJsonSchema }` works too.
- */
-declare function defineInputSchema<Output>(schema: Omit<GiriInputSchema<Output>, typeof inputSchemaBrand>): GiriInputSchema<Output>;
-declare function isGiriInputSchema(value: unknown): value is GiriInputSchema;
-/**
- * Build a giri body schema from per-content-type input schemas. Validator adapters use this `zod.body({ json, form })`
- */
-declare function defineBodySchema<Outputs extends Partial<Record<BodyContentType, unknown>>>(contents: GiriBodySchema<Outputs>['contents']): GiriBodySchema<Outputs>;
-declare function isGiriBodySchema(value: unknown): value is GiriBodySchema;
-declare function prepareRequestInput(request: Request, input?: RouteInput): Promise<PreparedRequestInput>;
+import { H as HttpMethod, h as GiriConfig, S as Services, j as GiriPaths, B as BodyContentType, A as SecurityRequirement } from './types-DZ-14IP6.js';
+export { C as Context, d as CookieJar, e as CookieJarFactory, f as CookieOptions, g as CookieSink, G as GiriAdapter, b as GiriBodySchema, i as GiriFetchHandler, c as GiriInputSchema, k as GiriRequest, l as GiriRouteRegistration, m as GiriServeOptions, n as GiriServer, o as GiriServerInfo, a as Handle, p as HandlerResponse, I as Infer, q as InferStackVars, r as InputValidationResult, J as JsonSchema, s as MergeStack, M as Middleware, t as MiddlewareOpenApi, u as MiddlewareOptions, v as MiddlewareVarsOf, N as Next, w as RouteInput, x as RouteInputOf, y as RouteOpenApi, z as RouteOpenApiConfig, D as StatusCode, T as TypedResponse, E as ValidBody, F as ValidQuery, V as ValidatedInput, K as VarsOf } from './types-DZ-14IP6.js';
+export { c as composeMiddleware, a as createContext, b as createTypedResponse, d as defineBodySchema, e as defineInputSchema, f as defineMiddleware, i as isGiriBodySchema, g as isGiriInputSchema, h as isTypedResponse, p as prepareRequestInput, s as stack, t as toResponse, j as typedResponseToResponse } from './validation-Cma_ytxd.js';
 
 interface RouteParam {
     name: string;
@@ -189,4 +130,4 @@ declare function runInit(lifecycle: GiriLifecycle): Promise<Services>;
 
 declare function defineConfig<App>(config: GiriConfig<App>): GiriConfig<App>;
 
-export { BodyContentType, Context, CookieJarFactory, GiriBodySchema, GiriConfig, GiriInputSchema, type GiriLifecycle, GiriPaths, HandlerResponse, HttpMethod, Middleware, MiddlewareOptions, RouteInput, SecurityRequirement, Services, StatusCode, TypedResponse, ValidatedInput, buildGiriApp, composeMiddleware, createContext, createTypedResponse, defineBodySchema, defineConfig, defineInputSchema, defineMiddleware, isGiriBodySchema, isGiriInputSchema, isTypedResponse, loadLifecycle, prepareRequestInput, resolveGiriPaths, runInit, scanRoutes, stack, syncProject, toResponse, typedResponseToResponse };
+export { BodyContentType, GiriConfig, type GiriLifecycle, GiriPaths, HttpMethod, SecurityRequirement, Services, buildGiriApp, defineConfig, loadLifecycle, resolveGiriPaths, runInit, scanRoutes, syncProject };

package/dist/index.js

@@ -1697,7 +1697,12 @@ function inputToJsonSchema(schema) {
   if (!isGiriInputSchema(schema)) {
     return void 0;
   }
-  return sanitize(schema.toJsonSchema());
+  try {
+    return sanitize(schema.toJsonSchema());
+  } catch (error) {
+    console.warn(`giri: skipped a request schema that can't be represented as JSON Schema (${error.message}).`);
+    return void 0;
+  }
 }
 function bodyToJsonSchemas(value) {
   if (!isGiriBodySchema(value)) {
@@ -1713,6 +1718,46 @@ function bodyToJsonSchemas(value) {
   return Object.keys(out).length > 0 ? out : void 0;
 }
 
+// src/generator/schema/route-openapi.ts
+var import_typebox2 = require("@sinclair/typebox");
+var import_value2 = require("@sinclair/typebox/value");
+var StringSchema = import_typebox2.Type.String();
+var BooleanSchema = import_typebox2.Type.Boolean();
+var StringArraySchema = import_typebox2.Type.Array(StringSchema);
+var routeOpenApiSchema = import_typebox2.Type.Object(
+  {
+    hidden: import_typebox2.Type.Optional(BooleanSchema),
+    tags: import_typebox2.Type.Optional(StringArraySchema),
+    summary: import_typebox2.Type.Optional(StringSchema),
+    description: import_typebox2.Type.Optional(StringSchema),
+    deprecated: import_typebox2.Type.Optional(BooleanSchema),
+    operationId: import_typebox2.Type.Optional(StringSchema)
+  },
+  { additionalProperties: true }
+);
+function pick(schema, value) {
+  return import_value2.Value.Check(schema, value) ? value : void 0;
+}
+function parseRouteOpenApi(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const o = value;
+  const parsed = {};
+  if ("hidden" in o) {
+    parsed.hidden = Boolean(o.hidden);
+  }
+  const tags = pick(StringArraySchema, o.tags);
+  if (tags) {
+    parsed.tags = tags;
+  }
+  parsed.summary = pick(StringSchema, o.summary);
+  parsed.description = pick(StringSchema, o.description);
+  parsed.operationId = pick(StringSchema, o.operationId);
+  parsed.deprecated = pick(BooleanSchema, o.deprecated);
+  return parsed;
+}
+
 // src/generator/route-meta.ts
 function loadModule2(file) {
   const resolved = require.resolve(file);
@@ -2025,27 +2070,27 @@ function resolveOpenApi(route, routeModule, loadShared) {
       hidden = false;
       return;
     }
-    if (!value || typeof value !== "object") {
+    const parsed = parseRouteOpenApi(value);
+    if (!parsed) {
       return;
     }
-    const o = value;
-    if ("hidden" in o) {
-      hidden = Boolean(o.hidden);
+    if (parsed.hidden !== void 0) {
+      hidden = parsed.hidden;
     }
-    if (Array.isArray(o.tags)) {
-      tags.push(...o.tags.filter((tag) => typeof tag === "string"));
+    if (parsed.tags) {
+      tags.push(...parsed.tags);
     }
-    if (typeof o.summary === "string") {
-      meta.summary = o.summary;
+    if (parsed.summary !== void 0) {
+      meta.summary = parsed.summary;
     }
-    if (typeof o.description === "string") {
-      meta.description = o.description;
+    if (parsed.description !== void 0) {
+      meta.description = parsed.description;
     }
-    if (typeof o.deprecated === "boolean") {
-      meta.deprecated = o.deprecated;
+    if (parsed.deprecated !== void 0) {
+      meta.deprecated = parsed.deprecated;
     }
-    if (isVerb && typeof o.operationId === "string") {
-      meta.operationId = o.operationId;
+    if (isVerb && parsed.operationId !== void 0) {
+      meta.operationId = parsed.operationId;
     }
   };
   for (const file of route.sharedFiles) {