Merge pull request #151 from abruzzihraig/master

fix(union): Union.create() shouldn't ignore extra arguments

Author: mattiamanzati

src/types/type.ts

@@ -67,3 +67,4 @@ export abstract class Type<S, T> implements IType<S, T> {
 import { fail } from "../utils"
 import { IMSTNode } from "../core/mst-node"
 import { IContext, IValidationResult } from "./type-checker"
+import { MSTAdministration } from "../core/mst-node-administration"

src/types/utility-types/union.ts

@@ -1,6 +1,7 @@
-import {isType, IType, TypeFlags, Type} from "../type"
+import { isType, IType, TypeFlags, Type } from "../type"
 import { IContext, IValidationResult, typeCheckSuccess, typeCheckFailure, flattenTypeErrors, typecheck } from "../type-checker"
-import {fail} from "../../utils"
+import { MSTAdministration } from "../../core/mst-node-administration"
+import { fail } from "../../utils"
 
 export type ITypeDispatcher = (snapshot: any) => IType<any, any>
 
@@ -10,7 +11,7 @@ export class Union extends Type<any, any> {
 
     get flags () {
         let result: TypeFlags = 0
-        
+
         this.types.forEach(type => {
             result |= type.flags
         })
@@ -28,20 +29,20 @@ export class Union extends Type<any, any> {
         return "(" + this.types.map(factory => factory.describe()).join(" | ") + ")"
     }
 
-    create(value: any) {
+    create(value: any, environment: any = undefined, parent: MSTAdministration | null = null, subpath: string = "") {
         typecheck(this, value)
 
         // try the dispatcher, if defined
         if (this.dispatcher !== null) {
-            return this.dispatcher(value).create(value)
+            return (this.dispatcher(value) as any).create(value, environment, parent, subpath)
         }
 
         // find the most accomodating type
         const applicableTypes = this.types.filter(type => type.is(value))
         if (applicableTypes.length > 1)
              return fail(`Ambiguos snapshot ${JSON.stringify(value)} for union ${this.name}. Please provide a dispatch in the union declaration.`)
 
-        return applicableTypes[0].create(value)
+        return (applicableTypes[0] as any).create(value, environment, parent, subpath)
     }
 
     validate(value: any, context: IContext): IValidationResult {

test/union.ts

@@ -1,4 +1,4 @@
-import {types} from "../src"
+import {types, hasParent, tryResolve} from "../src"
 import {test} from "ava"
 
 const createTestFactories = () => {
@@ -22,7 +22,11 @@ const createTestFactories = () => {
 
     const DispatchPlane = types.union(snapshot => snapshot && "height" in snapshot ? Box : Square, Box, Square)
 
-    return {Box, Square, Cube, Plane, DispatchPlane, Heighed}
+    const Block = types.model("Block", {
+        list: types.array(Heighed)
+    })
+
+    return {Box, Square, Cube, Plane, DispatchPlane, Heighed, Block}
 }
 
 test("it should complain about no dispatch method", (t) => {
@@ -34,6 +38,17 @@ test("it should complain about no dispatch method", (t) => {
 snapshot \`{"width":2,"height":2}\` is not assignable to type: \`Box | Square\` (Multiple types are applicable and no dispatch method is defined for the union), expected an instance of \`Box | Square\` or a snapshot like \`({ width: number; height: number } | { width: number })\` instead.`)
 })
 
+test("it should have parent whenever creating or applying from a complex data structure to a model which has Union typed children", (t) => {
+    const {Block, Heighed} = createTestFactories()
+    const block = Block.create({
+      list: [{width: 2, height: 2}]
+    })
+
+    const child = tryResolve(block, "./list/0")
+
+    hasParent(child) ? t.pass() : t.fail()
+})
+
 test("it should complain about no dispatch method and multiple applicable types", (t) => {
     const {Heighed} = createTestFactories()
 
@@ -90,4 +105,4 @@ test("it should compute exact union types - 2", (t) => {
 
     t.deepEqual(DispatchPlane.is(Box.create({ width: 3, height: 2})), true)
     t.deepEqual(DispatchPlane.is(Square.create({ width: 3, height: 2} as any)), true)
-})
+})