refactor: reorganize file structure and update documentation

- Reorganize project files for improved maintainability
- Add project structure documentation to README.md

Author: suekou

README.md

@@ -69,6 +69,7 @@ or
 - `--enabledTools`: Comma-separated list of tools to enable (e.g. "notion_retrieve_page,notion_query_database"). When specified, only the listed tools will be available. If not specified, all tools are enabled.
 
 Read-only tools example (copy-paste friendly):
+
 ```bash
 node build/index.js --enabledTools=notion_retrieve_block,notion_retrieve_block_children,notion_retrieve_page,notion_query_database,notion_retrieve_database,notion_search,notion_list_all_users,notion_retrieve_user,notion_retrieve_bot_user,notion_retrieve_comments
 ```
@@ -126,6 +127,48 @@ If you encounter permission errors:
 2. Verify that the integration is invited to the relevant pages or databases.
 3. Confirm the token and configuration are correctly set in `claude_desktop_config.json`.
 
+## Project Structure
+
+The project is organized in a modular way to improve maintainability and readability:
+
+```
+notion/
+├── src/
+│   ├── index.ts              # Entry point and command-line handling
+│   ├── client/
+│   │   └── index.ts          # NotionClientWrapper class for API interactions
+│   ├── server/
+│   │   └── index.ts          # MCP server setup and request handling
+│   ├── types/
+│   │   ├── index.ts          # Type exports
+│   │   ├── args.ts           # Tool argument interfaces
+│   │   ├── common.ts         # Common schema definitions
+│   │   ├── responses.ts      # API response type definitions
+│   │   └── schemas.ts        # Tool schema definitions
+│   ├── utils/
+│   │   └── index.ts          # Utility functions
+│   └── markdown/
+│       └── index.ts          # Markdown conversion utilities
+```
+
+### Directory Descriptions
+
+- **index.ts**: Application entry point. Parses command-line arguments and starts the server.
+- **client/**: Module responsible for communication with the Notion API.
+  - **index.ts**: NotionClientWrapper class implements all API calls.
+- **server/**: MCP server implementation.
+  - **index.ts**: Processes requests received from Claude and calls appropriate client methods.
+- **types/**: Type definition module.
+  - **index.ts**: Exports for all types.
+  - **args.ts**: Interface definitions for tool arguments.
+  - **common.ts**: Definitions for common schemas (ID formats, rich text, etc.).
+  - **responses.ts**: Type definitions for Notion API responses.
+  - **schemas.ts**: Definitions for MCP tool schemas.
+- **utils/**: Utility functions.
+  - **index.ts**: Functions like filtering enabled tools.
+- **markdown/**: Markdown conversion functionality.
+  - **index.ts**: Logic for converting JSON responses to Markdown format.
+
 ## Tools
 
 All tools support the following optional parameter:
@@ -284,4 +327,4 @@ All tools support the following optional parameter:
 
 ## License
 
-This MCP server is licensed under the MIT License. This means you are free to use, modify, and distribute the software, subject to the terms and conditions of the MIT License. For more details, please see the LICENSE file in the project repository.
+This MCP server is licensed under the MIT License. This means you are free to use, modify, and distribute the software, subject to the terms and conditions of the MIT License. For more details, please see the LICENSE file in the project repository.

notion/src/client.test.ts

@@ -1,27 +1,27 @@
 import { expect, test, describe, vi, beforeEach } from "vitest";
-import { NotionClientWrapper } from "./index.js";
+import { NotionClientWrapper } from "./client/index.js";
 import { PageResponse } from "./types/index.js";
-import { filterTools } from "./index.js";
+import { filterTools } from "./utils/index.js";
 
 vi.mock("./markdown/index.js", () => ({
   convertToMarkdown: vi.fn().mockReturnValue("# Test"),
 }));
 
 // Mock tool list
-const mockInputSchema = { type: "object" as const }
+const mockInputSchema = { type: "object" as const };
 const mockTools = [
-    {
-        name: "notion_retrieve_block",
-        inputSchema: mockInputSchema
-    },
-    {
-        name: "notion_retrieve_page",
-        inputSchema: mockInputSchema
-    },
-    {
-        name: "notion_query_database",
-        inputSchema: mockInputSchema
-    }
+  {
+    name: "notion_retrieve_block",
+    inputSchema: mockInputSchema,
+  },
+  {
+    name: "notion_retrieve_page",
+    inputSchema: mockInputSchema,
+  },
+  {
+    name: "notion_query_database",
+    inputSchema: mockInputSchema,
+  },
 ];
 global.fetch = vi.fn();
 
@@ -187,11 +187,14 @@ describe("NotionClientWrapper", () => {
     });
 
     test("should filter tools based on enabledTools", () => {
-      const enabledToolsSet = new Set(["notion_retrieve_block", "notion_query_database"]);
+      const enabledToolsSet = new Set([
+        "notion_retrieve_block",
+        "notion_query_database",
+      ]);
       const result = filterTools(mockTools, enabledToolsSet);
       expect(result).toEqual([
         { name: "notion_retrieve_block", inputSchema: mockInputSchema },
-        { name: "notion_query_database", inputSchema: mockInputSchema }
+        { name: "notion_query_database", inputSchema: mockInputSchema },
       ]);
     });