@contractkit/plugin-typescript 0.34.0 → 0.34.1

package/.turbo/turbo-build$colon$ci.log

@@ -5,9 +5,9 @@ $ tsup src/index.ts --format esm --sourcemap --dts && tsc --emitDeclarationOnly
 CLI tsup v8.5.1
 CLI Target: esnext
 ESM Build start
-ESM dist/index.js     220.70 KB
-ESM dist/index.js.map 514.14 KB
-ESM ⚡️ Build success in 310ms
+ESM dist/index.js     221.06 KB
+ESM dist/index.js.map 514.96 KB
+ESM ⚡️ Build success in 514ms
 DTS Build start
-DTS ⚡️ Build success in 3538ms
+DTS ⚡️ Build success in 5728ms
 DTS dist/index.d.ts 5.14 KB

package/.turbo/turbo-test$colon$ci.log

@@ -3,29 +3,29 @@ $ vitest run --coverage
  RUN  v4.1.5 /home/runner/work/ContractKit/ContractKit/packages/plugin-typescript
       Coverage enabled with v8
 
- ✓ tests/codegen-sdk.test.ts (173 tests) 434ms
- ✓ tests/codegen-contract.test.ts (147 tests) 165ms
- ✓ tests/codegen-operation.test.ts (159 tests) 297ms
- ✓ tests/pipeline.test.ts (34 tests) 276ms
- ✓ tests/codegen-server.test.ts (33 tests) 59ms
- ✓ tests/codegen-plain-types.test.ts (67 tests) 78ms
- ✓ tests/ts-render.test.ts (5 tests) 20ms
- ✓ tests/codegen-mcp.test.ts (28 tests) 53ms
- ✓ tests/escaping-security.test.ts (18 tests) 18ms
+ ✓ tests/codegen-contract.test.ts (147 tests) 222ms
+ ✓ tests/codegen-operation.test.ts (159 tests) 241ms
+ ✓ tests/codegen-sdk.test.ts (173 tests) 405ms
+ ✓ tests/codegen-plain-types.test.ts (67 tests) 63ms
+ ✓ tests/codegen-server.test.ts (33 tests) 149ms
+ ✓ tests/pipeline.test.ts (34 tests) 413ms
+ ✓ tests/ts-render.test.ts (5 tests) 8ms
+ ✓ tests/codegen-mcp.test.ts (31 tests) 49ms
+ ✓ tests/escaping-security.test.ts (18 tests) 30ms
 
  Test Files  9 passed (9)
-      Tests  664 passed (664)
-   Start at  14:41:57
-   Duration  7.07s (transform 3.29s, setup 0ms, import 12.86s, tests 1.40s, environment 1ms)
+      Tests  667 passed (667)
+   Start at  17:41:52
+   Duration  10.27s (transform 6.12s, setup 0ms, import 20.30s, tests 1.58s, environment 24ms)
 
  % Coverage report from v8
 -------------------|---------|----------|---------|---------|-------------------
 File               | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s 
 -------------------|---------|----------|---------|---------|-------------------
-All files          |   83.33 |    77.36 |   86.64 |   85.95 |                   
- src               |   83.14 |    77.04 |   86.23 |   85.78 |                   
+All files          |   83.37 |    77.38 |   86.64 |      86 |                   
+ src               |   83.19 |    77.06 |   86.23 |   85.83 |                   
   ...n-contract.ts |   90.13 |    85.89 |   90.51 |    90.9 | ...1166,1171-1172 
-  codegen-mcp.ts   |    82.2 |    74.21 |   84.21 |   85.65 | ...99,304-305,387 
+  codegen-mcp.ts   |   82.75 |    74.53 |   84.21 |   86.19 | ...99,304-305,390 
   ...-operation.ts |   83.06 |    80.46 |   80.28 |   85.15 | ...1045,1050-1051 
   ...lain-types.ts |    91.7 |     83.8 |   96.96 |   94.57 | ...79,204,316,322 
   ...gen-revive.ts |   59.23 |    52.54 |   78.37 |   65.28 | ...85-316,398-404 

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @contractkit/contractkit-plugin-typescript
 
+## 0.34.1
+
+### Patch Changes
+
+- 3e90488: Stop the MCP aggregator from calling `container.register`, and underscore the unused `args` parameter on no-argument tools.
+
+    `generateMcpAggregator` emitted `container.register(McpToolHandlerMap, { useValue: map })`. InjectKit's `Container` has no `register`; it exposes only `get`, `createScopedContainer`, `hasRegistration`, `disposeAsync`, and `[Symbol.asyncDispose]`. Registration belongs to `Registry`, the composition-phase object, while `Container` is the resolution-phase one. Every generated `mcp.tools.ts` therefore failed to compile with `TS2339`, and would have thrown at startup if it had.
+
+    `registerMcpTools` now only builds the map and returns it. Its doc comment shows the binding that supplies the `Container` in the first place:
+
+    ```ts
+    registry.register(McpToolHandlerMap).useFactory(registerMcpTools).asSingleton();
+    ```
+
+    `generateMcpRouter`'s doc line told consumers to _call_ the aggregator at startup, which is the same mistake. It now points at the binding.
+
+    Separately, `renderToolClass` always named the handler's first parameter `args`. An operation with no path parameters and no request body destructures nothing, so the parameter went unread and tripped `@typescript-eslint/no-unused-vars` in consumers that lint generated output. It is now emitted as `_args` when there is nothing to destructure.
+
 ## 0.34.0
 
 ### Minor Changes

