[chore] resolver tests

Author: scott-wyatt

lib/common/Model.ts

@@ -4,6 +4,7 @@ import { FabrixResolver } from './'
 import { IllegalAccessError } from '../errors'
 import { FabrixGeneric } from './Generic'
 
+
 /**
  * Fabrix Model Class.
  */
@@ -64,12 +65,9 @@ export class FabrixModel extends FabrixGeneric {
     }
     this._app = app
 
-    if (!datastore) {
-      this.app.log.warn(`${this.name} did not receive an instance of the datastore`)
-    }
     this._datastore = datastore
 
-    this.resolver = new (<typeof FabrixModel>this.constructor).resolver(this)
+    this.resolver = new (<typeof FabrixModel>this.constructor).resolver(this, datastore)
     this.app.emit(`model:${this.name}:constructed`, this)
   }
 
@@ -78,11 +76,14 @@ export class FabrixModel extends FabrixGeneric {
   }
 
   get datastore() {
+    // if (!this._datastore) {
+    //   this.app.log.warn(`${this.name} did not receive an instance of the datastore`)
+    // }
     return this._datastore
   }
 
-  set datastore(val) {
-    this._datastore = val
+  set datastore(datastore) {
+    this._datastore = datastore
   }
 
   /**
@@ -135,11 +136,11 @@ export class FabrixModel extends FabrixGeneric {
    */
   get tableName (): string {
     const config = (<typeof FabrixModel>this.constructor).config(this.app, this.datastore)
-    // const config = (<typeof FabrixModel>this.constructor).config || { tableName: null }
     return config.tableName || this.name
   }
 
   /**
+   * Bound Methods from the Resolver Class
     save (...args) {
       return this.resolver.save(...args)
     }

lib/common/Resolver.ts

@@ -9,13 +9,7 @@ import { FabrixModel } from './'
 export class FabrixResolver {
   private _model: FabrixModel
 
-  /**
-   * Model configuration
-   */
-  static config () {
-  }
-
-  constructor (model: FabrixModel) {
+  constructor (model: FabrixModel, datastore?) {
     if (!model) {
       throw new RangeError('Resolver must be given a Model to bind to')
     }
@@ -37,29 +31,34 @@ export class FabrixResolver {
     return this.model.schema
   }
 
+  /**
+   * Return the schema of the parent model
+   */
+  get config (): FabrixModel['config'] {
+    return this.model.config
+  }
+
   /**
    * Returns the instance of the parent model
    */
   get app(): FabrixApp {
     return this.model.app
   }
 
-  /**
-    public save(...args) {
-      throw new Error('Orm for Save not defined')
-    }
-
-    public update(...args) {
-      throw new Error('Orm for Update not defined')
-    }
-
-    public delete(...args) {
-      throw new Error('Orm for Delete not defined')
-    }
-
-    public get(...args) {
-      throw new Error('Orm for Get not defined')
-    }
-  */
+  // public save(...args) {
+  //   throw new Error('Orm method for Save not defined')
+  // }
+  //
+  // public update(...args) {
+  //   throw new Error('Orm method for Update not defined')
+  // }
+  //
+  // public delete(...args) {
+  //   throw new Error('Orm method for Delete not defined')
+  // }
+  //
+  // public get(...args) {
+  //   throw new Error('Orm method for Get not defined')
+  // }
 }
 

test/lib/Resolver.test.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const assert = require('assert')
 const Model = require('../../dist/common').FabrixModel
 const Resolver = require('../../dist/common').FabrixResolver
@@ -31,5 +33,22 @@ describe('lib/Resolver', () => {
       assert.throws(() => new Resolver(), RangeError)
     })
   })
+  describe('Model Proxy', () => {
+    it('should get a resolver method through model method', () => {
+      const app = new Fabrix(testApp)
+      const TestModel = class TestModel extends Model {
+        static get resolver () {
+          return class MyResolver extends Resolver {
+            findFoo() {
+              return 'foo'
+            }
+          }
+        }
+      }
+      const initModel = new TestModel(app)
+      assert.equal(initModel.resolver.findFoo(), 'foo')
+      assert.throws(() => initModel.save(), Error)
+    })
+  })
 })