alchemymvc 1.3.22 → 1.4.0-alpha.2

package/lib/app/helper_model/model.js

@@ -1,3 +1,5 @@
+const CriteriaNS = Function.getNamespace('Alchemy.Criteria');
+
 let class_cache = new Map(),
     fallback_datasource,
     TABLE = Symbol('table');
@@ -10,7 +12,7 @@ if (Blast.isBrowser) {
 		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);
+			Model.getClass(config.model_name).setModelConfig(config);
 		}
 	});
 }
@@ -21,7 +23,7 @@ if (Blast.isBrowser) {
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.0
  *
@@ -34,20 +36,52 @@ const Model = Function.inherits('Alchemy.Client.Base', 'Alchemy.Client.Model', f
 /**
  * Set the modelName property after class creation
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.4.0
  */
-Model.constitute(function setModelName() {
-	this.model_name = this.name;
-	this.setProperty('model_name', this.model_name);
-	this.table = this.model_name.tableize();
+Model.postInherit(function setModelName() {
+
+	let base_name = this.name;
+	let model_name = base_name;
+	let table_prefix = this.table_prefix;
+	let namespace = this.namespace;
+
+	if (namespace.startsWith('Alchemy.Model.') || namespace == 'Alchemy.Model') {
+		namespace = namespace.slice(14);
+	} else if (namespace.startsWith('Alchemy.Client.Model.') || namespace == 'Alchemy.Client.Model') {
+		namespace = namespace.slice(21);
+	}
+
+	this.setStatic('model_namespace', namespace, false);
+
+	let ns = namespace.replaceAll('.', '_');
+	
+	if (!table_prefix && ns) {
+		table_prefix = ns.tableize();
+	}
+
+	if (ns) {
+		model_name = ns + '_' + model_name;
+	}
+
+	// The simple name of the model
+	this.model_name = model_name;
+	this.setProperty('model_name', model_name);
+
+	let table_name = base_name.tableize();
+
+	if (table_prefix) {
+		table_name = table_prefix + '_' + table_name;
+	}
+
+	this.table = table_name;
 });
 
 /**
  * Map these events to methods
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.3.22
  */
@@ -64,13 +98,13 @@ Model.mapEventToMethod({
 /**
  * Is the given action enabled on the server?
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.6
  * @version  1.0.6
  *
- * @param    {String}    action
+ * @param    {string}    action
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Model.setStatic(function hasServerAction(action) {
 
@@ -89,7 +123,7 @@ Model.setStatic(function hasServerAction(action) {
 /**
  * Set the Model configuration
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.1
  *
@@ -114,7 +148,7 @@ Model.setStatic(function setModelConfig(config) {
  * Table name to use in the database.
  * False if no table should be used.
  *
- * @type {String}
+ * @type     {string}
  */
 Model.setProperty(function table() {
 
@@ -130,7 +164,7 @@ Model.setProperty(function table() {
 /**
  * The datasource
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.7
  *
@@ -169,7 +203,7 @@ Model.setProperty(function datasource() {
  * @since    1.3.0
  * @version  1.3.0
  *
- * @type     {Boolean}
+ * @type     {boolean}
  */
 Model.setProperty(function has_translatable_fields() {
 	return this.schema.has_translatable_fields;
@@ -178,7 +212,7 @@ Model.setProperty(function has_translatable_fields() {
 /**
  * The conduit
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.4
  * @version  1.0.4
  */
@@ -210,7 +244,7 @@ Model.setProperty(function conduit() {
 /**
  * Get the document class constructor
  *
- * @type   {Hawkejs.Document}
+ * @type     {Hawkejs.Document}
  */
 Model.prepareStaticProperty('Document', function getDocumentClass() {
 	return Blast.Classes.Alchemy.Client.Document.Document.getDocumentClass(this);
@@ -219,25 +253,36 @@ Model.prepareStaticProperty('Document', function getDocumentClass() {
 /**
  * Create client model class for specific model name
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.3.1
+ * @version  1.4.0
  *
- * @param    {String}   model_name
- * @param    {Boolean}  allow_create
- * @param    {String}   parent
+ * @param    {string}   model_name
+ * @param    {boolean}  allow_create
+ * @param    {string}   parent
  */
 Model.setStatic(function getClass(model_name, allow_create, parent) {
 
-	if (class_cache.has(model_name)) {
-		return class_cache.get(model_name);
+	let cache_key = model_name;
+
+	if (class_cache.has(cache_key)) {
+		return class_cache.get(cache_key);
 	}
 
+	// Get the model path as an array
+	let model_path = Blast.parseClassPath(model_name);
+
+	// Ensure it is the correct model_name
+	model_name = model_path.join('_');
+
 	// Construct the name of the class
-	let class_name = model_name;
+	let class_name = model_path.last();
+
+	// The root path
+	const root_path = 'Alchemy.Client.Model';
 
-	// Construct the path to this class
-	let class_path = 'Alchemy.Client.Model.' + class_name;
+	// Construct the expected path to this class
+	let class_path = root_path + '.' + model_path.join('.');
 
 	// Get the class
 	let ModelClass = Object.path(Blast.Classes, class_path);
@@ -247,39 +292,39 @@ Model.setStatic(function getClass(model_name, allow_create, parent) {
 	}
 
 	if (ModelClass == null && allow_create) {
-		let config;
+
+		let namespace = root_path,
+		    config;
+
+		if (model_path.length > 1) {
+			namespace += '.' + model_path.slice(0, -1).join('.');
+		}
 
 		let model_constructor = Function.create(class_name, function ModelConstructor(record, options) {
-			ModelConstructor.wrapper.super.call(this, record, options);
+			ModelConstructor.super.call(this, record, options);
 		});
 
-		// @TODO: inherit from parents
-		let parent_path = 'Alchemy.Client.Model';
-
 		if (Blast.isBrowser) {
-			// No longer needed
-		} else if (Blast.isNode) {
-			config = alchemy.getModel(model_name, false);
 
-			if (config && config.super) {
-				config = {
-					parent        : config.super.name,
-					primary_key   : config.prototype.primary_key,
-					display_field : config.prototype.display_field,
-				};
+			if (parent) {
+				let parent_model_path = Blast.parseClassPath(parent);
+				parent = root_path + '.' + parent_model_path.join('.');
+			} else {
+				parent = root_path;
 			}
-		}
 
-		if (config && config.parent) {
-			parent = config.parent;
-		}
+		} else if (Blast.isNode) {
+			let server_class = alchemy.getModel(model_name, false);
+
+			parent = getClass(server_class.super.model_name);
 
-		if (parent) {
-			getClass(parent);
-			parent_path += '.' + parent;
+			config = {
+				primary_key   : server_class.prototype.primary_key,
+				display_field : server_class.prototype.display_field,
+			};
 		}
 
-		ModelClass = Function.inherits(parent_path, model_constructor);
+		ModelClass = Function.inherits(parent, namespace, model_constructor);
 
 		ModelClass.setProperty('$model_name', model_name);
 
@@ -298,7 +343,7 @@ Model.setStatic(function getClass(model_name, allow_create, parent) {
 		}
 	}
 
-	class_cache.set(model_name, ModelClass);
+	class_cache.set(cache_key, ModelClass);
 
 	return ModelClass;
 });
@@ -306,9 +351,9 @@ Model.setStatic(function getClass(model_name, allow_create, parent) {
 /**
  * Set a method on the hawkejs document class
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.1.2
+ * @version  1.4.0
  */
 Model.setStatic(function setDocumentMethod(name, fnc, on_server) {
 
@@ -321,7 +366,7 @@ Model.setStatic(function setDocumentMethod(name, fnc, on_server) {
 	}
 
 	if (Blast.isNode) {
-		alchemy.sputnik.after('plugins', whenLoaded);
+		STAGES.afterStages('load_app.plugins', whenLoaded);
 	} else {
 		Blast.loaded(whenLoaded);
 	}
@@ -334,9 +379,9 @@ Model.setStatic(function setDocumentMethod(name, fnc, on_server) {
 /**
  * Set a property on the hawkejs document class
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.1.2
+ * @version  1.4.0
  */
 Model.setStatic(function setDocumentProperty(key, getter, setter, on_server) {
 
@@ -344,7 +389,7 @@ Model.setStatic(function setDocumentProperty(key, getter, setter, on_server) {
 	    args = arguments;
 
 	if (Blast.isNode) {
-		alchemy.sputnik.after('plugins', whenLoaded);
+		STAGES.afterStages('load_app.plugins', whenLoaded);
 	} else {
 		Blast.loaded(whenLoaded);
 	}
@@ -357,7 +402,7 @@ Model.setStatic(function setDocumentProperty(key, getter, setter, on_server) {
 /**
  * The schema
  *
- * @type {Schema}
+ * @type     {Schema}
  */
 Model.setStaticProperty(function schema() {
 	if (this.prototype.model_info) {
@@ -368,7 +413,7 @@ Model.setStaticProperty(function schema() {
 /**
  * The model name
  *
- * @type {String}
+ * @type     {string}
  */
 Model.setProperty(function name() {
 	return this._name || this.constructor.model_name;
@@ -379,7 +424,7 @@ Model.setProperty(function name() {
 /**
  * Initialize the model
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.0
  *
@@ -413,7 +458,7 @@ Model.setMethod(function init(options) {
  *
  * @deprecated
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
@@ -456,14 +501,14 @@ Model.setMethod(function getFindOptions(options) {
 /**
  * Get the title to display for this record
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.3.14
  *
  * @param    {Object}        item       The record item of this model
- * @param    {String|Array}  fallbacks  Extra fallbacks to use
+ * @param    {string|Array}  fallbacks  Extra fallbacks to use
  * 
- * @return   {String}        The display title to use
+ * @return   {string}        The display title to use
  */
 Model.setMethod(function getDisplayTitleOrNull(item, fallbacks) {
 
@@ -515,14 +560,14 @@ Model.setMethod(function getDisplayTitleOrNull(item, fallbacks) {
 /**
  * Get the title to display for this record
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.3.16
  *
  * @param    {Object}        item       The record item of this model
- * @param    {String|Array}  fallbacks  Extra fallbacks to use
+ * @param    {string|Array}  fallbacks  Extra fallbacks to use
  * 
- * @return   {String}        The display title to use
+ * @return   {string}        The display title to use
  */
 Model.setMethod(function getDisplayTitle(item, fallbacks) {
 
@@ -546,11 +591,11 @@ Model.setMethod(function getDisplayTitle(item, fallbacks) {
 /**
  * Return association configuration
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.2.0
  *
- * @param    {String}   alias
+ * @param    {string}   alias
  *
  * @return   {Object}
  */
@@ -595,11 +640,11 @@ Model.setMethod(function getAssociation(alias) {
 /**
  * Return a model instance for the given alias
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
- * @param    {String}   alias
+ * @param    {string}   alias
  *
  * @return   {Model}
  */
@@ -625,23 +670,55 @@ Model.setMethod(function getAliasModel(alias) {
 	return result;
 });
 
+/**
+ * Find one record
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string|Object|Criteria}     conditions
+ *
+ * @return   {Pledge|Criteria}
+ */
+Model.setMethod(function findOne(conditions, options) {
+	conditions = CriteriaNS.Model.cast(conditions, options, this);
+	return this.find('first', conditions);
+});
+
+/**
+ * Find all records
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string|Object|Criteria}     conditions
+ *
+ * @return   {Pledge|Criteria}
+ */
+Model.setMethod(function findAll(conditions, options) {
+	conditions = CriteriaNS.Model.cast(conditions, options, this);
+	return this.find('all', conditions);
+});
+
 /**
  * Query the database
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.3.21
+ * @version  1.4.0
  *
- * @param    {String}     type       The type of find (first, all)
+ * @param    {string}     type       The type of find (first, all)
  * @param    {Criteria}   criteria   The criteria object
  * @param    {Function}   callback
  *
- * @returns  {Pledge|Criteria}
+ * @return   {Pledge|Criteria}
  */
 Model.setMethod(function find(type, criteria, callback) {
 
 	if (arguments.length == 0) {
-		return new Blast.Classes.Alchemy.Criteria(this);
+		return new Classes.Alchemy.Criteria.Model(this);
 	}
 
 	let skip_type,
@@ -649,13 +726,13 @@ Model.setMethod(function find(type, criteria, callback) {
 	    error;
 
 	if (!this.datasource) {
-		pledge = new Blast.Classes.Pledge();
+		pledge = new Pledge();
 		pledge.done(callback);
 		pledge.reject(new Classes.Alchemy.Error.Model('Unable to perform ' + this.constructor.name + '#find(), no datasource is available'));
 		return pledge;
 	}
 
-	if (Blast.Classes.Alchemy.Criteria.Criteria.isCriteria(type)) {
+	if (Classes.Alchemy.Criteria.Criteria.isCriteria(type)) {
 		callback = criteria;
 		criteria = type;
 		type = null;
@@ -674,13 +751,13 @@ Model.setMethod(function find(type, criteria, callback) {
 	}
 
 	try {
-		criteria = Blast.Classes.Alchemy.Criteria.Criteria.cast(criteria, this);
+		criteria = Classes.Alchemy.Criteria.Model.cast(criteria, this);
 	} catch (err) {
 		error = err;
 	}
 
 	if (error != null) {
-		pledge = new Blast.Classes.Pledge();
+		pledge = new Pledge();
 		pledge.done(callback);
 		pledge.reject(error);
 		return pledge;
@@ -857,11 +934,11 @@ Model.setMethod(function find(type, criteria, callback) {
 /**
  * Query the database by a single id
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.1.0
  *
- * @param    {String|ObjectId}   id        The object id as string or object
+ * @param    {string|ObjectId}   id        The object id as string or object
  * @param    {Object}            options   Optional options object
  * @param    {Function}          callback
  *
@@ -874,11 +951,11 @@ Model.setMethod(function findById(id, options, callback) {
 /**
  * Query the database by a single id
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.3.4
+ * @version  1.4.0
  *
- * @param    {String|ObjectId}   pk        The primary key value
+ * @param    {string|ObjectId}   pk        The primary key value
  * @param    {Object}            options   Optional options object
  * @param    {Function}          callback
  *
@@ -892,7 +969,7 @@ Model.setMethod(function findByPk(pk, options, callback) {
 		return pledge;
 	}
 
-	let criteria = new Blast.Classes.Alchemy.Criteria(this);
+	let criteria = new Classes.Alchemy.Criteria.Model(this);
 
 	criteria.where(this.primary_key).equals(pk);
 
@@ -908,9 +985,9 @@ Model.setMethod(function findByPk(pk, options, callback) {
 /**
  * Query the database by key-val attributes, return the first result
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.3.4
+ * @version  1.4.0
  *
  * @param    {Object}    values       The values to look for
  * @param    {Object}    options      Optional options object
@@ -919,7 +996,7 @@ Model.setMethod(function findByPk(pk, options, callback) {
  */
 Model.setMethod(function findByValues(values, options) {
 
-	var criteria = new Blast.Classes.Alchemy.Criteria(this),
+	var criteria = new Classes.Alchemy.Criteria.Model(this),
 	    key;
 
 	if (options) {
@@ -936,9 +1013,9 @@ Model.setMethod(function findByValues(values, options) {
 /**
  * Query the database by key-val attributes, return all results
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.3.4
+ * @version  1.4.0
  *
  * @param    {Object}    values       The values to look for
  * @param    {Object}    options      Optional options object
@@ -947,7 +1024,7 @@ Model.setMethod(function findByValues(values, options) {
  */
 Model.setMethod(function findAllByValues(values, options) {
 
-	var criteria = new Blast.Classes.Alchemy.Criteria(this),
+	var criteria = new Classes.Alchemy.Criteria.Model(this),
 	    key;
 
 	if (options) {
@@ -964,7 +1041,7 @@ Model.setMethod(function findAllByValues(values, options) {
 /**
  * The 'first' find method
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.1.0
  *
@@ -985,7 +1062,7 @@ Model.setMethod(function beforeFindFirst(criteria, callback) {
 /**
  * The 'list' find method
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.1.0
  *
@@ -1009,7 +1086,7 @@ Model.setMethod(function beforeFindList(criteria, callback) {
 /**
  * The 'dict' find method
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.1.0
  *
@@ -1023,7 +1100,7 @@ Model.setMethod(function beforeFindDict(criteria, callback) {
 /**
  * The 'count' find method
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.1.0
  *
@@ -1044,7 +1121,7 @@ Model.setMethod(function beforeFindCount(criteria, callback) {
 /**
  * The 'list' find method
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *
@@ -1097,7 +1174,7 @@ Model.setMethod(function afterFindList(criteria, records, callback) {
 /**
  * The 'dict' find method
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -1140,7 +1217,7 @@ Model.setMethod(function afterFindDict(options, records, callback) {
 /**
  * The 'count' find method
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.4.0
  */
@@ -1151,7 +1228,7 @@ Model.setMethod(function afterFindCount(options, records, callback) {
 /**
  * Add associated data to a single record
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
  * @version  1.1.5
  *
@@ -1330,7 +1407,7 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 		};
 	});
 
-	pledge = Function.parallel(alchemy.settings.model_assoc_parallel_limit || 4, aliases, function gotAssociatedList(err, list) {
+	pledge = Function.parallel(alchemy.settings.data_management.model_assoc_parallel_limit || 4, aliases, function gotAssociatedList(err, list) {
 
 		if (err != null) {
 			console.log('ERROR: ' + err, err);
@@ -1351,11 +1428,11 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 /**
  * Save (mixed) data to the database
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.0.7
  *
- * @return    {Pledge}
+ * @return   {Pledge}
  */
 Model.setMethod(function save(data, _options, _callback) {
 
@@ -1447,7 +1524,7 @@ Model.setMethod(function save(data, _options, _callback) {
  * Create a new document.
  * If data is given, the document is populated
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
@@ -1486,7 +1563,7 @@ Model.setMethod(function createDocument(data, options) {
 /**
  * Create a document list
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.5
  *
@@ -1524,7 +1601,7 @@ Model.setMethod(function createDocumentList(records, options) {
 /**
  * Insert record on the client side
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  */
@@ -1541,13 +1618,13 @@ Model.setAfterMethod('ready', function _create(object, callback) {
 /**
  * Is the given action enabled on the server?
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.6
  * @version  1.0.6
  *
- * @param    {String}    action
+ * @param    {string}    action
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Model.setMethod(function hasServerAction(action) {
 	return this.constructor.hasServerAction(action);
@@ -1556,11 +1633,12 @@ Model.setMethod(function hasServerAction(action) {
 /**
  * Client-side model info
  *
- * @type {Object}
+ * @type     {Object}
  */
 Model.setProperty(function model_info() {
 
-	let name = this.constructor.name,
+	let class_name = this.constructor.name,
+	    model_name = this.constructor.model_name,
 	    data;
 
 	if (Blast.isBrowser) {
@@ -1573,17 +1651,17 @@ Model.setProperty(function model_info() {
 		let config;
 
 		for (config of hawkejs.scene.exposed.model_info) {
-			if (config.name === name) {
+			if (config.model_name === model_name) {
 				data = config;
 				break;
 			}
 		}
 	} else {
 
-		let MainClass = Blast.Classes.Alchemy.Model[name];
+		let MainClass = Blast.Classes.Alchemy.Model.Model.get(model_name, false);
 
 		if (!MainClass) {
-			throw new Error('Unable to find main class for "' + name + '", unable to get client config!');
+			throw new Error('Unable to find main class for "' + model_name + '", unable to get client config!');
 		}
 
 		data = MainClass.getClientConfig();
@@ -1595,7 +1673,7 @@ Model.setProperty(function model_info() {
 /**
  * Schema
  *
- * @type {Object}
+ * @type     {Object}
  */
 Model.setProperty(function schema() {
 	return this.model_info.schema;
@@ -1604,7 +1682,7 @@ Model.setProperty(function schema() {
 /**
  * Associations
  *
- * @type {Object}
+ * @type     {Object}
  */
 Model.setProperty(function associations() {
 	return this.schema.associations;
@@ -1613,7 +1691,7 @@ Model.setProperty(function associations() {
 /**
  * Get a field instance from the schema
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.2.0
  *
@@ -1646,7 +1724,7 @@ Hawkejs.Model = Model;
 /**
  * Save one record
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.3.20
  *
@@ -1773,7 +1851,7 @@ Model.setMethod(function saveRecord(document, options, callback) {
 /**
  * Prepare some data by passing it through the schema
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
  * @version  1.1.0
  *
@@ -1793,7 +1871,7 @@ Model.setMethod(function compose(data, options) {
 /**
  * Create a record in the database
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.21
  *
@@ -1855,7 +1933,7 @@ Model.setMethod(function createRecord(document, options, callback) {
 /**
  * Create a document used for saving
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.21
  * @version  1.3.21
  *
@@ -1878,7 +1956,7 @@ function createDocumentForSaving(model, original_input, data) {
 /**
  * Update a record in the database
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.21
  *
@@ -1942,7 +2020,7 @@ Model.setMethod(function updateRecord(document, options, callback) {
 /**
  * Get records that need to be saved to the server
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.6
  * @version  1.1.0
  */