alchemymvc 1.4.0-alpha.1 → 1.4.0-alpha.2

package/lib/app/behaviour/revision_behaviour.js

@@ -12,26 +12,49 @@ var jsondiffpatch = alchemy.use('jsondiffpatch'),
  * @since    0.0.1
  * @version  0.2.0
  */
-var Revision = Function.inherits('Alchemy.Behaviour', function RevisionBehaviour(model, options) {
-	Behaviour.call(this, model, options);
-});
+const Revision = Function.inherits('Alchemy.Behaviour', 'RevisionBehaviour');
 
 /**
- * Get the Revision Model class for the attached model
+ * Get the Revision model class for the given main model
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.0.3
- * @version  1.1.0
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {Schema}    schema
+ * @param    {Object}    options
  */
-Revision.setProperty(function revision_model_class() {
+Revision.setStatic(function getRevisionModel(model) {
 
-	var class_name = this.model.name + 'DataRevision';
+	if (typeof model == 'function') {
+		model = model.model_name;
+	}
+
+	if (typeof model == 'string') {
+		model = Model.get(model);
+	}
+
+	if (!model) {
+		throw new Error('Unable to add Revision behaviour to undefined model');
+	}
+
+	let revision_model_name = model.model_name + 'DataRevision',
+	    revision_model;
+
+	try {
+		revision_model = Model.get(revision_model_name, false);
+	} catch (err) {
+		// Ignore
+	}
 
-	if (Classes.Alchemy.Model[class_name]) {
-		return Classes.Alchemy.Model[class_name];
+	if (revision_model) {
+		return revision_model;
 	}
+	
+	let namespace = model.constructor.namespace,
+	    class_name = model.name + 'DataRevision';
 
-	let model_class = Function.inherits('Alchemy.Model', Function.create(class_name, function DataRevision(options) {
+	let model_class = Function.inherits('Alchemy.Model', namespace, Function.create(class_name, function DataRevision(options) {
 		Model.call(this, options);
 	}));
 
@@ -48,6 +71,12 @@ Revision.setProperty(function revision_model_class() {
 		if (Classes.Alchemy.Model.User) {
 			this.belongsTo('User');
 		}
+
+		// Add an index on the record_id
+		this.addIndex('record_id', {
+			unique : false,
+			sparse : false,
+		});
 	});
 
 	// Force the constitutors to load now
@@ -56,6 +85,39 @@ Revision.setProperty(function revision_model_class() {
 	return model_class;
 });
 
+/**
+ * Listen to attachments to schema's
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.0.3
+ * @version  1.4.0
+ *
+ * @param    {Schema}    schema
+ * @param    {Object}    options
+ */
+Revision.setStatic(function attached(schema, new_options) {
+
+	const context = schema.model_class;
+
+	// Add the revision number to the main model
+	context.addField('__r', 'Number', {
+		title: 'Revision',
+	});
+
+	Revision.getRevisionModel(schema.model_class);
+});
+
+/**
+ * Get the Revision Model class for the attached model
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.0.3
+ * @version  1.4.0
+ */
+Revision.setProperty(function revision_model_class() {
+	return Revision.getRevisionModel(this.model);
+});
+
 /**
  * Get the revision model for the attached model
  *
@@ -122,24 +184,6 @@ Revision.setProperty(function diff_patcher() {
 	return diff_patch_instance;
 });
 
-/**
- * Listen to attachments to schema's
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.0.3
- * @version  1.0.3
- *
- * @param    {Schema}    schema
- * @param    {Object}    options
- */
-Revision.setStatic(function attached(schema, new_options) {
-
-	var context = schema.model_class;
-
-	// Add the revision
-	context.addField('__r', 'Number', {title: 'Revision'});
-});
-
 /**
  * Compare 2 objects
  *
@@ -157,14 +201,14 @@ Revision.setMethod(function compare(left, right) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.0.5
+ * @version  1.4.0
  */
 Revision.setMethod(function beforeSave(record, options, creating) {
 
-	let main = record[this.model.name];
+	let main = record.$main;
 
 	if (!main) {
-		throw new Error('Unable to find main "' + this.model.name + '" data');
+		throw new Error('Unable to find main "' + this.model.model_name + '" data');
 	}
 
 	// No revision to save when creating a record
@@ -177,14 +221,12 @@ Revision.setMethod(function beforeSave(record, options, creating) {
 	    next = this.wait('series');
 
 	// Find the original record
-	Model.get(that.model.name).findById(main._id, async function gotRecord(err, result) {
-
-		var ori;
+	Model.get(this.model.model_name).findById(record.$pk, async function gotRecord(err, result) {
 
 		if (result) {
 
 			// Get the original data
-			ori = await that.model.convertRecordToDatasourceFormat(result);
+			let ori = await that.model.convertRecordToDatasourceFormat(result);
 
 			// Store the original data in a weakmap for later
 			revision_before.set(options, ori);
@@ -206,17 +248,11 @@ Revision.setMethod(function beforeSave(record, options, creating) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.1.0
+ * @version  1.4.0
  */
 Revision.setMethod(function afterSave(record, options, created) {
 
-	var that = this,
-	    earlier_data,
-	    right,
-	    main,
-	    that,
-	    left,
-	    next;
+	let earlier_data;
 
 	if (created) {
 		earlier_data = {};
@@ -229,11 +265,12 @@ Revision.setMethod(function afterSave(record, options, created) {
 		return;
 	}
 
-	next = this.wait();
-	main = record[that.model.name] || record;
+	let doc = this.model.createDocument(record);
+	let next = this.wait();
+	const that = this;
 
 	// Find the complete saved item
-	Model.get(that.model.name).findById(main._id, async function gotRecord(err, result) {
+	Model.get(this.model.model_name).findByPk(doc.$pk, async function gotRecord(err, result) {
 
 		if (result) {
 
@@ -243,8 +280,8 @@ Revision.setMethod(function afterSave(record, options, created) {
 			if (new_data) {
 
 				// Convert the objects so they can be diffed properly
-				left = JSON.toDryObject(earlier_data);
-				right = JSON.toDryObject(new_data);
+				let left = JSON.toDryObject(earlier_data),
+				    right = JSON.toDryObject(new_data);
 
 				// Diff them
 				let delta = that.compare(left, right);
@@ -267,7 +304,7 @@ Revision.setMethod(function afterSave(record, options, created) {
 
 				// Add the delta information
 				revision_data = {
-					[that.revision_model.name] : revision_data
+					[that.revision_model.model_name] : revision_data
 				};
 
 				// Save the data

package/lib/app/datasource/mongo_datasource.js

@@ -659,7 +659,7 @@ Mongo.setMethod(function _remove(model, query, options, callback) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.17
+ * @version  1.4.0
  */
 Mongo.setMethod(function _ensureIndex(model, index, callback) {
 
@@ -696,11 +696,20 @@ Mongo.setMethod(function _ensureIndex(model, index, callback) {
 
 			// Check for IndexOptionsConflict
 			if (err.code === 85) {
+				let index_to_drop;
+
+				if (err.message.includes('already exists with a different name:')) {
+					index_to_drop = err.message.after('different name:').trim();
+				}
+
+				if (!index_to_drop) {
+					index_to_drop = options.name;
+				}
 
 				try {
 
 					// Index already exists, drop it
-					await collection.dropIndex(options.name);
+					await collection.dropIndex(index_to_drop);
 
 					// Try again
 					await collection.createIndex(index_specs, options);

package/lib/class/model.js

@@ -59,11 +59,6 @@ Model.postInherit(function setModelName() {
 		model_name = ns + '_' + model_name;
 	}
 
-	if (model_name[0] == '_') {
-		console.log(ns, model_name)
-		throw new Error('KAK')
-	}
-
 	// The simple name of the model
 	this.model_name = model_name;
 	this.setProperty('model_name', model_name);
@@ -1186,10 +1181,6 @@ Model.setMethod(function auditRecord(document, options, callback) {
  */
 Model.setMethod(function convertRecordToDatasourceFormat(record, options, callback) {
 
-	var that = this,
-	    pledge,
-	    data;
-
 	if (typeof options == 'function') {
 		callback = options;
 		options = {};
@@ -1199,12 +1190,12 @@ Model.setMethod(function convertRecordToDatasourceFormat(record, options, callba
 		options = {};
 	}
 
-	data = record[this.name] || record;
+	let data = record.$main || record[this.model_name] || record;
 
 	// Normalize the data
 	data = this.compose(data, options);
 
-	pledge = this.datasource.toDatasource(this, data);
+	let pledge = this.datasource.toDatasource(this, data);
 
 	pledge.handleCallback(callback);
 

package/lib/class/schema_client.js

@@ -1041,7 +1041,7 @@ Schema.setMethod(function getFieldNames() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.17
+ * @version  1.4.0
  *
  * @param    {string|FieldType}   _field
  * @param    {Object}             options
@@ -1073,13 +1073,33 @@ Schema.setMethod(function addIndex(_field, _options) {
 	// Set the default options
 	options = Object.assign({}, this.indexOptions, options);
 
-	if (options.name == null) {
-		options.name = field.name;
+	const setIndexName = () => {
 
-		if (options.unique) {
-			options.name += '_uq';
+		if (options.name) {
+			return;
+		}
+
+		if (!this.model_name) {
+			return;
+		}
+
+		if (options.name == null) {
+			options.name = field.path;
+
+			if (options.unique) {
+				options.name += '_uq';
+			}
 		}
-	}
+
+		if (this.indexes[options.name] == null) {
+			// Create the index group if it doesn't exist yet.
+			// The first time it's called will define the group options.
+			this.indexes[options.name] = {
+				fields: {},
+				options: options
+			};
+		}
+	};
 
 	if (typeof options.order == 'number') {
 		if (options.order == 'asc') {
@@ -1089,15 +1109,6 @@ Schema.setMethod(function addIndex(_field, _options) {
 		}
 	}
 
-	if (this.indexes[options.name] == null) {
-		// Create the index group if it doesn't exist yet.
-		// The first time it's called will define the group options.
-		this.indexes[options.name] = {
-			fields: {},
-			options: options
-		};
-	}
-
 	// Even if an index is unique,
 	// it needs the 'alternate' property in order to be used
 	// as an alternate method of updating without _id
@@ -1105,6 +1116,9 @@ Schema.setMethod(function addIndex(_field, _options) {
 		this.has_alternates++;
 	}
 
+	// Try to set the index name now, if possible
+	setIndexName();
+
 	const that = this;
 
 	that.getDatasource().done(function gotDs(err, datasource) {
@@ -1123,6 +1137,9 @@ Schema.setMethod(function addIndex(_field, _options) {
 			return alchemy.printLog('error', ['Unable to ensure index on this datasource', options.name], {err: new Error()});
 		}
 
+		// Try to set the index name again, if it hasn't been done yet
+		setIndexName();
+
 		let path = field.path;
 
 		if (options.db_property) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.4.0-alpha.1",
+	"version": "1.4.0-alpha.2",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~3.5.1",
 		"graceful-fs"      : "~4.2.11",
-		"hawkejs"          : "~2.3.16",
+		"hawkejs"          : "~2.3.17",
 		"jsondiffpatch"    : "~0.5.0",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~6.1.0",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.31",
-		"protoblast"       : "~0.9.0",
+		"protoblast"       : "~0.9.1",
 		"semver"           : "~7.5.4",
 		"socket.io"        : "~4.7.2",
 		"@11ways/socket.io-stream" : "~0.9.2",