Merge branch 'main' into fmenezes/autoGenerateApiClient

Author: fmenezes

.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

@@ -35,28 +35,29 @@ export class ApiClient {
         return this.accessToken?.token.access_token as string | undefined;
     };
 
-    private authMiddleware = (apiClient: ApiClient): Middleware => ({
-        async onRequest({ request, schemaPath }) {
+    private authMiddleware: Middleware = {
+        onRequest: async ({ request, schemaPath }) => {
             if (schemaPath.startsWith("/api/private/unauth") || schemaPath.startsWith("/api/oauth")) {
                 return undefined;
             }
 
             try {
-                const accessToken = await apiClient.getAccessToken();
+                const accessToken = await this.getAccessToken();
                 request.headers.set("Authorization", `Bearer ${accessToken}`);
                 return request;
             } catch {
                 // ignore not availble tokens, API will return 401
             }
         },
-    });
-    private errorMiddleware = (): Middleware => ({
+    };
+
+    private readonly errorMiddleware: Middleware = {
         async onResponse({ response }) {
             if (!response.ok) {
                 throw await ApiClientError.fromResponse(response);
             }
         },
-    });
+    };
 
     constructor(options?: ApiClientOptions) {
         this.options = {
@@ -85,12 +86,14 @@ export class ApiClient {
                     tokenPath: "/api/oauth/token",
                 },
             });
-            this.client.use(this.authMiddleware(this));
+            this.client.use(this.authMiddleware);
         }
-        this.client.use(this.errorMiddleware());
+        this.client.use(this.errorMiddleware);
     }
 
-    async getIpInfo() {
+    public async getIpInfo(): Promise<{
+        currentIpv4Address: string;
+    }> {
         const accessToken = await this.getAccessToken();
 
         const endpoint = "api/private/ipinfo";
@@ -108,10 +111,9 @@ export class ApiClient {
             throw await ApiClientError.fromResponse(response);
         }
 
-        const responseBody = await response.json();
-        return responseBody as {
+        return (await response.json()) as Promise<{
             currentIpv4Address: string;
-        };
+        }>;
     }
 
     // DO NOT EDIT. This is auto-generated code.

src/common/atlas/apiClient.ts

@@ -7,7 +7,10 @@ export class ApiClientError extends Error {
         this.response = response;
     }
 
-    static async fromResponse(response: Response, message: string = `error calling Atlas API`): Promise<ApiClientError> {
+    static async fromResponse(
+        response: Response,
+        message: string = `error calling Atlas API`
+    ): Promise<ApiClientError> {
         try {
             const text = await response.text();
             return new ApiClientError(`${message}: [${response.status} ${response.statusText}] ${text}`, response);