Merge remote-tracking branch 'origin/master' into feature/stream-file…

…-param-decorator # Conflicts: # src/metadata/parameterGenerator.ts
thiagobustamante · Oct 22, 2020 · 8b83a52 · 8b83a52
2 parents c002572 + 990aa14
commit 8b83a52
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/metadata/parameterGenerator.ts b/src/metadata/parameterGenerator.ts
@@ -1,7 +1,7 @@
-import * as ts from 'typescript';
-import { getDecoratorName, getDecoratorOptions, getDecoratorTextValue } from '../utils/decoratorUtils';
 import { MetadataGenerator, Parameter, Type } from './metadataGenerator';
-import { getCommonPrimitiveAndArrayUnionType, getLiteralValue, resolveType } from './resolveType';
+import { resolveType, getCommonPrimitiveAndArrayUnionType, getLiteralValue } from './resolveType';
+import { getDecoratorName, getDecoratorTextValue, getDecoratorOptions } from '../utils/decoratorUtils';
+import * as ts from 'typescript';
 
 export class ParameterGenerator {
     constructor(

diff --git a/test/data/apis.ts b/test/data/apis.ts
@@ -387,6 +387,18 @@ export class ParameterizedEndpoint {
     stream(@swagger.StreamFileParam('stream') file: Express.Multer.File): PrimitiveClassModel {
         return new PrimitiveClassModel();
     }
+
+    @Path('/file')
+    @POST
+    file(@FileParam('file') file: Express.Multer.File): PrimitiveClassModel {
+        return new PrimitiveClassModel();
+    }
+
+    @Path('/stream')
+    @POST
+    stream(@swagger.StreamFileParam('stream') file: Express.Multer.File): PrimitiveClassModel {
+        return new PrimitiveClassModel();
+    }
 }
 
 export abstract class Entity {