Merge branch 'master' into yarn-on-travis

.gitignore

@@ -13,3 +13,6 @@ dist/
 .build*/
 .idea
 .wp-build*/
+*.iml
+*.ipr
+*.iws

src/api/autorun.ts

@@ -2,7 +2,7 @@ import {Lambda, getNextId, invariant, valueDidChange, fail} from "../utils/utils
 import {isModifierDescriptor} from "../types/modifiers";
 import {Reaction, IReactionPublic, IReactionDisposer} from "../core/reaction";
 import {untrackedStart, untrackedEnd} from "../core/derivation";
-import {action, isAction} from "../api/action";
+import {action, isAction} from "./action";
 import {getMessage} from "../utils/messages";
 
 /**

src/api/expr.ts

@@ -1,4 +1,4 @@
-import {computed} from "../api/computed";
+import {computed} from "./computed";
 import {isComputingDerivation} from "../core/derivation";
 import {getMessage} from "../utils/messages";
 

src/api/extendobservable.ts

@@ -1,6 +1,6 @@
 import {isObservableMap} from "../types/observablemap";
 import {asObservableObject, defineObservablePropertyFromDescriptor} from "../types/observableobject";
-import {isObservable} from "../api/isobservable";
+import {isObservable} from "./isobservable";
 import {invariant, isPropertyConfigurable, hasOwnProperty} from "../utils/utils";
 import {deepEnhancer, referenceEnhancer, IEnhancer} from "../types/modifiers";
 import {getMessage} from "../utils/messages";

src/api/isobservable.ts

@@ -9,7 +9,7 @@ import {getMessage} from "../utils/messages";
 /**
 	* Returns true if the provided value is reactive.
 	* @param value object, function or array
-	* @param propertyName if propertyName is specified, checkes whether value.propertyName is reactive.
+	* @param property if property is specified, checks whether value.property is reactive.
 	*/
 export function isObservable(value, property?: string): boolean {
 	if (value === null || value === undefined)

src/api/observable.ts

@@ -5,7 +5,7 @@ import {IObservableArray, ObservableArray} from "../types/observablearray";
 import {createDecoratorForEnhancer} from "./observabledecorator";
 import {isObservable} from "./isobservable";
 import {IObservableObject, asObservableObject} from "../types/observableobject";
-import {extendObservable, extendShallowObservable} from "../api/extendobservable";
+import {extendObservable, extendShallowObservable} from "./extendobservable";
 import {IObservableMapInitialValues, ObservableMap, IMap} from "../types/observablemap";
 import {getMessage} from "../utils/messages";
 
@@ -18,7 +18,7 @@ const refStructDecorator = createDecoratorForEnhancer(refStructEnhancer);
 
 /**
  * Turns an object, array or function into a reactive structure.
- * @param value the value which should become observable.
+ * @param v the value which should become observable.
  */
 function createObservable(v: any = undefined) {
 	// @observable someProp;

src/api/tojs.ts

@@ -2,8 +2,7 @@ import {isObservableArray} from "../types/observablearray";
 import {isObservableObject} from "../types/observableobject";
 import {isObservableMap} from "../types/observablemap";
 import {isObservableValue} from "../types/observablevalue";
-import {isObservable} from "../api/isobservable";
-import {deprecated, isArrayLike} from "../utils/utils";
+import {isObservable} from "./isobservable";
 
 /**
 	* Basically, a deep clone, so that no reactive property will exist anymore.

src/api/whyrun.ts

@@ -2,7 +2,7 @@ import {globalState} from "../core/globalstate";
 import {isComputedValue} from "../core/computedvalue";
 import {isReaction} from "../core/reaction";
 import {getAtom} from "../types/type-utils";
-import {fail, deprecated} from "../utils/utils";
+import {fail} from "../utils/utils";
 import {getMessage} from "../utils/messages";
 
 function log(msg: string): string {

src/core/action.ts

@@ -1,9 +1,9 @@
-import {IDerivation} from "../core/derivation";
+import {IDerivation} from "./derivation";
 import {invariant} from "../utils/utils";
-import {untrackedStart, untrackedEnd} from "../core/derivation";
-import {startBatch, endBatch} from "../core/observable";
-import {isSpyEnabled, spyReportStart, spyReportEnd} from "../core/spy";
-import {globalState} from "../core/globalstate";
+import {untrackedStart, untrackedEnd} from "./derivation";
+import {startBatch, endBatch} from "./observable";
+import {isSpyEnabled, spyReportStart, spyReportEnd} from "./spy";
+import {globalState} from "./globalstate";
 import {getMessage} from "../utils/messages";
 
 export interface IAction{

src/core/computedvalue.ts

@@ -3,7 +3,7 @@ import {IDerivation, IDerivationState, trackDerivedFunction, clearObserving, unt
 import {globalState} from "./globalstate";
 import {createAction} from "./action";
 import {createInstanceofPredicate, getNextId, valueDidChange, invariant, Lambda, unique, joinStrings, primitiveSymbol, toPrimitive} from "../utils/utils";
-import {isSpyEnabled, spyReport} from "../core/spy";
+import {isSpyEnabled, spyReport} from "./spy";
 import {autorun} from "../api/autorun";
 import {IValueDidChange} from "../types/observablevalue";
 import {getMessage} from "../utils/messages";
@@ -84,9 +84,9 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
 	public get(): T {
 		invariant(!this.isComputing, `Cycle detected in computation ${this.name}`, this.derivation);
 		if (globalState.inBatch === 0) {
-			// just for small optimization, can be droped for simplicity
-			// computed called outside of any mobx stuff. batch observing shuold be enough, don't need tracking
-			// because it will never be called again inside this batch
+			// This is an minor optimization which could be omitted to simplify the code
+			// The computedValue is accessed outside of any mobx stuff. Batch observing should be enough and don't need
+			// tracking as it will never be called again inside this batch.
 			startBatch();
 			if (shouldCompute(this))
 				this.value = this.computeValue(false);

src/core/derivation.ts

@@ -154,8 +154,8 @@ function bindDependencies(derivation: IDerivation) {
 	derivation.newObserving = null; // newObserving shouldn't be needed outside tracking
 
 	// Go through all new observables and check diffValue: (this list can contain duplicates):
-	//   0: first occurence, change to 1 and keep it
-	//   1: extra occurence, drop it
+	//   0: first occurrence, change to 1 and keep it
+	//   1: extra occurrence, drop it
 	let i0 = 0, l = derivation.unboundDepsCount;
 	for (let i = 0; i < l; i++) {
 		const dep = observing[i];

src/core/globalstate.ts

@@ -1,5 +1,5 @@
 import {getGlobal, deprecated} from "../utils/utils";
-import {IDerivation, CaughtException} from "./derivation";
+import {IDerivation} from "./derivation";
 import {Reaction} from "./reaction";
 import {IObservable} from "./observable";
 

src/core/observable.ts

@@ -11,7 +11,7 @@ export interface IDepTreeNode {
 export interface IObservable extends IDepTreeNode {
 	diffValue: number;
 	/**
-	 * Id of the derivation *run* that last accesed this observable.
+	 * Id of the derivation *run* that last accessed this observable.
 	 * If this id equals the *run* id of the current derivation,
 	 * the dependency is already established
 	 */

src/core/reaction.ts

@@ -130,7 +130,7 @@ export class Reaction implements IDerivation, IReactionPublic {
 		const messageToUser = getMessage("m037");
 
 		console.error(message || messageToUser /* latter will not be true, make sure uglify doesn't remove */, error);
-			/** If debugging brough you here, please, read the above message :-). Tnx! */
+			/** If debugging brought you here, please, read the above message :-). Tnx! */
 
 		if (isSpyEnabled()) {
 			spyReport({

src/types/modifiers-old.ts

@@ -1,5 +1,5 @@
 import {observable} from "../api/observable";
-import {ObservableMap, IMapEntries, IKeyValueMap} from "../types/observablemap";
+import {ObservableMap, IMapEntries, IKeyValueMap} from "./observablemap";
 import {deprecated} from "../utils/utils";
 
 export function asReference<T>(value: T): T {

src/types/observablearray.ts

@@ -5,7 +5,7 @@ import {IInterceptable, IInterceptor, hasInterceptors, registerInterceptor, inte
 import {IListenable, registerListener, hasListeners, notifyListeners} from "./listen-utils";
 import {isSpyEnabled, spyReportStart, spyReportEnd} from "../core/spy";
 import {arrayAsIterator, declareIterator} from "../utils/iterable";
-import {IEnhancer} from "../types/modifiers";
+import {IEnhancer} from "./modifiers";
 
 const MAX_SPLICE_SIZE = 10000; // See e.g. https://github.com/mobxjs/mobx/issues/859
 

src/types/observableobject.ts

@@ -5,7 +5,7 @@ import {runLazyInitializers} from "../utils/decorators";
 import {hasInterceptors, IInterceptable, registerInterceptor, interceptChange} from "./intercept-utils";
 import {IListenable, registerListener, hasListeners, notifyListeners} from "./listen-utils";
 import {isSpyEnabled, spyReportStart, spyReportEnd} from "../core/spy";
-import {IEnhancer, isModifierDescriptor, IModifierDescriptor} from "../types/modifiers";
+import {IEnhancer, isModifierDescriptor, IModifierDescriptor} from "./modifiers";
 import {isAction, defineBoundAction} from "../api/action";
 import {getMessage} from "../utils/messages";
 

src/types/observablevalue.ts

@@ -4,7 +4,7 @@ import {Lambda, getNextId, createInstanceofPredicate, primitiveSymbol, toPrimiti
 import {hasInterceptors, IInterceptable, IInterceptor, registerInterceptor, interceptChange} from "./intercept-utils";
 import {IListenable, registerListener, hasListeners, notifyListeners} from "./listen-utils";
 import {isSpyEnabled, spyReportStart, spyReportEnd, spyReport} from "../core/spy";
-import {IEnhancer} from "../types/modifiers";
+import {IEnhancer} from "./modifiers";
 
 export interface IValueWillChange<T> {
 	object: any;

src/types/type-utils.ts

@@ -4,9 +4,9 @@ import {runLazyInitializers} from "../utils/decorators";
 import {isAtom} from "../core/atom";
 import {isComputedValue} from "../core/computedvalue";
 import {isReaction} from "../core/reaction";
-import {isObservableArray} from "../types/observablearray";
-import {isObservableMap} from "../types/observablemap";
-import {isObservableObject} from "../types/observableobject";
+import {isObservableArray} from "./observablearray";
+import {isObservableMap} from "./observablemap";
+import {isObservableObject} from "./observableobject";
 import {getMessage} from "../utils/messages";