@codewithagents/openapi-server 1.8.0 → 1.9.0

package/dist/cli.cjs

@@ -18953,35 +18953,131 @@ function getQueryParams(operation, spec) {
     const resolved = resolveParam(p, spec);
     if (resolved === void 0 || resolved.in !== "query") continue;
     const schema = resolved.schema;
-    result.push({
+    const resolvedStyle = resolved.style;
+    const resolvedExplode = resolved.explode;
+    const param = {
       name: normalizeParamName(resolved.name),
+      rawName: resolved.name,
       tsType: schemaToTsType(schema),
       required: resolved.required === true
-    });
+    };
+    if (resolvedStyle === "deepObject" && schema !== void 0 && !isRef3(schema)) {
+      const s = schema;
+      if (s.type === "object" && s.properties !== void 0) {
+        param.isDeepObject = true;
+        param.deepObjectProperties = Object.entries(s.properties).map(([key, propSchema]) => ({
+          key,
+          tsType: schemaToTsType(propSchema)
+        }));
+      }
+    }
+    if (!param.isDeepObject && schema !== void 0 && !isRef3(schema) && schema.type === "array" && resolvedExplode === false) {
+      if (resolvedStyle === "spaceDelimited") {
+        param.delimiterStyle = "ssv";
+      } else if (resolvedStyle === "pipeDelimited") {
+        param.delimiterStyle = "psv";
+      } else {
+        param.delimiterStyle = "csv";
+      }
+    }
+    if (schema !== void 0 && !isRef3(schema)) {
+      const s = schema;
+      if (Array.isArray(s.enum)) param.enum = s.enum;
+      if (typeof s.minimum === "number") param.minimum = s.minimum;
+      if (typeof s.maximum === "number") param.maximum = s.maximum;
+      if (typeof s.exclusiveMinimum === "number") param.exclusiveMinimum = s.exclusiveMinimum;
+      if (typeof s.exclusiveMaximum === "number") param.exclusiveMaximum = s.exclusiveMaximum;
+      if (typeof s.minLength === "number") param.minLength = s.minLength;
+      if (typeof s.maxLength === "number") param.maxLength = s.maxLength;
+      if (typeof s.pattern === "string") param.pattern = s.pattern;
+    }
+    result.push(param);
   }
   return result;
 }
 function getBodyInfo(operation) {
   const requestBody = operation.requestBody;
   if (requestBody === void 0) return void 0;
-  if (isRef3(requestBody)) return { typeName: void 0 };
+  if (isRef3(requestBody)) {
+    return { typeName: void 0, contentType: "application/json", isSynthesized: false };
+  }
   const rb = requestBody;
   const content = rb.content;
-  if (content === void 0) return { typeName: void 0 };
+  if (content === void 0) {
+    return { typeName: void 0, contentType: "application/json", isSynthesized: false };
+  }
   const jsonContent = content["application/json"];
-  if (jsonContent === void 0 || jsonContent.schema === void 0) return { typeName: void 0 };
-  const schema = jsonContent.schema;
-  if (isRef3(schema)) {
-    return { typeName: refToName(schema.$ref) };
+  if (jsonContent !== void 0 && jsonContent.schema !== void 0) {
+    const schema = jsonContent.schema;
+    if (isRef3(schema)) {
+      return {
+        typeName: refToName(schema.$ref),
+        contentType: "application/json",
+        isSynthesized: false
+      };
+    }
+    const operationId = operation.operationId;
+    if (operationId !== void 0 && operationId.length > 0) {
+      return { typeName: toTypeName(operationId), contentType: "application/json", isSynthesized: true };
+    }
+    return { typeName: void 0, contentType: "application/json", isSynthesized: false };
   }
-  return { typeName: void 0 };
+  const formContent = content["application/x-www-form-urlencoded"];
+  if (formContent !== void 0) {
+    const schema = formContent.schema;
+    if (schema !== void 0 && isRef3(schema)) {
+      return {
+        typeName: refToName(schema.$ref),
+        contentType: "application/x-www-form-urlencoded",
+        isSynthesized: false
+      };
+    }
+    const operationId = operation.operationId;
+    if (operationId !== void 0 && operationId.length > 0) {
+      return {
+        typeName: toTypeName(operationId),
+        contentType: "application/x-www-form-urlencoded",
+        isSynthesized: true
+      };
+    }
+    return { typeName: void 0, contentType: "application/x-www-form-urlencoded", isSynthesized: false };
+  }
+  const multipartContent = content["multipart/form-data"];
+  if (multipartContent !== void 0) {
+    const schema = multipartContent.schema;
+    if (schema !== void 0 && isRef3(schema)) {
+      return {
+        typeName: refToName(schema.$ref),
+        contentType: "multipart/form-data",
+        isSynthesized: false
+      };
+    }
+    const operationId = operation.operationId;
+    if (operationId !== void 0 && operationId.length > 0) {
+      return {
+        typeName: toTypeName(operationId),
+        contentType: "multipart/form-data",
+        isSynthesized: true
+      };
+    }
+    return { typeName: void 0, contentType: "multipart/form-data", isSynthesized: false };
+  }
+  return { typeName: void 0, contentType: "application/json", isSynthesized: false };
 }
 
 // src/plugins/service.ts
+function collectContentfulTwoxxCodes(responses) {
+  return Object.keys(responses).filter((k) => /^2\d\d$/.test(k) && k !== "204").sort();
+}
 function getReturnInfo(operation) {
   const responses = operation.responses;
   if (responses === void 0) return { typeName: void 0, isArray: false, isVoid: true };
-  for (const code of ["200", "201"]) {
+  const contentfulCodes = collectContentfulTwoxxCodes(responses);
+  const isMultiStatus = contentfulCodes.length > 1;
+  const twoxxCodes = ["200", "201", ...Object.keys(responses).filter(
+    (k) => /^2\d\d$/.test(k) && k !== "200" && k !== "201" && k !== "204"
+  )];
+  for (const code of twoxxCodes) {
     const response = responses[code];
     if (response === void 0) continue;
     if (isRef3(response)) continue;
@@ -18989,28 +19085,37 @@ function getReturnInfo(operation) {
     const content = resp.content;
     if (content === void 0) continue;
     const jsonContent = content["application/json"];
-    if (jsonContent === void 0 || jsonContent.schema === void 0) continue;
-    const schema = jsonContent.schema;
-    if (isRef3(schema)) {
-      return {
-        typeName: refToName(schema.$ref),
-        isArray: false,
-        isVoid: false
-      };
-    }
-    const s = schema;
-    if (s.type === "array") {
-      const items = s.items;
-      if (items !== void 0 && isRef3(items)) {
+    if (jsonContent !== void 0 && jsonContent.schema !== void 0) {
+      const schema = jsonContent.schema;
+      if (isRef3(schema)) {
         return {
-          typeName: refToName(items.$ref),
-          isArray: true,
-          isVoid: false
+          typeName: refToName(schema.$ref),
+          isArray: false,
+          isVoid: false,
+          isMultiStatus
         };
       }
-      return { typeName: void 0, isArray: true, isVoid: false };
+      const s = schema;
+      if (s.type === "array") {
+        const items = s.items;
+        if (items !== void 0 && isRef3(items)) {
+          return {
+            typeName: refToName(items.$ref),
+            isArray: true,
+            isVoid: false,
+            isMultiStatus
+          };
+        }
+        return { typeName: void 0, isArray: true, isVoid: false, isMultiStatus };
+      }
+      return { typeName: void 0, isArray: false, isVoid: false, isMultiStatus };
+    }
+    if (content["text/plain"] !== void 0) {
+      return { typeName: void 0, isArray: false, isVoid: false, primitiveType: "string" };
+    }
+    if (content["application/octet-stream"] !== void 0) {
+      return { typeName: void 0, isArray: false, isVoid: false, primitiveType: "Uint8Array" };
     }
-    return { typeName: void 0, isArray: false, isVoid: false };
   }
   if (responses["204"] !== void 0) {
     return { typeName: void 0, isArray: false, isVoid: true };
@@ -19019,6 +19124,16 @@ function getReturnInfo(operation) {
 }
 function buildReturnType(info) {
   if (info.isVoid) return "Promise<void>";
+  if (info.primitiveType !== void 0) return `Promise<${info.primitiveType}>`;
+  if (info.isMultiStatus === true) {
+    let bodyType;
+    if (info.typeName !== void 0) {
+      bodyType = info.isArray ? `${info.typeName}[]` : info.typeName;
+    } else {
+      bodyType = info.isArray ? "unknown[]" : "unknown";
+    }
+    return `Promise<{ status: number; body: ${bodyType} }>`;
+  }
   if (info.typeName !== void 0) {
     return info.isArray ? `Promise<${info.typeName}[]>` : `Promise<${info.typeName}>`;
   }
@@ -19056,7 +19171,7 @@ function buildMethodSignature(op) {
     args.push(`${sanitizeOperationId2(p)}: string`);
   }
   if (op.bodyInfo !== void 0) {
-    const typeName = op.bodyInfo.typeName ?? "unknown";
+    const typeName = op.bodyInfo.typeName !== void 0 && !op.bodyInfo.isSynthesized ? op.bodyInfo.typeName : "unknown";
     args.push(`body: ${typeName}`);
   }
   if (op.queryParams.length > 0) {
@@ -19074,7 +19189,7 @@ function generateService(spec) {
   const operations = collectOperations(spec);
   const importTypes = /* @__PURE__ */ new Set();
   for (const op of operations) {
-    if (op.bodyInfo?.typeName !== void 0) {
+    if (op.bodyInfo?.typeName !== void 0 && !op.bodyInfo.isSynthesized) {
       importTypes.add(op.bodyInfo.typeName);
     }
     if (op.returnInfo.typeName !== void 0) {
@@ -19124,6 +19239,21 @@ function formatToZodModifier(format) {
 function pathParamZodExpr(schema) {
   if (schema === void 0 || isRef3(schema)) return void 0;
   const s = schema;
+  if (s.type === "integer" || s.type === "number") {
+    const hasMin = typeof s.minimum === "number";
+    const hasMax = typeof s.maximum === "number";
+    const hasExcMin = typeof s.exclusiveMinimum === "number";
+    const hasExcMax = typeof s.exclusiveMaximum === "number";
+    if (hasMin || hasMax || hasExcMin || hasExcMax) {
+      let expr = "z.coerce.number()";
+      if (hasMin) expr += `.min(${s.minimum})`;
+      if (hasMax) expr += `.max(${s.maximum})`;
+      if (hasExcMin) expr += `.gt(${s.exclusiveMinimum})`;
+      if (hasExcMax) expr += `.lt(${s.exclusiveMaximum})`;
+      return expr;
+    }
+    return void 0;
+  }
   if (s.type !== "string") return void 0;
   const format = s.format;
   if (format === void 0) return void 0;
@@ -19131,23 +19261,64 @@ function pathParamZodExpr(schema) {
   if (modifier === "") return void 0;
   return `z.string()${modifier}`;
 }
-function paramZodExpr(tsType, required, schema) {
+function queryParamDelimitedZodBase(_param) {
+  return "z.array(z.string())";
+}
+function queryParamDeepObjectZodBase(param) {
+  const propFields = (param.deepObjectProperties ?? []).map((p) => {
+    const coerced = p.tsType === "number" ? "z.coerce.number()" : "z.string()";
+    return `${p.key}: ${coerced}.optional()`;
+  });
+  return `z.object({ ${propFields.join(", ")} })`;
+}
+function queryParamNumberZodBase(param) {
+  let base = "z.number()";
+  if (param.minimum !== void 0) base += `.min(${param.minimum})`;
+  if (param.maximum !== void 0) base += `.max(${param.maximum})`;
+  if (param.exclusiveMinimum !== void 0) base += `.gt(${param.exclusiveMinimum})`;
+  if (param.exclusiveMaximum !== void 0) base += `.lt(${param.exclusiveMaximum})`;
+  return base;
+}
+function queryParamStringZodBase(param) {
   let base;
-  if (tsType === "number") {
-    base = "z.number()";
-  } else if (tsType === "boolean") {
+  if (param.enum !== void 0 && param.enum.length > 0) {
+    const members = param.enum.map((v) => JSON.stringify(v)).join(", ");
+    base = `z.enum([${members}])`;
+  } else {
+    base = "z.string()";
+  }
+  if (param.minLength !== void 0) base += `.min(${param.minLength})`;
+  if (param.maxLength !== void 0) base += `.max(${param.maxLength})`;
+  if (param.pattern !== void 0) base += `.regex(/${param.pattern}/)`;
+  return base;
+}
+function queryParamZodExpr(param) {
+  let base;
+  if (param.delimiterStyle !== void 0) {
+    base = queryParamDelimitedZodBase(param);
+  } else if (param.isDeepObject === true && param.deepObjectProperties !== void 0) {
+    base = queryParamDeepObjectZodBase(param);
+  } else if (param.tsType === "number") {
+    base = queryParamNumberZodBase(param);
+  } else if (param.tsType === "boolean") {
     base = "z.boolean()";
   } else {
-    if (schema !== void 0 && !isRef3(schema)) {
-      const s = schema;
-      const format = s.format;
-      const modifier = format !== void 0 ? formatToZodModifier(format) : "";
-      base = `z.string()${modifier}`;
-    } else {
-      base = "z.string()";
-    }
+    base = queryParamStringZodBase(param);
+  }
+  return param.required ? base : `${base}.optional()`;
+}
+function headerParamZodExpr(param) {
+  let base;
+  if (param.enum !== void 0 && param.enum.length > 0) {
+    const members = param.enum.map((v) => JSON.stringify(v)).join(", ");
+    base = `z.enum([${members}])`;
+  } else {
+    base = "z.string()";
   }
-  return required ? base : `${base}.optional()`;
+  if (param.minLength !== void 0) base += `.min(${param.minLength})`;
+  if (param.maxLength !== void 0) base += `.max(${param.maxLength})`;
+  if (param.pattern !== void 0) base += `.regex(/${param.pattern}/)`;
+  return param.required ? base : `${base}.optional()`;
 }
 function getPathParamValidations(operation, spec, rawPathParamNames) {
   const parameters = operation.parameters;
@@ -19174,21 +19345,51 @@ function getHeaderParams(operation, spec) {
   for (const p of parameters) {
     const resolved = resolveParam(p, spec);
     if (resolved === void 0 || resolved.in !== "header") continue;
-    result.push({
+    const param = {
       rawName: resolved.name,
       required: resolved.required === true
-    });
+    };
+    const schema = resolved.schema;
+    if (schema !== void 0 && !isRef3(schema)) {
+      const s = schema;
+      if (Array.isArray(s.enum)) param.enum = s.enum;
+      if (typeof s.minLength === "number") param.minLength = s.minLength;
+      if (typeof s.maxLength === "number") param.maxLength = s.maxLength;
+      if (typeof s.pattern === "string") param.pattern = s.pattern;
+    }
+    result.push(param);
   }
   return result;
 }
+function queryParamHasConstraints(q) {
+  const constraintFields = [
+    q.enum,
+    q.minimum,
+    q.maximum,
+    q.exclusiveMinimum,
+    q.exclusiveMaximum,
+    q.minLength,
+    q.maxLength,
+    q.pattern,
+    q.delimiterStyle
+  ];
+  return constraintFields.some((f) => f !== void 0) || q.isDeepObject === true;
+}
 function queryParamsNeedValidation(queryParams) {
-  return queryParams.some((q) => q.required || q.tsType !== "string");
+  return queryParams.some(
+    (q) => q.required || q.tsType !== "string" || queryParamHasConstraints(q)
+  );
+}
+function delimiterChar(style) {
+  if (style === "ssv") return " ";
+  if (style === "psv") return "|";
+  return ",";
 }
 function emitQueryValidation(lines, queryParams, indent) {
   const inner = `${indent}  `;
   const fieldIndent = `${indent}    `;
   const fields = queryParams.map((q) => {
-    const expr = paramZodExpr(q.tsType, q.required);
+    const expr = queryParamZodExpr(q);
     return `${fieldIndent}${q.name}: ${expr}`;
   }).join(",\n");
   lines.push(`${inner}// Validate query parameters: returns 422 with Zod issues on failure`);
@@ -19227,7 +19428,7 @@ function emitHeaderValidation(lines, headerParams, indent, framework) {
   const fieldIndent = `${indent}    `;
   const schemaFields = headerParams.map((h) => {
     const key = JSON.stringify(h.rawName);
-    const expr = h.required ? "z.string()" : "z.string().optional()";
+    const expr = headerParamZodExpr(h);
     return `${fieldIndent}${key}: ${expr}`;
   }).join(",\n");
   const rawFields = headerParams.map((h) => {
@@ -19255,18 +19456,63 @@ function response200IsVoid(resp) {
   const content = r.content;
   return content === void 0 || Object.keys(content).length === 0;
 }
+function detectResponseContentType(resp) {
+  if (isRef3(resp)) return "application/json";
+  const r = resp;
+  const content = r.content;
+  if (content === void 0) return "application/json";
+  if ("text/plain" in content) return "text/plain";
+  if ("application/octet-stream" in content) return "application/octet-stream";
+  return "application/json";
+}
 function getResponseStatus(operation, httpMethod) {
   const responses = operation.responses;
   if (responses === void 0) {
-    return httpMethod === "delete" ? { status: 204, isVoid: true } : { status: 200, isVoid: false };
+    return httpMethod === "delete" ? { status: 204, isVoid: true, responseContentType: "application/json" } : { status: 200, isVoid: false, responseContentType: "application/json" };
+  }
+  const contentfulTwoxxKeys = Object.keys(responses).filter((k) => /^2\d\d$/.test(k) && k !== "204").sort();
+  if (contentfulTwoxxKeys.length > 1) {
+    return {
+      status: 200,
+      isVoid: false,
+      responseContentType: "application/json",
+      isMultiStatus: true
+    };
+  }
+  if (responses["201"] !== void 0) {
+    return {
+      status: 201,
+      isVoid: false,
+      responseContentType: detectResponseContentType(responses["201"])
+    };
+  }
+  if (responses["204"] !== void 0) {
+    return { status: 204, isVoid: true, responseContentType: "application/json" };
   }
-  if (responses["201"] !== void 0) return { status: 201, isVoid: false };
-  if (responses["204"] !== void 0) return { status: 204, isVoid: true };
   if (responses["200"] !== void 0) {
-    if (response200IsVoid(responses["200"])) return { status: 204, isVoid: true };
-    return { status: 200, isVoid: false };
+    if (response200IsVoid(responses["200"])) {
+      return { status: 204, isVoid: true, responseContentType: "application/json" };
+    }
+    return {
+      status: 200,
+      isVoid: false,
+      responseContentType: detectResponseContentType(responses["200"])
+    };
   }
-  return httpMethod === "delete" ? { status: 204, isVoid: true } : { status: 200, isVoid: false };
+  const twoxxKeys = Object.keys(responses).filter(
+    (k) => /^2\d\d$/.test(k) && k !== "200" && k !== "201" && k !== "204"
+  );
+  if (twoxxKeys.length === 1) {
+    const code = parseInt(twoxxKeys[0], 10);
+    const resp = responses[twoxxKeys[0]];
+    const isVoid = isRef3(resp) ? false : (() => {
+      const r = resp;
+      const content = r.content;
+      return content === void 0 || Object.keys(content).length === 0;
+    })();
+    return { status: code, isVoid, responseContentType: detectResponseContentType(resp) };
+  }
+  return httpMethod === "delete" ? { status: 204, isVoid: true, responseContentType: "application/json" } : { status: 200, isVoid: false, responseContentType: "application/json" };
 }
 function collectOperations2(spec) {
   const paths = spec.paths;
@@ -19302,7 +19548,9 @@ function collectOperations2(spec) {
 function collectSortedBodyTypes(operations) {
   const bodyTypes = /* @__PURE__ */ new Set();
   for (const op of operations) {
-    if (op.bodyInfo?.typeName !== void 0) bodyTypes.add(op.bodyInfo.typeName);
+    if (op.bodyInfo?.typeName !== void 0 && !op.bodyInfo.isSynthesized) {
+      bodyTypes.add(op.bodyInfo.typeName);
+    }
   }
   return Array.from(bodyTypes).sort();
 }
@@ -19334,7 +19582,27 @@ function buildRouteHandler(op, indent, schemaNames) {
     lines.push(`${indent}  }`);
   }
   if (op.queryParams.length > 0) {
+    const deepObjectParams = op.queryParams.filter((q) => q.isDeepObject === true);
+    if (deepObjectParams.length > 0) {
+      lines.push(`${indent}  const _dq = c.req.queries()`);
+      for (const q of deepObjectParams) {
+        const prefixLen = q.rawName.length + 1;
+        const bracketPrefix = q.rawName + "[";
+        lines.push(`${indent}  const ${q.name} = Object.fromEntries(`);
+        lines.push(
+          `${indent}    Object.entries(_dq).filter(([k]) => k.startsWith('${bracketPrefix}') && k.endsWith(']')).map(([k, vs]) => [k.slice(${prefixLen}, -1), vs[0]])`
+        );
+        lines.push(`${indent}  )`);
+      }
+    }
     const fields = op.queryParams.map((q) => {
+      if (q.isDeepObject === true) {
+        return `    ${q.name}`;
+      }
+      if (q.delimiterStyle !== void 0) {
+        const delim = JSON.stringify(delimiterChar(q.delimiterStyle));
+        return `    ${q.name}: c.req.query('${q.rawName}') !== undefined ? c.req.query('${q.rawName}')!.split(${delim}) : undefined`;
+      }
       if (q.tsType === "number") {
         return `    ${q.name}: c.req.query('${q.name}') !== undefined ? Number(c.req.query('${q.name}')) : undefined`;
       }
@@ -19362,8 +19630,32 @@ function buildRouteHandler(op, indent, schemaNames) {
   }
   let bodyVarName = "body";
   if (op.bodyInfo !== void 0) {
-    const typeAnnotation = op.bodyInfo.typeName !== void 0 ? `<${op.bodyInfo.typeName}>` : "";
-    lines.push(`${indent}  const body = await c.req.json${typeAnnotation}()`);
+    const typeDecl = op.bodyInfo.typeName !== void 0 && !op.bodyInfo.isSynthesized ? op.bodyInfo.typeName : "unknown";
+    if (op.bodyInfo.contentType === "application/x-www-form-urlencoded") {
+      lines.push(`${indent}  const _ct = c.req.header('content-type') ?? ''`);
+      lines.push(
+        `${indent}  if (!_ct.toLowerCase().startsWith('application/x-www-form-urlencoded')) {`
+      );
+      lines.push(`${indent}    return c.json({ error: 'Unsupported Media Type' }, 415)`);
+      lines.push(`${indent}  }`);
+      lines.push(`${indent}  const body: unknown = await c.req.parseBody()`);
+    } else if (op.bodyInfo.contentType === "multipart/form-data") {
+      lines.push(
+        `${indent}  // multipart/form-data: parseBody({ all: true }) collects repeated keys into arrays.`
+      );
+      lines.push(`${indent}  const body: unknown = await c.req.parseBody({ all: true })`);
+    } else {
+      lines.push(`${indent}  const _ct = c.req.header('content-type') ?? ''`);
+      lines.push(`${indent}  if (!_ct.toLowerCase().startsWith('application/json')) {`);
+      lines.push(`${indent}    return c.json({ error: 'Unsupported Media Type' }, 415)`);
+      lines.push(`${indent}  }`);
+      lines.push(`${indent}  let body: ${typeDecl}`);
+      lines.push(`${indent}  try {`);
+      lines.push(`${indent}    body = JSON.parse(await c.req.text()) as ${typeDecl}`);
+      lines.push(`${indent}  } catch {`);
+      lines.push(`${indent}    return c.json({ error: 'Invalid JSON body' }, 400)`);
+      lines.push(`${indent}  }`);
+    }
     const schemaName = op.bodyInfo.typeName !== void 0 ? `${op.bodyInfo.typeName}Schema` : void 0;
     if (schemaName !== void 0 && schemaNames !== void 0 && schemaNames.has(schemaName)) {
       lines.push(`${indent}  // Validate request body: returns 422 with Zod issues on failure`);
@@ -19388,14 +19680,44 @@ function buildRouteHandler(op, indent, schemaNames) {
     serviceArgs.push("params");
   }
   const serviceCall = `service.${op.methodName}(${serviceArgs.join(", ")})`;
+  lines.push(`${indent}  try {`);
   if (op.responseStatus.isVoid) {
-    lines.push(`${indent}  await ${serviceCall}`);
-    lines.push(`${indent}  return new Response(null, { status: ${op.responseStatus.status} })`);
-  } else if (op.responseStatus.status === 201) {
-    lines.push(`${indent}  return c.json(await ${serviceCall}, 201)`);
+    lines.push(`${indent}    await ${serviceCall}`);
+    lines.push(`${indent}    return new Response(null, { status: ${op.responseStatus.status} })`);
+  } else if (op.responseStatus.isMultiStatus === true) {
+    lines.push(`${indent}    const _envelope = await ${serviceCall}`);
+    lines.push(`${indent}    return c.json(_envelope.body, _envelope.status as any)`);
+  } else if (op.responseStatus.responseContentType === "text/plain") {
+    if (op.responseStatus.status === 200) {
+      lines.push(`${indent}    return c.text(await ${serviceCall})`);
+    } else {
+      lines.push(`${indent}    return c.text(await ${serviceCall}, ${op.responseStatus.status})`);
+    }
+  } else if (op.responseStatus.responseContentType === "application/octet-stream") {
+    if (op.responseStatus.status === 200) {
+      lines.push(`${indent}    const _result = await ${serviceCall}`);
+      lines.push(
+        `${indent}    return new Response(_result, { headers: { 'content-type': 'application/octet-stream' } })`
+      );
+    } else {
+      lines.push(`${indent}    const _result = await ${serviceCall}`);
+      lines.push(
+        `${indent}    return new Response(_result, { status: ${op.responseStatus.status}, headers: { 'content-type': 'application/octet-stream' } })`
+      );
+    }
+  } else if (op.responseStatus.status === 200) {
+    lines.push(`${indent}    return c.json(await ${serviceCall})`);
   } else {
-    lines.push(`${indent}  return c.json(await ${serviceCall})`);
+    lines.push(`${indent}    return c.json(await ${serviceCall}, ${op.responseStatus.status})`);
   }
+  lines.push(`${indent}  } catch (err) {`);
+  lines.push(`${indent}    if (err instanceof HttpError) {`);
+  lines.push(
+    `${indent}      return new Response(JSON.stringify({ error: err.message }), { status: err.status, headers: { 'content-type': 'application/json' } })`
+  );
+  lines.push(`${indent}    }`);
+  lines.push(`${indent}    throw err`);
+  lines.push(`${indent}  }`);
   lines.push(`${indent}})`);
   return lines.join("\n");
 }
@@ -19414,6 +19736,13 @@ function buildExpressRouteHandler(op, indent, schemaNames) {
   }
   if (op.queryParams.length > 0) {
     const fields = op.queryParams.map((q) => {
+      if (q.isDeepObject === true) {
+        return `    ${q.name}: (req.query['${q.rawName}'] ?? {}) as Record<string, string | undefined>`;
+      }
+      if (q.delimiterStyle !== void 0) {
+        const delim = JSON.stringify(delimiterChar(q.delimiterStyle));
+        return `    ${q.name}: typeof req.query['${q.rawName}'] === 'string' ? (req.query['${q.rawName}'] as string).split(${delim}) : undefined`;
+      }
       if (q.tsType === "number") {
         return `    ${q.name}: Number(req.query['${q.name}'] as string)`;
       }
@@ -19444,21 +19773,28 @@ function buildExpressRouteHandler(op, indent, schemaNames) {
   }
   let bodyVarName = "body";
   if (op.bodyInfo !== void 0) {
-    const schemaName = op.bodyInfo.typeName !== void 0 ? `${op.bodyInfo.typeName}Schema` : void 0;
-    const useZod = schemaName !== void 0 && schemaNames !== void 0 && schemaNames.has(schemaName);
-    if (useZod) {
-      lines.push(`${indent}  // Validate request body: returns 422 with Zod issues on failure`);
-      lines.push(`${indent}  const parseResult = ${schemaName}.safeParse(req.body)`);
-      lines.push(`${indent}  if (!parseResult.success) {`);
+    if (op.bodyInfo.contentType === "multipart/form-data") {
       lines.push(
-        `${indent}    return void res.status(422).json({ error: 'Invalid request body', issues: parseResult.error.issues })`
+        `${indent}  // multipart/form-data: assumes multer middleware has populated req.files + req.body.`
       );
-      lines.push(`${indent}  }`);
-      lines.push(`${indent}  const validatedBody = parseResult.data`);
-      bodyVarName = "validatedBody";
+      lines.push(`${indent}  const body = { ...req.body, ...(req as any).files } as unknown`);
     } else {
-      const typeAnnotation = op.bodyInfo.typeName !== void 0 ? ` as ${op.bodyInfo.typeName}` : "";
-      lines.push(`${indent}  const body = req.body${typeAnnotation}`);
+      const schemaName = op.bodyInfo.typeName !== void 0 ? `${op.bodyInfo.typeName}Schema` : void 0;
+      const useZod = schemaName !== void 0 && schemaNames !== void 0 && schemaNames.has(schemaName);
+      if (useZod) {
+        lines.push(`${indent}  // Validate request body: returns 422 with Zod issues on failure`);
+        lines.push(`${indent}  const parseResult = ${schemaName}.safeParse(req.body)`);
+        lines.push(`${indent}  if (!parseResult.success) {`);
+        lines.push(
+          `${indent}    return void res.status(422).json({ error: 'Invalid request body', issues: parseResult.error.issues })`
+        );
+        lines.push(`${indent}  }`);
+        lines.push(`${indent}  const validatedBody = parseResult.data`);
+        bodyVarName = "validatedBody";
+      } else {
+        const typeAnnotation = op.bodyInfo.typeName !== void 0 && !op.bodyInfo.isSynthesized ? ` as ${op.bodyInfo.typeName}` : "";
+        lines.push(`${indent}  const body = req.body${typeAnnotation}`);
+      }
     }
   }
   const serviceArgs = [];
@@ -19472,14 +19808,42 @@ function buildExpressRouteHandler(op, indent, schemaNames) {
     serviceArgs.push("params");
   }
   const serviceCall = `service.${op.methodName}(${serviceArgs.join(", ")})`;
+  lines.push(`${indent}  try {`);
   if (op.responseStatus.isVoid) {
-    lines.push(`${indent}  await ${serviceCall}`);
-    lines.push(`${indent}  res.status(${op.responseStatus.status}).end()`);
-  } else if (op.responseStatus.status === 201) {
-    lines.push(`${indent}  res.status(201).json(await ${serviceCall})`);
+    lines.push(`${indent}    await ${serviceCall}`);
+    lines.push(`${indent}    res.status(${op.responseStatus.status}).end()`);
+  } else if (op.responseStatus.isMultiStatus === true) {
+    lines.push(`${indent}    const _envelope = await ${serviceCall}`);
+    lines.push(`${indent}    res.status(_envelope.status).json(_envelope.body)`);
+  } else if (op.responseStatus.responseContentType === "text/plain") {
+    if (op.responseStatus.status === 200) {
+      lines.push(`${indent}    res.type('text/plain').send(await ${serviceCall})`);
+    } else {
+      lines.push(
+        `${indent}    res.status(${op.responseStatus.status}).type('text/plain').send(await ${serviceCall})`
+      );
+    }
+  } else if (op.responseStatus.responseContentType === "application/octet-stream") {
+    if (op.responseStatus.status === 200) {
+      lines.push(
+        `${indent}    res.setHeader('Content-Type', 'application/octet-stream').send(Buffer.from(await ${serviceCall}))`
+      );
+    } else {
+      lines.push(
+        `${indent}    res.status(${op.responseStatus.status}).setHeader('Content-Type', 'application/octet-stream').send(Buffer.from(await ${serviceCall}))`
+      );
+    }
+  } else if (op.responseStatus.status === 200) {
+    lines.push(`${indent}    res.json(await ${serviceCall})`);
   } else {
-    lines.push(`${indent}  res.json(await ${serviceCall})`);
-  }
+    lines.push(`${indent}    res.status(${op.responseStatus.status}).json(await ${serviceCall})`);
+  }
+  lines.push(`${indent}  } catch (err) {`);
+  lines.push(`${indent}    if (err instanceof HttpError) {`);
+  lines.push(`${indent}      return void res.status(err.status).json({ error: err.message })`);
+  lines.push(`${indent}    }`);
+  lines.push(`${indent}    throw err`);
+  lines.push(`${indent}  }`);
   lines.push(`${indent}})`);
   return lines.join("\n");
 }
@@ -19487,14 +19851,23 @@ function buildFastifyRouteHandler(op, indent, schemaNames) {
   const lines = [];
   const genericParts = [];
   if (op.queryParams.length > 0) {
-    const queryFields = op.queryParams.map((q) => {
-      if (q.tsType === "number") return `${q.name}?: number`;
-      if (q.tsType === "boolean") return `${q.name}?: boolean`;
-      return `${q.name}?: string`;
-    }).join("; ");
-    genericParts.push(`Querystring: { ${queryFields} }`);
-  }
-  if (op.bodyInfo !== void 0 && op.bodyInfo.typeName !== void 0) {
+    const hasDeepOrDelimited = op.queryParams.some(
+      (q) => q.isDeepObject === true || q.delimiterStyle !== void 0
+    );
+    let querystringType;
+    if (hasDeepOrDelimited) {
+      querystringType = "Record<string, string | string[] | undefined>";
+    } else {
+      const queryFields = op.queryParams.map((q) => {
+        if (q.tsType === "number") return `${q.name}?: number`;
+        if (q.tsType === "boolean") return `${q.name}?: boolean`;
+        return `${q.name}?: string`;
+      }).join("; ");
+      querystringType = `{ ${queryFields} }`;
+    }
+    genericParts.push(`Querystring: ${querystringType}`);
+  }
+  if (op.bodyInfo !== void 0 && op.bodyInfo.typeName !== void 0 && !op.bodyInfo.isSynthesized) {
     genericParts.push(`Body: ${op.bodyInfo.typeName}`);
   } else if (op.bodyInfo !== void 0) {
     genericParts.push("Body: unknown");
@@ -19517,7 +19890,36 @@ function buildFastifyRouteHandler(op, indent, schemaNames) {
     lines.push(`${indent}  }`);
   }
   if (op.queryParams.length > 0) {
-    const fields = op.queryParams.map((q) => `    ${q.name}: req.query.${q.name}`).join(",\n");
+    const deepObjectParams = op.queryParams.filter((q) => q.isDeepObject === true);
+    const hasDeepOrDelimited = op.queryParams.some(
+      (q) => q.isDeepObject === true || q.delimiterStyle !== void 0
+    );
+    if (hasDeepOrDelimited) {
+      lines.push(
+        `${indent}  const _dq = req.query as unknown as Record<string, string | undefined>`
+      );
+    }
+    if (deepObjectParams.length > 0) {
+      for (const q of deepObjectParams) {
+        const prefixLen = q.rawName.length + 1;
+        const bracketPrefix = q.rawName + "[";
+        lines.push(`${indent}  const ${q.name} = Object.fromEntries(`);
+        lines.push(
+          `${indent}    Object.entries(_dq).filter(([k]) => k.startsWith('${bracketPrefix}') && k.endsWith(']')).map(([k, v]) => [k.slice(${prefixLen}, -1), v])`
+        );
+        lines.push(`${indent}  )`);
+      }
+    }
+    const fields = op.queryParams.map((q) => {
+      if (q.isDeepObject === true) {
+        return `    ${q.name}`;
+      }
+      if (q.delimiterStyle !== void 0) {
+        const delim = JSON.stringify(delimiterChar(q.delimiterStyle));
+        return `    ${q.name}: typeof _dq['${q.rawName}'] === 'string' ? _dq['${q.rawName}']!.split(${delim}) : undefined`;
+      }
+      return hasDeepOrDelimited ? `    ${q.name}: _dq['${q.rawName}']` : `    ${q.name}: req.query.${q.name}`;
+    }).join(",\n");
     lines.push(`${indent}  const params = {`);
     lines.push(fields);
     lines.push(`${indent}  }`);
@@ -19542,17 +19944,23 @@ function buildFastifyRouteHandler(op, indent, schemaNames) {
   }
   let bodyVarName = "req.body";
   if (op.bodyInfo !== void 0) {
-    const schemaName = op.bodyInfo.typeName !== void 0 ? `${op.bodyInfo.typeName}Schema` : void 0;
-    const useZod = schemaName !== void 0 && schemaNames !== void 0 && schemaNames.has(schemaName);
-    if (useZod) {
-      lines.push(`${indent}  // Validate request body: returns 422 with Zod issues on failure`);
-      lines.push(`${indent}  const parseResult = ${schemaName}.safeParse(req.body)`);
-      lines.push(`${indent}  if (!parseResult.success) {`);
+    if (op.bodyInfo.contentType === "multipart/form-data") {
       lines.push(
-        `${indent}    return reply.status(422).send({ error: 'Invalid request body', issues: parseResult.error.issues })`
+        `${indent}  // multipart/form-data: assumes @fastify/multipart plugin has populated req.body.`
       );
-      lines.push(`${indent}  }`);
-      bodyVarName = "parseResult.data";
+    } else {
+      const schemaName = op.bodyInfo.typeName !== void 0 ? `${op.bodyInfo.typeName}Schema` : void 0;
+      const useZod = schemaName !== void 0 && schemaNames !== void 0 && schemaNames.has(schemaName);
+      if (useZod) {
+        lines.push(`${indent}  // Validate request body: returns 422 with Zod issues on failure`);
+        lines.push(`${indent}  const parseResult = ${schemaName}.safeParse(req.body)`);
+        lines.push(`${indent}  if (!parseResult.success) {`);
+        lines.push(
+          `${indent}    return reply.status(422).send({ error: 'Invalid request body', issues: parseResult.error.issues })`
+        );
+        lines.push(`${indent}  }`);
+        bodyVarName = "parseResult.data";
+      }
     }
   }
   const serviceArgs = [];
@@ -19566,18 +19974,50 @@ function buildFastifyRouteHandler(op, indent, schemaNames) {
     serviceArgs.push("params");
   }
   const serviceCall = `service.${op.methodName}(${serviceArgs.join(", ")})`;
+  lines.push(`${indent}  try {`);
   if (op.responseStatus.isVoid) {
-    lines.push(`${indent}  await ${serviceCall}`);
-    lines.push(`${indent}  reply.status(${op.responseStatus.status}).send()`);
-  } else if (op.responseStatus.status === 201) {
-    lines.push(`${indent}  reply.status(201)`);
-    lines.push(`${indent}  return ${serviceCall}`);
+    lines.push(`${indent}    await ${serviceCall}`);
+    lines.push(`${indent}    reply.status(${op.responseStatus.status}).send()`);
+  } else if (op.responseStatus.isMultiStatus === true) {
+    lines.push(`${indent}    const _envelope = await ${serviceCall}`);
+    lines.push(`${indent}    return reply.status(_envelope.status).send(_envelope.body)`);
+  } else if (op.responseStatus.responseContentType === "text/plain") {
+    if (op.responseStatus.status === 200) {
+      lines.push(`${indent}    return reply.type('text/plain').send(await ${serviceCall})`);
+    } else {
+      lines.push(`${indent}    return reply.status(${op.responseStatus.status}).type('text/plain').send(await ${serviceCall})`);
+    }
+  } else if (op.responseStatus.responseContentType === "application/octet-stream") {
+    if (op.responseStatus.status === 200) {
+      lines.push(`${indent}    return reply.type('application/octet-stream').send(Buffer.from(await ${serviceCall}))`);
+    } else {
+      lines.push(`${indent}    return reply.status(${op.responseStatus.status}).type('application/octet-stream').send(Buffer.from(await ${serviceCall}))`);
+    }
+  } else if (op.responseStatus.status === 200) {
+    lines.push(`${indent}    return ${serviceCall}`);
   } else {
-    lines.push(`${indent}  return ${serviceCall}`);
-  }
+    lines.push(`${indent}    reply.status(${op.responseStatus.status})`);
+    lines.push(`${indent}    return ${serviceCall}`);
+  }
+  lines.push(`${indent}  } catch (err) {`);
+  lines.push(`${indent}    if (err instanceof HttpError) {`);
+  lines.push(`${indent}      return reply.status(err.status).send({ error: err.message })`);
+  lines.push(`${indent}    }`);
+  lines.push(`${indent}    throw err`);
+  lines.push(`${indent}  }`);
   lines.push(`${indent}})`);
   return lines.join("\n");
 }
+function httpErrorClassLines() {
+  return [
+    "export class HttpError extends Error {",
+    "  constructor(public readonly status: number, message: string) {",
+    "    super(message)",
+    "    this.name = 'HttpError'",
+    "  }",
+    "}"
+  ];
+}
 function operationsNeedZodForParams(operations) {
   for (const op of operations) {
     if (op.pathParamValidations.length > 0) return true;
@@ -19610,6 +20050,8 @@ function generateExpressRouter(spec, options) {
     lines.push(`import { ${sortedUsedSchemas.join(", ")} } from '${options.schemaImportPath}'`);
   }
   lines.push("");
+  for (const l of httpErrorClassLines()) lines.push(l);
+  lines.push("");
   lines.push(`export function createRouter(service: ${serviceName}): Router {`);
   lines.push("  const router = Router()");
   lines.push("");
@@ -19645,6 +20087,8 @@ function generateFastifyRouter(spec, options) {
     lines.push(`import { ${sortedUsedSchemas.join(", ")} } from '${options.schemaImportPath}'`);
   }
   lines.push("");
+  for (const l of httpErrorClassLines()) lines.push(l);
+  lines.push("");
   lines.push(`export function createRouter(app: FastifyInstance, service: ${serviceName}): void {`);
   for (const op of operations) {
     lines.push("");
@@ -19677,6 +20121,8 @@ function generateRouter(spec, options) {
     lines.push(`import { ${sortedUsedSchemas.join(", ")} } from '${options.schemaImportPath}'`);
   }
   lines.push("");
+  for (const l of httpErrorClassLines()) lines.push(l);
+  lines.push("");
   lines.push(`export function createRouter(service: ${serviceName}): Hono {`);
   lines.push("  const app = new Hono()");
   lines.push("");