Fix #66

kminami · May 16, 2022 · e370201 · e370201
1 parent 3c0ace1
commit e370201
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apib2swagger",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "Convert API Blueprint to Swagger.",
   "bin": "./bin/apib2swagger.js",
   "scripts": {

diff --git a/src/mson_to_json_schema.js b/src/mson_to_json_schema.js
@@ -51,11 +51,11 @@ function convert(mson, options) {
     schema.required = [];
     schema.properties = {};
     for (var j = 0; mson.content && j < mson.content.length; j++) {
-        var member = mson.content[j];
+        const member = mson.content[j];
         if (member.element !== "member") continue;
-        schema.properties[member.content.key.content] = convert(member.content.value, options);
+        var propertySchema = convert(member.content.value, options);
         if (member.meta && member.meta.description) {
-            schema.properties[member.content.key.content].description = member.meta.description;
+            propertySchema.description = member.meta.description;
         }
         var fixedType = false;
         if (member.attributes && member.attributes.typeAttributes) {
@@ -68,14 +68,19 @@ function convert(mson, options) {
                         schema.required.push(member.content.key.content);
                         break;
                     case 'nullable':
-                        schema.properties[member.content.key.content].type = [schema.properties[member.content.key.content].type, 'null']
+                        if (propertySchema.$ref) {
+                            propertySchema = {oneOf: [propertySchema, {type: 'null'}]};
+                        } else {
+                            propertySchema.type = [propertySchema.type, 'null']
+                        }
                         break;
                 }
             });
         }
-        if (schema.properties[member.content.key.content].type === 'array' && !fixedType) {
-            schema.properties[member.content.key.content].items = {}; // reset item schema
+        if (propertySchema.type === 'array' && !fixedType) {
+            propertySchema.items = {}; // reset item schema
         }
+        schema.properties[member.content.key.content] = propertySchema;
     }
 
     // According to schema definition, required is a stringArray, which must be non-empty

diff --git a/test/input/OpenAPI3_Issue-#66.md b/test/input/OpenAPI3_Issue-#66.md
@@ -0,0 +1,6 @@
+# Data Structures
+## ImagesType (object)
++ `name` (string)
+
+## BodyType (object)
++ images (required, nullable, ImagesType)
diff --git a/test/output/OpenAPI3_Issue-#66.json b/test/output/OpenAPI3_Issue-#66.json
@@ -0,0 +1,40 @@
+{
+  "openapi": "3.0.3",
+  "info": {
+    "title": "",
+    "version": "1.0.0",
+    "description": ""
+  },
+  "paths": {},
+  "components": {
+    "schemas": {
+      "ImagesType": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "BodyType": {
+        "type": "object",
+        "required": [
+          "images"
+        ],
+        "properties": {
+          "images": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ImagesType"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/test/output/OpenAPI3_Issue-#66.ref.json b/test/output/OpenAPI3_Issue-#66.ref.json
@@ -0,0 +1,40 @@
+{
+  "openapi": "3.0.3",
+  "info": {
+    "title": "",
+    "version": "1.0.0",
+    "description": ""
+  },
+  "paths": {},
+  "components": {
+    "schemas": {
+      "ImagesType": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "BodyType": {
+        "type": "object",
+        "required": [
+          "images"
+        ],
+        "properties": {
+          "images": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ImagesType"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/test/test.js b/test/test.js
@@ -55,7 +55,8 @@ var remote = 'https://raw.githubusercontent.com/apiaryio/api-blueprint/format-1A
         'OpenAPI3_headers.md',
         'OpenAPI3_includes.md',
         'OpenAPI3_attributes.md',
-        'OpenAPI3_Issue-#58.md'
+        'OpenAPI3_Issue-#58.md',
+        'OpenAPI3_Issue-#66.md'
     ];
 
 var fetch = function (file) {