alchemymvc 1.2.1 → 1.2.4

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

package/lib/app/{field → helper_field}/password_field.js

@@ -1,18 +1,20 @@
-var bcrypt = alchemy.use('bcrypt'),
-    regex  = /^\$2[ayb]\$/;
-
 /**
  * The Password Field class
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.3
  */
-var Password = Function.inherits('Alchemy.Field', function Password(schema, name, options) {
-	Password.super.call(this, schema, name, options);
-});
+const Password = Function.inherits('Alchemy.Field', 'Password');
+
+if (Blast.isBrowser) {
+	return true;
+}
+
+const bcrypt = alchemy.use('bcrypt'),
+      regex  = /^\$2[ayb]\$/;
 
 /**
  * Make sure the password is hashed before storing it

package/lib/app/helper_field/schema_field.js

@@ -5,7 +5,7 @@
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.3
+ * @version  1.2.4
  */
 var SchemaField = Function.inherits('Alchemy.Field', function Schema(schema, name, options) {
 	Schema.super.call(this, schema, name, options);
@@ -21,18 +21,20 @@ var SchemaField = Function.inherits('Alchemy.Field', function Schema(schema, nam
 		this.field_schema.setName(name);
 	}
 
-	if (!this.field_schema.parent || schema.root_schema == this.field_schema.parent) {
-		this.field_schema.setParent(schema);
-	} else {
-		// It's possible the given schema already had the correct parent
-		// But if that's not the case, throw an error
-		if (this.field_schema.parent != schema) {
-			throw new Error('Unable to re-use a schema for field "' + name + '", use `schema.clone()`!');
+	if (schema) {
+		if (!this.field_schema.parent || schema.root_schema == this.field_schema.parent) {
+			this.field_schema.setParent(schema);
+		} else {
+			// It's possible the given schema already had the correct parent
+			// But if that's not the case, throw an error
+			if (this.field_schema.parent != schema) {
+				throw new Error('Unable to re-use a schema for field "' + name + '", use `schema.clone()`!');
+			}
 		}
-	}
 
-	if (!this.field_schema.model_name) {
-		this.field_schema.setModel(schema.model_name);
+		if (!this.field_schema.model_name) {
+			this.field_schema.setModel(schema.model_name);
+		}
 	}
 });
 
@@ -242,7 +244,7 @@ SchemaField.setMethod(function _toDatasource(value, data, datasource, callback)
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.4
  *
  * @param    {Mixed}      value
  * @param    {Function}   callback
@@ -262,6 +264,12 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 		recursive = 1;
 	}
 
+	if (recursive && Blast.isBrowser) {
+		// @TODO: this will mostly fail on the browser, so disable it for now.
+		// Maybe make it configurable later
+		recursive = 0;
+	}
+
 	// Get associated records if the subschema has associations defined
 	if (recursive && this.field_schema && !Object.isEmpty(this.field_schema.associations)) {
 

package/lib/app/helper_model/criteria.js

@@ -59,7 +59,7 @@ Criteria.setStatic(function isCriteria(instance) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.5
+ * @version  1.2.3
  *
  * @param    {Object}   data
  *
@@ -81,10 +81,14 @@ Criteria.setStatic(function unDry(data) {
 	// Revive the group instance
 	criteria.group = Group.revive(data.group, criteria);
 
+	if(!data.options) {
+		data.options = {};
+	}
+
 	// Revive the select
 	data.options.select = Select.revive(data.options.select, criteria);
 
-	criteria.options = data.options;
+	criteria.options = data.options || {};
 
 	return criteria;
 });
@@ -248,7 +252,7 @@ Criteria.setProperty(function recursive_level() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.3
  */
 Criteria.setMethod(Blast.checksumSymbol, function toChecksum() {
 
@@ -259,7 +263,7 @@ Criteria.setMethod(Blast.checksumSymbol, function toChecksum() {
 
 	for (key in this.options) {
 
-		if (key == 'init_model' || key == 'init_record') {
+		if (key == 'init_model' || key == 'init_record' || key == 'assoc_cache') {
 			continue;
 		}
 
@@ -319,21 +323,30 @@ Criteria.setMethod(Symbol.asyncIterator, function asyncIterator() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.5
+ * @version  1.2.3
  *
  * @return   {Object}
  */
 Criteria.setMethod(function toJSON() {
 
-	var result = {},
-	    options = Object.assign({}, this.options);
+	let result = {},
+	    options;
 
 	if (this.model && this.model.name) {
 		result.model = this.model.name;
 	}
 
-	if (options.init_record) {
-		options.init_record = null;
+	if (this.options) {
+		let key;
+		options = {};
+
+		for (key in this.options) {
+			if (key == 'assoc_cache' || key == 'init_record') {
+				continue;
+			}
+
+			options[key] = this.options[key];
+		}
 	}
 
 	result.group = this.group;
@@ -388,7 +401,7 @@ Criteria.setMethod(function clone() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.2.0
+ * @version  1.2.3
  *
  * @return   {String[]}
  */
@@ -396,14 +409,14 @@ Criteria.setMethod(function getFieldsToSelect() {
 
 	let result;
 
-	if (this.options.select.fields && this.options.select.fields.length) {
+	if (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) {
+	if (result && this.options?.select?.query_fields) {
 		result.push(...this.options.select.query_fields);
 	}
 
@@ -479,7 +492,7 @@ Criteria.setMethod(function getAssociationConfiguration(alias) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.3
  *
  * @param    {String}   name
  * @param    {Object}   item
@@ -524,6 +537,16 @@ Criteria.setMethod(function getCriteriaForAssociation(name, item) {
 	assoc_crit.setOption('assoc_key', assoc_key);
 	assoc_crit.setOption('assoc_value', value);
 
+	// Make the assoc_cache if it doesn't exist yet
+	if (options.create_references !== false && !options.assoc_cache) {
+		options.assoc_cache = {};
+	}
+
+	// Add the assoc_cache
+	if (options.assoc_cache) {
+		assoc_crit.setOption('assoc_cache', options.assoc_cache);
+	}
+
 	// Take over the locale option
 	if (options.locale) {
 		assoc_crit.setOption('locale', options.locale);
@@ -1310,13 +1333,17 @@ var Select = Function.inherits('Alchemy.Base', 'Alchemy.Criteria', function Sele
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.3
  *
  * @return   {Select}
  */
 Select.setStatic(function revive(data, criteria) {
 
-	var result = new Select(criteria),
+	if (!data) {
+		return;
+	}
+
+	let result = new Select(criteria),
 	    key;
 
 	result.fields = data.fields;

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,
+		}
+	};
+});