Draft of fix for ChainableAttributeSpec being assigned to SharedType …

…type attribute
remaininlight · Apr 29, 2019 · Apr 29, 2019 · May 2, 2019 · May 10, 2019 · Nov 10, 2019
commit daba19745321c4ea11e7ee993d83ef7b0f70d405
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/lib/record/metatypes/any.d.ts b/lib/record/metatypes/any.d.ts
@@ -41,7 +41,7 @@ export declare class AnyType implements AttributeUpdatePipeline {
     createPropertyDescriptor(): PropertyDescriptor | void;
     value: any;
     static defaultValue: any;
-    type: Function;
+    type: any;
     initialize(name: string, options: TransactionOptions): void;
     options: AttributeOptions;
     doInit(value: any, record: AttributesContainer, options: TransactionOptions): any;

diff --git a/lib/record/metatypes/shared.d.ts b/lib/record/metatypes/shared.d.ts
@@ -1,8 +1,9 @@
 import { Transactional, TransactionOptions } from '../../transactions';
 import { AnyType } from './any';
 import { AttributesContainer, ConstructorOptions } from '../updates';
+import { ChainableAttributeSpec } from '../attrDef';
 export declare class SharedType extends AnyType {
-    type: typeof Transactional;
+    type: typeof Transactional | ChainableAttributeSpec<Function>;
     doInit(value: any, record: AttributesContainer, options: ConstructorOptions): any;
     doUpdate(value: any, record: any, options: any, nested: any[]): boolean;
     clone(value: Transactional, record: AttributesContainer): Transactional;

diff --git a/lib/record/metatypes/shared.js b/lib/record/metatypes/shared.js
diff --git a/lib/record/metatypes/shared.js.map b/lib/record/metatypes/shared.js.map
diff --git a/src/record/metatypes/any.ts b/src/record/metatypes/any.ts
@@ -127,7 +127,7 @@ export class AnyType implements AttributeUpdatePipeline {
     // Used as global default value for the given metatype
     static defaultValue : any;
 
-    type : Function
+    type : any
 
     initialize( name : string, options : TransactionOptions ){}
 

diff --git a/src/record/metatypes/shared.ts b/src/record/metatypes/shared.ts
@@ -1,6 +1,7 @@
 import { eventsApi } from '../../object-plus';
 import { ItemsBehavior, Transactional, transactionApi, TransactionOptions } from '../../transactions';
 import { AnyType } from './any';
+import { type } from '../attrDef'
 import { AttributesContainer, ConstructorOptions } from '../updates';
 import { ChainableAttributeSpec } from '../attrDef';
 
@@ -17,9 +18,14 @@ const { on, off } = eventsApi,
 
 const shareAndListen = ItemsBehavior.listen | ItemsBehavior.share;
 
+function getType(input: any) {
+    return input.type.options ? input.type.options.type : input.type;
+}
+
 /** @private */
 export class SharedType extends AnyType {
-    type : typeof Transactional
+    //type : ChainableAttributeSpec<Function>
+    type : typeof Transactional | ChainableAttributeSpec<Function>
 
      doInit( value, record : AttributesContainer, options : ConstructorOptions ){
         const v = options.clone ? this.clone( value, record ) : (
@@ -81,13 +87,15 @@ 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 && !( next instanceof this.type ) ){
+        let type = getType(this);
+        if( prev && next != null && !( next instanceof type ) ){
             return next;
         }
     }
 
     convert( next : any, prev : any, record : AttributesContainer, options : TransactionOptions ) : Transactional {
-        if( next == null || next instanceof this.type ) return next;
+        let type = getType(this);
+        if( next == null || next instanceof type ) return next;
 
         // Convert type using implicitly created transactional object.
         const implicitObject = new ( this.type as any )( next, options, shareAndListen );