alchemymvc 1.2.0 → 1.2.3

package/lib/app/helper/backed_map.js

@@ -0,0 +1,257 @@
+const OBJECT = Symbol('Object'),
+      BACKING = Symbol('Backing'),
+	  MAP = Symbol('Map');
+
+/**
+ * The Backed map class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ */
+const Backed = Function.inherits('Alchemy.Base', 'Alchemy.Map', function Backed(backing) {
+	this.local = new Map();
+	this.type = null;
+	this.backing = backing;
+});
+
+/**
+ * Undry the given value
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {Object}   value
+ *
+ * @return   {EnumValues}
+ */
+Backed.setStatic(function unDry(value, custom_method, whenDone) {
+	let result = new this(value.backing);
+	return result;
+});
+
+/**
+ * Get the size
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ */
+Backed.setProperty(function size() {
+	return this.keys().length;
+});
+
+/**
+ * Set the backing value
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ */
+Backed.enforceProperty(function backing(new_value, old_value) {
+
+	this.backing = null;
+	this.type = null;
+
+	if (!new_value) {
+		return;
+	}
+
+	if (new_value instanceof Backed) {
+		this.type = BACKING;
+	} else if (new_value instanceof Map) {
+		this.type = MAP;
+	} else if (typeof new_value == 'object') {
+		this.type = OBJECT;
+	}
+
+	return new_value;
+});
+
+/**
+ * Create a (shallow) clone of this backed map.
+ * Since we don't ever touch the backing itself, we don't have to clone that.
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @return   {Backed}
+ */
+Backed.setMethod(function clone() {
+	let result = new Backed(this.backing);
+	result.local = new Map(this.local);
+	return result;
+});
+
+/**
+ * Create a (shallow) clone of this backed map.
+ * Since we don't ever touch the backing itself, we don't have to clone that.
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @return   {Backed}
+ */
+Backed.setMethod(function dryClone(wm, custom_method) {
+	return this.clone();
+});
+
+/**
+ * Simplify the object for Hawkejs
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {WeakMap}   wm
+ *
+ * @return   {Backed}
+ */
+Backed.setMethod(function toHawkejs(wm) {
+
+	let values = new Map(),
+	    value,
+	    keys = this.keys(),
+		key;
+	
+	for (key of keys) {
+		value = this.get(key);
+		values.set(key, JSON.clone(value, 'toHawkejs', wm));
+	}
+
+	return new this.constructor(values);
+});
+
+/**
+ * Get all the keys
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @return   {String[]}
+ */
+Backed.setMethod(function keys() {
+
+	let result;
+
+	if (this.type == BACKING) {
+		result = this.backing.keys();
+	} else if (this.type == MAP) {
+		result = [...this.backing.keys()];
+	} else if (this.type == OBJECT) {
+		result = Object.keys(this.backing);
+	} else {
+		result = [];
+	}
+
+	if (this.local.size) {
+		for (let key of this.local.keys()) {
+			if (result.indexOf(key) == -1) {
+				result.push(key);
+			}
+		}
+	}
+
+	return result;
+});
+
+/**
+ * Get a value by it's name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {String}   name
+ *
+ * @return   {Mixed}
+ */
+Backed.setMethod(function get(name) {
+
+	if (this.local.has(name)) {
+		return this.local.get(name);
+	}
+
+	if (!this.type) {
+		return;
+	}
+
+	let value;
+
+	if (this.type == BACKING || this.type == MAP) {
+		value = this.backing.get(name);
+	} else if (this.type == OBJECT) {
+		value = this.backing[name];
+	}
+
+	return value;
+});
+
+/**
+ * Set a value
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {String}   name
+ * @param    {*}        value
+ *
+ * @return   {*}
+ */
+Backed.setMethod(function set(name, value) {
+	this.local.set(name, value);
+	return value;
+});
+
+/**
+ * Dry the object
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @return   {Object}
+ */
+Backed.setMethod(function toDry() {
+	
+	let result = {
+		backing  : {}
+	};
+
+	let value,
+	    key;
+
+	for (key of this.keys()) {
+		value = this.get(key);
+		result.backing[key] = value;
+	}
+
+	return {value: result};
+});
+
+/**
+ * Iterate over the object
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @return   {Object}
+ */
+Backed.setMethod(Symbol.iterator, function* iterate() {
+
+	let value,
+	    key;
+
+	for (key of this.keys()) {
+		value = this.get(key);
+		yield value;
+	}
+});

