alchemymvc 1.2.8 → 1.3.1

package/lib/app/helper_model/model.js

@@ -1,21 +1,16 @@
-var fallback_datasource,
-    model_info,
+let class_cache = new Map(),
+    fallback_datasource,
     TABLE = Symbol('table');
 
 if (Blast.isBrowser) {
 	Blast.once('hawkejs_init', function gotScene(hawkejs, variables, settings, view) {
 
-		var ModelClass,
-		    model_name,
-		    config,
-		    key;
-
-		model_info = hawkejs.scene.exposed.model_info;
+		let config;
 
-		for (model_name in model_info) {
-			config = model_info[model_name];
-			ModelClass = Model.getClass(model_name);
-			config.schema.setModel(model_name);
+		for (config of hawkejs.scene.exposed.model_info) {
+			// First get or create the client-side Model class,
+			// then set some extra configuration coming from the server-side
+			Model.getClass(config.name).setModelConfig(config);
 		}
 	});
 }
@@ -90,6 +85,30 @@ Model.setStatic(function hasServerAction(action) {
 	return !!config;
 });
 
+/**
+ * Set the Model configuration
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @param    {Object}    config
+ */
+Model.setStatic(function setModelConfig(config) {
+
+	let model_name = this.model_name;
+
+	config.schema.setModel(model_name);
+
+	if (!this.prototype.hasOwnProperty('primary_key')) {
+		this.setProperty('primary_key', config.primary_key);
+	}
+
+	if (!this.prototype.hasOwnProperty('display_field')) {
+		this.setProperty('display_field', config.display_field);
+	}
+});
+
 /**
  * Table name to use in the database.
  * False if no table should be used.
@@ -142,6 +161,19 @@ Model.setProperty(function datasource() {
 	return fallback_datasource;
 });
 
+/**
+ * Does this model have translatable fields?
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @type     {Boolean}
+ */
+Model.setProperty(function has_translatable_fields() {
+	return this.schema.has_translatable_fields;
+});
+
 /**
  * The conduit
  *
@@ -188,50 +220,43 @@ Model.prepareStaticProperty('Document', function getDocumentClass() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.0.0
- * @version  1.2.7
+ * @version  1.3.1
  *
  * @param    {String}   model_name
  * @param    {Boolean}  allow_create
+ * @param    {String}   parent
  */
-Model.setStatic(function getClass(model_name, allow_create ) {
-
-	var model_constructor,
-	    parent_path,
-	    class_name,
-	    class_path,
-	    ModelClass,
-	    config,
-	    key;
+Model.setStatic(function getClass(model_name, allow_create, parent) {
+
+	if (class_cache.has(model_name)) {
+		return class_cache.get(model_name);
+	}
 
 	// Construct the name of the class
-	class_name = model_name;
+	let class_name = model_name;
 
 	// Construct the path to this class
-	class_path = 'Alchemy.Client.Model.' + class_name;
+	let class_path = 'Alchemy.Client.Model.' + class_name;
 
 	// Get the class
-	ModelClass = Object.path(Blast.Classes, class_path);
+	let ModelClass = Object.path(Blast.Classes, class_path);
 
 	if (allow_create == null) {
 		allow_create = true;
 	}
 
 	if (ModelClass == null && allow_create) {
-		model_constructor = Function.create(class_name, function ModelConstructor(record, options) {
+		let config;
+
+		let model_constructor = Function.create(class_name, function ModelConstructor(record, options) {
 			ModelConstructor.wrapper.super.call(this, record, options);
 		});
 
 		// @TODO: inherit from parents
-		parent_path = 'Alchemy.Client.Model';
-
-		if (Blast.isBrowser && window._hawkejs_static_expose) {
-			let exposed = window._hawkejs_static_expose;
-
-			config = exposed.model_info;
+		let parent_path = 'Alchemy.Client.Model';
 
-			if (config) {
-				config = config[model_name];
-			}
+		if (Blast.isBrowser) {
+			// No longer needed
 		} else if (Blast.isNode) {
 			config = alchemy.getModel(model_name, false);
 
@@ -245,8 +270,12 @@ Model.setStatic(function getClass(model_name, allow_create ) {
 		}
 
 		if (config && config.parent) {
-			getClass(config.parent);
-			parent_path += '.' + config.parent;
+			parent = config.parent;
+		}
+
+		if (parent) {
+			getClass(parent);
+			parent_path += '.' + parent;
 		}
 
 		ModelClass = Function.inherits(parent_path, model_constructor);
@@ -268,6 +297,8 @@ Model.setStatic(function getClass(model_name, allow_create ) {
 		}
 	}
 
+	class_cache.set(model_name, ModelClass);
+
 	return ModelClass;
 });
 
@@ -349,7 +380,7 @@ Model.setProperty(function name() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param    {Object}   options
  */
@@ -371,7 +402,7 @@ Model.setMethod(function init(options) {
 	}
 
 	// Initialize behaviours
-	if (this.schema && this.schema.hasBehaviours && this.initBehaviours) {
+	if (this.schema && this.schema.has_behaviours && this.initBehaviours) {
 		this.initBehaviours();
 	}
 });
@@ -568,7 +599,7 @@ Model.setMethod(function getAliasModel(alias) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.2.5
+ * @version  1.3.0
  *
  * @param    {String}     type       The type of find (first, all)
  * @param    {Criteria}   criteria   The criteria object
@@ -626,10 +657,17 @@ Model.setMethod(function find(type, criteria, callback) {
 		return pledge;
 	}
 
+	if (this.conduit) {
+		criteria.conduit = this.conduit;
+	}
+
+	if (!criteria.options.locale && this.conduit) {
+		criteria.setOption('locale', this.conduit.prefix);
+	}
+
 	let that = this,
 	    available,
 	    records,
-	    query,
 	    Type;
 
 	// The criteria instance has to know about the model
@@ -1310,8 +1348,7 @@ Model.setMethod(function save(data, _options, _callback) {
 		return iter.hasNext();
 	}, function saveData(next) {
 
-		var document = iter.next().value,
-		    temp;
+		var document = iter.next().value;
 
 		// Skip invalid items
 		if (!document) {
@@ -1360,9 +1397,9 @@ Model.setMethod(function save(data, _options, _callback) {
  * Create a new document.
  * If data is given, the document is populated
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param    {Object}    data     Optional data
  * @param    {Object}    options
@@ -1371,13 +1408,15 @@ Model.setMethod(function save(data, _options, _callback) {
  */
 Model.setMethod(function createDocument(data, options) {
 
-	var doc;
+	let original_record;
 
 	if (!options) {
 		options = {};
 	}
 
 	if (data && this.constructor.Document.isDocument(data)) {
+		original_record = data.$attributes.original_record;
+
 		data = {
 			[data.$model_alias] : data.$main,
 		};
@@ -1385,7 +1424,11 @@ Model.setMethod(function createDocument(data, options) {
 
 	options.model = this;
 
-	doc = new this.constructor.Document(data, options);
+	let doc = new this.constructor.Document(data, options);
+
+	if (original_record) {
+		doc.$attributes.original_record = original_record;
+	}
 
 	return doc;
 });
@@ -1477,11 +1520,14 @@ Model.setProperty(function model_info() {
 			return {};
 		}
 
-		if (!hawkejs.scene.exposed.model_info[name]) {
-			hawkejs.scene.exposed.model_info[name] = {};
-		}
+		let config;
 
-		data = hawkejs.scene.exposed.model_info[name];
+		for (config of hawkejs.scene.exposed.model_info) {
+			if (config.name === name) {
+				data = config;
+				break;
+			}
+		}
 	} else {
 
 		let MainClass = Blast.Classes.Alchemy.Model[name];
@@ -1699,7 +1745,7 @@ Model.setMethod(function compose(data, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.1
+ * @version  1.3.1
  *
  * @param    {Object}     data       The record data to check
  * @param    {Object}     options
@@ -1725,6 +1771,10 @@ Model.setMethod(function createRecord(data, options, callback) {
 			return callback(err);
 		}
 
+		if (!that.datasource) {
+			return callback(new Error('Model "' + that.model_name + '" has no datasource'));
+		}
+
 		that.datasource.create(that, data, options, function afterCreate(err, result) {
 
 			if (err != null) {
@@ -1743,7 +1793,7 @@ Model.setMethod(function createRecord(data, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.1
+ * @version  1.3.1
  *
  * @param    {Object}     data       The record data to check
  * @param    {Object}     options
@@ -1770,6 +1820,10 @@ Model.setMethod(function updateRecord(data, options, callback) {
 			return callback(err);
 		}
 
+		if (!that.datasource) {
+			return callback(new Error('Model "' + that.model_name + '" has no datasource'));
+		}
+
 		that.datasource.update(that, data, options, function afterUpdate(err, result) {
 
 			if (err != null) {

package/lib/app/helper_validator/00_validator.js

@@ -60,13 +60,13 @@ Validator.setMethod(function toDry() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.1
  *
  * @param    {FieldValue}   fv   The FieldValue instance
  *
  * @return   {String}
  */
-Validator.setMethod(function getInvalidFieldMessage(fv) {
+Validator.setTypedMethod([Types.Alchemy.FieldValue], function getInvalidFieldMessage(fv) {
 
 	let field = fv.field,
 	    value = fv.value;
@@ -105,20 +105,52 @@ Validator.setMethod(function createFieldViolation(fv) {
 	return result;
 });
 
+/**
+ * Validate a value
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @param    {Field}   field
+ * @param    {*}       value
+ *
+ * @return   {Promise<Violation|undefined>}
+ */
+Validator.setTypedMethod([Types.Alchemy.Field, Types.Any], function validateFieldValue(field, value) {
+	return this.validateFieldValue(field, field.path, value);
+});
+
+/**
+ * Validate a value
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @param    {Field}   field
+ * @param    {String}  path
+ * @param    {*}       value
+ *
+ * @return   {Promise<Violation|undefined>}
+ */
+Validator.setTypedMethod([Types.Alchemy.Field, Types.String, Types.Any], function validateFieldValue(field, path, value) {
+	let fv = new Classes.Alchemy.FieldValue(field, path, value);
+	return this.validateFieldValue(fv);
+});
+
 /**
  * Validate a value
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.4
+ * @version  1.3.1
  *
  * @param    {FieldValue[]}   field_values   The FieldValue instance(s)
  *
  * @return   {Promise<Violation|undefined>}
  */
-Validator.setMethod(async function validateFieldValue(field_values) {
-
-	field_values = Array.cast(field_values);
+Validator.setTypedMethod([Types.Alchemy.FieldValue.array()], async function validateFieldValue(field_values) {
 
 	let violation,
 	    passes,

package/lib/app/helper_validator/not_empty_validator.js

@@ -10,9 +10,7 @@
  *
  * @param    {Object}   options
  */
-var NotEmpty = Function.inherits('Alchemy.Validator', function NotEmpty(options) {
-	NotEmpty.super.call(this, options);
-});
+const NotEmpty = Function.inherits('Alchemy.Validator', 'NotEmpty');
 
 /**
  * The message to use inside errors

package/lib/app/routes.js

@@ -1,3 +1,9 @@
 Router.add(['get', 'post'], 'APIResource', '/api/{action}', 'Api#{action}');
 Router.get('AlchemyInfo', '/alchemy-info', 'AlchemyInfo#info');
-Router.get('Postponed', '/alchemy/postponed/{id}', 'AlchemyInfo#postponed');
+
+Router.POSTPONED_ROUTE = Router.add({
+	name             : 'AlchemyInfo#postponed',
+	paths            : '/alchemy/postponed/{id}',
+	methods          : ['get'],
+	can_be_postponed : false,
+});

package/lib/bootstrap.js

@@ -160,6 +160,7 @@ hawkejs_options.server = false;
  * @version  1.1.0
  */
 alchemy.hawkejs.load(libpath.resolve(PATH_CORE, 'class', 'path_definition.js'), hawkejs_options);
+alchemy.hawkejs.load(libpath.resolve(PATH_CORE, 'class', 'path_param_definition.js'), hawkejs_options);
 
 /**
  * Require the element class on the client side too