@accordproject/concerto-cto 4.1.5 → 5.0.0-beta.1

package/dist/parser.js

@@ -243,9 +243,10 @@ function peg$parse(input, options) {
     var peg$c92 = "o";
     var peg$c93 = "regex";
     var peg$c94 = "length";
-    var peg$c95 = "range";
-    var peg$c96 = "-->";
-    var peg$c97 = ".{";
+    var peg$c95 = "size";
+    var peg$c96 = "range";
+    var peg$c97 = "-->";
+    var peg$c98 = ".{";
     var peg$r0 = /^[\n\r\u2028\u2029]/;
     var peg$r1 = /^[+\-]/;
     var peg$r2 = /^[0-9]/;
@@ -412,9 +413,10 @@ function peg$parse(input, options) {
     var peg$e133 = peg$literalExpectation("o", false);
     var peg$e134 = peg$literalExpectation("regex", false);
     var peg$e135 = peg$literalExpectation("length", false);
-    var peg$e136 = peg$literalExpectation("range", false);
-    var peg$e137 = peg$literalExpectation("-->", false);
-    var peg$e138 = peg$literalExpectation(".{", false);
+    var peg$e136 = peg$literalExpectation("size", false);
+    var peg$e137 = peg$literalExpectation("range", false);
+    var peg$e138 = peg$literalExpectation("-->", false);
+    var peg$e139 = peg$literalExpectation(".{", false);
     var peg$f0 = function (program) { return program; };
     var peg$f1 = function (name) { return name; };
     var peg$f2 = function (first, rest) {
@@ -760,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) {
             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;
     };
@@ -819,7 +821,7 @@ function peg$parse(input, options) {
             ...buildRange(location())
         };
     };
-    var peg$f78 = function (decorators, propertyType, array, id, d, optional) {
+    var peg$f78 = function (decorators, propertyType, array, id, d, size, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.ObjectProperty",
             name: id.name,
@@ -834,9 +836,12 @@ function peg$parse(input, options) {
         if (decorators.length > 0) {
             result.decorators = decorators;
         }
+        if (size) {
+            result.sizeValidator = size;
+        }
         return result;
     };
-    var peg$f79 = function (decorators, array, id, d, optional) {
+    var peg$f79 = function (decorators, array, id, d, size, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.BooleanProperty",
             name: id.name,
@@ -850,9 +855,12 @@ function peg$parse(input, options) {
         if (decorators.length > 0) {
             result.decorators = decorators;
         }
+        if (size) {
+            result.sizeValidator = size;
+        }
         return result;
     };
-    var peg$f80 = function (decorators, array, id, d, optional) {
+    var peg$f80 = function (decorators, array, id, d, size, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DateTimeProperty",
             name: id.name,
@@ -866,9 +874,12 @@ function peg$parse(input, options) {
         if (decorators.length > 0) {
             result.decorators = decorators;
         }
+        if (size) {
+            result.sizeValidator = size;
+        }
         return result;
     };
-    var peg$f81 = function (decorators, array, id, d, regex, length, optional) {
+    var peg$f81 = function (decorators, array, id, d, validators, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.StringProperty",
             name: id.name,
@@ -882,11 +893,14 @@ function peg$parse(input, options) {
         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 (validators.size) {
+            result.sizeValidator = validators.size;
         }
         return result;
     };
@@ -905,7 +919,19 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f84 = function (lower, upper) {
+    var peg$f84 = function (minSize, maxSize) {
+        const result = {
+            $class: `${metamodelNamespace}.CollectionSizeValidator`
+        };
+        if (minSize) {
+            result.minSize = parseInt(minSize);
+        }
+        if (maxSize) {
+            result.maxSize = parseInt(maxSize);
+        }
+        return result;
+    };
+    var peg$f85 = function (lower, upper) {
         const result = {
             $class: `${metamodelNamespace}.DoubleDomainValidator`
         };
@@ -917,7 +943,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f85 = function (lower, upper) {
+    var peg$f86 = function (lower, upper) {
         const result = {
             $class: `${metamodelNamespace}.IntegerDomainValidator`
         };
@@ -929,7 +955,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f86 = function (lower, upper) {
+    var peg$f87 = function (lower, upper) {
         const result = {
             $class: `${metamodelNamespace}.LongDomainValidator`
         };
@@ -941,7 +967,43 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f87 = function (decorators, propertyType, array, id, d, range, 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,
@@ -955,12 +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 (validators.size) {
+            result.sizeValidator = validators.size;
         }
         return result;
     };
-    var peg$f88 = function (decorators, propertyType, array, id, d, range, optional) {
+    var peg$f99 = function (decorators, propertyType, array, id, d, validators, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.IntegerProperty",
             name: id.name,
@@ -974,12 +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 (validators.size) {
+            result.sizeValidator = validators.size;
         }
         return result;
     };
-    var peg$f89 = function (decorators, propertyType, array, id, d, range, optional) {
+    var peg$f100 = function (decorators, propertyType, array, id, d, validators, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.LongProperty",
             name: id.name,
@@ -993,12 +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 (validators.size) {
+            result.sizeValidator = validators.size;
         }
         return result;
     };
-    var peg$f90 = function (decorators, id, body) {
+    var peg$f101 = function (decorators, id, body) {
         const result = {
             $class: "concerto.metamodel@1.0.0.MapDeclaration",
             name: id.name,
@@ -1011,13 +1082,13 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f91 = function (key, value) {
+    var peg$f102 = function (key, value) {
         return {
             type: "MapDeclarationBody",
             declarations: optionalList([key, value])
         };
     };
-    var peg$f92 = function (decorators) {
+    var peg$f103 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.StringMapKeyType",
             ...buildRange(location())
@@ -1027,7 +1098,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f93 = function (decorators) {
+    var peg$f104 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DateTimeMapKeyType",
             ...buildRange(location())
@@ -1037,7 +1108,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f94 = function (decorators, propertyType) {
+    var peg$f105 = function (decorators, propertyType) {
         const result = {
             $class: "concerto.metamodel@1.0.0.ObjectMapKeyType",
             type: propertyType,
@@ -1048,7 +1119,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f95 = function (decorators) {
+    var peg$f106 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.BooleanMapValueType",
             ...buildRange(location())
@@ -1058,7 +1129,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f96 = function (decorators) {
+    var peg$f107 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DateTimeMapValueType",
             ...buildRange(location())
@@ -1068,7 +1139,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f97 = function (decorators) {
+    var peg$f108 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.StringMapValueType",
             ...buildRange(location())
@@ -1078,7 +1149,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f98 = function (decorators) {
+    var peg$f109 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.IntegerMapValueType",
             ...buildRange(location())
@@ -1088,7 +1159,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f99 = function (decorators) {
+    var peg$f110 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.LongMapValueType",
             ...buildRange(location())
@@ -1098,7 +1169,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f100 = function (decorators) {
+    var peg$f111 = function (decorators) {
         const result = {
             $class: "concerto.metamodel@1.0.0.DoubleMapValueType",
             ...buildRange(location())
@@ -1108,7 +1179,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f101 = function (decorators, symbol, propertyType) {
+    var peg$f112 = function (decorators, symbol, propertyType) {
         const result = {
             $class: "concerto.metamodel@1.0.0.ObjectMapValueType",
             type: propertyType,
@@ -1122,7 +1193,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f102 = function (decorators, id, body) {
+    var peg$f113 = function (decorators, id, body) {
         const result = {
             $class: "concerto.metamodel@1.0.0.EnumDeclaration",
             name: id.name,
@@ -1134,13 +1205,13 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f103 = function (decls) {
+    var peg$f114 = function (decls) {
         return {
             type: "EnumDeclarationBody",
             declarations: optionalList(decls)
         };
     };
-    var peg$f104 = function (decorators, id) {
+    var peg$f115 = function (decorators, id) {
         const result = {
             $class: "concerto.metamodel@1.0.0.EnumProperty",
             name: id.name,
@@ -1151,7 +1222,7 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f105 = function (decorators, propertyType, array, id, optional) {
+    var peg$f116 = function (decorators, propertyType, array, id, size, optional) {
         const result = {
             $class: "concerto.metamodel@1.0.0.RelationshipProperty",
             name: id.name,
@@ -1163,24 +1234,27 @@ function peg$parse(input, options) {
         if (decorators.length > 0) {
             result.decorators = decorators;
         }
+        if (size) {
+            result.sizeValidator = size;
+        }
         return result;
     };
-    var peg$f106 = function (first, rest) {
+    var peg$f117 = function (first, rest) {
         return first.concat(JSON.stringify(rest).replace(/['"]+/g, ''));
     };
-    var peg$f107 = function (ns, version, name) {
+    var peg$f118 = function (ns, version, name) {
         return `${ns}@${version}${name}`;
     };
-    var peg$f108 = function (ns, version) {
+    var peg$f119 = function (ns, version) {
         return `${ns}@${version}`;
     };
-    var peg$f109 = function (ns) {
+    var peg$f120 = function (ns) {
         return ns;
     };
-    var peg$f110 = function (u) {
+    var peg$f121 = function (u) {
         return u;
     };
-    var peg$f111 = function (ns, u) {
+    var peg$f122 = function (ns, u) {
         const { namespace, name } = fullyQualifiedName(ns);
         const result = {
             $class: `${metamodelNamespace}.ImportType`,
@@ -1190,7 +1264,7 @@ function peg$parse(input, options) {
         u && (result.uri = u);
         return result;
     };
-    var peg$f112 = 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);
@@ -1210,7 +1284,7 @@ function peg$parse(input, options) {
         u && (result.uri = u);
         return result;
     };
-    var peg$f113 = 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}".`);
         }
@@ -1220,13 +1294,13 @@ function peg$parse(input, options) {
             aliasedName
         };
     };
-    var peg$f114 = function (head, tail) {
+    var peg$f125 = function (head, tail) {
         return [head, ...tail.map(t => t[2])];
     };
-    var peg$f115 = function (version) {
+    var peg$f126 = function (version) {
         return version.value;
     };
-    var peg$f116 = 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),
@@ -1239,10 +1313,10 @@ function peg$parse(input, options) {
         }
         return result;
     };
-    var peg$f117 = function (first, rest) {
+    var peg$f128 = function (first, rest) {
         return buildList(first, rest, 1);
     };
-    var peg$f118 = function (first, rest) {
+    var peg$f129 = function (first, rest) {
         return buildList(first, rest, 1);
     };
     var peg$currPos = 0;
@@ -9631,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) {
@@ -9640,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;
@@ -10024,7 +10089,7 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseObjectFieldDeclaration() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16;
         s0 = peg$currPos;
         s1 = peg$parseDecorators();
         s2 = peg$parse__();
@@ -10065,13 +10130,18 @@ function peg$parse(input, options) {
                         s11 = null;
                     }
                     s12 = peg$parse__();
-                    s13 = peg$parseOptional();
+                    s13 = peg$parseCollectionSizeValidator();
                     if (s13 === peg$FAILED) {
                         s13 = null;
                     }
                     s14 = peg$parse__();
+                    s15 = peg$parseOptional();
+                    if (s15 === peg$FAILED) {
+                        s15 = null;
+                    }
+                    s16 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f78(s1, s5, s7, s9, s11, s13);
+                    s0 = peg$f78(s1, s5, s7, s9, s11, s13, s15);
                 }
                 else {
                     peg$currPos = s0;
@@ -10090,7 +10160,7 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseBooleanFieldDeclaration() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16;
         s0 = peg$currPos;
         s1 = peg$parseDecorators();
         s2 = peg$parse__();
@@ -10131,13 +10201,18 @@ function peg$parse(input, options) {
                         s11 = null;
                     }
                     s12 = peg$parse__();
-                    s13 = peg$parseOptional();
+                    s13 = peg$parseCollectionSizeValidator();
                     if (s13 === peg$FAILED) {
                         s13 = null;
                     }
                     s14 = peg$parse__();
+                    s15 = peg$parseOptional();
+                    if (s15 === peg$FAILED) {
+                        s15 = null;
+                    }
+                    s16 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f79(s1, s7, s9, s11, s13);
+                    s0 = peg$f79(s1, s7, s9, s11, s13, s15);
                 }
                 else {
                     peg$currPos = s0;
@@ -10156,7 +10231,7 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseDateTimeFieldDeclaration() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16;
         s0 = peg$currPos;
         s1 = peg$parseDecorators();
         s2 = peg$parse__();
@@ -10197,13 +10272,18 @@ function peg$parse(input, options) {
                         s11 = null;
                     }
                     s12 = peg$parse__();
-                    s13 = peg$parseOptional();
+                    s13 = peg$parseCollectionSizeValidator();
                     if (s13 === peg$FAILED) {
                         s13 = null;
                     }
                     s14 = peg$parse__();
+                    s15 = peg$parseOptional();
+                    if (s15 === peg$FAILED) {
+                        s15 = null;
+                    }
+                    s16 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f80(s1, s7, s9, s11, s13);
+                    s0 = peg$f80(s1, s7, s9, s11, s13, s15);
                 }
                 else {
                     peg$currPos = s0;
@@ -10222,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;
+        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__();
@@ -10262,24 +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$parseOptional();
-                    if (s17 === peg$FAILED) {
-                        s17 = null;
-                    }
-                    s18 = peg$parse__();
+                    s15 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f81(s1, s7, s9, s11, s13, s15, s17);
+                    s0 = peg$f81(s1, s7, s9, s11, s12, s14);
                 }
                 else {
                     peg$currPos = s0;
@@ -10450,12 +10521,12 @@ function peg$parse(input, options) {
         }
         return s0;
     }
-    function peg$parseRealDomainValidator() {
+    function peg$parseCollectionSizeValidator() {
         var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 5) === peg$c95) {
+        if (input.substr(peg$currPos, 4) === peg$c95) {
             s1 = peg$c95;
-            peg$currPos += 5;
+            peg$currPos += 4;
         }
         else {
             s1 = peg$FAILED;
@@ -10463,6 +10534,111 @@ function peg$parse(input, options) {
                 peg$fail(peg$e136);
             }
         }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parse__();
+            if (input.charCodeAt(peg$currPos) === 61) {
+                s3 = peg$c62;
+                peg$currPos++;
+            }
+            else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e99);
+                }
+            }
+            if (s3 !== peg$FAILED) {
+                s4 = peg$parse__();
+                if (input.charCodeAt(peg$currPos) === 91) {
+                    s5 = peg$c34;
+                    peg$currPos++;
+                }
+                else {
+                    s5 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e49);
+                    }
+                }
+                if (s5 !== peg$FAILED) {
+                    s6 = peg$parse__();
+                    s7 = peg$currPos;
+                    s8 = peg$parseSignedInteger();
+                    if (s8 === peg$FAILED) {
+                        s8 = null;
+                    }
+                    s7 = input.substring(s7, peg$currPos);
+                    s8 = peg$parse__();
+                    if (input.charCodeAt(peg$currPos) === 44) {
+                        s9 = peg$c61;
+                        peg$currPos++;
+                    }
+                    else {
+                        s9 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e98);
+                        }
+                    }
+                    if (s9 !== peg$FAILED) {
+                        s10 = peg$parse__();
+                        s11 = peg$currPos;
+                        s12 = peg$parseSignedInteger();
+                        if (s12 === peg$FAILED) {
+                            s12 = null;
+                        }
+                        s11 = input.substring(s11, peg$currPos);
+                        s12 = peg$parse__();
+                        if (input.charCodeAt(peg$currPos) === 93) {
+                            s13 = peg$c35;
+                            peg$currPos++;
+                        }
+                        else {
+                            s13 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e50);
+                            }
+                        }
+                        if (s13 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s0 = peg$f84(s7, s11);
+                        }
+                        else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    }
+                    else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseRealDomainValidator() {
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 5) === peg$c96) {
+            s1 = peg$c96;
+            peg$currPos += 5;
+        }
+        else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e137);
+            }
+        }
         if (s1 !== peg$FAILED) {
             s2 = peg$parse__();
             if (input.charCodeAt(peg$currPos) === 61) {
@@ -10527,7 +10703,7 @@ function peg$parse(input, options) {
                         }
                         if (s13 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f84(s7, s11);
+                            s0 = peg$f85(s7, s11);
                         }
                         else {
                             peg$currPos = s0;
@@ -10558,14 +10734,14 @@ function peg$parse(input, options) {
     function peg$parseIntegerDomainValidator() {
         var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 5) === peg$c95) {
-            s1 = peg$c95;
+        if (input.substr(peg$currPos, 5) === peg$c96) {
+            s1 = peg$c96;
             peg$currPos += 5;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e136);
+                peg$fail(peg$e137);
             }
         }
         if (s1 !== peg$FAILED) {
@@ -10632,7 +10808,7 @@ function peg$parse(input, options) {
                         }
                         if (s13 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f85(s7, s11);
+                            s0 = peg$f86(s7, s11);
                         }
                         else {
                             peg$currPos = s0;
@@ -10663,14 +10839,14 @@ function peg$parse(input, options) {
     function peg$parseLongDomainValidator() {
         var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 5) === peg$c95) {
-            s1 = peg$c95;
+        if (input.substr(peg$currPos, 5) === peg$c96) {
+            s1 = peg$c96;
             peg$currPos += 5;
         }
         else {
             s1 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e136);
+                peg$fail(peg$e137);
             }
         }
         if (s1 !== peg$FAILED) {
@@ -10737,7 +10913,7 @@ function peg$parse(input, options) {
                         }
                         if (s13 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f86(s7, s11);
+                            s0 = peg$f87(s7, s11);
                         }
                         else {
                             peg$currPos = s0;
@@ -10765,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;
+        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__();
@@ -10806,19 +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;
-                    }
-                    s14 = peg$parse__();
-                    s15 = peg$parseOptional();
-                    if (s15 === peg$FAILED) {
-                        s15 = null;
+                    s12 = peg$parseRealFieldValidators();
+                    s13 = peg$parse__();
+                    s14 = peg$parseOptional();
+                    if (s14 === peg$FAILED) {
+                        s14 = null;
                     }
-                    s16 = peg$parse__();
+                    s15 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f87(s1, s5, s7, s9, s11, s13, s15);
+                    s0 = peg$f98(s1, s5, s7, s9, s11, s12, s14);
                 }
                 else {
                     peg$currPos = s0;
@@ -10837,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;
+        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__();
@@ -10877,19 +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$parseOptional();
-                    if (s15 === peg$FAILED) {
-                        s15 = null;
+                    s12 = peg$parseIntegerFieldValidators();
+                    s13 = peg$parse__();
+                    s14 = peg$parseOptional();
+                    if (s14 === peg$FAILED) {
+                        s14 = null;
                     }
-                    s16 = peg$parse__();
+                    s15 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f88(s1, s5, s7, s9, s11, s13, s15);
+                    s0 = peg$f99(s1, s5, s7, s9, s11, s12, s14);
                 }
                 else {
                     peg$currPos = s0;
@@ -10908,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;
+        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__();
@@ -10948,19 +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$parseOptional();
-                    if (s15 === peg$FAILED) {
-                        s15 = null;
+                    s12 = peg$parseLongFieldValidators();
+                    s13 = peg$parse__();
+                    s14 = peg$parseOptional();
+                    if (s14 === peg$FAILED) {
+                        s14 = null;
                     }
-                    s16 = peg$parse__();
+                    s15 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f89(s1, s5, s7, s9, s11, s13, s15);
+                    s0 = peg$f100(s1, s5, s7, s9, s11, s12, s14);
                 }
                 else {
                     peg$currPos = s0;
@@ -11016,7 +11386,7 @@ function peg$parse(input, options) {
                         }
                         if (s11 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f90(s1, s5, s9);
+                            s0 = peg$f101(s1, s5, s9);
                         }
                         else {
                             peg$currPos = s0;
@@ -11053,7 +11423,7 @@ function peg$parse(input, options) {
             s3 = peg$parseMapValueType();
             if (s3 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f91(s1, s3);
+                s0 = peg$f102(s1, s3);
             }
             else {
                 peg$currPos = s0;
@@ -11087,7 +11457,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f92(s1);
+                s0 = peg$f103(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11121,7 +11491,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f93(s1);
+                s0 = peg$f104(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11155,7 +11525,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f94(s1, s5);
+                s0 = peg$f105(s1, s5);
             }
             else {
                 peg$currPos = s0;
@@ -11200,7 +11570,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f95(s1);
+                s0 = peg$f106(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11234,7 +11604,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f96(s1);
+                s0 = peg$f107(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11268,7 +11638,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f97(s1);
+                s0 = peg$f108(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11302,7 +11672,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f98(s1);
+                s0 = peg$f109(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11336,7 +11706,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f99(s1);
+                s0 = peg$f110(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11370,7 +11740,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f100(s1);
+                s0 = peg$f111(s1);
             }
             else {
                 peg$currPos = s0;
@@ -11399,14 +11769,14 @@ function peg$parse(input, options) {
             }
         }
         if (s3 === peg$FAILED) {
-            if (input.substr(peg$currPos, 3) === peg$c96) {
-                s3 = peg$c96;
+            if (input.substr(peg$currPos, 3) === peg$c97) {
+                s3 = peg$c97;
                 peg$currPos += 3;
             }
             else {
                 s3 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$e137);
+                    peg$fail(peg$e138);
                 }
             }
         }
@@ -11416,7 +11786,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f101(s1, s3, s5);
+                s0 = peg$f112(s1, s3, s5);
             }
             else {
                 peg$currPos = s0;
@@ -11489,7 +11859,7 @@ function peg$parse(input, options) {
                     }
                     if (s11 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f102(s1, s5, s9);
+                        s0 = peg$f113(s1, s5, s9);
                     }
                     else {
                         peg$currPos = s0;
@@ -11522,7 +11892,7 @@ function peg$parse(input, options) {
             s2 = peg$parseEnumPropertyDeclaration();
         }
         peg$savedPos = s0;
-        s1 = peg$f103(s1);
+        s1 = peg$f114(s1);
         s0 = s1;
         return s0;
     }
@@ -11547,7 +11917,7 @@ function peg$parse(input, options) {
             if (s5 !== peg$FAILED) {
                 s6 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f104(s1, s5);
+                s0 = peg$f115(s1, s5);
             }
             else {
                 peg$currPos = s0;
@@ -11561,18 +11931,18 @@ function peg$parse(input, options) {
         return s0;
     }
     function peg$parseRelationshipDeclaration() {
-        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12;
+        var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
         s0 = peg$currPos;
         s1 = peg$parseDecorators();
         s2 = peg$parse__();
-        if (input.substr(peg$currPos, 3) === peg$c96) {
-            s3 = peg$c96;
+        if (input.substr(peg$currPos, 3) === peg$c97) {
+            s3 = peg$c97;
             peg$currPos += 3;
         }
         else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-                peg$fail(peg$e137);
+                peg$fail(peg$e138);
             }
         }
         if (s3 !== peg$FAILED) {
@@ -11597,13 +11967,18 @@ function peg$parse(input, options) {
                 s9 = peg$parseIdentifier();
                 if (s9 !== peg$FAILED) {
                     s10 = peg$parse__();
-                    s11 = peg$parseOptional();
+                    s11 = peg$parseCollectionSizeValidator();
                     if (s11 === peg$FAILED) {
                         s11 = null;
                     }
                     s12 = peg$parse__();
+                    s13 = peg$parseOptional();
+                    if (s13 === peg$FAILED) {
+                        s13 = null;
+                    }
+                    s14 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f105(s1, s5, s7, s9, s11);
+                    s0 = peg$f116(s1, s5, s7, s9, s11, s13);
                 }
                 else {
                     peg$currPos = s0;
@@ -11692,7 +12067,7 @@ function peg$parse(input, options) {
             }
             s2 = input.substring(s2, peg$currPos);
             peg$savedPos = s0;
-            s0 = peg$f106(s1, s2);
+            s0 = peg$f117(s1, s2);
         }
         else {
             peg$currPos = s0;
@@ -11735,7 +12110,7 @@ function peg$parse(input, options) {
                     }
                     if (s4 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f107(s1, s3, s4);
+                        s0 = peg$f118(s1, s3, s4);
                     }
                     else {
                         peg$currPos = s0;
@@ -11784,7 +12159,7 @@ function peg$parse(input, options) {
                 }
                 if (s3 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f108(s1, s3);
+                    s0 = peg$f119(s1, s3);
                 }
                 else {
                     peg$currPos = s0;
@@ -11828,7 +12203,7 @@ function peg$parse(input, options) {
             if (s3 !== peg$FAILED) {
                 s4 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f109(s3);
+                s0 = peg$f120(s3);
             }
             else {
                 peg$currPos = s0;
@@ -11858,7 +12233,7 @@ function peg$parse(input, options) {
             if (s3 !== peg$FAILED) {
                 s4 = peg$parse__();
                 peg$savedPos = s0;
-                s0 = peg$f110(s3);
+                s0 = peg$f121(s3);
             }
             else {
                 peg$currPos = s0;
@@ -11885,7 +12260,7 @@ function peg$parse(input, options) {
                     s5 = null;
                 }
                 peg$savedPos = s0;
-                s0 = peg$f111(s3, s5);
+                s0 = peg$f122(s3, s5);
             }
             else {
                 peg$currPos = s0;
@@ -11906,14 +12281,14 @@ function peg$parse(input, options) {
             s2 = peg$parse__();
             s3 = peg$parseQualifiedNamespaceDeclaration();
             if (s3 !== peg$FAILED) {
-                if (input.substr(peg$currPos, 2) === peg$c97) {
-                    s4 = peg$c97;
+                if (input.substr(peg$currPos, 2) === peg$c98) {
+                    s4 = peg$c98;
                     peg$currPos += 2;
                 }
                 else {
                     s4 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$e138);
+                        peg$fail(peg$e139);
                     }
                 }
                 if (s4 !== peg$FAILED) {
@@ -11938,7 +12313,7 @@ function peg$parse(input, options) {
                                 s10 = null;
                             }
                             peg$savedPos = s0;
-                            s0 = peg$f112(s3, s6, s10);
+                            s0 = peg$f123(s3, s6, s10);
                         }
                         else {
                             peg$currPos = s0;
@@ -11999,7 +12374,7 @@ function peg$parse(input, options) {
                 }
                 if (s5 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f113(s1, s5);
+                    s0 = peg$f124(s1, s5);
                 }
                 else {
                     peg$currPos = s0;
@@ -12097,7 +12472,7 @@ function peg$parse(input, options) {
                 }
             }
             peg$savedPos = s0;
-            s0 = peg$f114(s1, s3);
+            s0 = peg$f125(s1, s3);
         }
         else {
             peg$currPos = s0;
@@ -12126,7 +12501,7 @@ function peg$parse(input, options) {
                 if (s5 !== peg$FAILED) {
                     s6 = peg$parse__();
                     peg$savedPos = s0;
-                    s0 = peg$f115(s5);
+                    s0 = peg$f126(s5);
                 }
                 else {
                     peg$currPos = s0;
@@ -12163,7 +12538,7 @@ function peg$parse(input, options) {
                 s5 = null;
             }
             peg$savedPos = s0;
-            s0 = peg$f116(s1, s2, s3, s4, s5);
+            s0 = peg$f127(s1, s2, s3, s4, s5);
         }
         else {
             peg$currPos = s0;
@@ -12203,7 +12578,7 @@ function peg$parse(input, options) {
                 }
             }
             peg$savedPos = s0;
-            s0 = peg$f117(s1, s2);
+            s0 = peg$f128(s1, s2);
         }
         else {
             peg$currPos = s0;
@@ -12243,7 +12618,7 @@ function peg$parse(input, options) {
                 }
             }
             peg$savedPos = s0;
-            s0 = peg$f118(s1, s2);
+            s0 = peg$f129(s1, s2);
         }
         else {
             peg$currPos = s0;
@@ -12352,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;