alchemymvc 1.1.10 → 1.2.2

package/lib/app/helper_model/criteria.js

@@ -388,15 +388,26 @@ Criteria.setMethod(function clone() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.0
  *
- * @return   {Array}
+ * @return   {String[]}
  */
 Criteria.setMethod(function getFieldsToSelect() {
 
-	var result = this.options.select.fields || [];
+	let result;
 
-	return result;
+	if (this.options.select.fields && this.options.select.fields.length) {
+		result = this.options.select.fields.slice(0);
+	}
+
+	// Fields can sometimes be required for a query (like in a join) but they
+	// won't be selected if other fields are explicitly set.
+	// So in that case: add these special fields to the projection
+	if (result && this.options.select.query_fields && this.options.select.query_fields) {
+		result.push(...this.options.select.query_fields);
+	}
+
+	return result || [];
 });
 
 /**
@@ -663,7 +674,7 @@ Criteria.setMethod(function page(page, page_size) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.3
+ * @version  1.2.0
  *
  * @param    {String|Array}   field
  *
@@ -681,12 +692,6 @@ Criteria.setMethod(function select(field) {
 		}
 	} else {
 
-		if (typeof field == 'object') {
-			if (field instanceof Classes.Alchemy.Criteria.FieldConfig || field.name) {
-				field = field.name;
-			}
-		}
-
 		if (this._select) {
 			context = this._select.parse(field);
 		} else {
@@ -1383,7 +1388,7 @@ Select.setMethod(Blast.checksumSymbol, function toChecksum() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.0
  *
  * @param    {String}   name
  *
@@ -1419,9 +1424,39 @@ Select.setMethod(function addAssociation(name) {
 		this.associations[name].association_name = name;
 	}
 
+	// Get the association data
+	try {
+		let info = this.criteria.model.getAssociation(name);
+
+		if (info) {
+			// Make sure the localkey is added to the resultset
+			this.requireFieldForQuery(info.options.localKey);
+		}
+	} catch (err) {
+		console.warn('Failed to find "' + name + '" association for ' + this.criteria.model.modelName);
+	}
+
 	return this.associations[name];
 });
 
+/**
+ * Require a field for query purposes
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.2.0
+ * @version  1.2.0
+ *
+ * @param    {String}   path
+ */
+Select.setMethod(function requireFieldForQuery(path) {
+
+	if (!this.query_fields) {
+		this.query_fields = [];
+	}
+
+	this.query_fields.push(path);
+});
+
 /**
  * Add a field
  *
@@ -1445,17 +1480,33 @@ Select.setMethod(function addField(path) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.0
  *
- * @param    {String}   path
+ * @param    {String|Object}   path
  *
  * @return   {Criteria|Null}   A criteria object if the context has changed
  */
 Select.setMethod(function parse(path) {
 
-	var context,
+	let context,
 	    select = this,
-	    parsed = Criteria.parsePath(path, this.criteria);
+	    parsed;
+
+	if (typeof path == 'object' && path && path.name) {
+
+		if (path.path) {
+			path = path.path;
+		} else {
+			let obj = path;
+			path = obj.name;
+
+			if (obj.association) {
+				path = obj.association + '.' + path;
+			}
+		}
+	}
+
+	parsed = Criteria.parsePath(path, this.criteria);
 
 	// Associations were found,
 	// like "Comment._id" or "Comment.User"
@@ -1470,7 +1521,7 @@ Select.setMethod(function parse(path) {
 				continue;
 			}
 
-			select = this.addAssociation(name);
+			select = select.addAssociation(name);
 		}
 	}
 
@@ -1489,7 +1540,7 @@ Select.setMethod(function parse(path) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.0
  *
  * @param    {Criteria}   criteria
  *
@@ -1507,6 +1558,10 @@ Select.setMethod(function cloneForCriteria(criteria) {
 		clone.fields = this.fields.slice(0);
 	}
 
+	if (this.query_fields && this.query_fields.length) {
+		clone.query_fields = this.query_fields.slice(0);
+	}
+
 	if (this.associations) {
 		let key;
 

package/lib/app/helper_model/data_provider.js

@@ -0,0 +1,92 @@
+/**
+ * The DataProvider class
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+const DataProvider = Function.inherits('Alchemy.Base', 'Alchemy.DataProvider', function DataProvider(config) {
+	this.config = config || {};
+});
+
+
+/**
+ * Undry
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ *
+ * @param    {Object}           obj
+ * @param    {Boolean|String}   cloned
+ *
+ * @return   {DataProvider}
+ */
+DataProvider.setStatic(function unDry(obj) {
+	let result = new this(obj.config);
+	return result;
+});
+
+/**
+ * Configure a new config
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+DataProvider.setStatic(function addConfig(name, default_value) {
+	this.setProperty(name, function getValue() {
+
+		if (this.config[name] != null) {
+			return this.config[name];
+		}
+
+		return default_value;
+	}, function setValue(value) {
+		return this.config[name] = value;
+	});
+});
+
+/**
+ * The wanted page size
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+DataProvider.addConfig('page_size');
+
+/**
+ * Get all the data
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+DataProvider.setAbstractMethod('getAll');
+
+/**
+ * Get the data for the given page (pages are 1-index based)
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+DataProvider.setAbstractMethod('getPage');
+
+/**
+ * Return an object for json-drying this document
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ *
+ * @return   {Object}
+ */
+DataProvider.setMethod(function toDry() {
+	return {
+		value : {
+			config : this.config,
+		}
+	};
+});

package/lib/app/helper_model/field_config.js

@@ -7,7 +7,7 @@
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.7
+ * @version  1.2.0
  * 
  * @param    {string}   path
  * @param    {Object}   options
@@ -20,12 +20,18 @@ const FieldConfig = Fn.inherits('Alchemy.Base', 'Alchemy.Criteria', function Fie
 	// The full path to the value
 	this.path = null;
 
+	// The local path to the value (subfields)
+	this.local_path = null;
+
 	// The pieces of the path
 	this.pieces = null;
 
 	// The association this belongs to
 	this.association = null;
 
+	// The main model this field is in
+	this.model = null;
+
 	this.options = options || {};
 
 	if (path) {
@@ -69,6 +75,94 @@ FieldConfig.setProperty(function title() {
 	return title;
 });
 
+/**
+ * Set the main model context this field is used for
+ * (Actual field can be in an association of this model)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ *
+ * @param    {String|Model}   model
+ */
+FieldConfig.setMethod(function setContextModel(model) {
+
+	if (typeof model == 'string') {
+		this.model = model;
+		this._model = alchemy.getModel(model);
+	} else {
+		this._model = model;
+		this.model = model.model_name;
+	}
+});
+
+/**
+ * Get the context model this field is used for
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+FieldConfig.setMethod(function getContextModel() {
+
+	if (this._model) {
+		return this._model;
+	}
+
+	if (!this.model) {
+		return;
+	}
+
+	this._model = alchemy.getModel(this.model);
+	return this._model;
+});
+
+/**
+ * Get the actual model this field is in
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+FieldConfig.setMethod(function getModel() {
+
+	let model = this.getContextModel();
+
+	if (!model) {
+		return;
+	}
+
+	if (this.association) {
+		let config = model.getAssociation(this.association);
+
+		if (config) {
+			model = alchemy.getModel(config.modelName);
+		} else {
+			model = null;
+		}
+	}
+
+	return model;
+});
+
+/**
+ * Get the field definition
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+FieldConfig.setMethod(function getFieldDefinition() {
+
+	let model = this.getModel();
+
+	if (!model) {
+		return;
+	}
+
+	return model.getField(this.local_path);
+});
+
 /**
  * Return an object for json-drying this list
  *
@@ -89,7 +183,7 @@ FieldConfig.setMethod(function toDry() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.4
+ * @version  1.2.0
  *
  * @return   {Object}
  */
@@ -97,6 +191,7 @@ FieldConfig.setMethod(function toJSON() {
 	return {
 		name        : this.name,
 		path        : this.path,
+		local_path  : this.local_path,
 		association : this.association,
 		options     : this.options,
 	};
@@ -107,7 +202,7 @@ FieldConfig.setMethod(function toJSON() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.0
  *
  * @param    {string}   path
  */
@@ -120,6 +215,7 @@ FieldConfig.setMethod(function parsePath(path) {
 	} else if (path.indexOf('.') == -1) {
 		this.name = path;
 		this.path = path;
+		this.local_path = path;
 		this.pieces = [path];
 		return;
 	} else {
@@ -132,13 +228,27 @@ FieldConfig.setMethod(function parsePath(path) {
 
 	this.path = path;
 	this.pieces = pieces;
+	this.local_path = '';
 
 	for (i = 0; i < pieces.length; i++) {
 		piece = pieces[i];
 
-		if (i == 0 && piece[0].isUpperCase()) {
-			this.association = piece;
+		if (piece[0].isUpperCase()) {
+
+			if (this.association) {
+				this.association += '.';
+			} else {
+				this.association = '';
+			}
+
+			this.association += piece;
 			continue;
+		} else {
+			if (this.local_path) {
+				this.local_path += '.';
+			}
+
+			this.local_path += piece;
 		}
 	}
 

package/lib/app/helper_model/field_set.js

@@ -143,6 +143,28 @@ FieldSet.setMethod(function toJSON() {
 	return result;
 });
 
+/**
+ * Get an instance of the model
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ *
+ * @return   {Model}
+ */
+FieldSet.setMethod(function getModel() {
+
+	if (!this.model) {
+		return;
+	}
+
+	if (!this._model) {
+		this._model = alchemy.getModel(this.model);
+	}
+
+	return this._model;
+});
+
 /**
  * Iterator method
  *
@@ -165,7 +187,7 @@ FieldSet.setMethod(Symbol.iterator, function* iterate() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.2
  *
  * @param    {String}   name      The name of the field to add
  * @param    {Object}   options
@@ -176,6 +198,10 @@ FieldSet.setMethod(function addField(name, options) {
 
 	let config = new Classes.Alchemy.Criteria.FieldConfig(name, options);
 
+	if (this.model && !config.getContextModel()) {
+		config.setContextModel(this.model);
+	}
+
 	this.fields.set(name, config);
 
 	return config;

package/lib/app/helper_model/model.js

@@ -403,7 +403,7 @@ Model.setMethod(function getFindOptions(options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.0
  *
  * @param    {String}   alias
  *
@@ -415,7 +415,30 @@ Model.setMethod(function getAssociation(alias) {
 		throw new Error('Unable to find ' + this.constructor.name + ' schema associations');
 	}
 
-	let config = this.schema.associations[alias];
+	let config;
+
+	// @TODO: Test nested association getting
+	if (alias && alias.indexOf('.') > -1) {
+		let pieces = alias.split('.'),
+		    context = this,
+		    piece,
+		    temp;
+
+		for (piece of pieces) {
+			temp = context.getAssociation(piece);
+
+			if (!temp) {
+				break;
+			}
+
+			context = this.getModel(temp.modelName);
+		}
+
+		// The config s the last association gotten
+		config = temp;
+	} else {
+		config = this.schema.associations[alias];
+	}
 
 	if (!config) {
 		throw new Error('Unable to find ' + JSON.stringify(alias) + ' association in ' + this.constructor.name + ' model');
@@ -1401,15 +1424,30 @@ Model.setProperty(function associations() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.2.0
  *
- * @param    {String}   name   The name of the field
+ * @param    {string}   path   The path to the field
  *
  * @return   {Object}
  */
-Model.setMethod(function getField(name) {
-	return this.schema.getField(name);
-}, false);
+Model.setMethod(function getField(path) {
+
+	if (path.indexOf('.') > -1) {
+		let config = new Classes.Alchemy.Criteria.FieldConfig(path);
+
+		// If part of the path is an association, look for that now
+		if (config.association) {
+			let association = this.getAssociation(config.association);
+			let model = this.getModel(association.modelName);
+			return model.getField(config.local_path);
+		}
+
+		// If not, just use the local_path
+		path = config.local_path;
+	}
+
+	return this.schema.getField(path);
+});
 
 // Make this class easily available
 Hawkejs.Model = Model;

package/lib/app/helper_model/remote_data_provider.js

@@ -0,0 +1,35 @@
+/**
+ * The Remote DataProvider class
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+const RemoteDataProvider = Function.inherits('Alchemy.DataProvider', 'Remote');
+
+/**
+ * The url to load
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+RemoteDataProvider.addConfig('source');
+
+/**
+ * Get all the data
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+RemoteDataProvider.setMethod(async function getAll() {
+
+	if (!this.source) {
+		return [];
+	}
+
+	let result = await Blast.fetch(this.source);
+
+	return result;
+});

package/lib/app/model/alchemy_migration_model.js

@@ -0,0 +1,33 @@
+/**
+ * The Alchemy Migration Model class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.0
+ * @version  1.2.0
+ */
+const AlchemyMigration = Function.inherits('Alchemy.Model.App', 'AlchemyMigration');
+
+/**
+ * Constitute the class wide schema
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.0
+ * @version  1.2.0
+ */
+AlchemyMigration.constitute(function addTaskFields() {
+
+	// The name of the migration
+	this.addField('name', 'String');
+
+	// The full path of the file
+	this.addField('path', 'String');
+
+	// When the migration ended
+	this.addField('ended', 'Datetime');
+
+	// Was there an error?
+	this.addField('error', 'String');
+
+});

package/lib/bootstrap.js

@@ -3,6 +3,22 @@
 var libpath = require('path'),
     starting;
 
+/**
+ * Calling dynamic `import()` from certain places in the codebase actually
+ * causes segfaults. This is a workaround for that.
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ *
+ * @param    {String}   path
+ *
+ * @return   {Promise}
+ */
+global.doImport = function doImport(path) {
+	return import(path);
+};
+
 /**
  * Extend prototypes
  */
@@ -61,6 +77,15 @@ require('./core/base');
  */
 require('./core/client_base');
 
+/**
+ * The migration class
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.0
+ * @version  1.2.0
+ */
+require('./class/migration');
+
 var hawkejs_options = {
 	server : false,
 	make_commonjs: true,

package/lib/class/datasource.js

@@ -165,7 +165,7 @@ Datasource.setMethod(function getSchema(schema) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.0
  *
  * @param    {Schema|Model}   schema
  * @param    {Object}         data
@@ -187,7 +187,7 @@ Datasource.setMethod(function toDatasource(schema, data, callback) {
 	}
 
 	if (!schema) {
-		log.todo('Schema not found: not normalizing data');
+		log.todo('Schema not found: not normalizing data', data);
 		pledge = Pledge.resolve(data);
 		pledge.done(callback);
 		return pledge;

package/lib/class/element.js

@@ -23,12 +23,17 @@ Function.getNamespace('Alchemy.Element').setStatic('default_element_prefix', 'al
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.1
  *
  * @return  {RURL}
  */
 Element.setMethod(function getCurrentUrl() {
 	if (Blast.isBrowser) {
+
+		if (hawkejs.scene.opening_url && hawkejs.scene.opening_url.url) {
+			return Blast.Classes.RURL.parse(hawkejs.scene.opening_url.url);
+		}
+		
 		return Blast.Classes.RURL.parse(window.location);
 	} else if (this.hawkejs_renderer && this.hawkejs_renderer.variables && this.hawkejs_renderer.variables.__url) {
 		return this.hawkejs_renderer.variables.__url.clone();