alchemymvc 1.4.0 → 1.4.2

package/lib/app/behaviour/revision_behaviour.js

@@ -320,7 +320,7 @@ Revision.setMethod(function afterSave(record, options, created) {
 					[that.revision_model.model_name] : revision_data
 				};
 
-				// Save the data
+				// Save the data (but do not wait for it)
 				that.revision_model.save(revision_data, {allowFields: true});
 			}
 		}

package/lib/app/behaviour/sluggable_behaviour.js

@@ -141,7 +141,7 @@ Sluggable.setStatic(function attached(schema, new_options) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  1.0.6
+ * @version  1.4.1
  *
  * @param    {Object}    data      The data that is to be saved
  * @param    {Object}    options   Behaviour options
@@ -172,7 +172,7 @@ Sluggable.setMethod(async function beforeSave(data, options, creating) {
 	if (!creating) {
 		old_record = await this.model.findById(data._id);
 
-		if (old_value) {
+		if (old_record) {
 			old_value = old_record[that.target_field.name];
 		}
 	}

package/lib/app/datasource/mongo_datasource.js

@@ -3,6 +3,7 @@ const mongo = alchemy.use('mongodb'),
 
 const CONNECTION = Symbol('connection'),
       CONNECTION_ERROR = Symbol('connection_error'),
+      CONNECTION_ERROR_TIME = Symbol('connection_error_time'),
       MONGO_CLIENT = Symbol('mongo_client');
 
 /**
@@ -10,7 +11,7 @@ const CONNECTION = Symbol('connection'),
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.16
+ * @version  1.4.1
  */
 const Mongo = Function.inherits('Alchemy.Datasource.Nosql', function Mongo(name, _options) {
 
@@ -20,6 +21,9 @@ const Mongo = Function.inherits('Alchemy.Datasource.Nosql', function Mongo(name,
 	// Possible connection error
 	this[CONNECTION_ERROR] = null;
 
+	// Time of the connection error (for retry logic)
+	this[CONNECTION_ERROR_TIME] = null;
+
 	// The actual DB connection
 	this[CONNECTION] = null;
 
@@ -245,7 +249,7 @@ Mongo.setMethod(function normalizeFindOptions(options) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.4.0
+ * @version  1.4.1
  *
  * @param    {Pledge}
  */
@@ -256,7 +260,18 @@ Mongo.setMethod(function connect() {
 	}
 
 	if (this[CONNECTION_ERROR]) {
-		throw this[CONNECTION_ERROR];
+		// Allow retry after 5 seconds (configurable via options.retry_delay)
+		let retry_delay = this.options.retry_delay ?? 5000;
+		let error_age = Date.now() - this[CONNECTION_ERROR_TIME];
+
+		if (error_age < retry_delay) {
+			throw this[CONNECTION_ERROR];
+		}
+
+		// Clear the cached error to allow retry
+		this[CONNECTION_ERROR] = null;
+		this[CONNECTION_ERROR_TIME] = null;
+		log.info('Retrying connection to Mongo datasource', this.name);
 	}
 
 	let pledge = this[CONNECTION] = new Swift();
@@ -268,6 +283,7 @@ Mongo.setMethod(function connect() {
 
 		if (err) {
 			this[CONNECTION_ERROR] = err;
+			this[CONNECTION_ERROR_TIME] = Date.now();
 			alchemy.printLog(alchemy.SEVERE, 'Could not create connection to Mongo server', {err: err});
 			return pledge.reject(err);
 		} else {

package/lib/app/helper/cron.js

@@ -284,7 +284,7 @@ function splitAndCleanup(input, separator) {
  * @author   Santhosh Kumar <brsanthu@gmail.com>
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.17
- * @version  1.3.17
+ * @version  1.4.1
  */
 CronExpression.setMethod(function parse() {
 	
@@ -296,7 +296,7 @@ CronExpression.setMethod(function parse() {
 	let has_seconds = this.has_seconds;
 
 	if (Cron.PREDEFINED_EXPRESSIONS[internal_expression]) {
-		internal_expression = Cron.PREDEFINED_EXPRESSIONS[expression];
+		internal_expression = Cron.PREDEFINED_EXPRESSIONS[internal_expression];
 		has_seconds = false;
 	}
 

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

@@ -706,7 +706,7 @@ function addLookupForAssociation(aggregate, assoc, assoc_model, options = {}) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.4.0
+ * @version  1.4.1
  *
  * @param    {Criteria}   criteria   The criteria to convert
  * @param    {Group}      group      The current group
@@ -1210,6 +1210,14 @@ function convertCriteriaGroupToConditions(criteria, group, config, context) {
 				}
 			}
 
+			// Skip $lookup when there are nested associations (e.g., 'Parent.Parent')
+			// because $lookup only handles one level - let the N+1 code path handle nested
+			let assoc_select = associations_to_select[alias];
+			if (assoc_select?.associations && Object.keys(assoc_select.associations).length > 0) {
+				// This association has nested associations, skip $lookup
+				continue;
+			}
+
 			// Only create aggregate when we actually need it
 			getAggregate();
 
@@ -1228,8 +1236,6 @@ function convertCriteriaGroupToConditions(criteria, group, config, context) {
 			};
 
 			// Add projection if specific fields are selected (not just the whole association)
-			let assoc_select = associations_to_select[alias];
-
 			if (assoc_select && assoc_select.fields && assoc_select.fields.length > 0) {
 				let projection = { _id: 1 };  // Always include _id
 				for (let field of assoc_select.fields) {

package/lib/app/helper_datasource/05-fallback_datasource.js

@@ -94,6 +94,8 @@ Fallback.setMethod(function storeInUpperDatasource(model, data, options) {
 		data._$cache_time = Date.now();
 
 		// Also mark it as being a local save if needed
+		let time;
+
 		if (options.local_save) {
 			if (options.local_save === true) {
 				time = Date.now();
@@ -156,7 +158,7 @@ Fallback.setMethod(function storeInUpperDatasource(model, data, options) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.4.0
+ * @version  1.4.2
  *
  * @param    {Alchemy.OperationalContext.ReadDocumentFromDatasource}   context
  *
@@ -174,7 +176,7 @@ Fallback.setMethod(function read(context) {
 		let lower_context = context.createChild();
 		lower_context.setCriteria(lower_criteria);
 
-		tasks.push(() => this.lower.read(context));
+		tasks.push(() => this.lower.read(lower_context));
 	}
 
 	let upper_criteria = criteria.clone();
@@ -193,7 +195,7 @@ Fallback.setMethod(function read(context) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.4.2
  *
  * @param    {Model}   model
  *
@@ -202,21 +204,16 @@ Fallback.setMethod(function read(context) {
 Fallback.setMethod(function getRecordsToSync(model) {
 
 	var that = this,
-	    pledge = new Pledge,
 	    criteria = model.find();
 
 	criteria.where('_$needs_remote_save').equals(1);
 
-	this.upper.read(model, criteria, function gotRecords(err, records) {
+	let context = new Classes.Alchemy.OperationalContext.ReadDocumentFromDatasource();
+	context.setDatasource(this.upper);
+	context.setModel(model);
+	context.setCriteria(criteria);
 
-		if (err) {
-			return pledge.reject(err);
-		}
-
-		pledge.resolve(records);
-	});
-
-	return pledge;
+	return this.upper.read(context);
 });
 
 /**

package/lib/app/helper_datasource/idb_datasource.js

@@ -156,15 +156,16 @@ Idb.setMethod(function _read(context) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.4.0
  */
 Idb.setMethod(function _ensureIndex(model, index, callback) {
 
-	var that = this,
-	    collection;
-
+	// Disabled for now
 	return callback();
 
+	let that = this,
+	    collection;
+
 	return Function.series(function getCollection(next) {
 		that.collection(model.table).done(next);
 	}, function checkIndex(next, _c) {
@@ -181,9 +182,10 @@ Idb.setMethod(function _ensureIndex(model, index, callback) {
 
 		if (err) {
 			console.error('Failed to create IDB index:', err);
-			return;
+			return callback(err);
 		}
 
+		callback();
 	});
 
 });

package/lib/app/helper_datasource/remote_datasource.js

@@ -81,7 +81,7 @@ Remote.setMethod(async function doServerCommand(action, model, data, callback) {
 	let fetch_options = {
 		post        : data,
 		headers     : {'content-type': 'application/json-dry'},
-		max_timeout : 3500 // A timeout of max 3.5s
+		max_timeout : this.options.max_timeout ?? 3500 // Configurable timeout, default 3.5s
 	};
 
 	alchemy.fetch(route_name, fetch_options, function gotResult(err, result) {

package/lib/app/helper_field/password_field.js

@@ -21,7 +21,7 @@ const bcrypt = alchemy.use('bcrypt'),
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.0
- * @version  1.4.0
+ * @version  1.4.1
  *
  * @param    {Alchemy.OperationalContext.SaveFieldToDatasource}   context
  * @param    {*} value
@@ -36,7 +36,9 @@ Password.setMethod(function _toDatasource(context, value) {
 
 	let pledge = new Pledge.Swift();
 
-	bcrypt.hash(value, 10, pledge.getResolverFunction());
+	let salt_rounds = this.options.salt_rounds || 10;
+
+	bcrypt.hash(value, salt_rounds, pledge.getResolverFunction());
 
 	return pledge;
 });

package/lib/app/helper_field/schema_field.js

@@ -439,6 +439,7 @@ SchemaField.setMethod(function _toDatasourceFromValueWithSubSchema(context, valu
 			model = Model.get(model);
 
 			let pledge = new Pledge.Swift();
+			let that = this;
 
 			model.find('first', {document: false, fields: [this.options.schema]}, function gotRecord(err, result) {
 
@@ -482,8 +483,8 @@ SchemaField.setMethod(function _toDatasourceFromValueWithSubSchema(context, valu
 		}
 	}
 
-	log.warning('Model and subschema were not found for', that.path);
-	return Pledge.Swift.done(datasource.toDatasource(context), callback);
+	log.warning('Model and subschema were not found for', this.path);
+	return datasource.toDatasource(context);
 });
 
 /**

package/lib/app/helper_field/time_field.js

@@ -8,7 +8,7 @@
  * @version  1.1.0
  */
 var Time = Function.inherits('Alchemy.Field', function Time(schema, name, options) {
-	Time.call(this, schema, name, options);
+	Time.super.call(this, schema, name, options);
 });
 
 /**

package/lib/app/helper_model/00-base_criteria.js

@@ -359,6 +359,20 @@ Criteria.setMethod(function compileToConditions(context) {
 	return Classes.Alchemy.Datasource.Nosql.convertCriteriaToConditions(this, context);
 });
 
+/**
+ * Get the associations to select (stub for base Criteria)
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.1
+ * @version  1.4.1
+ *
+ * @return   {Object|undefined}
+ */
+Criteria.setMethod(function getAssociationsToSelect() {
+	// Base criteria doesn't have associations
+	return;
+});
+
 /**
  * Apply old-style mongodb conditions
  *

package/lib/app/helper_model/05-criteria_expressions.js

@@ -366,7 +366,7 @@ FieldExpression.setMethod(Blast.checksumSymbol, function toChecksum() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.4.1
  *
  * @param    {string}   path
  */
@@ -389,10 +389,28 @@ FieldExpression.setMethod(function setTargetPath(path) {
 	} else {
 		let first = pieces[0];
 
-		// @TODO: better check if the first part is an association
+		// Check if the first part is an association
+		// First use the uppercase heuristic, then validate against the model if available
 		if (first[0].isUpperCase()) {
-			this.association = first;
-			pieces.shift();
+			let is_association = true;
+
+			// If the model is available, verify this is actually an association
+			let model = this.criteria?.model;
+
+			if (model) {
+				try {
+					let assoc = model.getAssociation(first);
+					is_association = !!assoc;
+				} catch (err) {
+					// Association doesn't exist - treat as a field name
+					is_association = false;
+				}
+			}
+
+			if (is_association) {
+				this.association = first;
+				pieces.shift();
+			}
 		}
 
 		this.target_path = pieces.join('.');
@@ -487,7 +505,7 @@ FieldExpression.setMethod(function normalize() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.4.0
+ * @version  1.4.1
  *
  * @return   {Pledge}
  */
@@ -498,8 +516,13 @@ FieldExpression.setMethod(function normalizeAssociationValues() {
 	}
 
 	let that = this,
-	    association = this.model.getAssociation(this.association),
-	    assoc_model = this.model.getModel(association.modelName),
+	    association = this.model.getAssociation(this.association);
+
+	if (!association) {
+		return Pledge.reject(new Error('Association "' + this.association + '" not found on model "' + this.model.name + '"'));
+	}
+
+	let assoc_model = this.model.getModel(association.modelName),
 	    assoc_crit = new Classes.Alchemy.Criteria.Model(),
 	    pledge = new Pledge(),
 	    clone = this.getCleanClone(),

package/lib/app/helper_model/10-model_criteria.js

@@ -398,7 +398,7 @@ Criteria.setMethod(function getAssociationConfiguration(alias) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.4.0
+ * @version  1.4.1
  *
  * @param    {string}   name
  * @param    {Object}   item
@@ -426,14 +426,20 @@ Criteria.setMethod(function getCriteriaForAssociation(name, item) {
 	    options = this.options;
 
 	// For self-referencing associations (e.g., Person.Parent → Person),
-	// only allow if we have recursive depth remaining.
+	// only allow if we have recursive depth remaining OR explicit nested associations.
 	// This prevents infinite loops while still supporting hierarchical data.
 	if (assoc_model.name == options.init_model) {
 		// Check if we have recursive depth available
 		let recursive = options.recursive;
 
-		if (!Number.isSafeInteger(recursive) || recursive <= 0) {
-			// No recursive depth - block to prevent potential infinite loops
+		// Also check for explicit nested associations via dot notation (e.g., 'Parent.Parent')
+		// If there's an explicit Select for this association with nested associations,
+		// we should allow it even without recursive depth
+		let has_explicit_nested = options.select?.associations?.[name]?.associations;
+		let has_nested_associations = has_explicit_nested && Object.keys(has_explicit_nested).length > 0;
+
+		if (!has_nested_associations && (!Number.isSafeInteger(recursive) || recursive <= 0)) {
+			// No recursive depth and no explicit nested associations - block to prevent infinite loops
 			return;
 		}
 	}
@@ -985,12 +991,34 @@ Select.setMethod(Blast.checksumSymbol, function toChecksum() {
 	return result;
 });
 
+/**
+ * Get the model to use for association lookups.
+ * For nested Selects (e.g., when populating 'Project.Client'),
+ * this returns the associated model, not the criteria's root model.
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.1
+ * @version  1.4.1
+ *
+ * @return   {Model}
+ */
+Select.setMethod(function getModelForAssociations() {
+
+	// If this Select has an associated model set (for nested associations),
+	// use that instead of the criteria's model
+	if (this.associated_model) {
+		return this.associated_model;
+	}
+
+	return this.criteria?.model;
+});
+
 /**
  * Add an association
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.3.4
+ * @version  1.4.1
  *
  * @param    {string}   name
  *
@@ -998,7 +1026,9 @@ Select.setMethod(Blast.checksumSymbol, function toChecksum() {
  */
 Select.setMethod(function addAssociation(name) {
 
-	if (!this.criteria?.model) {
+	let model = this.getModelForAssociations();
+
+	if (!model) {
 		throw new Error('Unable to select an association: this Criteria has no model info');
 	}
 
@@ -1032,14 +1062,23 @@ Select.setMethod(function addAssociation(name) {
 
 	// Get the association data
 	try {
-		let info = this.criteria.model.getAssociation(name);
+		let info = model.getAssociation(name);
 
 		if (info) {
 			// Make sure the localkey is added to the resultset
 			this.requireFieldForQuery(info.options.localKey);
+
+			// Store the associated model on the nested Select so it can
+			// resolve its own nested associations correctly
+			// (e.g., for 'Project.Client', the Project Select needs to know
+			// to look up 'Client' on the Project model, not the root model)
+			let associated_model = this.getModel(info.modelName);
+			if (associated_model) {
+				this.associations[name].associated_model = associated_model;
+			}
 		}
 	} catch (err) {
-		console.warn('Failed to find "' + name + '" association for ' + this.criteria.model.model_name);
+		console.warn('Failed to find "' + name + '" association for ' + model.model_name);
 	}
 
 	return this.associations[name];

package/lib/app/helper_model/document.js

@@ -1282,7 +1282,7 @@ Document.setMethod(function checkAndInformDatasource(options, callback) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.4.1
  *
  * @param    {Object}   options
  * @param    {Function} callback
@@ -1319,7 +1319,7 @@ Document.setMethod(function informDatasource(options, callback) {
 
 	cache_stores_in_progress.set(this._id, true);
 
-	return Function.series(async function getLocalVersion(next) {
+	let series_result = Function.series(async function getLocalVersion(next) {
 
 		if (is_save) {
 			return next();
@@ -1367,6 +1367,15 @@ Document.setMethod(function informDatasource(options, callback) {
 
 		callback.apply(null, results.last());
 	});
+
+	// Ensure cleanup happens even if the series fails unexpectedly
+	if (series_result && typeof series_result.catch === 'function') {
+		series_result.catch(() => {
+			cache_stores_in_progress.delete(that._id);
+		});
+	}
+
+	return series_result;
 });
 
 /**

package/lib/app/helper_model/model.js

@@ -1362,7 +1362,7 @@ Model.setMethod(function afterFindCount(options, records, callback) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  1.1.5
+ * @version  1.4.1
  *
  * @param    {Criteria}  criteria
  * @param    {Object}    item
@@ -1404,13 +1404,16 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 					if (Object.isPlainObject(item[alias])) {
 						let assoc_crit = criteria.getCriteriaForAssociation(alias, item);
 
-						if (!(item[alias] instanceof assoc_crit.model.constructor.Document)) {
+						// assoc_crit can be undefined for self-referencing without recursive depth
+						if (assoc_crit && !(item[alias] instanceof assoc_crit.model.constructor.Document)) {
 							item[alias] = assoc_crit.model.createDocument(item[alias]);
 						}
 					}
 				} else if (Array.isArray(item[alias])) {
 					let assoc_crit = criteria.getCriteriaForAssociation(alias, item);
-					item[alias] = assoc_crit.model.createDocumentList(item[alias]);
+					if (assoc_crit) {
+						item[alias] = assoc_crit.model.createDocumentList(item[alias]);
+					}
 				}
 			}