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

mikunn · mikunn · commit f68f368f79e8 · 2018-04-04T09:01:02.000+03:00
diff --git a/index.js b/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;
 	}
diff --git a/test/combination_keywords.js b/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 
 		}
 	};
diff --git a/test/items.js b/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'
 		}
 	};
diff --git a/test/numeric_types.js b/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');
 });
diff --git a/test/properties.js b/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'
 				}
 			}
 		}
diff --git a/test/string_types.js b/test/string_types.js

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ var test = require('tape')`
`2`	`2`	`, convert = require('../')`
`3`	`3`	`;`
`4`	`4`
`5`		`-test('iterates allOfs and converts types', function(assert) {`
	`5`	`+test('iterates allOfs', function(assert) {`
`6`	`6`	`var schema`
`7`	`7`	`, result`
`8`	`8`	`, expected`
`@@ -17,14 +17,16 @@ test('iterates allOfs and converts types', function(assert) {`
`17`	`17`	`required: ['foo'],`
`18`	`18`	`properties: {`
`19`	`19`	`foo: {`
`20`		`- type: 'long'`
	`20`	`+ type: 'integer',`
	`21`	`+ format: 'int64'`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`},`
`24`	`25`	`{`
`25`	`26`	`allOf: [`
`26`	`27`	`{`
`27`		`- type: 'double'`
	`28`	`+ type: 'number',`
	`29`	`+ format: 'double'`
`28`	`30`	`}`
`29`	`31`	`]`
`30`	`32`	`}`
`@@ -60,7 +62,7 @@ test('iterates allOfs and converts types', function(assert) {`
`60`	`62`	`assert.deepEqual(result, expected, 'iterated allOfs');`
`61`	`63`	`});`
`62`	`64`
`63`		`-test('iterates anyOfs and converts types', function(assert) {`
	`65`	`+test('iterates anyOfs', function(assert) {`
`64`	`66`	`var schema`
`65`	`67`	`, result`
`66`	`68`	`, expected`
`@@ -75,7 +77,7 @@ test('iterates anyOfs and converts types', function(assert) {`
`75`	`77`	`required: ['foo'],`
`76`	`78`	`properties: {`
`77`	`79`	`foo: {`
`78`		`- type: 'long'`
	`80`	`+ type: 'integer'`
`79`	`81`	`}`
`80`	`82`	`}`
`81`	`83`	`},`
`@@ -85,7 +87,7 @@ test('iterates anyOfs and converts types', function(assert) {`
`85`	`87`	`type: 'object',`
`86`	`88`	`properties: {`
`87`	`89`	`bar: {`
`88`		`- type: 'double'`
	`90`	`+ type: 'number'`
`89`	`91`	`}`
`90`	`92`	`}`
`91`	`93`	`}`
`@@ -105,7 +107,6 @@ test('iterates anyOfs and converts types', function(assert) {`
`105`	`107`	`properties: {`
`106`	`108`	`foo: {`
`107`	`109`	`type: 'integer',`
`108`		`- format: 'int64'`
`109`	`110`	`}`
`110`	`111`	`}`
`111`	`112`	`},`
`@@ -116,7 +117,6 @@ test('iterates anyOfs and converts types', function(assert) {`
`116`	`117`	`properties: {`
`117`	`118`	`bar: {`
`118`	`119`	`type: 'number',`
`119`		`- format: 'double'`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`
`@@ -128,7 +128,7 @@ test('iterates anyOfs and converts types', function(assert) {`
`128`	`128`	`assert.deepEqual(result, expected, 'anyOfs iterated');`
`129`	`129`	`});`
`130`	`130`
`131`		`-test('iterates oneOfs and converts types', function(assert) {`
	`131`	`+test('iterates oneOfs', function(assert) {`
`132`	`132`	`var schema`
`133`	`133`	`, result`
`134`	`134`	`, expected`
`@@ -143,7 +143,7 @@ test('iterates oneOfs and converts types', function(assert) {`
`143`	`143`	`required: ['foo'],`
`144`	`144`	`properties: {`
`145`	`145`	`foo: {`
`146`		`- type: 'long'`
	`146`	`+ type: 'integer'`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`},`
`@@ -153,7 +153,7 @@ test('iterates oneOfs and converts types', function(assert) {`
`153`	`153`	`type: 'object',`
`154`	`154`	`properties: {`
`155`	`155`	`bar: {`
`156`		`- type: 'double'`
	`156`	`+ type: 'number'`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
`@@ -173,7 +173,6 @@ test('iterates oneOfs and converts types', function(assert) {`
`173`	`173`	`properties: {`
`174`	`174`	`foo: {`
`175`	`175`	`type: 'integer',`
`176`		`- format: 'int64'`
`177`	`176`	`}`
`178`	`177`	`}`
`179`	`178`	`},`
`@@ -184,7 +183,6 @@ test('iterates oneOfs and converts types', function(assert) {`
`184`	`183`	`properties: {`
`185`	`184`	`bar: {`
`186`	`185`	`type: 'number',`
`187`		`- format: 'double'`
`188`	`186`	`}`
`189`	`187`	`}`
`190`	`188`	`}`
`@@ -208,7 +206,8 @@ test('converts types in not', function(assert) {`
`208`	`206`	`type: 'object',`
`209`	`207`	`properties: {`
`210`	`208`	`not: {`
`211`		`- type: 'password',`
	`209`	`+ type: 'string',`
	`210`	`+ format: 'password',`
`212`	`211`	`minLength: 8`
`213`	`212`	`}`
`214`	`213`	`}`
`@@ -241,7 +240,8 @@ test('converts types in not', function(assert) {`
`241`	`240`
`242`	`241`	`schema = {`
`243`	`242`	`not: {`
`244`		`- type: 'password',`
	`243`	`+ type: 'string',`
	`244`	`+ format: 'password',`
`245`	`245`	`minLength: 8`
`246`	`246`	`}`
`247`	`247`	`};`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ test('additionalProperties is an object', function(assert) {`
`134`	`134`	`type: 'object',`
`135`	`135`	`properties: {`
`136`	`136`	`foo: {`
`137`		`- type: 'dateTime'`
	`137`	`+ type: 'string',`
	`138`	`+ format: 'date-time'`
`138`	`139`	`}`
`139`	`140`	`}`
`140`	`141`	`}`