chore: enable eslint rule for consistent type import/export MCP-130

eslint.config.js

@@ -48,6 +48,13 @@ export default defineConfig([
         rules: {
             "@typescript-eslint/switch-exhaustiveness-check": "error",
             "@typescript-eslint/no-non-null-assertion": "error",
+            "@typescript-eslint/consistent-type-imports": ["error", { prefer: "type-imports" }],
+            "@typescript-eslint/consistent-type-exports": [
+                "error",
+                {
+                    fixMixedExportsWithInlineTypeSpecifier: false,
+                },
+            ],
             eqeqeq: "error",
             "no-self-compare": "error",
             "no-unassigned-vars": "error",

scripts/accuracy/generateTestSummary.ts

@@ -1,7 +1,7 @@
 import path from "path";
 import { readFile, writeFile, mkdir } from "fs/promises";
 import { getAccuracyResultStorage } from "../../tests/accuracy/sdk/accuracyResultStorage/getAccuracyResultStorage.js";
-import {
+import type {
     AccuracyResult,
     AccuracyRunStatuses,
     ExpectedToolCall,

scripts/apply.ts

@@ -1,5 +1,5 @@
 import fs from "fs/promises";
-import { OpenAPIV3_1 } from "openapi-types";
+import type { OpenAPIV3_1 } from "openapi-types";
 import argv from "yargs-parser";
 
 function findObjectFromRef<T>(obj: T | OpenAPIV3_1.ReferenceObject, openapi: OpenAPIV3_1.Document): T {

scripts/filter.ts

@@ -1,4 +1,4 @@
-import { OpenAPIV3_1 } from "openapi-types";
+import type { OpenAPIV3_1 } from "openapi-types";
 
 async function readStdin(): Promise<string> {
     return new Promise<string>((resolve, reject) => {

src/common/atlas/accessListUtils.ts

@@ -1,4 +1,4 @@
-import { ApiClient } from "./apiClient.js";
+import type { ApiClient } from "./apiClient.js";
 import { LogId } from "../logger.js";
 import { ApiClientError } from "./apiClientError.js";
 

src/common/atlas/apiClient.ts

@@ -1,10 +1,11 @@
-import createClient, { Client, Middleware } from "openapi-fetch";
-import type { ClientOptions, FetchOptions } from "openapi-fetch";
+import createClient from "openapi-fetch";
+import type { ClientOptions, FetchOptions, Client, Middleware } from "openapi-fetch";
 import { ApiClientError } from "./apiClientError.js";
-import { paths, operations } from "./openapi.js";
-import { CommonProperties, TelemetryEvent } from "../../telemetry/types.js";
+import type { paths, operations } from "./openapi.js";
+import type { CommonProperties, TelemetryEvent } from "../../telemetry/types.js";
 import { packageInfo } from "../packageInfo.js";
-import { LoggerBase, LogId } from "../logger.js";
+import type { LoggerBase } from "../logger.js";
+import { LogId } from "../logger.js";
 import { createFetch } from "@mongodb-js/devtools-proxy-support";
 import * as oauth from "oauth4webapi";
 import { Request as NodeFetchRequest } from "node-fetch";

src/common/atlas/apiClientError.ts

@@ -1,4 +1,4 @@
-import { ApiError } from "./openapi.js";
+import type { ApiError } from "./openapi.js";
 
 export class ApiClientError extends Error {
     private constructor(

src/common/atlas/cluster.ts

@@ -1,5 +1,5 @@
-import { ClusterDescription20240805, FlexClusterDescription20241113 } from "./openapi.js";
-import { ApiClient } from "./apiClient.js";
+import type { ClusterDescription20240805, FlexClusterDescription20241113 } from "./openapi.js";
+import type { ApiClient } from "./apiClient.js";
 import { LogId } from "../logger.js";
 
 export interface Cluster {

src/common/connectionManager.ts

@@ -1,15 +1,17 @@
-import { UserConfig, DriverOptions } from "./config.js";
+import type { UserConfig, DriverOptions } from "./config.js";
 import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import EventEmitter from "events";
 import { setAppNameParamIfMissing } from "../helpers/connectionOptions.js";
 import { packageInfo } from "./packageInfo.js";
 import ConnectionString from "mongodb-connection-string-url";
-import { MongoClientOptions } from "mongodb";
+import type { MongoClientOptions } from "mongodb";
 import { ErrorCodes, MongoDBError } from "./errors.js";
-import { DeviceId } from "../helpers/deviceId.js";
-import { AppNameComponents } from "../helpers/connectionOptions.js";
-import { CompositeLogger, LogId } from "./logger.js";
-import { ConnectionInfo, generateConnectionInfoFromCliArgs } from "@mongosh/arg-parser";
+import type { DeviceId } from "../helpers/deviceId.js";
+import type { AppNameComponents } from "../helpers/connectionOptions.js";
+import type { CompositeLogger } from "./logger.js";
+import { LogId } from "./logger.js";
+import type { ConnectionInfo } from "@mongosh/arg-parser";
+import { generateConnectionInfoFromCliArgs } from "@mongosh/arg-parser";
 
 export interface AtlasClusterConnectionInfo {
     username: string;

src/common/exportsManager.ts

@@ -3,14 +3,16 @@ import path from "path";
 import fs from "fs/promises";
 import EventEmitter from "events";
 import { createWriteStream } from "fs";
-import { AggregationCursor, FindCursor } from "mongodb";
-import { EJSON, EJSONOptions, ObjectId } from "bson";
+import type { AggregationCursor, FindCursor } from "mongodb";
+import type { EJSONOptions } from "bson";
+import { EJSON, ObjectId } from "bson";
 import { Transform } from "stream";
 import { pipeline } from "stream/promises";
-import { MongoLogId } from "mongodb-log-writer";
+import type { MongoLogId } from "mongodb-log-writer";
 
-import { UserConfig } from "./config.js";
-import { LoggerBase, LogId } from "./logger.js";
+import type { UserConfig } from "./config.js";
+import type { LoggerBase } from "./logger.js";
+import { LogId } from "./logger.js";
 
 export const jsonExportFormat = z.enum(["relaxed", "canonical"]);
 export type JSONExportFormat = z.infer<typeof jsonExportFormat>;

src/common/logger.ts

@@ -1,8 +1,9 @@
 import fs from "fs/promises";
-import { mongoLogId, MongoLogId, MongoLogManager, MongoLogWriter } from "mongodb-log-writer";
+import type { MongoLogId, MongoLogWriter } from "mongodb-log-writer";
+import { mongoLogId, MongoLogManager } from "mongodb-log-writer";
 import redact from "mongodb-redact";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { LoggingMessageNotification } from "@modelcontextprotocol/sdk/types.js";
+import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { LoggingMessageNotification } from "@modelcontextprotocol/sdk/types.js";
 import { EventEmitter } from "events";
 
 export type LogLevel = LoggingMessageNotification["params"]["level"];

src/common/session.ts

@@ -1,17 +1,19 @@
 import { ObjectId } from "bson";
-import { ApiClient, ApiClientCredentials } from "./atlas/apiClient.js";
-import { Implementation } from "@modelcontextprotocol/sdk/types.js";
-import { CompositeLogger, LogId } from "./logger.js";
+import type { ApiClientCredentials } from "./atlas/apiClient.js";
+import { ApiClient } from "./atlas/apiClient.js";
+import type { Implementation } from "@modelcontextprotocol/sdk/types.js";
+import type { CompositeLogger } from "./logger.js";
+import { LogId } from "./logger.js";
 import EventEmitter from "events";
-import {
+import type {
     AtlasClusterConnectionInfo,
     ConnectionManager,
     ConnectionSettings,
     ConnectionStateConnected,
 } from "./connectionManager.js";
-import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
+import type { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { ErrorCodes, MongoDBError } from "./errors.js";
-import { ExportsManager } from "./exportsManager.js";
+import type { ExportsManager } from "./exportsManager.js";
 
 export interface SessionOptions {
     apiBaseUrl: string;

src/common/sessionStore.ts

@@ -1,6 +1,8 @@
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import { LogId, LoggerBase } from "./logger.js";
-import { ManagedTimeout, setManagedTimeout } from "./managedTimeout.js";
+import type { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import type { LoggerBase } from "./logger.js";
+import { LogId } from "./logger.js";
+import type { ManagedTimeout } from "./managedTimeout.js";
+import { setManagedTimeout } from "./managedTimeout.js";
 
 export class SessionStore {
     private sessions: {

src/helpers/connectionOptions.ts

@@ -1,4 +1,4 @@
-import { MongoClientOptions } from "mongodb";
+import type { MongoClientOptions } from "mongodb";
 import ConnectionString from "mongodb-connection-string-url";
 
 export interface AppNameComponents {

src/helpers/deviceId.ts

@@ -1,6 +1,7 @@
 import { getDeviceId } from "@mongodb-js/device-id";
 import nodeMachineId from "node-machine-id";
-import { LogId, LoggerBase } from "../common/logger.js";
+import type { LoggerBase } from "../common/logger.js";
+import { LogId } from "../common/logger.js";
 
 export const DEVICE_ID_TIMEOUT = 3000;
 

src/helpers/indexCheck.ts

@@ -1,5 +1,5 @@
-import { Document } from "mongodb";
-import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
+import type { Document } from "mongodb";
+import type { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { ErrorCodes, MongoDBError } from "../common/errors.js";
 
 /**

src/resources/common/debug.ts

@@ -1,6 +1,6 @@
 import { ReactiveResource } from "../resource.js";
 import type { Telemetry } from "../../telemetry/telemetry.js";
-import { Session, UserConfig } from "../../lib.js";
+import type { Session, UserConfig } from "../../lib.js";
 
 type ConnectionStateDebuggingInformation = {
     readonly tag: "connected" | "connecting" | "disconnected" | "errored";

src/resources/common/exportedData.ts

@@ -1,12 +1,12 @@
-import {
+import type {
     CompleteResourceTemplateCallback,
     ListResourcesCallback,
     ReadResourceTemplateCallback,
-    ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { Server } from "../../server.js";
+import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { Server } from "../../server.js";
 import { LogId } from "../../common/logger.js";
-import { Session } from "../../common/session.js";
+import type { Session } from "../../common/session.js";
 
 export class ExportedData {
     private readonly name = "exported-data";

src/resources/resource.ts

@@ -1,9 +1,9 @@
-import { Server } from "../server.js";
-import { Session } from "../common/session.js";
-import { UserConfig } from "../common/config.js";
-import { Telemetry } from "../telemetry/telemetry.js";
+import type { Server } from "../server.js";
+import type { Session } from "../common/session.js";
+import type { UserConfig } from "../common/config.js";
+import type { Telemetry } from "../telemetry/telemetry.js";
 import type { SessionEvents } from "../common/session.js";
-import { ReadResourceCallback, ResourceMetadata } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { ReadResourceCallback, ResourceMetadata } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { LogId } from "../common/logger.js";
 
 type PayloadOf<K extends keyof SessionEvents> = SessionEvents[K][0];

src/server.ts

@@ -1,22 +1,22 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { Session } from "./common/session.js";
-import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { Session } from "./common/session.js";
+import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import { AtlasTools } from "./tools/atlas/tools.js";
 import { MongoDbTools } from "./tools/mongodb/tools.js";
 import { Resources } from "./resources/resources.js";
 import { LogId } from "./common/logger.js";
-import { Telemetry } from "./telemetry/telemetry.js";
-import { UserConfig } from "./common/config.js";
+import type { Telemetry } from "./telemetry/telemetry.js";
+import type { UserConfig } from "./common/config.js";
 import { type ServerEvent } from "./telemetry/types.js";
 import { type ServerCommand } from "./telemetry/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import {
     CallToolRequestSchema,
-    CallToolResult,
     SubscribeRequestSchema,
     UnsubscribeRequestSchema,
 } from "@modelcontextprotocol/sdk/types.js";
 import assert from "assert";
-import { ToolBase } from "./tools/tool.js";
+import type { ToolBase } from "./tools/tool.js";
 import { validateConnectionString } from "./helpers/connectionOptions.js";
 
 export interface ServerOptions {

src/telemetry/eventCache.ts

@@ -1,5 +1,5 @@
 import { LRUCache } from "lru-cache";
-import { BaseEvent } from "./types.js";
+import type { BaseEvent } from "./types.js";
 
 /**
  * Singleton class for in-memory telemetry event caching

src/telemetry/telemetry.ts

@@ -1,12 +1,12 @@
-import { Session } from "../common/session.js";
-import { BaseEvent, CommonProperties } from "./types.js";
-import { UserConfig } from "../common/config.js";
+import type { Session } from "../common/session.js";
+import type { BaseEvent, CommonProperties } from "./types.js";
+import type { UserConfig } from "../common/config.js";
 import { LogId } from "../common/logger.js";
-import { ApiClient } from "../common/atlas/apiClient.js";
+import type { ApiClient } from "../common/atlas/apiClient.js";
 import { MACHINE_METADATA } from "./constants.js";
 import { EventCache } from "./eventCache.js";
 import { detectContainerEnv } from "../helpers/container.js";
-import { DeviceId } from "../helpers/deviceId.js";
+import type { DeviceId } from "../helpers/deviceId.js";
 
 type EventResult = {
     success: boolean;

src/tools/atlas/atlasTool.ts

@@ -1,6 +1,7 @@
-import { ToolBase, ToolCategory, TelemetryToolMetadata, ToolArgs } from "../tool.js";
-import { ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { ToolCategory, TelemetryToolMetadata, ToolArgs } from "../tool.js";
+import { ToolBase } from "../tool.js";
+import type { ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { LogId } from "../../common/logger.js";
 import { z } from "zod";
 import { ApiClientError } from "../../common/atlas/apiClientError.js";

src/tools/atlas/connect/connectCluster.ts

@@ -1,12 +1,12 @@
 import { z } from "zod";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
-import { ToolArgs, OperationType } from "../../tool.js";
+import type { ToolArgs, OperationType } from "../../tool.js";
 import { generateSecurePassword } from "../../../helpers/generatePassword.js";
 import { LogId } from "../../../common/logger.js";
 import { inspectCluster } from "../../../common/atlas/cluster.js";
 import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
-import { AtlasClusterConnectionInfo } from "../../../common/connectionManager.js";
+import type { AtlasClusterConnectionInfo } from "../../../common/connectionManager.js";
 
 const EXPIRY_MS = 1000 * 60 * 60 * 12; // 12 hours
 

src/tools/atlas/create/createAccessList.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
-import { ToolArgs, OperationType } from "../../tool.js";
+import type { ToolArgs, OperationType } from "../../tool.js";
 import { makeCurrentIpAccessListEntry, DEFAULT_ACCESS_LIST_COMMENT } from "../../../common/atlas/accessListUtils.js";
 
 export class CreateAccessListTool extends AtlasToolBase {

src/tools/atlas/create/createDBUser.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
-import { ToolArgs, OperationType } from "../../tool.js";
-import { CloudDatabaseUser, DatabaseUserRole } from "../../../common/atlas/openapi.js";
+import type { ToolArgs, OperationType } from "../../tool.js";
+import type { CloudDatabaseUser, DatabaseUserRole } from "../../../common/atlas/openapi.js";
 import { generateSecurePassword } from "../../../helpers/generatePassword.js";
 import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
 

src/tools/atlas/create/createFreeCluster.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
-import { ToolArgs, OperationType } from "../../tool.js";
-import { ClusterDescription20240805 } from "../../../common/atlas/openapi.js";
+import type { ToolArgs, OperationType } from "../../tool.js";
+import type { ClusterDescription20240805 } from "../../../common/atlas/openapi.js";
 import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
 
 export class CreateFreeClusterTool extends AtlasToolBase {

src/tools/atlas/create/createProject.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
-import { ToolArgs, OperationType } from "../../tool.js";
-import { Group } from "../../../common/atlas/openapi.js";
+import type { ToolArgs, OperationType } from "../../tool.js";
+import type { Group } from "../../../common/atlas/openapi.js";
 
 export class CreateProjectTool extends AtlasToolBase {
     public name = "atlas-create-project";

src/tools/atlas/read/inspectAccessList.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
-import { ToolArgs, OperationType } from "../../tool.js";
+import type { ToolArgs, OperationType } from "../../tool.js";
 
 export class InspectAccessListTool extends AtlasToolBase {
     public name = "atlas-inspect-access-list";

src/tools/atlas/read/inspectCluster.ts

@@ -1,8 +1,9 @@
 import { z } from "zod";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
-import { ToolArgs, OperationType } from "../../tool.js";
-import { Cluster, inspectCluster } from "../../../common/atlas/cluster.js";
+import type { ToolArgs, OperationType } from "../../tool.js";
+import type { Cluster } from "../../../common/atlas/cluster.js";
+import { inspectCluster } from "../../../common/atlas/cluster.js";
 
 export class InspectClusterTool extends AtlasToolBase {
     public name = "atlas-inspect-cluster";

src/tools/atlas/read/listAlerts.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { AtlasToolBase } from "../atlasTool.js";
-import { ToolArgs, OperationType } from "../../tool.js";
+import type { ToolArgs, OperationType } from "../../tool.js";
 
 export class ListAlertsTool extends AtlasToolBase {
     public name = "atlas-list-alerts";