Merge pull request #24 from speakeasy-api/speakeasy-sdk-regen-1741642416

simplesagar · web-flow · commit 161d384af8f7 · 2025-03-10T14:35:49.000-07:00
chore: 🐝 Update SDK - Generate 2.4.0-beta
diff --git a/.speakeasy/gen.lock b/.speakeasy/gen.lock
@@ -3,17 +3,17 @@ id: 521af75f-d011-41f9-a5ff-9f8033773118
 management:
   docChecksum: 80bdf0b395520d76da9a1e1e2896dae0
   docVersion: 0.4.0
-  speakeasyVersion: 1.504.0
-  generationVersion: 2.529.0
-  releaseVersion: 2.4.0
-  configChecksum: cf2dd71ca7f41b785896af8960a03d06
+  speakeasyVersion: 1.514.0
+  generationVersion: 2.546.0
+  releaseVersion: 2.4.0-beta
+  configChecksum: ef5d56dcfd4f4ba9e07e1a535f410421
   repoURL: https://github.com/speakeasy-api/speakeasy-code-samples-ts.git
   installationURL: https://github.com/speakeasy-api/speakeasy-code-samples-ts
   published: true
 features:
   typescript:
     additionalDependencies: 0.1.0
-    core: 3.21.1
+    core: 3.21.3
     deepObjectParams: 0.1.0
     defaultEnabledRetries: 0.1.0
     devContainers: 2.90.0
@@ -25,7 +25,7 @@ features:
     globalServerURLs: 2.82.4
     globals: 2.82.2
     groups: 2.81.2
-    mcpServer: 0.3.0
+    mcpServer: 0.6.0
     nameOverrides: 2.81.2
     reactQueryHooks: 0.2.2
     responseFormat: 0.2.3
@@ -82,6 +82,7 @@ generatedFiles:
   - src/mcp-server/cli/start/command.ts
   - src/mcp-server/cli/start/impl.ts
   - src/mcp-server/console-logger.ts
+  - src/mcp-server/extensions.ts
   - src/mcp-server/mcp-server.ts
   - src/mcp-server/resources.ts
   - src/mcp-server/scopes.ts
diff --git a/.speakeasy/gen.yaml b/.speakeasy/gen.yaml
@@ -45,6 +45,7 @@ typescript:
       shared: models/components
       webhooks: models/webhooks
   inputModelSuffix: input
+  jsonpath: legacy
   maxMethodParams: 1
   methodArguments: require-security-and-request
   moduleFormat: esm
diff --git a/.speakeasy/workflow.lock b/.speakeasy/workflow.lock
@@ -1,21 +1,21 @@
-speakeasyVersion: 1.504.0
+speakeasyVersion: 1.514.0
 sources:
     speakeasy-OAS:
         sourceNamespace: speakeasy-oas
-        sourceRevisionDigest: sha256:6180bad971055a1a572b46b6a517e12856af53066c19042d87a409f6859d4485
+        sourceRevisionDigest: sha256:c95b7bde7a889f8d6461e405347f2dac28defaaf6a36cc19709b4ce29f4eaefb
         sourceBlobDigest: sha256:706c912b2e5755fdaff8d2a95ca3ce6fb1fff777a7aa49a8afcb0b909cc22892
         tags:
             - latest
-            - speakeasy-sdk-regen-1740516603
+            - speakeasy-sdk-regen-1741642416
             - 0.4.0
 targets:
     code_samples_typescript_sdk:
         source: speakeasy-OAS
         sourceNamespace: speakeasy-oas
-        sourceRevisionDigest: sha256:6180bad971055a1a572b46b6a517e12856af53066c19042d87a409f6859d4485
+        sourceRevisionDigest: sha256:c95b7bde7a889f8d6461e405347f2dac28defaaf6a36cc19709b4ce29f4eaefb
         sourceBlobDigest: sha256:706c912b2e5755fdaff8d2a95ca3ce6fb1fff777a7aa49a8afcb0b909cc22892
         codeSamplesNamespace: speakeasy-oas-typescript-code-samples
