@accordproject/concerto-cto 4.2.0 → 5.0.0-beta.2

package/dist/parser.js

@@ -762,18 +762,18 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f69 = function (d, regex, length) {
+    var peg$f69 = function (d, validators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.StringScalar",
         };
-        if (d) {
+        if (d !== null) {
             result.defaultValue = d;
         }
-        if (regex) {
-            result.validator = regex;
+        if (validators.regex) {
+            result.validator = validators.regex;
         }
-        if (length) {
-            result.lengthValidator = length;
+        if (validators.length) {
+            result.lengthValidator = validators.length;
         }
         return result;
     };
@@ -781,7 +781,7 @@ function peg$parse(input, options) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DateTimeScalar",
         };
-        if (d) {
+        if (d !== null) {
             result.defaultValue = d;
         }
         return result;
@@ -830,7 +830,7 @@ function peg$parse(input, options) {
             isOptional: buildBoolean(optional),
             ...buildRange(location())
         };
-        if (d) {
+        if (d !== null) {
             result.defaultValue = d;
         }
         if (decorators.length > 0) {
@@ -868,7 +868,7 @@ function peg$parse(input, options) {
             isOptional: buildBoolean(optional),
             ...buildRange(location())
         };
-        if (d) {
+        if (d !== null) {
             result.defaultValue = d;
         }
         if (decorators.length > 0) {
@@ -879,7 +879,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f81 = function (decorators, array, id, d, regex, length, size, optional) {
+    var peg$f81 = function (decorators, array, id, d, validators, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.StringProperty",
             name: id.name,
@@ -887,20 +887,20 @@ function peg$parse(input, options) {
             isOptional: buildBoolean(optional),
             ...buildRange(location())
         };
-        if (d) {
+        if (d !== null) {
             result.defaultValue = d;
         }
         if (decorators.length > 0) {
             result.decorators = decorators;
         }
-        if (regex) {
-            result.validator = regex;
+        if (validators.regex) {
+            result.validator = validators.regex;
         }
-        if (length) {
-            result.lengthValidator = length;
+        if (validators.length) {
+            result.lengthValidator = validators.length;
         }
-        if (size) {
-            result.sizeValidator = size;
+        if (validators.size) {
+            result.sizeValidator = validators.size;
         }
         return result;
     };
@@ -967,7 +967,43 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f88 = function (decorators, propertyType, array, id, d, range, size, optional) {
+    var peg$f88 = function (v) { return v; };
+    var peg$f89 = function (items) {
+        return bucketValidators(items, {
+            [`${metamodelNamespace}.StringRegexValidator`]: 'regex',
+            [`${metamodelNamespace}.StringLengthValidator`]: 'length',
+        });
+    };
+    var peg$f90 = function (v) { return v; };
+    var peg$f91 = function (items) {
+        return bucketValidators(items, {
+            [`${metamodelNamespace}.StringRegexValidator`]: 'regex',
+            [`${metamodelNamespace}.StringLengthValidator`]: 'length',
+            [`${metamodelNamespace}.CollectionSizeValidator`]: 'size',
+        });
+    };
+    var peg$f92 = function (v) { return v; };
+    var peg$f93 = function (items) {
+        return bucketValidators(items, {
+            [`${metamodelNamespace}.DoubleDomainValidator`]: 'range',
+            [`${metamodelNamespace}.CollectionSizeValidator`]: 'size',
+        });
+    };
+    var peg$f94 = function (v) { return v; };
+    var peg$f95 = function (items) {
+        return bucketValidators(items, {
+            [`${metamodelNamespace}.IntegerDomainValidator`]: 'range',
+            [`${metamodelNamespace}.CollectionSizeValidator`]: 'size',
+        });
+    };
+    var peg$f96 = function (v) { return v; };
+    var peg$f97 = function (items) {
+        return bucketValidators(items, {
+            [`${metamodelNamespace}.LongDomainValidator`]: 'range',
+            [`${metamodelNamespace}.CollectionSizeValidator`]: 'size',
+        });
+    };
+    var peg$f98 = function (decorators, propertyType, array, id, d, validators, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DoubleProperty",
             name: id.name,
@@ -981,15 +1017,15 @@ function peg$parse(input, options) {
         if (decorators.length > 0) {
             result.decorators = decorators;
         }
-        if (range) {
-            result.validator = range;
+        if (validators.range) {
+            result.validator = validators.range;
         }
-        if (size) {
-            result.sizeValidator = size;
+        if (validators.size) {
+            result.sizeValidator = validators.size;
         }
         return result;
     };
-    var peg$f89 = function (decorators, propertyType, array, id, d, range, size, optional) {
+    var peg$f99 = function (decorators, propertyType, array, id, d, validators, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.IntegerProperty",
             name: id.name,
@@ -1003,15 +1039,15 @@ function peg$parse(input, options) {
         if (decorators.length > 0) {
             result.decorators = decorators;
         }
-        if (range) {
-            result.validator = range;
+        if (validators.range) {
+            result.validator = validators.range;
         }
-        if (size) {
-            result.sizeValidator = size;
+        if (validators.size) {
+            result.sizeValidator = validators.size;
         }
         return result;
     };
-    var peg$f90 = function (decorators, propertyType, array, id, d, range, size, optional) {
+    var peg$f100 = function (decorators, propertyType, array, id, d, validators, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.LongProperty",
             name: id.name,
@@ -1025,15 +1061,15 @@ function peg$parse(input, options) {
         if (decorators.length > 0) {
             result.decorators = decorators;
         }
-        if (range) {
-            result.validator = range;
+        if (validators.range) {
+            result.validator = validators.range;
         }
-        if (size) {
-            result.sizeValidator = size;
+        if (validators.size) {
+            result.sizeValidator = validators.size;
         }
         return result;
     };
-    var peg$f91 = function (decorators, id, body) {
+    var peg$f101 = function (decorators, id, body) {
         const result = {
             $class: "concerto.metamodel@1.0.0.MapDeclaration",
             name: id.name,
@@ -1046,13 +1082,13 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f92 = function (key, value) {
+    var peg$f102 = function (key, value) {
         return {
             type: "MapDeclarationBody",
             declarations: optionalList([key, value])
         };
     };
-    var peg$f93 = function (decorators) {
+    var peg$f103 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.StringMapKeyType",
             ...buildRange(location())
@@ -1062,7 +1098,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f94 = function (decorators) {
+    var peg$f104 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DateTimeMapKeyType",
             ...buildRange(location())
@@ -1072,7 +1108,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f95 = function (decorators, propertyType) {
+    var peg$f105 = function (decorators, propertyType) {
         const result = {
             $class: "concerto.metamodel@1.0.0.ObjectMapKeyType",
             type: propertyType,
@@ -1083,7 +1119,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f96 = function (decorators) {
+    var peg$f106 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.BooleanMapValueType",
             ...buildRange(location())
@@ -1093,7 +1129,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f97 = function (decorators) {
+    var peg$f107 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DateTimeMapValueType",
             ...buildRange(location())
@@ -1103,7 +1139,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f98 = function (decorators) {
+    var peg$f108 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.StringMapValueType",
             ...buildRange(location())
@@ -1113,7 +1149,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f99 = function (decorators) {
+    var peg$f109 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.IntegerMapValueType",
             ...buildRange(location())
@@ -1123,7 +1159,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f100 = function (decorators) {
+    var peg$f110 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.LongMapValueType",
             ...buildRange(location())
@@ -1133,7 +1169,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f101 = function (decorators) {
+    var peg$f111 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DoubleMapValueType",
             ...buildRange(location())
@@ -1143,7 +1179,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f102 = function (decorators, symbol, propertyType) {
+    var peg$f112 = function (decorators, symbol, propertyType) {
         const result = {
             $class: "concerto.metamodel@1.0.0.ObjectMapValueType",
             type: propertyType,
@@ -1157,7 +1193,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f103 = function (decorators, id, body) {
+    var peg$f113 = function (decorators, id, body) {
         const result = {
             $class: "concerto.metamodel@1.0.0.EnumDeclaration",
             name: id.name,
@@ -1169,13 +1205,13 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f104 = function (decls) {
+    var peg$f114 = function (decls) {
         return {
             type: "EnumDeclarationBody",
             declarations: optionalList(decls)
         };
     };
-    var peg$f105 = function (decorators, id) {
+    var peg$f115 = function (decorators, id) {
         const result = {
             $class: "concerto.metamodel@1.0.0.EnumProperty",
             name: id.name,
@@ -1186,7 +1222,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f106 = function (decorators, propertyType, array, id, size, optional) {
+    var peg$f116 = function (decorators, propertyType, array, id, size, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.RelationshipProperty",
             name: id.name,
@@ -1203,22 +1239,22 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f107 = function (first, rest) {
+    var peg$f117 = function (first, rest) {
         return first.concat(JSON.stringify(rest).replace(/['"]+/g, ''));
     };
-    var peg$f108 = function (ns, version, name) {
+    var peg$f118 = function (ns, version, name) {
         return `${ns}@${version}${name}`;
     };
-    var peg$f109 = function (ns, version) {
+    var peg$f119 = function (ns, version) {
         return `${ns}@${version}`;
     };
-    var peg$f110 = function (ns) {
+    var peg$f120 = function (ns) {
         return ns;
     };
-    var peg$f111 = function (u) {
+    var peg$f121 = function (u) {
         return u;
     };
-    var peg$f112 = function (ns, u) {
+    var peg$f122 = function (ns, u) {
         const { namespace, name } = fullyQualifiedName(ns);
         const result = {
             $class: `${metamodelNamespace}.ImportType`,
@@ -1228,7 +1264,7 @@ function peg$parse(input, options) {
         u && (result.uri = u);
         return result;
     };
-    var peg$f113 = function (ns, types, u) {
+    var peg$f123 = function (ns, types, u) {
         const { aliasedTypes, typesNames } = types.reduce((acc, type) => {
             if (type.$class === "concerto.metamodel@1.0.0.AliasedType") {
                 acc.aliasedTypes.push(type);
@@ -1248,7 +1284,7 @@ function peg$parse(input, options) {
         u && (result.uri = u);
         return result;
     };
-    var peg$f114 = function (name, aliasedName) {
+    var peg$f124 = function (name, aliasedName) {
         if (isPrimitiveType(aliasedName)) {
             throw new Error(`A type cannot be aliased to a Primitive type, here "${name}" is being aliased as "${aliasedName}".`);
         }
@@ -1258,13 +1294,13 @@ function peg$parse(input, options) {
             aliasedName
         };
     };
-    var peg$f115 = function (head, tail) {
+    var peg$f125 = function (head, tail) {
         return [head, ...tail.map(t => t[2])];
     };
-    var peg$f116 = function (version) {
+    var peg$f126 = function (version) {
         return version.value;
     };
-    var peg$f117 = function (version, decorators, ns, imports, body) {
+    var peg$f127 = function (version, decorators, ns, imports, body) {
         const result = {
             $class: "concerto.metamodel@1.0.0.Model",
             decorators: optionalList(decorators),
@@ -1277,10 +1313,10 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f118 = function (first, rest) {
+    var peg$f128 = function (first, rest) {
         return buildList(first, rest, 1);
     };
-    var peg$f119 = function (first, rest) {
+    var peg$f129 = function (first, rest) {
         return buildList(first, rest, 1);
     };
     var peg$currPos = 0;
@@ -9669,7 +9705,7 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseStringScalar() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8;
+        var s0, s1, s2, s3, s4, s5;
         s0 = peg$currPos;
         s1 = peg$parseStringType();
         if (s1 !== peg$FAILED) {
@@ -9678,19 +9714,10 @@ function peg$parse(input, options) {
             if (s3 === peg$FAILED) {
                 s3 = null;
             }
-            s4 = peg$parse__();
-            s5 = peg$parseStringRegexValidator();
-            if (s5 === peg$FAILED) {
-                s5 = null;
-            }
-            s6 = peg$parse__();
-            s7 = peg$parseStringLengthValidator();
-            if (s7 === peg$FAILED) {
-                s7 = null;
-            }
-            s8 = peg$parse__();
+            s4 = peg$parseStringScalarValidators();
+            s5 = peg$parse__();
             peg$savedPos = s0;
-            s0 = peg$f69(s3, s5, s7);
+            s0 = peg$f69(s3, s4);
         }
         else {
             peg$currPos = s0;
@@ -10275,7 +10302,7 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseStringFieldDeclaration() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18, s19, s20;
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
         s0 = peg$currPos;
         s1 = peg$parseDecorators();
         s2 = peg$parse__();
@@ -10315,29 +10342,15 @@ function peg$parse(input, options) {
                     if (s11 === peg$FAILED) {
                         s11 = null;
                     }
-                    s12 = peg$parse__();
-                    s13 = peg$parseStringRegexValidator();
-                    if (s13 === peg$FAILED) {
-                        s13 = null;
+                    s12 = peg$parseStringFieldValidators();
+                    s13 = peg$parse__();
+                    s14 = peg$parseOptional();
+                    if (s14 === peg$FAILED) {
+                        s14 = null;
                     }
-                    s14 = peg$parse__();
-                    s15 = peg$parseStringLengthValidator();
-                    if (s15 === peg$FAILED) {
-                        s15 = null;
-                    }
-                    s16 = peg$parse__();
-                    s17 = peg$parseCollectionSizeValidator();
-                    if (s17 === peg$FAILED) {
-                        s17 = null;
-                    }
-                    s18 = peg$parse__();
-                    s19 = peg$parseOptional();
-                    if (s19 === peg$FAILED) {
-                        s19 = null;
-                    }
-                    s20 = peg$parse__();
+                    s15 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f81(s1, s7, s9, s11, s13, s15, s17, s19);
+                    s0 = peg$f81(s1, s7, s9, s11, s12, s14);
                 }
                 else {
                     peg$currPos = s0;
@@ -10928,8 +10941,214 @@ function peg$parse(input, options) {
         }
         return s0;
     }
+    function peg$parseStringScalarValidators() {
+        var s0, s1, s2, s3, s4;
+        s0 = peg$currPos;
+        s1 = [];
+        s2 = peg$currPos;
+        s3 = peg$parse__();
+        s4 = peg$parseStringRegexValidator();
+        if (s4 === peg$FAILED) {
+            s4 = peg$parseStringLengthValidator();
+        }
+        if (s4 !== peg$FAILED) {
+            peg$savedPos = s2;
+            s2 = peg$f88(s4);
+        }
+        else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+        }
+        while (s2 !== peg$FAILED) {
+            s1.push(s2);
+            s2 = peg$currPos;
+            s3 = peg$parse__();
+            s4 = peg$parseStringRegexValidator();
+            if (s4 === peg$FAILED) {
+                s4 = peg$parseStringLengthValidator();
+            }
+            if (s4 !== peg$FAILED) {
+                peg$savedPos = s2;
+                s2 = peg$f88(s4);
+            }
+            else {
+                peg$currPos = s2;
+                s2 = peg$FAILED;
+            }
+        }
+        peg$savedPos = s0;
+        s1 = peg$f89(s1);
+        s0 = s1;
+        return s0;
+    }
+    function peg$parseStringFieldValidators() {
+        var s0, s1, s2, s3, s4;
+        s0 = peg$currPos;
+        s1 = [];
+        s2 = peg$currPos;
+        s3 = peg$parse__();
+        s4 = peg$parseStringRegexValidator();
+        if (s4 === peg$FAILED) {
+            s4 = peg$parseStringLengthValidator();
+            if (s4 === peg$FAILED) {
+                s4 = peg$parseCollectionSizeValidator();
+            }
+        }
+        if (s4 !== peg$FAILED) {
+            peg$savedPos = s2;
+            s2 = peg$f90(s4);
+        }
+        else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+        }
+        while (s2 !== peg$FAILED) {
+            s1.push(s2);
+            s2 = peg$currPos;
+            s3 = peg$parse__();
+            s4 = peg$parseStringRegexValidator();
+            if (s4 === peg$FAILED) {
+                s4 = peg$parseStringLengthValidator();
+                if (s4 === peg$FAILED) {
+                    s4 = peg$parseCollectionSizeValidator();
+                }
+            }
+            if (s4 !== peg$FAILED) {
+                peg$savedPos = s2;
+                s2 = peg$f90(s4);
+            }
+            else {
+                peg$currPos = s2;
+                s2 = peg$FAILED;
+            }
+        }
+        peg$savedPos = s0;
+        s1 = peg$f91(s1);
+        s0 = s1;
+        return s0;
+    }
+    function peg$parseRealFieldValidators() {
+        var s0, s1, s2, s3, s4;
+        s0 = peg$currPos;
+        s1 = [];
+        s2 = peg$currPos;
+        s3 = peg$parse__();
+        s4 = peg$parseRealDomainValidator();
+        if (s4 === peg$FAILED) {
+            s4 = peg$parseCollectionSizeValidator();
+        }
+        if (s4 !== peg$FAILED) {
+            peg$savedPos = s2;
+            s2 = peg$f92(s4);
+        }
+        else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+        }
+        while (s2 !== peg$FAILED) {
+            s1.push(s2);
+            s2 = peg$currPos;
+            s3 = peg$parse__();
+            s4 = peg$parseRealDomainValidator();
+            if (s4 === peg$FAILED) {
+                s4 = peg$parseCollectionSizeValidator();
+            }
+            if (s4 !== peg$FAILED) {
+                peg$savedPos = s2;
+                s2 = peg$f92(s4);
+            }
+            else {
+                peg$currPos = s2;
+                s2 = peg$FAILED;
+            }
+        }
+        peg$savedPos = s0;
+        s1 = peg$f93(s1);
+        s0 = s1;
+        return s0;
+    }
+    function peg$parseIntegerFieldValidators() {
+        var s0, s1, s2, s3, s4;
+        s0 = peg$currPos;
+        s1 = [];
+        s2 = peg$currPos;
+        s3 = peg$parse__();
+        s4 = peg$parseIntegerDomainValidator();
+        if (s4 === peg$FAILED) {
+            s4 = peg$parseCollectionSizeValidator();
+        }
+        if (s4 !== peg$FAILED) {
+            peg$savedPos = s2;
+            s2 = peg$f94(s4);
+        }
+        else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+        }
+        while (s2 !== peg$FAILED) {
+            s1.push(s2);
+            s2 = peg$currPos;
+            s3 = peg$parse__();
+            s4 = peg$parseIntegerDomainValidator();
+            if (s4 === peg$FAILED) {
+                s4 = peg$parseCollectionSizeValidator();
+            }
+            if (s4 !== peg$FAILED) {
+                peg$savedPos = s2;
+                s2 = peg$f94(s4);
+            }
+            else {
+                peg$currPos = s2;
+                s2 = peg$FAILED;
+            }
+        }
+        peg$savedPos = s0;
+        s1 = peg$f95(s1);
+        s0 = s1;
+        return s0;
+    }
+    function peg$parseLongFieldValidators() {
+        var s0, s1, s2, s3, s4;
+        s0 = peg$currPos;
+        s1 = [];
+        s2 = peg$currPos;
+        s3 = peg$parse__();
+        s4 = peg$parseLongDomainValidator();
+        if (s4 === peg$FAILED) {
+            s4 = peg$parseCollectionSizeValidator();
+        }
+        if (s4 !== peg$FAILED) {
+            peg$savedPos = s2;
+            s2 = peg$f96(s4);
+        }
+        else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+        }
+        while (s2 !== peg$FAILED) {
+            s1.push(s2);
+            s2 = peg$currPos;
+            s3 = peg$parse__();
+            s4 = peg$parseLongDomainValidator();
+            if (s4 === peg$FAILED) {
+                s4 = peg$parseCollectionSizeValidator();
+            }
+            if (s4 !== peg$FAILED) {
+                peg$savedPos = s2;
+                s2 = peg$f96(s4);
+            }
+            else {
+                peg$currPos = s2;
+                s2 = peg$FAILED;
+            }
+        }
+        peg$savedPos = s0;
+        s1 = peg$f97(s1);
+        s0 = s1;
+        return s0;
+    }
     function peg$parseRealFieldDeclaration() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18;
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
         s0 = peg$currPos;
         s1 = peg$parseDecorators();
         s2 = peg$parse__();
@@ -10969,24 +11188,15 @@ function peg$parse(input, options) {
                     if (s11 === peg$FAILED) {
                         s11 = null;
                     }
-                    s12 = peg$parse__();
-                    s13 = peg$parseRealDomainValidator();
-                    if (s13 === peg$FAILED) {
-                        s13 = null;
+                    s12 = peg$parseRealFieldValidators();
+                    s13 = peg$parse__();
+                    s14 = peg$parseOptional();
+                    if (s14 === peg$FAILED) {
+                        s14 = null;
                     }
-                    s14 = peg$parse__();
-                    s15 = peg$parseCollectionSizeValidator();
-                    if (s15 === peg$FAILED) {
-                        s15 = null;
-                    }
-                    s16 = peg$parse__();
-                    s17 = peg$parseOptional();
-                    if (s17 === peg$FAILED) {
-                        s17 = null;
-                    }
-                    s18 = peg$parse__();
+                    s15 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f88(s1, s5, s7, s9, s11, s13, s15, s17);
+                    s0 = peg$f98(s1, s5, s7, s9, s11, s12, s14);
                 }
                 else {
                     peg$currPos = s0;
@@ -11005,7 +11215,7 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseIntegerFieldDeclaration() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18;
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
         s0 = peg$currPos;
         s1 = peg$parseDecorators();
         s2 = peg$parse__();
@@ -11045,24 +11255,15 @@ function peg$parse(input, options) {
                     if (s11 === peg$FAILED) {
                         s11 = null;
                     }
-                    s12 = peg$parse__();
-                    s13 = peg$parseIntegerDomainValidator();
-                    if (s13 === peg$FAILED) {
-                        s13 = null;
-                    }
-                    s14 = peg$parse__();
-                    s15 = peg$parseCollectionSizeValidator();
-                    if (s15 === peg$FAILED) {
-                        s15 = null;
+                    s12 = peg$parseIntegerFieldValidators();
+                    s13 = peg$parse__();
+                    s14 = peg$parseOptional();
+                    if (s14 === peg$FAILED) {
+                        s14 = null;
                     }
-                    s16 = peg$parse__();
-                    s17 = peg$parseOptional();
-                    if (s17 === peg$FAILED) {
-                        s17 = null;
-                    }
-                    s18 = peg$parse__();
+                    s15 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f89(s1, s5, s7, s9, s11, s13, s15, s17);
+                    s0 = peg$f99(s1, s5, s7, s9, s11, s12, s14);
                 }
                 else {
                     peg$currPos = s0;
@@ -11081,7 +11282,7 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseLongFieldDeclaration() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18;
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
         s0 = peg$currPos;
         s1 = peg$parseDecorators();
         s2 = peg$parse__();
@@ -11121,24 +11322,15 @@ function peg$parse(input, options) {
                     if (s11 === peg$FAILED) {
                         s11 = null;
                     }
-                    s12 = peg$parse__();
-                    s13 = peg$parseLongDomainValidator();
-                    if (s13 === peg$FAILED) {
-                        s13 = null;
-                    }
-                    s14 = peg$parse__();
-                    s15 = peg$parseCollectionSizeValidator();
-                    if (s15 === peg$FAILED) {
-                        s15 = null;
-                    }
-                    s16 = peg$parse__();
-                    s17 = peg$parseOptional();
-                    if (s17 === peg$FAILED) {
-                        s17 = null;
+                    s12 = peg$parseLongFieldValidators();
+                    s13 = peg$parse__();
+                    s14 = peg$parseOptional();
+                    if (s14 === peg$FAILED) {
+                        s14 = null;
                     }
-                    s18 = peg$parse__();
+                    s15 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f90(s1, s5, s7, s9, s11, s13, s15, s17);
+                    s0 = peg$f100(s1, s5, s7, s9, s11, s12, s14);
                 }
                 else {
                     peg$currPos = s0;
@@ -11194,7 +11386,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f91(s1, s5, s9);
+                            s0 = peg$f101(s1, s5, s9);
                         }
                         else {
                             peg$currPos = s0;
@@ -11231,7 +11423,7 @@ function peg$parse(input, options) {
             s3 = peg$parseMapValueType();
             if (s3 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f92(s1, s3);
+                s0 = peg$f102(s1, s3);
             }
             else {
                 peg$currPos = s0;
@@ -11265,7 +11457,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f93(s1);
+                s0 = peg$f103(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11299,7 +11491,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f94(s1);
+                s0 = peg$f104(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11333,7 +11525,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f95(s1, s5);
+                s0 = peg$f105(s1, s5);
             }
             else {
                 peg$currPos = s0;
@@ -11378,7 +11570,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f96(s1);
+                s0 = peg$f106(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11412,7 +11604,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f97(s1);
+                s0 = peg$f107(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11446,7 +11638,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f98(s1);
+                s0 = peg$f108(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11480,7 +11672,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f99(s1);
+                s0 = peg$f109(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11514,7 +11706,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f100(s1);
+                s0 = peg$f110(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11548,7 +11740,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f101(s1);
+                s0 = peg$f111(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11594,7 +11786,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f102(s1, s3, s5);
+                s0 = peg$f112(s1, s3, s5);
             }
             else {
                 peg$currPos = s0;
@@ -11667,7 +11859,7 @@ function peg$parse(input, options) {
                     }
                     if (s11 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f103(s1, s5, s9);
+                        s0 = peg$f113(s1, s5, s9);
                     }
                     else {
                         peg$currPos = s0;
@@ -11700,7 +11892,7 @@ function peg$parse(input, options) {
             s2 = peg$parseEnumPropertyDeclaration();
         }
         peg$savedPos = s0;
-        s1 = peg$f104(s1);
+        s1 = peg$f114(s1);
         s0 = s1;
         return s0;
     }
@@ -11725,7 +11917,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f105(s1, s5);
+                s0 = peg$f115(s1, s5);
             }
             else {
                 peg$currPos = s0;
@@ -11786,7 +11978,7 @@ function peg$parse(input, options) {
                     }
                     s14 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f106(s1, s5, s7, s9, s11, s13);
+                    s0 = peg$f116(s1, s5, s7, s9, s11, s13);
                 }
                 else {
                     peg$currPos = s0;
@@ -11875,7 +12067,7 @@ function peg$parse(input, options) {
             }
             s2 = input.substring(s2, peg$currPos);
             peg$savedPos = s0;
-            s0 = peg$f107(s1, s2);
+            s0 = peg$f117(s1, s2);
         }
         else {
             peg$currPos = s0;
@@ -11918,7 +12110,7 @@ function peg$parse(input, options) {
                     }
                     if (s4 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f108(s1, s3, s4);
+                        s0 = peg$f118(s1, s3, s4);
                     }
                     else {
                         peg$currPos = s0;
@@ -11967,7 +12159,7 @@ function peg$parse(input, options) {
                 }
                 if (s3 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f109(s1, s3);
+                    s0 = peg$f119(s1, s3);
                 }
                 else {
                     peg$currPos = s0;
@@ -12011,7 +12203,7 @@ function peg$parse(input, options) {
             if (s3 !== peg$FAILED) {
                 s4 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f110(s3);
+                s0 = peg$f120(s3);
             }
             else {
                 peg$currPos = s0;
@@ -12041,7 +12233,7 @@ function peg$parse(input, options) {
             if (s3 !== peg$FAILED) {
                 s4 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f111(s3);
+                s0 = peg$f121(s3);
             }
             else {
                 peg$currPos = s0;
@@ -12068,7 +12260,7 @@ function peg$parse(input, options) {
                     s5 = null;
                 }
                 peg$savedPos = s0;
-                s0 = peg$f112(s3, s5);
+                s0 = peg$f122(s3, s5);
             }
             else {
                 peg$currPos = s0;
@@ -12121,7 +12313,7 @@ function peg$parse(input, options) {
                                 s10 = null;
                             }
                             peg$savedPos = s0;
-                            s0 = peg$f113(s3, s6, s10);
+                            s0 = peg$f123(s3, s6, s10);
                         }
                         else {
                             peg$currPos = s0;
@@ -12182,7 +12374,7 @@ function peg$parse(input, options) {
                 }
                 if (s5 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f114(s1, s5);
+                    s0 = peg$f124(s1, s5);
                 }
                 else {
                     peg$currPos = s0;
@@ -12280,7 +12472,7 @@ function peg$parse(input, options) {
                 }
             }
             peg$savedPos = s0;
-            s0 = peg$f115(s1, s3);
+            s0 = peg$f125(s1, s3);
         }
         else {
             peg$currPos = s0;
@@ -12309,7 +12501,7 @@ function peg$parse(input, options) {
                 if (s5 !== peg$FAILED) {
                     s6 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f116(s5);
+                    s0 = peg$f126(s5);
                 }
                 else {
                     peg$currPos = s0;
@@ -12346,7 +12538,7 @@ function peg$parse(input, options) {
                 s5 = null;
             }
             peg$savedPos = s0;
-            s0 = peg$f117(s1, s2, s3, s4, s5);
+            s0 = peg$f127(s1, s2, s3, s4, s5);
         }
         else {
             peg$currPos = s0;
@@ -12386,7 +12578,7 @@ function peg$parse(input, options) {
                 }
             }
             peg$savedPos = s0;
-            s0 = peg$f118(s1, s2);
+            s0 = peg$f128(s1, s2);
         }
         else {
             peg$currPos = s0;
@@ -12426,7 +12618,7 @@ function peg$parse(input, options) {
                 }
             }
             peg$savedPos = s0;
-            s0 = peg$f119(s1, s2);
+            s0 = peg$f129(s1, s2);
         }
         else {
             peg$currPos = s0;
@@ -12535,6 +12727,17 @@ function peg$parse(input, options) {
         const primitiveTypes = ['Boolean', 'String', 'DateTime', 'Double', 'Integer', 'Long'];
         return (primitiveTypes.indexOf(typeName) >= 0);
     }
+    function bucketValidators(items, kindByClass) {
+        const result = {};
+        for (const v of items) {
+            const kind = kindByClass[v.$class];
+            if (result[kind]) {
+                error(`Duplicate ${kind} validator`);
+            }
+            result[kind] = v;
+        }
+        return result;
+    }
     peg$result = peg$startRuleFunction();
     if (peg$result !== peg$FAILED && peg$currPos === input.length) {
         return peg$result;