alchemymvc 1.2.0 → 1.2.3

package/lib/app/helper_field/enum_field.js

@@ -5,9 +5,14 @@
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.1
  */
 var Enum = Function.inherits('Alchemy.Field', function Enum(schema, name, options) {
+
+	if (options.values) {
+		options.values = new Classes.Alchemy.Map.Enum(options.values);
+	}
+
 	Enum.super.call(this, schema, name, options);
 });
 
@@ -40,9 +45,9 @@ Enum.setMethod(function cast(value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.2.1
  *
- * @return   {Object}
+ * @return   {EnumValues}
  */
 Enum.setMethod(function getValues() {
 
@@ -62,7 +67,7 @@ Enum.setMethod(function getValues() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.1
  *
  * @param    {WeakMap}   wm
  *
@@ -72,37 +77,5 @@ Enum.setMethod(function getClientConfigOptions(wm) {
 
 	let options = JSON.clone(this.options, 'toHawkejs', wm);
 
-	if (this.options.values) {
-		let value,
-		    entry,
-		    key;
-
-		if (!options.values) {
-			options.values = {};
-		}
-
-		for (key in this.options.values) {
-
-			if (options.values[key]) {
-				continue;
-			}
-
-			value = this.options.values[key];
-
-			if (typeof value == 'function') {
-				entry = {
-					name  : value.name,
-					title : value.title,
-				};
-
-				if (value.schema) {
-					entry.schema = JSON.clone(value.schema, 'toHawkejs', wm);
-				}
-
-				options.values[key] = entry;
-			}
-		}
-	}
-
 	return options;
 });

package/lib/app/helper_field/schema_field.js

@@ -91,7 +91,7 @@ SchemaField.setProperty(function requires_translating() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.4.0
+ * @version  1.2.1
  *
  * @param    {Object}   record
  * @param    {String}   some_path   Some path to a field in the wanted schema
@@ -106,8 +106,7 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 	    record_value,
 	    pieces,
 	    field,
-	    name,
-	    temp;
+	    name;
 
 	// If schema is a string,
 	// it needs to be extracted from another field's value
@@ -131,9 +130,9 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 		}
 
 		// Get the values that field can have (probably an enum)
-		temp = field.getValues();
+		let values = field.getValues();
 
-		if (temp == null) {
+		if (values == null) {
 			return null;
 		}
 
@@ -146,23 +145,14 @@ SchemaField.setMethod(function getSubschema(record, some_path) {
 		}
 
 		// Get the correct field value
-		temp = temp[record_value];
-
-		if (temp != null) {
-			schema = temp[property_name];
+		let enum_value = values.get(record_value);
 
-			if (schema == null && typeof temp == 'function') {
-				temp = new temp();
-				schema = temp[property_name] || temp.schema || temp.blueprint;
-
-				if (schema != null) {
-					schema.setModel(this.schema.model_name);
-					schema.setName(this.name);
-					schema.setParent(this.schema);
-				}
-			}
-		} else {
+		if (!enum_value) {
 			schema = null;
+		} else if (enum_value.schema) {
+			schema = enum_value.schema;
+		} else if (enum_value.value) {
+			schema = enum_value.value[property_name] || enum_value.value.schema;
 		}
 	}
 
@@ -243,7 +233,7 @@ SchemaField.setMethod(function _toDatasource(value, data, datasource, callback)
 		}
 	}
 
-	log.warning('Model and subschema were not found for', that.name);
+	log.warning('Model and subschema were not found for', that.path);
 	return datasource.toDatasource(null, value, callback);
 });
 

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

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

@@ -29,6 +29,9 @@ const FieldConfig = Fn.inherits('Alchemy.Base', 'Alchemy.Criteria', function Fie
 	// The association this belongs to
 	this.association = null;
 
+	// The main model this field is in
+	this.model = null;
+
 	this.options = options || {};
 
 	if (path) {
@@ -41,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;
 });
 
 /**
@@ -72,6 +84,94 @@ FieldConfig.setProperty(function title() {
 	return title;
 });
 
+/**
+ * Set the main model context this field is used for
+ * (Actual field can be in an association of this model)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ *
+ * @param    {String|Model}   model
+ */
+FieldConfig.setMethod(function setContextModel(model) {
+
+	if (typeof model == 'string') {
+		this.model = model;
+		this._model = alchemy.getModel(model);
+	} else {
+		this._model = model;
+		this.model = model.model_name;
+	}
+});
+
+/**
+ * Get the context model this field is used for
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+FieldConfig.setMethod(function getContextModel() {
+
+	if (this._model) {
+		return this._model;
+	}
+
+	if (!this.model) {
+		return;
+	}
+
+	this._model = alchemy.getModel(this.model);
+	return this._model;
+});
+
+/**
+ * Get the actual model this field is in
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+FieldConfig.setMethod(function getModel() {
+
+	let model = this.getContextModel();
+
+	if (!model) {
+		return;
+	}
+
+	if (this.association) {
+		let config = model.getAssociation(this.association);
+
+		if (config) {
+			model = alchemy.getModel(config.modelName);
+		} else {
+			model = null;
+		}
+	}
+
+	return model;
+});
+
+/**
+ * Get the field definition
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+FieldConfig.setMethod(function getFieldDefinition() {
+
+	let model = this.getModel();
+
+	if (!model) {
+		return;
+	}
+
+	return model.getField(this.local_path);
+});
+
 /**
  * Return an object for json-drying this list
  *
@@ -103,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/field_set.js

@@ -143,6 +143,28 @@ FieldSet.setMethod(function toJSON() {
 	return result;
 });
 
+/**
+ * Get an instance of the model
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ *
+ * @return   {Model}
+ */
+FieldSet.setMethod(function getModel() {
+
+	if (!this.model) {
+		return;
+	}
+
+	if (!this._model) {
+		this._model = alchemy.getModel(this.model);
+	}
+
+	return this._model;
+});
+
 /**
  * Iterator method
  *
@@ -165,7 +187,7 @@ FieldSet.setMethod(Symbol.iterator, function* iterate() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.3
+ * @version  1.2.2
  *
  * @param    {String}   name      The name of the field to add
  * @param    {Object}   options
@@ -176,6 +198,10 @@ FieldSet.setMethod(function addField(name, options) {
 
 	let config = new Classes.Alchemy.Criteria.FieldConfig(name, options);
 
+	if (this.model && !config.getContextModel()) {
+		config.setContextModel(this.model);
+	}
+
 	this.fields.set(name, config);
 
 	return config;

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/app/helper_model/remote_data_provider.js

@@ -0,0 +1,35 @@
+/**
+ * The Remote DataProvider class
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+const RemoteDataProvider = Function.inherits('Alchemy.DataProvider', 'Remote');
+
+/**
+ * The url to load
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+RemoteDataProvider.addConfig('source');
+
+/**
+ * Get all the data
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ */
+RemoteDataProvider.setMethod(async function getAll() {
+
+	if (!this.source) {
+		return [];
+	}
+
+	let result = await Blast.fetch(this.source);
+
+	return result;
+});

package/lib/bootstrap.js

@@ -3,6 +3,22 @@
 var libpath = require('path'),
     starting;
 
+/**
+ * Calling dynamic `import()` from certain places in the codebase actually
+ * causes segfaults. This is a workaround for that.
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.2
+ * @version  1.2.2
+ *
+ * @param    {String}   path
+ *
+ * @return   {Promise}
+ */
+global.doImport = function doImport(path) {
+	return import(path);
+};
+
 /**
  * Extend prototypes
  */