Merge pull request #2 from thedumbterminal/typeArray

support fields types as arrays and descriptions

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.0.3 (25/07/2018)
+
+* Now supporting fields with type(s) as an array.
+
 ## v0.0.2 (23/07/2018)
 
 * Required fields supported.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonschema-bigquery",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Convert JSON schema to Google BigQuery schema",
   "main": "src/index.js",
   "scripts": {

src/index.js

@@ -27,23 +27,37 @@ jsonSchemaBigquery._convertProperties = (schema, required = []) => {
 		if(jsonSchemaBigquery._isComplex(schema[item])){
 			return jsonSchemaBigquery._convertComplexProperty(item, schema[item])
 		}
-		const initialMode = jsonSchemaBigquery._initialMode(required, item)
-		return jsonSchemaBigquery._convertProperty(item, schema[item], initialMode)
+		const mode = jsonSchemaBigquery._getMode(required, item, schema[item])
+		return jsonSchemaBigquery._convertProperty(item, schema[item], mode)
 	})
 }
 
-jsonSchemaBigquery._initialMode = (required, field) => {
-	return required.includes(field) ? 'REQUIRED' : 'NULLABLE'
+jsonSchemaBigquery._getMode = (required, name, item) => {
+	if(Array.isArray(item.type) && item.type.includes('null')){
+		return 'NULLABLE'
+	}
+	return required.includes(name) ? 'REQUIRED' : 'NULLABLE'
 }
 
 jsonSchemaBigquery._convertProperty = (name, value, mode) => {
 	return {
 		name: name,
-		type: typeMapping[value.type],
+		type: jsonSchemaBigquery._getType(value.type),
 		mode: mode
 	}
 }
 
+jsonSchemaBigquery._getType = (types) => {
+	if(!Array.isArray(types)){
+		return typeMapping[types]
+	}
+	const notNullTypes = types.filter(item => item !== 'null')
+	if(notNullTypes.length > 1){
+		throw new Error('Multiple types are not allowed')
+	}
+	return typeMapping[notNullTypes[0]]
+}
+
 jsonSchemaBigquery._convertComplexProperty = (name, contents) => {
 	return {
 		name: name,

test/samples/typeArray/expected.json

@@ -0,0 +1,16 @@
+{
+	"schema": {
+		"fields": [
+			{
+				"name": "first_name",
+				"type": "STRING",
+				"mode": "NULLABLE"
+			},
+			{
+				"name": "last_name",
+				"type": "STRING",
+				"mode": "NULLABLE"
+			}
+		]
+	}
+}

test/samples/typeArray/input.json

@@ -0,0 +1,24 @@
+{
+	"id": "http://yourdomain.com/schemas/myschema.json",
+	"description": "Example description",
+	"type": "object",
+	"properties": {
+		"first_name": {
+			"description": "the first name",
+			"type": [
+				"string",
+				"null"
+			]
+		},
+		"last_name": {
+			"description": "the first name",
+			"type": [
+				"string",
+				"null"
+			]
+		}
+	},
+	"required": [
+		"first_name"
+	]
+}