* In elicitation.test.ts

  - Replace @ts-expect-error erroneously removed for "pattern" types

* In types.ts
  - follow the pattern of the other primitive types
    - name the zod schemas with SchemaSchema at the end
    - export types inferred from enum schemas with just Schema at the end

* In spec.types.test.ts
  - add tests for enum types

Author: cliffhall

src/server/elicitation.test.ts

@@ -159,6 +159,7 @@ function testElicitationFlow(validatorProvider: typeof ajvProvider | typeof cfWo
                     age: { type: 'integer', minimum: 0, maximum: 150 },
                     street: { type: 'string' },
                     city: { type: 'string' },
+                    // @ts-expect-error - pattern is not a valid property by MCP spec, however it is making use of the Ajv validator
                     zipCode: { type: 'string', pattern: '^[0-9]{5}$' },
                     newsletter: { type: 'boolean' },
                     notifications: { type: 'boolean' }
@@ -273,6 +274,7 @@ function testElicitationFlow(validatorProvider: typeof ajvProvider | typeof cfWo
                 requestedSchema: {
                     type: 'object',
                     properties: {
+                        // @ts-expect-error - pattern is not a valid property by MCP spec, however it is making use of the Ajv validator
                         zipCode: { type: 'string', pattern: '^[0-9]{5}$' }
                     },
                     required: ['zipCode']

src/spec.types.test.ts

@@ -464,6 +464,34 @@ const sdkTypeChecks = {
         sdk = spec;
         spec = sdk;
     },
+    UntitledSingleSelectEnumSchema: (sdk: SDKTypes.UntitledSingleSelectEnumSchema, spec: SpecTypes.UntitledSingleSelectEnumSchema) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    TitledSingleSelectEnumSchema: (sdk: SDKTypes.TitledSingleSelectEnumSchema, spec: SpecTypes.TitledSingleSelectEnumSchema) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    SingleSelectEnumSchema: (sdk: SDKTypes.SingleSelectEnumSchema, spec: SpecTypes.SingleSelectEnumSchema) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    UntitledMultiSelectEnumSchema: (sdk: SDKTypes.UntitledMultiSelectEnumSchema, spec: SpecTypes.UntitledMultiSelectEnumSchema) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    TitledMultiSelectEnumSchema: (sdk: SDKTypes.TitledMultiSelectEnumSchema, spec: SpecTypes.TitledMultiSelectEnumSchema) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    MultiSelectEnumSchema: (sdk: SDKTypes.MultiSelectEnumSchema, spec: SpecTypes.MultiSelectEnumSchema) => {
+        sdk = spec;
+        spec = sdk;
+    },
+    LegacyTitledEnumSchema: (sdk: SDKTypes.LegacyTitledEnumSchema, spec: SpecTypes.LegacyTitledEnumSchema) => {
+        sdk = spec;
+        spec = sdk;
+    },
     PrimitiveSchemaDefinition: (sdk: SDKTypes.PrimitiveSchemaDefinition, spec: SpecTypes.PrimitiveSchemaDefinition) => {
         sdk = spec;
         spec = sdk;
@@ -565,7 +593,7 @@ describe('Spec Types', () => {
     it('should define some expected types', () => {
         expect(specTypes).toContain('JSONRPCNotification');
         expect(specTypes).toContain('ElicitResult');
-        expect(specTypes).toHaveLength(112);
+        expect(specTypes).toHaveLength(119);
     });
 
     it('should have up to date list of missing sdk types', () => {

src/types.ts

@@ -1229,21 +1229,18 @@ export const NumberSchemaSchema = z.object({
 /**
  * Schema for single-selection enumeration without display titles for options.
  */
-export const UntitledSingleSelectEnumSchema = z
-    .object({
-        type: z.literal('string'),
-        title: z.optional(z.string()),
-        description: z.optional(z.string()),
-        enum: z.array(z.string()),
-        default: z.string().optional()
-    })
-    .passthrough();
-
+export const UntitledSingleSelectEnumSchemaSchema = z.object({
+    type: z.literal('string'),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    enum: z.array(z.string()),
+    default: z.string().optional()
+});
 
 /**
  * Schema for single-selection enumeration with display titles for each option.
  */
-export const TitledSingleSelectEnumSchema = z.object({
+export const TitledSingleSelectEnumSchemaSchema = z.object({
     type: z.literal('string'),
     title: z.string().optional(),
     description: z.string().optional(),
@@ -1260,7 +1257,7 @@ export const TitledSingleSelectEnumSchema = z.object({
  * Use TitledSingleSelectEnumSchema instead.
  * This interface will be removed in a future version.
  */
-export const LegacyTitledEnumSchema = z.object({
+export const LegacyTitledEnumSchemaSchema = z.object({
     type: z.literal('string'),
     title: z.string().optional(),
     description: z.string().optional(),
@@ -1270,12 +1267,16 @@ export const LegacyTitledEnumSchema = z.object({
 });
 
 // Combined single selection enumeration
-export const SingleSelectEnumSchema = z.union([UntitledSingleSelectEnumSchema, TitledSingleSelectEnumSchema, LegacyTitledEnumSchema]);
+export const SingleSelectEnumSchemaSchema = z.union([
+    UntitledSingleSelectEnumSchemaSchema,
+    TitledSingleSelectEnumSchemaSchema,
+    LegacyTitledEnumSchemaSchema
+]);
 
 /**
  * Schema for multiple-selection enumeration without display titles for options.
  */
-export const UntitledMultiSelectEnumSchema = z.object({
+export const UntitledMultiSelectEnumSchemaSchema = z.object({
     type: z.literal('array'),
     title: z.string().optional(),
     description: z.string().optional(),
@@ -1291,7 +1292,7 @@ export const UntitledMultiSelectEnumSchema = z.object({
 /**
  * Schema for multiple-selection enumeration with display titles for each option.
  */
-export const TitledMultiSelectEnumSchema = z.object({
+export const TitledMultiSelectEnumSchemaSchema = z.object({
     type: z.literal('array'),
     title: z.string().optional(),
     description: z.string().optional(),
@@ -1311,12 +1312,12 @@ export const TitledMultiSelectEnumSchema = z.object({
 /**
  * Combined schema for multiple-selection enumeration
  */
-export const MultiSelectEnumSchema = z.union([UntitledMultiSelectEnumSchema, TitledMultiSelectEnumSchema]);
+export const MultiSelectEnumSchemaSchema = z.union([UntitledMultiSelectEnumSchemaSchema, TitledMultiSelectEnumSchemaSchema]);
 
 /**
  * Primitive schema definition for enum fields.
  */
-export const EnumSchemaSchema = z.union([SingleSelectEnumSchema, MultiSelectEnumSchema]);
+export const EnumSchemaSchema = z.union([SingleSelectEnumSchemaSchema, MultiSelectEnumSchemaSchema]);
 
 /**
  * Union of all primitive schema definitions.
@@ -1735,7 +1736,16 @@ export type CreateMessageResult = Infer<typeof CreateMessageResultSchema>;
 export type BooleanSchema = Infer<typeof BooleanSchemaSchema>;
 export type StringSchema = Infer<typeof StringSchemaSchema>;
 export type NumberSchema = Infer<typeof NumberSchemaSchema>;
+
 export type EnumSchema = Infer<typeof EnumSchemaSchema>;
+export type UntitledSingleSelectEnumSchema = Infer<typeof UntitledSingleSelectEnumSchemaSchema>;
+export type TitledSingleSelectEnumSchema = Infer<typeof TitledSingleSelectEnumSchemaSchema>;
+export type LegacyTitledEnumSchema = Infer<typeof LegacyTitledEnumSchemaSchema>;
+export type UntitledMultiSelectEnumSchema = Infer<typeof UntitledMultiSelectEnumSchemaSchema>;
+export type TitledMultiSelectEnumSchema = Infer<typeof TitledMultiSelectEnumSchemaSchema>;
+export type SingleSelectEnumSchema = Infer<typeof SingleSelectEnumSchemaSchema>;
+export type MultiSelectEnumSchema = Infer<typeof MultiSelectEnumSchemaSchema>;
+
 export type PrimitiveSchemaDefinition = Infer<typeof PrimitiveSchemaDefinitionSchema>;
 export type ElicitRequestParams = Infer<typeof ElicitRequestParamsSchema>;
 export type ElicitRequest = Infer<typeof ElicitRequestSchema>;