Skip to content

refactor: fix CI, use zod v4, and latest method in mcp #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fasttime merged 25 commits into from
Dec 3, 2025
Merged

refactor: fix CI, use zod v4, and latest method in mcp #332

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8f43508
refactor: fix CI failure and use `registerTool`
lumirlumir Nov 27, 2025
b0e2fbc
Merge branch 'main' into refactor-fix-ci-failure-and-replace-deprecat…
lumirlumir Nov 27, 2025
eb1c886
wip
lumirlumir Nov 27, 2025
d198ca4
wip
lumirlumir Nov 27, 2025
3c6378b
wip
lumirlumir Nov 27, 2025
5f8b964
wip
lumirlumir Nov 27, 2025
03eef9f
wip
lumirlumir Nov 27, 2025
71ad117
wip
lumirlumir Nov 27, 2025
1da37ef
wip
lumirlumir Nov 27, 2025
f2a7c1e
wip
lumirlumir Nov 27, 2025
7e76e37
wip
lumirlumir Nov 27, 2025
3b70778
wip
lumirlumir Nov 27, 2025
c4b5f1a
wip
lumirlumir Nov 27, 2025
ac5e857
wip
lumirlumir Nov 27, 2025
a79fb04
wip
lumirlumir Nov 27, 2025
a3d66e9
wip: try modelcontextprotocol branch
lumirlumir Nov 27, 2025
0258f86
wip: apply comments from `@modelcontextprotocol/sdk`
lumirlumir Nov 28, 2025
19fc40a
wip: use `v10_config_lookup_from_file`
lumirlumir Nov 28, 2025
3e5f69e
wip: add `$schema` in test
lumirlumir Nov 28, 2025
098ef13
wip: `prettier`
lumirlumir Nov 28, 2025
72b26b8
wip: revert using `v10` flag
lumirlumir Nov 28, 2025
e6082c9
wip: update `prettier` to latest
lumirlumir Nov 30, 2025
1fe759e
Merge branch 'main' into refactor-fix-ci-failure-and-replace-deprecat…
lumirlumir Dec 2, 2025
8ad6bc6
wip: update `@modelcontextprotocol/sdk` and install `@types/express`
lumirlumir Dec 3, 2025
fb2b0dd
wip: add `@types/express` to `ignoreDependenices` for `knip`
lumirlumir Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"knip": "^5.62.0",
"lint-staged": "^16.0.0",
"mocha": "^11.5.0",
"prettier": "^3.4.1",
"prettier": "^3.7.3",
"rollup": "^4.52.3",
"typescript": "^5.8.3",
"typescript-eslint": "^8.0.0",
Expand Down
5 changes: 3 additions & 2 deletions packages/core/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,8 +1030,9 @@ export interface BaseConfig<
/**
* The overwrites that apply more differing configuration to specific files or directories.
*/
export interface ConfigOverride<Rules extends RulesConfig = RulesConfig>
extends BaseConfig<Rules> {
export interface ConfigOverride<
Rules extends RulesConfig = RulesConfig,
> extends BaseConfig<Rules> {
/**
* The glob patterns for excluded files.
*/
Expand Down
19 changes: 8 additions & 11 deletions packages/core/tests/types/types.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,12 @@ interface TestLanguageOptions extends LanguageOptions {
howMuch?: "yes" | "no" | boolean;
}

class TestSourceCode
implements
TextSourceCode<{
LangOptions: TestLanguageOptions;
RootNode: TestRootNode;
SyntaxElementWithLoc: unknown;
ConfigNode: unknown;
}>
{
class TestSourceCode implements TextSourceCode<{
LangOptions: TestLanguageOptions;
RootNode: TestRootNode;
SyntaxElementWithLoc: unknown;
ConfigNode: unknown;
}> {
text: string;
ast: TestRootNode;
notMuch: "no" | false;
Expand Down Expand Up @@ -394,8 +391,8 @@ const testRuleWithInvalidDefaultOptions: RuleDefinition<{
testRuleWithInvalidDefaultOptions.meta satisfies RulesMeta | undefined;

type TestRuleDefinition<
Options extends
Partial<CustomRuleTypeDefinitions> = CustomRuleTypeDefinitions,
Options extends Partial<CustomRuleTypeDefinitions> =
CustomRuleTypeDefinitions,
> = CustomRuleDefinitionType<
{
LangOptions: TestLanguageOptions;
Expand Down
4 changes: 2 additions & 2 deletions packages/mcp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"node": "^20.19.0 || ^22.13.0 || >=24"
},
"dependencies": {
"@modelcontextprotocol/sdk": "^1.22.0",
"@modelcontextprotocol/sdk": "^1.23.0",

@fasttime fasttime Dec 2, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With @modelcontextprotocol/sdk 1.23.0, the build completes without issues. Anyway, with version 1.24.1 (latest at the time of writing), I'm getting a type error:

$ npm run build

> @eslint/mcp@0.2.0 build
> tsc

../../node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.d.ts:1:25 - error TS7016: Could not find a declaration file for module 'express'. '.../rewrite/node_modules/express/index.js' implicitly has an 'any' type.
  Try `npm i --save-dev @types/express` if it exists or add a new declaration (.d.ts) file containing `declare module 'express';`

1 import { Express } from 'express';
                          ~~~~~~~~~


Found 1 error in ../../node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.d.ts:1

The error can be fixed by installing @types/express as the message suggests.

@lumirlumir lumirlumir Dec 3, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated it in 8ad6bc6 👍

Also, I've added @types/express to the ignoreDependencies for knip in fb2b0dd, because knip reported an error indicating that the dependency was unused.

"eslint": "^9.39.1",
"zod": "^3.24.4"
"zod": "^4.1.13"
},
"devDependencies": {
"@cfworker/json-schema": "^4.1.1",
Expand Down
11 changes: 7 additions & 4 deletions packages/mcp/src/mcp-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//-----------------------------------------------------------------------------

import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
import { z } from "zod";
import { z } from "zod/v3";
import { ESLint } from "eslint";

//-----------------------------------------------------------------------------
Expand All @@ -29,10 +29,13 @@ const filePathsSchema = {
// Tools
//-----------------------------------------------------------------------------

mcpServer.tool(
mcpServer.registerTool(
"lint-files",
"Lint files using ESLint. You must provide a list of absolute file paths to the files you want to lint. The absolute file paths should be in the correct format for your operating system (e.g., forward slashes on Unix-like systems, backslashes on Windows).",
filePathsSchema,
{
description:
"Lint files using ESLint. You must provide a list of absolute file paths to the files you want to lint. The absolute file paths should be in the correct format for your operating system (e.g., forward slashes on Unix-like systems, backslashes on Windows).",
inputSchema: filePathsSchema,
},
async ({ filePaths }) => {
const eslint = new ESLint({
// enable lookup from file rather than from cwd
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp/tests/mcp-server.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ const passingFilePath = path.join(dirname, "fixtures", "passing.js");
const syntaxErrorFilePath = path.join(dirname, "fixtures", "syntax-error.js");

const filePathsJsonSchema = {
$schema: "http://json-schema.org/draft-07/schema#",
additionalProperties: false,
Comment on lines +26 to +27

@lumirlumir lumirlumir Nov 28, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I don't add these two lines, the tests fail, so I've added them.

However, I'm not sure whether this is considered a user-facing change.

@fasttime fasttime Dec 2, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine to re-add these lines. These were removed in commit 45842c0 to fix compatibility with version 1.22.0 of @modelcontextprotocol/sdk.

properties: {
filePaths: {
items: {
Expand Down
⚡