Merge branch 'main' into ni/disable-tools

* main:
  chore: auto generate apiClient (#64)
  refactor: rename state to session, combine tool registration, and clearer dependencies (#55)
  chore: add type-powered eslint rules (#62)

Author: nirinchev

.prettierignore

@@ -2,3 +2,4 @@ dist
 coverage
 package-lock.json
 tests/tmp
+src/common/atlas/openapi.d.ts

.prettierrc.json

@@ -5,6 +5,13 @@
   "singleQuote": false,
   "printWidth": 120,
   "overrides": [
+    {
+      "files": "*.ts",
+      "options": {
+        "insertPragma": false,
+        "proseWrap": "preserve"
+      }
+    },
     {
       "files": "*.json",
       "options": {

eslint.config.js

@@ -4,10 +4,32 @@ import globals from "globals";
 import tseslint from "typescript-eslint";
 import eslintConfigPrettier from "eslint-config-prettier/flat";
 
+const files = ["src/**/*.ts", "scripts/**/*.ts", "tests/**/*.test.ts", "eslint.config.js", "jest.config.js"];
+
 export default defineConfig([
-    { files: ["src/**/*.ts"], plugins: { js }, extends: ["js/recommended"] },
-    { files: ["src/**/*.ts"], languageOptions: { globals: globals.node } },
-    tseslint.configs.recommended,
+    { files, plugins: { js }, extends: ["js/recommended"] },
+    { files, languageOptions: { globals: globals.node } },
+    tseslint.configs.recommendedTypeChecked,
+    {
+        languageOptions: {
+            parserOptions: {
+                projectService: true,
+                tsconfigRootDir: import.meta.dirname,
+            },
+        },
+    },
+    {
+        files,
+        rules: {
+            "@typescript-eslint/switch-exhaustiveness-check": "error",
+            "@typescript-eslint/no-non-null-assertion": "error",
+        },
+    },
+    // Ignore features specific to TypeScript resolved rules
+    tseslint.config({
+        // TODO: Configure tests and scripts to work with this.
+        ignores: ["eslint.config.js", "jest.config.js", "tests/**/*.ts", "scripts/**/*.ts"],
+    }),
+    globalIgnores(["node_modules", "dist", "src/common/atlas/openapi.d.ts"]),
     eslintConfigPrettier,
-    globalIgnores(["node_modules", "dist"]),
 ]);

package-lock.json

@@ -19,9 +19,8 @@
     "prepare": "npm run build",
     "build:clean": "rm -rf dist",
     "build:compile": "tsc",
-    "build:addshebang": "echo '#!/usr/bin/env node' > dist/index2.js && cat dist/index.js >> dist/index2.js && mv dist/index2.js dist/index.js",
     "build:chmod": "chmod +x dist/index.js",
-    "build": "npm run build:clean && npm run build:compile && npm run build:addshebang && npm run build:chmod",
+    "build": "npm run build:clean && npm run build:compile && npm run build:chmod",
     "inspect": "npm run build && mcp-inspector -- dist/index.js",
     "prettier": "prettier",
     "check": "npm run build && npm run check:lint && npm run check:format",
@@ -38,6 +37,7 @@
     "@modelcontextprotocol/inspector": "^0.8.2",
     "@modelcontextprotocol/sdk": "^1.8.0",
     "@redocly/cli": "^1.34.2",
+    "@types/express": "^5.0.1",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.14.0",
     "@types/simple-oauth2": "^5.0.7",
@@ -60,7 +60,6 @@
   "dependencies": {
     "@mongodb-js/devtools-connect": "^3.7.2",
     "@mongosh/service-provider-node-driver": "^3.6.0",
-    "@types/express": "^5.0.1",
     "bson": "^6.10.3",
     "mongodb": "^6.15.0",
     "mongodb-log-writer": "^2.4.1",

package.json

@@ -0,0 +1,92 @@
+import fs from "fs/promises";
+import { OpenAPIV3_1 } from "openapi-types";
+import argv from "yargs-parser";
+
+function findParamFromRef(ref: string, openapi: OpenAPIV3_1.Document): OpenAPIV3_1.ParameterObject {
+    const paramParts = ref.split("/");
+    paramParts.shift(); // Remove the first part which is always '#'
+    let param: any = openapi; // eslint-disable-line @typescript-eslint/no-explicit-any
+    while (true) {
+        const part = paramParts.shift();
+        if (!part) {
+            break;
+        }
+        param = param[part];
+    }
+    return param;
+}
+
+async function main() {
+    const { spec, file } = argv(process.argv.slice(2));
+
+    if (!spec || !file) {
+        console.error("Please provide both --spec and --file arguments.");
+        process.exit(1);
+    }
+
+    const specFile = (await fs.readFile(spec, "utf8")) as string;
+
+    const operations: {
+        path: string;
+        method: string;
+        operationId: string;
+        requiredParams: boolean;
+        tag: string;
+    }[] = [];
+
+    const openapi = JSON.parse(specFile) as OpenAPIV3_1.Document;
+    for (const path in openapi.paths) {
+        for (const method in openapi.paths[path]) {
+            const operation: OpenAPIV3_1.OperationObject = openapi.paths[path][method];
+
+            if (!operation.operationId || !operation.tags?.length) {
+                continue;
+            }
+
+            let requiredParams = !!operation.requestBody;
+
+            for (const param of operation.parameters || []) {
+                const ref = (param as OpenAPIV3_1.ReferenceObject).$ref as string | undefined;
+                let paramObject: OpenAPIV3_1.ParameterObject = param as OpenAPIV3_1.ParameterObject;
+                if (ref) {
+                    paramObject = findParamFromRef(ref, openapi);
+                }
+                if (paramObject.in === "path") {
+                    requiredParams = true;
+                }
+            }
+
+            operations.push({
+                path,
+                method: method.toUpperCase(),
+                operationId: operation.operationId || "",
+                requiredParams,
+                tag: operation.tags[0],
+            });
+        }
+    }
+
+    const operationOutput = operations
+        .map((operation) => {
+            const { operationId, method, path, requiredParams } = operation;
+            return `async ${operationId}(options${requiredParams ? "" : "?"}: FetchOptions<operations["${operationId}"]>) {
+    const { data } = await this.client.${method}("${path}", options);
+    return data;
+}
+`;
+        })
+        .join("\n");
+
+    const templateFile = (await fs.readFile(file, "utf8")) as string;
+    const output = templateFile.replace(
+        /\/\/ DO NOT EDIT\. This is auto-generated code\.\n.*\/\/ DO NOT EDIT\. This is auto-generated code\./g,
+        operationOutput
+    );
+
+    await fs.writeFile(file, output, "utf8");
+}
+
+main().catch((error) => {
+    console.error("Error:", error);
+    process.exit(1);
+});

scripts/apply.ts

@@ -6,5 +6,6 @@ curl -Lo ./scripts/spec.json https://github.com/mongodb/openapi/raw/refs/heads/m
 tsx ./scripts/filter.ts > ./scripts/filteredSpec.json < ./scripts/spec.json
 redocly bundle --ext json --remove-unused-components ./scripts/filteredSpec.json --output ./scripts/bundledSpec.json
 openapi-typescript ./scripts/bundledSpec.json --root-types-no-schema-prefix --root-types --output ./src/common/atlas/openapi.d.ts
-prettier --write ./src/common/atlas/openapi.d.ts
+tsx ./scripts/apply.ts --spec ./scripts/bundledSpec.json --file ./src/common/atlas/apiClient.ts
+prettier --write ./src/common/atlas/openapi.d.ts ./src/common/atlas/apiClient.ts
 rm -rf ./scripts/bundledSpec.json ./scripts/filteredSpec.json ./scripts/spec.json