Code cleanup.

Author: Dr. Safi

class/Application.class.js

@@ -1,42 +1,34 @@
+const EventEmitter = require('events')
+import http from 'http'
 import configuration from '../configuration/configuration.export.js' // Load configuration settings.
 import Koa from 'koa' // Koa applicaiton server
 import compose from 'koa-compose'
 import rethinkdbConfig from '../configuration/rethinkdbConfig.js'
 import _ from '../../../node_modules/underscore' // To affect changes of _ to the main app.
-const EventEmitter = require('events')
 import { connect } from 'appscript/utilityFunction/middleware/commonDatabaseFunctionality.js'
-
-import http from 'http'
+import { add, execute, applyMixin } from 'appscript/utilityFunction/decoratorUtility.js'
 import addStaticSubclassToClassArray from 'appscript/module/addStaticSubclassToClassArray.staticMethod'
 
-const self = class Application extends EventEmitter {
+const self = 
+@add({ to: 'static'}, {
+    addStaticSubclassToClassArray
+})
+class Application extends EventEmitter {
 
     static eventEmitter = (new EventEmitter()).setMaxListeners(200) // increase maximum eventliseners (default = 10) // i.e. new EventEmitter()
     static rethinkdbConnection = {}
     static config = configuration // Array
     static frontend;
     static extendedSubclass = {
-        instance: [],
         static: []
     }
-    static subclassPath = {
-        asInstance: [
-            'class/StaticContent.class.js',
-            'class/Api.class.js',
-            'class/Test.class.js',
-        ],
-        // asStatic: [
-        //     // 'class/ConditionTree.class.js',
-        //     // 'class/Condition.class.js',
-        // ]
-    }
 
     constructor(skipConstructor = false) {
         super();
         if(skipConstructor) return;
     }
 
-    static async initialize(staticSubclass) { // One-time initialization of Applicaiton Class.
+    static async initialize(/*staticSubclass*/) { // One-time initialization of Applicaiton Class.
         console.info(`☕%c Running Application as ${self.config.DEPLOYMENT} - '${self.config.PROTOCOL}${self.config.HOST}'`, self.config.style.green)
         self.rethinkdbConnection = await connect()
         _.templateSettings = { // initial underscore template settings on first import gets applied on the rest.
@@ -49,12 +41,12 @@ const self = class Application extends EventEmitter {
     }
 
 // Used by extended subclasses:
-    static addStaticClassToSubclassArray({ keyName = null, subclass }) {
-        if (keyName) {
-            self.eventEmitter.on('initializationEnd', () => {
-                self.extendedSubclass.static[keyName] = subclass
-            })
-        }
+    // Add subclasses to list
+    static addSubclass({ keyName, Subclass = this } = {}) {
+        if(!keyName) keyName = Subclass.name
+        self.eventEmitter.on('initializationEnd', () => {
+            self.extendedSubclass.static[keyName] = Subclass
+        })
     }
 
     static initializeStaticClass() { // used for extended subclasses
@@ -94,7 +86,5 @@ const self = class Application extends EventEmitter {
 
 }
 
-self.addStaticSubclassToClassArray = addStaticSubclassToClassArray
-
 const instance = new self();
 export { self as default, instance as instance }

module/reusableNestedUnit/Controller.class.js

@@ -1,12 +1,12 @@
-import { mix } from 'mixwith'
 import commonMethod from './commonMethod.mixin'
 const EventEmitter = require('events')
 import createInstance from 'appscript/module/createInstance.staticMethod'
 import { usingGenericInstance as populateInstancePropertyFromJson, usingThis as populateInstancePropertyFromJson_this } from 'appscript/module/populateInstancePropertyFromJson.method'
 import addStaticSubclassToClassArray from 'appscript/module/addStaticSubclassToClassArray.staticMethod'
 import { classDecorator as prototypeChainDebug} from 'appscript/module/prototypeChainDebug'
 import { MultiplePrototypeChain } from 'appscript/module/multiplePrototypeChain'
-import { add, execute } from 'appscript/utilityFunction/decoratorUtility.js'
+import { add, execute, applyMixin } from 'appscript/utilityFunction/decoratorUtility.js'
+import { mix } from 'mixwith'
 
 /**
  * @class
@@ -29,14 +29,15 @@ export default ({
             populateInstancePropertyFromJson_this
         })
         @execute({ staticMethod: 'initializeStaticClass' })
+        @applyMixin({ mixin })
         class ReusableController extends mix(Superclass).with(...mixinArray) {
 
             static eventEmitter = new EventEmitter() // i.e. new EventEmitter()
             static extendedSubclass = {
                 static: {}
             }
 
-            static initializeStaticClass() {
+            static initializeStaticClass(self) {
                 // Mutation observer on array for debugging purposes.
                 // self.extendedSubclass.static = new Proxy(self.extendedSubclass.static, {
                 //     set: function(target, property, value, receiver) {      
@@ -137,13 +138,6 @@ export default ({
 
         }
 
-    // add controller methods for the specific module that uses them.
-    let Controller
-    if(mixin) {
-        Controller = mixin({ Superclass: self}) // return Specific implementation Controller
-    } else {
-        Controller = self; // return Reusable nested unit
-    }
-    return Controller
+    return self
 }
 

module/reusableNestedUnit/NestedUnit.class.js

@@ -6,7 +6,7 @@ export default ({ Superclass }) => {
 
         static getDocumentQuery;
 
-        static initializeStaticClass(getTableDocument) {
+        static initializeStaticClass(self, getTableDocument) {
             super.initializeStaticClassControllerLevel()
             self.getDocumentQuery = getTableDocument
         }

module/reusableNestedUnit/Unit.class.js

@@ -6,7 +6,7 @@ export default ({ Superclass }) => {
 
         static getDocumentQuery;
 
-        static initializeStaticClass(getTableDocument) {
+        static initializeStaticClass(self, getTableDocument) {
             self.getDocumentQuery = getTableDocument
             super.initializeStaticClassControllerLevel()
         }

utilityFunction/decoratorUtility.js

@@ -17,9 +17,20 @@ export function add({ to = 'static' }, method) {
     }
 }
 
-export function execute({ staticMethod, args = [] }) {
+export function execute({ staticMethod, self = true, args = [] }) {
     return Class => {
+        if(self) args.unshift(Class) // add to beginning 
         Class[staticMethod](...args)
         return Class
     }
 }
+
+export function applyMixin({ mixin = null }) {
+    return Class => {
+        // add controller methods for the specific module that uses them.
+            Class = (mixin) ?
+                mixin({ Superclass: Class }) /* return Specific implementation Controller */ : 
+                Class /* return Reusable nested unit */;
+        return Class
+    }
+}