alchemymvc 1.2.5 → 1.2.7

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/document.js

@@ -300,7 +300,7 @@ Document.setProperty(function $model() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.3.3
- * @version  1.0.3
+ * @version  1.2.7
  */
 Document.setProperty(function conduit() {
 	if (this.$conduit) {
@@ -314,6 +314,10 @@ Document.setProperty(function conduit() {
 	}
 }, function setConduit(conduit) {
 	this.$conduit = conduit;
+
+	if (this.$options.model) {
+		this.$options.model.conduit = conduit;
+	}
 });
 
 /**
@@ -384,9 +388,9 @@ Document.setMethod(function toDry() {
 /**
  * Simplify the object for Hawkejs
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.2.4
+ * @version  1.2.7
  *
  * @param    {WeakMap}   wm
  *
@@ -410,7 +414,7 @@ Document.setMethod(function toHawkejs(wm) {
 	record = JSON.clone(this.$record, 'toHawkejs', wm);
 
 	// Sometimes we get an EMPTY $record value,
-	// this is probably because it's already in the process of being clones
+	// this is probably because it's already in the process of being cloned
 	if (!Object.isEmpty(record)) {
 		// Get clean options
 		let options = JSON.clone(this.getCleanOptions(), 'toHawkejs', wm);
@@ -425,6 +429,16 @@ Document.setMethod(function toHawkejs(wm) {
 		result.$_hold = JSON.clone(this.$_hold, 'toHawkejs', wm);
 	}
 
+	const conduit = this.conduit;
+
+	if (conduit) {
+		result.conduit = conduit;
+
+		if (result.$options?.model) {
+			result.$options.model.conduit = conduit;
+		}
+	}
+
 	return result;
 });
 

package/lib/class/inode_file.js

@@ -1,113 +1,137 @@
-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.7
+ */
+File.setStatic(function from(obj) {
+
+	if (!obj) {
+		return;
+	}
+
+	let path,
+	    name,
+	    type,
+	    hash,
+		size;
+
+	if (typeof obj == 'string') {
+		path = obj;
+	} else if (obj.originalFilename) {
+		// Formidable 2.0
+		path = obj.filepath;
+		name = obj.originalFilename;
+		type = obj.mimetype;
+		hash = obj.hash;
+		size = obj.size;
+	} else {
+		path = obj.path;
+		name = obj.name;
+		type = obj.type;
+		hash = obj.hash;
+		size = obj.size;
+	}
+
+	let file = new File(path);
+
+	if (size != null) {
+		file.stat = {size};
+	}
+
+	if (name != null) {
+		file.name = name;
+	}
+
+	if (type != null) {
+		file.type = type;
+	}
+
+	if (hash != null) {
+		file.hash = 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});
 });