alchemymvc 1.1.10 → 1.2.2

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
@@ -611,6 +611,15 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 		group = criteria.group;
 	}
 
+	let getAggregate = () => {
+		if (!aggregate) {
+			aggregate = {
+				pipeline: [],
+				lookups: {}
+			};
+		}
+	}
+
 	for (i = 0; i < group.items.length; i++) {
 		entry = group.items[i];
 
@@ -620,12 +629,7 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 		}
 
 		if (entry.association) {
-			if (!aggregate) {
-				aggregate = {
-					pipeline: [],
-					lookups: {}
-				};
-			}
+			getAggregate();
 
 			// Get the association info
 			assoc = criteria.model.getAssociation(entry.association);
@@ -705,9 +709,45 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 			    not,
 			    obj = {};
 
+			let field_entry = {},
+			    name = entry.target_path;
+
+			// Do we need to look into an object itself?
+			// (Like the "timestamp" property of a date field when stored with units)
+			if (entry.db_property) {
+				name += '.' + entry.db_property;
+			}
+
+			if (entry.association) {
+				name = entry.association + '.' + name;
+			}
+
 			for (let i = 0; i < entry.items.length; i++) {
 				item = entry.items[i];
 
+				// If the value is a RegExp, we might have to stringify the value
+				if (shouldStringify(entry, item) && RegExp.isRegExp(item.value)) {
+
+					let stringified_field = name + '_stringified';
+
+					getAggregate();
+
+					aggregate.pipeline.push({
+						$addFields: {
+							[stringified_field]: {
+								$convert: {
+									input: '$' + name,
+									to: 'string',
+									onError: '',
+									onNull: ''
+								}
+							}
+						}
+					});
+
+					name = stringified_field;
+				}
+
 				if (item.type == 'ne') {
 					obj.$ne = item.value;
 				} else if (item.type == 'not') {
@@ -758,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) {
@@ -771,19 +815,6 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 					throw new Error('Unknown criteria expression: "' + item.type + '"');
 				}
 
-				let field_entry = {},
-				    name = entry.target_path;
-
-				// Do we need to look into an object itself?
-				// (Like the "timestamp" property of a date field when stored with units)
-				if (entry.db_property) {
-					name += '.' + entry.db_property;
-				}
-
-				if (entry.association) {
-					name = entry.association + '.' + name;
-				}
-
 				if (obj && obj.$or) {
 
 					let $or = [],
@@ -870,6 +901,33 @@ NoSQL.setMethod(function compileCriteria(criteria, group) {
 	return {$and: result};
 });
 
+/**
+ * Is the given item about a string field?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.0
+ * @version  1.2.0
+ *
+ * @param    {Object}   entry
+ * @param    {Object}   item
+ *
+ * @return   {boolean}
+ */
+function shouldStringify(entry, item) {
+
+	if (!item || !item.value) {
+		return false;
+	}
+
+	try {
+		let field = entry.model.getField(entry.target_path);
+
+		// The field value should only be stringified if it isn't a string already
+		return !(field instanceof Classes.Alchemy.Field.String);
+	} catch (err) {}
+
+	return false;
+}
 
 /**
  * Get the MongoDB options from this criteria

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');

package/lib/app/helper_field/enum_field.js

@@ -5,9 +5,14 @@
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.1
  */
 var Enum = Function.inherits('Alchemy.Field', function Enum(schema, name, options) {
+
+	if (options.values) {
+		options.values = new Classes.Alchemy.Map.Enum(options.values);
+	}
+
 	Enum.super.call(this, schema, name, options);
 });
 
@@ -40,9 +45,9 @@ Enum.setMethod(function cast(value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.2.1
  *
- * @return   {Object}
+ * @return   {EnumValues}
  */
 Enum.setMethod(function getValues() {
 
@@ -62,7 +67,7 @@ Enum.setMethod(function getValues() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.1
  *
  * @param    {WeakMap}   wm
  *
@@ -72,37 +77,5 @@ Enum.setMethod(function getClientConfigOptions(wm) {
 
 	let options = JSON.clone(this.options, 'toHawkejs', wm);
 
-	if (this.options.values) {
-		let value,
-		    entry,
-		    key;
-
-		if (!options.values) {
-			options.values = {};
-		}
-
-		for (key in this.options.values) {
-
-			if (options.values[key]) {
-				continue;
-			}
-
-			value = this.options.values[key];
-
-			if (typeof value == 'function') {
-				entry = {
-					name  : value.name,
-					title : value.title,
-				};
-
-				if (value.schema) {
-					entry.schema = JSON.clone(value.schema, 'toHawkejs', wm);
-				}
-
-				options.values[key] = entry;
-			}
-		}
-	}
-
 	return options;
 });

package/lib/app/helper_field/schema_field.js

@@ -91,7 +91,7 @@ SchemaField.setProperty(function requires_translating() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.4.0
+ * @version  1.2.1
  *
  * @param    {Object}   record
  * @param    {String}   some_path   Some path to a field in the wanted schema
@@ -106,8 +106,7 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 	    record_value,
 	    pieces,
 	    field,
-	    name,
-	    temp;
+	    name;
 
 	// If schema is a string,
 	// it needs to be extracted from another field's value
@@ -131,9 +130,9 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 		}
 
 		// Get the values that field can have (probably an enum)
-		temp = field.getValues();
+		let values = field.getValues();
 
-		if (temp == null) {
+		if (values == null) {
 			return null;
 		}
 
@@ -146,23 +145,14 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 		}
 
 		// Get the correct field value
-		temp = temp[record_value];
-
-		if (temp != null) {
-			schema = temp[property_name];
+		let enum_value = values.get(record_value);
 
-			if (schema == null && typeof temp == 'function') {
-				temp = new temp();
-				schema = temp[property_name] || temp.schema || temp.blueprint;
-
-				if (schema != null) {
-					schema.setModel(this.schema.model_name);
-					schema.setName(this.name);
-					schema.setParent(this.schema);
-				}
-			}
-		} else {
+		if (!enum_value) {
 			schema = null;
+		} else if (enum_value.schema) {
+			schema = enum_value.schema;
+		} else if (enum_value.value) {
+			schema = enum_value.value[property_name] || enum_value.value.schema;
 		}
 	}
 
@@ -243,7 +233,7 @@ SchemaField.setMethod(function _toDatasource(value, data, datasource, callback)
 		}
 	}
 
-	log.warning('Model and subschema were not found for', that.name);
+	log.warning('Model and subschema were not found for', that.path);
 	return datasource.toDatasource(null, value, callback);
 });