Add a new SchemaBuilder types.

petersirka · petersirka · commit b5dd9b579155 · 2016-12-04T23:12:28.000+01:00
diff --git a/builders.js b/builders.js
@@ -330,8 +330,14 @@ SchemaBuilderEntity.prototype.$parse = function(name, value, required, custom) {
 		return result;
 	}
 
-	if (type === 'object')
+	if (type === 'object') {
+		if (value instanceof Array) {
+			result.type = 8; // enum
+			result.subtype = typeof(value[0]);
+		} else
+			result.type = 9; // keyvalue
 		return result;
+	}
 
 	if (value[0] === '[') {
 		value = value.substring(1, value.length - 1);
@@ -1135,6 +1141,11 @@ SchemaBuilderEntity.prototype.default = function() {
 						item[property] = tmp.default();
 				}
 				break;
+			// enum + keyvalue
+			case 8:
+			case 9:
+				item[property] = undefined;
+				break;
 		}
 	}
 
@@ -1323,6 +1334,20 @@ SchemaBuilderEntity.prototype.prepare = function(model, dependencies) {
 					item[property] = self.$onprepare(property, model[property], undefined, model);
 					break;
 
+				// enum
+				case 8:
+					tmp = self.$onprepare(property, model[property], undefined, model);
+					if (type.subtype === 'number' && typeof(tmp) === 'string')
+						tmp = tmp.parseFloat(null);
+					item[property] = tmp != null && type.raw.indexOf(tmp) !== -1 ? tmp : undefined;
+					break;
+
+				// keyvalue
+				case 9:
+					tmp = self.$onprepare(property, model[property], undefined, model);
+					item[property] = tmp != null ? type.raw[tmp] : undefined;
+					break;
+
 				// schema
 				case 7:
 
diff --git a/changes.txt b/changes.txt
@@ -2,6 +2,7 @@
 
 - added: support for `/workflows` file (more in documentation)
 - added: `ShcemaBuilderEntity.$exec(name, callback)` (more in documentation)
+- added: `SchemaBuilder` supports new types `enum` and `keyvalue`
 - added: `controller.$exec(name, [options], [callback])` (more in documentation)
 - added: a new argument `description` to each SchemaBuilder `set` + `add` method e.g. `.setSave()`, `.addWorkflow()`, etc..
 - added: `SchemaBuilder.meta` contains all registered handlers with their descriptions
diff --git a/test/test-builders.js b/test/test-builders.js
@@ -431,6 +431,25 @@ function test_Schema() {
 			assert.ok(response.counter === 4, 'Problem with hooks');
 		});
 	});
+
+	NEWSCHEMA('EnumKeyValue').make(function(schema) {
+		schema.define('enum_int', [1, 2, 0.3, 4], true);
+		schema.define('enum_string', ['Peter', 'Širka'], true);
+		schema.define('keyvalue', { 'peter': 1, 'lucia': 2 }, true);
+
+		schema.make({ enum_int: '0.3', 'keyvalue': 'lucia', enum_string: 'Širka' }, function(err, response) {
+			assert.ok(response.enum_int === 0.3, 'Schema enums (int)');
+			assert.ok(response.enum_string === 'Širka', 'Schema enums (int)');
+			assert.ok(response.keyvalue === 2, 'Schema keyvalue');
+		});
+
+		schema.make({ enum_int: '5', 'keyvalue': 'luciaa', enum_string: 'Širkaa' }, function(err) {
+			assert.ok(err.items[0].path === 'EnumKeyValue.enum_int', 'Schema enums (int) 2');
+			assert.ok(err.items[1].path === 'EnumKeyValue.enum_string', 'Schema enums (string) 2');
+			assert.ok(err.items[2].path === 'EnumKeyValue.keyvalue', 'Schema keyvalue 2');
+		});
+
+	});
 }
 
 function test_ErrorBuilder() {
diff --git a/utils.js b/utils.js
@@ -1716,12 +1716,14 @@ function validate_builder_default(name, value, entity) {
 
 	var type = typeof(value);
 
+	// Enum + KeyValue (8+9)
+	if (entity.type > 7)
+		return value !== undefined;
+
 	switch (entity.subtype) {
 		case 'uid':
 			var number = parseInt(value.substring(10, value.length - 4), 10);
-			if (isNaN(number))
-				return false;
-			return value[value.length - 1] === (number % 2 ? '1' : '0');
+			return isNaN(number) ? false : value[value.length - 1] === (number % 2 ? '1' : '0');
 		case 'zip':
 			return value.isZIP();
 		case 'email':
@@ -1737,7 +1739,7 @@ function validate_builder_default(name, value, entity) {
 	if (type === 'number')
 		return value > 0;
 
-	if (type === 'string')
+	if (type === 'string' || value instanceof Array)
 		return value.length > 0;
 
 	if (type === 'boolean')
@@ -1746,9 +1748,6 @@ function validate_builder_default(name, value, entity) {
 	if (value == null)
 		return false;
 
-	if (value instanceof Array)
-		return value.length > 0;
-
 	if (value instanceof Date)
 		return value.toString()[0] !== 'I'; // Invalid Date
 
@@ -4239,10 +4238,6 @@ Array.prototype.remove = function(cb, value) {
 	return arr;
 };
 
-Array.prototype.random = function() {
-	return this[exports.random(this.length - 1)];
-};
-
 Array.prototype.wait = Array.prototype.waitFor = function(onItem, callback, thread) {
 
 	var self = this;
