mastercontroller 1.1.19 → 1.1.21

package/MasterAction.js

@@ -1,42 +1,45 @@
 
-// version 1.0.17
+// version 0.0.21
 
 var master = require('./MasterControl');
 var fileserver = require('fs');
-var tools =  require('./MasterTools');
-var temp =  require('./MasterTemplate');
-var templateFunc = null;
+var toolClass =  require('./MasterTools');
+var tempClass =  require('./MasterTemplate');
+var temp = new tempClass();
+var tools = new toolClass();
 
 class MasterAction{
-
-	init(opts){
-		templateFunc = opts.templateFunc === undefined ? null : opts.templateFunc;
+	
+	getView(location, data){
+		var actionUrl =  master.root + location;
+		var actionView = fileserver.readFileSync(actionUrl, 'utf8');
+		return temp.htmlBuilder(actionView, data);
 	}
 
-	
+
 	returnJson(data){
 		var json = JSON.stringify(data);
-		if (!master.router.currentRoute.response.headersSent) {
-			master.router.currentRoute.response.writeHead(200, {'Content-Type': 'application/json'});
-			master.router.currentRoute.response.end(json);
+		if (!this.__response._headerSent) {
+			this.__response.writeHead(200, {'Content-Type': 'application/json'});
+			this.__response.end(json);
 		}
 	}
 
 	// location starts from the view folder. Ex: partialViews/fileName.html
 	returnPartialView(location, data){
-		var actionUrl = master.router.currentRoute.root + "/app/views/" + location;
+		var actionUrl = master.root + location;
 		var getAction = fileserver.readFileSync(actionUrl, 'utf8');
-		if(typeof(templateFunc) === "function"){
-			return templateFunc(getAction, data);
+		if(master.overwrite.isTemplate){
+			return master.overwrite.templateRender( data, "returnPartialView");
 		}
 		else{
-			return temp.htmlBuilder(getAction, data);	
+			return temp.htmlBuilder(getAction, data);
 		}
 	}
 
 	redirectBack(fallback){
 		if(fallback === undefined){
-			var backUrl = master.router.currentRoute.request.headers.referer === "" ? "/" : master.router.currentRoute.request.headers.referer
+			var backUrl = this.__requestObject.request.headers.referer === "" ? "/" : this.__requestObject.request.headers.referer
 			this.redirectTo(backUrl);
 		}
 		else{
@@ -68,87 +71,91 @@ class MasterAction{
 
 		var doneParsedUrl = objCounter >= 1 ? parseUrl + queryString : parseUrl; // /boards?james=dfdfd&rih=sdsd&
 
-		if (!master.router.currentRoute.response.headersSent) {
-			master.router.currentRoute.response.writeHead(302, {
+		if (!this.__requestObject.response._headerSent) {
+			this.__requestObject.response.writeHead(302, {
 				'Location': doneParsedUrl
 				//add other headers here...
 			});
-			master.router.currentRoute.response.end();
+			this.__requestObject.response.end();
 		}
 
 	}
 	
 
 	// redirects to another action inside the same controller = does not reload the page
-	redirectToAction(namespace, action, type, data){
+	redirectToAction(namespace, action, type, data, components){
 
-		this.namespace = namespace,
-		this.action = action;
-		this.type = type;
-		this.params = data;
+		var requestObj = {
+			toController : namespace,
+			toAction : action,
+			type : type,
+			params : data
+		}
+		if(components){
+			var resp = this.__requestObject.response;
+			var req = this.__requestObject.request;
+			master.router.currentRoute = {root : `${master.root}/components/${namespace}`, toController : namespace, toAction : action, response : resp, request: req };
+		}else{
+			master.router.currentRoute = {root : `${master.root}/${namespace}`, toController : namespace, toAction : action, response : resp, request: req };
+		}
+		
 
-		master.router._call(this);
+		master.router._call(requestObj);
 	}
 	
 	// this will allow static pages without master view
 	returnViewWithoutMaster(location, data){
 		var masterView = null;
+		this.params = this.params === undefined ? {} : this.params;
 		this.params = tools.combineObjects(data, this.params);
 		var func = master.viewList;
         this.params = tools.combineObjects(this.params, func);
-		var actionUrl = (location === undefined) ? master.router.currentRoute.root + "/app/views/" +  master.router.currentRoute.toController + "/" +  master.router.currentRoute.toAction + ".html" : master.router.currentRoute.root + location;
+		var actionUrl = (location === undefined) ? this.__currentRoute.root + "/app/views/" +  this.__currentRoute.toController + "/" +  this.__currentRoute.toAction + ".html" : master.root + location;
 		var actionView = fileserver.readFileSync(actionUrl, 'utf8');
-		if(typeof(templateFunc) === "function"){
-			masterView = templateFunc(actionView, data);
+		if(master.overwrite.isTemplate){
+			masterView = master.overwrite.templateRender(data, "returnViewWithoutMaster");
 		}
 		else{
 			masterView = temp.htmlBuilder(actionView, data);	
 		}
-		if (!master.router.currentRoute.response.headersSent) {
-			master.router.currentRoute.response.writeHead(200, {'Content-Type': 'text/html'});
-			master.router.currentRoute.response.end(masterView);
+		if (!this.__requestObject.response._headerSent) {
+			this.__requestObject.response.writeHead(200, {'Content-Type': 'text/html'});
+			this.__requestObject.response.end(masterView);
 		}
 	}
 
 	returnViewWithoutEngine(location){
-		var actionUrl =  master.router.currentRoute.root + location;
+		var actionUrl =  master.root + location;
 		var masterView = fileserver.readFileSync(actionUrl, 'utf8');
-		if (!master.router.currentRoute.response.headersSent) {
-			master.router.currentRoute.response.writeHead(200, {'Content-Type': 'text/html'});
-			master.router.currentRoute.response.end(masterView);
+		if (!this.__requestObject.response._headerSent) {
+			this.__requestObject.response.writeHead(200, {'Content-Type': 'text/html'});
+			this.__requestObject.response.end(masterView);
 		}
 	}
 
 	returnView(data, location){
-		var childView = null;
+		
 		var masterView = null;
 		data = data === undefined ? {} : data;
 		this.params = this.params === undefined ? {} : this.params;
         this.params = tools.combineObjects(data, this.params);
         var func = master.viewList;
         this.params = tools.combineObjects(this.params, func);
-		var viewUrl = (location === undefined || location === "" || location === null) ? master.router.currentRoute.root + "/app/views/" + master.router.currentRoute.toController + "/" +  master.router.currentRoute.toAction + ".html": master.router.currentRoute.root + "/app/" + location;
+		var viewUrl = (location === undefined || location === "" || location === null) ? this.__currentRoute.root + "/app/views/" + this.__currentRoute.toController + "/" +  this.__currentRoute.toAction + ".html" : master.root + location;
 		var viewFile = fileserver.readFileSync(viewUrl,'utf8');
-		if(typeof(templateFunc) === "function"){
-			childView = templateFunc(viewFile, this.params);
-		}
-		else{
-			childView = temp.htmlBuilder(viewFile, this.params);
-		}
-
-		this.params.yield = childView;
-		var masterFile = fileserver.readFileSync(master.router.currentRoute.root + "/app/views/layouts/master.html", 'utf8');
-		if(typeof(templateFunc) === "function"){
-			masterView = templateFunc(masterFile, this.params);
+		var masterFile = fileserver.readFileSync(this.__currentRoute.root + "/app/views/layouts/master.html", 'utf8');
+		if(master.overwrite.isTemplate){
+			masterView = master.overwrite.templateRender(this.params, "returnView");
 		}
 		else{
+			var childView = temp.htmlBuilder(viewFile, this.params);
+			this.params.yield = childView;
 			masterView = temp.htmlBuilder(masterFile, this.params);
 		}
 		
-
-		if (!master.router.currentRoute.response.headersSent) {
-			master.router.currentRoute.response.writeHead(200, {'Content-Type': 'text/html'});
-			master.router.currentRoute.response.end(masterView);
+		if (!this.__response._headerSent) {
+			this.__response.writeHead(200, {'Content-Type': 'text/html'});
+			this.__response.end(masterView);
 		}
 		
 	}
@@ -161,14 +168,4 @@ class MasterAction{
 
 }
 
-// IMPORTANT
-// you dont instatiate application controller extention methods because it will get done on build
-var masterAction = new MasterAction();
-// give option to change the template engine. Skips default template engine and calls templateFunc function. Inside this function you can return your own parsed TEXT or HTML.
-master.extend({action: {
-	init : masterAction.init,
-	close: masterAction.close,
-	templateFunc : templateFunc
-} });
-// you need to have access to functions inside the controller
-master.extendController(masterAction);
+master.extendController(MasterAction);

package/MasterActionFilters.js

@@ -1,4 +1,4 @@
-// version 1.5	
+// version 1.6	
 var master = require('./MasterControl');
 
 var _beforeActionFunc = {
@@ -89,5 +89,4 @@ class MasterActionFilters {
      }
 }
 
-master.extendController(new MasterActionFilters());
-//module.exports = MasterActionFilters;
+master.extendController( MasterActionFilters);

package/MasterControl.js

@@ -1,5 +1,5 @@
 // MasterControl - by Alexander rich
-// version 1.0.19
+// version 1.0.21
 
 var url = require('url');
 var fileserver = require('fs');
@@ -66,26 +66,18 @@ class MasterControl {
     }
 
     // this extends master framework - adds your class to main master class object
-    extend(){
-        var i = arguments.length;
-
-        while (i--) {
-
-            for (var m in arguments[i]) {
-                this[m] = arguments[i][m];
-            }
-        }
-
-        return MasterControl;
+    extend(name, element){
+        this[name] = new element()
     }
 
     // extends class methods to be used inside of the view class using the THIS keyword
     extendView( name, element){
+        element = new element();
         var $that = this;
         var propertyNames = Object.getOwnPropertyNames( element.__proto__);
         this.viewList[name] = {};
         for(var i in propertyNames){
-            if(propertyNames !== "constructor"){
+            if(propertyNames[i] !== "constructor"){
                 if (propertyNames.hasOwnProperty(i)) {
                     $that.viewList[name][propertyNames[i]] = element[propertyNames[i]];
                 }
@@ -95,11 +87,11 @@ class MasterControl {
 
     // extends class methods to be used inside of the controller class using the THIS keyword
     extendController(element){
-        
+        element = new element();
         var $that = this;
         var propertyNames = Object.getOwnPropertyNames( element.__proto__);
         for(var i in propertyNames){
-            if(propertyNames !== "constructor"){
+            if(propertyNames[i] !== "constructor"){
                 if (propertyNames.hasOwnProperty(i)) {
                     $that.controllerList[propertyNames[i]] = element[propertyNames[i]];
                 }

package/MasterCors.js

@@ -1,6 +1,5 @@
-// version 1.1.7
+// version 1.1.10
 var master = require('./MasterControl');
-var tools =  require('./MasterTools');
 
 	// todo - res.setHeader('Access-Control-Request-Method', '*');
 class MasterCors{
@@ -144,4 +143,4 @@ class MasterCors{
 	}
 }
 
-master.extend({cors: new MasterCors() });
+master.extend("cors", MasterCors);

package/MasterError.js

@@ -1,5 +1,5 @@
 
-// version 1.0.17
+// version 1.0.19
 var master = require('./MasterControl');
 var winston = require('winston');
 var fileserver = require('fs');
@@ -113,7 +113,7 @@ class MasterError{
     }
 }
 
-master.extend({error: new MasterError()});
+master.extend("error", MasterError);
 
 // ================ CODES YOU CAN USE ================ //
 // ACCEPTED    202 Accepted

package/MasterHtml.js

@@ -1,14 +1,16 @@
-// version 1.0.18
+// version 0.0.21
 
 var master = require('./MasterControl');
-var  temp =  require('./MasterTemplate');
 var fs = require('fs');
-var tools =  require('./MasterTools');
+var tempClass =  require('./MasterTemplate');
+var toolClass =  require('./MasterTools');
+var temp = new tempClass();
+var tools = new toolClass();
 
 class html {
 
 	javaScriptSerializer(name, obj){
-		return `<script data-eer type="text/javascript">
+		return `<script type="text/javascript">
 			${name} = ${JSON.stringify(obj)}
 		</script>`;
 	}
@@ -22,8 +24,8 @@ class html {
 		var filepartialView = fs.readFileSync(master.router.currentRoute.root + partialViewUrl, 'utf8');
 
 		var partialView = null;
-		if(typeof(master.action.templateFunc) === "function"){
-			partialView = master.action.templateFunc(filepartialView, params);
+		if(master.overwrite.isTemplate){
+			partialView = master.overwrite.templateRender(params, "renderPartialView");
 		}
 		else{
 			partialView =  temp.htmlBuilder(filepartialView, params);	
@@ -34,33 +36,41 @@ class html {
 	}
 
 	   // render all your link tags styles given the folder location
-	renderStyles(folderName, typeArray){
+	   renderStyles(folderName, typeArray){
 		var styles = [];
 		var styleFolder = `/app/assets/stylesheets/`;
 		var rootLocation = master.router.currentRoute.root;
+		var extention = "";
+
 		if(master.router.currentRoute.isComponent === true){
-			rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
-			styleFolder =  `${rootLocation}${styleFolder}`;
+			extention = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
 		}
+
 		var type = typeArray === undefined ? ["css"] : typeArray;
 
 		if(folderName){
 			styleFolder = `${styleFolder}${folderName}/`;
 		 }
-		 if (fs.existsSync(styleFolder)) {
-			fs.readdirSync(styleFolder).forEach(function(file){
+		 
+		 if (fs.existsSync(`${rootLocation}${styleFolder}`)) {
+			fs.readdirSync(`${rootLocation}${styleFolder}`).forEach(function(file){
 
 					var fileExtension = file.replace(/^.*\./, '');
 					if(type.indexOf(fileExtension) >= 0){
-						var fileLocatoon = `${styleFolder}${file}`
-						styles.push(`<link rel="stylesheet" type="text/${type}" href="/${fileLocatoon}">`);
+						var fileLocatoon = `${styleFolder}${file}`;
+						if(master.router.currentRoute.isComponent === true){
+							styles.push(`<link rel="stylesheet" type="text/${type}" href="/${extention}${fileLocatoon}">`);
+						}
+						else{
+							styles.push(`<link rel="stylesheet" type="text/${type}" href="/${fileLocatoon}">`);
+						}
 					}
 			});
 		}
 	   	var partialView = null;
 		
-		if(typeof(master.action.templateFunc) === "function"){
-			partialView = master.action.templateFunc(styles.join(""), {});
+		if(master.overwrite.isTemplate){
+			partialView = master.overwrite.templateRender({}, "renderStyles");
 		}
 		else{
 			partialView =  temp.htmlBuilder(styles.join(""),{});	
@@ -75,9 +85,10 @@ class html {
 		var scripts = [];
 		var jsFolder =`/app/assets/javascripts/`;
 		var rootLocation = master.router.currentRoute.root;
+		var extention = "";
+		//components/auth/app/assets/javascripts/pages/changePassword.js
 		if(master.router.currentRoute.isComponent === true){
-			rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
-			jsFolder = `${rootLocation}${jsFolder}`;
+			extention = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
 		}
 
 		var type = typeArray === undefined ? ["js"] : typeArray;
@@ -86,20 +97,25 @@ class html {
 			jsFolder = `${jsFolder}${folderName}/`;
 		}
 
-		if (fs.existsSync(jsFolder)) {
-			fs.readdirSync(jsFolder).forEach(function(file){
+		if (fs.existsSync(`${rootLocation}${jsFolder}`)) {
+			fs.readdirSync(`${rootLocation}${jsFolder}`).forEach(function(file){
 				var fileExtension = file.replace(/^.*\./, '');
 				if(type.indexOf(fileExtension) >= 0){
-					var fileLocatoon = `${jsFolder}${file}`
-					scripts.push(`<script src="/${fileLocatoon}"></script>`);
+					var fileLocatoon = `${jsFolder}${file}`;
+					if(master.router.currentRoute.isComponent === true){
+						scripts.push(`<script src="/${extention}${fileLocatoon}"></script>`);
+					}
+					else{
+						scripts.push(`<script src="${fileLocatoon}"></script>`);
+					}
 				}
 		   });
 		}
 
 		var partialView = null;
 
-		if(typeof(master.action.templateFunc) === "function"){
-			partialView = master.action.templateFunc(scripts.join(""), {});
+		if(master.overwrite.isTemplate){
+			partialView = master.overwrite.templateRender({}, "renderScripts");
 		}
 		else{
 			partialView =  temp.htmlBuilder(scripts.join(""),{});	
@@ -108,6 +124,7 @@ class html {
 	   return partialView;
 	}
 
+
 	// renders js using location
 	renderJS(folderName, name){
 		if(folderName === undefined && name === undefined){
@@ -444,5 +461,5 @@ class html {
 	
 }
 
-master.extendView("html", new html());
+master.extendView("html", html);
 

package/MasterJWT.js

@@ -1,13 +1,14 @@
 
-// version 1.0.15
+// version 0.0.17
 
-var master = require('./MasterControl');
-var crypto = require('crypto');
-var tools =  require('./MasterTools');
+var master = require('./MasterControl');	
+var crypto = require('crypto');	
+var toolClass =  require('./MasterTools');
+var tools = new toolClass();
 
  //https://www.youtube.com/watch?v=67mezK3NzpU&t=2492s
 class MasterJWT{
-    
+
         init(TID){
             this.alg = "sha256";
             var $that = this;
@@ -108,4 +109,4 @@ class MasterJWT{
 }
 
 
-master.extend({jwt: new MasterJWT() });
+master.extend("jwt", MasterJWT);

package/MasterRequest.js

@@ -1,5 +1,5 @@
 
-// version 1.0.16
+// version 0.0.1
 
 var master = require('./MasterControl');
 var url = require('url');
@@ -54,7 +54,8 @@ class MasterRequest{
                                 });
 
                                 $that.form.on('file', function(field, file) {
-                                    file.extension = path.extname(file.name);
+                                    file.extension = file.name === undefined ? path.extname(file.originalFilename) : path.extname(file.name);
+
                                     if(Array.isArray($that.parsedURL.formData.files[field])){
                                         $that.parsedURL.formData.files[field].push(file);
                                     }
@@ -170,4 +171,4 @@ class MasterRequest{
     }
 }
 
-master.extend({request: new MasterRequest()});
+master.extend("request", MasterRequest);

package/MasterRouter.js

@@ -1,11 +1,10 @@
-// version 1.0.20
+// version 0.0.24
 
 var master = require('./MasterControl');
-var tools =  require('./MasterTools');
+var toolClass =  require('./MasterTools');
 const EventEmitter = require("events");
 var currentRoute = {};
-const path = require('path');
-const { root } = require('./MasterControl');
+var tools = new toolClass();
 
  var normalizePaths = function(requestPath, routePath, requestParams){
     var obj = {
@@ -203,6 +202,10 @@ class MasterRouter {
         return currentRoute;
     }
 
+    set currentRoute(data){
+        currentRoute = data;
+    }
+
     _addMimeList(mimeObject){
         var that = this;
         if(mimeObject){
@@ -239,9 +242,16 @@ class MasterRouter {
          var Control = require(`${currentRoute.root}/app/controllers/${tools.firstLetterlowercase(requestObject.toController)}Controller`);
          if(Control === null){
             Control = require(`${currentRoute.root}/app/controllers/${tools.firstLetterUppercase(requestObject.toController)}Controller`);
+            if(Control === null){
+                console.log(`Cannot find controller name - ${requestObject.toController}`);
+            }
          }
          tools.combineObjectPrototype(Control, master.controllerList);
          Control.prototype.__namespace = Control.name;
+         Control.prototype.__requestObject = requestObject;
+         Control.prototype.__currentRoute = currentRoute;
+         Control.prototype.__response = requestObject.response;
+         Control.prototype.__request = requestObject.request;
          var control = new Control(requestObject);
          var _callEmit = new EventEmitter();
          
@@ -249,6 +259,7 @@ class MasterRouter {
             control.next = function(){
                 control.__callAfterAction(control, requestObject);
             }
+            // 
             control[requestObject.toAction](requestObject);
          });
         
@@ -293,4 +304,4 @@ class MasterRouter {
     
 }
 
-master.extend({router :  new MasterRouter()});
+master.extend("router", MasterRouter);

package/MasterSession.js

@@ -1,13 +1,14 @@
  
-// version 0.0.17
+// version 0.0.19
 
 var master = require('./MasterControl');
 var cookie = require('cookie');
-var tools =  require('./MasterTools');
+var toolClass =  require('./MasterTools');
 var crypto = require('crypto');
+var tools = new toolClass();
 
 class MasterSession{
-
+ 
     sessions = {};
     options = {
         domain: undefined,
@@ -171,4 +172,4 @@ class MasterSession{
     }
 }
 
-master.extend({sessions: new MasterSession() });
+master.extend("sessions", MasterSession);

package/MasterSocket.js

@@ -1,4 +1,4 @@
-// version 0.0.1
+// version 0.0.3
 var master = require('./MasterControl');
 
 var jsUcfirst = function(string){
@@ -45,4 +45,4 @@ class MasterSocket{
     }
 }
 
-master.extend({socket: new MasterSocket()});
+master.extend("socket", MasterSocket);

package/MasterTemp.js

@@ -1,4 +1,4 @@
-// version 0.0.1
+// version 0.0.3
 var master = require('./MasterControl');
 
 class MasterTemp{
@@ -27,4 +27,4 @@ class MasterTemp{
 
 }
 
-master.extend({tempdata: new MasterTemp()});
+master.extend("tempdata", MasterTemp);

package/MasterTemplate.js

@@ -1,4 +1,4 @@
-// version 0.0.1
+// version 0.0.3
 // https://github.com/WebReflection/backtick-template
 // https://stackoverflow.com/questions/29182244/convert-a-string-to-a-template-string
 var replace = ''.replace;
@@ -33,44 +33,52 @@ class MasterTemplate{
 
 
   /*! (C) 2017-2018 Andrea Giammarchi - MIT Style License */
-  htmlBuilder( fn, $str, $object) {'use strict';
-// reset cache every 32M
-if (33554432 < this.$) {
-  this._ = {};
-  this.$ = 0;
-}
-var
-  hasTransformer = typeof fn === 'function',
-  str = hasTransformer ? $str : fn,
-  object = hasTransformer ? $object : $str,
-  _ = this._,
-  known = _.hasOwnProperty(str),
-  parsed = known ? _[str] : (_[str] = this.parse(str)),
-  chunks = parsed.chunks,
-  values = parsed.values,
-  strings
-;
-// add str length only if not known
-if (!known)
-  this.$ += str.length;
-if (hasTransformer) {
-  str = 'function' + (Math.random() * 1e5 | 0);
-  strings = [
-    str,
-    'with(this)return ' + str + '([' + chunks + ']' + (
-      values.length ? (',' + values.join(',')) : ''
-    ) + ')'
-  ];
-} else {
-  strings = chunks.slice(0, 1);
-  for (var i = 1, length = chunks.length; i < length; i++)
-    strings.push(values[i - 1], chunks[i]);
-  strings = ['with(this)return ' + strings.join('+')];
-}
-return Function.apply(null, strings).apply(
-  object,
-  hasTransformer ? [fn] : []
-);
+  htmlBuilder( fn, $str, $object) {
+    'use strict';
+
+    try{
+        // reset cache every 32M
+        if (33554432 < this.$) {
+          this._ = {};
+          this.$ = 0;
+        }
+        var
+          hasTransformer = typeof fn === 'function',
+          str = hasTransformer ? $str : fn,
+          object = hasTransformer ? $object : $str,
+          _ = this._,
+          known = _.hasOwnProperty(str),
+          parsed = known ? _[str] : (_[str] = this.parse(str)),
+          chunks = parsed.chunks,
+          values = parsed.values,
+          strings
+        ;
+        // add str length only if not known
+        if (!known)
+          this.$ += str.length;
+        if (hasTransformer) {
+          str = 'function' + (Math.random() * 1e5 | 0);
+          strings = [
+            str,
+            'with(this)return ' + str + '([' + chunks + ']' + (
+              values.length ? (',' + values.join(',')) : ''
+            ) + ')'
+          ];
+        } else {
+          strings = chunks.slice(0, 1);
+          for (var i = 1, length = chunks.length; i < length; i++)
+            strings.push(values[i - 1], chunks[i]);
+          strings = ['with(this)return ' + strings.join('+')];
+        }
+
+        return Function.apply(null, strings).apply(
+          object,
+          hasTransformer ? [fn] : []
+        );
+    }
+    catch(err){
+      console.log("error", err);
+    }
 }
 
 parse(str) {
@@ -126,4 +134,4 @@ return {chunks: chunks, values: values};
     }
 }
 
-module.exports = new MasterTemplate();
+module.exports = MasterTemplate;

package/MasterTools.js

@@ -1,4 +1,4 @@
-// version 0.0.1
+// version 0.0.2
 var crypto = require('crypto');
 
 class MasterTools{
@@ -161,10 +161,16 @@ class MasterTools{
     };
 
     combineObjects(obj, src) {
-        for(var i in src){
-            obj[i] = src[i];
-        };
-        return obj;
+        if(obj){
+            for(var i in src){
+                obj[i] = src[i];
+            };
+            return obj;
+        }
+        else{
+            return {}
+        }
+
     };
 
     makeWordId(length) {
@@ -199,4 +205,4 @@ class MasterTools{
     
 }
 
-module.exports = new MasterTools();
+module.exports = MasterTools;

package/TemplateOverwrite.js

@@ -0,0 +1,33 @@
+// version 0.0.1
+var master = require('mastercontroller');
+
+class TemplateOverwrite{
+
+	#templateFunc;
+	#isTemplate = false;
+
+	get isTemplate(){
+		return this.#isTemplate;
+	}
+
+    template(func){
+		this.#isTemplate = true;
+		this.#templateFunc = func === undefined ? null : func;
+	}
+
+	templateRender(data, type){
+		if(this.#templateFunc){
+			return this.#templateFunc(data, type);
+		}
+		else{
+			console.log("cannot call template render when no function has been declared. ")
+		}
+	}
+
+    close(response, code, content, end){
+		response.writeHead(code, content.type);
+		response.end(end);
+	}
+}
+
+master.extend("overwrite", TemplateOverwrite);

package/package.json

@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "qs" : "^6.11.0",
-    "formidable": "^2.0.1",
+    "qs" : "^6.11.2",
+    "formidable": "^3.5.1",
     "cookie": "^0.5.0",
-    "winston": "^3.8.2",
-    "glob" :"^8.0.3"
+    "winston": "^3.10.0",
+    "glob" :"^10.3.4"
   },
   "description": "A class library that makes using the Master Framework a breeze",
   "homepage": "https://github.com/Tailor/MasterController#readme",
@@ -18,5 +18,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.1.19"
+  "version": "1.1.21"
 }