alchemymvc 1.3.0 → 1.3.2

package/lib/app/conduit/http_conduit.js

@@ -105,9 +105,9 @@ HttpConduit.enforceProperty(function fingerprint() {
 /**
  * Init
  *
- * @author   Jelle De Loecker   <jelle@kipdola.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.3.3
- * @version  1.2.0
+ * @version  1.3.1
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -139,6 +139,11 @@ HttpConduit.setMethod(async function initHttp(req, res, router) {
 
 	this.debugMark(false);
 
+	if (this.shouldBePostponed()) {
+		this.postponeAndQueue();
+		return;
+	}
+
 	// Call the middleware, which will call the handler afterwards
 	this.callMiddleware();
 });

package/lib/app/conduit/socket_conduit.js

@@ -102,19 +102,34 @@ var SocketConduit = Function.inherits('Alchemy.Conduit', function Socket(socket,
 /**
  * Return the client IP address
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.1
- * @version  0.2.1
+ * @version  1.3.1
  */
 SocketConduit.setProperty(function ip() {
 
-	var sock = this.socket;
+	let handshake = this.socket?.handshake;
 
-	if (!sock) {
+	if (!handshake) {
 		return null;
 	}
 
-	return sock.conn.remoteAddress || null;
+	if (handshake.headers) {
+		let forwarded_for = handshake.headers['x-forwarded-for'] || handshake.headers['x-real-ip'];
+
+		if (forwarded_for) {
+
+			// Forwarded for can contain multiple ip addresses,
+			// return the first one
+			if (forwarded_for.indexOf(',') > -1) {
+				forwarded_for = forwarded_for.before(',');
+			}
+
+			return forwarded_for;
+		}
+	}
+
+	return handshake.address || null;
 });
 
 /**

package/lib/app/controller/alchemy_info_controller.js

@@ -130,20 +130,16 @@ Info.setAction(async function appcache(conduit) {
  *
  * @author   Jelle De Loecker       <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.1
  */
 Info.setAction(function postponed(conduit, id) {
 
 	var session = conduit.getSession(),
-	    postponed_conduit = session.postponed.get(id);
+	    postponement = session.getPostponement(id);
 
-	if (!postponed_conduit) {
+	if (!postponement) {
 		return conduit.notFound();
 	}
 
-	postponed_conduit.response = conduit.response;
-
-	postponed_conduit._end(...postponed_conduit._end_arguments);
-
-	session.postponed.remove(id);
+	postponement.handleRequest(conduit);
 });

package/lib/app/helper/backed_map.js

@@ -77,12 +77,12 @@ Backed.enforceProperty(function backing(new_value, old_value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.1
- * @version  1.2.1
+ * @version  1.3.1
  *
  * @return   {Backed}
  */
 Backed.setMethod(function clone() {
-	let result = new Backed(this.backing);
+	let result = new this.constructor(this.backing);
 	result.local = new Map(this.local);
 	return result;
 });

package/lib/app/helper/router_helper.js

@@ -86,9 +86,9 @@ Router.setMethod(function isLocalUrl(url) {
 /**
  * Apply directive to an element
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.2.7
+ * @version  1.3.1
  *
  * @param    {Element}   element    The element to apply to
  * @param    {String}    name       The route name
@@ -120,14 +120,23 @@ Router.setMethod(function applyDirective(element, name, options) {
 	if (config.keys && config.keys.length) {
 
 		let key,
-		    val,
-		    i;
+		    val;
 
-		for (i = 0; i < config.keys.length; i++) {
-			key = config.keys[i];
+		for (key of config.keys) {
 
 			if (params[key] == null) {
-				if ((val = element['route_' + key]) == null) {
+
+				val = element['route_' + key];
+
+				if (val == null) {
+					let variables = element[Hawkejs.VARIABLES];
+
+					if (variables) {
+						val = variables[key];
+					}
+				}
+
+				if (val == null) {
 					val = element[key];
 				}
 

package/lib/app/helper_field/schema_field.js

@@ -93,7 +93,7 @@ SchemaField.setProperty(function requires_translating() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.1
+ * @version  1.3.1
  *
  * @param    {Object}   record
  * @param    {String}   some_path   Some path to a field in the wanted schema
@@ -102,29 +102,23 @@ SchemaField.setProperty(function requires_translating() {
  */
 SchemaField.setMethod(function getSubschema(record, some_path) {
 
-	var schema = this.options.schema,
-	    external_field_name,
-	    property_name,
-	    record_value,
-	    pieces,
-	    field,
-	    name;
+	let schema = this.options.schema;
 
 	// If schema is a string,
 	// it needs to be extracted from another field's value
 	if (typeof schema == 'string') {
 
 		// When there are 2 pieces, the second piece is the property name
-		pieces = schema.split('.');
+		let pieces = schema.split('.');
 
 		// The first piece is the external field name
-		external_field_name = pieces[0];
+		let external_field_name = pieces[0];
 
 		// The second piece is the property name
-		property_name = pieces[1] || 'schema';
+		let property_name = pieces[1] || 'schema';
 
 		// Get that other field by its name
-		field = this.schema.getField(external_field_name);
+		let field = this.schema.getField(external_field_name);
 
 		if (!field) {
 			console.error('Failed to get subschema', external_field_name, 'of', this.schema, some_path);
@@ -139,7 +133,7 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 		}
 
 		// Now get the actual external value from the record
-		record_value = field.getRecordValue(record);
+		let record_value = field.getRecordValue(record);
 
 		// I'm not sure if this will help
 		if (record_value == null) {
@@ -155,6 +149,8 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 			schema = enum_value.schema;
 		} else if (enum_value.value) {
 			schema = enum_value.value[property_name] || enum_value.value.schema;
+		} else {
+			console.log('Could not find', schema, 'in', record, 'enum values:', enum_value, 'of field', field)
 		}
 	}
 
@@ -166,7 +162,7 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.4.0
+ * @version  1.3.1
  *
  * @param    {Object}      value        Value of field, an object in this case
  * @param    {Object}      data         The data object containing `value`
@@ -174,18 +170,21 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
  *
  * @return   {Object}
  */
-SchemaField.setMethod(function _toDatasource(value, data, datasource, callback) {
+SchemaField.setMethod(function _toDatasource(value, holder, datasource, callback) {
 
 	var that = this,
 	    sub_schema,
 	    record,
 	    model,
 	    temp;
-
-	record = {};
-
-	// Recreate a record
-	record[this.schema.name] = data;
+	
+	if (this.schema.name) {
+		record = {
+			[this.schema.name] : holder,
+		};
+	} else {
+		record = holder;
+	}
 
 	sub_schema = this.getSubschema(record);
 
@@ -217,7 +216,7 @@ SchemaField.setMethod(function _toDatasource(value, data, datasource, callback)
 				}
 
 				// Add the newly found data
-				temp = Object.assign({}, data);
+				temp = Object.assign({}, holder);
 				record = {};
 				record[that.schema.name] = temp;
 
@@ -240,7 +239,7 @@ SchemaField.setMethod(function _toDatasource(value, data, datasource, callback)
 });
 
 /**
- * Get some more subschema data
+ * Turn datasource data into app data
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
@@ -323,11 +322,19 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 		return;
 	}
 
-	// Create new dummy record
-	let record = {};
+	let record;
 
-	// Recreate the record
-	record[this.schema.name] = value;
+	if (options.parent_value) {
+		record = {
+			[this.schema.name] : options.parent_value
+		};
+	} else {
+		record = {
+			[this.schema.name] : {
+				[this.name] : value,
+			}
+		};
+	}
 
 	let sub_schema = this.getSubschema(record);
 
@@ -335,13 +342,20 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 	if (sub_schema) {
 		let tasks = {};
 
-		Object.each(value, function eachField(field_value, field_name) {
+		Object.each(value, (field_value, field_name) => {
 
-			var field = sub_schema.get(field_name);
+			let field = sub_schema.get(field_name);
 
 			if (field != null) {
-				tasks[field_name] = function doToDatasource(next) {
-					field.toApp({}, {_root_data: options._root_data}, field_value, next);
+
+				let sub_options = {
+					_root_data: options._root_data,
+					parent_field_schema_name: this.name,
+					parent_value : value,
+				};
+
+				tasks[field_name] = (next) => {
+					field.toApp({}, sub_options, field_value, next);
 				};
 			}
 		});

package/lib/app/helper_model/document.js

@@ -1,4 +1,4 @@
-var model_info,
+let class_cache = new Map(),
     cache_stores_in_progress,
     did_check = Symbol('did_check');
 
@@ -7,16 +7,11 @@ if (Blast.isBrowser) {
 
 	Blast.once('hawkejs_init', function gotScene(hawkejs, variables, settings, renderer) {
 
-		var model_name,
-		    DocClass,
-		    config,
-		    key;
-
-		model_info = hawkejs.scene.exposed.model_info;
-
-		for (model_name in model_info) {
-			config = model_info[model_name];
-			DocClass = Document.getDocumentClass(model_name);
+		let DocClass,
+		    config;
+		
+		for (config of hawkejs.scene.exposed.model_info) {
+			DocClass = Document.getDocumentClass(config.name);
 
 			for (key in config.schema.dict) {
 				DocClass.setFieldGetter(key);
@@ -218,25 +213,18 @@ Document.setStatic(function getClassForUndry(class_name) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.3.1
  *
  * @param    {Object|String}   model
  */
 Document.setStatic(function getDocumentClass(model) {
 
-	var doc_constructor,
-	    document_name,
-	    parent_path,
-	    model_name,
-	    DocClass,
-	    doc_path,
-	    config,
-	    key;
-
 	if (!model) {
 		throw new Error('Can not get Hawkejs.Document class for non-existing model');
 	}
 
+	let model_name;
+
 	if (typeof model == 'function') {
 		model_name = model.name;
 	} else if (typeof model == 'string') {
@@ -246,26 +234,32 @@ Document.setStatic(function getDocumentClass(model) {
 	}
 
 	// Construct the name of the document class
-	document_name = model_name;
+	let document_name = model_name;
+
+	if (class_cache.has(document_name)) {
+		return class_cache.get(document_name);
+	}
 
 	// Construct the path to this class
-	doc_path = 'Alchemy.Client.Document.' + document_name;
+	let doc_path = 'Alchemy.Client.Document.' + document_name;
 
 	// Get the class
-	DocClass = Object.path(Blast.Classes, doc_path);
+	let DocClass = Object.path(Blast.Classes, doc_path);
 
 	if (DocClass == null) {
-		doc_constructor = Function.create(document_name, function DocumentConstructor(record, options) {
+		let doc_constructor = Function.create(document_name, function DocumentConstructor(record, options) {
 			DocumentConstructor.wrapper.super.call(this, record, options);
 		});
 
-		if (Blast.isBrowser && window._hawkejs_static_expose) {
-			let exposed = window._hawkejs_static_expose;
+		let parent,
+		    config;
+
+		if (Blast.isBrowser) {
 
-			config = exposed.model_info;
+			let model = Blast.Classes.Alchemy.Client.Model.Model.getClass(model_name);
 
-			if (config) {
-				config = config[model_name];
+			if (model && model.super) {
+				parent = model.super.name;
 			}
 		} else if (Blast.isNode) {
 			config = alchemy.getModel(model_name, false);
@@ -277,13 +271,17 @@ Document.setStatic(function getDocumentClass(model) {
 			}
 		}
 
-		parent_path = 'Alchemy.Client.Document';
+		let parent_path = 'Alchemy.Client.Document';
 
 		if (config && config.parent) {
+			parent = config.parent;
+		}
+
+		if (parent && parent != 'Model') {
 			// Make sure the parent class exists
-			getDocumentClass(config.parent);
+			getDocumentClass(parent);
 
-			parent_path += '.' + config.parent;
+			parent_path += '.' + parent;
 		}
 
 		DocClass = Function.inherits(parent_path, doc_constructor);
@@ -297,6 +295,8 @@ Document.setStatic(function getDocumentClass(model) {
 		DocClass.Model = Blast.Classes.Hawkejs.Model.getClass(model_name);
 	}
 
+	class_cache.set(document_name, DocClass);
+
 	return DocClass;
 });
 
@@ -1068,12 +1068,16 @@ Document.setMethod(function informDatasource(options, callback) {
 /**
  * Store the current data as the original record
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.0.4
- * @version  1.0.4
+ * @version  1.3.1
  */
 Document.setMethod(function storeCurrentDataAsOriginalRecord() {
-	this.$attributes.original_record = JSON.clone(this.$main);
+	try {
+		this.$attributes.original_record = JSON.clone(this.$main);
+	} catch (err) {
+		alchemy.distinctProblem('store_current_data_error', err.message, {error: err});
+	}
 });
 
 /**

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.
@@ -201,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);
 
@@ -258,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);
@@ -281,6 +297,8 @@ Model.setStatic(function getClass(model_name, allow_create ) {
 		}
 	}
 
+	class_cache.set(model_name, ModelClass);
+
 	return ModelClass;
 });
 
@@ -1502,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];
@@ -1724,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
@@ -1750,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) {
@@ -1768,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
@@ -1795,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) {