-        codeSamplesRevisionDigest: sha256:9c31b17bb4388ab6732bc9336387d791a59abf73c92d316e32b6cf543d575b40
+        codeSamplesRevisionDigest: sha256:73a780b60ccc00d5344b505208070173d62dfcb9013e97f8f123e322230d6afe
 workflow:
     workflowVersion: 1.0.0
     speakeasyVersion: latest
diff --git a/RELEASES.md b/RELEASES.md
@@ -122,4 +122,14 @@ Based on:
 ### Generated
 - [typescript v2.4.0] .
 ### Releases
-- [NPM v2.4.0] https://www.npmjs.com/package/@speakeasyapi/code-samples/v/2.4.0 - .
+- [NPM v2.4.0] https://www.npmjs.com/package/@speakeasyapi/code-samples/v/2.4.0 - .
+
+## 2025-03-10 21:33:21
+### Changes
+Based on:
+- OpenAPI Doc  
+- Speakeasy CLI 1.514.0 (2.546.0) https://github.com/speakeasy-api/speakeasy
+### Generated
+- [typescript v2.4.0-beta] .
+### Releases
+- [NPM v2.4.0-beta] https://www.npmjs.com/package/@speakeasyapi/code-samples/v/2.4.0-beta - .
diff --git a/jsr.json b/jsr.json
@@ -2,7 +2,7 @@
 
 {
   "name": "@speakeasyapi/code-samples",
-  "version": "2.4.0",
+  "version": "2.4.0-beta",
   "exports": {
     ".": "./src/index.ts",    
     "./models/errors": "./src/models/errors/index.ts",    
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@speakeasyapi/code-samples",
-  "version": "2.4.0",
+  "version": "2.4.0-beta",
   "author": "Speakeasy",
   "type": "module",
   "bin": {
diff --git a/src/lib/config.ts b/src/lib/config.ts
@@ -57,8 +57,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "0.4.0",
-  sdkVersion: "2.4.0",
-  genVersion: "2.529.0",
+  sdkVersion: "2.4.0-beta",
+  genVersion: "2.546.0",
   userAgent:
-    "speakeasy-sdk/typescript 2.4.0 2.529.0 0.4.0 @speakeasyapi/code-samples",
+    "speakeasy-sdk/typescript 2.4.0-beta 2.546.0 0.4.0 @speakeasyapi/code-samples",
 } as const;
diff --git a/src/mcp-server/cli/start/command.ts b/src/mcp-server/cli/start/command.ts
@@ -28,6 +28,15 @@ export const startCommand = buildCommand({
         parse: (val: string) =>
           z.coerce.number().int().gte(0).lt(65536).parse(val),
       },
+      tool: {
+        kind: "parsed",
+        brief: "Specify tools to mount on the server",
+        optional: true,
+        variadic: true,
+        parse: (value) => {
+          return z.string().parse(value);
+        },
+      },
       ...(mcpScopes.length
         ? {
           scope: {
diff --git a/src/mcp-server/cli/start/impl.ts b/src/mcp-server/cli/start/impl.ts
@@ -17,6 +17,7 @@ import { createMCPServer } from "../../server.js";
 interface StartCommandFlags {
   readonly transport: "stdio" | "sse";
   readonly port: number;
+  readonly tool?: string[];
   readonly scope?: MCPScope[];
   readonly "api-key"?: string | undefined;
   readonly "registry-url"?: SDKOptions["registryUrl"] | undefined;
@@ -48,6 +49,7 @@ async function startStdio(flags: StartCommandFlags) {
   const transport = new StdioServerTransport();
   const server = createMCPServer({
     logger,
+    allowedTools: flags.tool,
     scopes: flags.scope,
     ...{ apiKey: flags["api-key"] },
     registryUrl: flags["registry-url"],
@@ -69,6 +71,7 @@ async function startSSE(flags: StartCommandFlags) {
   const app = express();
   const mcpServer = createMCPServer({
     logger,
+    allowedTools: flags.tool,
     scopes: flags.scope,
     ...{ apiKey: flags["api-key"] },
     registryUrl: flags["registry-url"],
diff --git a/src/mcp-server/extensions.ts b/src/mcp-server/extensions.ts
@@ -0,0 +1,13 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { ZodRawShape } from "zod";
+import { ResourceDefinition, ResourceTemplateDefinition } from "./resources.js";
+import { ToolDefinition } from "./tools.js";
+
+export type Register = {
+  tool: <A extends ZodRawShape | undefined>(def: ToolDefinition<A>) => void;
+  resource: (def: ResourceDefinition) => void;
+  resourceTemplate: (def: ResourceTemplateDefinition) => void;
+};
diff --git a/src/mcp-server/mcp-server.ts b/src/mcp-server/mcp-server.ts
@@ -19,7 +19,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "2.4.0",
+    currentVersion: "2.4.0-beta",
   },
 });
 
diff --git a/src/mcp-server/resources.ts b/src/mcp-server/resources.ts
@@ -2,12 +2,16 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
+import {
+  McpServer,
+  ResourceMetadata,
+  ResourceTemplate,
+} from "@modelcontextprotocol/sdk/server/mcp.js";
 import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import { Variables } from "@modelcontextprotocol/sdk/shared/uriTemplate.js";
 import { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
 import { SpeakeasyCodeSamplesCore } from "../core.js";
-import { Result } from "../types/fp.js";
+import { ConsoleLogger } from "./console-logger.js";
 import { MCPScope } from "./scopes.js";
 import { isAsyncIterable, isBinaryData, valueToBase64 } from "./shared.js";
 
@@ -19,7 +23,8 @@ export type ReadResourceCallback = (
 
 export type ResourceDefinition = {
   name: string;
-  description: string;
+  description?: string;
+  metadata?: ResourceMetadata;
   scopes?: MCPScope[];
   resource: string;
   read: ReadResourceCallback;
@@ -35,30 +40,27 @@ export type ReadResourceTemplateCallback = (
 export type ResourceTemplateDefinition = {
   name: string;
   description: string;
+  metadata?: ResourceMetadata;
   scopes?: MCPScope[];
   resource: ResourceTemplate;
   read: ReadResourceTemplateCallback;
 };
 
 export async function formatResult(
-  result: Result<unknown, Error>,
+  value: unknown,
   uri: URL,
-  init: { response?: Response | undefined },
+  init: { mimeType?: string | undefined; response?: Response | undefined },
 ): Promise<ReadResourceResult> {
-  if (!result.ok) {
-    throw result.error;
-  }
-
-  const { value } = result;
   if (typeof value === "undefined") {
     return { contents: [] };
   }
 
-  const { response } = init;
-  const mimeType = response?.headers.get("content-type") ?? "";
   let contents: ReadResourceResult["contents"] = [];
 
-  if (mimeType.search(/\bjson\b/g)) {
+  const mimeType = init.mimeType ?? init.response?.headers.get("content-type")
+    ?? "";
+
+  if (mimeType.search(/\bjson\b/g) !== -1) {
     contents = [{ uri: uri.toString(), mimeType, text: JSON.stringify(value) }];
   } else if (
     mimeType.startsWith("text/event-stream")
@@ -71,7 +73,10 @@ export async function formatResult(
         text: await stringifySSEToJSON(value),
       },
     ];
-  } else if (mimeType.startsWith("text/") && typeof value === "string") {
+  } else if (
+    (mimeType.startsWith("text/") || mimeType.startsWith("application/"))
+    && typeof value === "string"
+  ) {
     contents = [{ uri: uri.toString(), mimeType, text: value }];
   } else if (isBinaryData(value)) {
     const blob = await valueToBase64(value);
@@ -94,3 +99,59 @@ async function stringifySSEToJSON(
 
   return JSON.stringify(payloads);
 }
+
+export function createRegisterResource(
+  logger: ConsoleLogger,
+  server: McpServer,
+  sdk: SpeakeasyCodeSamplesCore,
+  allowedScopes: Set<MCPScope>,
+): (resource: ResourceDefinition) => void {
+  return (resource: ResourceDefinition): void => {
+    const scopes = resource.scopes ?? [];
+    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+      return;
+    }
+
+    const metadata: ResourceMetadata = {
+      ...resource.metadata,
+      description: resource.description,
+    };
+
+    server.resource(
+      resource.name,
+      resource.resource,
+      metadata,
+      async (uri, ctx) => resource.read(sdk, uri, ctx),
+    );
+
+    logger.debug("Registered resource", { name: resource.name });
+  };
+}
+
+export function createRegisterResourceTemplate(
+  logger: ConsoleLogger,
+  server: McpServer,
+  sdk: SpeakeasyCodeSamplesCore,
+  allowedScopes: Set<MCPScope>,
+): (resource: ResourceTemplateDefinition) => void {
+  return (resource: ResourceTemplateDefinition): void => {
+    const scopes = resource.scopes ?? [];
+    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+      return;
+    }
+
+    const metadata: ResourceMetadata = {
+      ...resource.metadata,
+      description: resource.description,
+    };
+
+    server.resource(
+      resource.name,
+      resource.resource,
+      metadata,
+      async (uri, vars, ctx) => resource.read(sdk, uri, vars, ctx),
+    );
+
+    logger.debug("Registered resource template", { name: resource.name });
+  };
+}
diff --git a/src/mcp-server/server.ts b/src/mcp-server/server.ts
@@ -6,12 +6,17 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { SpeakeasyCodeSamplesCore } from "../core.js";
 import { SDKOptions } from "../lib/config.js";
 import type { ConsoleLogger } from "./console-logger.js";
+import {
+  createRegisterResource,
+  createRegisterResourceTemplate,
+} from "./resources.js";
 import { MCPScope, mcpScopes } from "./scopes.js";
 import { createRegisterTool } from "./tools.js";
 import { tool$codeSamplesGet } from "./tools/codeSamplesGet.js";
 
 export function createMCPServer(deps: {
   logger: ConsoleLogger;
+  allowedTools?: string[] | undefined;
   scopes?: MCPScope[] | undefined;
   serverURL?: string | undefined;
   apiKey?: SDKOptions["apiKey"] | undefined;
@@ -20,7 +25,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "SpeakeasyCodeSamples",
-    version: "2.4.0",
+    version: "2.4.0-beta",
   });
 
   const client = new SpeakeasyCodeSamplesCore({
@@ -29,8 +34,26 @@ export function createMCPServer(deps: {
     serverURL: deps.serverURL,
     server: deps.server,
   });
+
   const scopes = new Set(deps.scopes ?? mcpScopes);
-  const tool = createRegisterTool(deps.logger, server, client, scopes);
+
+  const allowedTools = deps.allowedTools && new Set(deps.allowedTools);
+  const tool = createRegisterTool(
+    deps.logger,
+    server,
+    client,
+    scopes,
+    allowedTools,
+  );
+  const resource = createRegisterResource(deps.logger, server, client, scopes);
+  const resourceTemplate = createRegisterResourceTemplate(
+    deps.logger,
+    server,
+    client,
+    scopes,
+  );
+  const register = { tool, resource, resourceTemplate };
+  void register; // suppress unused warnings
 
   tool(tool$codeSamplesGet);
 
diff --git a/src/mcp-server/tools.ts b/src/mcp-server/tools.ts

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`{`
`4`	`4`	`"name": "@speakeasyapi/code-samples",`
`5`		`- "version": "2.4.0",`
	`5`	`+ "version": "2.4.0-beta",`
`6`	`6`	`"exports": {`
`7`	`7`	`".": "./src/index.ts",`
`8`	`8`	`"./models/errors": "./src/models/errors/index.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@speakeasyapi/code-samples",`
`3`		`- "version": "2.4.0",`
	`3`	`+ "version": "2.4.0-beta",`
`4`	`4`	`"author": "Speakeasy",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"bin": {`