Merge pull request #17 from fabrix-app/v1.5

[fix] #11

Author: scott-wyatt

lib/Fabrix.ts

@@ -41,10 +41,10 @@ export class FabrixApp extends EventEmitter {
   private _spools: {[key: string]: Spool | ServerSpool | ExtensionSpool | DatastoreSpool | SystemSpool | ToolSpool | MiscSpool }
   private _resources: string[] = [ ]
 
-  public controllers: {[key: string]: any } // FabrixController }
-  public services: {[key: string]: any } // FabrixService }
-  public policies: {[key: string]: any } // FabrixPolicy }
-  public models: {[key: string]: any } // FabrixModel }
+  public controllers: {[key: string]: FabrixGeneric } // FabrixController }
+  public services: {[key: string]: FabrixGeneric } // FabrixService }
+  public policies: {[key: string]: FabrixGeneric } // FabrixPolicy }
+  public models: {[key: string]: FabrixGeneric } // FabrixModel }
   public resolvers: {[key: string]: any } // FabrixResolver }
 
   /**
@@ -79,14 +79,49 @@ export class FabrixApp extends EventEmitter {
 
     const processEnv = Object.freeze(Object.assign({}, JSON.parse(JSON.stringify(process.env))))
 
-    this._logger = new LoggerProxy(this)
-    this._env = processEnv
-    this._pkg = app.pkg
-    this._versions = process.versions
-    this._config = new Configuration(app.config, processEnv)
-    this._spools = {}
-    this._api = app.api
-    this._fabrix = pkg
+    Object.defineProperties(this, {
+      _logger: {
+        value: new LoggerProxy(this),
+        enumerable: false
+      },
+      _env: {
+        value: processEnv,
+        enumerable: false
+      },
+      _pkg: {
+        value: app.pkg,
+        enumerable: false
+      },
+      _versions: {
+        value: process.versions,
+        enumerable: false
+      },
+      _config: {
+        value: new Configuration(app.config, processEnv),
+        enumerable: false
+      },
+      _spools: {
+        value: {},
+        enumerable: false
+      },
+      _api: {
+        value: app.api,
+        enumerable: false
+      },
+      _fabrix: {
+        value: pkg,
+        enumerable: false
+      }
+    })
+
+    // this._logger = new LoggerProxy(this)
+    // this._env = processEnv
+    // this._pkg = app.pkg
+    // this._versions = process.versions
+    // this._config = new Configuration(app.config, processEnv)
+    // this._spools = {}
+    // this._api = app.api
+    // this._fabrix = pkg
 
     // Set the max listeners from the config
     this.setMaxListeners(this.config.get('main.maxListeners'))

lib/LoggerProxy.ts

@@ -1,4 +1,5 @@
 import { FabrixApp } from './'
+import { FabrixGeneric } from './common/Generic'
 
 // declare global {
 //   interface Console {
@@ -37,7 +38,7 @@ import { FabrixApp } from './'
 //   (message?: any, ...optionalParams: any[]): void
 // }
 
-export class LoggerProxy {
+export class LoggerProxy extends FabrixGeneric {
   public app: FabrixApp
   public warn
   public debug
@@ -48,13 +49,7 @@ export class LoggerProxy {
    * Instantiate Proxy; bind log events to default console.log
    */
   constructor (app: FabrixApp) {
-    Object.defineProperties(this, {
-      app: {
-        value: app,
-        writable: false,
-        enumerable: false
-      }
-    })
+    super(app)
 
     this.app.on('fabrix:log', (level: string, msg: any[] = [ ]) => (
       console[level] || console.log)(level, ...msg)

lib/Templates.ts

@@ -42,16 +42,22 @@ export const Templates = {
   silly: {
     ready (app: FabrixApp) {
       const resources = (app.resources || []).map(resource => {
-        let prefix = resource.charAt(0).toUpperCase() + resource.slice(1)
+        let prefix = resource.charAt(0).toUpperCase() + resource.slice(1) + (` (${ Object.keys(app.api[resource]).length })`)
         while (prefix.length < 17) { prefix = prefix + ' '}
         return `${ prefix } : ${Object.keys(app.api[resource] || {})}`
       }).join('\n          ')
 
+      let apiResourcesLabel = `API Resources (${ (app.resources || []).length })`
+      while (apiResourcesLabel.length < 18) { apiResourcesLabel = apiResourcesLabel + ' '}
+
+      let spoolsLabel = `Spools (${ Object.keys(app.spools || {}).length})`
+      while (spoolsLabel.length < 18) { spoolsLabel = spoolsLabel + ' '}
+
       return (
         ` API
-          API Resources     : ${resources ? app.resources : 'NONE INSTALLED'}
+          ${ apiResourcesLabel }: ${resources ? app.resources : 'NONE INSTALLED'}
           ${ resources }
-          Spools            : ${Object.keys(app.spools || {})}`
+          ${ spoolsLabel }: ${Object.keys(app.spools || {})}`
       )
     },
 

lib/common/Generic.ts

@@ -14,4 +14,11 @@ export class FabrixGeneric {
       }
     })
   }
+
+  /**
+   * Return the id of this controller
+   */
+  get id (): string {
+    return this.constructor.name.toLowerCase()
+  }
 }

lib/common/Model.ts

@@ -29,13 +29,13 @@ export class FabrixModel extends FabrixGeneric {
   private _schema: any
   private _resolver: any
 
-  public store
-  public migrate
+  public store: any
+  public migrate: any
 
   /**
    * Model configuration
    */
-  public static config (app: FabrixApp, datastore?) {
+  public static config (app: FabrixApp, datastore?): {[key: string]: any} {
     return {
       tableName: null,
       store: null,
@@ -72,12 +72,12 @@ export class FabrixModel extends FabrixGeneric {
    * Construct the model and bind the Resolver
    */
   constructor (app: FabrixApp, datastore?) {
-    super(app)
-
     if (!(app instanceof EventEmitter)) {
       throw new Error('The "app" argument must be of type EventEmitter')
     }
 
+    super(app)
+
     this._datastore = datastore
 
     this.resolver = new (<typeof FabrixModel>this.constructor).resolver(this, datastore)

lib/common/spools/datastore.ts

@@ -31,9 +31,8 @@ export class DatastoreSpool extends Spool {
   async initialize (): Promise<any> {
     Object.entries(this.app.models).forEach(([ modelName, model ]) => {
       const modelConfig = (<typeof FabrixModel>model.constructor).config(this.app, this._datastore)
-      model.store = modelConfig.store || this.app.config.get('models.defaultStore')
-      model.migrate = modelConfig.migrate || this.app.config.get('models.migrate') || 'safe'
-      console.log('INIT STORE', model.store)
+      Object.assign(model, { store: modelConfig['store'] || this.app.config.get('models.defaultStore')})
+      Object.assign(model, { migrate: modelConfig['migrate'] || this.app.config.get('models.migrate') || 'safe'})
     })
     return Promise.resolve()
   }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/fabrix",
-  "version": "1.1.5",
+  "version": "1.5.0",
   "description": "Strongly Typed Modern Web Application Framework for Node.js",
   "keywords": [
     "framework",

package.json

@@ -556,7 +556,7 @@ describe('Fabrix', () => {
       })
 
       // https://github.com/fabrix-app/fabrix/issues/11
-      it.skip('should log itself without failing', (done) => {
+      it('should log itself without failing', (done) => {
         app.log.info(app)
         console.log(app)
         done()