@flock/wirespec 0.8.9 → 0.8.11

package/wirespec-src-compiler-core.js

@@ -93,40 +93,40 @@
   setMetadataFor(Reported, 'Reported', classMeta, Enum);
   setMetadataFor(Wirespec, 'Wirespec', objectMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Type', block);
+    return logger.nl('Emitting Definition: Refined', block);
   }
   function withLogging_0(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Type Shape', block);
+    return logger.nl('Emitting Definition: Refined Validator', block);
   }
+  setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_1(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Type Shape Field', block);
+    return logger.nl('Emitting Definition: Type', block);
   }
   function withLogging_2(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Type Shape Field Key', block);
+    return logger.nl('Emitting Definition: Type Shape', block);
   }
   function withLogging_3(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Type Shape Field Value', block);
+    return logger.nl('Emitting Definition: Type Shape Field', block);
   }
-  setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_4(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Endpoint', block);
+    return logger.nl('Emitting Definition: Type Shape Field Key', block);
   }
   function withLogging_5(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Endpoint Segment', block);
+    return logger.nl('Emitting Definition: Type Shape Field Value', block);
   }
-  setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
+  setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_6(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Refined', block);
+    return logger.nl('Emitting Definition: Endpoint', block);
   }
+  setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_7(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Refined Validator', block);
+    return logger.nl('Emitting Definition: Endpoint', block);
   }
-  setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_8(_this__u8e3s4, logger, block) {
-    return logger.ml('Emitting Definition: Endpoint', block);
+    return logger.nl('Emitting Definition: Endpoint Segment', block);
   }
-  setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
-  setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [TypeDefinitionEmitterLogger, EndpointDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger, EnumDefinitionEmitterLogger]);
+  setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
+  setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [RefinedTypeDefinitionEmitterLogger, TypeDefinitionEmitterLogger, EnumDefinitionEmitterLogger, EndpointDefinitionEmitterLogger]);
   setMetadataFor(JavaEmitter, 'JavaEmitter', classMeta, Emitter);
   setMetadataFor(Companion, 'Companion', objectMeta);
   setMetadataFor(KotlinEmitter, 'KotlinEmitter', classMeta, Emitter);
@@ -1477,7 +1477,7 @@
       }
       tmp$ret$1 = tmp0_mapIndexedTo;
       tmp$ret$2 = tmp$ret$1;
-      return this$0.xk(joinToString(tmp$ret$2, ''));
+      return this$0.yk(this$0.xk(joinToString(tmp$ret$2, '')));
     };
   }
   function KotlinEmitter$emit$lambda_3($this_emit) {
@@ -1528,7 +1528,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.yk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.zk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -1872,7 +1872,7 @@
   }
   function KotlinEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + this$0.oj(it.lj_1) + '" to listOf(' + this$0.oj(it.lj_1) + ')';
