Merge pull request #3129 from alex-statsig/more-schema-option-keys

feat: Add schema support for more option keys
nestjs · Oct 29, 2024 · 81ea4a2 · 81ea4a2
2 parents 6132592 + d279a08
commit 81ea4a2
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 3 deletions.
diff --git a/e2e/api-spec.json b/e2e/api-spec.json
@@ -386,6 +386,26 @@
               "type": "number"
             }
           },
+          {
+            "name": "constrainedLimit",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "oneOf": [
+                {
+                  "minimum": 0,
+                  "maximum": 10,
+                  "format": "int32"
+                },
+                {
+                  "minimum": 100,
+                  "maximum": 100,
+                  "format": "int32"
+                }
+              ],
+              "type": "number"
+            }
+          },
           {
             "name": "enum",
             "required": true,
@@ -1535,6 +1555,20 @@
           "limit": {
             "type": "number"
           },
+          "constrainedLimit": {
+            "oneOf": [
+              {
+                "minimum": 0,
+                "maximum": 10,
+                "format": "int32"
+              },
+              {
+                "minimum": 100,
+                "maximum": 100,
+                "format": "int32"
+              }
+            ]
+          },
           "enum": {
             "allOf": [
               {
@@ -1575,6 +1609,7 @@
           "page",
           "_sortBy",
           "limit",
+          "constrainedLimit",
           "enum",
           "enumArr",
           "letters",

diff --git a/e2e/src/cats/dto/pagination-query.dto.ts b/e2e/src/cats/dto/pagination-query.dto.ts
@@ -29,6 +29,22 @@ export class PaginationQuery {
   @ApiProperty()
   limit: number;
 
+  @ApiProperty({
+    oneOf: [
+      {
+        minimum: 0,
+        maximum: 10,
+        format: 'int32'
+      },
+      {
+        minimum: 100,
+        maximum: 100,
+        format: 'int32'
+      }
+    ],
+  })
+  constrainedLimit?: number;
+
   @ApiProperty({
     enum: LettersEnum,
     enumName: 'LettersEnum'
@@ -45,7 +61,7 @@ export class PaginationQuery {
   @ApiProperty({
     enum: LettersEnum,
     enumName: 'Letter',
-    isArray: true,
+    isArray: true
   })
   letters: LettersEnum[];
 
@@ -59,7 +75,7 @@ export class PaginationQuery {
         type: 'string'
       },
       age: {
-        type: 'number',
+        type: 'number'
       }
     },
     additionalProperties: true

diff --git a/lib/services/swagger-types-mapper.ts b/lib/services/swagger-types-mapper.ts
@@ -174,7 +174,9 @@ export class SwaggerTypesMapper {
       'pattern',
       'nullable',
       'default',
-      'example'
+      'example',
+      'oneOf',
+      'anyOf'
     ];
   }
 }
diff --git a/test/plugin/fixtures/project/cats/dto/pagination-query.dto.ts b/test/plugin/fixtures/project/cats/dto/pagination-query.dto.ts
@@ -29,6 +29,22 @@ export class PaginationQuery {
   @ApiProperty()
   limit: number;
 
+  @ApiProperty({
+    oneOf: [
+      {
+        minimum: 0,
+        maximum: 10,
+        format: 'int32'
+      },
+      {
+        minimum: 100,
+        maximum: 100,
+        format: 'int32'
+      }
+    ],
+  })
+  constrainedLimit?: number;
+
   @ApiProperty({
     enum: LettersEnum,
     enumName: 'LettersEnum'

diff --git a/test/plugin/fixtures/serialized-meta.fixture.ts b/test/plugin/fixtures/serialized-meta.fixture.ts
@@ -18,6 +18,7 @@ export default async () => {
               page: { required: true, type: () => Number },
               sortBy: { required: true, type: () => [String] },
               limit: { required: true, type: () => Number },
+              constrainedLimit: { required: false, type: () => Number },
               enum: {
                 required: true,
                 enum: t['./cats/dto/pagination-query.dto'].LettersEnum