Skip to content

Commit efb8e62

Browse files
chore(internal): improve layout of generated MCP server files
1 parent e307e2e commit efb8e62

File tree

8 files changed

+35
-31
lines changed

8 files changed

+35
-31
lines changed

packages/mcp-server/src/code-tool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { McpTool, Metadata, ToolCallResult, asErrorResult, asTextContentResult } from './types';
44
import { Tool } from '@modelcontextprotocol/sdk/types.js';
5-
import { readEnv } from './server';
5+
import { readEnv } from './util';
66
import { WorkerInput, WorkerOutput } from './code-tool-types';
77
import { SdkMethod } from './methods';
88
import { Finch } from '@tryfinch/finch-api';

packages/mcp-server/src/docs-search-tool.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
22

33
import { Metadata, asTextContentResult } from './types';
4-
import { readEnv } from './server';
4+
import { readEnv } from './util';
55

66
import { Tool } from '@modelcontextprotocol/sdk/types.js';
77

packages/mcp-server/src/http.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp';
44
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
5+
import { ClientOptions } from '@tryfinch/finch-api';
56
import express from 'express';
67
import morgan from 'morgan';
78
import morganBody from 'morgan-body';
9+
import { parseAuthHeaders } from './auth';
810
import { McpOptions } from './options';
9-
import { ClientOptions, initMcpServer, newMcpServer } from './server';
10-
import { parseAuthHeaders } from './headers';
11+
import { initMcpServer, newMcpServer } from './server';
1112

1213
const newServer = async ({
1314
clientOptions,

packages/mcp-server/src/methods.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
2+
13
import { McpOptions } from './options';
24

35
export type SdkMethod = {

packages/mcp-server/src/options.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
2+
13
import qs from 'qs';
24
import yargs from 'yargs';
35
import { hideBin } from 'yargs/helpers';

packages/mcp-server/src/server.ts

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import docsSearchTool from './docs-search-tool';
1414
import { McpOptions } from './options';
1515
import { blockedMethodsForCodeTool } from './methods';
1616
import { HandlerFunction, McpTool } from './types';
17-
18-
export { McpOptions } from './options';
19-
export { ClientOptions } from '@tryfinch/finch-api';
17+
import { readEnv } from './util';
2018

2119
async function getInstructions() {
2220
// This API key is optional; providing it allows the server to fetch instructions for unreleased versions.
@@ -170,27 +168,3 @@ export async function executeHandler(
170168
) {
171169
return await handler(client, args || {});
172170
}
173-
174-
export const readEnv = (env: string): string | undefined => {
175-
if (typeof (globalThis as any).process !== 'undefined') {
176-
return (globalThis as any).process.env?.[env]?.trim();
177-
} else if (typeof (globalThis as any).Deno !== 'undefined') {
178-
return (globalThis as any).Deno.env?.get?.(env)?.trim();
179-
}
180-
return;
181-
};
182-
183-
export const readEnvOrError = (env: string): string => {
184-
let envValue = readEnv(env);
185-
if (envValue === undefined) {
186-
throw new Error(`Environment variable ${env} is not set`);
187-
}
188-
return envValue;
189-
};
190-
191-
export const requireValue = <T>(value: T | undefined, description: string): T => {
192-
if (value === undefined) {
193-
throw new Error(`Missing required value: ${description}`);
194-
}
195-
return value;
196-
};

packages/mcp-server/src/util.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
2+
3+
export const readEnv = (env: string): string | undefined => {
4+
if (typeof (globalThis as any).process !== 'undefined') {
5+
return (globalThis as any).process.env?.[env]?.trim();
6+
} else if (typeof (globalThis as any).Deno !== 'undefined') {
7+
return (globalThis as any).Deno.env?.get?.(env)?.trim();
8+
}
9+
return;
10+
};
11+
12+
export const readEnvOrError = (env: string): string => {
13+
let envValue = readEnv(env);
14+
if (envValue === undefined) {
15+
throw new Error(`Environment variable ${env} is not set`);
16+
}
17+
return envValue;
18+
};
19+
20+
export const requireValue = <T>(value: T | undefined, description: string): T => {
21+
if (value === undefined) {
22+
throw new Error(`Missing required value: ${description}`);
23+
}
24+
return value;
25+
};

0 commit comments

Comments
 (0)