Fix lodash imports

package.json

@@ -53,6 +53,7 @@
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
     "coveralls": "^2.11.6",
+    "es6-promise": "^3.2.1",
     "es6-set": "^0.1.4",
     "istanbul": "^0.4.3",
     "istanbul-instrumenter-loader": "^0.2.0",

src/lib/KnockoutValidator.ts

@@ -3,7 +3,7 @@ import * as ko from 'knockout';
 import ClassnameOptions  from './options/Classnames';
 import Field from "./fields/Field";
 import createBindings from "./bindings/createBindings";
-import some from 'lodash/some';
+import * as some from 'lodash/some';
 import IValidatable from "./interface/IValidatable";
 
 createBindings(ko.bindingHandlers);

src/lib/bindings/genericBindingHandler.ts

@@ -2,7 +2,7 @@ import * as ko from 'knockout';
 import ValidatorFieldBinding from "./ValidatorFieldBinding";
 import {bindings, SHORTHAND_BINDING_NAME} from "../const/bindings";
 import elementMapper from "./elementMapper";
-import find from 'lodash/find';
+import * as find from 'lodash/find';
 
 type BindingDescriptor = {
 	value:any,

src/lib/fields/Field.ts

@@ -3,7 +3,7 @@ import KnockoutValidator from "../KnockoutValidator";
 import elementMapper from "../bindings/elementMapper";
 import IValidatableRule from "../interface/IValidatableRule";
 import ValidationGroup from "./ValidationGroup";
-import every from 'lodash/every';
+import * as every from 'lodash/every';
 import FieldCollection from "./FieldCollection";
 import getUnique from "../utils/getUnique";
 

src/lib/rules/RuleState.ts

@@ -1,9 +1,9 @@
 import IValidatableRule from "../interface/IValidatableRule";
 import * as ko from 'knockout';
 import RuleType from "./RuleType";
-import some from 'lodash/some';
-import every from 'lodash/every';
-import find from 'lodash/find';
+import * as some from 'lodash/some';
+import * as every from 'lodash/every';
+import * as find from 'lodash/find';
 import Disposable from "seng-disposable";
 import {SingleRuleFunction} from "./RuleBindingValue";
 
@@ -42,7 +42,7 @@ export default class RuleState extends Disposable implements IValidatableRule {
 		else
 		{
 			this._isValid = ko.observable(null).extend({deferred : true});
-			this._isValidating = ko.observable(0).extend({deferred : true});
+			this._isValidating = ko.observable(0);
 			this.isValidated = ko.pureComputed(() => this._isValid() === null);
 			this.isValid = ko.pureComputed({
 				read : () => this._isValid(),
@@ -68,11 +68,9 @@ export default class RuleState extends Disposable implements IValidatableRule {
 		{
 			case RuleType.COLLECTION_AND:
 			case RuleType.COLLECTION_OR:
-				this._isValidating(this._isValidating() + 1);
 				const aggregate = this.ruleType === RuleType.COLLECTION_AND ? every : some;
 				return Promise.all((<Array<RuleState>> this.test).map(rule => rule.validate(value))).then((results:Array<boolean>) =>
 				{
-					this._isValidating(Math.max(0, this._isValidating() - 1));
 					return aggregate(results, result => !!result);
 				});
 			case RuleType.CHECKED:

test/index.ts

@@ -1,4 +1,5 @@
 import 'mdn-polyfills/dist/Array.find';
+require('es6-promise').polyfill();
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised);