@flock/wirespec 0.9.6 → 0.9.8

package/wirespec-src-compiler-lib.js

@@ -40,40 +40,47 @@
   var ArrayList_init_$Create$ = kotlin_kotlin.$_$.j;
   var copyToArray = kotlin_kotlin.$_$.t5;
   var noWhenBranchMatchedException = kotlin_kotlin.$_$.rf;
-  var Union = kotlin_community_flock_wirespec_compiler_core.$_$.z;
-  var Refined = kotlin_community_flock_wirespec_compiler_core.$_$.w;
-  var Enum_0 = kotlin_community_flock_wirespec_compiler_core.$_$.p;
-  var Endpoint = kotlin_community_flock_wirespec_compiler_core.$_$.o;
-  var Type = kotlin_community_flock_wirespec_compiler_core.$_$.y;
-  var Param = kotlin_community_flock_wirespec_compiler_core.$_$.n;
-  var Literal = kotlin_community_flock_wirespec_compiler_core.$_$.m;
-  var Primitive = kotlin_community_flock_wirespec_compiler_core.$_$.s;
-  var Custom = kotlin_community_flock_wirespec_compiler_core.$_$.r;
-  var Unit = kotlin_community_flock_wirespec_compiler_core.$_$.t;
-  var Any = kotlin_community_flock_wirespec_compiler_core.$_$.q;
-  var Companion_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.t1;
-  var Method_GET_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.h1;
-  var Method_POST_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.l1;
-  var Method_PUT_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.m1;
-  var Method_DELETE_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.g1;
-  var Method_OPTIONS_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.j1;
-  var Method_HEAD_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.i1;
-  var Method_PATCH_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.k1;
-  var Method_TRACE_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.n1;
-  var Field = kotlin_community_flock_wirespec_compiler_core.$_$.u;
-  var Request = kotlin_community_flock_wirespec_compiler_core.$_$.k;
-  var Response = kotlin_community_flock_wirespec_compiler_core.$_$.l;
-  var Content = kotlin_community_flock_wirespec_compiler_core.$_$.i;
-  var Type_String_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.r1;
-  var Type_Integer_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.p1;
-  var Type_Number_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.q1;
-  var Type_Boolean_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.o1;
-  var Logger = kotlin_community_flock_wirespec_compiler_core.$_$.e1;
+  var _Comment___get_value__impl__8r3pla = kotlin_community_flock_wirespec_compiler_core.$_$.v1;
+  var Comment = kotlin_community_flock_wirespec_compiler_core.$_$.h;
+  var Union = kotlin_community_flock_wirespec_compiler_core.$_$.b1;
+  var Refined = kotlin_community_flock_wirespec_compiler_core.$_$.y;
+  var Enum_0 = kotlin_community_flock_wirespec_compiler_core.$_$.q;
+  var Endpoint = kotlin_community_flock_wirespec_compiler_core.$_$.p;
+  var Type = kotlin_community_flock_wirespec_compiler_core.$_$.a1;
+  var Param = kotlin_community_flock_wirespec_compiler_core.$_$.o;
+  var Literal = kotlin_community_flock_wirespec_compiler_core.$_$.n;
+  var Primitive = kotlin_community_flock_wirespec_compiler_core.$_$.t;
+  var Custom = kotlin_community_flock_wirespec_compiler_core.$_$.s;
+  var Unit = kotlin_community_flock_wirespec_compiler_core.$_$.u;
+  var Any = kotlin_community_flock_wirespec_compiler_core.$_$.r;
+  var _Comment___init__impl__cg8s2u = kotlin_community_flock_wirespec_compiler_core.$_$.u1;
+  var Companion_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.x1;
+  var toSet = kotlin_kotlin.$_$.m8;
+  var Validator = kotlin_community_flock_wirespec_compiler_core.$_$.x;
+  var Shape = kotlin_community_flock_wirespec_compiler_core.$_$.z;
+  var toSet_0 = kotlin_kotlin.$_$.l8;
+  var Method_GET_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.j1;
+  var Method_POST_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.n1;
+  var Method_PUT_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.o1;
+  var Method_DELETE_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.i1;
+  var Method_OPTIONS_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.l1;
+  var Method_HEAD_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.k1;
+  var Method_PATCH_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.m1;
+  var Method_TRACE_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.p1;
+  var Field = kotlin_community_flock_wirespec_compiler_core.$_$.v;
+  var Request = kotlin_community_flock_wirespec_compiler_core.$_$.l;
+  var Response = kotlin_community_flock_wirespec_compiler_core.$_$.m;
+  var Content = kotlin_community_flock_wirespec_compiler_core.$_$.j;
+  var Type_String_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.t1;
+  var Type_Integer_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.r1;
+  var Type_Number_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.s1;
+  var Type_Boolean_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.q1;
+  var Logger = kotlin_community_flock_wirespec_compiler_core.$_$.g1;
   var objectMeta = kotlin_kotlin.$_$.na;
-  var WirespecSpec_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.u1;
-  var compile = kotlin_community_flock_wirespec_compiler_core.$_$.b1;
-  var tokenize = kotlin_community_flock_wirespec_compiler_core.$_$.a1;
-  var Parser = kotlin_community_flock_wirespec_compiler_core.$_$.v;
+  var WirespecSpec_getInstance = kotlin_community_flock_wirespec_compiler_core.$_$.y1;
+  var compile = kotlin_community_flock_wirespec_compiler_core.$_$.d1;
+  var tokenize = kotlin_community_flock_wirespec_compiler_core.$_$.c1;
+  var Parser = kotlin_community_flock_wirespec_compiler_core.$_$.w;
   var KotlinEmitter = kotlin_community_flock_wirespec_compiler_core.$_$.d;
   var TypeScriptEmitter = kotlin_community_flock_wirespec_compiler_core.$_$.f;
   var ScalaEmitter = kotlin_community_flock_wirespec_compiler_core.$_$.e;
@@ -99,7 +106,7 @@
   setMetadataFor(WsSegment, 'WsSegment', interfaceMeta);
   setMetadataFor(WsLiteral, 'WsLiteral', classMeta, VOID, [WsSegment]);
   setMetadataFor(WsParam, 'WsParam', classMeta, VOID, [WsSegment]);
-  setMetadataFor(Shape, 'Shape', classMeta);
+  setMetadataFor(Shape_0, 'Shape', classMeta);
   setMetadataFor(WsField, 'WsField', classMeta);
   setMetadataFor(WsIdentifier, 'WsIdentifier', classMeta);
   setMetadataFor(WsReference, 'WsReference', interfaceMeta);
@@ -149,35 +156,44 @@
   //endregion
   function WsNode() {
   }