+      return '"' + it.lj_1.pj_1 + '" to listOf(' + this$0.oj(it.lj_1) + ')';
     };
   }
   function KotlinEmitter$emit$lambda_8($this_emit) {
@@ -1977,6 +1977,9 @@
   protoOf(KotlinEmitter).xk = function (_this__u8e3s4) {
     return Companion_getInstance_0().wk_1.j1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
   };
+  protoOf(KotlinEmitter).yk = function (_this__u8e3s4) {
+    return replace(_this__u8e3s4, '.', '');
+  };
   function toField(_this__u8e3s4, identifier, isNullable) {
     return new Field(new Identifier(identifier), _this__u8e3s4, isNullable);
   }
@@ -2003,7 +2006,7 @@
   }
   function Companion_0() {
     Companion_instance_0 = this;
-    this.zk_1 = listOf(['abstract', 'case', 'catch', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', 'finally', 'for', 'forSome', 'if', 'implicit', 'import', 'lazy', 'match', 'new', 'null', 'object', 'override', 'package', 'private', 'protected', 'return', 'sealed', 'super', 'this', 'throw', 'trait', 'true', 'try', 'type', 'val', 'var', 'while', 'with', 'yield']);
+    this.al_1 = listOf(['abstract', 'case', 'catch', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', 'finally', 'for', 'forSome', 'if', 'implicit', 'import', 'lazy', 'match', 'new', 'null', 'object', 'override', 'package', 'private', 'protected', 'return', 'sealed', 'super', 'this', 'throw', 'trait', 'true', 'try', 'type', 'val', 'var', 'while', 'with', 'yield']);
   }
   var Companion_instance_0;
   function Companion_getInstance_1() {
@@ -2034,7 +2037,7 @@
   }
   function ScalaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return Companion_getInstance_1().zk_1.j1($this_emit.pj_1) ? '`' + $this_emit.pj_1 + '`' : $this_emit.pj_1;
+      return Companion_getInstance_1().al_1.j1($this_emit.pj_1) ? '`' + $this_emit.pj_1 + '`' : $this_emit.pj_1;
     };
   }
   function ScalaEmitter$emit$lambda_3($this_emit) {
@@ -2132,8 +2135,8 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.cl_1 = packageName;
-    this.dl_1 = '';
+    this.dl_1 = packageName;
+    this.el_1 = '';
   }
   protoOf(ScalaEmitter).ci = function (ast) {
     // Inline function 'kotlin.collections.map' call
@@ -2147,7 +2150,7 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>' call
       var name = item.j3();
       var result = item.k3();
-      tmp$ret$0 = to(name, isBlank(this.cl_1) ? '' : 'package ' + this.cl_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, isBlank(this.dl_1) ? '' : 'package ' + this.dl_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     return tmp0_mapTo;
@@ -2279,7 +2282,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.yk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.zk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -2401,7 +2404,7 @@
   function TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit) {
     return function (it) {
       var tmp = Companion_getInstance_2().ck(emitName(it, this$0));
-      var tmp_0 = Companion_getInstance_2().il($this_emit, it.ii_1);
+      var tmp_0 = Companion_getInstance_2().jl($this_emit, it.ii_1);
       var tmp_1 = joinToString(tmp_0, ',', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda$lambda(this$0));
       var tmp_2 = emitPath_1($this_emit.ti_1, this$0);
       var tmp_3 = emitMap_1($this_emit.ui_1, this$0);
@@ -2495,13 +2498,13 @@
   function TypeScriptEmitter(logger) {
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.gl_1 = '';
+    this.hl_1 = '';
     var tmp = this;
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    tmp.hl_1 = trimMargin('\n        |export namespace WirespecShared {\n        |' + '  ' + 'type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
+    tmp.il_1 = trimMargin('\n        |export namespace WirespecShared {\n        |' + '  ' + 'type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
   }
   protoOf(TypeScriptEmitter).ci = function (ast) {
     // Inline function 'kotlin.collections.map' call
@@ -2517,7 +2520,7 @@
       var result = item.k3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_2().gi(ast) ? this.hl_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_2().gi(ast) ? this.il_1 : '') + '\n                    |' + result + '\n            ');
       tmp$ret$0 = toString(trimStart(isCharSequence(tmp0_trimStart) ? tmp0_trimStart : THROW_CCE()));
       tmp$ret$1 = to(name, tmp$ret$0);
       tmp0_mapTo.a(tmp$ret$1);
@@ -2644,7 +2647,7 @@
   function WirespecEmitter(logger) {
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.ll_1 = '';
+    this.ml_1 = '';
   }
   protoOf(WirespecEmitter).ek = function (_this__u8e3s4) {
     return this.fk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
@@ -2748,7 +2751,7 @@
     }
     return tmp$ret$0;
   };
-  protoOf(Companion_1).il = function (_this__u8e3s4, content) {
+  protoOf(Companion_1).jl = function (_this__u8e3s4, content) {
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.filterIsInstance' call
     var tmp0_filterIsInstance = _this__u8e3s4.ti_1;
@@ -2859,7 +2862,7 @@
   }
   function WrongTokenException(expected, actual) {
     Companion_getInstance_3();
-    ParserException.call(this, actual.pl_1, '' + expected.kc() + ' expected, not: ' + actual.nl_1.ql() + ' at line ' + actual.pl_1.rl_1 + ' and position ' + (actual.pl_1.sl_1 - actual.ol_1.length | 0));
+    ParserException.call(this, actual.ql_1, '' + expected.kc() + ' expected, not: ' + actual.ol_1.rl() + ' at line ' + actual.ql_1.sl_1 + ' and position ' + (actual.ql_1.tl_1 - actual.pl_1.length | 0));
     captureStack(this, WrongTokenException);
   }
   function NullTokenException(message, coordinates) {
@@ -2877,15 +2880,15 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.ul_1 = coordinates;
+    this.vl_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     // Inline function 'arrow.core.NonEmptyList.map' call
     // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
     var tmp0_anonymous = _this__u8e3s4.zg_1;
     var tmp;
-    if (tmp0_anonymous.nl_1 instanceof CustomRegex) {
-      tmp = tmp0_anonymous.vl(VOID, '"' + dropLast(drop(tmp0_anonymous.ol_1, 1), 2) + '"');
+    if (tmp0_anonymous.ol_1 instanceof CustomRegex) {
+      tmp = tmp0_anonymous.wl(VOID, '"' + dropLast(drop(tmp0_anonymous.pl_1, 1), 2) + '"');
     } else {
       tmp = tmp0_anonymous;
     }
@@ -2900,8 +2903,8 @@
       var tmp$ret$1;
       // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
       var tmp_1;
-      if (item.nl_1 instanceof CustomRegex) {
-        tmp_1 = item.vl(VOID, '"' + dropLast(drop(item.ol_1, 1), 2) + '"');
+      if (item.ol_1 instanceof CustomRegex) {
+        tmp_1 = item.wl(VOID, '"' + dropLast(drop(item.pl_1, 1), 2) + '"');
       } else {
         tmp_1 = item;
       }
@@ -2921,25 +2924,25 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
       var method = raise.kh(parseEndpointMethod(_this__u8e3s4, $this));
       var path = raise.kh(parseEndpointPath(_this__u8e3s4, $this));
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.zl_1.ol_1 instanceof LeftCurly) {
         tmp_0 = Unit_getInstance();
       } else {
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         tmp$ret$0 = new WrongTokenException(getKClass(LeftCurly), tmp1_invoke);
         raise.jh(tmp$ret$0);
       }
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
+      raise.kh(_this__u8e3s4.bm());
       var responses = raise.kh(parseEndpointResponses(_this__u8e3s4, $this));
       var res = new Endpoint(name, method, path, emptyList(), emptyList(), emptyList(), emptyList(), responses);
       raise.hh();
@@ -2977,12 +2980,12 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointMethod.<anonymous>' call
-      $this.cm(_this__u8e3s4.yl_1);
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.yl_1.nl_1;
+      var tmp0_subject = _this__u8e3s4.zl_1.ol_1;
       var tmp_0;
       if (isInterface(tmp0_subject, Method_0)) {
-        var tmp_1 = _this__u8e3s4.yl_1.nl_1;
+        var tmp_1 = _this__u8e3s4.zl_1.ol_1;
         var tmp1_subject = isInterface(tmp_1, Method_0) ? tmp_1 : THROW_CCE();
         var tmp_2;
         if (equals(tmp1_subject, DELETE_getInstance())) {
@@ -3009,14 +3012,14 @@
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         tmp$ret$0 = new WrongTokenException(getKClass(Method_0), tmp1_invoke);
         raise.jh(tmp$ret$0);
       }
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointMethod.<anonymous>.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
+      raise.kh(_this__u8e3s4.bm());
       var res = tmp2_also;
       raise.hh();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -3053,25 +3056,25 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointPath.<anonymous>' call
-      $this.cm(_this__u8e3s4.yl_1);
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof Path) {
+      if (_this__u8e3s4.zl_1.ol_1 instanceof Path) {
         // Inline function 'arrow.core.nel' call
-        var tmp0_nel = new Literal(drop(_this__u8e3s4.yl_1.ol_1, 1));
+        var tmp0_nel = new Literal(drop(_this__u8e3s4.zl_1.pl_1, 1));
         tmp_0 = nonEmptyListOf(tmp0_nel, []);
       } else {
         var tmp$ret$1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp2_invoke = _this__u8e3s4.yl_1;
+        var tmp2_invoke = _this__u8e3s4.zl_1;
         tmp$ret$1 = new WrongTokenException(getKClass(Path), tmp2_invoke);
         raise.jh(tmp$ret$1);
       }
       var tmp3_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointPath.<anonymous>.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
+      raise.kh(_this__u8e3s4.bm());
       var res = tmp3_also;
       raise.hh();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -3108,40 +3111,40 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>' call
-      $this.cm(_this__u8e3s4.yl_1);
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.collections.mutableListOf' call
       var responses = ArrayList_init_$Create$();
       $l$loop: while (true) {
-        var tmp_0 = _this__u8e3s4.yl_1.nl_1;
+        var tmp_0 = _this__u8e3s4.zl_1.ol_1;
         if (!!(tmp_0 instanceof RightCurly)) {
           break $l$loop;
         }
-        if (_this__u8e3s4.yl_1.nl_1 instanceof StatusCode) {
-          responses.a(raise.kh(parseEndpointResponse(_this__u8e3s4, $this, _this__u8e3s4.yl_1.ol_1)));
+        if (_this__u8e3s4.zl_1.ol_1 instanceof StatusCode) {
+          responses.a(raise.kh(parseEndpointResponse(_this__u8e3s4, $this, _this__u8e3s4.zl_1.pl_1)));
         } else {
           var tmp$ret$1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_3();
-          var tmp1_invoke = _this__u8e3s4.yl_1;
+          var tmp1_invoke = _this__u8e3s4.zl_1;
           tmp$ret$1 = new WrongTokenException(getKClass(StatusCode), tmp1_invoke);
           raise.jh(tmp$ret$1);
         }
       }
       // Inline function 'kotlin.also' call
       var tmp_1;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof RightCurly) {
+      if (_this__u8e3s4.zl_1.ol_1 instanceof RightCurly) {
         tmp_1 = Unit_getInstance();
       } else {
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp3_invoke = _this__u8e3s4.yl_1;
+        var tmp3_invoke = _this__u8e3s4.zl_1;
         tmp$ret$2 = new WrongTokenException(getKClass(RightCurly), tmp3_invoke);
         raise.jh(tmp$ret$2);
       }
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
+      raise.kh(_this__u8e3s4.bm());
       var res = toList(responses);
       raise.hh();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -3178,28 +3181,28 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
-      if (!(_this__u8e3s4.yl_1.nl_1 instanceof Arrow)) {
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
+      if (!(_this__u8e3s4.zl_1.ol_1 instanceof Arrow)) {
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         tmp$ret$0 = new WrongTokenException(getKClass(Arrow), tmp1_invoke);
         raise.jh(tmp$ret$0);
       }
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
-      var tmp1_subject = _this__u8e3s4.yl_1.nl_1;
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
+      var tmp1_subject = _this__u8e3s4.zl_1.ol_1;
       var tmp_0;
       if (isInterface(tmp1_subject, WirespecType)) {
-        var tmp_1 = _this__u8e3s4.yl_1.nl_1;
-        tmp_0 = raise.kh(parseContent(_this__u8e3s4, $this, isInterface(tmp_1, WirespecType) ? tmp_1 : THROW_CCE(), _this__u8e3s4.yl_1.ol_1));
+        var tmp_1 = _this__u8e3s4.zl_1.ol_1;
+        tmp_0 = raise.kh(parseContent(_this__u8e3s4, $this, isInterface(tmp_1, WirespecType) ? tmp_1 : THROW_CCE(), _this__u8e3s4.zl_1.pl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp3_invoke = _this__u8e3s4.yl_1;
+        var tmp3_invoke = _this__u8e3s4.zl_1;
         tmp$ret$1 = new WrongTokenException(getKClass(WirespecType), tmp3_invoke);
         raise.jh(tmp$ret$1);
       }
@@ -3240,15 +3243,15 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseContent.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.yl_1.nl_1;
+      var tmp_0 = _this__u8e3s4.zl_1.ol_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseContent.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
       var isIterable = tmp0_also;
       var tmp_1;
       if (wsType instanceof WsString) {
@@ -3297,7 +3300,7 @@
   function EndpointParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(EndpointParser).em = function (_this__u8e3s4) {
+  protoOf(EndpointParser).fm = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -3308,20 +3311,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      this.dm(_this__u8e3s4.zl_1);
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof CustomType) {
-        tmp_0 = raise.kh(parseEndpointDefinition(_this__u8e3s4, this, _this__u8e3s4.yl_1.ol_1));
+      if (_this__u8e3s4.zl_1.ol_1 instanceof CustomType) {
+        tmp_0 = raise.kh(parseEndpointDefinition(_this__u8e3s4, this, _this__u8e3s4.zl_1.pl_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also);
       }
       var res = tmp_0;
@@ -3360,37 +3363,37 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.zl_1.ol_1 instanceof LeftCurly) {
         tmp_0 = new Enum_0(typeName, raise.kh(parseEnumTypeEntries(_this__u8e3s4, $this)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         var tmp2_also = new WrongTokenException(getKClass(LeftCurly), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also);
       }
       var tmp3_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-      if (_this__u8e3s4.yl_1.nl_1 instanceof RightCurly)
-        raise.kh(_this__u8e3s4.am());
+      if (_this__u8e3s4.zl_1.ol_1 instanceof RightCurly)
+        raise.kh(_this__u8e3s4.bm());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke_0 = _this__u8e3s4.yl_1;
+        var tmp1_invoke_0 = _this__u8e3s4.zl_1;
         var tmp2_also_0 = new WrongTokenException(getKClass(RightCurly), tmp1_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also_0);
       }
       var res = tmp3_also;
@@ -3429,34 +3432,34 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof CustomType) {
+      if (_this__u8e3s4.zl_1.ol_1 instanceof CustomType) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var tmp0_apply = ArrayList_init_$Create$();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        tmp0_apply.a(_this__u8e3s4.yl_1.ol_1);
-        raise.kh(_this__u8e3s4.am());
-        while (equals(_this__u8e3s4.yl_1.nl_1, Comma_getInstance())) {
-          raise.kh(_this__u8e3s4.am());
-          if (_this__u8e3s4.yl_1.nl_1 instanceof CustomType) {
+        tmp0_apply.a(_this__u8e3s4.zl_1.pl_1);
+        raise.kh(_this__u8e3s4.bm());
+        while (equals(_this__u8e3s4.zl_1.ol_1, Comma_getInstance())) {
+          raise.kh(_this__u8e3s4.bm());
+          if (_this__u8e3s4.zl_1.ol_1 instanceof CustomType) {
             // Inline function 'kotlin.also' call
-            tmp0_apply.a(_this__u8e3s4.yl_1.ol_1);
+            tmp0_apply.a(_this__u8e3s4.zl_1.pl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.kh(_this__u8e3s4.am());
+            raise.kh(_this__u8e3s4.bm());
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
             Companion_getInstance_3();
-            var tmp2_invoke = _this__u8e3s4.yl_1;
+            var tmp2_invoke = _this__u8e3s4.zl_1;
             var tmp3_also = new WrongTokenException(getKClass(CustomType), tmp2_invoke);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.kh(_this__u8e3s4.am());
+            raise.kh(_this__u8e3s4.bm());
             raise.jh(tmp3_also);
           }
         }
@@ -3465,11 +3468,11 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp2_invoke_0 = _this__u8e3s4.yl_1;
+        var tmp2_invoke_0 = _this__u8e3s4.zl_1;
         var tmp3_also_0 = new WrongTokenException(getKClass(CustomType), tmp2_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp3_also_0);
       }
       var res = toSet(tmp_0);
@@ -3500,7 +3503,7 @@
   function EnumParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(EnumParser).gm = function (_this__u8e3s4) {
+  protoOf(EnumParser).hm = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -3511,20 +3514,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      this.dm(_this__u8e3s4.zl_1);
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof CustomType) {
-        tmp_0 = raise.kh(parseEnumTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.yl_1.ol_1));
+      if (_this__u8e3s4.zl_1.ol_1 instanceof CustomType) {
+        tmp_0 = raise.kh(parseEnumTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.zl_1.pl_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also);
       }
       var res = tmp_0;
@@ -3643,11 +3646,11 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>' call
-      $this.cm(_this__u8e3s4.yl_1);
-      var tmp0_subject = _this__u8e3s4.yl_1.nl_1;
+      $this.dm(_this__u8e3s4.zl_1);
+      var tmp0_subject = _this__u8e3s4.zl_1.ol_1;
       var tmp_0;
       if (isInterface(tmp0_subject, WirespecDefinition)) {
-        var tmp_1 = _this__u8e3s4.yl_1.nl_1;
+        var tmp_1 = _this__u8e3s4.zl_1.ol_1;
         var tmp1_subject = isInterface(tmp_1, WirespecDefinition) ? tmp_1 : THROW_CCE();
         var tmp_2;
         if (tmp1_subject instanceof WsTypeDef) {
@@ -3655,7 +3658,7 @@
           // Inline function 'kotlin.with' call
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-          tmp$ret$1 = $this.vh_1.km(_this__u8e3s4);
+          tmp$ret$1 = $this.vh_1.lm(_this__u8e3s4);
           tmp_2 = raise.kh(tmp$ret$1);
         } else {
           if (tmp1_subject instanceof WsEnumTypeDef) {
@@ -3663,7 +3666,7 @@
             // Inline function 'kotlin.with' call
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            tmp$ret$3 = $this.wh_1.gm(_this__u8e3s4);
+            tmp$ret$3 = $this.wh_1.hm(_this__u8e3s4);
             tmp_2 = raise.kh(tmp$ret$3);
           } else {
             if (tmp1_subject instanceof WsRefinedTypeDef) {
@@ -3671,7 +3674,7 @@
               // Inline function 'kotlin.with' call
               // Inline function 'kotlin.contracts.contract' call
               // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-              tmp$ret$5 = $this.xh_1.im(_this__u8e3s4);
+              tmp$ret$5 = $this.xh_1.jm(_this__u8e3s4);
               tmp_2 = raise.kh(tmp$ret$5);
             } else {
               if (tmp1_subject instanceof WsEndpointDef) {
@@ -3679,7 +3682,7 @@
                 // Inline function 'kotlin.with' call
                 // Inline function 'kotlin.contracts.contract' call
                 // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-                tmp$ret$7 = $this.yh_1.em(_this__u8e3s4);
+                tmp$ret$7 = $this.yh_1.fm(_this__u8e3s4);
                 tmp_2 = raise.kh(tmp$ret$7);
               } else {
                 noWhenBranchMatchedException();
@@ -3692,11 +3695,11 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp5_invoke = _this__u8e3s4.yl_1;
+        var tmp5_invoke = _this__u8e3s4.zl_1;
         var tmp6_also = new WrongTokenException(getKClass(WirespecDefinition), tmp5_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp6_also);
       }
       var res = tmp_0;
@@ -3732,13 +3735,13 @@
     this.yh_1 = new EndpointParser(logger);
   }
   protoOf(Parser).zh = function (tokens) {
-    return parse(toProvider(removeWhiteSpace(tokens), this.bm_1), this);
+    return parse(toProvider(removeWhiteSpace(tokens), this.cm_1), this);
   };
   function AbstractParser(logger) {
-    this.bm_1 = logger;
+    this.cm_1 = logger;
   }
-  protoOf(AbstractParser).cm = function (_this__u8e3s4) {
-    return this.bm_1.qh('Parsing ' + _this__u8e3s4.nl_1 + ' at line ' + _this__u8e3s4.pl_1.rl_1 + ' position ' + _this__u8e3s4.pl_1.sl_1);
+  protoOf(AbstractParser).dm = function (_this__u8e3s4) {
+    return this.cm_1.qh('Parsing ' + _this__u8e3s4.ol_1 + ' at line ' + _this__u8e3s4.ql_1.sl_1 + ' position ' + _this__u8e3s4.ql_1.tl_1);
   };
   function parseCustomRegex(_this__u8e3s4, $this, typeName) {
     // Inline function 'arrow.core.raise.either' call
@@ -3751,27 +3754,27 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseCustomRegex.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof CustomRegex) {
-        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.yl_1.ol_1));
+      if (_this__u8e3s4.zl_1.ol_1 instanceof CustomRegex) {
+        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.zl_1.pl_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomRegex), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseCustomRegex.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also);
       }
       var tmp3_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseCustomRegex.<anonymous>.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
+      raise.kh(_this__u8e3s4.bm());
       var res = tmp3_also;
       raise.hh();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -3800,7 +3803,7 @@
   function RefinedTypeParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(RefinedTypeParser).im = function (_this__u8e3s4) {
+  protoOf(RefinedTypeParser).jm = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -3811,20 +3814,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseRefinedType.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      this.dm(_this__u8e3s4.zl_1);
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof CustomType) {
-        tmp_0 = raise.kh(parseCustomRegex(_this__u8e3s4, this, _this__u8e3s4.yl_1.ol_1));
+      if (_this__u8e3s4.zl_1.ol_1 instanceof CustomType) {
+        tmp_0 = raise.kh(parseCustomRegex(_this__u8e3s4, this, _this__u8e3s4.zl_1.pl_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseRefinedType.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also);
       }
       var res = tmp_0;
@@ -3860,15 +3863,15 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp = "Eating: '" + previousToken.ol_1 + "', ";
+      tmp = "Eating: '" + previousToken.pl_1 + "', ";
     }
     var tmp1_elvis_lhs = tmp;
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-    var curr = "Current: '" + $this.yl_1.ol_1 + "'";
-    var tmp2_safe_receiver = $this.zl_1;
+    var curr = "Current: '" + $this.zl_1.pl_1 + "'";
+    var tmp2_safe_receiver = $this.am_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -3876,11 +3879,11 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp_0 = ", Next: '" + tmp2_safe_receiver.ol_1 + "'";
+      tmp_0 = ", Next: '" + tmp2_safe_receiver.pl_1 + "'";
     }
     var tmp3_elvis_lhs = tmp_0;
     var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-    $this.wl_1.qh(prev + curr + next);
+    $this.xl_1.qh(prev + curr + next);
   }
   function printTokens$default($this, previousToken, $super) {
     previousToken = previousToken === VOID ? null : previousToken;
@@ -3894,7 +3897,7 @@
       // Inline function 'kotlin.Companion.success' call
       Companion_getInstance();
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.nextToken.<anonymous>' call
-      var tmp1_success = $this.xl_1.e();
+      var tmp1_success = $this.yl_1.e();
       tmp = _Result___init__impl__xyqfz8(tmp1_success);
     } catch ($p) {
       var tmp_0;
@@ -3919,16 +3922,16 @@
     return tmp_1;
   }
   function TokenProvider(logger, tokenIterator) {
-    this.wl_1 = logger;
-    this.xl_1 = tokenIterator;
-    this.yl_1 = ensureNotNull(nextToken(this));
-    this.zl_1 = nextToken(this);
+    this.xl_1 = logger;
+    this.yl_1 = tokenIterator;
+    this.zl_1 = ensureNotNull(nextToken(this));
+    this.am_1 = nextToken(this);
     printTokens$default(this);
   }
   protoOf(TokenProvider).d = function () {
-    return !(this.zl_1 == null);
+    return !(this.am_1 == null);
   };
-  protoOf(TokenProvider).am = function () {
+  protoOf(TokenProvider).bm = function () {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -3938,17 +3941,17 @@
     var tmp;
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.yl_1;
+      var previousToken = this.zl_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.zl_1;
+      var tmp0_elvis_lhs = this.am_1;
       var tmp_1;
       if (tmp0_elvis_lhs == null) {
-        raise.jh(new NextException(previousToken.pl_1));
+        raise.jh(new NextException(previousToken.ql_1));
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.yl_1 = tmp_1;
-      this.zl_1 = nextToken(this);
+      tmp_0.zl_1 = tmp_1;
+      this.am_1 = nextToken(this);
       printTokens(this, previousToken);
       var res = Unit_getInstance();
       raise.hh();
@@ -3989,37 +3992,37 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.zl_1.ol_1 instanceof LeftCurly) {
         tmp_0 = new Type_0(typeName, raise.kh(parseTypeShape(_this__u8e3s4, $this)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         var tmp2_also = new WrongTokenException(getKClass(LeftCurly), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also);
       }
       var tmp3_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>.<anonymous>' call
-      if (_this__u8e3s4.yl_1.nl_1 instanceof RightCurly)
-        raise.kh(_this__u8e3s4.am());
+      if (_this__u8e3s4.zl_1.ol_1 instanceof RightCurly)
+        raise.kh(_this__u8e3s4.bm());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke_0 = _this__u8e3s4.yl_1;
+        var tmp1_invoke_0 = _this__u8e3s4.zl_1;
         var tmp2_also_0 = new WrongTokenException(getKClass(RightCurly), tmp1_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also_0);
       }
       var res = tmp3_also;
@@ -4058,30 +4061,30 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.let' call
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof CustomValue) {
+      if (_this__u8e3s4.zl_1.ol_1 instanceof CustomValue) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var tmp0_apply = ArrayList_init_$Create$();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-        tmp0_apply.a(raise.kh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.yl_1.ol_1))));
-        while (equals(_this__u8e3s4.yl_1.nl_1, Comma_getInstance())) {
-          raise.kh(_this__u8e3s4.am());
-          if (_this__u8e3s4.yl_1.nl_1 instanceof CustomValue) {
-            tmp0_apply.a(raise.kh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.yl_1.ol_1))));
+        tmp0_apply.a(raise.kh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.zl_1.pl_1))));
+        while (equals(_this__u8e3s4.zl_1.ol_1, Comma_getInstance())) {
+          raise.kh(_this__u8e3s4.bm());
+          if (_this__u8e3s4.zl_1.ol_1 instanceof CustomValue) {
+            tmp0_apply.a(raise.kh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.zl_1.pl_1))));
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
             Companion_getInstance_3();
-            var tmp1_invoke = _this__u8e3s4.yl_1;
+            var tmp1_invoke = _this__u8e3s4.zl_1;
             var tmp2_also = new WrongTokenException(getKClass(CustomValue), tmp1_invoke);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-            raise.kh(_this__u8e3s4.am());
+            raise.kh(_this__u8e3s4.bm());
             raise.jh(tmp2_also);
           }
         }
@@ -4090,11 +4093,11 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp2_invoke = _this__u8e3s4.yl_1;
+        var tmp2_invoke = _this__u8e3s4.zl_1;
         var tmp3_also = new WrongTokenException(getKClass(CustomValue), tmp2_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp3_also);
       }
       var tmp4_let = tmp_0;
@@ -4135,42 +4138,42 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
-      if (_this__u8e3s4.yl_1.nl_1 instanceof Colon)
-        raise.kh(_this__u8e3s4.am());
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
+      if (_this__u8e3s4.zl_1.ol_1 instanceof Colon)
+        raise.kh(_this__u8e3s4.bm());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         var tmp2_also = new WrongTokenException(getKClass(Colon), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also);
       }
-      var type = _this__u8e3s4.yl_1.nl_1;
+      var type = _this__u8e3s4.zl_1.ol_1;
       var tmp_0;
       if (isInterface(type, WirespecType)) {
-        var tmp_1 = raise.kh(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.yl_1.ol_1));
+        var tmp_1 = raise.kh(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.zl_1.pl_1));
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.yl_1.nl_1;
+        var tmp_2 = _this__u8e3s4.zl_1.ol_1;
         var tmp3_also = tmp_2 instanceof QuestionMark;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
         if (tmp3_also)
-          raise.kh(_this__u8e3s4.am());
+          raise.kh(_this__u8e3s4.bm());
         tmp_0 = new Field(identifier, tmp_1, tmp3_also);
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp5_invoke = _this__u8e3s4.yl_1;
+        var tmp5_invoke = _this__u8e3s4.zl_1;
         var tmp6_also = new WrongTokenException(getKClass(CustomType), tmp5_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp6_also);
       }
       var res = tmp_0;
@@ -4209,15 +4212,15 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseFieldValue.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      $this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      $this.dm(_this__u8e3s4.zl_1);
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.yl_1.nl_1;
+      var tmp_0 = _this__u8e3s4.zl_1.ol_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseFieldValue.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
       var isIterable = tmp0_also;
       var tmp_1;
       if (wsType instanceof WsString) {
@@ -4265,7 +4268,7 @@
   function TypeParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(TypeParser).km = function (_this__u8e3s4) {
+  protoOf(TypeParser).lm = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4276,20 +4279,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>' call
-      raise.kh(_this__u8e3s4.am());
-      this.cm(_this__u8e3s4.yl_1);
+      raise.kh(_this__u8e3s4.bm());
+      this.dm(_this__u8e3s4.zl_1);
       var tmp_0;
-      if (_this__u8e3s4.yl_1.nl_1 instanceof CustomType) {
-        tmp_0 = raise.kh(parseTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.yl_1.ol_1));
+      if (_this__u8e3s4.zl_1.ol_1 instanceof CustomType) {
+        tmp_0 = raise.kh(parseTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.zl_1.pl_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_3();
-        var tmp1_invoke = _this__u8e3s4.yl_1;
+        var tmp1_invoke = _this__u8e3s4.zl_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>.<anonymous>' call
-        raise.kh(_this__u8e3s4.am());
+        raise.kh(_this__u8e3s4.bm());
         raise.jh(tmp2_also);
       }
       var res = tmp_0;
@@ -4642,29 +4645,29 @@
   }
   function Any(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.lm_1 = isIterable;
-    this.mm_1 = isMap;
+    this.mm_1 = isIterable;
+    this.nm_1 = isMap;
   }
   protoOf(Any).cj = function () {
-    return this.lm_1;
-  };
-  protoOf(Any).yk = function () {
     return this.mm_1;
   };
-  protoOf(Any).nm = function (isIterable, isMap) {
+  protoOf(Any).zk = function () {
+    return this.nm_1;
+  };
+  protoOf(Any).om = function (isIterable, isMap) {
     return new Any(isIterable, isMap);
   };
-  protoOf(Any).om = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.lm_1 : isIterable;
-    isMap = isMap === VOID ? this.mm_1 : isMap;
-    return $super === VOID ? this.nm(isIterable, isMap) : $super.nm.call(this, isIterable, isMap);
+  protoOf(Any).pm = function (isIterable, isMap, $super) {
+    isIterable = isIterable === VOID ? this.mm_1 : isIterable;
+    isMap = isMap === VOID ? this.nm_1 : isMap;
+    return $super === VOID ? this.om(isIterable, isMap) : $super.om.call(this, isIterable, isMap);
   };
   protoOf(Any).toString = function () {
-    return 'Any(isIterable=' + this.lm_1 + ', isMap=' + this.mm_1 + ')';
+    return 'Any(isIterable=' + this.mm_1 + ', isMap=' + this.nm_1 + ')';
   };
   protoOf(Any).hashCode = function () {
-    var result = this.lm_1 | 0;
-    result = imul(result, 31) + (this.mm_1 | 0) | 0;
+    var result = this.mm_1 | 0;
+    result = imul(result, 31) + (this.nm_1 | 0) | 0;
     return result;
   };
   protoOf(Any).equals = function (other) {
@@ -4673,10 +4676,10 @@
     if (!(other instanceof Any))
       return false;
     var tmp0_other_with_cast = other instanceof Any ? other : THROW_CCE();
-    if (!(this.lm_1 === tmp0_other_with_cast.lm_1))
-      return false;
     if (!(this.mm_1 === tmp0_other_with_cast.mm_1))
       return false;
+    if (!(this.nm_1 === tmp0_other_with_cast.nm_1))
+      return false;
     return true;
   };
   function Custom(value, isIterable, isMap) {
@@ -4688,17 +4691,17 @@
   protoOf(Custom).cj = function () {
     return this.uj_1;
   };
-  protoOf(Custom).yk = function () {
+  protoOf(Custom).zk = function () {
     return this.vj_1;
   };
-  protoOf(Custom).pm = function (value, isIterable, isMap) {
+  protoOf(Custom).qm = function (value, isIterable, isMap) {
     return new Custom(value, isIterable, isMap);
   };
-  protoOf(Custom).qm = function (value, isIterable, isMap, $super) {
+  protoOf(Custom).rm = function (value, isIterable, isMap, $super) {
     value = value === VOID ? this.tj_1 : value;
     isIterable = isIterable === VOID ? this.uj_1 : isIterable;
     isMap = isMap === VOID ? this.vj_1 : isMap;
-    return $super === VOID ? this.pm(value, isIterable, isMap) : $super.pm.call(this, value, isIterable, isMap);
+    return $super === VOID ? this.qm(value, isIterable, isMap) : $super.qm.call(this, value, isIterable, isMap);
   };
   protoOf(Custom).toString = function () {
     return 'Custom(value=' + this.tj_1 + ', isIterable=' + this.uj_1 + ', isMap=' + this.vj_1 + ')';
@@ -4732,17 +4735,17 @@
   protoOf(Primitive).cj = function () {
     return this.rj_1;
   };
-  protoOf(Primitive).yk = function () {
+  protoOf(Primitive).zk = function () {
     return this.sj_1;
   };
-  protoOf(Primitive).rm = function (type, isIterable, isMap) {
+  protoOf(Primitive).sm = function (type, isIterable, isMap) {
     return new Primitive(type, isIterable, isMap);
   };
-  protoOf(Primitive).sm = function (type, isIterable, isMap, $super) {
+  protoOf(Primitive).tm = function (type, isIterable, isMap, $super) {
     type = type === VOID ? this.qj_1 : type;
     isIterable = isIterable === VOID ? this.rj_1 : isIterable;
     isMap = isMap === VOID ? this.sj_1 : isMap;
-    return $super === VOID ? this.rm(type, isIterable, isMap) : $super.rm.call(this, type, isIterable, isMap);
+    return $super === VOID ? this.sm(type, isIterable, isMap) : $super.sm.call(this, type, isIterable, isMap);
   };
   protoOf(Primitive).toString = function () {
     return 'Primitive(type=' + this.qj_1 + ', isIterable=' + this.rj_1 + ', isMap=' + this.sj_1 + ')';
@@ -4860,15 +4863,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.tm_1 = idx;
-    this.um_1 = length;
+    this.um_1 = idx;
+    this.vm_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.tm_1 + ', length=' + this.um_1 + ')';
+    return 'IdxAndLength(idx=' + this.um_1 + ', length=' + this.vm_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.tm_1;
-    result = imul(result, 31) + this.um_1 | 0;
+    var result = this.um_1;
+    result = imul(result, 31) + this.vm_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -4877,36 +4880,36 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.tm_1 === tmp0_other_with_cast.tm_1))
-      return false;
     if (!(this.um_1 === tmp0_other_with_cast.um_1))
       return false;
+    if (!(this.vm_1 === tmp0_other_with_cast.vm_1))
+      return false;
     return true;
   };
   function Coordinates(line, position, idxAndLength) {
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.rl_1 = line;
-    this.sl_1 = position;
-    this.tl_1 = idxAndLength;
+    this.sl_1 = line;
+    this.tl_1 = position;
+    this.ul_1 = idxAndLength;
   }
-  protoOf(Coordinates).vm = function (line, position, idxAndLength) {
+  protoOf(Coordinates).wm = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).wm = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.rl_1 : line;
-    position = position === VOID ? this.sl_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.tl_1 : idxAndLength;
-    return $super === VOID ? this.vm(line, position, idxAndLength) : $super.vm.call(this, line, position, idxAndLength);
+  protoOf(Coordinates).xm = function (line, position, idxAndLength, $super) {
+    line = line === VOID ? this.sl_1 : line;
+    position = position === VOID ? this.tl_1 : position;
+    idxAndLength = idxAndLength === VOID ? this.ul_1 : idxAndLength;
+    return $super === VOID ? this.wm(line, position, idxAndLength) : $super.wm.call(this, line, position, idxAndLength);
   };
   protoOf(Coordinates).toString = function () {
-    return 'Coordinates(line=' + this.rl_1 + ', position=' + this.sl_1 + ', idxAndLength=' + this.tl_1 + ')';
+    return 'Coordinates(line=' + this.sl_1 + ', position=' + this.tl_1 + ', idxAndLength=' + this.ul_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.rl_1;
-    result = imul(result, 31) + this.sl_1 | 0;
-    result = imul(result, 31) + this.tl_1.hashCode() | 0;
+    var result = this.sl_1;
+    result = imul(result, 31) + this.tl_1 | 0;
+    result = imul(result, 31) + this.ul_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -4915,35 +4918,35 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.rl_1 === tmp0_other_with_cast.rl_1))
-      return false;
     if (!(this.sl_1 === tmp0_other_with_cast.sl_1))
       return false;
-    if (!this.tl_1.equals(tmp0_other_with_cast.tl_1))
+    if (!(this.tl_1 === tmp0_other_with_cast.tl_1))
+      return false;
+    if (!this.ul_1.equals(tmp0_other_with_cast.ul_1))
       return false;
     return true;
   };
   function Token(type, value, coordinates) {
-    this.nl_1 = type;
-    this.ol_1 = value;
-    this.pl_1 = coordinates;
+    this.ol_1 = type;
+    this.pl_1 = value;
+    this.ql_1 = coordinates;
   }
-  protoOf(Token).xm = function (type, value, coordinates) {
+  protoOf(Token).ym = function (type, value, coordinates) {
     return new Token(type, value, coordinates);
   };
-  protoOf(Token).vl = function (type, value, coordinates, $super) {
-    type = type === VOID ? this.nl_1 : type;
-    value = value === VOID ? this.ol_1 : value;
-    coordinates = coordinates === VOID ? this.pl_1 : coordinates;
-    return $super === VOID ? this.xm(type, value, coordinates) : $super.xm.call(this, type, value, coordinates);
+  protoOf(Token).wl = function (type, value, coordinates, $super) {
+    type = type === VOID ? this.ol_1 : type;
+    value = value === VOID ? this.pl_1 : value;
+    coordinates = coordinates === VOID ? this.ql_1 : coordinates;
+    return $super === VOID ? this.ym(type, value, coordinates) : $super.ym.call(this, type, value, coordinates);
   };
   protoOf(Token).toString = function () {
-    return 'Token(type=' + this.nl_1 + ', value=' + this.ol_1 + ', coordinates=' + this.pl_1 + ')';
+    return 'Token(type=' + this.ol_1 + ', value=' + this.pl_1 + ', coordinates=' + this.ql_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = hashCode(this.nl_1);
-    result = imul(result, 31) + getStringHashCode(this.ol_1) | 0;
-    result = imul(result, 31) + this.pl_1.hashCode() | 0;
+    var result = hashCode(this.ol_1);
+    result = imul(result, 31) + getStringHashCode(this.pl_1) | 0;
+    result = imul(result, 31) + this.ql_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -4952,19 +4955,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!equals(this.nl_1, tmp0_other_with_cast.nl_1))
+    if (!equals(this.ol_1, tmp0_other_with_cast.ol_1))
       return false;
-    if (!(this.ol_1 === tmp0_other_with_cast.ol_1))
+    if (!(this.pl_1 === tmp0_other_with_cast.pl_1))
       return false;
-    if (!this.pl_1.equals(tmp0_other_with_cast.pl_1))
+    if (!this.ql_1.equals(tmp0_other_with_cast.ql_1))
       return false;
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.tm_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.um_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.wm(VOID, _this__u8e3s4.sl_1 + length | 0, plus_1(_this__u8e3s4.tl_1, length));
+    return _this__u8e3s4.xm(VOID, _this__u8e3s4.tl_1 + length | 0, plus_1(_this__u8e3s4.ul_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     return tokenize_0(_this__u8e3s4, source, nonEmptyListOf(new Token(StartOfProgram_getInstance(), '', new Coordinates()), []));
@@ -4975,12 +4978,12 @@
     var incompleteTokens_0 = incompleteTokens;
     $l$1: do {
       $l$0: do {
-        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).pl_1);
+        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).ql_1);
         var token = tmp0_container.j3();
         var remaining = tmp0_container.k3();
         var tokens = incompleteTokens_0.eh(token);
         var tmp;
-        var tmp_0 = token.nl_1;
+        var tmp_0 = token.ol_1;
         if (tmp_0 instanceof EndOfProgram) {
           tmp = tokens;
         } else {
@@ -5022,7 +5025,7 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.extractToken.<anonymous>' call
-      tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.ol_1));
+      tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.pl_1));
     }
     var tmp1_elvis_lhs = tmp;
     return tmp1_elvis_lhs == null ? new Pair(endToken(previousTokenCoordinates), '') : tmp1_elvis_lhs;
@@ -5041,7 +5044,7 @@
   function nextCoordinates(_this__u8e3s4, type, value) {
     var tmp;
     if (type instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.rl_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.tl_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.sl_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.ul_1, value.length));
     } else {
       tmp = plus_2(_this__u8e3s4, value.length);
     }
@@ -5055,7 +5058,7 @@
     while (tmp0_iterator.d()) {
       var element = tmp0_iterator.e();
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.removeWhiteSpace.<anonymous>' call
-      var tmp = element.nl_1;
+      var tmp = element.ol_1;
       if (!isInterface(tmp, WhiteSpace)) {
         tmp0_filterNotTo.a(element);
       }
@@ -5788,7 +5791,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.ym_1 = 'EOP';
+    this.zm_1 = 'EOP';
   }
   protoOf(EndOfProgram).toString = function () {
     return 'EndOfProgram';
@@ -5839,7 +5842,7 @@
     }
     return tmp;
   };
-  protoOf(Logger).ml = function (s, block) {
+  protoOf(Logger).nl = function (s, block) {
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.utils.Logger.log.<anonymous>' call
@@ -5857,86 +5860,86 @@
     }
   }
   //region block: post-declaration
-  protoOf(JavaEmitter).fk = withLogging;
-  protoOf(JavaEmitter).gk = withLogging_0;
-  protoOf(JavaEmitter).hk = withLogging_1;
-  protoOf(JavaEmitter).ik = withLogging_2;
-  protoOf(JavaEmitter).hi = withLogging_3;
-  protoOf(JavaEmitter).kk = withLogging_8;
-  protoOf(JavaEmitter).mk = withLogging_6;
-  protoOf(JavaEmitter).nk = withLogging_7;
-  protoOf(JavaEmitter).pk = withLogging_4;
-  protoOf(JavaEmitter).dj = withLogging_5;
-  protoOf(KotlinEmitter).fk = withLogging;
-  protoOf(KotlinEmitter).gk = withLogging_0;
-  protoOf(KotlinEmitter).hk = withLogging_1;
-  protoOf(KotlinEmitter).ik = withLogging_2;
-  protoOf(KotlinEmitter).hi = withLogging_3;
-  protoOf(KotlinEmitter).kk = withLogging_8;
-  protoOf(KotlinEmitter).mk = withLogging_6;
-  protoOf(KotlinEmitter).nk = withLogging_7;
-  protoOf(KotlinEmitter).pk = withLogging_4;
-  protoOf(KotlinEmitter).dj = withLogging_5;
-  protoOf(ScalaEmitter).fk = withLogging;
-  protoOf(ScalaEmitter).gk = withLogging_0;
-  protoOf(ScalaEmitter).hk = withLogging_1;
-  protoOf(ScalaEmitter).ik = withLogging_2;
-  protoOf(ScalaEmitter).hi = withLogging_3;
-  protoOf(ScalaEmitter).kk = withLogging_8;
-  protoOf(ScalaEmitter).mk = withLogging_6;
-  protoOf(ScalaEmitter).nk = withLogging_7;
-  protoOf(ScalaEmitter).pk = withLogging_4;
-  protoOf(TypeScriptEmitter).fk = withLogging;
-  protoOf(TypeScriptEmitter).gk = withLogging_0;
-  protoOf(TypeScriptEmitter).hk = withLogging_1;
-  protoOf(TypeScriptEmitter).ik = withLogging_2;
-  protoOf(TypeScriptEmitter).hi = withLogging_3;
-  protoOf(TypeScriptEmitter).kk = withLogging_8;
-  protoOf(TypeScriptEmitter).mk = withLogging_6;
-  protoOf(TypeScriptEmitter).nk = withLogging_7;
-  protoOf(TypeScriptEmitter).pk = withLogging_4;
-  protoOf(TypeScriptEmitter).dj = withLogging_5;
-  protoOf(WirespecEmitter).fk = withLogging;
-  protoOf(WirespecEmitter).gk = withLogging_0;
-  protoOf(WirespecEmitter).hk = withLogging_1;
-  protoOf(WirespecEmitter).ik = withLogging_2;
-  protoOf(WirespecEmitter).hi = withLogging_3;
-  protoOf(WirespecEmitter).kk = withLogging_8;
-  protoOf(WirespecEmitter).mk = withLogging_6;
-  protoOf(WirespecEmitter).nk = withLogging_7;
-  protoOf(WirespecEmitter).pk = withLogging_4;
-  protoOf(WsTypeDef).ql = name;
-  protoOf(WsEnumTypeDef).ql = name;
-  protoOf(WsRefinedTypeDef).ql = name;
-  protoOf(WsEndpointDef).ql = name;
-  protoOf(WhiteSpaceExceptNewLine).ql = name;
-  protoOf(NewLine).ql = name;
-  protoOf(LeftCurly).ql = name;
-  protoOf(RightCurly).ql = name;
-  protoOf(Colon).ql = name;
-  protoOf(Comma).ql = name;
-  protoOf(QuestionMark).ql = name;
-  protoOf(Brackets).ql = name;
-  protoOf(WsString).ql = name;
-  protoOf(WsInteger).ql = name;
-  protoOf(WsBoolean).ql = name;
-  protoOf(Arrow).ql = name;
-  protoOf(GET).ql = name;
-  protoOf(POST).ql = name;
-  protoOf(PUT).ql = name;
-  protoOf(DELETE).ql = name;
-  protoOf(OPTIONS).ql = name;
-  protoOf(HEAD).ql = name;
-  protoOf(PATCH).ql = name;
-  protoOf(TRACE).ql = name;
-  protoOf(CustomRegex).ql = name;
-  protoOf(StatusCode).ql = name;
-  protoOf(CustomValue).ql = name;
-  protoOf(CustomType).ql = name;
-  protoOf(Path).ql = name;
-  protoOf(Invalid).ql = name;
-  protoOf(StartOfProgram).ql = name;
-  protoOf(EndOfProgram).ql = name;
+  protoOf(JavaEmitter).fk = withLogging_1;
+  protoOf(JavaEmitter).gk = withLogging_2;
+  protoOf(JavaEmitter).hk = withLogging_3;
+  protoOf(JavaEmitter).ik = withLogging_4;
+  protoOf(JavaEmitter).hi = withLogging_5;
+  protoOf(JavaEmitter).kk = withLogging_6;
+  protoOf(JavaEmitter).mk = withLogging;
+  protoOf(JavaEmitter).nk = withLogging_0;
+  protoOf(JavaEmitter).pk = withLogging_7;
+  protoOf(JavaEmitter).dj = withLogging_8;
+  protoOf(KotlinEmitter).fk = withLogging_1;
+  protoOf(KotlinEmitter).gk = withLogging_2;
+  protoOf(KotlinEmitter).hk = withLogging_3;
+  protoOf(KotlinEmitter).ik = withLogging_4;
+  protoOf(KotlinEmitter).hi = withLogging_5;
+  protoOf(KotlinEmitter).kk = withLogging_6;
+  protoOf(KotlinEmitter).mk = withLogging;
+  protoOf(KotlinEmitter).nk = withLogging_0;
+  protoOf(KotlinEmitter).pk = withLogging_7;
+  protoOf(KotlinEmitter).dj = withLogging_8;
+  protoOf(ScalaEmitter).fk = withLogging_1;
+  protoOf(ScalaEmitter).gk = withLogging_2;
+  protoOf(ScalaEmitter).hk = withLogging_3;
+  protoOf(ScalaEmitter).ik = withLogging_4;
+  protoOf(ScalaEmitter).hi = withLogging_5;
+  protoOf(ScalaEmitter).kk = withLogging_6;
+  protoOf(ScalaEmitter).mk = withLogging;
+  protoOf(ScalaEmitter).nk = withLogging_0;
+  protoOf(ScalaEmitter).pk = withLogging_7;
+  protoOf(TypeScriptEmitter).fk = withLogging_1;
+  protoOf(TypeScriptEmitter).gk = withLogging_2;
+  protoOf(TypeScriptEmitter).hk = withLogging_3;
+  protoOf(TypeScriptEmitter).ik = withLogging_4;
+  protoOf(TypeScriptEmitter).hi = withLogging_5;
+  protoOf(TypeScriptEmitter).kk = withLogging_6;
+  protoOf(TypeScriptEmitter).mk = withLogging;
+  protoOf(TypeScriptEmitter).nk = withLogging_0;
+  protoOf(TypeScriptEmitter).pk = withLogging_7;
+  protoOf(TypeScriptEmitter).dj = withLogging_8;
+  protoOf(WirespecEmitter).fk = withLogging_1;
+  protoOf(WirespecEmitter).gk = withLogging_2;
+  protoOf(WirespecEmitter).hk = withLogging_3;
+  protoOf(WirespecEmitter).ik = withLogging_4;
+  protoOf(WirespecEmitter).hi = withLogging_5;
+  protoOf(WirespecEmitter).kk = withLogging_6;
+  protoOf(WirespecEmitter).mk = withLogging;
+  protoOf(WirespecEmitter).nk = withLogging_0;
+  protoOf(WirespecEmitter).pk = withLogging_7;
+  protoOf(WsTypeDef).rl = name;
+  protoOf(WsEnumTypeDef).rl = name;
+  protoOf(WsRefinedTypeDef).rl = name;
+  protoOf(WsEndpointDef).rl = name;
+  protoOf(WhiteSpaceExceptNewLine).rl = name;
+  protoOf(NewLine).rl = name;
+  protoOf(LeftCurly).rl = name;
+  protoOf(RightCurly).rl = name;
+  protoOf(Colon).rl = name;
+  protoOf(Comma).rl = name;
+  protoOf(QuestionMark).rl = name;
+  protoOf(Brackets).rl = name;
+  protoOf(WsString).rl = name;
+  protoOf(WsInteger).rl = name;
+  protoOf(WsBoolean).rl = name;
+  protoOf(Arrow).rl = name;
+  protoOf(GET).rl = name;
+  protoOf(POST).rl = name;
+  protoOf(PUT).rl = name;
+  protoOf(DELETE).rl = name;
+  protoOf(OPTIONS).rl = name;
+  protoOf(HEAD).rl = name;
+  protoOf(PATCH).rl = name;
+  protoOf(TRACE).rl = name;
+  protoOf(CustomRegex).rl = name;
+  protoOf(StatusCode).rl = name;
+  protoOf(CustomValue).rl = name;
+  protoOf(CustomType).rl = name;
+  protoOf(Path).rl = name;
+  protoOf(Invalid).rl = name;
+  protoOf(StartOfProgram).rl = name;
+  protoOf(EndOfProgram).rl = name;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_NAME = 'community.flock.wirespec.generated';