@contractkit/plugin-typescript 0.29.0 → 0.30.0

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     178.19 KB
-ESM dist/index.js.map 395.78 KB
-ESM ⚡️ Build success in 396ms
+ESM dist/index.js     176.34 KB
+ESM dist/index.js.map 392.55 KB
+ESM ⚡️ Build success in 283ms
 DTS Build start
-DTS ⚡️ Build success in 6065ms
+DTS ⚡️ Build success in 7018ms
 DTS dist/index.d.ts 4.55 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-contract.test.ts (128 tests) 221ms
- ✓ tests/codegen-sdk.test.ts (140 tests) 252ms
- ✓ tests/codegen-operation.test.ts (113 tests) 255ms
- ✓ tests/codegen-server.test.ts (25 tests) 110ms
- ✓ tests/codegen-plain-types.test.ts (66 tests) 35ms
- ✓ tests/pipeline.test.ts (28 tests) 217ms
- ✓ tests/escaping-security.test.ts (18 tests) 27ms
- ✓ tests/codegen-mcp.test.ts (24 tests) 67ms
+ ✓ tests/codegen-contract.test.ts (128 tests) 300ms
+ ✓ tests/codegen-sdk.test.ts (140 tests) 255ms
+ ✓ tests/codegen-operation.test.ts (117 tests) 165ms
+ ✓ tests/codegen-plain-types.test.ts (66 tests) 41ms
+ ✓ tests/codegen-server.test.ts (25 tests) 90ms
+ ✓ tests/pipeline.test.ts (28 tests) 234ms
+ ✓ tests/codegen-mcp.test.ts (24 tests) 70ms
+ ✓ tests/escaping-security.test.ts (18 tests) 52ms
 
  Test Files  8 passed (8)
-      Tests  542 passed (542)
-   Start at  12:07:42
-   Duration  9.60s (transform 5.83s, setup 0ms, import 18.92s, tests 1.18s, environment 1ms)
+      Tests  546 passed (546)
+   Start at  15:07:03
+   Duration  10.03s (transform 6.46s, setup 0ms, import 19.18s, tests 1.21s, environment 1ms)
 
  % Coverage report from v8
 -------------------|---------|----------|---------|---------|-------------------
 File               | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s 
 -------------------|---------|----------|---------|---------|-------------------
-All files          |   82.66 |    77.13 |   85.59 |   85.15 |                   
- src               |   82.52 |    76.89 |   85.35 |      85 |                   
+All files          |   82.42 |     76.7 |   85.01 |   85.02 |                   
+ src               |   82.27 |    76.44 |   84.72 |   84.86 |                   
   ...n-contract.ts |    88.1 |    82.91 |   90.08 |   89.26 | ...1095,1100-1101 
   codegen-mcp.ts   |   82.67 |    75.47 |   84.61 |    85.9 | ...85,290-291,374 
-  ...-operation.ts |   80.12 |    77.35 |   79.22 |   81.36 | ...59-770,775-776 
+  ...-operation.ts |   78.36 |       75 |   72.88 |   80.34 | ...65-776,781-782 
   ...lain-types.ts |   91.57 |    81.98 |   96.87 |   94.44 | ...31,157,269,275 
   codegen-sdk.ts   |   88.37 |     83.2 |   87.83 |   91.48 | ...1187-1188,1191 
   index.ts         |   66.25 |    53.64 |   72.72 |   70.29 | ...1022,1038-1057 

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @contractkit/contractkit-plugin-typescript
 
+## 0.30.0
+
+### Minor Changes
+
+- 23e4beb: Stop emitting unused imports in generated Koa routers. `bodyParserMiddleware` was imported unconditionally even when no operation declared a request body, and `MultipartBody` was imported whenever any body was multipart — including when the multipart body is structurally equal to its sibling MIME types and the handler collapses to a single `parseAndValidate` call that never references it. `requirePolicy`, `requireSignature` and `parseAndValidate` could also go unused when `includeInternal: false` skipped the only handlers that needed them. Each unused import trips `noUnusedLocals` and lint in the consuming project.
+
+    Imports are now derived from the generated body — a symbol is emitted only if it actually appears in the output — rather than from predicates over the AST that had to be kept in step by hand.
+
+### Patch Changes
+
+- Updated dependencies [23e4beb]
+    - @contractkit/core@0.24.0
+
 ## 0.29.0
 
 ### Minor Changes

