Prepared for the ultimate fix to circular deps

packages/mobx-state-tree/src/core/action.ts

@@ -1,5 +1,15 @@
 import { action as mobxAction } from "mobx"
 
+import {
+    INode,
+    getStateTreeNode,
+    IStateTreeNode,
+    fail,
+    argsToArray,
+    IDisposer,
+    getRoot
+} from "../internal"
+
 export type IMiddlewareEventType =
     | "action"
     | "process_spawn"
@@ -156,7 +166,3 @@ function runMiddleWares(node: INode, baseCall: IMiddlewareEvent, originalFn: Fun
     }
     return runNextMiddleware(baseCall)
 }
-
-import { INode, getStateTreeNode, IStateTreeNode } from "./node"
-import { fail, argsToArray, IDisposer } from "../utils"
-import { getRoot } from "./mst-operations"

packages/mobx-state-tree/src/core/json-patch.ts

@@ -1,3 +1,5 @@
+import { fail } from "../internal"
+
 // https://tools.ietf.org/html/rfc6902
 // http://jsonpatch.com/
 
@@ -80,5 +82,3 @@ export function splitJsonPath(path: string): string[] {
     // path '../../b/c -> .. .. b c
     return parts[0] === "" ? parts.slice(1) : parts
 }
-
-import { fail } from "../utils"

packages/mobx-state-tree/src/core/mst-operations.ts

@@ -1,3 +1,20 @@
+import { IObservableArray, ObservableMap } from "mobx"
+import {
+    INode,
+    getStateTreeNode,
+    IStateTreeNode,
+    isStateTreeNode,
+    IJsonPatch,
+    splitJsonPath,
+    asArray,
+    EMPTY_OBJECT,
+    fail,
+    IDisposer,
+    ISnapshottable,
+    IType,
+    isType
+} from "../internal"
+
 /**
  * Returns the _actual_ type of the given tree node. (Or throws)
  *
@@ -216,10 +233,10 @@ export function protect(target: IStateTreeNode) {
  * }))
  *
  * const todo = Todo.create()
- * todo.done = true // throws! 
- * todo.toggle() // OK 
- * unprotect(todo) 
- * todo.done = false // OK 
+ * todo.done = true // throws!
+ * todo.toggle() // OK
+ * unprotect(todo)
+ * todo.done = false // OK
  */
 export function unprotect(target: IStateTreeNode) {
     // check all arguments
@@ -644,9 +661,3 @@ export function walk(target: IStateTreeNode, processor: (item: IStateTreeNode) =
     })
     processor(node.storedValue)
 }
-
-import { IObservableArray, ObservableMap } from "mobx"
-import { INode, getStateTreeNode, IStateTreeNode, isStateTreeNode } from "./node"
-import { IJsonPatch, splitJsonPath } from "./json-patch"
-import { asArray, EMPTY_OBJECT, fail, IDisposer } from "../utils"
-import { ISnapshottable, IType, isType } from "./type"

packages/mobx-state-tree/src/core/node/create-node.ts

