alchemymvc 1.2.2 → 1.2.3

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/document_list.js

@@ -143,14 +143,31 @@ DocumentList.setMethod(function createIterator() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.3
+ * @version  1.2.3
  *
  * @return   {Object}
  */
 DocumentList.setMethod(function toDry() {
+
+	let options;
+
+	if (this.options) {
+		let key;
+
+		options = {};
+
+		for (key in this.options) {
+			if (key == 'options' || key == 'assoc_cache') {
+				continue;
+			}
+
+			options[key] = this.options[key];
+		}
+	}
+
 	return {
 		value: {
-			options    : this.options,
+			options    : options,
 			records    : this.records,
 			available  : this.available,
 		}

package/lib/app/helper_model/field_config.js

@@ -44,15 +44,24 @@ const FieldConfig = Fn.inherits('Alchemy.Base', 'Alchemy.Criteria', function Fie
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.3
  *
  * @param    {Object}   obj
  *
  * @return   {Alchemy.Form.FieldConfig}
  */
 FieldConfig.setStatic(function unDry(obj) {
-	let set = new FieldConfig(obj.path, obj.options);
-	return set;
+	let result = new FieldConfig(obj.path, obj.options);
+
+	if (obj.association) {
+		result.association = obj.association;
+	}
+
+	if (obj.model) {
+		result.model = obj.model;
+	}
+
+	return result;
 });
 
 /**
@@ -194,6 +203,7 @@ FieldConfig.setMethod(function toJSON() {
 		local_path  : this.local_path,
 		association : this.association,
 		options     : this.options,
+		model       : this.model,
 	};
 });
 

package/lib/app/helper_model/model.js

@@ -1103,13 +1103,20 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 
 		aliases[alias] = function aliasRecordTask(nextAlias) {
 
-			var key;
+			let pledge,
+			    key;
 
 			if (options.create_references !== false) {
 				key = alchemy.checksum(assoc_crit);
 
-				if (key != null && options.assoc_cache[key]) {
-					return nextAlias(null, options.assoc_cache[key]);
+				if (key != null) {
+					if (options.assoc_cache[key]) {
+						Pledge.done(options.assoc_cache[key], nextAlias);
+						return;
+					} else {
+						pledge = new Pledge();
+						options.assoc_cache[key] = pledge;
+					}
 				}
 			}
 
@@ -1125,6 +1132,11 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 				}
 
 				if (err != null) {
+
+					if (pledge) {
+						pledge.reject(err);
+					}
+
 					return nextAlias(err);
 				}
 
@@ -1140,6 +1152,10 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 
 				if (key) {
 					options.assoc_cache[key] = result;
+
+					if (pledge) {
+						pledge.resolve(result);
+					}
 				}
 
 				nextAlias(null, result);

package/lib/class/document.js

@@ -536,27 +536,24 @@ Document.setMethod(function remove(callback) {
 /**
  * Add associated data to this record
  *
- * @author   Jelle De Loecker <jelle@develry.be>
- * @since    0.2.0
- * @version  1.1.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.3
+ * @version  1.2.3
  *
- * @param    {Criteria} criteria
- * @param    {Function} callback
+ * @param    {Criteria|String} criteria
  *
- * @return   {Pledge}
+ * @return   {Criteria}
  */
-Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria, callback) {
+Document.setMethod(function preparePopulationCriteria(criteria) {
 
-	var that  = this,
+	let type = typeof criteria,
 	    model = this.$model,
-	    type  = typeof criteria,
 	    selects;
 
 	if (type == 'string') {
 		selects = [criteria];
 		criteria = {};
 	} else if (type == 'function') {
-		callback = criteria;
 		criteria = {};
 	} else if (Array.isArray(criteria)) {
 		selects = criteria;
@@ -583,7 +580,31 @@ Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData
 		}
 	}
 
-	return model.addAssociatedDataToRecord(criteria, this.$record, callback);
+	return criteria;
+});
+
+/**
+ * Add associated data to this record
+ *
+ * @author   Jelle De Loecker <jelle@develry.be>
+ * @since    0.2.0
+ * @version  1.2.3
+ *
+ * @param    {Criteria} criteria
+ * @param    {Function} callback
+ *
+ * @return   {Pledge}
+ */
+Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria, callback) {
+
+	if (typeof criteria == 'function') {
+		callback = criteria;
+		criteria = null;
+	}
+
+	criteria = this.preparePopulationCriteria(criteria);
+
+	return this.$model.addAssociatedDataToRecord(criteria, this.$record, callback);
 });
 
 /**

package/lib/class/document_list.js

@@ -63,13 +63,23 @@ DocumentList.setMethod(function clone() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.3
  *
  * @param    {Criteria}   criteria
  *
  * @return   {Pledge}
  */
 DocumentList.setMethod(['populate', 'addAssociatedData'], function addAssociatedData(criteria) {
+
+	if (!this.records?.length) {
+		return;
+	}
+
+	let doc = this.records[0];
+
+	// Use the first doc to prepare the population criteria
+	criteria = doc.preparePopulationCriteria(criteria);
+
 	return Function.forEach.parallel(this.records, function eachDoc(doc, key, next) {
 		doc.populate(criteria).done(next);
 	});

package/lib/core/client_alchemy.js

@@ -24,6 +24,17 @@ var Alchemy = Function.inherits('Alchemy.Client.Base', function Alchemy() {
 	this.sent_subscriptions = [];
 });
 
+/**
+ * A reference to the main hawkejs instance
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.2.3
+ * @version   1.2.3
+ */
+Alchemy.setProperty(function hawkejs() {
+	return window.hawkejs;
+});
+
 /**
  * Called in the onScene static method of the Alchemy helper
  *

package/lib/init/requirements.js

@@ -50,7 +50,7 @@ alchemy.use('less', 'less');
  * @link   https://npmjs.org/package/hawkejs
  */
 alchemy.use('hawkejs', 'hawkejs');
-alchemy.hawkejs = new Classes.Hawkejs.Hawkejs;
+alchemy.hawkejs = Classes.Hawkejs.Hawkejs.getInstance();
 
 /**
  * The function to detect when everything is too busy

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.2.2",
+	"version": "1.2.3",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~1.2.2",
 		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.2.8",
+		"hawkejs"          : "~2.2.9",
 		"jsondiffpatch"    : "~0.4.1",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~3.6.6",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.7.16",
+		"protoblast"       : "~0.7.20",
 		"semver"           : "~7.3.5",
 		"socket.io"        : "~2.4.0",
 		"@11ways/socket.io-stream" : "~0.9.2",