TT-39 - Support number literal generation to OpenApi2 and 3 with form…

…at on it. (airtasker#479) * TT-39 - Support number literal generation to OpenApi2 and 3 with format on it. * Updated test.
adrian-chang · Oct 14, 2019 · 7ec2497 · 7ec2497
1 parent e0735db
commit 7ec2497
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/lib/src/generators/contract/openapi2-schema.spec.ts b/lib/src/generators/contract/openapi2-schema.spec.ts
@@ -86,6 +86,7 @@ describe("OpenAPI 2 generator", () => {
           "enum": Array [
             1.5,
           ],
+          "format": "float",
           "type": "number",
         }
       `);
@@ -94,6 +95,7 @@ describe("OpenAPI 2 generator", () => {
           "enum": Array [
             -23.1,
           ],
+          "format": "float",
           "type": "number",
         }
       `);
@@ -123,6 +125,7 @@ describe("OpenAPI 2 generator", () => {
           "enum": Array [
             0,
           ],
+          "format": "int32",
           "type": "integer",
         }
       `);
@@ -131,6 +134,7 @@ describe("OpenAPI 2 generator", () => {
           "enum": Array [
             122,
           ],
+          "format": "int32",
           "type": "integer",
         }
       `);
@@ -139,6 +143,7 @@ describe("OpenAPI 2 generator", () => {
           "enum": Array [
             -1000,
           ],
+          "format": "int32",
           "type": "integer",
         }
       `);

diff --git a/lib/src/generators/contract/openapi2-schema.ts b/lib/src/generators/contract/openapi2-schema.ts
@@ -56,11 +56,13 @@ export function openApi2TypeSchema(type: DataType): OpenAPI2SchemaType {
       return Math.round(type.value) === type.value
         ? {
             type: "integer",
-            enum: [type.value]
+            enum: [type.value],
+            format: "int32"
           }
         : {
             type: "number",
-            enum: [type.value]
+            enum: [type.value],
+            format: "float"
           };
     case TypeKind.INT32:
       return {
@@ -180,11 +182,13 @@ export interface OpenAPI2SchemaTypeString extends OpenAPI2BaseSchemaType {
 export interface OpenAPI2SchemaTypeNumber extends OpenAPI2BaseSchemaType {
   type: "number";
   enum?: number[];
+  format: "float" | "double";
 }
 
 export interface OpenAPI2SchemaTypeInteger extends OpenAPI2BaseSchemaType {
   type: "integer";
   enum?: number[];
+  format: "int32" | "int64";
 }
 
 export interface OpenAPI2SchemaTypeDateTime extends OpenAPI2BaseSchemaType {

diff --git a/lib/src/generators/contract/openapi3-schema.spec.ts b/lib/src/generators/contract/openapi3-schema.spec.ts
@@ -88,6 +88,7 @@ describe("OpenAPI 3 generator", () => {
           "enum": Array [
             1.5,
           ],
+          "format": "float",
           "type": "number",
         }
       `);
@@ -97,6 +98,7 @@ describe("OpenAPI 3 generator", () => {
           "enum": Array [
             -23.1,
           ],
+          "format": "float",
           "type": "number",
         }
       `);
@@ -126,6 +128,7 @@ describe("OpenAPI 3 generator", () => {
           "enum": Array [
             0,
           ],
+          "format": "int32",
           "type": "integer",
         }
       `);
@@ -134,6 +137,7 @@ describe("OpenAPI 3 generator", () => {
           "enum": Array [
             123,
           ],
+          "format": "int32",
           "type": "integer",
         }
       `);
@@ -143,6 +147,7 @@ describe("OpenAPI 3 generator", () => {
           "enum": Array [
             -1000,
           ],
+          "format": "int32",
           "type": "integer",
         }
       `);

diff --git a/lib/src/generators/contract/openapi3-schema.ts b/lib/src/generators/contract/openapi3-schema.ts
@@ -69,11 +69,13 @@ export function openApi3TypeSchema(
       return Math.round(type.value) === type.value
         ? {
             type: "integer",
-            enum: [type.value]
+            enum: [type.value],
+            format: "int32"
           }
         : {
             type: "number",
-            enum: [type.value]
+            enum: [type.value],
+            format: "float"
           };
     case TypeKind.INT32:
       return {
@@ -225,11 +227,13 @@ export interface OpenAPI3SchemaTypeString extends OpenAPI3BaseSchemaType {
 export interface OpenAPI3SchemaTypeNumber extends OpenAPI3BaseSchemaType {
   type: "number";
   enum?: number[];
+  format: "float" | "double";
 }
 
 export interface OpenAPI3SchemaTypeInteger extends OpenAPI3BaseSchemaType {
   type: "integer";
   enum?: number[];
+  format: "int32" | "int64";
 }
 
 export interface OpenAPI3SchemaTypeDateTime extends OpenAPI3BaseSchemaType {