@@ -4,17 +4,22 @@ import { registerSimplePrompt } from "../prompts/simple.js";
44import { registerArgumentsPrompt } from "../prompts/args.js" ;
55import { registerPromptWithCompletions } from "../prompts/completions.js" ;
66import { registerEmbeddedResourcePrompt } from "../prompts/resource.js" ;
7+ import { contentOfType , textOf , type PromptHandler } from "./helpers.js" ;
78
89// Helper to capture registered prompt handlers
910function createMockServer ( ) {
10- const handlers : Map < string , Function > = new Map ( ) ;
11- const configs : Map < string , any > = new Map ( ) ;
11+ const handlers : Map < string , PromptHandler > = new Map ( ) ;
12+ const configs : Map < string , unknown > = new Map ( ) ;
1213
1314 const mockServer = {
14- registerPrompt : vi . fn ( ( name : string , config : any , handler : Function ) => {
15- handlers . set ( name , handler ) ;
16- configs . set ( name , config ) ;
17- } ) ,
15+ registerPrompt : vi . fn (
16+ ( name : string , config : unknown , handler : PromptHandler ) => {
17+ handlers . set ( name , handler ) ;
18+ configs . set ( name , config ) ;
19+ } ,
20+ ) ,
21+ // Partial mock: the prompt registrars only call registerPrompt, and
22+ // McpServer is a class whose private members no object literal can satisfy.
1823 } as unknown as McpServer ;
1924
2025 return { mockServer, handlers, configs } ;
@@ -51,7 +56,7 @@ describe("Prompts", () => {
5156 const handler = handlers . get ( "args-prompt" ) ! ;
5257 const result = handler ( { city : "San Francisco" } ) ;
5358
54- expect ( result . messages [ 0 ] . content . text ) . toBe (
59+ expect ( textOf ( result . messages [ 0 ] . content ) ) . toBe (
5560 "What's weather in San Francisco?" ,
5661 ) ;
5762 } ) ;
@@ -63,7 +68,7 @@ describe("Prompts", () => {
6368 const handler = handlers . get ( "args-prompt" ) ! ;
6469 const result = handler ( { city : "San Francisco" , state : "California" } ) ;
6570
66- expect ( result . messages [ 0 ] . content . text ) . toBe (
71+ expect ( textOf ( result . messages [ 0 ] . content ) ) . toBe (
6772 "What's weather in San Francisco, California?" ,
6873 ) ;
6974 } ) ;
@@ -75,10 +80,10 @@ describe("Prompts", () => {
7580 const handler = handlers . get ( "args-prompt" ) ! ;
7681 const result = handler ( { city : "New York" } ) ;
7782
78- expect ( result . messages [ 0 ] . content . text ) . toBe (
83+ expect ( textOf ( result . messages [ 0 ] . content ) ) . toBe (
7984 "What's weather in New York?" ,
8085 ) ;
81- expect ( result . messages [ 0 ] . content . text ) . not . toContain ( "," ) ;
86+ expect ( textOf ( result . messages [ 0 ] . content ) ) . not . toContain ( "," ) ;
8287 expect ( result . messages [ 0 ] . role ) . toBe ( "user" ) ;
8388 expect ( result . messages [ 0 ] . content . type ) . toBe ( "text" ) ;
8489 } ) ;
@@ -92,7 +97,7 @@ describe("Prompts", () => {
9297 const handler = handlers . get ( "completable-prompt" ) ! ;
9398 const result = handler ( { department : "Engineering" , name : "Alice" } ) ;
9499
95- expect ( result . messages [ 0 ] . content . text ) . toBe (
100+ expect ( textOf ( result . messages [ 0 ] . content ) ) . toBe (
96101 "Please promote Alice to the head of the Engineering team." ,
97102 ) ;
98103 } ) ;
@@ -104,16 +109,18 @@ describe("Prompts", () => {
104109 const handler = handlers . get ( "completable-prompt" ) ! ;
105110
106111 const salesResult = handler ( { department : "Sales" , name : "David" } ) ;
107- expect ( salesResult . messages [ 0 ] . content . text ) . toContain ( "Sales" ) ;
108- expect ( salesResult . messages [ 0 ] . content . text ) . toContain ( "David" ) ;
112+ expect ( textOf ( salesResult . messages [ 0 ] . content ) ) . toContain ( "Sales" ) ;
113+ expect ( textOf ( salesResult . messages [ 0 ] . content ) ) . toContain ( "David" ) ;
109114 expect ( salesResult . messages [ 0 ] . role ) . toBe ( "user" ) ;
110115
111116 const marketingResult = handler ( {
112117 department : "Marketing" ,
113118 name : "Grace" ,
114119 } ) ;
115- expect ( marketingResult . messages [ 0 ] . content . text ) . toContain ( "Marketing" ) ;
116- expect ( marketingResult . messages [ 0 ] . content . text ) . toContain ( "Grace" ) ;
120+ expect ( textOf ( marketingResult . messages [ 0 ] . content ) ) . toContain (
121+ "Marketing" ,
122+ ) ;
123+ expect ( textOf ( marketingResult . messages [ 0 ] . content ) ) . toContain ( "Grace" ) ;
117124 } ) ;
118125 } ) ;
119126
@@ -126,10 +133,12 @@ describe("Prompts", () => {
126133 const result = handler ( { resourceType : "Text" , resourceId : "1" } ) ;
127134
128135 expect ( result . messages ) . toHaveLength ( 2 ) ;
129- expect ( result . messages [ 0 ] . content . text ) . toContain ( "Text" ) ;
130- expect ( result . messages [ 0 ] . content . text ) . toContain ( "1" ) ;
136+ expect ( textOf ( result . messages [ 0 ] . content ) ) . toContain ( "Text" ) ;
137+ expect ( textOf ( result . messages [ 0 ] . content ) ) . toContain ( "1" ) ;
131138 expect ( result . messages [ 1 ] . content . type ) . toBe ( "resource" ) ;
132- expect ( result . messages [ 1 ] . content . resource . uri ) . toContain ( "text/1" ) ;
139+ expect (
140+ contentOfType ( result . messages [ 1 ] . content , "resource" ) . resource . uri ,
141+ ) . toContain ( "text/1" ) ;
133142 } ) ;
134143
135144 it ( "should return blob resource reference" , ( ) => {
@@ -139,8 +148,10 @@ describe("Prompts", () => {
139148 const handler = handlers . get ( "resource-prompt" ) ! ;
140149 const result = handler ( { resourceType : "Blob" , resourceId : "5" } ) ;
141150
142- expect ( result . messages [ 0 ] . content . text ) . toContain ( "Blob" ) ;
143- expect ( result . messages [ 1 ] . content . resource . uri ) . toContain ( "blob/5" ) ;
151+ expect ( textOf ( result . messages [ 0 ] . content ) ) . toContain ( "Blob" ) ;
152+ expect (
153+ contentOfType ( result . messages [ 1 ] . content , "resource" ) . resource . uri ,
154+ ) . toContain ( "blob/5" ) ;
144155 } ) ;
145156
146157 it ( "should reject invalid resource type" , ( ) => {
0 commit comments