package/lib/app/helper/enum_values.js

@@ -0,0 +1,125 @@
+/**
+ * The EnumValues class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ */
+const EnumMap = Function.inherits('Alchemy.Map.Backed', 'Enum');
+
+/**
+ * Get a value by it's name
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {String}   name
+ *
+ * @return   {Mixed}
+ */
+EnumMap.setMethod(function get(name) {
+
+	if (this.local.has(name)) {
+		return this.local.get(name);
+	}
+
+	let value = get.super.call(this, name);
+
+	if (value) {
+		value = this.set(name, value);
+	}
+
+	return value;
+});
+
+/**
+ * Set a value
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {String}   name
+ * @param    {*}        value
+ *
+ * @return   {*}
+ */
+EnumMap.setMethod(function set(name, value) {
+
+	if (value == null) {
+		return;
+	}
+
+	if (value.is_enumified) {
+		this.local.set(name, value);
+		return value;
+	}
+
+	let result;
+
+	if (typeof value == 'string') {
+		result = {
+			name  : value,
+			title : value,
+		};
+	} else if (typeof value == 'function') {
+		result = {
+			name  : value.name,
+			title : value.title,
+		};
+	} else {
+		result = {
+			name  : value.name,
+			title : value.title || value.name,
+		};
+	}
+
+	result.value = value;
+	result.is_enumified = true;
+
+	this.local.set(name, result);
+
+	return result;
+});
+
+
+/**
+ * Simplify the object for Hawkejs
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.1
+ * @version  1.2.1
+ *
+ * @param    {WeakMap}   wm
+ *
+ * @return   {Enum}
+ */
+EnumMap.setMethod(function toHawkejs(wm) {
+
+	let result = toHawkejs.super.call(this, wm),
+	    original_value,
+		cloned_value,
+	    keys = this.keys(),
+		key;
+	
+	for (key of keys) {
+		original_value = this.get(key);
+		cloned_value = result.get(key);
+
+		if (original_value.value) {
+
+			if (typeof original_value.value == 'function') {
+				cloned_value.type = 'function';
+			}
+
+			if (original_value.value.schema) {
+				cloned_value.schema = JSON.clone(original_value.value.schema, 'toHawkejs', wm);
+			}
+		}
+	}
+
+	return result;
+});

package/lib/app/helper/router_helper.js

