use applyPatches internally instead of a dedicated actions

mobxjs · Jul 13, 2017 · 63080c8 · 63080c8
1 parent 385598b
commit 63080c8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 26 deletions.
diff --git a/src/core/node.ts b/src/core/node.ts
@@ -25,7 +25,6 @@ export class Node {
     private readonly disposers: (() => void)[] = []
     applyPatches: (patches: IReversibleJsonPatch[]) => void
     applySnapshot: (snapshot: any) => void
-    replaceChild: (subpath: string, newValue: any) => void
 
     constructor(
         type: IType<any, any>,
@@ -56,12 +55,6 @@ export class Node {
         this.applySnapshot = createActionInvoker("@APPLY_SNAPSHOT", (snapshot: any) => {
             return this.type.applySnapshot(this, snapshot)
         }).bind(this.storedValue)
-        this.replaceChild = createActionInvoker(
-            "@REPLACE_NODE",
-            (subpath: string, newValue: any) => {
-                return this.type.replaceChild(this, subpath, newValue)
-            }
-        ).bind(this.storedValue)
 
         // optimization: don't keep the snapshot by default alive with a reaction by default
         // in prod mode. This saves lot of GC overhead (important for e.g. React Native)

diff --git a/src/types/complex-types/array.ts b/src/types/complex-types/array.ts
@@ -210,10 +210,6 @@ export class ArrayType<S, T> extends ComplexType<S[], IObservableArray<T>> {
     removeChild(node: Node, subpath: string) {
         node.storedValue.splice(parseInt(subpath, 10), 1)
     }
-
-    replaceChild(node: Node, subpath: string, newValue: any) {
-        node.storedValue[parseInt(subpath, 10)] = newValue
-    }
 }
 
 export function array<S, T>(subtype: IType<S, T>): IComplexType<S[], IObservableArray<T>> {

diff --git a/src/types/complex-types/map.ts b/src/types/complex-types/map.ts
@@ -261,10 +261,6 @@ export class MapType<S, T> extends ComplexType<{ [key: string]: S }, IExtendedOb
     removeChild(node: Node, subpath: string) {
         ;(node.storedValue as ObservableMap<any>).delete(subpath)
     }
-
-    replaceChild(node: Node, subpath: string, newValue: any) {
-        ;(node.storedValue as ObservableMap<any>).set(subpath, newValue)
-    }
 }
 
 export function map<S, T>(

diff --git a/src/types/complex-types/object.ts b/src/types/complex-types/object.ts
@@ -274,10 +274,6 @@ export class ObjectType extends ComplexType<any, any> {
     removeChild(node: Node, subpath: string) {
         node.storedValue[subpath] = null
     }
-
-    replaceChild(node: Node, subpath: string, newValue: any) {
-        node.storedValue[subpath] = newValue
-    }
 }
 
 export type IModelProperties<T> = { [K in keyof T]: IType<any, T[K]> | T[K] }

diff --git a/src/types/type.ts b/src/types/type.ts
@@ -25,7 +25,6 @@ export interface IType<S, T> {
     getChildNode(node: Node, key: string): Node
     getChildType(key: string): IType<any, any>
     removeChild(node: Node, subpath: string): void
-    replaceChild(node: Node, subpath: string, newValue: any): void
     isAssignableFrom(type: IType<any, any>): boolean
 }
 
@@ -69,7 +68,6 @@ export abstract class ComplexType<S, T> implements IType<S, T> {
     abstract applyPatchLocally(node: Node, subpath: string, patch: IJsonPatch): void
     abstract getChildType(key: string): IType<any, any>
     abstract removeChild(node: Node, subpath: string): void
-    abstract replaceChild(node: Node, subpath: string, newValue: any): void
     abstract isValidSnapshot(value: any, context: IContext): IValidationResult
 
     isAssignableFrom(type: IType<any, any>): boolean {
@@ -192,10 +190,6 @@ export abstract class Type<S, T> extends ComplexType<S, T> implements IType<S, T
     removeChild(node: Node, subpath: string): void {
         return fail(`No child '${subpath}' available in type: ${this.name}`)
     }
-
-    replaceChild(node: Node, subpath: string, newValue: any): void {
-        return fail(`No child '${subpath}' available in type: ${this.name}`)
-    }
 }
 
 import { EMPTY_ARRAY, fail, isMutable } from "../utils"

diff --git a/src/types/utility-types/lazy.ts b/src/types/utility-types/lazy.ts
@@ -50,7 +50,13 @@ export class Lazy<S, T, TR> extends Type<S, T | TR> {
                             if (!node.parent) return
                             if (!this.loadedType) return
 
-                            node.parent.replaceChild(node.subpath, type.create(node.snapshot))
+                            node.parent.applyPatches([
+                                {
+                                    op: "replace",
+                                    path: node.subpath,
+                                    value: node.snapshot
+                                }
+                            ])
                         })
                     })
                 )