@continuous-excellence/coupling-cli 1.1.568 → 1.1.569

package/kotlin/mordant-mordant/com/github/ajalt/mordant/rendering/Lines.mjs

@@ -61,18 +61,18 @@ function Lines() {
   if (LinesClass === VOID) {
     class $ {
       constructor(lines) {
-        this.o6l_1 = lines;
+        this.n6l_1 = lines;
       }
-      c6o() {
-        return this.o6l_1.q2();
+      b6o() {
+        return this.n6l_1.q2();
       }
-      d6o(style) {
+      c6o(style) {
         var tmp;
         if (style == null || equals(style, get_DEFAULT_STYLE())) {
           tmp = this;
         } else {
           // Inline function 'kotlin.collections.map' call
-          var this_0 = this.o6l_1;
+          var this_0 = this.n6l_1;
           // Inline function 'kotlin.collections.mapTo' call
           var destination = ArrayList().r2(collectionSizeOrDefault(this_0, 10));
           var _iterator__ex2g4s = this_0.l1();
@@ -84,10 +84,10 @@ function Lines() {
             var _iterator__ex2g4s_0 = item.l1();
             while (_iterator__ex2g4s_0.m1()) {
               var item_0 = _iterator__ex2g4s_0.n1();
-              var tmp$ret$5 = item_0.e6o(style);
+              var tmp$ret$5 = item_0.d6o(style);
               destination_0.o2(tmp$ret$5);
             }
-            var tmp$ret$2 = Line().v6l(destination_0, item.q6l_1.u6l(style));
+            var tmp$ret$2 = Line().u6l(destination_0, item.p6l_1.t6l(style));
             destination.o2(tmp$ret$2);
           }
           tmp = new (Lines())(destination);
@@ -104,57 +104,57 @@ var LineClass;
 function Line() {
   if (LineClass === VOID) {
     class $ {
-      static v6l(spans, endStyle) {
+      static u6l(spans, endStyle) {
         var $this = createThis(this);
-        $this.p6l_1 = spans;
-        $this.q6l_1 = endStyle;
+        $this.o6l_1 = spans;
+        $this.p6l_1 = endStyle;
         return $this;
       }
-      f6o(element) {
-        return this.p6l_1.k3(element);
+      e6o(element) {
+        return this.o6l_1.k3(element);
       }
       k3(element) {
         if (!(element instanceof Span()))
           return false;
-        return this.f6o(element instanceof Span() ? element : THROW_CCE());
+        return this.e6o(element instanceof Span() ? element : THROW_CCE());
       }
       p2(index) {
-        return this.p6l_1.p2(index);
+        return this.o6l_1.p2(index);
       }
-      g6o(element) {
-        return this.p6l_1.f4(element);
+      f6o(element) {
+        return this.o6l_1.f4(element);
       }
       f4(element) {
         if (!(element instanceof Span()))
           return -1;
-        return this.g6o(element instanceof Span() ? element : THROW_CCE());
+        return this.f6o(element instanceof Span() ? element : THROW_CCE());
       }
       j1() {
-        return this.p6l_1.j1();
+        return this.o6l_1.j1();
       }
       l1() {
-        return this.p6l_1.l1();
+        return this.o6l_1.l1();
       }
       u2(index) {
-        return this.p6l_1.u2(index);
+        return this.o6l_1.u2(index);
       }
       y2(fromIndex, toIndex) {
-        return this.p6l_1.y2(fromIndex, toIndex);
+        return this.o6l_1.y2(fromIndex, toIndex);
       }
       q2() {
-        return this.p6l_1.q2();
+        return this.o6l_1.q2();
       }
-      static i6m(spans) {
+      static h6m(spans) {
         var tmp44_safe_receiver = lastOrNull(spans);
-        var tmp0_elvis_lhs = tmp44_safe_receiver == null ? null : tmp44_safe_receiver.s6l_1;
-        return this.v6l(spans, tmp0_elvis_lhs == null ? get_DEFAULT_STYLE() : tmp0_elvis_lhs);
+        var tmp0_elvis_lhs = tmp44_safe_receiver == null ? null : tmp44_safe_receiver.r6l_1;
+        return this.u6l(spans, tmp0_elvis_lhs == null ? get_DEFAULT_STYLE() : tmp0_elvis_lhs);
       }
       toString() {
-        return 'Line(spans=' + toString(this.p6l_1) + ', endStyle=' + toString(this.q6l_1) + ')';
+        return 'Line(spans=' + toString(this.o6l_1) + ', endStyle=' + toString(this.p6l_1) + ')';
       }
       hashCode() {
-        var result = hashCode(this.p6l_1);
-        result = imul(result, 31) + hashCode(this.q6l_1) | 0;
+        var result = hashCode(this.o6l_1);
+        result = imul(result, 31) + hashCode(this.p6l_1) | 0;
         return result;
       }
       equals(other) {
@@ -163,9 +163,9 @@ function Line() {
         if (!(other instanceof Line()))
           return false;
         var tmp0_other_with_cast = other instanceof Line() ? other : THROW_CCE();
-        if (!equals(this.p6l_1, tmp0_other_with_cast.p6l_1))
+        if (!equals(this.o6l_1, tmp0_other_with_cast.o6l_1))
           return false;
-        if (!equals(this.q6l_1, tmp0_other_with_cast.q6l_1))
+        if (!equals(this.p6l_1, tmp0_other_with_cast.p6l_1))
           return false;
         return true;
       }
@@ -178,11 +178,11 @@ function Line() {
 function get_lineWidth(_this__u8e3s4) {
   // Inline function 'kotlin.collections.sumOf' call
   var sum = 0;
-  var _iterator__ex2g4s = _this__u8e3s4.p6l_1.l1();
+  var _iterator__ex2g4s = _this__u8e3s4.o6l_1.l1();
   while (_iterator__ex2g4s.m1()) {
     var element = _iterator__ex2g4s.n1();
     var tmp = sum;
-    sum = tmp + element.h6o() | 0;
+    sum = tmp + element.g6o() | 0;
   }
   return sum;
 }
@@ -230,10 +230,10 @@ function flatLine(parts) {
       }
     }
   }
-  return Line().i6m(line);
+  return Line().h6m(line);
 }
 function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, scrollRight, scrollDown) {
-  newHeight = newHeight === VOID ? _this__u8e3s4.o6l_1.q2() : newHeight;
+  newHeight = newHeight === VOID ? _this__u8e3s4.n6l_1.q2() : newHeight;
   verticalAlign = verticalAlign === VOID ? VerticalAlign_TOP_getInstance() : verticalAlign;
   textAlign = textAlign === VOID ? TextAlign_NONE_getInstance() : textAlign;
   scrollRight = scrollRight === VOID ? 0 : scrollRight;
@@ -256,19 +256,19 @@ function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, s
        while (inductionVariable < newHeight);
     return new (Lines())(list);
   }
-  var emptyLine = Line().i6m(listOf(Companion_instance.w6l(newWidth)));
+  var emptyLine = Line().h6m(listOf(Companion_instance.v6l(newWidth)));
   var tmp;
   if (scrollDown === 0) {
-    tmp = _this__u8e3s4.o6l_1;
+    tmp = _this__u8e3s4.n6l_1;
   } else {
-    var containsLower = -get_lastIndex(_this__u8e3s4.o6l_1) | 0;
-    if (!(scrollDown <= get_lastIndex(_this__u8e3s4.o6l_1) ? containsLower <= scrollDown : false)) {
+    var containsLower = -get_lastIndex(_this__u8e3s4.n6l_1) | 0;
+    if (!(scrollDown <= get_lastIndex(_this__u8e3s4.n6l_1) ? containsLower <= scrollDown : false)) {
       tmp = emptyList();
     } else {
       if (scrollDown < 0) {
         // Inline function 'kotlin.collections.buildList' call
         // Inline function 'kotlin.collections.buildListInternal' call
-        var capacity = _this__u8e3s4.o6l_1.q2() - scrollDown | 0;
+        var capacity = _this__u8e3s4.n6l_1.q2() - scrollDown | 0;
         checkBuilderCapacity(capacity);
         // Inline function 'kotlin.apply' call
         var this_0 = ArrayList().r2(capacity);
@@ -282,10 +282,10 @@ function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, s
             this_0.o2(emptyLine);
           }
            while (inductionVariable_0 < times);
-        this_0.s2(_this__u8e3s4.o6l_1);
+        this_0.s2(_this__u8e3s4.n6l_1);
         tmp = this_0.f8();
       } else {
-        tmp = _this__u8e3s4.o6l_1.y2(scrollDown, _this__u8e3s4.o6l_1.q2());
+        tmp = _this__u8e3s4.n6l_1.y2(scrollDown, _this__u8e3s4.n6l_1.q2());
       }
     }
   }
@@ -325,7 +325,7 @@ function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, s
   var _iterator__ex2g4s = offsetLines.y2(0, coerceAtMost(newHeight, offsetLines.q2())).l1();
   while (_iterator__ex2g4s.m1()) {
     var item = _iterator__ex2g4s.n1();
-    var tmp$ret$18 = Line().i6m(resizeLine(item, scrollRight, newWidth, textAlign));
+    var tmp$ret$18 = Line().h6m(resizeLine(item, scrollRight, newWidth, textAlign));
     this_1.o2(tmp$ret$18);
   }
   // Inline function 'kotlin.repeat' call
@@ -344,7 +344,7 @@ function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, s
 function resizeLine(line, scrollRight, newWidth, textAlign) {
   var width = 0;
   var offset = 0;
-  var inputLine = scrollRight < 0 ? plus(listOf(Companion_instance.i6o(-scrollRight | 0, get_startStyle(line))), line.p6l_1) : line.p6l_1;
+  var inputLine = scrollRight < 0 ? plus(listOf(Companion_instance.h6o(-scrollRight | 0, get_startStyle(line))), line.o6l_1) : line.o6l_1;
   var startIndex = 0;
   var endIndex = inputLine.q2();
   var startSpan = null;
@@ -355,24 +355,24 @@ function resizeLine(line, scrollRight, newWidth, textAlign) {
     var j = index;
     index = index + 1 | 0;
     var span = iterator.n1();
-    if (scrollRight > 0 && (offset + span.h6o() | 0) < scrollRight) {
-      offset = offset + span.h6o() | 0;
+    if (scrollRight > 0 && (offset + span.g6o() | 0) < scrollRight) {
+      offset = offset + span.g6o() | 0;
       startIndex = j + 1 | 0;
     } else if (scrollRight > 0 && offset < scrollRight) {
-      if ((offset + span.h6o() | 0) > scrollRight) {
-        startSpan = span.k6o(scrollRight - offset | 0).j6o(newWidth - width | 0);
+      if ((offset + span.g6o() | 0) > scrollRight) {
+        startSpan = span.j6o(scrollRight - offset | 0).i6o(newWidth - width | 0);
         startIndex = j;
-        width = width + startSpan.h6o() | 0;
+        width = width + startSpan.g6o() | 0;
       }
       offset = scrollRight;
       startIndex = j + 1 | 0;
-    } else if ((width + span.h6o() | 0) <= newWidth) {
-      width = width + span.h6o() | 0;
+    } else if ((width + span.g6o() | 0) <= newWidth) {
+      width = width + span.g6o() | 0;
       endIndex = j + 1 | 0;
     } else {
       endIndex = j;
       if (width < newWidth) {
-        endSpan = span.j6o(newWidth - width | 0);
+        endSpan = span.i6o(newWidth - width | 0);
         width = newWidth;
       }
       break $l$loop;
@@ -401,24 +401,24 @@ function resizeLine(line, scrollRight, newWidth, textAlign) {
     return outputLine;
   }
   var tmp50_safe_receiver = firstOrNull(outputLine);
-  var tmp0_elvis_lhs = tmp50_safe_receiver == null ? null : tmp50_safe_receiver.s6l_1;
-  var beginStyle = tmp0_elvis_lhs == null ? line.q6l_1 : tmp0_elvis_lhs;
-  var endStyle = line.q6l_1;
+  var tmp0_elvis_lhs = tmp50_safe_receiver == null ? null : tmp50_safe_receiver.r6l_1;
+  var beginStyle = tmp0_elvis_lhs == null ? line.p6l_1 : tmp0_elvis_lhs;
+  var endStyle = line.p6l_1;
   var tmp_0;
   switch (textAlign.s1_1) {
     case 0:
-      tmp_0 = plus_0(outputLine, Companion_instance.i6o(remainingWidth, endStyle));
+      tmp_0 = plus_0(outputLine, Companion_instance.h6o(remainingWidth, endStyle));
       break;
     case 4:
-      tmp_0 = plus_0(outputLine, Companion_instance.w6l(remainingWidth));
+      tmp_0 = plus_0(outputLine, Companion_instance.v6l(remainingWidth));
       break;
     case 1:
-      tmp_0 = plus(listOf(Companion_instance.i6o(remainingWidth, beginStyle)), outputLine);
+      tmp_0 = plus(listOf(Companion_instance.h6o(remainingWidth, beginStyle)), outputLine);
       break;
     case 2:
     case 3:
-      var l = Companion_instance.i6o(remainingWidth / 2 | 0, beginStyle);
-      var r = Companion_instance.i6o((remainingWidth / 2 | 0) + (remainingWidth % 2 | 0) | 0, endStyle);
+      var l = Companion_instance.h6o(remainingWidth / 2 | 0, beginStyle);
+      var r = Companion_instance.h6o((remainingWidth / 2 | 0) + (remainingWidth % 2 | 0) | 0, endStyle);
       // Inline function 'kotlin.collections.buildList' call
 
       // Inline function 'kotlin.collections.buildListInternal' call
@@ -441,7 +441,7 @@ function resizeLine(line, scrollRight, newWidth, textAlign) {
 }
 function get_startStyle(_this__u8e3s4) {
   var tmp45_safe_receiver = firstOrNull(_this__u8e3s4);
-  var tmp0_elvis_lhs = tmp45_safe_receiver == null ? null : tmp45_safe_receiver.s6l_1;
+  var tmp0_elvis_lhs = tmp45_safe_receiver == null ? null : tmp45_safe_receiver.r6l_1;
   return tmp0_elvis_lhs == null ? get_DEFAULT_STYLE() : tmp0_elvis_lhs;
 }
 //region block: exports

package/kotlin/mordant-mordant/com/github/ajalt/mordant/rendering/Size.mjs

@@ -9,11 +9,11 @@ function Size() {
   if (SizeClass === VOID) {
     class $ {
       constructor(width, height) {
-        this.l6o_1 = width;
-        this.m6o_1 = height;
+        this.k6o_1 = width;
+        this.l6o_1 = height;
       }
       toString() {
-        return '' + this.l6o_1 + '\xD7' + this.m6o_1;
+        return '' + this.k6o_1 + '\xD7' + this.l6o_1;
       }
     }
     initMetadataForClass($, 'Size');

package/kotlin/mordant-mordant/com/github/ajalt/mordant/rendering/Span.mjs

@@ -33,7 +33,7 @@ var CompanionClass;
 function Companion() {
   if (CompanionClass === VOID) {
     class $ {
-      h6m(text, style) {
+      g6m(text, style) {
         // Inline function 'kotlin.text.isNotEmpty' call
         // Inline function 'kotlin.require' call
         if (!(charSequenceLength(text) > 0)) {
@@ -69,13 +69,13 @@ function Companion() {
         }
         return new (Span())(text, style);
       }
-      i6o(width, style) {
+      h6o(width, style) {
         return new (Span())(repeat(' ', width), style);
       }
-      w6l(width, style, $super) {
+      v6l(width, style, $super) {
         width = width === VOID ? 1 : width;
         style = style === VOID ? get_DEFAULT_STYLE() : style;
-        return $super === VOID ? this.i6o(width, style) : $super.i6o.call(this, width, style);
+        return $super === VOID ? this.h6o(width, style) : $super.h6o.call(this, width, style);
       }
     }
     initMetadataForCompanion($);
@@ -88,10 +88,10 @@ function Companion_getInstance() {
   return Companion_instance;
 }
 function Span$cellWidth$delegate$lambda(this$0) {
-  return () => stringCellWidth(this$0.r6l_1);
+  return () => stringCellWidth(this$0.q6l_1);
 }
 function Span$_get_cellWidth_$ref_bfbm2m() {
-  return (p0) => p0.h6o();
+  return (p0) => p0.g6o();
 }
 var SpanClass;
 function Span() {
@@ -99,36 +99,36 @@ function Span() {
     class $ {
       constructor(text, style) {
         style = style === VOID ? get_DEFAULT_STYLE() : style;
-        this.r6l_1 = text;
-        this.s6l_1 = style;
+        this.q6l_1 = text;
+        this.r6l_1 = style;
         var tmp = this;
         var tmp_0 = LazyThreadSafetyMode_PUBLICATION_getInstance();
-        tmp.t6l_1 = lazy(tmp_0, Span$cellWidth$delegate$lambda(this));
+        tmp.s6l_1 = lazy(tmp_0, Span$cellWidth$delegate$lambda(this));
       }
-      h6o() {
-        var tmp0 = this.t6l_1;
+      g6o() {
+        var tmp0 = this.s6l_1;
         var tmp = KProperty1();
         // Inline function 'kotlin.getValue' call
         getPropertyCallableRef('cellWidth', 1, tmp, Span$_get_cellWidth_$ref_bfbm2m(), null);
         return tmp0.c3();
       }
+      i6o(n) {
+        return new (Span())(take(this.q6l_1, n), this.r6l_1);
+      }
       j6o(n) {
-        return new (Span())(take(this.r6l_1, n), this.s6l_1);
+        return new (Span())(drop(this.q6l_1, n), this.r6l_1);
       }
-      k6o(n) {
-        return new (Span())(drop(this.r6l_1, n), this.s6l_1);
+      m6o() {
+        return isWhitespace(charCodeAt(this.q6l_1, 0));
       }
       n6o() {
-        return isWhitespace(charCodeAt(this.r6l_1, 0));
-      }
-      o6o() {
-        return charCodeAt(this.r6l_1, 0) === _Char___init__impl__6a9atx(9);
+        return charCodeAt(this.q6l_1, 0) === _Char___init__impl__6a9atx(9);
       }
-      e6o(style) {
-        return new (Span())(this.r6l_1, this.s6l_1.u6l(style));
+      d6o(style) {
+        return new (Span())(this.q6l_1, this.r6l_1.t6l(style));
       }
       toString() {
-        return "<Span '" + this.r6l_1 + "', " + toString(this.s6l_1) + '>';
+        return "<Span '" + this.q6l_1 + "', " + toString(this.r6l_1) + '>';
       }
     }
     initMetadataForClass($, 'Span');

package/kotlin/mordant-mordant/com/github/ajalt/mordant/rendering/TextStyle.mjs

@@ -30,26 +30,26 @@ function plus(other) {
   } else if (other === get_DEFAULT_STYLE()) {
     tmp = this;
   } else {
-    var tmp0_elvis_lhs = other.e6l();
-    var tmp_0 = tmp0_elvis_lhs == null ? this.e6l() : tmp0_elvis_lhs;
-    var tmp1_elvis_lhs = other.f6l();
-    var tmp_1 = tmp1_elvis_lhs == null ? this.f6l() : tmp1_elvis_lhs;
-    var tmp2_elvis_lhs = other.k6l();
-    var tmp_2 = tmp2_elvis_lhs == null ? this.k6l() : tmp2_elvis_lhs;
-    var tmp3_elvis_lhs = other.g6l();
-    var tmp_3 = tmp3_elvis_lhs == null ? this.g6l() : tmp3_elvis_lhs;
-    var tmp4_elvis_lhs = other.h6l();
-    var tmp_4 = tmp4_elvis_lhs == null ? this.h6l() : tmp4_elvis_lhs;
-    var tmp5_elvis_lhs = other.l6l();
-    var tmp_5 = tmp5_elvis_lhs == null ? this.l6l() : tmp5_elvis_lhs;
-    var tmp6_elvis_lhs = other.i6l();
-    var tmp_6 = tmp6_elvis_lhs == null ? this.i6l() : tmp6_elvis_lhs;
-    var tmp7_elvis_lhs = other.j6l();
-    var tmp_7 = tmp7_elvis_lhs == null ? this.j6l() : tmp7_elvis_lhs;
-    var tmp8_elvis_lhs = other.m6l();
-    var tmp_8 = tmp8_elvis_lhs == null ? this.m6l() : tmp8_elvis_lhs;
-    var tmp9_elvis_lhs = other.n6l();
-    tmp = new (TxtStyle())(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, tmp_5, tmp_6, tmp_7, tmp_8, tmp9_elvis_lhs == null ? this.n6l() : tmp9_elvis_lhs);
+    var tmp0_elvis_lhs = other.d6l();
+    var tmp_0 = tmp0_elvis_lhs == null ? this.d6l() : tmp0_elvis_lhs;
+    var tmp1_elvis_lhs = other.e6l();
+    var tmp_1 = tmp1_elvis_lhs == null ? this.e6l() : tmp1_elvis_lhs;
+    var tmp2_elvis_lhs = other.j6l();
+    var tmp_2 = tmp2_elvis_lhs == null ? this.j6l() : tmp2_elvis_lhs;
+    var tmp3_elvis_lhs = other.f6l();
+    var tmp_3 = tmp3_elvis_lhs == null ? this.f6l() : tmp3_elvis_lhs;
+    var tmp4_elvis_lhs = other.g6l();
+    var tmp_4 = tmp4_elvis_lhs == null ? this.g6l() : tmp4_elvis_lhs;
+    var tmp5_elvis_lhs = other.k6l();
+    var tmp_5 = tmp5_elvis_lhs == null ? this.k6l() : tmp5_elvis_lhs;
+    var tmp6_elvis_lhs = other.h6l();
+    var tmp_6 = tmp6_elvis_lhs == null ? this.h6l() : tmp6_elvis_lhs;
+    var tmp7_elvis_lhs = other.i6l();
+    var tmp_7 = tmp7_elvis_lhs == null ? this.i6l() : tmp7_elvis_lhs;
+    var tmp8_elvis_lhs = other.l6l();
+    var tmp_8 = tmp8_elvis_lhs == null ? this.l6l() : tmp8_elvis_lhs;
+    var tmp9_elvis_lhs = other.m6l();
+    tmp = new (TxtStyle())(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, tmp_5, tmp_6, tmp_7, tmp_8, tmp9_elvis_lhs == null ? this.m6l() : tmp9_elvis_lhs);
   }
   return tmp;
 }
@@ -86,61 +86,61 @@ function TxtStyle() {
   if (TxtStyleClass === VOID) {
     class $ {
       constructor(color, bgColor, bold, italic, underline, dim, inverse, strikethrough, hyperlink, hyperlinkId) {
-        this.p6o_1 = color;
-        this.q6o_1 = bgColor;
-        this.r6o_1 = bold;
-        this.s6o_1 = italic;
-        this.t6o_1 = underline;
-        this.u6o_1 = dim;
-        this.v6o_1 = inverse;
-        this.w6o_1 = strikethrough;
-        this.x6o_1 = hyperlink;
-        this.y6o_1 = hyperlinkId;
+        this.o6o_1 = color;
+        this.p6o_1 = bgColor;
+        this.q6o_1 = bold;
+        this.r6o_1 = italic;
+        this.s6o_1 = underline;
+        this.t6o_1 = dim;
+        this.u6o_1 = inverse;
+        this.v6o_1 = strikethrough;
+        this.w6o_1 = hyperlink;
+        this.x6o_1 = hyperlinkId;
+      }
+      d6l() {
+        return this.o6o_1;
       }
       e6l() {
         return this.p6o_1;
       }
-      f6l() {
+      j6l() {
         return this.q6o_1;
       }
-      k6l() {
+      f6l() {
         return this.r6o_1;
       }
       g6l() {
         return this.s6o_1;
       }
-      h6l() {
+      k6l() {
         return this.t6o_1;
       }
-      l6l() {
+      h6l() {
         return this.u6o_1;
       }
       i6l() {
         return this.v6o_1;
       }
-      j6l() {
+      l6l() {
         return this.w6o_1;
       }
       m6l() {
         return this.x6o_1;
       }
-      n6l() {
-        return this.y6o_1;
-      }
       toString() {
-        return 'TxtStyle(color=' + toString(this.p6o_1) + ', bgColor=' + toString(this.q6o_1) + ', bold=' + this.r6o_1 + ', italic=' + this.s6o_1 + ', underline=' + this.t6o_1 + ', dim=' + this.u6o_1 + ', inverse=' + this.v6o_1 + ', strikethrough=' + this.w6o_1 + ', hyperlink=' + this.x6o_1 + ', hyperlinkId=' + this.y6o_1 + ')';
+        return 'TxtStyle(color=' + toString(this.o6o_1) + ', bgColor=' + toString(this.p6o_1) + ', bold=' + this.q6o_1 + ', italic=' + this.r6o_1 + ', underline=' + this.s6o_1 + ', dim=' + this.t6o_1 + ', inverse=' + this.u6o_1 + ', strikethrough=' + this.v6o_1 + ', hyperlink=' + this.w6o_1 + ', hyperlinkId=' + this.x6o_1 + ')';
       }
       hashCode() {
-        var result = this.p6o_1 == null ? 0 : hashCode(this.p6o_1);
-        result = imul(result, 31) + (this.q6o_1 == null ? 0 : hashCode(this.q6o_1)) | 0;
+        var result = this.o6o_1 == null ? 0 : hashCode(this.o6o_1);
+        result = imul(result, 31) + (this.p6o_1 == null ? 0 : hashCode(this.p6o_1)) | 0;
+        result = imul(result, 31) + (this.q6o_1 == null ? 0 : getBooleanHashCode(this.q6o_1)) | 0;
         result = imul(result, 31) + (this.r6o_1 == null ? 0 : getBooleanHashCode(this.r6o_1)) | 0;
         result = imul(result, 31) + (this.s6o_1 == null ? 0 : getBooleanHashCode(this.s6o_1)) | 0;
         result = imul(result, 31) + (this.t6o_1 == null ? 0 : getBooleanHashCode(this.t6o_1)) | 0;
         result = imul(result, 31) + (this.u6o_1 == null ? 0 : getBooleanHashCode(this.u6o_1)) | 0;
         result = imul(result, 31) + (this.v6o_1 == null ? 0 : getBooleanHashCode(this.v6o_1)) | 0;
-        result = imul(result, 31) + (this.w6o_1 == null ? 0 : getBooleanHashCode(this.w6o_1)) | 0;
+        result = imul(result, 31) + (this.w6o_1 == null ? 0 : getStringHashCode(this.w6o_1)) | 0;
         result = imul(result, 31) + (this.x6o_1 == null ? 0 : getStringHashCode(this.x6o_1)) | 0;
-        result = imul(result, 31) + (this.y6o_1 == null ? 0 : getStringHashCode(this.y6o_1)) | 0;
         return result;
       }
       equals(other) {
@@ -149,9 +149,11 @@ function TxtStyle() {
         if (!(other instanceof TxtStyle()))
           return false;
         var tmp0_other_with_cast = other instanceof TxtStyle() ? other : THROW_CCE();
+        if (!equals(this.o6o_1, tmp0_other_with_cast.o6o_1))
+          return false;
         if (!equals(this.p6o_1, tmp0_other_with_cast.p6o_1))
           return false;
-        if (!equals(this.q6o_1, tmp0_other_with_cast.q6o_1))
+        if (!(this.q6o_1 == tmp0_other_with_cast.q6o_1))
           return false;
         if (!(this.r6o_1 == tmp0_other_with_cast.r6o_1))
           return false;
@@ -167,24 +169,22 @@ function TxtStyle() {
           return false;
         if (!(this.x6o_1 == tmp0_other_with_cast.x6o_1))
           return false;
-        if (!(this.y6o_1 == tmp0_other_with_cast.y6o_1))
-          return false;
         return true;
       }
     }
-    protoOf($).f6i = invoke;
-    protoOf($).u6l = plus;
+    protoOf($).e6i = invoke;
+    protoOf($).t6l = plus;
     initMetadataForClass($, 'TxtStyle', VOID, VOID, [TextStyle()]);
     TxtStyleClass = $;
   }
   return TxtStyleClass;
 }
 function copy(_this__u8e3s4, fg, bg, hyperlink, hyperlinkId) {
-  fg = fg === VOID ? _this__u8e3s4.e6l() : fg;
-  bg = bg === VOID ? _this__u8e3s4.f6l() : bg;
-  hyperlink = hyperlink === VOID ? _this__u8e3s4.m6l() : hyperlink;
-  hyperlinkId = hyperlinkId === VOID ? _this__u8e3s4.n6l() : hyperlinkId;
-  return new (TxtStyle())(fg, bg, _this__u8e3s4.k6l(), _this__u8e3s4.g6l(), _this__u8e3s4.h6l(), _this__u8e3s4.l6l(), _this__u8e3s4.i6l(), _this__u8e3s4.j6l(), hyperlink, hyperlinkId);
+  fg = fg === VOID ? _this__u8e3s4.d6l() : fg;
+  bg = bg === VOID ? _this__u8e3s4.e6l() : bg;
+  hyperlink = hyperlink === VOID ? _this__u8e3s4.l6l() : hyperlink;
+  hyperlinkId = hyperlinkId === VOID ? _this__u8e3s4.m6l() : hyperlinkId;
+  return new (TxtStyle())(fg, bg, _this__u8e3s4.j6l(), _this__u8e3s4.f6l(), _this__u8e3s4.g6l(), _this__u8e3s4.k6l(), _this__u8e3s4.h6l(), _this__u8e3s4.i6l(), hyperlink, hyperlinkId);
 }
 function foldStyles(styles) {
   var style = null;
@@ -195,7 +195,7 @@ function foldStyles(styles) {
     inductionVariable = inductionVariable + 1 | 0;
     if (s == null)
       continue $l$loop;
-    style = style == null ? s : s.u6l(style);
+    style = style == null ? s : s.t6l(style);
   }
   return style;
 }