@dudousxd/nestjs-codegen 0.12.0 → 0.13.1

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @dudousxd/nestjs-codegen
 
+## 0.13.1
+
+### Patch Changes
+
+- 6b51c7b: fix(multipart): intersect the uploaded-file field at emit time so it survives a named `bodyRef`, and leave deliberately-loose bodies untouched.
+
+  Two fixes to the multipart upload routes shipped in 0.13.0:
+
+  - **Named body refs now include the file field.** Discovery carries the uploaded-file
+    field(s) in a new `multipartBody` (kept off `body`), and the emitter intersects it onto
+    whichever body expression it picks — a named `bodyRef` (`BaseFileUploadDto`) or the inline
+    text. Previously the merge lived on the inline `body` string, so a route whose `@Body`
+    resolved to an imported DTO emitted the plain `BaseFileUploadDto` and dropped the file
+    field (`api.X({ body: { ...fields, file } })` failed to type-check).
+
+  - **Deliberately-loose bodies are left alone.** A `@Body() x: SomeDto | any` handler resolves
+    to a top-level `unknown`/`any` union arm; intersecting `(Dto | unknown) & { file }` collapses
+    it and wrongly tightens the type. The emitter now detects a permissive body and skips the
+    intersection, keeping the author's loose `@Body()` (the route is still flagged `multipart`).
+
+## 0.13.0
+
+### Minor Changes
+
+- a044e73: feat: typed `multipart/form-data` upload routes (`@UploadedFile()` / Multer interceptors).
+
+  The codegen now understands handlers that accept uploaded files, so multipart uploads
+  become first-class typed routes (`api.X({ body: { ...fields, file } })`) instead of
+  needing the `fetchRaw` escape hatch.
+
+  **core (`@dudousxd/nestjs-codegen`):**
+
+  - Discovery detects `@UploadedFile()` / `@UploadedFiles()` handlers and reads the HTTP
+    field name(s) + arity from the Multer interceptor in `@UseInterceptors(...)`:
+    - `FileInterceptor('file')` → `file: File | Blob`
+    - `FilesInterceptor('files')` → `files: Array<File | Blob>`
+    - `FileFieldsInterceptor([{ name: 'a' }, { name: 'b' }])` → `a: Array<File | Blob>; b: Array<File | Blob>`
+    - `AnyFilesInterceptor()` → flagged multipart (no statically known field names)
+  - The uploaded-file field(s) are merged into the route `body` as an intersection with the
+    `@Body` DTO (`SomeDto & { file: File | Blob }`), typed for the browser as `File | Blob`
+    (never the server-side `Express.Multer.File`).
+  - The route carries a new `multipart` flag, emitted into the generated client so the call
+    passes `multipart: true` to the fetcher.
+
+  **client (`@dudousxd/nestjs-client`):**
+
+  - `RequestOpts` gains `multipart?: boolean`. When set, the fetcher serializes the body
+    object to a `FormData` (scalars as strings, `Date` as ISO, `File`/`Blob` as file parts,
+    arrays as repeated parts) instead of JSON, letting the runtime set the multipart
+    boundary. `onUploadProgress` already rides the same path.
+
 ## 0.12.0
 
 ### Minor Changes

package/dist/cli/main.cjs

@@ -785,7 +785,15 @@ function emitRouterTypeBlock(tree, indent, outDir, serialization) {
       const isFilterQuery = c.contractSource.filterSource === "query" && !!c.contractSource.filterFields?.length;
       const query = queryRef ? queryRef.isArray ? `Array<${queryRef.name}>` : queryRef.name : isFilterQuery ? emitFilterQueryType(c) : c.contractSource.query ?? "never";
       const bodyRef = c.contractSource.bodyRef;
-      const body = method === "GET" ? "never" : bodyRef ? bodyRef.isArray ? `Array<${bodyRef.name}>` : bodyRef.name : c.contractSource.body ?? "never";
+      let body = method === "GET" ? "never" : bodyRef ? bodyRef.isArray ? `Array<${bodyRef.name}>` : bodyRef.name : c.contractSource.body ?? "never";
+      const multipartBody = c.contractSource.multipartBody;
+      if (c.contractSource.multipart && multipartBody) {
+        if (body === "never") {
+          body = multipartBody;
+        } else if (!bodyAcceptsAnything(body)) {
+          body = `(${body}) & ${multipartBody}`;
+        }
+      }
       const response = buildResponseType(c, outDir, serialization);
       const error = buildErrorType(c);
       const params = buildParamsType(c.params);
@@ -804,6 +812,25 @@ function emitRouterTypeBlock(tree, indent, outDir, serialization) {
   }
   return lines;
 }
