Rolled back mixins fix. Doesn't work.

Author: Vlad Balin

index.js

@@ -17,9 +17,8 @@ Record.define = function( protoProps : RecordDefinition = {}, staticProps ){
           // Extract record definition from static members, if any.
           staticsDefinition : RecordDefinition = tools.getChangedStatics( this, 'attributes', 'collection', 'Collection' ),
           // Definition can be made either through statics or define argument.
-          // Merge them together, so we won't care about it below.
-          // Grab an object's prototype values so mixins will be merged properly.
-          definition = defaults( staticsDefinition, protoProps, this.prototype );
+          // Merge them together, so we won't care about it below. 
+          definition = assign( staticsDefinition, protoProps );
 
     if( 'Collection' in this && this.Collection === void 0 ){
         tools.log.error( `[Model Definition] ${ this.prototype.getClassName() }.Collection is undefined. It must be defined _before_ the model.`, definition );

index.js.map

@@ -3,7 +3,7 @@
  * The root of all definitions. 
  */
 
-import { tools, eventsApi, Mixable, ClassDefinition, Constructor, define, mixinRules } from '../object-plus'
+import { tools, eventsApi, Mixable, ClassDefinition, Constructor, define } from '../object-plus'
 
 import { transactionApi, CloneOptions, Transactional, Transaction, TransactionOptions, Owner } from '../transactions'
 import { ChildrenErrors } from '../validation'
@@ -107,10 +107,6 @@ let _cidCounter : number = 0;
     idAttribute : 'id',
     _keys : [ 'id' ]
 })
-@mixinRules({
-    attributes : 'merge',
-    defaults : 'merge'
-})
 export class Record extends Transactional implements Owner {
     // Implemented at the index.ts to avoid circular dependency. Here we have just proper singature.
     static define( protoProps : RecordDefinition, staticProps? ) : typeof Record {