@contractkit/plugin-typescript 0.25.3 → 0.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contractkit/plugin-typescript",
-  "version": "0.25.3",
+  "version": "0.26.0",
   "description": "ContractKit built-in plugin: TypeScript codegen (SDK clients, Koa routers, Zod schemas, plain types)",
   "author": {
     "name": "Marooned Software",
@@ -26,7 +26,7 @@
     ".": "./dist/index.js"
   },
   "dependencies": {
-    "@contractkit/core": "0.20.0"
+    "@contractkit/core": "0.21.0"
   },
   "devDependencies": {
     "@repo/config-typescript": "0.1.0",

package/src/codegen-operation.ts

@@ -160,6 +160,10 @@ export function generateOp(root: OpRootNode, options: OpCodegenOptions = {}): st
         body.push(`import { parseAndValidate } from '@maroonedsoftware/zod';`);
     }
 
+    if (fileUsesMultipart(root)) {
+        body.push(`import { MultipartBody } from '@maroonedsoftware/multipart';`);
+    }
+
     const helpers: string[] = [];
     if (opNeedsScalar(root, 'binary')) {
         helpers.push(`const _ZodBinary = z.custom<Buffer>((val) => Buffer.isBuffer(val), { error: 'Must be binary data' });`);
@@ -256,7 +260,10 @@ function generateHandler(route: OpRouteNode, op: OpOperationNode, root: OpRootNo
         middlewares.push(`bodyParserMiddleware([${tokensExpr}])`);
     }
     if (op.signature) {
-        middlewares.push(`requireSignature('${op.signature}')`);
+        const sigArgs = op.signaturePolicy
+            ? `'${op.signature}', { policy: '${op.signaturePolicy}' }`
+            : `'${op.signature}'`;
+        middlewares.push(`requireSignature(${sigArgs})`);
     }
     const middlewareStr = middlewares.length > 0 ? `, ${middlewares.join(', ')},` : ',';
 
@@ -773,6 +780,12 @@ function fileNeedsSignature(root: OpRootNode): boolean {
     return root.routes.some(route => route.operations.some(op => !!op.signature));
 }
 
+function fileUsesMultipart(root: OpRootNode): boolean {
+    return root.routes.some(route =>
+        route.operations.some(op => (op.request?.bodies ?? []).some(b => b.contentType === 'multipart/form-data')),
+    );
+}
+
 function isValidIdentifier(name: string): boolean {
     return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }

package/tests/codegen-operation.test.ts

@@ -193,6 +193,7 @@ describe('generateOperation', () => {
             expect(output).toContain("case 'multipart/form-data':");
             expect(output).toContain('body = ctx.body as MultipartBody;');
             expect(output).toContain('body = await parseAndValidate(ctx.body, UploadMeta)');
+            expect(output).toContain("import { MultipartBody } from '@maroonedsoftware/multipart';");
         });
     });
 
@@ -471,6 +472,7 @@ describe('generateOperation', () => {
             const output = generateOp(root);
             expect(output).toContain("bodyParserMiddleware(['multipart'])");
             expect(output).toContain('ctx.body as MultipartBody');
+            expect(output).toContain("import { MultipartBody } from '@maroonedsoftware/multipart';");
         });
     });
 
@@ -849,6 +851,17 @@ describe('generateOp — route modifiers JSDoc', () => {
             expect(out).toContain(`requireSignature('MODERN_TREASURY_WEBHOOK')`);
         });
 
+        it('passes the signature policy to requireSignature when set', () => {
+            const op = opOperation('post', {
+                signature: 'SLACK_WEBHOOK',
+                signaturePolicy: 'slackSignatureValid',
+                request: opRequest('Payload'),
+            });
+            const root = opRoot([opRoute('/webhooks', [op])]);
+            const out = generateOp(root);
+            expect(out).toContain(`requireSignature('SLACK_WEBHOOK', { policy: 'slackSignatureValid' })`);
+        });
+
         it('places requireSignature after bodyParserMiddleware in the route line', () => {
             const op = opOperation('post', {
                 signature: 'MY_KEY',