+function topLevelUnionArms(type) {
+  const arms = [];
+  let depth = 0;
+  let start = 0;
+  for (let i = 0; i < type.length; i++) {
+    const ch = type[i];
+    if (ch === "{" || ch === "[" || ch === "<" || ch === "(") depth++;
+    else if (ch === "}" || ch === "]" || ch === ">" || ch === ")") depth--;
+    else if (ch === "|" && depth === 0) {
+      arms.push(type.slice(start, i).trim());
+      start = i + 1;
+    }
+  }
+  arms.push(type.slice(start).trim());
+  return arms;
+}
+function bodyAcceptsAnything(body) {
+  return topLevelUnionArms(body).some((arm) => arm === "unknown" || arm === "any");
+}
 function buildRequestModel(c) {
   const m = c.method.toLowerCase();
   const flat = JSON.stringify(c.name);
@@ -820,6 +847,7 @@ function buildRequestModel(c) {
   const optsParts = [];
   if (hasQuery) optsParts.push("query: input?.query as Record<string, unknown> | undefined");
   if (hasBody) optsParts.push("body: input?.body");
+  if (hasBody && c.contractSource.multipart) optsParts.push("multipart: true");
   const optsExpr = optsParts.length ? `{ ${optsParts.join(", ")} }` : "{}";
   return {
     routeName: c.name,
@@ -3700,6 +3728,55 @@ function extractParamsType(method, sourceFile, project) {
   }
   return entries.length > 0 ? `{ ${entries.join("; ")} }` : null;
 }
+function extractUploadedFiles(method) {
+  const FILE = "File | Blob";
+  const entries = [];
+  let multipart = false;
+  const hasUploadedFileParam = method.getParameters().some(
+    (p) => p.getDecorators().some((d) => {
+      const name = d.getName();
+      return name === "UploadedFile" || name === "UploadedFiles";
+    })
+  );
+  for (const decorator of method.getDecorators()) {
+    if (decorator.getName() !== "UseInterceptors") continue;
+    for (const arg of decorator.getArguments()) {
+      if (!import_ts_morph7.Node.isCallExpression(arg)) continue;
+      const interceptor = arg.getExpression().getText();
+      const callArgs = arg.getArguments();
+      const firstArg2 = callArgs[0];
+      if (interceptor === "FileInterceptor") {
+        if (firstArg2 && import_ts_morph7.Node.isStringLiteral(firstArg2)) {
+          entries.push(`${firstArg2.getLiteralValue()}: ${FILE}`);
+          multipart = true;
+        }
+      } else if (interceptor === "FilesInterceptor") {
+        if (firstArg2 && import_ts_morph7.Node.isStringLiteral(firstArg2)) {
+          entries.push(`${firstArg2.getLiteralValue()}: Array<${FILE}>`);
+          multipart = true;
+        }
+      } else if (interceptor === "FileFieldsInterceptor") {
+        if (firstArg2 && import_ts_morph7.Node.isArrayLiteralExpression(firstArg2)) {
+          for (const el of firstArg2.getElements()) {
+            if (!import_ts_morph7.Node.isObjectLiteralExpression(el)) continue;
+            const nameProp = el.getProperty("name");
+            if (nameProp && import_ts_morph7.Node.isPropertyAssignment(nameProp)) {
+              const init = nameProp.getInitializer();
+              if (init && import_ts_morph7.Node.isStringLiteral(init)) {
+                entries.push(`${init.getLiteralValue()}: Array<${FILE}>`);
+              }
+            }
+          }
+          multipart = true;
+        }
+      } else if (interceptor === "AnyFilesInterceptor") {
+        multipart = true;
+      }
+    }
+  }
+  if (hasUploadedFileParam) multipart = true;
+  return { fields: entries.length > 0 ? entries.join("; ") : null, multipart };
+}
 function extractResponseType(method, sourceFile, project) {
   const apiResponseDecorator = method.getDecorators().find((d) => d.getName() === "ApiResponse" && (apiResponseStatus(d) ?? 0) < 400);
   if (apiResponseDecorator) {
@@ -3834,6 +3911,8 @@ function extractDtoContract(method, sourceFile, project) {
   let body = extractBodyType(method, sourceFile, project);
   const filterInfo = extractApplyFilterInfo(method, sourceFile, project);
   const query = extractQueryType(method, sourceFile, project);
+  const uploads = extractUploadedFiles(method);
+  const multipartBody = uploads.fields ? `{ ${uploads.fields} }` : null;
   const streamElement = detectStreamElement(method);
   const isStream = streamElement !== null;
   if (filterInfo && filterInfo.source === "body") {
@@ -3843,7 +3922,7 @@ function extractDtoContract(method, sourceFile, project) {
   const paramsType = extractParamsType(method, sourceFile, project);
   const response = isStream ? resolveTypeNodeToString(streamElement, sourceFile, project, 3) : extractResponseType(method, sourceFile, project);
   const errorInfo = extractErrorType(method, sourceFile, project);
-  if (body === null && query === null && paramsType === null && response === "unknown" && errorInfo === null && filterInfo === null && !isStream) {
+  if (body === null && query === null && paramsType === null && response === "unknown" && errorInfo === null && filterInfo === null && !isStream && !uploads.multipart) {
     return null;
   }
   let bodyRef = null;
@@ -3916,7 +3995,9 @@ function extractDtoContract(method, sourceFile, project) {
     formWarnings,
     bodySchema,
     querySchema,
-    stream: isStream
+    stream: isStream,
+    multipart: uploads.multipart,
+    multipartBody
   };
 }
 function resolveParamClass(method, decoratorName, sourceFile, project) {
@@ -4401,7 +4482,9 @@ function extractDtoRoute(args) {
       formWarnings: dtoContract?.formWarnings ?? [],
       bodySchema: dtoContract?.bodySchema ?? null,
       querySchema: dtoContract?.querySchema ?? null,
-      stream: dtoContract?.stream ?? false
+      stream: dtoContract?.stream ?? false,
+      multipart: dtoContract?.multipart ?? false,
+      multipartBody: dtoContract?.multipartBody ?? null
     }
   });
 }
@@ -4631,7 +4714,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.12.0";
+var VERSION = "0.13.1";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {