Skip to content

Commit 6ef0971

Browse files
committed
fixes
1 parent 13a6345 commit 6ef0971

4 files changed

Lines changed: 25 additions & 4 deletions

File tree

packages/client/src/validators/cfWorker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
* import { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/client/validators/cf-worker';
77
* ```
88
*/
9-
export type { CfWorkerSchemaDraft } from '@modelcontextprotocol/core';
109
export { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/core';
10+
export type { CfWorkerSchemaDraft } from '@modelcontextprotocol/core';

packages/codemod/src/migrations/v1-to-v2/transforms/mockPaths.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,13 @@ function rewriteDynamicImports(
307307
}
308308
}
309309
}
310-
if (!Node.isObjectBindingPattern(nameNode) && Object.keys(allRenames).length > 0) {
310+
const moduleRenames = resolved.renamedSymbols ?? {};
311+
if (!Node.isObjectBindingPattern(nameNode) && Object.keys(moduleRenames).length > 0) {
311312
diagnostics.push(
312313
warning(
313314
sourceFile.getFilePath(),
314315
node.getStartLineNumber(),
315-
`Dynamic import assigned to variable (not destructured). Symbol renames (${Object.keys(allRenames).join(', ')}) were not applied. Manual update may be needed.`
316+
`Dynamic import assigned to variable (not destructured). Symbol renames (${Object.keys(moduleRenames).join(', ')}) were not applied. Manual update may be needed.`
316317
)
317318
);
318319
}

packages/codemod/test/v1-to-v2/transforms/mockPaths.test.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,26 @@ describe('mock-paths transform', () => {
260260
expect(result.diagnostics[0]!.message).toContain('mixes symbols that belong to different v2 packages');
261261
});
262262

263+
it('does not emit warning for non-destructured dynamic import of module without renamedSymbols', () => {
264+
const input = [`const mod = await import('@modelcontextprotocol/sdk/server/mcp.js');`, ''].join('\n');
265+
const project = new Project({ useInMemoryFileSystem: true });
266+
const sourceFile = project.createSourceFile('test.ts', input);
267+
const result = mockPathsTransform.apply(sourceFile, ctx);
268+
const renameWarnings = result.diagnostics.filter(d => d.message.includes('Symbol renames'));
269+
expect(renameWarnings).toHaveLength(0);
270+
});
271+
272+
it('emits warning for non-destructured dynamic import of module with renamedSymbols', () => {
273+
const input = [`const mod = await import('@modelcontextprotocol/sdk/server/streamableHttp.js');`, ''].join('\n');
274+
const project = new Project({ useInMemoryFileSystem: true });
275+
const sourceFile = project.createSourceFile('test.ts', input);
276+
const result = mockPathsTransform.apply(sourceFile, ctx);
277+
const renameWarnings = result.diagnostics.filter(d => d.message.includes('Symbol renames'));
278+
expect(renameWarnings).toHaveLength(1);
279+
expect(renameWarnings[0]!.message).toContain('StreamableHTTPServerTransport');
280+
expect(renameWarnings[0]!.message).not.toContain('McpError');
281+
});
282+
263283
it('renames SIMPLE_RENAMES symbols in aliased dynamic import destructuring', () => {
264284
const input = [
265285
`const { McpError: MyError } = await import('@modelcontextprotocol/sdk/types.js');`,

packages/server/src/validators/cfWorker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
* import { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/server/validators/cf-worker';
77
* ```
88
*/
9-
export type { CfWorkerSchemaDraft } from '@modelcontextprotocol/core';
109
export { CfWorkerJsonSchemaValidator } from '@modelcontextprotocol/core';
10+
export type { CfWorkerSchemaDraft } from '@modelcontextprotocol/core';

0 commit comments

Comments
 (0)