-  function WsType(name, shape) {
-    this.x2c_1 = name;
+  function WsType(identifier, comment, shape) {
+    this.x2c_1 = identifier;
+    this.comment = comment;
     this.shape = shape;
   }
-  protoOf(WsType).wa = function () {
+  protoOf(WsType).n21 = function () {
     return this.x2c_1;
   };
   protoOf(WsType).y2c = function () {
+    return this.comment;
+  };
+  protoOf(WsType).z2c = function () {
     return this.shape;
   };
   protoOf(WsType).gd = function () {
     return this.x2c_1;
   };
   protoOf(WsType).hd = function () {
+    return this.comment;
+  };
+  protoOf(WsType).ah = function () {
     return this.shape;
   };
-  protoOf(WsType).z2c = function (name, shape) {
-    return new WsType(name, shape);
+  protoOf(WsType).a2d = function (identifier, comment, shape) {
+    return new WsType(identifier, comment, shape);
   };
-  protoOf(WsType).copy = function (name, shape, $super) {
-    name = name === VOID ? this.x2c_1 : name;
+  protoOf(WsType).copy = function (identifier, comment, shape, $super) {
+    identifier = identifier === VOID ? this.x2c_1 : identifier;
+    comment = comment === VOID ? this.comment : comment;
     shape = shape === VOID ? this.shape : shape;
-    return this.z2c(name, shape);
+    return this.a2d(identifier, comment, shape);
   };
   protoOf(WsType).toString = function () {
-    return 'WsType(name=' + this.x2c_1 + ', shape=' + this.shape + ')';
+    return 'WsType(identifier=' + this.x2c_1 + ', comment=' + this.comment + ', shape=' + this.shape + ')';
   };
   protoOf(WsType).hashCode = function () {
     var result = getStringHashCode(this.x2c_1);
+    result = imul(result, 31) + (this.comment == null ? 0 : getStringHashCode(this.comment)) | 0;
     result = imul(result, 31) + this.shape.hashCode() | 0;
     return result;
   };
@@ -189,6 +205,8 @@
     var tmp0_other_with_cast = other instanceof WsType ? other : THROW_CCE();
     if (!(this.x2c_1 === tmp0_other_with_cast.x2c_1))
       return false;
+    if (!(this.comment == tmp0_other_with_cast.comment))
+      return false;
     if (!this.shape.equals(tmp0_other_with_cast.shape))
       return false;
     return true;
@@ -202,12 +220,12 @@
   protoOf(WsShape).gd = function () {
     return this.value;
   };
-  protoOf(WsShape).a2d = function (value) {
+  protoOf(WsShape).b2d = function (value) {
     return new WsShape(value);
   };
   protoOf(WsShape).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.a2d(value);
+    return this.b2d(value);
   };
   protoOf(WsShape).toString = function () {
     return 'WsShape(value=' + toString(this.value) + ')';
@@ -225,8 +243,9 @@
       return false;
     return true;
   };
-  function WsEndpoint(name, method, path, query, headers, cookies, requests, responses) {
-    this.b2d_1 = name;
+  function WsEndpoint(identifier, comment, method, path, query, headers, cookies, requests, responses) {
+    this.c2d_1 = identifier;
+    this.comment = comment;
     this.method = method;
     this.path = path;
     this.query = query;
@@ -235,59 +254,66 @@
     this.requests = requests;
     this.responses = responses;
   }
-  protoOf(WsEndpoint).wa = function () {
-    return this.b2d_1;
+  protoOf(WsEndpoint).n21 = function () {
+    return this.c2d_1;
   };
-  protoOf(WsEndpoint).c2d = function () {
-    return this.method;
+  protoOf(WsEndpoint).y2c = function () {
+    return this.comment;
   };
   protoOf(WsEndpoint).d2d = function () {
-    return this.path;
+    return this.method;
   };
   protoOf(WsEndpoint).e2d = function () {
-    return this.query;
+    return this.path;
   };
   protoOf(WsEndpoint).f2d = function () {
-    return this.headers;
+    return this.query;
   };
   protoOf(WsEndpoint).g2d = function () {
-    return this.cookies;
+    return this.headers;
   };
   protoOf(WsEndpoint).h2d = function () {
-    return this.requests;
+    return this.cookies;
   };
   protoOf(WsEndpoint).i2d = function () {
+    return this.requests;
+  };
+  protoOf(WsEndpoint).j2d = function () {
     return this.responses;
   };
   protoOf(WsEndpoint).gd = function () {
-    return this.b2d_1;
+    return this.c2d_1;
   };
   protoOf(WsEndpoint).hd = function () {
-    return this.method;
+    return this.comment;
   };
   protoOf(WsEndpoint).ah = function () {
+    return this.method;
+  };
+  protoOf(WsEndpoint).k2d = function () {
     return this.path;
   };
-  protoOf(WsEndpoint).j2d = function () {
+  protoOf(WsEndpoint).l2d = function () {
     return this.query;
   };
-  protoOf(WsEndpoint).k2d = function () {
+  protoOf(WsEndpoint).m2d = function () {
     return this.headers;
   };
-  protoOf(WsEndpoint).l2d = function () {
+  protoOf(WsEndpoint).n2d = function () {
     return this.cookies;
   };
-  protoOf(WsEndpoint).m2d = function () {
+  protoOf(WsEndpoint).o2d = function () {
     return this.requests;
   };
-  protoOf(WsEndpoint).n2d = function () {
+  protoOf(WsEndpoint).p2d = function () {
     return this.responses;
   };
-  protoOf(WsEndpoint).o2d = function (name, method, path, query, headers, cookies, requests, responses) {
-    return new WsEndpoint(name, method, path, query, headers, cookies, requests, responses);
+  protoOf(WsEndpoint).q2d = function (identifier, comment, method, path, query, headers, cookies, requests, responses) {
+    return new WsEndpoint(identifier, comment, method, path, query, headers, cookies, requests, responses);
   };
-  protoOf(WsEndpoint).copy = function (name, method, path, query, headers, cookies, requests, responses, $super) {
-    name = name === VOID ? this.b2d_1 : name;
+  protoOf(WsEndpoint).copy = function (identifier, comment, method, path, query, headers, cookies, requests, responses, $super) {
+    identifier = identifier === VOID ? this.c2d_1 : identifier;
+    comment = comment === VOID ? this.comment : comment;
     method = method === VOID ? this.method : method;
     path = path === VOID ? this.path : path;
     query = query === VOID ? this.query : query;
@@ -295,13 +321,14 @@
     cookies = cookies === VOID ? this.cookies : cookies;
     requests = requests === VOID ? this.requests : requests;
     responses = responses === VOID ? this.responses : responses;
-    return this.o2d(name, method, path, query, headers, cookies, requests, responses);
+    return this.q2d(identifier, comment, method, path, query, headers, cookies, requests, responses);
   };
   protoOf(WsEndpoint).toString = function () {
-    return 'WsEndpoint(name=' + this.b2d_1 + ', method=' + this.method + ', path=' + toString(this.path) + ', query=' + toString(this.query) + ', headers=' + toString(this.headers) + ', cookies=' + toString(this.cookies) + ', requests=' + toString(this.requests) + ', responses=' + toString(this.responses) + ')';
+    return 'WsEndpoint(identifier=' + this.c2d_1 + ', comment=' + this.comment + ', method=' + this.method + ', path=' + toString(this.path) + ', query=' + toString(this.query) + ', headers=' + toString(this.headers) + ', cookies=' + toString(this.cookies) + ', requests=' + toString(this.requests) + ', responses=' + toString(this.responses) + ')';
   };
   protoOf(WsEndpoint).hashCode = function () {
-    var result = getStringHashCode(this.b2d_1);
+    var result = getStringHashCode(this.c2d_1);
+    result = imul(result, 31) + (this.comment == null ? 0 : getStringHashCode(this.comment)) | 0;
     result = imul(result, 31) + this.method.hashCode() | 0;
     result = imul(result, 31) + hashCode(this.path) | 0;
     result = imul(result, 31) + hashCode(this.query) | 0;
@@ -317,7 +344,9 @@
     if (!(other instanceof WsEndpoint))
       return false;
     var tmp0_other_with_cast = other instanceof WsEndpoint ? other : THROW_CCE();
-    if (!(this.b2d_1 === tmp0_other_with_cast.b2d_1))
+    if (!(this.c2d_1 === tmp0_other_with_cast.c2d_1))
+      return false;
+    if (!(this.comment == tmp0_other_with_cast.comment))
       return false;
     if (!this.method.equals(tmp0_other_with_cast.method))
       return false;
@@ -335,35 +364,44 @@
       return false;
     return true;
   };
-  function WsEnum(name, entries) {
-    this.p2d_1 = name;
+  function WsEnum(identifier, comment, entries) {
+    this.r2d_1 = identifier;
+    this.comment = comment;
     this.entries = entries;
   }
-  protoOf(WsEnum).wa = function () {
-    return this.p2d_1;
+  protoOf(WsEnum).n21 = function () {
+    return this.r2d_1;
+  };
+  protoOf(WsEnum).y2c = function () {
+    return this.comment;
   };
   protoOf(WsEnum).n2 = function () {
     return this.entries;
   };
   protoOf(WsEnum).gd = function () {
-    return this.p2d_1;
+    return this.r2d_1;
   };
   protoOf(WsEnum).hd = function () {
+    return this.comment;
+  };
+  protoOf(WsEnum).ah = function () {
     return this.entries;
   };
-  protoOf(WsEnum).q2d = function (name, entries) {
-    return new WsEnum(name, entries);
+  protoOf(WsEnum).s2d = function (identifier, comment, entries) {
+    return new WsEnum(identifier, comment, entries);
   };
-  protoOf(WsEnum).copy = function (name, entries, $super) {
-    name = name === VOID ? this.p2d_1 : name;
+  protoOf(WsEnum).copy = function (identifier, comment, entries, $super) {
+    identifier = identifier === VOID ? this.r2d_1 : identifier;
+    comment = comment === VOID ? this.comment : comment;
     entries = entries === VOID ? this.entries : entries;
-    return this.q2d(name, entries);
+    return this.s2d(identifier, comment, entries);
   };
   protoOf(WsEnum).toString = function () {
-    return 'WsEnum(name=' + this.p2d_1 + ', entries=' + toString(this.entries) + ')';
+    return 'WsEnum(identifier=' + this.r2d_1 + ', comment=' + this.comment + ', entries=' + toString(this.entries) + ')';
   };
   protoOf(WsEnum).hashCode = function () {
-    var result = getStringHashCode(this.p2d_1);
+    var result = getStringHashCode(this.r2d_1);
+    result = imul(result, 31) + (this.comment == null ? 0 : getStringHashCode(this.comment)) | 0;
     result = imul(result, 31) + hashCode(this.entries) | 0;
     return result;
   };
@@ -373,41 +411,52 @@
     if (!(other instanceof WsEnum))
       return false;
     var tmp0_other_with_cast = other instanceof WsEnum ? other : THROW_CCE();
-    if (!(this.p2d_1 === tmp0_other_with_cast.p2d_1))
+    if (!(this.r2d_1 === tmp0_other_with_cast.r2d_1))
+      return false;
+    if (!(this.comment == tmp0_other_with_cast.comment))
       return false;
     if (!equals(this.entries, tmp0_other_with_cast.entries))
       return false;
     return true;
   };
-  function WsUnion(name, entries) {
-    this.r2d_1 = name;
+  function WsUnion(identifier, comment, entries) {
+    this.t2d_1 = identifier;
+    this.comment = comment;
     this.entries = entries;
   }
-  protoOf(WsUnion).wa = function () {
-    return this.r2d_1;
+  protoOf(WsUnion).n21 = function () {
+    return this.t2d_1;
+  };
+  protoOf(WsUnion).y2c = function () {
+    return this.comment;
   };
   protoOf(WsUnion).n2 = function () {
     return this.entries;
   };
   protoOf(WsUnion).gd = function () {
-    return this.r2d_1;
+    return this.t2d_1;
   };
   protoOf(WsUnion).hd = function () {
+    return this.comment;
+  };
+  protoOf(WsUnion).ah = function () {
     return this.entries;
   };
-  protoOf(WsUnion).s2d = function (name, entries) {
-    return new WsUnion(name, entries);
+  protoOf(WsUnion).u2d = function (identifier, comment, entries) {
+    return new WsUnion(identifier, comment, entries);
   };
-  protoOf(WsUnion).copy = function (name, entries, $super) {
-    name = name === VOID ? this.r2d_1 : name;
+  protoOf(WsUnion).copy = function (identifier, comment, entries, $super) {
+    identifier = identifier === VOID ? this.t2d_1 : identifier;
+    comment = comment === VOID ? this.comment : comment;
     entries = entries === VOID ? this.entries : entries;
-    return this.s2d(name, entries);
+    return this.u2d(identifier, comment, entries);
   };
   protoOf(WsUnion).toString = function () {
-    return 'WsUnion(name=' + this.r2d_1 + ', entries=' + toString(this.entries) + ')';
+    return 'WsUnion(identifier=' + this.t2d_1 + ', comment=' + this.comment + ', entries=' + toString(this.entries) + ')';
   };
   protoOf(WsUnion).hashCode = function () {
-    var result = getStringHashCode(this.r2d_1);
+    var result = getStringHashCode(this.t2d_1);
+    result = imul(result, 31) + (this.comment == null ? 0 : getStringHashCode(this.comment)) | 0;
     result = imul(result, 31) + hashCode(this.entries) | 0;
     return result;
   };
@@ -417,41 +466,52 @@
     if (!(other instanceof WsUnion))
       return false;
     var tmp0_other_with_cast = other instanceof WsUnion ? other : THROW_CCE();
-    if (!(this.r2d_1 === tmp0_other_with_cast.r2d_1))
+    if (!(this.t2d_1 === tmp0_other_with_cast.t2d_1))
+      return false;
+    if (!(this.comment == tmp0_other_with_cast.comment))
       return false;
     if (!equals(this.entries, tmp0_other_with_cast.entries))
       return false;
     return true;
   };
-  function WsRefined(name, validator) {
-    this.t2d_1 = name;
+  function WsRefined(identifier, comment, validator) {
+    this.v2d_1 = identifier;
+    this.comment = comment;
     this.validator = validator;
   }
-  protoOf(WsRefined).wa = function () {
-    return this.t2d_1;
+  protoOf(WsRefined).n21 = function () {
+    return this.v2d_1;
+  };
+  protoOf(WsRefined).y2c = function () {
+    return this.comment;
   };
-  protoOf(WsRefined).u2d = function () {
+  protoOf(WsRefined).w2d = function () {
     return this.validator;
   };
   protoOf(WsRefined).gd = function () {
-    return this.t2d_1;
+    return this.v2d_1;
   };
   protoOf(WsRefined).hd = function () {
+    return this.comment;
+  };
+  protoOf(WsRefined).ah = function () {
     return this.validator;
   };
-  protoOf(WsRefined).v2d = function (name, validator) {
-    return new WsRefined(name, validator);
+  protoOf(WsRefined).x2d = function (identifier, comment, validator) {
+    return new WsRefined(identifier, comment, validator);
   };
-  protoOf(WsRefined).copy = function (name, validator, $super) {
-    name = name === VOID ? this.t2d_1 : name;
+  protoOf(WsRefined).copy = function (identifier, comment, validator, $super) {
+    identifier = identifier === VOID ? this.v2d_1 : identifier;
+    comment = comment === VOID ? this.comment : comment;
     validator = validator === VOID ? this.validator : validator;
-    return this.v2d(name, validator);
+    return this.x2d(identifier, comment, validator);
   };
   protoOf(WsRefined).toString = function () {
-    return 'WsRefined(name=' + this.t2d_1 + ', validator=' + this.validator + ')';
+    return 'WsRefined(identifier=' + this.v2d_1 + ', comment=' + this.comment + ', validator=' + this.validator + ')';
   };
   protoOf(WsRefined).hashCode = function () {
-    var result = getStringHashCode(this.t2d_1);
+    var result = getStringHashCode(this.v2d_1);
+    result = imul(result, 31) + (this.comment == null ? 0 : getStringHashCode(this.comment)) | 0;
     result = imul(result, 31) + getStringHashCode(this.validator) | 0;
     return result;
   };
@@ -461,7 +521,9 @@
     if (!(other instanceof WsRefined))
       return false;
     var tmp0_other_with_cast = other instanceof WsRefined ? other : THROW_CCE();
-    if (!(this.t2d_1 === tmp0_other_with_cast.t2d_1))
+    if (!(this.v2d_1 === tmp0_other_with_cast.v2d_1))
+      return false;
+    if (!(this.comment == tmp0_other_with_cast.comment))
       return false;
     if (!(this.validator === tmp0_other_with_cast.validator))
       return false;
@@ -530,12 +592,12 @@
   protoOf(WsLiteral).gd = function () {
     return this.value;
   };
-  protoOf(WsLiteral).y2d = function (value) {
+  protoOf(WsLiteral).a2e = function (value) {
     return new WsLiteral(value);
   };
   protoOf(WsLiteral).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.y2d(value);
+    return this.a2e(value);
   };
   protoOf(WsLiteral).toString = function () {
     return 'WsLiteral(value=' + this.value + ')';
@@ -560,7 +622,7 @@
   protoOf(WsParam).n21 = function () {
     return this.identifier;
   };
-  protoOf(WsParam).z2d = function () {
+  protoOf(WsParam).b2e = function () {
     return this.reference;
   };
   protoOf(WsParam).gd = function () {
@@ -569,13 +631,13 @@
   protoOf(WsParam).hd = function () {
     return this.reference;
   };
-  protoOf(WsParam).a2e = function (identifier, reference) {
+  protoOf(WsParam).c2e = function (identifier, reference) {
     return new WsParam(identifier, reference);
   };
   protoOf(WsParam).copy = function (identifier, reference, $super) {
     identifier = identifier === VOID ? this.identifier : identifier;
     reference = reference === VOID ? this.reference : reference;
-    return this.a2e(identifier, reference);
+    return this.c2e(identifier, reference);
   };
   protoOf(WsParam).toString = function () {
     return 'WsParam(identifier=' + this.identifier + ', reference=' + this.reference + ')';
@@ -597,34 +659,34 @@
       return false;
     return true;
   };
-  function Shape(value) {
+  function Shape_0(value) {
     this.value = value;
   }
-  protoOf(Shape).p2 = function () {
+  protoOf(Shape_0).p2 = function () {
     return this.value;
   };
-  protoOf(Shape).gd = function () {
+  protoOf(Shape_0).gd = function () {
     return this.value;
   };
-  protoOf(Shape).a2d = function (value) {
-    return new Shape(value);
+  protoOf(Shape_0).b2d = function (value) {
+    return new Shape_0(value);
   };
-  protoOf(Shape).copy = function (value, $super) {
+  protoOf(Shape_0).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.a2d(value);
+    return this.b2d(value);
   };
-  protoOf(Shape).toString = function () {
+  protoOf(Shape_0).toString = function () {
     return 'Shape(value=' + toString(this.value) + ')';
   };
-  protoOf(Shape).hashCode = function () {
+  protoOf(Shape_0).hashCode = function () {
     return hashCode(this.value);
   };
-  protoOf(Shape).equals = function (other) {
+  protoOf(Shape_0).equals = function (other) {
     if (this === other)
       return true;
-    if (!(other instanceof Shape))
+    if (!(other instanceof Shape_0))
       return false;
-    var tmp0_other_with_cast = other instanceof Shape ? other : THROW_CCE();
+    var tmp0_other_with_cast = other instanceof Shape_0 ? other : THROW_CCE();
     if (!equals(this.value, tmp0_other_with_cast.value))
       return false;
     return true;
@@ -637,7 +699,7 @@
   protoOf(WsField).n21 = function () {
     return this.identifier;
   };
-  protoOf(WsField).z2d = function () {
+  protoOf(WsField).b2e = function () {
     return this.reference;
   };
   protoOf(WsField).wj = function () {
@@ -652,14 +714,14 @@
   protoOf(WsField).ah = function () {
     return this.isNullable;
   };
-  protoOf(WsField).b2e = function (identifier, reference, isNullable) {
+  protoOf(WsField).d2e = function (identifier, reference, isNullable) {
     return new WsField(identifier, reference, isNullable);
   };
   protoOf(WsField).copy = function (identifier, reference, isNullable, $super) {
     identifier = identifier === VOID ? this.identifier : identifier;
     reference = reference === VOID ? this.reference : reference;
     isNullable = isNullable === VOID ? this.isNullable : isNullable;
-    return this.b2e(identifier, reference, isNullable);
+    return this.d2e(identifier, reference, isNullable);
   };
   protoOf(WsField).toString = function () {
     return 'WsField(identifier=' + this.identifier + ', reference=' + this.reference + ', isNullable=' + this.isNullable + ')';
@@ -693,12 +755,12 @@
   protoOf(WsIdentifier).gd = function () {
     return this.value;
   };
-  protoOf(WsIdentifier).y2d = function (value) {
+  protoOf(WsIdentifier).a2e = function (value) {
     return new WsIdentifier(value);
   };
   protoOf(WsIdentifier).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.y2d(value);
+    return this.a2e(value);
   };
   protoOf(WsIdentifier).toString = function () {
     return 'WsIdentifier(value=' + this.value + ')';
@@ -720,35 +782,35 @@
   }
   function WsAny(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.c2e_1 = isIterable;
-    this.d2e_1 = isMap;
+    this.e2e_1 = isIterable;
+    this.f2e_1 = isMap;
   }
   protoOf(WsAny).t20 = function () {
-    return this.c2e_1;
+    return this.e2e_1;
   };
   protoOf(WsAny).l28 = function () {
-    return this.d2e_1;
+    return this.f2e_1;
   };
   protoOf(WsAny).gd = function () {
-    return this.c2e_1;
+    return this.e2e_1;
   };
   protoOf(WsAny).hd = function () {
-    return this.d2e_1;
+    return this.f2e_1;
   };
-  protoOf(WsAny).w29 = function (isIterable, isMap) {
+  protoOf(WsAny).x29 = function (isIterable, isMap) {
     return new WsAny(isIterable, isMap);
   };
   protoOf(WsAny).copy = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.c2e_1 : isIterable;
-    isMap = isMap === VOID ? this.d2e_1 : isMap;
-    return this.w29(isIterable, isMap);
+    isIterable = isIterable === VOID ? this.e2e_1 : isIterable;
+    isMap = isMap === VOID ? this.f2e_1 : isMap;
+    return this.x29(isIterable, isMap);
   };
   protoOf(WsAny).toString = function () {
-    return 'WsAny(isIterable=' + this.c2e_1 + ', isMap=' + this.d2e_1 + ')';
+    return 'WsAny(isIterable=' + this.e2e_1 + ', isMap=' + this.f2e_1 + ')';
   };
   protoOf(WsAny).hashCode = function () {
-    var result = this.c2e_1 | 0;
-    result = imul(result, 31) + (this.d2e_1 | 0) | 0;
+    var result = this.e2e_1 | 0;
+    result = imul(result, 31) + (this.f2e_1 | 0) | 0;
     return result;
   };
   protoOf(WsAny).equals = function (other) {
@@ -757,43 +819,43 @@
     if (!(other instanceof WsAny))
       return false;
     var tmp0_other_with_cast = other instanceof WsAny ? other : THROW_CCE();
-    if (!(this.c2e_1 === tmp0_other_with_cast.c2e_1))
+    if (!(this.e2e_1 === tmp0_other_with_cast.e2e_1))
       return false;
-    if (!(this.d2e_1 === tmp0_other_with_cast.d2e_1))
+    if (!(this.f2e_1 === tmp0_other_with_cast.f2e_1))
       return false;
     return true;
   };
   function WsUnit(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.e2e_1 = isIterable;
-    this.f2e_1 = isMap;
+    this.g2e_1 = isIterable;
+    this.h2e_1 = isMap;
   }
   protoOf(WsUnit).t20 = function () {
-    return this.e2e_1;
+    return this.g2e_1;
   };
   protoOf(WsUnit).l28 = function () {
-    return this.f2e_1;
+    return this.h2e_1;
   };
   protoOf(WsUnit).gd = function () {
-    return this.e2e_1;
+    return this.g2e_1;
   };
   protoOf(WsUnit).hd = function () {
-    return this.f2e_1;
+    return this.h2e_1;
   };
-  protoOf(WsUnit).w29 = function (isIterable, isMap) {
+  protoOf(WsUnit).x29 = function (isIterable, isMap) {
     return new WsUnit(isIterable, isMap);
   };
   protoOf(WsUnit).copy = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.e2e_1 : isIterable;
-    isMap = isMap === VOID ? this.f2e_1 : isMap;
-    return this.w29(isIterable, isMap);
+    isIterable = isIterable === VOID ? this.g2e_1 : isIterable;
+    isMap = isMap === VOID ? this.h2e_1 : isMap;
+    return this.x29(isIterable, isMap);
   };
   protoOf(WsUnit).toString = function () {
-    return 'WsUnit(isIterable=' + this.e2e_1 + ', isMap=' + this.f2e_1 + ')';
+    return 'WsUnit(isIterable=' + this.g2e_1 + ', isMap=' + this.h2e_1 + ')';
   };
   protoOf(WsUnit).hashCode = function () {
-    var result = this.e2e_1 | 0;
-    result = imul(result, 31) + (this.f2e_1 | 0) | 0;
+    var result = this.g2e_1 | 0;
+    result = imul(result, 31) + (this.h2e_1 | 0) | 0;
     return result;
   };
   protoOf(WsUnit).equals = function (other) {
@@ -802,52 +864,52 @@
     if (!(other instanceof WsUnit))
       return false;
     var tmp0_other_with_cast = other instanceof WsUnit ? other : THROW_CCE();
-    if (!(this.e2e_1 === tmp0_other_with_cast.e2e_1))
+    if (!(this.g2e_1 === tmp0_other_with_cast.g2e_1))
       return false;
-    if (!(this.f2e_1 === tmp0_other_with_cast.f2e_1))
+    if (!(this.h2e_1 === tmp0_other_with_cast.h2e_1))
       return false;
     return true;
   };
   function WsCustom(value, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
     this.value = value;
-    this.g2e_1 = isIterable;
-    this.h2e_1 = isMap;
+    this.i2e_1 = isIterable;
+    this.j2e_1 = isMap;
   }
   protoOf(WsCustom).p2 = function () {
     return this.value;
   };
   protoOf(WsCustom).t20 = function () {
-    return this.g2e_1;
+    return this.i2e_1;
   };
   protoOf(WsCustom).l28 = function () {
-    return this.h2e_1;
+    return this.j2e_1;
   };
   protoOf(WsCustom).gd = function () {
     return this.value;
   };
   protoOf(WsCustom).hd = function () {
-    return this.g2e_1;
+    return this.i2e_1;
   };
   protoOf(WsCustom).ah = function () {
-    return this.h2e_1;
+    return this.j2e_1;
   };
-  protoOf(WsCustom).f2a = function (value, isIterable, isMap) {
+  protoOf(WsCustom).g2a = function (value, isIterable, isMap) {
     return new WsCustom(value, isIterable, isMap);
   };
   protoOf(WsCustom).copy = function (value, isIterable, isMap, $super) {
     value = value === VOID ? this.value : value;
-    isIterable = isIterable === VOID ? this.g2e_1 : isIterable;
-    isMap = isMap === VOID ? this.h2e_1 : isMap;
-    return this.f2a(value, isIterable, isMap);
+    isIterable = isIterable === VOID ? this.i2e_1 : isIterable;
+    isMap = isMap === VOID ? this.j2e_1 : isMap;
+    return this.g2a(value, isIterable, isMap);
   };
   protoOf(WsCustom).toString = function () {
-    return 'WsCustom(value=' + this.value + ', isIterable=' + this.g2e_1 + ', isMap=' + this.h2e_1 + ')';
+    return 'WsCustom(value=' + this.value + ', isIterable=' + this.i2e_1 + ', isMap=' + this.j2e_1 + ')';
   };
   protoOf(WsCustom).hashCode = function () {
     var result = getStringHashCode(this.value);
-    result = imul(result, 31) + (this.g2e_1 | 0) | 0;
-    result = imul(result, 31) + (this.h2e_1 | 0) | 0;
+    result = imul(result, 31) + (this.i2e_1 | 0) | 0;
+    result = imul(result, 31) + (this.j2e_1 | 0) | 0;
     return result;
   };
   protoOf(WsCustom).equals = function (other) {
@@ -858,52 +920,52 @@
     var tmp0_other_with_cast = other instanceof WsCustom ? other : THROW_CCE();
     if (!(this.value === tmp0_other_with_cast.value))
       return false;
-    if (!(this.g2e_1 === tmp0_other_with_cast.g2e_1))
+    if (!(this.i2e_1 === tmp0_other_with_cast.i2e_1))
       return false;
-    if (!(this.h2e_1 === tmp0_other_with_cast.h2e_1))
+    if (!(this.j2e_1 === tmp0_other_with_cast.j2e_1))
       return false;
     return true;
   };
   function WsPrimitive(type, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
     this.type = type;
-    this.i2e_1 = isIterable;
-    this.j2e_1 = isMap;
+    this.k2e_1 = isIterable;
+    this.l2e_1 = isMap;
   }
-  protoOf(WsPrimitive).k2e = function () {
+  protoOf(WsPrimitive).m2e = function () {
     return this.type;
   };
   protoOf(WsPrimitive).t20 = function () {
-    return this.i2e_1;
+    return this.k2e_1;
   };
   protoOf(WsPrimitive).l28 = function () {
-    return this.j2e_1;
+    return this.l2e_1;
   };
   protoOf(WsPrimitive).gd = function () {
     return this.type;
   };
   protoOf(WsPrimitive).hd = function () {
-    return this.i2e_1;
+    return this.k2e_1;
   };
   protoOf(WsPrimitive).ah = function () {
-    return this.j2e_1;
+    return this.l2e_1;
   };
-  protoOf(WsPrimitive).l2e = function (type, isIterable, isMap) {
+  protoOf(WsPrimitive).n2e = function (type, isIterable, isMap) {
     return new WsPrimitive(type, isIterable, isMap);
   };
   protoOf(WsPrimitive).copy = function (type, isIterable, isMap, $super) {
     type = type === VOID ? this.type : type;
-    isIterable = isIterable === VOID ? this.i2e_1 : isIterable;
-    isMap = isMap === VOID ? this.j2e_1 : isMap;
-    return this.l2e(type, isIterable, isMap);
+    isIterable = isIterable === VOID ? this.k2e_1 : isIterable;
+    isMap = isMap === VOID ? this.l2e_1 : isMap;
+    return this.n2e(type, isIterable, isMap);
   };
   protoOf(WsPrimitive).toString = function () {
-    return 'WsPrimitive(type=' + this.type + ', isIterable=' + this.i2e_1 + ', isMap=' + this.j2e_1 + ')';
+    return 'WsPrimitive(type=' + this.type + ', isIterable=' + this.k2e_1 + ', isMap=' + this.l2e_1 + ')';
   };
   protoOf(WsPrimitive).hashCode = function () {
     var result = this.type.hashCode();
-    result = imul(result, 31) + (this.i2e_1 | 0) | 0;
-    result = imul(result, 31) + (this.j2e_1 | 0) | 0;
+    result = imul(result, 31) + (this.k2e_1 | 0) | 0;
+    result = imul(result, 31) + (this.l2e_1 | 0) | 0;
     return result;
   };
   protoOf(WsPrimitive).equals = function (other) {
@@ -914,9 +976,9 @@
     var tmp0_other_with_cast = other instanceof WsPrimitive ? other : THROW_CCE();
     if (!this.type.equals(tmp0_other_with_cast.type))
       return false;
-    if (!(this.i2e_1 === tmp0_other_with_cast.i2e_1))
+    if (!(this.k2e_1 === tmp0_other_with_cast.k2e_1))
       return false;
-    if (!(this.j2e_1 === tmp0_other_with_cast.j2e_1))
+    if (!(this.l2e_1 === tmp0_other_with_cast.l2e_1))
       return false;
     return true;
   };
@@ -965,12 +1027,12 @@
   protoOf(WsRequest).gd = function () {
     return this.content;
   };
-  protoOf(WsRequest).o2e = function (content) {
+  protoOf(WsRequest).q2e = function (content) {
     return new WsRequest(content);
   };
   protoOf(WsRequest).copy = function (content, $super) {
     content = content === VOID ? this.content : content;
-    return this.o2e(content);
+    return this.q2e(content);
   };
   protoOf(WsRequest).toString = function () {
     return 'WsRequest(content=' + this.content + ')';
@@ -993,10 +1055,10 @@
     this.headers = headers;
     this.content = content;
   }
-  protoOf(WsResponse).p2e = function () {
+  protoOf(WsResponse).r2e = function () {
     return this.status;
   };
-  protoOf(WsResponse).f2d = function () {
+  protoOf(WsResponse).g2d = function () {
     return this.headers;
   };
   protoOf(WsResponse).k14 = function () {
@@ -1011,14 +1073,14 @@
   protoOf(WsResponse).ah = function () {
     return this.content;
   };
-  protoOf(WsResponse).q2e = function (status, headers, content) {
+  protoOf(WsResponse).s2e = function (status, headers, content) {
     return new WsResponse(status, headers, content);
   };
   protoOf(WsResponse).copy = function (status, headers, content, $super) {
     status = status === VOID ? this.status : status;
     headers = headers === VOID ? this.headers : headers;
     content = content === VOID ? this.content : content;
-    return this.q2e(status, headers, content);
+    return this.s2e(status, headers, content);
   };
   protoOf(WsResponse).toString = function () {
     return 'WsResponse(status=' + this.status + ', headers=' + toString(this.headers) + ', content=' + this.content + ')';
@@ -1049,10 +1111,10 @@
     this.reference = reference;
     this.isNullable = isNullable;
   }
-  protoOf(WsContent).k2e = function () {
+  protoOf(WsContent).m2e = function () {
     return this.type;
   };
-  protoOf(WsContent).z2d = function () {
+  protoOf(WsContent).b2e = function () {
     return this.reference;
   };
   protoOf(WsContent).wj = function () {
@@ -1067,14 +1129,14 @@
   protoOf(WsContent).ah = function () {
     return this.isNullable;
   };
-  protoOf(WsContent).r2e = function (type, reference, isNullable) {
+  protoOf(WsContent).t2e = function (type, reference, isNullable) {
     return new WsContent(type, reference, isNullable);
   };
   protoOf(WsContent).copy = function (type, reference, isNullable, $super) {
     type = type === VOID ? this.type : type;
     reference = reference === VOID ? this.reference : reference;
     isNullable = isNullable === VOID ? this.isNullable : isNullable;
-    return this.r2e(type, reference, isNullable);
+    return this.t2e(type, reference, isNullable);
   };
   protoOf(WsContent).toString = function () {
     return 'WsContent(type=' + this.type + ', reference=' + this.reference + ', isNullable=' + this.isNullable + ')';
@@ -1117,22 +1179,64 @@
   function produce_0(_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof Type) {
-      tmp = new WsType(_this__u8e3s4.v26_1.d27_1, produce_1(_this__u8e3s4.w26_1));
+      var tmp1_safe_receiver = _this__u8e3s4.u26_1;
+      var tmp_0;
+      var tmp_1 = tmp1_safe_receiver;
+      if ((tmp_1 == null ? null : new Comment(tmp_1)) == null) {
+        tmp_0 = null;
+      } else {
+        tmp_0 = _Comment___get_value__impl__8r3pla(tmp1_safe_receiver);
+      }
+      tmp = new WsType(_this__u8e3s4.v26_1.d27_1, tmp_0, produce_1(_this__u8e3s4.w26_1));
     } else {
       if (_this__u8e3s4 instanceof Endpoint) {
-        tmp = new WsEndpoint(_this__u8e3s4.b28_1.d27_1, produce_2(_this__u8e3s4.c28_1), produce_3(_this__u8e3s4.d28_1), produce_4(_this__u8e3s4.e28_1), produce_4(_this__u8e3s4.f28_1), produce_4(_this__u8e3s4.g28_1), produce_5(_this__u8e3s4.h28_1), produce_6(_this__u8e3s4.i28_1));
+        var tmp2_safe_receiver = _this__u8e3s4.a28_1;
+        var tmp_2;
+        var tmp_3 = tmp2_safe_receiver;
+        if ((tmp_3 == null ? null : new Comment(tmp_3)) == null) {
+          tmp_2 = null;
+        } else {
+          tmp_2 = _Comment___get_value__impl__8r3pla(tmp2_safe_receiver);
+        }
+        tmp = new WsEndpoint(_this__u8e3s4.b28_1.d27_1, tmp_2, produce_2(_this__u8e3s4.c28_1), produce_3(_this__u8e3s4.d28_1), produce_4(_this__u8e3s4.e28_1), produce_4(_this__u8e3s4.f28_1), produce_4(_this__u8e3s4.g28_1), produce_5(_this__u8e3s4.h28_1), produce_6(_this__u8e3s4.i28_1));
       } else {
         if (_this__u8e3s4 instanceof Enum_0) {
+          var tmp3_safe_receiver = _this__u8e3s4.r26_1;
+          var tmp_4;
+          var tmp_5 = tmp3_safe_receiver;
+          if ((tmp_5 == null ? null : new Comment(tmp_5)) == null) {
+            tmp_4 = null;
+          } else {
+            tmp_4 = _Comment___get_value__impl__8r3pla(tmp3_safe_receiver);
+          }
+          var tmp_6 = tmp_4;
           var tmp$ret$0;
           // Inline function 'kotlin.collections.toTypedArray' call
           var tmp0_toTypedArray = _this__u8e3s4.t26_1;
           tmp$ret$0 = copyToArray(tmp0_toTypedArray);
-          tmp = new WsEnum(_this__u8e3s4.s26_1.d27_1, tmp$ret$0);
+          tmp = new WsEnum(_this__u8e3s4.s26_1.d27_1, tmp_6, tmp$ret$0);
         } else {
           if (_this__u8e3s4 instanceof Refined) {
-            tmp = new WsRefined(_this__u8e3s4.j27_1.d27_1, _this__u8e3s4.k27_1.m27_1);
+            var tmp4_safe_receiver = _this__u8e3s4.i27_1;
+            var tmp_7;
+            var tmp_8 = tmp4_safe_receiver;
+            if ((tmp_8 == null ? null : new Comment(tmp_8)) == null) {
+              tmp_7 = null;
+            } else {
+              tmp_7 = _Comment___get_value__impl__8r3pla(tmp4_safe_receiver);
+            }
+            tmp = new WsRefined(_this__u8e3s4.j27_1.d27_1, tmp_7, _this__u8e3s4.k27_1.m27_1);
           } else {
             if (_this__u8e3s4 instanceof Union) {
+              var tmp5_safe_receiver = _this__u8e3s4.m28_1;
+              var tmp_9;
+              var tmp_10 = tmp5_safe_receiver;
+              if ((tmp_10 == null ? null : new Comment(tmp_10)) == null) {
+                tmp_9 = null;
+              } else {
+                tmp_9 = _Comment___get_value__impl__8r3pla(tmp5_safe_receiver);
+              }
+              var tmp_11 = tmp_9;
               var tmp$ret$4;
               // Inline function 'kotlin.collections.toTypedArray' call
               // Inline function 'kotlin.collections.map' call
@@ -1148,7 +1252,7 @@
                 tmp0_mapTo.s(tmp$ret$1);
               }
               tmp$ret$4 = copyToArray(tmp0_mapTo);
-              tmp = new WsUnion(_this__u8e3s4.n28_1.d27_1, tmp$ret$4);
+              tmp = new WsUnion(_this__u8e3s4.n28_1.d27_1, tmp_11, tmp$ret$4);
             } else {
               noWhenBranchMatchedException();
             }
@@ -1358,16 +1462,16 @@
       tmp = consume_0(_this__u8e3s4);
     } else {
       if (_this__u8e3s4 instanceof WsEnum) {
-        tmp = consume(_this__u8e3s4);
+        tmp = consume_1(_this__u8e3s4);
       } else {
         if (_this__u8e3s4 instanceof WsRefined) {
-          tmp = consume(_this__u8e3s4);
+          tmp = consume_2(_this__u8e3s4);
         } else {
           if (_this__u8e3s4 instanceof WsType) {
-            tmp = consume(_this__u8e3s4);
+            tmp = consume_3(_this__u8e3s4);
           } else {
             if (_this__u8e3s4 instanceof WsUnion) {
-              tmp = consume(_this__u8e3s4);
+              tmp = consume_4(_this__u8e3s4);
             } else {
               noWhenBranchMatchedException();
             }
@@ -1378,8 +1482,19 @@
     return tmp;
   }
   function consume_0(_this__u8e3s4) {
-    var tmp = Companion_getInstance().j28(_this__u8e3s4.b2d_1);
-    var tmp_0 = consume_1(_this__u8e3s4.method);
+    var tmp0_safe_receiver = _this__u8e3s4.comment;
+    var tmp;
+    if (tmp0_safe_receiver == null) {
+      tmp = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      // Inline function 'kotlin.contracts.contract' call
+      // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
+      tmp = _Comment___init__impl__cg8s2u(tmp0_safe_receiver);
+    }
+    var tmp_0 = tmp;
+    var tmp_1 = Companion_getInstance().j28(_this__u8e3s4.c2d_1);
+    var tmp_2 = consume_5(_this__u8e3s4.method);
     // Inline function 'kotlin.collections.map' call
     var tmp0_map = _this__u8e3s4.path;
     // Inline function 'kotlin.collections.mapTo' call
@@ -1389,12 +1504,12 @@
     while (inductionVariable < last) {
       var item = tmp0_map[inductionVariable];
       inductionVariable = inductionVariable + 1 | 0;
-      var tmp$ret$0;
+      var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
-      tmp$ret$0 = consume_2(item);
-      tmp0_mapTo.s(tmp$ret$0);
+      tmp$ret$2 = consume_6(item);
+      tmp0_mapTo.s(tmp$ret$2);
     }
-    var tmp_1 = tmp0_mapTo;
+    var tmp_3 = tmp0_mapTo;
     // Inline function 'kotlin.collections.map' call
     var tmp1_map = _this__u8e3s4.query;
     // Inline function 'kotlin.collections.mapTo' call
@@ -1404,12 +1519,12 @@
     while (inductionVariable_0 < last_0) {
       var item_0 = tmp1_map[inductionVariable_0];
       inductionVariable_0 = inductionVariable_0 + 1 | 0;
-      var tmp$ret$3;
+      var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
-      tmp$ret$3 = consume_3(item_0);
-      tmp0_mapTo_0.s(tmp$ret$3);
+      tmp$ret$5 = consume_7(item_0);
+      tmp0_mapTo_0.s(tmp$ret$5);
     }
-    var tmp_2 = tmp0_mapTo_0;
+    var tmp_4 = tmp0_mapTo_0;
     // Inline function 'kotlin.collections.map' call
     var tmp2_map = _this__u8e3s4.query;
     // Inline function 'kotlin.collections.mapTo' call
@@ -1419,12 +1534,12 @@
     while (inductionVariable_1 < last_1) {
       var item_1 = tmp2_map[inductionVariable_1];
       inductionVariable_1 = inductionVariable_1 + 1 | 0;
-      var tmp$ret$6;
+      var tmp$ret$8;
       // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
-      tmp$ret$6 = consume_3(item_1);
-      tmp0_mapTo_1.s(tmp$ret$6);
+      tmp$ret$8 = consume_7(item_1);
+      tmp0_mapTo_1.s(tmp$ret$8);
     }
-    var tmp_3 = tmp0_mapTo_1;
+    var tmp_5 = tmp0_mapTo_1;
     // Inline function 'kotlin.collections.map' call
     var tmp3_map = _this__u8e3s4.query;
     // Inline function 'kotlin.collections.mapTo' call
@@ -1434,12 +1549,12 @@
     while (inductionVariable_2 < last_2) {
       var item_2 = tmp3_map[inductionVariable_2];
       inductionVariable_2 = inductionVariable_2 + 1 | 0;
-      var tmp$ret$9;
+      var tmp$ret$11;
       // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
-      tmp$ret$9 = consume_3(item_2);
-      tmp0_mapTo_2.s(tmp$ret$9);
+      tmp$ret$11 = consume_7(item_2);
+      tmp0_mapTo_2.s(tmp$ret$11);
     }
-    var tmp_4 = tmp0_mapTo_2;
+    var tmp_6 = tmp0_mapTo_2;
     // Inline function 'kotlin.collections.map' call
     var tmp4_map = _this__u8e3s4.requests;
     // Inline function 'kotlin.collections.mapTo' call
@@ -1449,12 +1564,12 @@
     while (inductionVariable_3 < last_3) {
       var item_3 = tmp4_map[inductionVariable_3];
       inductionVariable_3 = inductionVariable_3 + 1 | 0;
-      var tmp$ret$12;
+      var tmp$ret$14;
       // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
-      tmp$ret$12 = consume_4(item_3);
-      tmp0_mapTo_3.s(tmp$ret$12);
+      tmp$ret$14 = consume_8(item_3);
+      tmp0_mapTo_3.s(tmp$ret$14);
     }
-    var tmp_5 = tmp0_mapTo_3;
+    var tmp_7 = tmp0_mapTo_3;
     // Inline function 'kotlin.collections.map' call
     var tmp5_map = _this__u8e3s4.responses;
     // Inline function 'kotlin.collections.mapTo' call
@@ -1464,14 +1579,106 @@
     while (inductionVariable_4 < last_4) {
       var item_4 = tmp5_map[inductionVariable_4];
       inductionVariable_4 = inductionVariable_4 + 1 | 0;
-      var tmp$ret$15;
+      var tmp$ret$17;
       // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
-      tmp$ret$15 = consume_5(item_4);
-      tmp0_mapTo_4.s(tmp$ret$15);
+      tmp$ret$17 = consume_9(item_4);
+      tmp0_mapTo_4.s(tmp$ret$17);
     }
-    return new Endpoint(null, tmp, tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, tmp_5, tmp0_mapTo_4);
+    return new Endpoint(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, tmp_5, tmp_6, tmp_7, tmp0_mapTo_4);
   }
   function consume_1(_this__u8e3s4) {
+    var tmp1_identifier = Companion_getInstance().j28(_this__u8e3s4.r2d_1);
+    var tmp0_safe_receiver = _this__u8e3s4.comment;
+    var tmp;
+    if (tmp0_safe_receiver == null) {
+      tmp = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      // Inline function 'kotlin.contracts.contract' call
+      // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
+      tmp = _Comment___init__impl__cg8s2u(tmp0_safe_receiver);
+    }
+    var tmp2_comment = tmp;
+    var tmp3_entries = toSet(_this__u8e3s4.entries);
+    return new Enum_0(tmp2_comment, tmp1_identifier, tmp3_entries);
+  }
+  function consume_2(_this__u8e3s4) {
+    var tmp1_identifier = Companion_getInstance().j28(_this__u8e3s4.v2d_1);
+    var tmp0_safe_receiver = _this__u8e3s4.comment;
+    var tmp;
+    if (tmp0_safe_receiver == null) {
+      tmp = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      // Inline function 'kotlin.contracts.contract' call
+      // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
+      tmp = _Comment___init__impl__cg8s2u(tmp0_safe_receiver);
+    }
+    var tmp2_comment = tmp;
+    var tmp3_validator = new Validator(_this__u8e3s4.validator);
+    return new Refined(tmp2_comment, tmp1_identifier, tmp3_validator);
+  }
+  function consume_3(_this__u8e3s4) {
+    var tmp1_identifier = Companion_getInstance().j28(_this__u8e3s4.x2c_1);
+    var tmp0_safe_receiver = _this__u8e3s4.comment;
+    var tmp;
+    if (tmp0_safe_receiver == null) {
+      tmp = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      // Inline function 'kotlin.contracts.contract' call
+      // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
+      tmp = _Comment___init__impl__cg8s2u(tmp0_safe_receiver);
+    }
+    var tmp2_comment = tmp;
+    // Inline function 'kotlin.collections.map' call
+    var tmp0_map = _this__u8e3s4.shape.value;
+    // Inline function 'kotlin.collections.mapTo' call
+    var tmp0_mapTo = ArrayList_init_$Create$(tmp0_map.length);
+    var inductionVariable = 0;
+    var last = tmp0_map.length;
+    while (inductionVariable < last) {
+      var item = tmp0_map[inductionVariable];
+      inductionVariable = inductionVariable + 1 | 0;
+      var tmp$ret$2;
+      // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
+      tmp$ret$2 = consume_7(item);
+      tmp0_mapTo.s(tmp$ret$2);
+    }
+    var tmp3_shape = new Shape(tmp0_mapTo);
+    return new Type(tmp2_comment, tmp1_identifier, tmp3_shape);
+  }
+  function consume_4(_this__u8e3s4) {
+    var tmp1_identifier = Companion_getInstance().j28(_this__u8e3s4.t2d_1);
+    var tmp0_safe_receiver = _this__u8e3s4.comment;
+    var tmp;
+    if (tmp0_safe_receiver == null) {
+      tmp = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      // Inline function 'kotlin.contracts.contract' call
+      // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
+      tmp = _Comment___init__impl__cg8s2u(tmp0_safe_receiver);
+    }
+    var tmp2_comment = tmp;
+    // Inline function 'kotlin.collections.map' call
+    var tmp0_map = _this__u8e3s4.entries;
+    // Inline function 'kotlin.collections.mapTo' call
+    var tmp0_mapTo = ArrayList_init_$Create$(tmp0_map.length);
+    var inductionVariable = 0;
+    var last = tmp0_map.length;
+    while (inductionVariable < last) {
+      var item = tmp0_map[inductionVariable];
+      inductionVariable = inductionVariable + 1 | 0;
+      var tmp$ret$2;
+      // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
+      tmp$ret$2 = consume_10(item);
+      tmp0_mapTo.s(tmp$ret$2);
+    }
+    var tmp3_entries = toSet_0(tmp0_mapTo);
+    return new Union(tmp2_comment, tmp1_identifier, tmp3_entries);
+  }
+  function consume_5(_this__u8e3s4) {
     var tmp;
     switch (_this__u8e3s4.d9_1) {
       case 0:
@@ -1504,27 +1711,27 @@
     }
     return tmp;
   }
-  function consume_2(_this__u8e3s4) {
+  function consume_6(_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof WsLiteral) {
       tmp = new Literal(_this__u8e3s4.value);
     } else {
       if (_this__u8e3s4 instanceof WsParam) {
-        tmp = new Param(consume_6(_this__u8e3s4.identifier), consume_7(_this__u8e3s4.reference));
+        tmp = new Param(consume_11(_this__u8e3s4.identifier), consume_10(_this__u8e3s4.reference));
       } else {
         noWhenBranchMatchedException();
       }
     }
     return tmp;
   }
-  function consume_3(_this__u8e3s4) {
-    return new Field(consume_6(_this__u8e3s4.identifier), consume_7(_this__u8e3s4.reference), _this__u8e3s4.isNullable);
+  function consume_7(_this__u8e3s4) {
+    return new Field(consume_11(_this__u8e3s4.identifier), consume_10(_this__u8e3s4.reference), _this__u8e3s4.isNullable);
   }
-  function consume_4(_this__u8e3s4) {
+  function consume_8(_this__u8e3s4) {
     var tmp0_safe_receiver = _this__u8e3s4.content;
-    return new Request(tmp0_safe_receiver == null ? null : consume_8(tmp0_safe_receiver));
+    return new Request(tmp0_safe_receiver == null ? null : consume_12(tmp0_safe_receiver));
   }
-  function consume_5(_this__u8e3s4) {
+  function consume_9(_this__u8e3s4) {
     // Inline function 'kotlin.collections.map' call
     var tmp0_map = _this__u8e3s4.headers;
     // Inline function 'kotlin.collections.mapTo' call
@@ -1536,17 +1743,14 @@
       inductionVariable = inductionVariable + 1 | 0;
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.lib.consume.<anonymous>' call
-      tmp$ret$0 = consume_3(item);
+      tmp$ret$0 = consume_7(item);
       tmp0_mapTo.s(tmp$ret$0);
     }
     var tmp = tmp0_mapTo;
     var tmp0_safe_receiver = _this__u8e3s4.content;
-    return new Response(_this__u8e3s4.status, tmp, tmp0_safe_receiver == null ? null : consume_8(tmp0_safe_receiver));
-  }
-  function consume_6(_this__u8e3s4) {
-    return Companion_getInstance().j28(_this__u8e3s4.value);
+    return new Response(_this__u8e3s4.status, tmp, tmp0_safe_receiver == null ? null : consume_12(tmp0_safe_receiver));
   }
-  function consume_7(_this__u8e3s4) {
+  function consume_10(_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof WsAny) {
       tmp = new Any(_this__u8e3s4.isIterable, _this__u8e3s4.isMap);
@@ -1558,7 +1762,7 @@
           tmp = new Custom(_this__u8e3s4.value, _this__u8e3s4.isIterable, _this__u8e3s4.isMap);
         } else {
           if (_this__u8e3s4 instanceof WsPrimitive) {
-            tmp = new Primitive(consume_9(_this__u8e3s4.type), _this__u8e3s4.isIterable, _this__u8e3s4.isMap);
+            tmp = new Primitive(consume_13(_this__u8e3s4.type), _this__u8e3s4.isIterable, _this__u8e3s4.isMap);
           } else {
             noWhenBranchMatchedException();
           }
@@ -1567,10 +1771,13 @@
     }
     return tmp;
   }
-  function consume_8(_this__u8e3s4) {
-    return new Content(_this__u8e3s4.type, consume_7(_this__u8e3s4.reference), _this__u8e3s4.isNullable);
+  function consume_11(_this__u8e3s4) {
+    return Companion_getInstance().j28(_this__u8e3s4.value);
   }
-  function consume_9(_this__u8e3s4) {
+  function consume_12(_this__u8e3s4) {
+    return new Content(_this__u8e3s4.type, consume_10(_this__u8e3s4.reference), _this__u8e3s4.isNullable);
+  }
+  function consume_13(_this__u8e3s4) {
     var tmp;
     switch (_this__u8e3s4.d9_1) {
       case 0:
@@ -1647,7 +1854,7 @@
     var tmp = this;
     tmp.logger = new Compiler$Companion$logger$1();
   }
-  protoOf(Companion).s2e = function () {
+  protoOf(Companion).u2e = function () {
     return this.logger;
   };
   var Companion_instance;
@@ -1674,7 +1881,7 @@
   };
   function Companion_0() {
     Companion_instance_0 = this;
-    this.t2e_1 = new KotlinEmitter(VOID, Companion_getInstance_2().logger);
+    this.v2e_1 = new KotlinEmitter(VOID, Companion_getInstance_2().logger);
   }
   var Companion_instance_0;
   function Companion_getInstance_3() {
@@ -1687,11 +1894,11 @@
     Compiler.call(this);
   }
   protoOf(WsToKotlin).compile = function (source) {
-    return produce_15(this.preCompile(source)(Companion_getInstance_3().t2e_1));
+    return produce_15(this.preCompile(source)(Companion_getInstance_3().v2e_1));
   };
   function Companion_1() {
     Companion_instance_1 = this;
-    this.u2e_1 = new TypeScriptEmitter(Companion_getInstance_2().logger);
+    this.w2e_1 = new TypeScriptEmitter(Companion_getInstance_2().logger);
   }
   var Companion_instance_1;
   function Companion_getInstance_4() {
@@ -1704,11 +1911,11 @@
     Compiler.call(this);
   }
   protoOf(WsToTypeScript).compile = function (source) {
-    return produce_15(this.preCompile(source)(Companion_getInstance_4().u2e_1));
+    return produce_15(this.preCompile(source)(Companion_getInstance_4().w2e_1));
   };
   function Companion_2() {
     Companion_instance_2 = this;
-    this.v2e_1 = new ScalaEmitter(VOID, Companion_getInstance_2().logger);
+    this.x2e_1 = new ScalaEmitter(VOID, Companion_getInstance_2().logger);
   }
   var Companion_instance_2;
   function Companion_getInstance_5() {
@@ -1721,11 +1928,11 @@
     Compiler.call(this);
   }
   protoOf(WsToScala).compile = function (source) {
-    return produce_15(this.preCompile(source)(Companion_getInstance_5().v2e_1));
+    return produce_15(this.preCompile(source)(Companion_getInstance_5().x2e_1));
   };
   function Companion_3() {
     Companion_instance_3 = this;
-    this.w2e_1 = new JavaEmitter(VOID, Companion_getInstance_2().logger);
+    this.y2e_1 = new JavaEmitter(VOID, Companion_getInstance_2().logger);
   }
   var Companion_instance_3;
   function Companion_getInstance_6() {
@@ -1738,11 +1945,11 @@
     Compiler.call(this);
   }
   protoOf(WsToJava).compile = function (source) {
-    return produce_15(this.preCompile(source)(Companion_getInstance_6().w2e_1));
+    return produce_15(this.preCompile(source)(Companion_getInstance_6().y2e_1));
   };
   function Companion_4() {
     Companion_instance_4 = this;
-    this.x2e_1 = new WirespecEmitter(Companion_getInstance_2().logger);
+    this.z2e_1 = new WirespecEmitter(Companion_getInstance_2().logger);
   }
   var Companion_instance_4;
   function Companion_getInstance_7() {
@@ -1755,7 +1962,7 @@
     Compiler.call(this);
   }
   protoOf(WsToWirespec).compile = function (source) {
-    return produce_15(this.preCompile(source)(Companion_getInstance_7().x2e_1));
+    return produce_15(this.preCompile(source)(Companion_getInstance_7().z2e_1));
   };
   function OpenApiV2Parser() {
     OpenApiV2Parser_instance = this;
@@ -1776,16 +1983,16 @@
     OpenApiV2ToTypescript_instance = this;
     var tmp = this;
     tmp.logger = new OpenApiV2ToTypescript$logger$1();
-    this.y2e_1 = new TypeScriptEmitter(this.logger);
+    this.a2f_1 = new TypeScriptEmitter(this.logger);
   }
-  protoOf(OpenApiV2ToTypescript).s2e = function () {
+  protoOf(OpenApiV2ToTypescript).u2e = function () {
     return this.logger;
   };
   protoOf(OpenApiV2ToTypescript).compile = function (source) {
     var ast = Companion_getInstance_0().u2b(source);
     // Inline function 'kotlin.collections.toTypedArray' call
     // Inline function 'kotlin.collections.map' call
-    var tmp0_map = this.y2e_1.c20(ast);
+    var tmp0_map = this.a2f_1.c20(ast);
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
     var tmp0_iterator = tmp0_map.v();
@@ -1813,16 +2020,16 @@
     OpenApiV2ToWirespec_instance = this;
     var tmp = this;
     tmp.logger = new OpenApiV2ToWirespec$logger$1();
-    this.z2e_1 = new WirespecEmitter(this.logger);
+    this.b2f_1 = new WirespecEmitter(this.logger);
   }
-  protoOf(OpenApiV2ToWirespec).s2e = function () {
+  protoOf(OpenApiV2ToWirespec).u2e = function () {
     return this.logger;
   };
   protoOf(OpenApiV2ToWirespec).compile = function (source) {
     var ast = Companion_getInstance_0().u2b(source);
     // Inline function 'kotlin.collections.toTypedArray' call
     // Inline function 'kotlin.collections.map' call
-    var tmp0_map = this.z2e_1.c20(ast);
+    var tmp0_map = this.b2f_1.c20(ast);
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
     var tmp0_iterator = tmp0_map.v();
@@ -1862,16 +2069,16 @@
     OpenApiV3ToTypescript_instance = this;
     var tmp = this;
     tmp.logger = new OpenApiV3ToTypescript$logger$1();
-    this.a2f_1 = new TypeScriptEmitter(this.logger);
+    this.c2f_1 = new TypeScriptEmitter(this.logger);
   }
-  protoOf(OpenApiV3ToTypescript).s2e = function () {
+  protoOf(OpenApiV3ToTypescript).u2e = function () {
     return this.logger;
   };
   protoOf(OpenApiV3ToTypescript).compile = function (source) {
     var ast = Companion_getInstance_1().l2c(source);
     // Inline function 'kotlin.collections.toTypedArray' call
     // Inline function 'kotlin.collections.map' call
-    var tmp0_map = this.a2f_1.c20(ast);
+    var tmp0_map = this.c2f_1.c20(ast);
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
     var tmp0_iterator = tmp0_map.v();
@@ -1899,16 +2106,16 @@
     OpenApiV3ToWirespec_instance = this;
     var tmp = this;
     tmp.logger = new OpenApiV3ToWirespec$logger$1();
-    this.b2f_1 = new WirespecEmitter(this.logger);
+    this.d2f_1 = new WirespecEmitter(this.logger);
   }
-  protoOf(OpenApiV3ToWirespec).s2e = function () {
+  protoOf(OpenApiV3ToWirespec).u2e = function () {
     return this.logger;
   };
   protoOf(OpenApiV3ToWirespec).compile = function (source) {
     var ast = Companion_getInstance_1().l2c(source);
     // Inline function 'kotlin.collections.toTypedArray' call
     // Inline function 'kotlin.collections.map' call
-    var tmp0_map = this.b2f_1.c20(ast);
+    var tmp0_map = this.d2f_1.c20(ast);
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
     var tmp0_iterator = tmp0_map.v();
@@ -1942,10 +2149,10 @@
     this.result = result;
     this.errors = errors;
   }
-  protoOf(WsCompilationResult).c2f = function () {
+  protoOf(WsCompilationResult).e2f = function () {
     return this.result;
   };
-  protoOf(WsCompilationResult).d2f = function () {
+  protoOf(WsCompilationResult).f2f = function () {
     return this.errors;
   };
   function WsCompiled(value) {
@@ -1970,10 +2177,10 @@
     this.result = result;
     this.errors = errors;
   }
-  protoOf(WsParseResult).c2f = function () {
+  protoOf(WsParseResult).e2f = function () {
     return this.result;
   };
-  protoOf(WsParseResult).d2f = function () {
+  protoOf(WsParseResult).f2f = function () {
     return this.errors;
   };
   function WsStringResult(result, errors) {
@@ -1982,20 +2189,20 @@
     this.result = result;
     this.errors = errors;
   }
-  protoOf(WsStringResult).c2f = function () {
+  protoOf(WsStringResult).e2f = function () {
     return this.result;
   };
-  protoOf(WsStringResult).d2f = function () {
+  protoOf(WsStringResult).f2f = function () {
     return this.errors;
   };
   function WsEmitted(typeName, result) {
     this.typeName = typeName;
     this.result = result;
   }
-  protoOf(WsEmitted).e2f = function () {
+  protoOf(WsEmitted).g2f = function () {
     return this.typeName;
   };
-  protoOf(WsEmitted).c2f = function () {
+  protoOf(WsEmitted).e2f = function () {
     return this.result;
   };
   function produce_14(_this__u8e3s4) {
@@ -2139,10 +2346,10 @@
     this.tokens = tokens;
     this.error = error;
   }
-  protoOf(WsTokenResult).f2f = function () {
+  protoOf(WsTokenResult).h2f = function () {
     return this.tokens;
   };
-  protoOf(WsTokenResult).g2f = function () {
+  protoOf(WsTokenResult).i2f = function () {
     return this.error;
   };
   protoOf(WsTokenResult).gd = function () {
@@ -2151,13 +2358,13 @@
   protoOf(WsTokenResult).hd = function () {
     return this.error;
   };
-  protoOf(WsTokenResult).h2f = function (tokens, error) {
+  protoOf(WsTokenResult).j2f = function (tokens, error) {
     return new WsTokenResult(tokens, error);
   };
   protoOf(WsTokenResult).copy = function (tokens, error, $super) {
     tokens = tokens === VOID ? this.tokens : tokens;
     error = error === VOID ? this.error : error;
-    return this.h2f(tokens, error);
+    return this.j2f(tokens, error);
   };
   protoOf(WsTokenResult).toString = function () {
     return 'WsTokenResult(tokens=' + this.tokens + ', error=' + this.error + ')';
@@ -2202,12 +2409,12 @@
   protoOf(WsTokens).gd = function () {
     return this.value;
   };
-  protoOf(WsTokens).i2f = function (value) {
+  protoOf(WsTokens).k2f = function (value) {
     return new WsTokens(value);
   };
   protoOf(WsTokens).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return this.i2f(value);
+    return this.k2f(value);
   };
   protoOf(WsTokens).toString = function () {
     return 'WsTokens(value=' + toString(this.value) + ')';
@@ -2218,13 +2425,13 @@
     this.value = value;
     this.coordinates = coordinates;
   }
-  protoOf(WsToken).k2e = function () {
+  protoOf(WsToken).m2e = function () {
     return this.type;
   };
   protoOf(WsToken).p2 = function () {
     return this.value;
   };
-  protoOf(WsToken).j2f = function () {
+  protoOf(WsToken).l2f = function () {
     return this.coordinates;
   };
   protoOf(WsToken).gd = function () {
@@ -2236,14 +2443,14 @@
   protoOf(WsToken).ah = function () {
     return this.coordinates;
   };
-  protoOf(WsToken).k2f = function (type, value, coordinates) {
+  protoOf(WsToken).m2f = function (type, value, coordinates) {
     return new WsToken(type, value, coordinates);
   };
   protoOf(WsToken).copy = function (type, value, coordinates, $super) {
     type = type === VOID ? this.type : type;
     value = value === VOID ? this.value : value;
     coordinates = coordinates === VOID ? this.coordinates : coordinates;
-    return this.k2f(type, value, coordinates);
+    return this.m2f(type, value, coordinates);
   };
   protoOf(WsToken).toString = function () {
     return 'WsToken(type=' + this.type + ', value=' + this.value + ', coordinates=' + this.coordinates + ')';
@@ -2276,13 +2483,13 @@
     this.position = position;
     this.idxAndLength = idxAndLength;
   }
-  protoOf(WsCoordinates).l2f = function () {
+  protoOf(WsCoordinates).n2f = function () {
     return this.line;
   };
   protoOf(WsCoordinates).jr = function () {
     return this.position;
   };
-  protoOf(WsCoordinates).m2f = function () {
+  protoOf(WsCoordinates).o2f = function () {
     return this.idxAndLength;
   };
   protoOf(WsCoordinates).gd = function () {
@@ -2294,14 +2501,14 @@
   protoOf(WsCoordinates).ah = function () {
     return this.idxAndLength;
   };
-  protoOf(WsCoordinates).n2f = function (line, position, idxAndLength) {
+  protoOf(WsCoordinates).p2f = function (line, position, idxAndLength) {
     return new WsCoordinates(line, position, idxAndLength);
   };
   protoOf(WsCoordinates).copy = function (line, position, idxAndLength, $super) {
     line = line === VOID ? this.line : line;
     position = position === VOID ? this.position : position;
     idxAndLength = idxAndLength === VOID ? this.idxAndLength : idxAndLength;
-    return this.n2f(line, position, idxAndLength);
+    return this.p2f(line, position, idxAndLength);
   };
   protoOf(WsCoordinates).toString = function () {
     return 'WsCoordinates(line=' + this.line + ', position=' + this.position + ', idxAndLength=' + this.idxAndLength + ')';
@@ -2332,7 +2539,7 @@
     this.idx = idx;
     this.length = length;
   }
-  protoOf(WsIndex).o2f = function () {
+  protoOf(WsIndex).q2f = function () {
     return this.idx;
   };
   protoOf(WsIndex).a = function () {
@@ -2344,13 +2551,13 @@
   protoOf(WsIndex).hd = function () {
     return this.length;
   };
-  protoOf(WsIndex).p2f = function (idx, length) {
+  protoOf(WsIndex).r2f = function (idx, length) {
     return new WsIndex(idx, length);
   };
   protoOf(WsIndex).copy = function (idx, length, $super) {
     idx = idx === VOID ? this.idx : idx;
     length = length === VOID ? this.length : length;
-    return this.p2f(idx, length);
+    return this.r2f(idx, length);
   };
   protoOf(WsIndex).toString = function () {
     return 'WsIndex(idx=' + this.idx + ', length=' + this.length + ')';
@@ -2403,7 +2610,7 @@
     this.length = length;
     this.value = value;
   }
-  protoOf(WsError).q2f = function () {
+  protoOf(WsError).s2f = function () {
     return this.index;
   };
   protoOf(WsError).a = function () {
@@ -2421,14 +2628,14 @@
   protoOf(WsError).ah = function () {
     return this.value;
   };
-  protoOf(WsError).r2f = function (index, length, value) {
+  protoOf(WsError).t2f = function (index, length, value) {
     return new WsError(index, length, value);
   };
   protoOf(WsError).copy = function (index, length, value, $super) {
     index = index === VOID ? this.index : index;
     length = length === VOID ? this.length : length;
     value = value === VOID ? this.value : value;
-    return this.r2f(index, length, value);
+    return this.t2f(index, length, value);
   };
   protoOf(WsError).toString = function () {
     return 'WsError(index=' + this.index + ', length=' + this.length + ', value=' + this.value + ')';
@@ -2459,20 +2666,20 @@
     return new WsError(tmp, _this__u8e3s4.b29_1.a29_1.n2a_1, tmp0_elvis_lhs == null ? 'No message' : tmp0_elvis_lhs);
   }
   //region block: post-declaration
-  defineProp(protoOf(WsType), 'name', function () {
-    return this.wa();
+  defineProp(protoOf(WsType), 'identifier', function () {
+    return this.n21();
   }, VOID);
-  defineProp(protoOf(WsEndpoint), 'name', function () {
-    return this.wa();
+  defineProp(protoOf(WsEndpoint), 'identifier', function () {
+    return this.n21();
   }, VOID);
-  defineProp(protoOf(WsEnum), 'name', function () {
-    return this.wa();
+  defineProp(protoOf(WsEnum), 'identifier', function () {
+    return this.n21();
   }, VOID);
-  defineProp(protoOf(WsUnion), 'name', function () {
-    return this.wa();
+  defineProp(protoOf(WsUnion), 'identifier', function () {
+    return this.n21();
   }, VOID);
-  defineProp(protoOf(WsRefined), 'name', function () {
-    return this.wa();
+  defineProp(protoOf(WsRefined), 'identifier', function () {
+    return this.n21();
   }, VOID);
   defineProp(protoOf(WsMethod), 'name', protoOf(WsMethod).wa, VOID);
   defineProp(protoOf(WsMethod), 'ordinal', protoOf(WsMethod).xa, VOID);
@@ -2529,7 +2736,7 @@
     defineProp($community$flock$wirespec$compiler$lib.WsMethod, 'TRACE', WsMethod_TRACE_getInstance, VOID);
     $community$flock$wirespec$compiler$lib.WsLiteral = WsLiteral;
     $community$flock$wirespec$compiler$lib.WsParam = WsParam;
-    $community$flock$wirespec$compiler$lib.Shape = Shape;
+    $community$flock$wirespec$compiler$lib.Shape = Shape_0;
     $community$flock$wirespec$compiler$lib.WsField = WsField;
     $community$flock$wirespec$compiler$lib.WsIdentifier = WsIdentifier;
     $community$flock$wirespec$compiler$lib.WsAny = WsAny;