Renamed propertyName to virtualPropertyName for composite rules

dist/amd/builders/ruleset-builder.js

@@ -42,17 +42,17 @@ define(["require", "exports", "../rulesets/ruleset", "../rulesets/rule-link", ".
                 return _this;
             };
             this.addCompositeRule = function (compositeRule) {
-                _this.internalRuleset.compositeRules[compositeRule.propertyName] = compositeRule;
+                _this.internalRuleset.compositeRules[compositeRule.virtualPropertyName] = compositeRule;
                 return _this;
             };
             this.withDisplayName = function (displayName) {
                 _this.verifyExistingProperty();
                 _this.internalRuleset.propertyDisplayNames[_this.currentProperty] = displayName;
                 return _this;
             };
-            this.addDynamicRule = function (propertyName, validate, getMessage) {
-                var compositeRule = new dynamic_composite_validation_rule_1.DynamicCompositeValidationRule(propertyName, validate, getMessage);
-                _this.internalRuleset.compositeRules[propertyName] = compositeRule;
+            this.addDynamicRule = function (virtualPropertyName, validate, getMessage) {
+                var compositeRule = new dynamic_composite_validation_rule_1.DynamicCompositeValidationRule(virtualPropertyName, validate, getMessage);
+                _this.internalRuleset.compositeRules[virtualPropertyName] = compositeRule;
                 return _this;
             };
             this.withMessage = function (messageOverride) {

dist/amd/index.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "./exposer", "./rule-registry-setup", "./builders/reactive-validation-group-builder", "./builders/ruleset-builder", "./builders/validation-group-builder", "./events/model-state-changed-event", "./events/property-changed-event", "./events/property-state-changed-event", "./factories/model-resolver-factory", "./factories/model-watcher-factory", "./helpers/comparer-helper", "./helpers/type-helper", "./processors/field-error-processor", "./processors/field-has-error", "./processors/validation-error", "./promises/promise-counter", "./resolvers/model-resolver", "./rulesets/for-each-rule", "./rulesets/rule-link", "./rulesets/rule-resolver", "./rulesets/ruleset", "./rules/advanced-regex-rule", "./rules/date-validation-rule", "./rules/decimal-validation-rule", "./rules/email-validation-rule", "./rules/equal-validation-rule", "./rules/iso-date-validation-rule", "./rules/matches-validation-rule", "./rules/max-length-validation-rule", "./rules/max-value-validation-rule", "./rules/min-length-validation-rule", "./rules/min-value-validation-rule", "./rules/not-equal-validation-rule", "./rules/number-validation-rule", "./rules/regex-validation-rule", "./rules/required-validation-rule", "./rules/rule-registry", "./rules/step-validation-rule", "./watcher/model-watcher", "./watcher/property-watcher", "./validation-groups/reactive-validation-group", "./validation-groups/validation-group", "./rules/composite/dynamic-composite-validation-rule"], function (require, exports, exposer_1, rule_registry_setup_1, reactive_validation_group_builder_1, ruleset_builder_1, validation_group_builder_1, model_state_changed_event_1, property_changed_event_1, property_state_changed_event_1, model_resolver_factory_1, model_watcher_factory_1, comparer_helper_1, type_helper_1, field_error_processor_1, field_has_error_1, validation_error_1, promise_counter_1, model_resolver_1, for_each_rule_1, rule_link_1, rule_resolver_1, ruleset_1, advanced_regex_rule_1, date_validation_rule_1, decimal_validation_rule_1, email_validation_rule_1, equal_validation_rule_1, iso_date_validation_rule_1, matches_validation_rule_1, max_length_validation_rule_1, max_value_validation_rule_1, min_length_validation_rule_1, min_value_validation_rule_1, not_equal_validation_rule_1, number_validation_rule_1, regex_validation_rule_1, required_validation_rule_1, rule_registry_1, step_validation_rule_1, model_watcher_1, property_watcher_1, reactive_validation_group_1, validation_group_1, dynamic_composite_validation_rule_1) {
+define(["require", "exports", "./exposer", "./rule-registry-setup", "./builders/reactive-validation-group-builder", "./builders/ruleset-builder", "./builders/validation-group-builder", "./events/model-state-changed-event", "./events/property-changed-event", "./events/property-state-changed-event", "./factories/model-resolver-factory", "./factories/model-watcher-factory", "./helpers/comparer-helper", "./helpers/type-helper", "./processors/field-error-processor", "./processors/field-has-error", "./processors/validation-error", "./promises/promise-counter", "./resolvers/model-resolver", "./rules/advanced-regex-rule", "./rules/date-validation-rule", "./rules/decimal-validation-rule", "./rules/email-validation-rule", "./rules/equal-validation-rule", "./rules/iso-date-validation-rule", "./rules/matches-validation-rule", "./rules/max-length-validation-rule", "./rules/max-value-validation-rule", "./rules/min-length-validation-rule", "./rules/min-value-validation-rule", "./rules/not-equal-validation-rule", "./rules/number-validation-rule", "./rules/regex-validation-rule", "./rules/required-validation-rule", "./rules/rule-registry", "./rules/step-validation-rule", "./rulesets/for-each-rule", "./rulesets/rule-link", "./rulesets/rule-resolver", "./rulesets/ruleset", "./validation-groups/reactive-validation-group", "./validation-groups/validation-group", "./watcher/model-watcher", "./watcher/property-watcher", "./rules/composite/dynamic-composite-validation-rule"], function (require, exports, exposer_1, rule_registry_setup_1, reactive_validation_group_builder_1, ruleset_builder_1, validation_group_builder_1, model_state_changed_event_1, property_changed_event_1, property_state_changed_event_1, model_resolver_factory_1, model_watcher_factory_1, comparer_helper_1, type_helper_1, field_error_processor_1, field_has_error_1, validation_error_1, promise_counter_1, model_resolver_1, advanced_regex_rule_1, date_validation_rule_1, decimal_validation_rule_1, email_validation_rule_1, equal_validation_rule_1, iso_date_validation_rule_1, matches_validation_rule_1, max_length_validation_rule_1, max_value_validation_rule_1, min_length_validation_rule_1, min_value_validation_rule_1, not_equal_validation_rule_1, number_validation_rule_1, regex_validation_rule_1, required_validation_rule_1, rule_registry_1, step_validation_rule_1, for_each_rule_1, rule_link_1, rule_resolver_1, ruleset_1, reactive_validation_group_1, validation_group_1, model_watcher_1, property_watcher_1, dynamic_composite_validation_rule_1) {
     "use strict";
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
@@ -21,10 +21,6 @@ define(["require", "exports", "./exposer", "./rule-registry-setup", "./builders/
     __export(validation_error_1);
     __export(promise_counter_1);
     __export(model_resolver_1);
-    __export(for_each_rule_1);
-    __export(rule_link_1);
-    __export(rule_resolver_1);
-    __export(ruleset_1);
     __export(advanced_regex_rule_1);
     __export(date_validation_rule_1);
     __export(decimal_validation_rule_1);
@@ -42,9 +38,13 @@ define(["require", "exports", "./exposer", "./rule-registry-setup", "./builders/
     __export(required_validation_rule_1);
     __export(rule_registry_1);
     __export(step_validation_rule_1);
-    __export(model_watcher_1);
-    __export(property_watcher_1);
+    __export(for_each_rule_1);
+    __export(rule_link_1);
+    __export(rule_resolver_1);
+    __export(ruleset_1);
     __export(reactive_validation_group_1);
     __export(validation_group_1);
+    __export(model_watcher_1);
+    __export(property_watcher_1);
     __export(dynamic_composite_validation_rule_1);
 });

dist/amd/rules/composite/dynamic-composite-validation-rule.js

@@ -2,8 +2,8 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var DynamicCompositeValidationRule = (function () {
-        function DynamicCompositeValidationRule(propertyName, validate, message) {
-            this.propertyName = propertyName;
+        function DynamicCompositeValidationRule(virtualPropertyName, validate, message) {
+            this.virtualPropertyName = virtualPropertyName;
             this.validate = validate;
             this.message = message;
         }

dist/amd/rulesets/ruleset.js

@@ -20,7 +20,7 @@ define(["require", "exports"], function (require, exports) {
                 _this.createPropertyEntryIfNeeded(property);
                 _this.rules[property].push(ruleset);
             };
-            this.addCompositeRule = function (compositeRule) { _this.compositeRules[compositeRule.propertyName] = compositeRule; };
+            this.addCompositeRule = function (compositeRule) { _this.compositeRules[compositeRule.virtualPropertyName] = compositeRule; };
             this.addPropertyDisplayName = function (propertyName, displayName) { return _this.propertyDisplayNames[propertyName] = displayName; };
             this.getRulesForProperty = function (property) { return _this.rules[property]; };
             this.getCompositeRulesRulesForProperty = function (propertyName) { return _this.compositeRules[propertyName]; };

dist/amd/validation-groups/validation-group.js

@@ -127,9 +127,9 @@ define(["require", "exports", "tslib", "../rulesets/rule-resolver", "../helpers/
                         case 1:
                             isValid = _a.sent();
                             if (isValid) {
-                                if (this.propertyErrors[compositeRule.propertyName]) {
-                                    delete this.propertyErrors[compositeRule.propertyName];
-                                    eventArgs = new property_state_changed_event_1.PropertyStateChangedEvent(compositeRule.propertyName, true);
+                                if (this.propertyErrors[compositeRule.virtualPropertyName]) {
+                                    delete this.propertyErrors[compositeRule.virtualPropertyName];
+                                    eventArgs = new property_state_changed_event_1.PropertyStateChangedEvent(compositeRule.virtualPropertyName, true);
                                     this.propertyStateChangedEvent.publish(eventArgs);
                                 }
                                 stillHasErrors = hadErrors && this.hasErrors();
@@ -138,17 +138,17 @@ define(["require", "exports", "tslib", "../rulesets/rule-resolver", "../helpers/
                                 }
                                 return [2 /*return*/];
                             }
-                            previousError = this.propertyErrors[compositeRule.propertyName];
+                            previousError = this.propertyErrors[compositeRule.virtualPropertyName];
                             currentError = compositeRule.getMessage(this.modelResolver);
-                            this.propertyErrors[compositeRule.propertyName] = currentError;
+                            this.propertyErrors[compositeRule.virtualPropertyName] = currentError;
                             if (currentError != previousError) {
-                                eventArgs = new property_state_changed_event_1.PropertyStateChangedEvent(compositeRule.propertyName, false, currentError);
+                                eventArgs = new property_state_changed_event_1.PropertyStateChangedEvent(compositeRule.virtualPropertyName, false, currentError);
                                 this.propertyStateChangedEvent.publish(eventArgs);
                                 if (!hadErrors) {
                                     this.modelStateChangedEvent.publish(new model_state_changed_event_1.ModelStateChangedEvent(false));
                                 }
                             }
-                            return [2 /*return*/, this.propertyErrors[compositeRule.propertyName]];
+                            return [2 /*return*/, this.propertyErrors[compositeRule.virtualPropertyName]];
                     }
                 });
             }); };

dist/commonjs/builders/ruleset-builder.js

@@ -46,17 +46,17 @@ var RulesetBuilder = (function () {
             return _this;
         };
         this.addCompositeRule = function (compositeRule) {
-            _this.internalRuleset.compositeRules[compositeRule.propertyName] = compositeRule;
+            _this.internalRuleset.compositeRules[compositeRule.virtualPropertyName] = compositeRule;
             return _this;
         };
         this.withDisplayName = function (displayName) {
             _this.verifyExistingProperty();
             _this.internalRuleset.propertyDisplayNames[_this.currentProperty] = displayName;
             return _this;
         };
-        this.addDynamicRule = function (propertyName, validate, getMessage) {
-            var compositeRule = new dynamic_composite_validation_rule_1.DynamicCompositeValidationRule(propertyName, validate, getMessage);
-            _this.internalRuleset.compositeRules[propertyName] = compositeRule;
+        this.addDynamicRule = function (virtualPropertyName, validate, getMessage) {
+            var compositeRule = new dynamic_composite_validation_rule_1.DynamicCompositeValidationRule(virtualPropertyName, validate, getMessage);
+            _this.internalRuleset.compositeRules[virtualPropertyName] = compositeRule;
             return _this;
         };
         this.withMessage = function (messageOverride) {

dist/commonjs/index.js

@@ -20,10 +20,6 @@ __export(require("./processors/field-has-error"));
 __export(require("./processors/validation-error"));
 __export(require("./promises/promise-counter"));
 __export(require("./resolvers/model-resolver"));
-__export(require("./rulesets/for-each-rule"));
-__export(require("./rulesets/rule-link"));
-__export(require("./rulesets/rule-resolver"));
-__export(require("./rulesets/ruleset"));
 __export(require("./rules/advanced-regex-rule"));
 __export(require("./rules/date-validation-rule"));
 __export(require("./rules/decimal-validation-rule"));
@@ -41,8 +37,12 @@ __export(require("./rules/regex-validation-rule"));
 __export(require("./rules/required-validation-rule"));
 __export(require("./rules/rule-registry"));
 __export(require("./rules/step-validation-rule"));
-__export(require("./watcher/model-watcher"));
-__export(require("./watcher/property-watcher"));
+__export(require("./rulesets/for-each-rule"));
+__export(require("./rulesets/rule-link"));
+__export(require("./rulesets/rule-resolver"));
+__export(require("./rulesets/ruleset"));
 __export(require("./validation-groups/reactive-validation-group"));
 __export(require("./validation-groups/validation-group"));
+__export(require("./watcher/model-watcher"));
+__export(require("./watcher/property-watcher"));
 __export(require("./rules/composite/dynamic-composite-validation-rule"));

dist/commonjs/rules/composite/dynamic-composite-validation-rule.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var DynamicCompositeValidationRule = (function () {
-    function DynamicCompositeValidationRule(propertyName, validate, message) {
-        this.propertyName = propertyName;
+    function DynamicCompositeValidationRule(virtualPropertyName, validate, message) {
+        this.virtualPropertyName = virtualPropertyName;
         this.validate = validate;
         this.message = message;
     }

dist/commonjs/rulesets/ruleset.js

@@ -19,7 +19,7 @@ var Ruleset = (function () {
             _this.createPropertyEntryIfNeeded(property);
             _this.rules[property].push(ruleset);
         };
-        this.addCompositeRule = function (compositeRule) { _this.compositeRules[compositeRule.propertyName] = compositeRule; };
+        this.addCompositeRule = function (compositeRule) { _this.compositeRules[compositeRule.virtualPropertyName] = compositeRule; };
         this.addPropertyDisplayName = function (propertyName, displayName) { return _this.propertyDisplayNames[propertyName] = displayName; };
         this.getRulesForProperty = function (property) { return _this.rules[property]; };
         this.getCompositeRulesRulesForProperty = function (propertyName) { return _this.compositeRules[propertyName]; };

dist/commonjs/validation-groups/validation-group.js

@@ -133,9 +133,9 @@ var ValidationGroup = (function () {
                     case 1:
                         isValid = _a.sent();
                         if (isValid) {
-                            if (this.propertyErrors[compositeRule.propertyName]) {
-                                delete this.propertyErrors[compositeRule.propertyName];
-                                eventArgs = new property_state_changed_event_1.PropertyStateChangedEvent(compositeRule.propertyName, true);
+                            if (this.propertyErrors[compositeRule.virtualPropertyName]) {
+                                delete this.propertyErrors[compositeRule.virtualPropertyName];
+                                eventArgs = new property_state_changed_event_1.PropertyStateChangedEvent(compositeRule.virtualPropertyName, true);
                                 this.propertyStateChangedEvent.publish(eventArgs);
                             }
                             stillHasErrors = hadErrors && this.hasErrors();
@@ -144,17 +144,17 @@ var ValidationGroup = (function () {
                             }
                             return [2 /*return*/];
                         }
-                        previousError = this.propertyErrors[compositeRule.propertyName];
+                        previousError = this.propertyErrors[compositeRule.virtualPropertyName];
                         currentError = compositeRule.getMessage(this.modelResolver);
-                        this.propertyErrors[compositeRule.propertyName] = currentError;
+                        this.propertyErrors[compositeRule.virtualPropertyName] = currentError;
                         if (currentError != previousError) {
-                            eventArgs = new property_state_changed_event_1.PropertyStateChangedEvent(compositeRule.propertyName, false, currentError);
+                            eventArgs = new property_state_changed_event_1.PropertyStateChangedEvent(compositeRule.virtualPropertyName, false, currentError);
                             this.propertyStateChangedEvent.publish(eventArgs);
                             if (!hadErrors) {
                                 this.modelStateChangedEvent.publish(new model_state_changed_event_1.ModelStateChangedEvent(false));
                             }
                         }
-                        return [2 /*return*/, this.propertyErrors[compositeRule.propertyName]];
+                        return [2 /*return*/, this.propertyErrors[compositeRule.virtualPropertyName]];
                 }
             });
         }); };

dist/definitions/builders/ruleset-builder.d.ts

@@ -17,7 +17,7 @@ export declare class RulesetBuilder<T> {
     addRule: (rule: string, ruleOptions?: any) => RulesetBuilder<T>;
     addCompositeRule: (compositeRule: ICompositeValidationRule) => RulesetBuilder<T>;
     withDisplayName: (displayName: string) => RulesetBuilder<T>;
-    addDynamicRule: (propertyName: string, validate: (modelResolver: IModelResolver) => Promise<boolean>, getMessage: string | ((modelResolver: IModelResolver) => string)) => this;
+    addDynamicRule: (virtualPropertyName: string, validate: (modelResolver: IModelResolver) => Promise<boolean>, getMessage: string | ((modelResolver: IModelResolver) => string)) => this;
     withMessage: (messageOverride: string | ((value: any, ruleOptions?: any) => string)) => RulesetBuilder<T>;
     appliesIf: (appliesFunction: boolean | ((modelResolver: IModelResolver, value: any, ruleOptions?: any) => boolean)) => RulesetBuilder<T>;
     addRuleForEach: (rule: string, ruleOptions?: any) => RulesetBuilder<T>;