restructure test helpers, integration tests, clean up package.json

Author: KKonstantinov

examples/shared/package.json

@@ -41,6 +41,7 @@
         "@modelcontextprotocol/tsconfig": "workspace:^",
         "@modelcontextprotocol/eslint-config": "workspace:^",
         "@modelcontextprotocol/vitest-config": "workspace:^",
+        "@modelcontextprotocol/test-helpers": "workspace:^",
         "@types/express": "catalog:devTools",
         "@typescript/native-preview": "catalog:devTools",
         "@eslint/js": "catalog:devTools",

examples/shared/test/demoInMemoryOAuthProvider.test.ts

@@ -1,10 +1,10 @@
 import type { OAuthClientInformationFull } from '@modelcontextprotocol/sdk-core';
 import type { AuthorizationParams } from '@modelcontextprotocol/sdk-server';
 import { InvalidRequestError } from '@modelcontextprotocol/sdk-server';
+import { createExpressResponseMock } from '@modelcontextprotocol/test-helpers';
 import type { Response } from 'express';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { createExpressResponseMock } from '../../../packages/integration/test/helpers/http.js';
 import { DemoInMemoryAuthProvider, DemoInMemoryClientsStore } from '../src/demoInMemoryOAuthProvider.js';
 
 describe('DemoInMemoryAuthProvider', () => {

examples/shared/tsconfig.json

@@ -11,7 +11,9 @@
                 "node_modules/@modelcontextprotocol/sdk-server/node_modules/@modelcontextprotocol/sdk-core/src/index.ts"
             ],
             "@modelcontextprotocol/eslint-config": ["node_modules/@modelcontextprotocol/eslint-config/tsconfig.json"],
-            "@modelcontextprotocol/vitest-config": ["node_modules/@modelcontextprotocol/vitest-config/tsconfig.json"]
+            "@modelcontextprotocol/vitest-config": ["node_modules/@modelcontextprotocol/vitest-config/tsconfig.json"],
+            "@modelcontextprotocol/test-helpers": ["node_modules/@modelcontextprotocol/test-helpers/src/index.ts"],
+            "@modelcontextprotocol/sdk-client": ["node_modules/@modelcontextprotocol/test-helpers/node_modules/@modelcontextprotocol/sdk-client/src/index.ts"],
         }
     }
 }

packages/client/package.json

@@ -68,6 +68,7 @@
         "@modelcontextprotocol/tsconfig": "workspace:^",
         "@modelcontextprotocol/vitest-config": "workspace:^",
         "@modelcontextprotocol/eslint-config": "workspace:^",
+        "@modelcontextprotocol/test-helpers": "workspace:^",
         "@cfworker/json-schema": "catalog:runtimeShared",
         "@types/content-type": "catalog:devTools",
         "@types/cross-spawn": "catalog:devTools",

packages/client/test/client/auth-extensions.test.ts

@@ -1,6 +1,6 @@
+import { createMockOAuthFetch } from '@modelcontextprotocol/test-helpers';
 import { describe, expect, it } from 'vitest';
 
-import { createMockOAuthFetch } from '../../../integration/test/helpers/oauth.js';
 import { auth } from '../../src/client/auth.js';
 import {
     ClientCredentialsProvider,

packages/client/test/client/sse.test.ts

@@ -4,9 +4,9 @@ import type { AddressInfo } from 'node:net';
 
 import type { JSONRPCMessage, OAuthTokens } from '@modelcontextprotocol/sdk-core';
 import { InvalidClientError, InvalidGrantError, UnauthorizedClientError } from '@modelcontextprotocol/sdk-core';
+import { listenOnRandomPort } from '@modelcontextprotocol/test-helpers';
 import type { Mock, Mocked, MockedFunction, MockInstance } from 'vitest';
 
-import { listenOnRandomPort } from '../../../integration/test/helpers/http.js';
 import type { OAuthClientProvider } from '../../src/client/auth.js';
 import { UnauthorizedError } from '../../src/client/auth.js';
 import { SSEClientTransport } from '../../src/client/sse.js';

packages/client/tsconfig.json

@@ -7,9 +7,13 @@
         "paths": {
             "*": ["./*"],
             "@modelcontextprotocol/sdk-core": ["node_modules/@modelcontextprotocol/sdk-core/src/index.ts"],
-            "@modelcontextprotocol/sdk-client": ["node_modules/@modelcontextprotocol/sdk-client/src/index.ts"],
-            "@modelcontextprotocol/vitest-config": ["node_modules/@modelcontextprotocol/vitest-config/tsconfig.json"],
-            "@modelcontextprotocol/eslint-config": ["node_modules/@modelcontextprotocol/eslint-config/tsconfig.json"]
+            "@modelcontextprotocol/test-helpers": ["node_modules/@modelcontextprotocol/test-helpers/src/index.ts"],
+            "@modelcontextprotocol/sdk-client": [
+                "node_modules/@modelcontextprotocol/test-helpers/node_modules/@modelcontextprotocol/sdk-client/src/index.ts"
+            ],
+            "@modelcontextprotocol/sdk-server": [
+                "node_modules/@modelcontextprotocol/test-helpers/node_modules/@modelcontextprotocol/sdk-server/src/index.ts"
+            ]
         }
     }
 }

packages/core/package.json

@@ -22,7 +22,6 @@
         "mcp"
     ],
     "scripts": {
-        "fetch:spec-types": "tsx scripts/fetch-spec-types.ts",
         "typecheck": "tsc -p tsconfig.json --noEmit",
         "examples:simple-server:w": "tsx --watch src/examples/server/simpleStreamableHttp.ts --oauth",
         "lint": "eslint src/ && prettier --ignore-path ../../.prettierignore --check .",

packages/server/package.json

@@ -30,7 +30,6 @@
         "dist"
     ],
     "scripts": {
-        "fetch:spec-types": "tsx scripts/fetch-spec-types.ts",
         "typecheck": "tsc -p tsconfig.json --noEmit",
         "build": "tsdown",
         "build:watch": "tsdown --watch",
@@ -73,6 +72,7 @@
         "@modelcontextprotocol/tsconfig": "workspace:^",
         "@modelcontextprotocol/vitest-config": "workspace:^",
         "@modelcontextprotocol/eslint-config": "workspace:^",
+        "@modelcontextprotocol/test-helpers": "workspace:^",
         "@cfworker/json-schema": "catalog:runtimeShared",
         "@eslint/js": "catalog:devTools",
         "@types/content-type": "catalog:devTools",

packages/server/test/server/auth/middleware/bearerAuth.test.ts

@@ -1,9 +1,9 @@
 import type { AuthInfo } from '@modelcontextprotocol/sdk-core';
 import { CustomOAuthError, InsufficientScopeError, InvalidTokenError, ServerError } from '@modelcontextprotocol/sdk-core';
+import { createExpressResponseMock } from '@modelcontextprotocol/test-helpers';
 import type { Request, Response } from 'express';
 import type { Mock } from 'vitest';
 
-import { createExpressResponseMock } from '../../../../../integration/test/helpers/http.js';
 import { requireBearerAuth } from '../../../../src/server/auth/middleware/bearerAuth.js';
 import type { OAuthTokenVerifier } from '../../../../src/server/auth/provider.js';