@@ -266,7 +266,7 @@ Router.setMethod(function routeConfig(name, socket_route) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.5
+ * @version  1.2.1
  *
  * @param    {String}   name
  * @param    {Object}   parameters
@@ -331,6 +331,12 @@ Router.setMethod(function routeUrl(name, _parameters, options) {
 		// Remove [brackets]
 		url = url.replace(/\[.*?\]/g, '');
 		url = url.assign(parameters, true, RURL.encodeUriQuery);
+
+		// Remove capturing regexes
+		if (url.indexOf('(') > -1) {
+			// @TODO: should exclude escaped colons like "\\("
+			url = url.replace(/\(.*?\)/g, '');
+		}
 	}
 
 	url = this.parseURL(url);

package/lib/app/helper_component/paginate_component.js

@@ -8,151 +8,98 @@
  * @since         0.0.1
  * @version       1.0.0
  */
-var Paginate = Function.inherits('Alchemy.Client.Component', function Paginate(controller, options) {
-	Paginate.super.call(this, controller, options);
-});
+const Paginate = Function.inherits('Alchemy.Client.Component', 'Paginate');
 
 /**
  * Perform a query
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.0.6
+ * @version  1.2.2
  *
  * @param   {Model}     model
- * @param   {Object}    options
- * @param   {Function}  callback
+ * @param   {Criteria}  criteria
  *
  * @return  {Pledge}
  */
-Paginate.setMethod(function find(model, options, callback) {
-
-	var that = this,
-	    conduit = this.controller.conduit,
-	    conditions,
-	    last_id,
-	    filter,
-	    pledge,
-	    order,
-	    name,
-	    sort;
+Paginate.setMethod(function find(model, criteria) {
+
+	const conduit = this.controller.conduit;
 
 	// Get the model if a name has been given
 	if (typeof model == 'string') {
 		model = this.getModel(model);
 	}
 
-	// Make sure callback is set correctly
-	if (typeof options == 'function') {
-		callback = options;
-	}
-
-	// Make sure options is an object
-	if (!options || typeof options != 'object') {
-		options = {};
-	}
-
-	// Set the name for this pagination
-	if (!options.name) {
-		options.name = model.name;
-	} else {
-		options.name = options.name.modelName();
-	}
+	let page_size = criteria.options.page_size || 10,
+	    skipless = criteria.options.skipless,
+		last_id,
+	    name = criteria.options.name,
+		page = criteria.options.page;
 
-	if (!options.pageSize) {
-		options.pageSize = 10;
+	if (!name) {
+		name = model.name;
+		criteria.setOption('name', name);
 	}
 
-	if (options.skipless) {
-		last_id = options.last_id || conduit.param('page');
+	if (skipless) {
+		let sort;
+		last_id = criteria.options.last_id || conduit.param('page');
 
 		// When it's a skipless pagination,
 		// a sort is always implied
-		if (options.skipless === true) {
+		if (skipless === true) {
 			sort = {_id: 1};
 		} else {
 			sort = {};
-			sort[options.skipless] = 1;
+			sort[skipless] = 1;
 		}
 
-		options.sort = sort;
-
+		criteria.sort(sort);
 	} else {
 
 		// If no page has been given
-		if (typeof options.page != 'number') {
-			options.page = conduit.param('page');
+		if (typeof page != 'number') {
+			page = conduit.param('page');
 		}
 
-		if (options.page < 0 || !options.page) {
-			options.page = 1;
+		if (page < 0 || !page) {
+			page = 1;
 		}
 
-		options.offset = (options.page-1) * options.pageSize;
-
-		sort = conduit.param('sort');
+		let sort = conduit.param('sort');
 
 		if (sort) {
 			// Always override the sort
-			options.sort = {};
+			let new_sort = {};
 
 			order = conduit.param('order');
 
 			if (typeof order == 'string' && order.toLowerCase() == 'desc') {
-				options.sort[sort] = -1;
+				new_sort[sort] = -1;
 			} else {
-				options.sort[sort] = 1;
+				new_sort[sort] = 1;
 			}
-		}
-	}
-
-	options.limit = options.pageSize;
 
-	if (conduit.param('filter_field') && conduit.param('filter_value')) {
-		conditions = {};
-		conditions[conduit.param('filter_field')] = RegExp.interpret('/.*' + conduit.param('filter_value') + '.*/i');
-		options.conditions = conditions;
-	}
-
-	filter = conduit.param('filter');
-
-	if (filter) {
-		if (!conditions) {
-			conditions = {};
+			criteria.sort(new_sort);
 		}
 
-		options.conditions = conditions;
-
-		for (name in filter) {
-			if (filter[name] !== '') {
-				conditions[name] = RegExp.interpret('/.*' + filter[name] + '.*/i');
-			}
+		if (page) {
+			criteria.page(page, page_size);
 		}
 	}
 
 	if (last_id) {
-		if (!options.conditions) {
-			options.conditions = {};
-		}
-
-		if (!options.conditions.$and) {
-			options.conditions.$and = [];
-		}
-
-		let entry = {};
-
-		if (options.skipless === true) {
-			entry._id = {$gt: alchemy.castObjectId(last_id)};
+		if (skipless === true) {
+			criteria.where('_id').gt(last_id);
 		} else {
-			entry[options.skipless] = {$gt: last_id};
+			criteria.where(skipless).gt(last_id);
 		}
-
-		options.conditions.$and.push(entry);
 	}
 
-	options.available = true;
+	criteria.setOption('available', true);
 
-	pledge = model.find('all', options, function findAllPaginate(err, result) {
+	let pledge = model.find('all', criteria, function findAllPaginate(err, result) {
 
 		if (err) {
 			return;
@@ -166,21 +113,19 @@ Paginate.setMethod(function find(model, options, callback) {
 		}
 
 		let entry = {
-			page     : options.page,
-			size     : options.pageSize,
+			page     : page,
+			size     : page_size,
 			items    : result.available,
-			pages    : Math.ceil(result.available/options.pageSize),
-			skipless : options.skipless
+			pages    : Math.ceil(result.available/page_size),
+			skipless : skipless
 		};
 
-		if (options.skipless && result.length) {
+		if (skipless && result.length) {
 			entry.last_id = result.last()._id;
 		}
 
-		PageInfo[options.name] = entry;
+		PageInfo[name] = entry;
 	});
 
-	pledge.handleCallback(callback);
-
 	return pledge;
 });

package/lib/app/helper_controller/conduit.js

@@ -34,7 +34,7 @@ var Conduit = Function.inherits('Alchemy.Client.Base', 'Alchemy.Client.Conduit',
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.2
  *
  * @param    {RURL}     url
  * @param    {Object}   options
@@ -121,17 +121,19 @@ Conduit.setStatic(function handleUrlLocal(url, options) {
 		conduit = new Conduit(url, options);
 	}
 
-	for (let key in options) {
-		let info = Blast.Classes.Develry.Request.getMethodInfo(key);
+	if (conduit) {
+		for (let key in options) {
+			let info = Blast.Classes.Develry.Request.getMethodInfo(key);
 
-		if (info && info.method != 'GET') {
-			conduit.method = info.method.toLowerCase();
-			break;
+			if (info && info.method != 'GET') {
+				conduit.method = info.method.toLowerCase();
+				break;
+			}
 		}
-	}
 
-	if (!conduit.method) {
-		conduit.method = 'get';
+		if (!conduit.method) {
+			conduit.method = 'get';
+		}
 	}
 
 	Function.series(tasks, function done(err) {

package/lib/app/helper_datasource/00-nosql_datasource.js

@@ -590,7 +590,7 @@ NoSQL.setStatic(function areComparable(a, b) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.2
+ * @version  1.2.2
  *
  * @param    {Criteria}   criteria
  * @param    {Group}      group
@@ -798,6 +798,10 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 						{$exists: exists}
 					];
 
+					if (!entry.field) {
+						throw new Error('Could not find field for path "' + entry.target_path + '" in model ' + entry.model.name);
+					}
+
 					if (entry.field.is_array) {
 						$or.push({[comparator]: []});
 					} else if (entry.field instanceof Classes.Alchemy.Field.String) {

package/lib/app/helper_field/05-string_field.js

@@ -7,9 +7,7 @@
  * @since    0.2.0
  * @version  1.1.0
  */
-var StringField = Function.inherits('Alchemy.Field', function String(schema, name, options) {
-	String.super.call(this, schema, name, options);
-});
+var StringField = Function.inherits('Alchemy.Field', 'String');
 
 /**
  * Set the datatype name

package/lib/app/helper_field/belongsto_field.js

@@ -7,23 +7,4 @@
  * @since    0.2.0
  * @version  1.1.0
  */
-var BelongsTo = Function.inherits('Alchemy.Field.ObjectId', function BelongsTo(schema, name, options) {
-	BelongsTo.super.call(this, schema, name, options);
-
-	// @todo: set index stuff
-});
-
-/**
- * Load remote data for some fields
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @param    {Object}   config
- */
-BelongsTo.setMethod(async function loadData(config) {
-
-	
-
-});
+const BelongsTo = Function.inherits('Alchemy.Field.ObjectId', 'BelongsTo');