@dudousxd/nestjs-codegen 0.12.0 → 0.13.1

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { U as UserConfig, R as ResolvedConfig, a as RouteDescriptor, S as SchemaNode, b as RenderContext, c as SchemaModule, d as RenderedModule, e as ResolvedFormsConfig, V as ValidationAdapter, C as CodegenExtension, E as ExtensionContext, f as SerializationMode } from './index-CxkGbILp.cjs';
-export { A as AdapterUsage, g as ContractDescriptor, h as ContractSource, i as ControllerRef, N as NumberCheck, j as ScopeConfig, k as StringCheck, T as TypeRef, l as ValidationOption, r as resolveAdapter } from './index-CxkGbILp.cjs';
+import { U as UserConfig, R as ResolvedConfig, a as RouteDescriptor, S as SchemaNode, b as RenderContext, c as SchemaModule, d as RenderedModule, e as ResolvedFormsConfig, V as ValidationAdapter, C as CodegenExtension, E as ExtensionContext, f as SerializationMode } from './index-D8RIMVpU.cjs';
+export { A as AdapterUsage, g as ContractDescriptor, h as ContractSource, i as ControllerRef, N as NumberCheck, j as ScopeConfig, k as StringCheck, T as TypeRef, l as ValidationOption, r as resolveAdapter } from './index-D8RIMVpU.cjs';
 import { ClassDeclaration, SourceFile, Project } from 'ts-morph';
 
 declare function defineConfig(c: UserConfig): UserConfig;
@@ -322,6 +322,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.12.0";
+declare const VERSION = "0.13.1";
 
 export { type ChainModuleRendererOptions, CodegenError, type CodegenManifest, ConfigError, type FastDiscoveryOptions, type JsonSchema, type MocksEmitOptions, type OpenApiDocument, type OpenApiEmitOptions, type OpenApiInfo, RenderContext, RenderedModule, ResolvedConfig, RouteDescriptor, SchemaModule, SchemaNode, type TsTypeContext, UserConfig, VERSION, ValidationAdapter, type WatchOptions, type Watcher, acquireLock, buildMocksFile, buildOpenApiSpec, createChainModuleRenderer, defineConfig, discoverContractsFast, emitApi, emitForms, emitMocks, emitOpenApi, emitRoutes, extractSchemaFromDto, generate, loadConfig, renderTsType, resolveConfig, schemaModuleToJsonSchema, schemaNodeToJsonSchema, toObjectKey, typeNameFor, watch };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { U as UserConfig, R as ResolvedConfig, a as RouteDescriptor, S as SchemaNode, b as RenderContext, c as SchemaModule, d as RenderedModule, e as ResolvedFormsConfig, V as ValidationAdapter, C as CodegenExtension, E as ExtensionContext, f as SerializationMode } from './index-CxkGbILp.js';
-export { A as AdapterUsage, g as ContractDescriptor, h as ContractSource, i as ControllerRef, N as NumberCheck, j as ScopeConfig, k as StringCheck, T as TypeRef, l as ValidationOption, r as resolveAdapter } from './index-CxkGbILp.js';
+import { U as UserConfig, R as ResolvedConfig, a as RouteDescriptor, S as SchemaNode, b as RenderContext, c as SchemaModule, d as RenderedModule, e as ResolvedFormsConfig, V as ValidationAdapter, C as CodegenExtension, E as ExtensionContext, f as SerializationMode } from './index-D8RIMVpU.js';
+export { A as AdapterUsage, g as ContractDescriptor, h as ContractSource, i as ControllerRef, N as NumberCheck, j as ScopeConfig, k as StringCheck, T as TypeRef, l as ValidationOption, r as resolveAdapter } from './index-D8RIMVpU.js';
 import { ClassDeclaration, SourceFile, Project } from 'ts-morph';
 
 declare function defineConfig(c: UserConfig): UserConfig;
@@ -322,6 +322,6 @@ interface FastDiscoveryOptions {
 }
 declare function discoverContractsFast(opts: FastDiscoveryOptions): Promise<RouteDescriptor[]>;
 
-declare const VERSION = "0.12.0";
+declare const VERSION = "0.13.1";
 
 export { type ChainModuleRendererOptions, CodegenError, type CodegenManifest, ConfigError, type FastDiscoveryOptions, type JsonSchema, type MocksEmitOptions, type OpenApiDocument, type OpenApiEmitOptions, type OpenApiInfo, RenderContext, RenderedModule, ResolvedConfig, RouteDescriptor, SchemaModule, SchemaNode, type TsTypeContext, UserConfig, VERSION, ValidationAdapter, type WatchOptions, type Watcher, acquireLock, buildMocksFile, buildOpenApiSpec, createChainModuleRenderer, defineConfig, discoverContractsFast, emitApi, emitForms, emitMocks, emitOpenApi, emitRoutes, extractSchemaFromDto, generate, loadConfig, renderTsType, resolveConfig, schemaModuleToJsonSchema, schemaNodeToJsonSchema, toObjectKey, typeNameFor, watch };

package/dist/index.js

@@ -756,7 +756,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);
@@ -775,6 +783,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);
@@ -791,6 +818,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,
@@ -3689,6 +3717,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 (!Node6.isCallExpression(arg)) continue;
+      const interceptor = arg.getExpression().getText();
+      const callArgs = arg.getArguments();
+      const firstArg2 = callArgs[0];
+      if (interceptor === "FileInterceptor") {
+        if (firstArg2 && Node6.isStringLiteral(firstArg2)) {
+          entries.push(`${firstArg2.getLiteralValue()}: ${FILE}`);
+          multipart = true;
+        }
+      } else if (interceptor === "FilesInterceptor") {
+        if (firstArg2 && Node6.isStringLiteral(firstArg2)) {
+          entries.push(`${firstArg2.getLiteralValue()}: Array<${FILE}>`);
+          multipart = true;
+        }
+      } else if (interceptor === "FileFieldsInterceptor") {
+        if (firstArg2 && Node6.isArrayLiteralExpression(firstArg2)) {
+          for (const el of firstArg2.getElements()) {
+            if (!Node6.isObjectLiteralExpression(el)) continue;
+            const nameProp = el.getProperty("name");
+            if (nameProp && Node6.isPropertyAssignment(nameProp)) {
+              const init = nameProp.getInitializer();
+              if (init && Node6.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) {
@@ -3823,6 +3900,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") {
@@ -3832,7 +3911,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;
@@ -3905,7 +3984,9 @@ function extractDtoContract(method, sourceFile, project) {
     formWarnings,
     bodySchema,
     querySchema,
-    stream: isStream
+    stream: isStream,
+    multipart: uploads.multipart,
+    multipartBody
   };
 }
 function resolveParamClass(method, decoratorName, sourceFile, project) {
@@ -4390,7 +4471,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
     }
   });
 }
@@ -4703,7 +4786,7 @@ function createChainModuleRenderer(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.12.0";
+var VERSION = "0.13.1";
 export {
   CodegenError,
   ConfigError,