alchemymvc 1.2.4 → 1.2.6

package/lib/class/controller.js

@@ -407,7 +407,7 @@ Controller.setMethod(function update(name, value) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.2.6
  */
 Controller.setAction(async function readDatasource(conduit) {
 
@@ -449,6 +449,9 @@ Controller.setAction(async function readDatasource(conduit) {
 		}
 
 		model.removePrivateFields(items);
+
+		// @TODO: Is this still necesary?
+		// When would the records need translation so late?
 		model.translateItems(items, criteria, Function.thrower);
 
 		conduit.end({

package/lib/class/element.js

@@ -21,21 +21,12 @@ Function.getNamespace('Alchemy.Element').setStatic('default_element_prefix', 'al
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.2.1
+ * @version  1.2.5
  *
  * @return  {RURL}
  */
 Element.setMethod(function getCurrentUrl() {
-	if (Blast.isBrowser) {
-
-		if (hawkejs.scene.opening_url && hawkejs.scene.opening_url.url) {
-			return Blast.Classes.RURL.parse(hawkejs.scene.opening_url.url);
-		}
-		
-		return Blast.Classes.RURL.parse(window.location);
-	} else if (this.hawkejs_renderer && this.hawkejs_renderer.variables && this.hawkejs_renderer.variables.__url) {
-		return this.hawkejs_renderer.variables.__url.clone();
-	}
+	return this.hawkejs_renderer?.helpers?.Router?.current_url;
 });
 
 /**

package/lib/class/field.js

@@ -1049,7 +1049,7 @@ Field.setMethod(function getRules() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.4
- * @version  1.1.4
+ * @version  1.2.5
  */
 Field.setMethod(function translateRecord(prefixes, record, allow_empty) {
 
@@ -1058,4 +1058,10 @@ Field.setMethod(function translateRecord(prefixes, record, allow_empty) {
 	// Use the final result, if we found something or not
 	record[this.name] = found.result;
 	record['_prefix_' + this.name] = found.prefix;
+
+	if (!record.$translated_fields) {
+		record.$translated_fields = {};
+	}
+
+	record.$translated_fields[this.name] = found.prefix;
 });

package/lib/class/inode_file.js

@@ -1,113 +1,113 @@
-const fs = alchemy.use('fs');
-
-/**
- * The File class
- *
- * @constructor
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.1.0
- * @version  1.1.0
- *
- * @param    {String}   path   Path to the file
- */
-var File = Function.inherits('Alchemy.Inode', function File(path) {
-
-	if (typeof path == 'object') {
-		return File.from(path);
-	}
-
-	this.type = null;
-	this.hash = null;
-
-	File.super.call(this, path);
-});
-
-/**
- * Files are obviously files
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    1.1.0
- * @version  1.1.0
- *
- * @type     {Boolean}
- */
-File.setProperty('is_file', true);
-
-/**
- * Create a File instance from the given variable
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    1.1.0
- * @version  1.2.0
- */
-File.setStatic(function from(obj) {
-
-	let path;
-
-	if (typeof obj == 'string') {
-		path = obj;
-		obj = null;
-	} else {
-		path = obj.path;
-	}
-
-	let file = new File(path);
-
-	if (obj) {
-		file.stat = {
-			size : obj.size
-		};
-
-		file.name = obj.name;
-		file.type = obj.type;
-		file.hash = obj.hash;
-	}
-
-	return file;
-});
-
-/**
- * Read and return the contents
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    1.1.0
- * @version  1.1.8
- */
-File.setMethod(function read(options) {
-
-	let pledge = new Pledge();
-
-	if (!options) {
-		options = {flag: 'r'};
-	} else if (!options.flag) {
-		options.flag = 'r';
-	}
-
-	fs.readFile(this.path, options, function done(err, data) {
-
-		if (err) {
-			return pledge.reject(err);
-		}
-
-		pledge.resolve(data);
-	});
-
-	return pledge;
-});
-
-/**
- * Read and return the contents as a string
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    1.1.0
- * @version  1.1.0
- */
-File.setMethod(function readString(encoding) {
-
-	if (!encoding) {
-		encoding = 'utf8';
-	}
-
-	return this.read({encoding: encoding});
+const fs = alchemy.use('fs');
+
+/**
+ * The File class
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.1.0
+ * @version  1.1.0
+ *
+ * @param    {String}   path   Path to the file
+ */
+var File = Function.inherits('Alchemy.Inode', function File(path) {
+
+	if (typeof path == 'object') {
+		return File.from(path);
+	}
+
+	this.type = null;
+	this.hash = null;
+
+	File.super.call(this, path);
+});
+
+/**
+ * Files are obviously files
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.1.0
+ * @version  1.1.0
+ *
+ * @type     {Boolean}
+ */
+File.setProperty('is_file', true);
+
+/**
+ * Create a File instance from the given variable
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.1.0
+ * @version  1.2.0
+ */
+File.setStatic(function from(obj) {
+
+	let path;
+
+	if (typeof obj == 'string') {
+		path = obj;
+		obj = null;
+	} else {
+		path = obj.path;
+	}
+
+	let file = new File(path);
+
+	if (obj) {
+		file.stat = {
+			size : obj.size
+		};
+
+		file.name = obj.name;
+		file.type = obj.type;
+		file.hash = obj.hash;
+	}
+
+	return file;
+});
+
+/**
+ * Read and return the contents
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.1.0
+ * @version  1.1.8
+ */
+File.setMethod(function read(options) {
+
+	let pledge = new Pledge();
+
+	if (!options) {
+		options = {flag: 'r'};
+	} else if (!options.flag) {
+		options.flag = 'r';
+	}
+
+	fs.readFile(this.path, options, function done(err, data) {
+
+		if (err) {
+			return pledge.reject(err);
+		}
+
+		pledge.resolve(data);
+	});
+
+	return pledge;
+});
+
+/**
+ * Read and return the contents as a string
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.1.0
+ * @version  1.1.0
+ */
+File.setMethod(function readString(encoding) {
+
+	if (!encoding) {
+		encoding = 'utf8';
+	}
+
+	return this.read({encoding: encoding});
 });