Merge branch 'feat/strict-mode' of https://github.com/stoplightio/openapi-schema-to-json-schema

Author: Phil Sturgeon

index.js

@@ -39,6 +39,7 @@ function resolveOptions(options) {
 	options.cloneSchema = options.cloneSchema == false ? false : true;
 	options.supportPatternProperties = options.supportPatternProperties || false;
 	options.keepNotSupported = options.keepNotSupported || [];
+	options.strictMode = options.strictMode == false ? false : true;
 
 	if (typeof options.patternPropertiesHandler !== 'function') {
 		options.patternPropertiesHandler = patternPropertiesHandler;

lib/converters/parameter.js

@@ -5,31 +5,34 @@ module.exports = convertFromParameter;
 
 // Convert from OpenAPI 3.0 `ParameterObject` to JSON schema v4
 function convertFromParameter(parameter, options) {
-	if (parameter.schema !== undefined) {
-		return convertParameterSchema(parameter, parameter.schema, options);
-	} else if (parameter.content !== undefined) {
-		return convertFromContents(parameter, options);
-	} else {
-		throw new InvalidInputError('OpenAPI parameter must have either a \'schema\' or a \'content\' property');
-	}
+  if (parameter.schema !== undefined) {
+    return convertParameterSchema(parameter, parameter.schema, options);
+  } else if (parameter.content !== undefined) {
+    return convertFromContents(parameter, options);
+  } else {
+    if (options.strictMode) {
+      throw new InvalidInputError('OpenAPI parameter must have either a \'schema\' or a \'content\' property');
+    }
+    return convertParameterSchema(parameter, {}, options);
+  }
 }
 
 function convertFromContents(parameter, options) {
-	var schemas = {};
+  var schemas = {};
 
-	for (var mime in parameter.content) {
-		schemas[mime] = convertParameterSchema(parameter, parameter.content[mime].schema, options);
-	}
+  for (var mime in parameter.content) {
+    schemas[mime] = convertParameterSchema(parameter, parameter.content[mime].schema, options);
+  }
 
-	return schemas;
+  return schemas;
 }
 
 function convertParameterSchema(parameter, schema, options) {
-	var jsonSchema = convertFromSchema(schema || {}, options);
+  var jsonSchema = convertFromSchema(schema || {}, options);
 
-	if (parameter.description) {
-		jsonSchema.description = parameter.description;
-	}
+  if (parameter.description) {
+    jsonSchema.description = parameter.description;
+  }
 
-	return jsonSchema;
+  return jsonSchema;
 }

lib/converters/schema.js

@@ -15,6 +15,7 @@ function convertFromSchema(schema, options) {
 function convertSchema(schema, options) {
 	var structs = options._structs
 		, notSupported = options._notSupported
+		, strictMode = options.strictMode
 		, i = 0
 		, j = 0
 		, struct = null
@@ -55,7 +56,10 @@ function convertSchema(schema, options) {
 		}
 	}
 
-	validateType(schema.type);
+	if (strictMode) {
+		validateType(schema.type);
+	}
+
 	schema = convertTypes(schema);
 	schema = convertFormat(schema, options);
 
@@ -71,7 +75,7 @@ function convertSchema(schema, options) {
 }
 
 function validateType(type) {
-	var validTypes = ['integer', 'number', 'string', 'boolean', 'object', 'array'];
+	var validTypes = ['integer', 'number', 'string', 'boolean', 'object', 'array', 'null'];
 
 	if (validTypes.indexOf(type) < 0 && type !== undefined) {
 		throw new InvalidTypeError('Type ' + JSON.stringify(type) + ' is not a valid type');