chore: consolidate multiple ZodV4Internal and ZodV3Internal defs

Author: dclark27

src/client/index.ts

@@ -42,35 +42,17 @@ import {
 } from '../types.js';
 import { AjvJsonSchemaValidator } from '../validation/ajv-provider.js';
 import type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator } from '../validation/types.js';
-import { AnyObjectSchema, SchemaOutput, getObjectShape, isZ4Schema, safeParse, type AnySchema } from '../server/zod-compat.js';
+import {
+    AnyObjectSchema,
+    SchemaOutput,
+    getObjectShape,
+    isZ4Schema,
+    safeParse,
+    type ZodV3Internal,
+    type ZodV4Internal
+} from '../server/zod-compat.js';
 import type { RequestHandlerExtra } from '../shared/protocol.js';
 
-// Helper interfaces for accessing Zod internal properties (same as in zod-compat.ts and protocol.ts)
-interface ZodV3Internal {
-    _def?: {
-        typeName?: string;
-        value?: unknown;
-        values?: unknown[];
-        shape?: Record<string, AnySchema> | (() => Record<string, AnySchema>);
-        description?: string;
-    };
-    shape?: Record<string, AnySchema> | (() => Record<string, AnySchema>);
-    value?: unknown;
-}
-
-interface ZodV4Internal {
-    _zod?: {
-        def?: {
-            typeName?: string;
-            value?: unknown;
-            values?: unknown[];
-            shape?: Record<string, AnySchema> | (() => Record<string, AnySchema>);
-            description?: string;
-        };
-    };
-    value?: unknown;
-}
-
 /**
  * Elicitation default application helper. Applies defaults to the data based on the schema.
  *

src/server/zod-compat.ts

@@ -16,7 +16,7 @@ export type ZodRawShapeCompat = Record<string, AnySchema>;
 
 // --- Internal property access helpers ---
 // These types help us safely access internal properties that differ between v3 and v4
-interface ZodV3Internal {
+export interface ZodV3Internal {
     _def?: {
         typeName?: string;
         value?: unknown;
@@ -25,9 +25,10 @@ interface ZodV3Internal {
         description?: string;
     };
     shape?: Record<string, AnySchema> | (() => Record<string, AnySchema>);
+    value?: unknown;
 }
 
-interface ZodV4Internal {
+export interface ZodV4Internal {
     _zod?: {
         def?: {
             typeName?: string;
@@ -37,6 +38,7 @@ interface ZodV4Internal {
             description?: string;
         };
     };
+    value?: unknown;
 }
 
 // --- Type inference helpers ---

src/shared/protocol.ts

@@ -1,30 +1,4 @@
-import { AnySchema, AnyObjectSchema, SchemaOutput, getObjectShape, safeParse, isZ4Schema } from '../server/zod-compat.js';
-
-// Helper interfaces for accessing Zod internal properties (same as in zod-compat.ts)
-interface ZodV3Internal {
-    _def?: {
-        typeName?: string;
-        value?: unknown;
-        values?: unknown[];
-        shape?: Record<string, AnySchema> | (() => Record<string, AnySchema>);
-        description?: string;
-    };
-    shape?: Record<string, AnySchema> | (() => Record<string, AnySchema>);
-    value?: unknown;
-}
-
-interface ZodV4Internal {
-    _zod?: {
-        def?: {
-            typeName?: string;
-            value?: unknown;
-            values?: unknown[];
-            shape?: Record<string, AnySchema> | (() => Record<string, AnySchema>);
-            description?: string;
-        };
-    };
-    value?: unknown;
-}
+import { AnySchema, AnyObjectSchema, SchemaOutput, getObjectShape, safeParse, isZ4Schema, type ZodV3Internal, type ZodV4Internal } from '../server/zod-compat.js';
 import {
     CancelledNotificationSchema,
     ClientCapabilities,