mythix-orm 1.8.0 → 1.8.1

package/lib/connection/connection-base.d.ts

@@ -81,8 +81,8 @@ declare class ConnectionBase extends EventEmitter {
   public getOptions(): ConnectionBaseOptions;
   public isStarted(): boolean;
   public toQueryEngine(queryEngineLike: any): QueryEngine | undefined;
-  public registerModel<T = ModelClass>(Model: T): T;
-  public registerModels(models: Models | Array<ModelClass>): Models | undefined;
+  public registerModel<T = ModelClass>(Model: T, options?: GenericObject): T;
+  public registerModels(models: Models | Array<ModelClass>, options?: GenericObject): Models | undefined;
   public getContextValue(key: any, defaultValue?: any): any;
   public setContextValue(key: any, value: any): any;
   public buildConnectionContext(connection?: ConnectionBase): Map<any, any>;

package/lib/connection/connection-base.js

@@ -236,15 +236,15 @@ class ConnectionBase extends EventEmitter {
     return queryEngine;
   }
 
-  registerModel(_Model) {
-    let Model = _Model.bindConnection(this);
+  registerModel(_Model, options) {
+    let Model = _Model.bindConnection(this, options);
 
     this._models[Model.getModelName()] = Model;
 
     return Model;
   }
 
-  registerModels(models) {
+  registerModels(models, options) {
     if (!models)
       return;
 
@@ -254,7 +254,7 @@ class ConnectionBase extends EventEmitter {
       let key   = keys[i];
       let Model = models[key];
 
-      this.registerModel(Model);
+      this.registerModel(Model, options);
     }
 
     return this._models;
@@ -330,8 +330,8 @@ class ConnectionBase extends EventEmitter {
   }
 
   async createContext(callback, _connection, thisArg) {
-    let context     = this.buildConnectionContext(_connection);
     let connection  = _connection || this;
+    let context     = this.buildConnectionContext(connection);
 
     return await Utils.runInContext(context, async () => {
       return await callback.call(thisArg, connection);

package/lib/model.js

@@ -458,6 +458,14 @@ class Model {
     return this.constructor._getConnection();
   }
 
+  static getConnection(_connection) {
+    let connection = this._getConnection(_connection);
+    if (!connection)
+      throw new Error(`${this.getModelName()}::getConnection: No connection bound to model. You need to provide a connection for this operation.`);
+
+    return connection;
+  }
+
   /// Get the underlying connection bound to
   /// the model's class. Connection binding is
   /// optional, so this method can also be provided
@@ -470,6 +478,15 @@ class Model {
   /// you wish to provide your own model specific
   /// connection.
   ///
+  /// This method will also search for a `modelInstance.connection`,
+  /// and return that connection if found.
+  ///
+  /// Note:
+  ///   `static getConnection` is simply a proxy for
+  ///   `static _getConnection`, whereas this instance
+  ///   method will also attempt to find a connection
+  ///   on the model instance itself.
+  ///
   /// Return: <see>Connection</see>
   ///
   /// Arguments:
@@ -479,14 +496,6 @@ class Model {
   ///     Otherwise, if not provided, or a falsy value,
   ///     then attempt to fallback to the bound connection,
   ///     if any is available.
-  static getConnection(_connection) {
-    let connection = this._getConnection(_connection);
-    if (!connection)
-      throw new Error(`${this.getModelName()}::getConnection: No connection bound to model. You need to provide a connection for this operation.`);
-
-    return connection;
-  }
-
   getConnection(_connection) {
     if (_connection)
       return _connection;
@@ -514,14 +523,14 @@ class Model {
   ///   connection?: <see>Connection</see>
   ///     The connection instance to bind to
   ///     this model class.
-  static bindConnection(connection) {
+  static bindConnection(connection, options) {
     let ModelClass = this;
 
     // Ensure that the model fields
     // are constructed properly
     ModelClass.getFields();
 
-    let connectionOptions = connection.getOptions();
+    let connectionOptions = { ...(connection.getOptions() || {}), ...(options || {}) };
     if (connectionOptions && connectionOptions.bindModels === false) {
       // let modelName = ModelClass.getModelName();
 
@@ -544,7 +553,7 @@ class Model {
       enumerable:   false,
       configurable: true,
       get:          () => {
-        return ModelClass.getQueryEngine(connection);
+        return ModelClass.getQueryEngine(ModelClass._getConnection() || connection);
       },
       set:          () => {},
     };

package/lib/utils/async-store.d.ts

@@ -1,3 +1,4 @@
+export declare function getContextStore(): any;
 export declare function getContextValue(key: any, defaultValue: any): any;
 export declare function setContextValue(key: any, value: any): void;
 export declare function runInContext(context: any, callback: Function): Promise<any>;

package/lib/utils/async-store.js

@@ -12,6 +12,10 @@ try {
   };
 }
 
+function getContextStore() {
+  return globalAsyncStore.getStore();
+}
+
 function getContextValue(key, defaultValue) {
   let store = globalAsyncStore.getStore();
   while (store) {
@@ -52,4 +56,5 @@ module.exports = {
   getContextValue,
   setContextValue,
   runInContext,
+  getContextStore,
 };

package/lib/utils/index.js

@@ -34,6 +34,7 @@ const {
 } = QueryUtils;
 
 const {
+  getContextStore,
   getContextValue,
   setContextValue,
   runInContext,
@@ -71,6 +72,7 @@ module.exports = {
   generateQueryFromFilter,
 
   // AsyncStore
+  getContextStore,
   getContextValue,
   setContextValue,
   runInContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "ORM for Mythix framework",
   "main": "lib/index",
   "type": "commonjs",