Better support for "module" and "exports"

Electrino/Electrino/ENOJavaScriptApp.m

@@ -85,7 +85,8 @@ - (id)init
 			JSContext *tmpContext = [weakSelf newContextForEvaluation];
 
 			[tmpContext evaluateScript:[NSString stringWithContentsOfURL:[NSURL fileURLWithPath:[appDir stringByAppendingString:arg]] encoding:NSUTF8StringEncoding error:NULL]];
-			return (id)[tmpContext objectForKeyedSubscript:@"exports"]; // Casted to id as the compile doesn't like multiple types of return values when no return value is specified
+            JSValue *module = tmpContext[@"module"];
+            return (id)[module valueForProperty:@"exports"]; // Casted to id as the compile doesn't like multiple types of return values when no return value is specified
 		} else if (weakSelf.jsModules[arg] != nil) {
 			id module = weakSelf.jsModules[arg];
 			return module;
@@ -111,8 +112,8 @@ - (id)init
 			JSContext *tmpContext = [weakSelf newContextForEvaluation];
 
 			[tmpContext evaluateScript:jsFileContents];
-			return (id)[tmpContext objectForKeyedSubscript:@"exports"]; // Casted to id as the compile doesn't like multiple types of return values when no return value is specified
-
+            JSValue *module = tmpContext[@"module"];
+            return (id)[module valueForProperty:@"exports"]; // Casted to id as the compile doesn't like multiple types of return values when no return value is specified
 		} else {
 			// Module doesn't exist!
 		}
@@ -134,7 +135,7 @@ -(JSContext*)newContextForEvaluation
 	newContext[@"require"] = self.jsContext[@"require"];
 	newContext[@"process"] = self.jsContext[@"process"];
 	newContext[@"console"] = self.jsContext[@"console"];
-	[newContext evaluateScript:@"var exports = {};"]; // Evaluated so the developer doesnt have to
+    [newContext evaluateScript:@"var exports = {}; var module = { exports }"]; // Evaluated so the developer doesnt have to
 	return newContext;
 }
 

Electrino/app/main.js

@@ -55,8 +55,10 @@ app.on('activate', function(){
   }
 })
 
-const module = require('module.js')
-module.custom_function();
+const module_simple = require('module.js')
+module_simple.custom_function();
 
 const module_folder = require('module_folder')
 module_folder.custom_function();
+
+const module_exports = require('module_exports.js')();

Electrino/app/module_exports.js

@@ -0,0 +1,3 @@
+module.exports = function () {
+  console.log("Function from a module overwriting module.exports!");
+}