@boon4681/giri 0.0.3-alpha-9 → 0.0.3-alpha-11

package/dist/cli.js

@@ -833,39 +833,37 @@ function isGiriBodySchema(value) {
     value && typeof value === "object" && value[bodySchemaBrand] === true
   );
 }
+var RouteInputError = class extends Error {
+  name = "RouteInputError";
+};
 function resolveRouteInput(sources) {
-  const input = {};
-  const owners = {};
+  const body = [];
+  const query = [];
   for (const source of sources) {
     if (source.body !== void 0) {
       if (!isGiriBodySchema(source.body)) {
-        throw new Error(
+        throw new RouteInputError(
           `${source.label}: "body" must be wrapped with a validator, e.g. \`zod.body({ json: ... })\` from @boon4681/giri/validators/zod.`
         );
       }
-      if (input.body) {
-        throw new Error(
-          `${source.label}: body validator conflicts with the body validator from ${owners.body}.`
-        );
-      }
-      input.body = source.body;
-      owners.body = source.label;
+      body.push(source.body);
     }
     if (source.query !== void 0) {
       if (!isGiriInputSchema(source.query)) {
-        throw new Error(
+        throw new RouteInputError(
           `${source.label}: "query" must be wrapped with a validator, e.g. \`zod.query(...)\` from @boon4681/giri/validators/zod.`
         );
       }
-      if (input.query) {
-        throw new Error(
-          `${source.label}: query validator conflicts with the query validator from ${owners.query}.`
-        );
-      }
-      input.query = source.query;
-      owners.query = source.label;
+      query.push(source.query);
     }
   }
+  const input = {};
+  if (body.length > 0) {
+    input.body = body;
+  }
+  if (query.length > 0) {
+    input.query = query;
+  }
   return input.body || input.query ? input : void 0;
 }
 
@@ -1527,6 +1525,63 @@ function bodyToJsonSchemas(value) {
   }
   return Object.keys(out).length > 0 ? out : void 0;
 }
+function mergeObjectJsonSchemas(schemas) {
+  const properties = {};
+  const required = /* @__PURE__ */ new Set();
+  let mergedAny = false;
+  for (const schema of schemas) {
+    if (schema.type === "object" && schema.properties && typeof schema.properties === "object") {
+      mergedAny = true;
+      Object.assign(properties, schema.properties);
+      if (Array.isArray(schema.required)) {
+        for (const name of schema.required) {
+          required.add(name);
+        }
+      }
+    }
+  }
+  if (!mergedAny) {
+    return schemas[schemas.length - 1];
+  }
+  const merged = { type: "object", properties };
+  if (required.size > 0) {
+    merged.required = [...required];
+  }
+  return merged;
+}
+function queryToJsonSchema(schemas) {
+  if (!schemas || schemas.length === 0) {
+    return void 0;
+  }
+  const jsons = schemas.map((schema) => inputToJsonSchema(schema)).filter((json) => json !== void 0);
+  if (jsons.length === 0) {
+    return void 0;
+  }
+  return jsons.length === 1 ? jsons[0] : mergeObjectJsonSchemas(jsons);
+}
+function bodiesToJsonSchemas(schemas) {
+  if (!schemas || schemas.length === 0) {
+    return void 0;
+  }
+  const perType = /* @__PURE__ */ new Map();
+  for (const schema of schemas) {
+    const single = bodyToJsonSchemas(schema);
+    if (!single) {
+      continue;
+    }
+    for (const [contentType, json] of Object.entries(single)) {
+      const key = contentType;
+      const list = perType.get(key) ?? [];
+      list.push(json);
+      perType.set(key, list);
+    }
+  }
+  const out = {};
+  for (const [contentType, jsons] of perType) {
+    out[contentType] = jsons.length === 1 ? jsons[0] : mergeObjectJsonSchemas(jsons);
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 
 // src/generator/schema/route-openapi.ts
 var import_typebox2 = require("@sinclair/typebox");
@@ -1600,8 +1655,8 @@ function readInput(routeModule, middleware, label) {
     { label, body: routeModule.body, query: routeModule.query }
   ]);
   const input = {};
-  const body = bodyToJsonSchemas(resolved?.body);
-  const query = inputToJsonSchema(resolved?.query);
+  const body = bodiesToJsonSchemas(resolved?.body);
+  const query = queryToJsonSchema(resolved?.query);
   if (body) {
     input.body = body;
   }
@@ -2029,7 +2084,10 @@ async function extractRouteMeta(config, paths, routes) {
         if (meta.input || meta.security || meta.hidden || meta.openapi) {
           byFile.set(route.file, meta);
         }
-      } catch {
+      } catch (error) {
+        if (error instanceof RouteInputError) {
+          throw error;
+        }
       }
     }
   } finally {
@@ -2257,6 +2315,9 @@ async function extractMeta(config, paths, routes) {
       }
     }
   } catch (error) {
+    if (error instanceof RouteInputError) {
+      throw error;
+    }
     console.warn(`giri: skipped input/security generation (${error.message}).`);
   }
   return { inputsByFile, securityByFile, hiddenFiles, openapiByFile };