Remove conversion from common name to type/format (closes #4)

Author: mikunn

index.js

@@ -120,10 +120,7 @@ function convertProperties(properties, options) {
 }
 
 function convertTypes(schema, options) {
-	var newType
-		, newFormat
-		, toDateTime = options.dateToDateTime
-	;
+	var toDateTime = options.dateToDateTime;
 
 	if (schema.type === undefined) {
 		return schema;
@@ -133,52 +130,6 @@ function convertTypes(schema, options) {
 		schema.format = 'date-time';
 	}
 
-	switch(schema.type) {
-		case 'integer':
-			newType = 'integer';
-			break;
-		case 'long':
-			newType = 'integer';
-			newFormat = 'int64';
-			break;
-		case 'float':
-			newType = 'number';
-			newFormat = 'float';
-			break;
-		case 'double':
-			newType = 'number';
-			newFormat = 'double';
-			break;
-		case 'byte':
-			newType = 'string';
-			newFormat = 'byte';
-			break;
-		case 'binary':
-			newType = 'string';
-			newFormat = 'binary';
-			break;
-		case 'date':
-			newType = 'string';
-			newFormat = 'date';
-			if (toDateTime === true) {
-				newFormat = 'date-time';
-			}
-			break;
-		case 'dateTime':
-			newType = 'string';
-			newFormat = 'date-time';
-			break;
-		case 'password':
-			newType = 'string';
-			newFormat = 'password';
-			break;
-		default:
-			newType = schema.type;
-	}
-
-	schema.type = newType;
-	schema.format = typeof newFormat === 'string' ? newFormat : schema.format;
-
 	if (! schema.format) {
 		delete schema.format;
 	}

test/combination_keywords.js

@@ -2,7 +2,7 @@ var test = require('tape')
 	, convert = require('../')
 ;
 
-test('iterates allOfs and converts types', function(assert) {
+test('iterates allOfs', function(assert) {
 	var schema
 		, result
 		, expected
@@ -17,14 +17,16 @@ test('iterates allOfs and converts types', function(assert) {
 				required: ['foo'],
 				properties: {
 					foo: {
-						type: 'long'
+						type: 'integer',
+						format: 'int64'
 					}
 				}
 			},
 			{
 				allOf: [
 					{
-						type: 'double'
+						type: 'number',
+						format: 'double'
 					}
 				]
 			}
@@ -60,7 +62,7 @@ test('iterates allOfs and converts types', function(assert) {
 	assert.deepEqual(result, expected, 'iterated allOfs');
 });
 
-test('iterates anyOfs and converts types', function(assert) {
+test('iterates anyOfs', function(assert) {
 	var schema
 		, result
 		, expected
@@ -75,7 +77,7 @@ test('iterates anyOfs and converts types', function(assert) {
 				required: ['foo'],
 				properties: {
 					foo: {
-						type: 'long'
+						type: 'integer'
 					}
 				}
 			},
@@ -85,7 +87,7 @@ test('iterates anyOfs and converts types', function(assert) {
 						type: 'object',
 						properties: {
 							bar: {
-								type: 'double'
+								type: 'number'
 							}
 						}
 					}
@@ -105,7 +107,6 @@ test('iterates anyOfs and converts types', function(assert) {
 				properties: {
 					foo: {
 						type: 'integer',
-						format: 'int64'
 					}
 				}
 			},
@@ -116,7 +117,6 @@ test('iterates anyOfs and converts types', function(assert) {
 						properties: {
 							bar: {
 								type: 'number',
-								format: 'double'
 							}
 						}
 					}
@@ -128,7 +128,7 @@ test('iterates anyOfs and converts types', function(assert) {
 	assert.deepEqual(result, expected, 'anyOfs iterated');
 });
 
-test('iterates oneOfs and converts types', function(assert) {
+test('iterates oneOfs', function(assert) {
 	var schema
 		, result
 		, expected
@@ -143,7 +143,7 @@ test('iterates oneOfs and converts types', function(assert) {
 				required: ['foo'],
 				properties: {
 					foo: {
-						type: 'long'
+						type: 'integer'
 					}
 				}
 			},
@@ -153,7 +153,7 @@ test('iterates oneOfs and converts types', function(assert) {
 						type: 'object',
 						properties: {
 							bar: {
-								type: 'double'
+								type: 'number'
 							}
 						}
 					}
@@ -173,7 +173,6 @@ test('iterates oneOfs and converts types', function(assert) {
 				properties: {
 					foo: {
 						type: 'integer',
-						format: 'int64'
 					}
 				}
 			},
@@ -184,7 +183,6 @@ test('iterates oneOfs and converts types', function(assert) {
 						properties: {
 							bar: {
 								type: 'number',
-								format: 'double'
 							}
 						}
 					}
@@ -208,7 +206,8 @@ test('converts types in not', function(assert) {
 		type: 'object',
 		properties: {
 			not: {
-				type: 'password',
+				type: 'string',
+				format: 'password',
 				minLength: 8 
 			}
 		}
@@ -241,7 +240,8 @@ test('converts types in not', function(assert) {
 
 	schema = {
 		not: {
-			type: 'password',
+			type: 'string',
+			format: 'password',
 			minLength: 8 
 		}
 	};

test/items.js

@@ -13,7 +13,8 @@ test('items', function(assert) {
 	schema = {
 		type: 'array',
 		items: {
-			type: 'dateTime',
+			type: 'string',
+			format: 'date-time',
 			example: '2017-01-01T12:34:56Z'
 		}
 	};

test/numeric_types.js

@@ -2,13 +2,13 @@ var test = require('tape')
 	, convert = require('../')
 ;
 
-test('converts integer types', function(assert) {
+test('handles integer types', function(assert) {
 	var schema
 		, result
 		, expected
 	;
 
-	assert.plan(3);
+	assert.plan(2);
 
 	schema = {
 		type: 'integer',
@@ -21,73 +21,31 @@ test('converts integer types', function(assert) {
 		type: 'integer',
 	};
 
-	assert.deepEqual(result, expected, 'plain integer not changed');
+	assert.deepEqual(result, expected, 'integer type untouched');
 
 	schema = {
 		type: 'integer',
-		format: 'int64'
+		format: 'int32',
 	};
 
 	result = convert(schema);
 
 	expected = {
 		$schema: 'http://json-schema.org/draft-04/schema#',
 		type: 'integer',
-		format: 'int64'
+		format: 'int32'
 	};
 
-	assert.deepEqual(result, expected, 'respects integer format');
-
-	schema = {
-		type: 'long',
-	};
-
-	result = convert(schema);
-
-	expected = {
-		$schema: 'http://json-schema.org/draft-04/schema#',
-		type: 'integer',
-		format: 'int64'
-	};
-
-	assert.deepEqual(result, expected, 'long converted');
+	assert.deepEqual(result, expected, 'integer type and format untouched');
 });
 
-test('converts number types', function(assert) {
+test('handles number types', function(assert) {
 	var schema
 		, result
 		, expected
 	;
 
-	assert.plan(4);
-
-	schema = {
-		type: 'float',
-	};
-
-	result = convert(schema);
-
-	expected = {
-		$schema: 'http://json-schema.org/draft-04/schema#',
-		type: 'number',
-		format: 'float'
-	};
-
-	assert.deepEqual(result, expected, 'float converted');
-
-	schema = {
-		type: 'double',
-	};
-
-	result = convert(schema);
-
-	expected = {
-		$schema: 'http://json-schema.org/draft-04/schema#',
-		type: 'number',
-		format: 'double'
-	};
-
-	assert.deepEqual(result, expected, 'double converted');
+	assert.plan(2);
 
 	schema = {
 		type: 'number',
@@ -100,7 +58,7 @@ test('converts number types', function(assert) {
 		type: 'number',
 	};
 
-	assert.deepEqual(result, expected, 'number untouched');
+	assert.deepEqual(result, expected, 'number type untouched');
 
 	schema = {
 		type: 'number',
@@ -115,5 +73,5 @@ test('converts number types', function(assert) {
 		format: 'float'
 	};
 
-	assert.deepEqual(result, expected, 'number and format untouched');
+	assert.deepEqual(result, expected, 'number type and format untouched');
 });

test/properties.js

@@ -134,7 +134,8 @@ test('additionalProperties is an object', function(assert) {
 			type: 'object',
 			properties: {
 				foo: {
-					type: 'dateTime'
+					type: 'string',
+					format: 'date-time'
 				}
 			}
 		}