@dudousxd/nestjs-codegen 0.13.0 → 0.13.1

package/dist/cli/main.js

@@ -751,7 +751,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);
@@ -770,6 +778,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);
@@ -3866,10 +3893,7 @@ function extractDtoContract(method, sourceFile, project) {
   const filterInfo = extractApplyFilterInfo(method, sourceFile, project);
   const query = extractQueryType(method, sourceFile, project);
   const uploads = extractUploadedFiles(method);
-  if (uploads.fields) {
-    const fileObject = `{ ${uploads.fields} }`;
-    body = body ? `(${body}) & ${fileObject}` : fileObject;
-  }
+  const multipartBody = uploads.fields ? `{ ${uploads.fields} }` : null;
   const streamElement = detectStreamElement(method);
   const isStream = streamElement !== null;
   if (filterInfo && filterInfo.source === "body") {
@@ -3953,7 +3977,8 @@ function extractDtoContract(method, sourceFile, project) {
     bodySchema,
     querySchema,
     stream: isStream,
-    multipart: uploads.multipart
+    multipart: uploads.multipart,
+    multipartBody
   };
 }
 function resolveParamClass(method, decoratorName, sourceFile, project) {
@@ -4439,7 +4464,8 @@ function extractDtoRoute(args) {
       bodySchema: dtoContract?.bodySchema ?? null,
       querySchema: dtoContract?.querySchema ?? null,
       stream: dtoContract?.stream ?? false,
-      multipart: dtoContract?.multipart ?? false
+      multipart: dtoContract?.multipart ?? false,
+      multipartBody: dtoContract?.multipartBody ?? null
     }
   });
 }
@@ -4669,7 +4695,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.13.0";
+var VERSION = "0.13.1";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {