[HTTP/OAS] zod support

.github/CODEOWNERS

@@ -939,6 +939,7 @@ packages/kbn-web-worker-stub @elastic/kibana-operations
 packages/kbn-whereis-pkg-cli @elastic/kibana-operations
 packages/kbn-xstate-utils @elastic/obs-ux-logs-team
 packages/kbn-yarn-lock-validator @elastic/kibana-operations
+packages/kbn-zod @elastic/kibana-core
 packages/kbn-zod-helpers @elastic/security-detection-rule-management
 ####
 ## Everything below this line overrides the default assignments for each package.

package.json

@@ -931,6 +931,7 @@
     "@kbn/visualizations-plugin": "link:src/plugins/visualizations",
     "@kbn/watcher-plugin": "link:x-pack/plugins/watcher",
     "@kbn/xstate-utils": "link:packages/kbn-xstate-utils",
+    "@kbn/zod": "link:packages/kbn-zod",
     "@kbn/zod-helpers": "link:packages/kbn-zod-helpers",
     "@langchain/community": "^0.2.4",
     "@langchain/core": "0.2.3",
@@ -1755,7 +1756,7 @@
     "xmlbuilder": "13.0.2",
     "yargs": "^15.4.1",
     "yarn-deduplicate": "^6.0.2",
-    "zod-to-json-schema": "^3.22.3"
+    "zod-to-json-schema": "^3.23.0"
   },
   "packageManager": "yarn@1.22.21"
 }

packages/core/http/core-http-router-server-internal/src/router.ts

@@ -27,7 +27,7 @@ import type {
   RouteRegistrar,
 } from '@kbn/core-http-server';
 import { validBodyOutput, getRequestValidation } from '@kbn/core-http-server';
-import { RouteValidator } from './validator';
+import { isZod, RouteValidator } from './validator';
 import { CoreVersionedRouter } from './versioned_router';
 import { CoreKibanaRequest } from './request';
 import { kibanaResponseFactory } from './response';
@@ -73,7 +73,7 @@ function routeSchemasFromRouteConfig<P, Q, B>(
   if (route.validate !== false) {
     const validation = getRequestValidation(route.validate);
     Object.entries(validation).forEach(([key, schema]) => {
-      if (!(isConfigSchema(schema) || typeof schema === 'function')) {
+      if (!(isConfigSchema(schema) || isZod(schema) || typeof schema === 'function')) {
         throw new Error(
           `Expected a valid validation logic declared with '@kbn/config-schema' package or a RouteValidationFunction at key: [${key}].`
         );

packages/core/http/core-http-router-server-internal/src/util.ts

@@ -9,6 +9,7 @@
 import { once } from 'lodash';
 import {
   isFullValidatorContainer,
+  ZodEsque,
   type RouteConfig,
   type RouteMethod,
   type RouteValidator,
@@ -20,7 +21,7 @@ function isStatusCode(key: string) {
 }
 
 interface ResponseValidation {
-  [statusCode: number]: { body: () => ObjectType | Type<unknown> };
+  [statusCode: number]: { body: () => ObjectType | Type<unknown> | ZodEsque<unknown> };
 }
 
 export function prepareResponseValidation(validation: ResponseValidation): ResponseValidation {

packages/core/http/core-http-router-server-internal/src/validator.ts

@@ -7,6 +7,7 @@
  */
 
 import { Stream } from 'stream';
+import { z } from '@kbn/zod';
 import { ValidationError, schema, isConfigSchema } from '@kbn/config-schema';
 import type {
   RouteValidationSpec,
@@ -18,6 +19,10 @@ import type {
 } from '@kbn/core-http-server';
 import { RouteValidationError } from '@kbn/core-http-server';
 
+export function isZod<T>(rule: RouteValidationSpec<T>): rule is z.ZodType<T> {
+  return Boolean('_def' in rule && 'typeName' in (rule as { _def: {} })._def);
+}
+
 /**
  * Route validator class to define the validation logic for each new route.
  *
@@ -119,6 +124,8 @@ export class RouteValidator<P = {}, Q = {}, B = {}> {
   ): T {
     if (isConfigSchema(validationRule)) {
       return validationRule.validate(data, {}, namespace);
+    } else if (isZod(validationRule)) {
+      return validationRule.parse(data);
     } else if (typeof validationRule === 'function') {
       return this.validateFunction(validationRule, data, namespace);
     } else {

packages/core/http/core-http-router-server-internal/tsconfig.json

@@ -12,6 +12,7 @@
     "@kbn/std",
     "@kbn/utility-types",
     "@kbn/config-schema",
+    "@kbn/zod",
     "@kbn/es-errors",
     "@kbn/core-http-server",
     "@kbn/hapi-mocks",

packages/core/http/core-http-server/index.ts

@@ -106,6 +106,7 @@ export type {
   RouteValidatorFullConfigResponse,
   LazyValidator,
   RouteAccess,
+  ZodEsque,
 } from './src/router';
 export {
   validBodyOutput,

packages/core/http/core-http-server/src/router/index.ts

@@ -65,6 +65,7 @@ export type {
   RouteValidator,
   RouteValidatorRequestAndResponses,
   LazyValidator,
+  ZodEsque,
 } from './route_validator';
 export { RouteValidationError } from './route_validator';
 export type { IRouter, RouteRegistrar, RouterRoute } from './router';

packages/core/http/core-http-server/src/router/route_validator.ts

@@ -72,14 +72,22 @@ export type RouteValidationFunction<T> = (
       error: RouteValidationError;
     };
 
+export interface ZodEsque<V> {
+  _output: V;
+}
+
 /**
  * Allowed property validation options: either @kbn/config-schema validations or custom validation functions
  *
  * See {@link RouteValidationFunction} for custom validation.
  *
  * @public
  */
-export type RouteValidationSpec<T> = ObjectType | Type<T> | RouteValidationFunction<T>;
+export type RouteValidationSpec<T> =
+  | ObjectType
+  | Type<T>
+  | ZodEsque<T>
+  | RouteValidationFunction<T>;
 
 /**
  * The configuration object to the RouteValidator class.
@@ -208,4 +216,4 @@ export type RouteValidator<P, Q, B> =
  * @return A @kbn/config-schema schema
  * @public
  */
-export type LazyValidator = () => Type<unknown>;
+export type LazyValidator = () => Type<unknown> | ZodEsque<unknown>;