@@ -1,3 +1,16 @@
+import {
+    canAttachNode,
+    isStateTreeNode,
+    getStateTreeNode,
+    INode,
+    identity,
+    noop,
+    fail,
+    ObjectNode,
+    ScalarNode,
+    IType
+} from "../../internal"
+
 export function createNode<S, T>(
     type: IType<S, T>,
     parent: INode | null,
@@ -50,9 +63,3 @@ export function createNode<S, T>(
 export function isNode(value: any): value is INode {
     return value instanceof ScalarNode || value instanceof ObjectNode
 }
-
-import { canAttachNode, isStateTreeNode, getStateTreeNode, INode } from "./node-utils"
-import { identity, noop, fail } from "../../utils"
-import { ObjectNode } from "./object-node"
-import { ScalarNode } from "./scalar-node"
-import { IType } from "../type"

packages/mobx-state-tree/src/core/node/identifier-cache.ts

@@ -1,3 +1,6 @@
+import { observable, IObservableArray } from "mobx"
+import { fail, IType, INode } from "../../internal"
+
 export class IdentifierCache {
     private cache = observable.map<IObservableArray<INode>>()
 
@@ -63,8 +66,3 @@ export class IdentifierCache {
         }
     }
 }
-
-import { fail } from "../../utils"
-import { observable, IObservableArray } from "mobx"
-import { IType } from "../type"
-import { INode } from "./node-utils"

packages/mobx-state-tree/src/core/node/node-utils.ts

@@ -1,3 +1,13 @@
+import {
+    IType,
+    IdentifierCache,
+    IReversibleJsonPatch,
+    IJsonPatch,
+    IDisposer,
+    fail,
+    IMiddlewareHandler
+} from "../../internal"
+
 export interface INode {
     readonly type: IType<any, any>
 
@@ -99,9 +109,3 @@ export function canAttachNode(value: any) {
 export function toJSON(this: IStateTreeNode) {
     return getStateTreeNode(this).snapshot
 }
-
-import { IType } from "../type"
-import { IdentifierCache } from "./identifier-cache"
-import { IJsonPatch, IReversibleJsonPatch } from "../json-patch"
-import { IDisposer, fail } from "../../utils"
-import { IMiddlewareHandler } from "../action"

packages/mobx-state-tree/src/core/node/object-node.ts

@@ -1,5 +1,24 @@
 import { reaction } from "mobx"
-import { ScalarNode } from "./scalar-node"
+import {
+    ScalarNode,
+    INode,
+    isStateTreeNode,
+    getStateTreeNode,
+    IJsonPatch,
+    IReversibleJsonPatch,
+    splitJsonPath,
+    splitPatch,
+    IType,
+    IDisposer,
+    extend,
+    noop,
+    fail,
+    registerEventHandler,
+    addReadOnlyProp,
+    walk,
+    IMiddlewareHandler,
+    createActionInvoker
+} from "../../internal"
 
 export class ObjectNode extends ScalarNode implements INode {
     middlewares: IMiddlewareHandler[]
@@ -156,10 +175,3 @@ export class ObjectNode extends ScalarNode implements INode {
         this.type.applyPatchLocally(this, subpath, patch)
     }
 }
-
-import { INode, isStateTreeNode, getStateTreeNode } from "./node-utils"
-import { IJsonPatch, IReversibleJsonPatch, splitJsonPath, splitPatch } from "../json-patch"
-import { IType } from "../type"
-import { IDisposer, extend, noop, fail, registerEventHandler, addReadOnlyProp } from "../../utils"
-import { walk } from "../mst-operations"
-import { IMiddlewareHandler, createActionInvoker } from "../action"

packages/mobx-state-tree/src/core/node/scalar-node.ts

@@ -1,4 +1,23 @@
-import { observable, action, computed } from "mobx"
+import { observable, computed } from "mobx"
+
+import {
+    INode,
+    toJSON,
+    IdentifierCache,
+    escapeJsonPath,
+    splitJsonPath,
+    IJsonPatch,
+    IReversibleJsonPatch,
+    joinJsonPath,
+    EMPTY_ARRAY,
+    noop,
+    addHiddenFinalProp,
+    fail,
+    freeze,
+    IDisposer,
+    IType,
+    IMiddlewareHandler
+} from "../../internal"
 
 let nextNodeId = 1
 export class ScalarNode implements INode {
@@ -342,24 +361,3 @@ export class ScalarNode implements INode {
         throw fail(`ImmutableNode does not support the addDisposer operation`)
     }
 }
-
-import { INode, toJSON } from "./node-utils"
-import { IdentifierCache } from "./identifier-cache"
-import {
-    escapeJsonPath,
-    splitJsonPath,
-    IJsonPatch,
-    IReversibleJsonPatch,
-    joinJsonPath
-} from "../json-patch"
-import {
-    EMPTY_ARRAY,
-    noop,
-    identity,
-    addHiddenFinalProp,
-    fail,
-    freeze,
-    IDisposer
-} from "../../utils"
-import { IType } from "../type"
-import { IMiddlewareHandler } from "../action"

packages/mobx-state-tree/src/core/process.ts

@@ -1,3 +1,12 @@
+import {
+    IMiddlewareEventType,
+    runWithActionContext,
+    getActionContext,
+    getNextActionId,
+    fail,
+    argsToArray
+} from "../internal"
+
 // based on: https://github.com/mobxjs/mobx-utils/blob/master/src/async-action.ts
 
 export function process<R>(generator: () => IterableIterator<any>): () => Promise<R>
@@ -137,11 +146,3 @@ export function createProcessSpawner(name: string, generator: Function) {
     }
     return spawner
 }
-
-import {
-    IMiddlewareEventType,
-    runWithActionContext,
-    getActionContext,
-    getNextActionId
-} from "./action"
-import { fail, argsToArray } from "../utils"

packages/mobx-state-tree/src/core/type/type-checker.ts

@@ -1,3 +1,13 @@
+import {
+    IType,
+    fail,
+    EMPTY_ARRAY,
+    isPrimitive,
+    getStateTreeNode,
+    isStateTreeNode,
+    isPrimitiveType
+} from "../../internal"
+
 export interface IContextEntry {
     path: string
     type?: IType<any, any>
@@ -112,8 +122,3 @@ export function typecheckPublic(type: IType<any, any>, value: any): void {
         )
     }
 }
-
-import { IType } from "./type"
-import { fail, EMPTY_ARRAY, isPrimitive } from "../../utils"
-import { getStateTreeNode, isStateTreeNode } from "../node/node-utils"
-import { isPrimitiveType } from "../../types/primitives"

packages/mobx-state-tree/src/core/type/type.ts

@@ -1,5 +1,22 @@
 import { action } from "mobx"
 
+import {
+    EMPTY_ARRAY,
+    fail,
+    isMutable,
+    isStateTreeNode,
+    getStateTreeNode,
+    IContext,
+    IValidationResult,
+    typecheck,
+    typeCheckFailure,
+    typeCheckSuccess,
+    INode,
+    IStateTreeNode,
+    IJsonPatch,
+    getType
+} from "../../internal"
+
 export interface ISnapshottable<S> {}
 
 export interface IType<S, T> {
@@ -197,16 +214,3 @@ export abstract class Type<S, T> extends ComplexType<S, T> implements IType<S, T
 export function isType(value: any): value is IType<any, any> {
     return typeof value === "object" && value && value.isType === true
 }
-
-import { EMPTY_ARRAY, fail, isMutable } from "../../utils"
-import { isStateTreeNode, getStateTreeNode } from "../node/node-utils"
-import {
-    IContext,
-    IValidationResult,
-    typecheck,
-    typeCheckFailure,
-    typeCheckSuccess
-} from "./type-checker"
-import { INode, IStateTreeNode } from "../node/node-utils"
-import { IJsonPatch } from "../json-patch"
-import { getType } from "../mst-operations"