added transactional.assign and fixed bug with merging shared attrs

Author: Vlad Balin

dist/index.js

@@ -48,6 +48,7 @@ export declare abstract class Transactional implements Messenger, Validatable, T
     transaction(fun: (self: this) => void, options?: TransactionOptions): void;
     updateEach(iteratee: (val: any, key: string) => void, options?: TransactionOptions): void;
     set(values: any, options?: TransactionOptions): this;
+    assign(source: Transactional): this;
     abstract _createTransaction(values: any, options?: TransactionOptions): Transaction;
     parse(data: any, options?: TransactionOptions): any;
     abstract toJSON(): {};

dist/index.js.map

@@ -37,7 +37,9 @@ export class AggregatedType extends AnyType {
                 this._log( 'error', 'aggregated attribute is assigned with shared collection type', value, record );
             }
 
-            return options.merge ? value.clone() : value; // TODO: looks like clone is never called. Remove.
+            // With explicit 'merge' option we need to clone an object if its previous value was 'null'.
+            // This is an only case we could be here when merge === true.
+            return options.merge ? value.clone() : value;
         }
 
         return <any>this.type.create( value, options );

dist/transactions.d.ts

@@ -35,14 +35,8 @@ export class SharedType extends AnyType {
 
     canBeUpdated( prev : Transactional, next : any, options : TransactionOptions ) : any {
         // If an object already exists, and new value is of incompatible type, let object handle the update.
-        if( prev && next != null ){
-            if( next instanceof this.type ){
-                // In case if merge option explicitly specified, force merge.
-                if( options.merge ) return next.__inner_state__;
-            }
-            else{
-                return next;
-            }
+        if( prev && next != null && !( next instanceof this.type ) ){
+            return next;
         }
     }
 

src/record/attributes/owned.ts

@@ -155,6 +155,11 @@ export abstract class Transactional implements Messenger, Validatable, Traversab
         return this;
     }
 
+    // Assign transactional object "by value", copying aggregated fields.
+    assign( source : Transactional ) : this {
+        return this.set( this.__inner_state__, { merge : true } );
+    }
+
     // Apply bulk object update without any notifications, and return open transaction.
     // Used internally to implement two-phase commit.
     // Returns null if there are no any changes.