package/dist/codegen-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen-mcp.d.ts","sourceRoot":"","sources":["../src/codegen-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA8E,MAAM,mBAAmB,CAAC;AAUhI,MAAM,WAAW,iBAAiB;IAC9B,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uFAAuF;IACvF,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,qDAAqD;IACrD,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,yFAAyF;IACzF,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,2DAA2D;IAC3D,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AASD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,UAAQ,GAAG,OAAO,CASnF;AAgWD,0GAA0G;AAC1G,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,sGAAsG;AACtG,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,iBAAsB,GAAG,MAAM,CA0DzF;AAED,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IAC/B,6EAA6E;IAC7E,UAAU,EAAE,MAAM,CAAC;IACnB,oFAAoF;IACpF,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,0FAA0F;AAC1F,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAe3E;AAED,sGAAsG;AACtG,wBAAgB,iBAAiB,CAAC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,MAAM,CAwBzE"}
+{"version":3,"file":"codegen-mcp.d.ts","sourceRoot":"","sources":["../src/codegen-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA8E,MAAM,mBAAmB,CAAC;AAUhI,MAAM,WAAW,iBAAiB;IAC9B,mFAAmF;IACnF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uFAAuF;IACvF,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,qDAAqD;IACrD,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,yFAAyF;IACzF,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,2DAA2D;IAC3D,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AASD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,UAAQ,GAAG,OAAO,CASnF;AAmWD,0GAA0G;AAC1G,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,sGAAsG;AACtG,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,iBAAsB,GAAG,MAAM,CA0DzF;AAED,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IAC/B,6EAA6E;IAC7E,UAAU,EAAE,MAAM,CAAC;IACnB,oFAAoF;IACpF,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,0FAA0F;AAC1F,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAuB3E;AAED,sGAAsG;AACtG,wBAAgB,iBAAiB,CAAC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,MAAM,CAwBzE"}

package/dist/index.js

@@ -4415,7 +4415,8 @@ function renderToolClass(plan, file, options) {
   const callArgs = buildArgs(route, op);
   const isVoid = !primaryResponseBody(op);
   const structured = !!outExpr;
-  lines.push("    async handle(args: Record<string, unknown>, _context: McpToolContext): Promise<CallToolResult> {");
+  const argsParam = destructure.length > 0 ? "args" : "_args";
+  lines.push(`    async handle(${argsParam}: Record<string, unknown>, _context: McpToolContext): Promise<CallToolResult> {`);
   if (destructure.length > 0) {
     lines.push(`        const { ${destructure.join(", ")} } = await parseAndValidate(args, ${argsConstName});`);
   }
@@ -4503,11 +4504,19 @@ function generateMcpAggregator(entries) {
   lines.push(`import { McpToolHandlerMap } from '@maroonedsoftware/mcp';`);
   for (const e of sorted) lines.push(`import { ${e.registerFn} } from '${e.importPath}';`);
   lines.push("");
-  lines.push("/** Build + register the MCP tool catalog. Call once at startup. */");
+  lines.push("/**");
+  lines.push(" * Build the MCP tool catalog.");
+  lines.push(" *");
+  lines.push(" * Bind it to the `McpToolHandlerMap` token from a factory, which is what supplies the");
+  lines.push(" * `Container` needed to resolve each handler:");
+  lines.push(" *");
+  lines.push(" * ```ts");
+  lines.push(" * registry.register(McpToolHandlerMap).useFactory(registerMcpTools).asSingleton();");
+  lines.push(" * ```");
+  lines.push(" */");
   lines.push("export function registerMcpTools(container: Container): McpToolHandlerMap {");
   lines.push("    const map = new McpToolHandlerMap();");
   for (const e of sorted) lines.push(`    ${e.registerFn}(map, container);`);
-  lines.push("    container.register(McpToolHandlerMap, { useValue: map });");
   lines.push("    return map;");
   lines.push("}");
   return lines.join("\n") + "\n";
@@ -4518,7 +4527,7 @@ function generateMcpRouter(options = {}) {
   return `import { ServerKitRouter, bodyParserMiddleware, requireSignature } from '@maroonedsoftware/koa';
 import { McpDispatcher, createMcpRequestContext, MCP_AUTH_POLICY } from '@maroonedsoftware/mcp';
 
-/** Mount the MCP endpoint onto a ServerKit router. Call \`registerMcpTools(container)\` at startup. */
+/** Mount the MCP endpoint onto a ServerKit router. Bind \`registerMcpTools\` to the \`McpToolHandlerMap\` token. */
 export function mountMcp(router: ReturnType<typeof ServerKitRouter>): void {
     router.post('${path}', bodyParserMiddleware(['json']), requireSignature('mcp', { policy: MCP_AUTH_POLICY }), async (ctx) => {
         const dispatcher = ctx.container.get(McpDispatcher);