alchemymvc 1.2.2 → 1.2.5

package/lib/app/helper/router_helper.js

@@ -29,14 +29,19 @@ var Route = Function.inherits('Alchemy.Helper.Router', function Route(renderer)
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.3
+ * @version  1.2.5
  *
  * @type     {RURL}
  */
 Router.setProperty(function current_url() {
-	if (this.view && this.view.variables && this.view.variables.__url) {
-		return this.view.variables.__url.clone();
+	if (this.view_render?.variables?.__url) {
+		return this.view_render.variables.__url.clone();
 	} else if (Blast.isBrowser) {
+
+		if (hawkejs?.scene?.opening_url?.url) {
+			return Blast.Classes.RURL.parse(hawkejs.scene.opening_url.url);
+		}
+
 		return Blast.Classes.RURL.parse(window.location);
 	}
 });
@@ -580,6 +585,129 @@ Router.setMethod(function getAnchor(name, parameters, options) {
 	return anchor;
 });
 
+/**
+ * Get the current route variables
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @return   {Object}
+ */
+Router.setMethod(function getRouteVariables() {
+
+	let params,
+	    route,
+	    url;
+	
+	if (this.view_render?.variables?.__route) {
+		route = this.view_render.variables.__route;
+		params = this.view_render.variables.__urlparams;
+		url = this.view_render.variables.__url;
+	} else if (Blast.isBrowser) {
+		route = alchemy.current_route;
+		params = alchemy.current_url_params;
+		url = alchemy.current_url;
+	}
+
+	return {route, params, url};
+});
+
+/**
+ * Update language switcher info
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Element}   element    The element to apply to
+ */
+Router.setMethod(function updateLanguageSwitcher(element) {
+
+	let language = element.getAttribute('data-alchemy-language-switch');
+
+	if (!language) {
+		return;
+	}
+
+	let url = this.translateCurrentRoute(language);
+
+	if (!url) {
+		url = '/' + language;
+	}
+
+	element.setAttribute('href', url);
+});
+
+/**
+ * Get a translated URL for the current route
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String}   prefix    The prefix to use
+ */
+Router.setMethod(function translateCurrentRoute(prefix) {
+
+	let info = this.getRouteVariables();
+
+	if (!info.route) {
+		return;
+	}
+
+	let config = this.routeConfig(info.route);
+
+	if (!config) {
+		return;
+	}
+
+	// Get the url string
+	let url = this.routeUrl(info.route, info.params, {locale: prefix});
+
+	// Turn it into an RURL object
+	url = RURL.parse(url);
+
+	if (url && url.pathname == '/') {
+		url.pathname = '/' + prefix + url.pathname;
+	}
+
+	// Add the get queries
+	if (info.url && info.url.search) {
+		for (key in info.url.query) {
+
+			if (key == 'hajax' || key == 'h_diversion' || key == 'htop') {
+				continue;
+			}
+
+			url.addQuery(key, info.url.query[key]);
+		}
+	}
+
+	return url;
+});
+
+/**
+ * Turn the given element into a language switcher
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Element}   element    The element to apply to
+ * @param    {String}    language   The actual language
+ * @param    {Object}    options
+ */
+Router.setMethod(function languageSwitcherDirective(element, language, options) {
+
+	element.setAttribute('hreflang', language);
+	element.setAttribute('data-he-link', 'false');
+	element.setAttribute('data-alchemy-language-switch', language);
+	element.setAttribute('rel', 'nofollow');
+
+	this.updateLanguageSwitcher(element);
+});
+
 /**
  * The switch language element
  *
@@ -589,6 +717,10 @@ Router.setMethod(function getAnchor(name, parameters, options) {
  */
 Router.setMethod(function languageSwitcher(options) {
 
+	if (arguments.length == 3) {
+		return this.languageSwitcherDirective(...arguments);
+	}
+
 	var prefixes = this.view.expose('prefixes'),
 	    prefix,
 	    config,

package/lib/app/helper_component/paginate_component.js

@@ -15,7 +15,7 @@ const Paginate = Function.inherits('Alchemy.Client.Component', 'Paginate');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.2.2
+ * @version  1.2.5
  *
  * @param   {Model}     model
  * @param   {Criteria}  criteria
@@ -26,6 +26,8 @@ Paginate.setMethod(function find(model, criteria) {
 
 	const conduit = this.controller.conduit;
 
+	criteria = Blast.Classes.Alchemy.Criteria.Criteria.cast(criteria);
+
 	// Get the model if a name has been given
 	if (typeof model == 'string') {
 		model = this.getModel(model);

package/lib/app/helper_controller/conduit.js

@@ -405,6 +405,26 @@ Conduit.setMethod(function chooseBestLocale(locales) {
 	return 'en';
 });
 
+/**
+ * Check if this request has a permission
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {String}    permission
+ *
+ * @return   {Boolean}   True if the user has the permission, false otherwise
+ */
+Conduit.setMethod(function hasPermission(permission) {
+
+	if (alchemy.permission_checker != null) {
+		return alchemy.permission_checker.conduitHasPermission(this, permission);
+	}
+
+	return false;
+});
+
 if (Blast.isNode) {
 	return;
 }

package/lib/app/{field → helper_field}/password_field.js

@@ -1,18 +1,20 @@
-var bcrypt = alchemy.use('bcrypt'),
-    regex  = /^\$2[ayb]\$/;
-
 /**
  * The Password Field class
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.3
  */
-var Password = Function.inherits('Alchemy.Field', function Password(schema, name, options) {
-	Password.super.call(this, schema, name, options);
-});
+const Password = Function.inherits('Alchemy.Field', 'Password');
+
+if (Blast.isBrowser) {
+	return true;
+}
+
+const bcrypt = alchemy.use('bcrypt'),
+      regex  = /^\$2[ayb]\$/;
 
 /**
  * Make sure the password is hashed before storing it

package/lib/app/helper_field/schema_field.js

@@ -5,7 +5,7 @@
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.3
+ * @version  1.2.4
  */
 var SchemaField = Function.inherits('Alchemy.Field', function Schema(schema, name, options) {
 	Schema.super.call(this, schema, name, options);
@@ -21,18 +21,20 @@ var SchemaField = Function.inherits('Alchemy.Field', function Schema(schema, nam
 		this.field_schema.setName(name);
 	}
 
-	if (!this.field_schema.parent || schema.root_schema == this.field_schema.parent) {
-		this.field_schema.setParent(schema);
-	} else {
-		// It's possible the given schema already had the correct parent
-		// But if that's not the case, throw an error
-		if (this.field_schema.parent != schema) {
-			throw new Error('Unable to re-use a schema for field "' + name + '", use `schema.clone()`!');
+	if (schema) {
+		if (!this.field_schema.parent || schema.root_schema == this.field_schema.parent) {
+			this.field_schema.setParent(schema);
+		} else {
+			// It's possible the given schema already had the correct parent
+			// But if that's not the case, throw an error
+			if (this.field_schema.parent != schema) {
+				throw new Error('Unable to re-use a schema for field "' + name + '", use `schema.clone()`!');
+			}
 		}
-	}
 
-	if (!this.field_schema.model_name) {
-		this.field_schema.setModel(schema.model_name);
+		if (!this.field_schema.model_name) {
+			this.field_schema.setModel(schema.model_name);
+		}
 	}
 });
 
@@ -242,7 +244,7 @@ SchemaField.setMethod(function _toDatasource(value, data, datasource, callback)
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.4
  *
  * @param    {Mixed}      value
  * @param    {Function}   callback
@@ -262,6 +264,12 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 		recursive = 1;
 	}
 
+	if (recursive && Blast.isBrowser) {
+		// @TODO: this will mostly fail on the browser, so disable it for now.
+		// Maybe make it configurable later
+		recursive = 0;
+	}
+
 	// Get associated records if the subschema has associations defined
 	if (recursive && this.field_schema && !Object.isEmpty(this.field_schema.associations)) {
 

package/lib/app/helper_model/criteria.js

@@ -53,13 +53,38 @@ Criteria.setStatic(function isCriteria(instance) {
 	return false;
 });
 
+/**
+ * Make sure to get a criteria
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.5
+ * @version  1.2.5
+ *
+ * @param    {Object}   obj
+ *
+ * @return   {Criteria}
+ */
+Criteria.setStatic(function cast(obj) {
+
+	if (Criteria.isCriteria(obj)) {
+		return obj;
+	}
+
+	let instance = new Criteria();
+
+	if (obj) {
+		instance.applyOldOptions(obj);
+	}
+
+	return instance;
+});
 
 /**
  * Undry the given object
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.5
+ * @version  1.2.3
  *
  * @param    {Object}   data
  *
@@ -81,10 +106,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 +277,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 +288,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 +348,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 +426,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 +434,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 +517,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 +562,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 +1358,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.js

@@ -305,7 +305,7 @@ Document.setStatic(function getDocumentClass(model) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {Object}           obj
  * @param    {Boolean|String}   cloned
@@ -349,6 +349,26 @@ Document.setStatic(function unDry(obj, cloned) {
 		obj.$options.model = null;
 	}
 
+	if (Blast.isBrowser && obj.$options?.private_fields) {
+		let model = alchemy.getModel(obj.$model_name),
+		    field;
+		
+		for (field of obj.$options.private_fields) {
+
+			// @TODO: don't let documents undry before schema is ready?
+			if (!model.schema) {
+				continue;
+			}
+
+			if (model.schema.has(field.name)) {
+				continue;
+			}
+
+			model.schema.addField(field.name, field.constructor.type_name, field.options);
+			model.constructor.Document.setFieldGetter(field.name);
+		}
+	}
+
 	DocClass.call(result, obj.$record, obj.$options);
 
 	if (cloned || Blast.isNode || obj[Blast.Classes.IndexedDb.from_cache_symbol]) {
@@ -619,9 +639,9 @@ Document.setMethod(function toDry() {
 /**
  * Actually initialize this instance
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.4
- * @version  1.1.0
+ * @version  1.2.5
  *
  * @param    {Object}   record
  * @param    {Object}   options
@@ -661,17 +681,43 @@ Document.setMethod(function setDataRecord(record, options) {
 	// The original record
 	this.$record = record;
 
+	// @TODO: Find a cleaner way of setting these values
+	if (record[name].$translated_fields) {
+		this.$hold.translated_fields = record[name].$translated_fields;
+	}
+
 	if (Blast.isNode && this.constructor.namespace.indexOf('Alchemy.Document') == -1) {
-		let field,
+		let delete_field,
+		    field,
 		    key;
 
 		for (key in this.$main) {
 			field = this.$model.schema.get(key);
 
-			if (!field || field.is_private) {
+			if (!field) {
+				delete_field = true;
+			} else if (field.is_private) {
+				delete_field = true;
+
+				if (options.keep_private_fields) {
+					delete_field = false;
+				}
+			} else {
+				delete_field = false;
+			}
+
+			if (delete_field) {
 				delete this.$main[key];
 			}
 		}
+
+		if (options?.keep_private_fields) {
+			let fields = this.$model.schema.getPrivateFields();
+
+			if (fields?.length) {
+				options.private_fields = JSON.clone(fields, 'toHawkejs');
+			}
+		}
 	}
 
 	// If this has object fields we need to clone the document already

package/lib/app/helper_model/document_list.js

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