alchemymvc 1.2.8 → 1.3.1

package/lib/app/helper_field/schema_field.js

@@ -69,7 +69,7 @@ SchemaField.setProperty(function root_model() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.4
- * @version  1.1.4
+ * @version  1.3.0
  *
  * @type     {Boolean}
  */
@@ -80,7 +80,7 @@ SchemaField.setProperty(function requires_translating() {
 	}
 
 	if (this.field_schema) {
-		return !!this.field_schema.hasTranslations;
+		return !!this.field_schema.has_translations;
 	}
 
 	return false;
@@ -93,7 +93,7 @@ SchemaField.setProperty(function requires_translating() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.1
+ * @version  1.3.1
  *
  * @param    {Object}   record
  * @param    {String}   some_path   Some path to a field in the wanted schema
@@ -102,29 +102,23 @@ SchemaField.setProperty(function requires_translating() {
  */
 SchemaField.setMethod(function getSubschema(record, some_path) {
 
-	var schema = this.options.schema,
-	    external_field_name,
-	    property_name,
-	    record_value,
-	    pieces,
-	    field,
-	    name;
+	let schema = this.options.schema;
 
 	// If schema is a string,
 	// it needs to be extracted from another field's value
 	if (typeof schema == 'string') {
 
 		// When there are 2 pieces, the second piece is the property name
-		pieces = schema.split('.');
+		let pieces = schema.split('.');
 
 		// The first piece is the external field name
-		external_field_name = pieces[0];
+		let external_field_name = pieces[0];
 
 		// The second piece is the property name
-		property_name = pieces[1] || 'schema';
+		let property_name = pieces[1] || 'schema';
 
 		// Get that other field by its name
-		field = this.schema.getField(external_field_name);
+		let field = this.schema.getField(external_field_name);
 
 		if (!field) {
 			console.error('Failed to get subschema', external_field_name, 'of', this.schema, some_path);
@@ -139,7 +133,7 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 		}
 
 		// Now get the actual external value from the record
-		record_value = field.getRecordValue(record);
+		let record_value = field.getRecordValue(record);
 
 		// I'm not sure if this will help
 		if (record_value == null) {
@@ -155,6 +149,8 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 			schema = enum_value.schema;
 		} else if (enum_value.value) {
 			schema = enum_value.value[property_name] || enum_value.value.schema;
+		} else {
+			console.log('Could not find', schema, 'in', record, 'enum values:', enum_value, 'of field', field)
 		}
 	}
 
@@ -166,7 +162,7 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.4.0
+ * @version  1.3.1
  *
  * @param    {Object}      value        Value of field, an object in this case
  * @param    {Object}      data         The data object containing `value`
@@ -174,18 +170,21 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
  *
  * @return   {Object}
  */
-SchemaField.setMethod(function _toDatasource(value, data, datasource, callback) {
+SchemaField.setMethod(function _toDatasource(value, holder, datasource, callback) {
 
 	var that = this,
 	    sub_schema,
 	    record,
 	    model,
 	    temp;
-
-	record = {};
-
-	// Recreate a record
-	record[this.schema.name] = data;
+	
+	if (this.schema.name) {
+		record = {
+			[this.schema.name] : holder,
+		};
+	} else {
+		record = holder;
+	}
 
 	sub_schema = this.getSubschema(record);
 
@@ -217,7 +216,7 @@ SchemaField.setMethod(function _toDatasource(value, data, datasource, callback)
 				}
 
 				// Add the newly found data
-				temp = Object.assign({}, data);
+				temp = Object.assign({}, holder);
 				record = {};
 				record[that.schema.name] = temp;
 
@@ -240,7 +239,7 @@ SchemaField.setMethod(function _toDatasource(value, data, datasource, callback)
 });
 
 /**
- * Get some more subschema data
+ * Turn datasource data into app data
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
@@ -323,11 +322,19 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 		return;
 	}
 
-	// Create new dummy record
-	let record = {};
+	let record;
 
-	// Recreate the record
-	record[this.schema.name] = value;
+	if (options.parent_value) {
+		record = {
+			[this.schema.name] : options.parent_value
+		};
+	} else {
+		record = {
+			[this.schema.name] : {
+				[this.name] : value,
+			}
+		};
+	}
 
 	let sub_schema = this.getSubschema(record);
 
@@ -335,13 +342,20 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 	if (sub_schema) {
 		let tasks = {};
 
-		Object.each(value, function eachField(field_value, field_name) {
+		Object.each(value, (field_value, field_name) => {
 
-			var field = sub_schema.get(field_name);
+			let field = sub_schema.get(field_name);
 
 			if (field != null) {
-				tasks[field_name] = function doToDatasource(next) {
-					field.toApp({}, {_root_data: options._root_data}, field_value, next);
+
+				let sub_options = {
+					_root_data: options._root_data,
+					parent_field_schema_name: this.name,
+					parent_value : value,
+				};
+
+				tasks[field_name] = (next) => {
+					field.toApp({}, sub_options, field_value, next);
 				};
 			}
 		});
@@ -364,7 +378,7 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.4
- * @version  1.2.6
+ * @version  1.3.0
  */
 SchemaField.setMethod(function translateRecord(prefixes, record, allow_empty) {
 
@@ -385,13 +399,13 @@ SchemaField.setMethod(function translateRecord(prefixes, record, allow_empty) {
 	for (schema_record of subject) {
 		count++;
 
-		if (this.field_schema.hasTranslations && schema_record) {
+		if (this.field_schema.has_translations && schema_record) {
 
 			let field_name,
 			    field;
 
-			for (field_name in this.field_schema.translatableFields) {
-				field = this.field_schema.translatableFields[field_name];
+			for (field_name in this.field_schema.translatable_fields) {
+				field = this.field_schema.translatable_fields[field_name];
 				field.translateRecord(prefixes, schema_record, allow_empty);
 
 				if (schema_record.$translated_fields) {

package/lib/app/helper_model/document.js

@@ -1,4 +1,4 @@
-var model_info,
+let class_cache = new Map(),
     cache_stores_in_progress,
     did_check = Symbol('did_check');
 
@@ -7,16 +7,11 @@ if (Blast.isBrowser) {
 
 	Blast.once('hawkejs_init', function gotScene(hawkejs, variables, settings, renderer) {
 
-		var model_name,
-		    DocClass,
-		    config,
-		    key;
-
-		model_info = hawkejs.scene.exposed.model_info;
-
-		for (model_name in model_info) {
-			config = model_info[model_name];
-			DocClass = Document.getDocumentClass(model_name);
+		let DocClass,
+		    config;
+		
+		for (config of hawkejs.scene.exposed.model_info) {
+			DocClass = Document.getDocumentClass(config.name);
 
 			for (key in config.schema.dict) {
 				DocClass.setFieldGetter(key);
@@ -218,25 +213,18 @@ Document.setStatic(function getClassForUndry(class_name) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.3.1
  *
  * @param    {Object|String}   model
  */
 Document.setStatic(function getDocumentClass(model) {
 
-	var doc_constructor,
-	    document_name,
-	    parent_path,
-	    model_name,
-	    DocClass,
-	    doc_path,
-	    config,
-	    key;
-
 	if (!model) {
 		throw new Error('Can not get Hawkejs.Document class for non-existing model');
 	}
 
+	let model_name;
+
 	if (typeof model == 'function') {
 		model_name = model.name;
 	} else if (typeof model == 'string') {
@@ -246,26 +234,32 @@ Document.setStatic(function getDocumentClass(model) {
 	}
 
 	// Construct the name of the document class
-	document_name = model_name;
+	let document_name = model_name;
+
+	if (class_cache.has(document_name)) {
+		return class_cache.get(document_name);
+	}
 
 	// Construct the path to this class
-	doc_path = 'Alchemy.Client.Document.' + document_name;
+	let doc_path = 'Alchemy.Client.Document.' + document_name;
 
 	// Get the class
-	DocClass = Object.path(Blast.Classes, doc_path);
+	let DocClass = Object.path(Blast.Classes, doc_path);
 
 	if (DocClass == null) {
-		doc_constructor = Function.create(document_name, function DocumentConstructor(record, options) {
+		let doc_constructor = Function.create(document_name, function DocumentConstructor(record, options) {
 			DocumentConstructor.wrapper.super.call(this, record, options);
 		});
 
-		if (Blast.isBrowser && window._hawkejs_static_expose) {
-			let exposed = window._hawkejs_static_expose;
+		let parent,
+		    config;
+
+		if (Blast.isBrowser) {
 
-			config = exposed.model_info;
+			let model = Blast.Classes.Alchemy.Client.Model.Model.getClass(model_name);
 
-			if (config) {
-				config = config[model_name];
+			if (model && model.super) {
+				parent = model.super.name;
 			}
 		} else if (Blast.isNode) {
 			config = alchemy.getModel(model_name, false);
@@ -277,13 +271,17 @@ Document.setStatic(function getDocumentClass(model) {
 			}
 		}
 
-		parent_path = 'Alchemy.Client.Document';
+		let parent_path = 'Alchemy.Client.Document';
 
 		if (config && config.parent) {
+			parent = config.parent;
+		}
+
+		if (parent && parent != 'Model') {
 			// Make sure the parent class exists
-			getDocumentClass(config.parent);
+			getDocumentClass(parent);
 
-			parent_path += '.' + config.parent;
+			parent_path += '.' + parent;
 		}
 
 		DocClass = Function.inherits(parent_path, doc_constructor);
@@ -297,6 +295,8 @@ Document.setStatic(function getDocumentClass(model) {
 		DocClass.Model = Blast.Classes.Hawkejs.Model.getClass(model_name);
 	}
 
+	class_cache.set(document_name, DocClass);
+
 	return DocClass;
 });
 
@@ -641,7 +641,7 @@ Document.setMethod(function toDry() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.4
- * @version  1.2.5
+ * @version  1.3.0
  *
  * @param    {Object}   record
  * @param    {Object}   options
@@ -721,7 +721,7 @@ Document.setMethod(function setDataRecord(record, options) {
 	}
 
 	// If this has object fields we need to clone the document already
-	if (Blast.isBrowser && this.hasObjectFields() && !this.$is_cloned) {
+	if (this.hasObjectFields() && !this.$is_cloned) {
 		this.storeCurrentDataAsOriginalRecord();
 	}
 
@@ -731,6 +731,30 @@ Document.setMethod(function setDataRecord(record, options) {
 	}
 });
 
+/**
+ * Get the translated value of a certain field.
+ * If this document has already been translated, a new instance will be queried
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @param    {String}   prefix
+ */
+Document.setMethod(async function getTranslatedValueOfField(field_name, prefix) {
+
+	const model = this.$model;
+
+	let crit = model.find();
+	crit.setOption('locale', prefix);
+	crit.select(field_name);
+	crit.where(model.primary_key, this.$pk);
+
+	let doc = await model.find('first', crit);
+
+	return doc?.[field_name];
+});
+
 /**
  * Refresh the values
  *
@@ -793,7 +817,7 @@ Document.setMethod(function getCleanOptions() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.7
+ * @version  1.3.0
  *
  * @param    {Object}    data
  * @param    {Function}  callback
@@ -890,11 +914,7 @@ Document.setMethod(function save(data, options, callback) {
 		}
 	}
 
-	if (use_data) {
-		sub_pledge = this.$model.save(data, options, updateDoc);
-	} else {
-		sub_pledge = this.$model.save(main, options, updateDoc);
-	}
+	sub_pledge = this.$model.save(this, options, updateDoc);
 
 	return pledge;
 });
@@ -1048,12 +1068,16 @@ Document.setMethod(function informDatasource(options, callback) {
 /**
  * Store the current data as the original record
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.0.4
- * @version  1.0.4
+ * @version  1.3.1
  */
 Document.setMethod(function storeCurrentDataAsOriginalRecord() {
-	this.$attributes.original_record = JSON.clone(this.$main);
+	try {
+		this.$attributes.original_record = JSON.clone(this.$main);
+	} catch (err) {
+		alchemy.distinctProblem('store_current_data_error', err.message, {error: err});
+	}
 });
 
 /**
@@ -1146,7 +1170,7 @@ Document.setMethod(function hasFieldValue(name) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.4
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param    {String}   name   The optional field name
  *
@@ -1169,7 +1193,18 @@ Document.setMethod(function hasChanged(name) {
 
 	// If we only want to check a single field
 	if (name) {
-		result = !Object.alike(this.$attributes.original_record[name], this[name]);
+		let current_value,
+		    old_value;
+		
+		if (name.includes('.')) {
+			current_value = Object.path(this, name);
+			old_value = Object.path(this.$attributes.original_record, name);
+		} else {
+			current_value = this[name];
+			old_value = this.$attributes.original_record[name];
+		}
+
+		result = !Object.alike(old_value, current_value);
 	} else {
 
 		let key;

package/lib/app/helper_model/field_set.js

@@ -215,6 +215,17 @@ FieldSet.setMethod(function addField(name, options) {
 	return config;
 });
 
+/**
+ * Remove all current fields
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ */
+FieldSet.setMethod(function clear() {
+	this.fields = new Deck();
+});
+
 /**
  * Get a fieldconfig by its field name
  *