package/dist/codegen-operation.d.ts

@@ -22,7 +22,15 @@ export interface OpCodegenOptions {
      */
     includeInternal?: boolean;
 }
-/** Generate a Koa router module for every operation in `root`, including the imports, type aliases, and handler list. */
+/**
+ * Generate a Koa router module for every operation in `root`, including the imports, type
+ * aliases, and handler list.
+ *
+ * Imports are derived from the generated body — each candidate symbol is emitted only if it
+ * actually appears in the output. Deciding them from predicates over the AST instead means any
+ * drift between predicate and codegen leaves an unused import in every generated file, which
+ * trips `noUnusedLocals` and lint downstream.
+ */
 export declare function generateOp(root: OpRootNode, options?: OpCodegenOptions): string;
 /**
  * Resolve the service class and method a handler should delegate to.

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

@@ -1 +1 @@
-{"version":3,"file":"codegen-operation.d.ts","sourceRoot":"","sources":["../src/codegen-operation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAA2C,MAAM,mBAAmB,CAAC;AAmC7I;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAkE5F;AAID,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sFAAsF;IACtF,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,qFAAqF;IACrF,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,yHAAyH;AACzH,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,gBAAqB,GAAG,MAAM,CAuFnF;AAyKD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAY7H;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,eAAe,GAAG,MAAM,CAqBzE;AAiaD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWnD;AAMD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ/E"}
+{"version":3,"file":"codegen-operation.d.ts","sourceRoot":"","sources":["../src/codegen-operation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAA2C,MAAM,mBAAmB,CAAC;AAkC7I;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAkE5F;AAID,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sFAAsF;IACtF,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,qFAAqF;IACrF,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,gBAAqB,GAAG,MAAM,CAsFnF;AAyKD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAY7H;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,eAAe,GAAG,MAAM,CAqBzE;AAwXD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWnD;AAMD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ/E"}

package/dist/index.js

@@ -1182,37 +1182,6 @@ function generateOp(root, options = {}) {
   const types = collectTypes(root, options.modelsWithInput, options.modelsWithOutput);
   const services = collectServices(root);
   const routerName = deriveRouterName(root.file);
-  const needsParseAndValidate = routeNeedsValidation(root);
-  const body = [];
-  const needsSignature = fileNeedsSignature(root);
-  const needsPolicy = fileNeedsPolicy(root);
-  const koaImports = [
-    "ServerKitRouter",
-    "bodyParserMiddleware"
-  ];
-  if (needsPolicy) koaImports.push("requirePolicy");
-  if (needsSignature) koaImports.push("requireSignature");
-  body.push(`import { ${koaImports.join(", ")} } from '@maroonedsoftware/koa';`);
-  for (const svc of services) {
-    const modulePath = root.services?.[svc] ?? root.meta[svc] ?? deriveModulePath(svc, options.servicePathTemplate);
-    body.push(`import { ${svc} } from '${modulePath}';`);
-  }
-  if (types.length > 0) {
-    body.push(...generateTypeImports(types, root.file, options));
-  }
-  const luxonImports = [];
-  if (opNeedsDateTime(root)) luxonImports.push("DateTime");
-  if (opNeedsScalar(root, "duration")) luxonImports.push("Duration");
-  if (opNeedsScalar(root, "interval")) luxonImports.push("Interval");
-  if (luxonImports.length > 0) {
-    body.push(`import { ${luxonImports.join(", ")} } from 'luxon';`);
-  }
-  if (needsParseAndValidate) {
-    body.push(`import { parseAndValidate } from '@maroonedsoftware/zod';`);
-  }
-  if (fileUsesMultipart(root)) {
-    body.push(`import { MultipartBody } from '@maroonedsoftware/multipart';`);
-  }
   const helpers = [];
   if (opNeedsScalar(root, "binary")) {
     helpers.push(`const _ZodBinary = z.custom<Buffer>((val) => Buffer.isBuffer(val), { error: 'Must be binary data' });`);
@@ -1243,6 +1212,45 @@ function generateOp(root, options = {}) {
       lines.push("");
     }
   }
+  const generated = [
+    ...helpers.length ? [
+      "",
+      ...helpers
+    ] : [],
+    ...lines
+  ].join("\n");
+  const uses = /* @__PURE__ */ __name((symbol) => new RegExp(`\\b${symbol}\\b`).test(generated), "uses");
+  const body = [];
+  const koaImports = [
+    "ServerKitRouter",
+    "bodyParserMiddleware",
+    "requirePolicy",
+    "requireSignature"
+  ].filter(uses);
+  if (koaImports.length > 0) {
+    body.push(`import { ${koaImports.join(", ")} } from '@maroonedsoftware/koa';`);
+  }
+  for (const svc of services) {
+    const modulePath = root.services?.[svc] ?? root.meta[svc] ?? deriveModulePath(svc, options.servicePathTemplate);
+    body.push(`import { ${svc} } from '${modulePath}';`);
+  }
+  if (types.length > 0) {
+    body.push(...generateTypeImports(types, root.file, options));
+  }
+  const luxonImports = [
+    "DateTime",
+    "Duration",
+    "Interval"
+  ].filter(uses);
+  if (luxonImports.length > 0) {
+    body.push(`import { ${luxonImports.join(", ")} } from 'luxon';`);
+  }
+  if (uses("parseAndValidate")) {
+    body.push(`import { parseAndValidate } from '@maroonedsoftware/zod';`);
+  }
+  if (uses("MultipartBody")) {
+    body.push(`import { MultipartBody } from '@maroonedsoftware/multipart';`);
+  }
   const allContent = [
     ...body,
     ...helpers.length ? [
@@ -1716,17 +1724,6 @@ function collectTypeNodeRefs(type, out) {
   }
 }
 __name(collectTypeNodeRefs, "collectTypeNodeRefs");
-function paramSourceNeedsDateTime(source) {
-  if (!source) return false;
-  if (source.kind === "ref") return false;
-  if (source.kind === "params") return source.nodes.some((p) => typeNeedsDateTime(p.type));
-  return typeNeedsDateTime(source.node);
-}
-__name(paramSourceNeedsDateTime, "paramSourceNeedsDateTime");
-function opNeedsDateTime(root) {
-  return root.routes.some((route) => paramSourceNeedsDateTime(route.params) || route.operations.some((op) => !!op.request?.bodies.some((b) => typeNeedsDateTime(b.bodyType)) || op.responses.some((r) => r.bodyType && typeNeedsDateTime(r.bodyType)) || paramSourceNeedsDateTime(op.query) || paramSourceNeedsDateTime(op.headers)));
-}
-__name(opNeedsDateTime, "opNeedsDateTime");
 function paramSourceNeedsScalar(source, name) {
   if (!source) return false;
   if (source.kind === "ref") return false;
@@ -1755,29 +1752,6 @@ function collectServices(root) {
   ].sort();
 }
 __name(collectServices, "collectServices");
-function hasParamSource(source) {
-  if (!source) return false;
-  if (source.kind === "ref") return true;
-  if (source.kind === "params") return source.nodes.length > 0;
-  return true;
-}
-__name(hasParamSource, "hasParamSource");
-function routeNeedsValidation(root) {
-  return root.routes.some((r) => hasParamSource(r.params) || r.operations.some((op) => !!op.request || hasParamSource(op.query) || hasParamSource(op.headers)));
-}
-__name(routeNeedsValidation, "routeNeedsValidation");
-function fileNeedsPolicy(root) {
-  return root.routes.some((route) => route.operations.some((op) => resolveSecurity(route, op, root) !== SECURITY_NONE));
-}
-__name(fileNeedsPolicy, "fileNeedsPolicy");
-function fileNeedsSignature(root) {
-  return root.routes.some((route) => route.operations.some((op) => !!op.signature));
-}
-__name(fileNeedsSignature, "fileNeedsSignature");
-function fileUsesMultipart(root) {
-  return root.routes.some((route) => route.operations.some((op) => (op.request?.bodies ?? []).some((b) => b.contentType === "multipart/form-data")));
-}
-__name(fileUsesMultipart, "fileUsesMultipart");
 function isValidIdentifier2(name) {
   return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }