Remove OpenAPI zod, valibot types

Author: mpppk

pkgs/typed-api-spec/src/core/openapi/openapi.ts

@@ -9,9 +9,35 @@ import { JSONSchema7 } from "json-schema";
 import { StatusCode } from "../hono-types";
 import {
   AnyOpenApiSpec,
+  BaseOpenApiSpec,
+  DefineOpenApiEndpoint,
+  DefineOpenApiResponses,
   JsonSchemaOpenApiEndpoints,
   JsonSchemaOpenApiSpec,
+  ToOpenApiResponse,
 } from "./spec";
+import { StandardSchemaV1 } from "@standard-schema/spec";
+import { SSAnyApiResponse } from "../../ss";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type AnyStandardSchemaV1 = StandardSchemaV1<any>;
+export type SSOpenApiEndpoints = {
+  [Path in string]: SSOpenApiEndpoint;
+};
+export type SSOpenApiEndpoint = DefineOpenApiEndpoint<SSOpenApiSpec>;
+export type SSAnyOpenApiResponse = ToOpenApiResponse<SSAnyApiResponse>;
+export type SSAnyOpenApiResponses =
+  DefineOpenApiResponses<SSAnyOpenApiResponse>;
+
+export type SSOpenApiSpec<
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  ParamKeys extends string = string,
+  Params extends AnyStandardSchemaV1 = AnyStandardSchemaV1,
+  Query extends AnyStandardSchemaV1 = AnyStandardSchemaV1,
+  Body extends AnyStandardSchemaV1 = AnyStandardSchemaV1,
+  RequestHeaders extends AnyStandardSchemaV1 = AnyStandardSchemaV1,
+  Responses extends SSAnyOpenApiResponses = SSAnyOpenApiResponses,
+> = BaseOpenApiSpec<Params, Query, Body, RequestHeaders, Responses>;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const toPathItemObject = (

pkgs/typed-api-spec/src/valibot/openapi.ts

@@ -1,46 +1,22 @@
 import { OpenAPIV3_1 } from "openapi-types";
 import {
   JsonSchemaApiEndpoints,
+  SSOpenApiEndpoints,
   toOpenApiDoc as toOpenApiDocOrg,
 } from "../core";
-import { AnyV } from "./util";
-import {
-  BaseOpenApiSpec,
-  DefineOpenApiEndpoint,
-  DefineOpenApiResponses,
-  JsonSchemaOpenApiEndpoints,
-  ToOpenApiResponse,
-} from "../core/openapi/spec";
+import { JsonSchemaOpenApiEndpoints } from "../core/openapi/spec";
 import { toJsonSchemaApiEndpoints as toEndpoints } from "../core/jsonschema";
 import { toJsonSchema } from "@valibot/to-json-schema";
-import { SSAnyApiResponse, SSApiEndpoints } from "../ss";
+import { SSApiEndpoints } from "../ss";
 
-export const toOpenApiDoc = <E extends ValibotOpenApiEndpoints>(
+export const toOpenApiDoc = <E extends SSOpenApiEndpoints>(
   doc: Omit<OpenAPIV3_1.Document, "paths">,
   endpoints: E,
 ): OpenAPIV3_1.Document => {
   const e = toJsonSchemaApiEndpoints(endpoints);
   return toOpenApiDocOrg(doc, e as JsonSchemaOpenApiEndpoints);
 };
 
-export type ValibotOpenApiEndpoints = {
-  [Path in string]: ValibotOpenApiEndpoint;
-};
-export type ValibotOpenApiEndpoint = DefineOpenApiEndpoint<ValibotOpenApiSpec>;
-export type ValibotAnyOpenApiResponse = ToOpenApiResponse<SSAnyApiResponse>;
-export type ValibotAnyOpenApiResponses =
-  DefineOpenApiResponses<ValibotAnyOpenApiResponse>;
-
-export type ValibotOpenApiSpec<
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  ParamKeys extends string = string,
-  Params extends AnyV = AnyV,
-  Query extends AnyV = AnyV,
-  Body extends AnyV = AnyV,
-  RequestHeaders extends AnyV = AnyV,
-  Responses extends ValibotAnyOpenApiResponses = ValibotAnyOpenApiResponses,
-> = BaseOpenApiSpec<Params, Query, Body, RequestHeaders, Responses>;
-
 export const toJsonSchemaApiEndpoints = <E extends SSApiEndpoints>(
   endpoints: E,
 ): JsonSchemaApiEndpoints => toEndpoints(toJsonSchema, endpoints);

pkgs/typed-api-spec/src/zod/openapi.ts

@@ -1,48 +1,24 @@
 import { OpenAPIV3_1 } from "openapi-types";
 import {
   JsonSchemaApiEndpoints,
+  SSOpenApiEndpoints,
   toOpenApiDoc as toOpenApiDocOrg,
 } from "../core";
-import {
-  BaseOpenApiSpec,
-  DefineOpenApiEndpoint,
-  DefineOpenApiResponses,
-  JsonSchemaOpenApiEndpoints,
-  ToOpenApiResponse,
-} from "../core/openapi/spec";
+import { JsonSchemaOpenApiEndpoints } from "../core/openapi/spec";
 import { z } from "zod";
 import { toJsonSchemaApiEndpoints as toEndpoints } from "../core/jsonschema";
 import { createSchema } from "zod-openapi";
 import { JSONSchema7 } from "json-schema";
-import { SSAnyApiResponse } from "../ss";
 
-export const toOpenApiDoc = <E extends ZodOpenApiEndpoints>(
+export const toOpenApiDoc = <E extends SSOpenApiEndpoints>(
   doc: Omit<OpenAPIV3_1.Document, "paths">,
   endpoints: E,
 ): OpenAPIV3_1.Document => {
   const e = toJsonSchemaApiEndpoints(endpoints);
   return toOpenApiDocOrg(doc, e as JsonSchemaOpenApiEndpoints);
 };
 
-export type ZodOpenApiEndpoints = {
-  [Path in string]: ZodOpenApiEndpoint;
-};
-export type ZodOpenApiEndpoint = DefineOpenApiEndpoint<ZodOpenApiSpec>;
-export type ZodAnyOpenApiResponse = ToOpenApiResponse<SSAnyApiResponse>;
-export type ZodAnyOpenApiResponses =
-  DefineOpenApiResponses<ZodAnyOpenApiResponse>;
-
-export type ZodOpenApiSpec<
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  ParamKeys extends string = string,
-  Params extends z.ZodTypeAny = z.ZodTypeAny,
-  Query extends z.ZodTypeAny = z.ZodTypeAny,
-  Body extends z.ZodTypeAny = z.ZodTypeAny,
-  RequestHeaders extends z.ZodTypeAny = z.ZodTypeAny,
-  Responses extends ZodAnyOpenApiResponses = ZodAnyOpenApiResponses,
-> = BaseOpenApiSpec<Params, Query, Body, RequestHeaders, Responses>;
-
-export const toJsonSchemaApiEndpoints = <E extends ZodOpenApiEndpoints>(
+export const toJsonSchemaApiEndpoints = <E extends SSOpenApiEndpoints>(
   endpoints: E,
 ): JsonSchemaApiEndpoints => toEndpoints(toSchema, endpoints);