@continuous-excellence/coupling-cli 1.1.429 → 1.1.430

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

@@ -61,18 +61,18 @@ function Lines() {
   if (LinesClass === VOID) {
     class $ {
       constructor(lines) {
-        this.u6d_1 = lines;
+        this.v6d_1 = lines;
       }
-      i6g() {
-        return this.u6d_1.v2();
+      j6g() {
+        return this.v6d_1.v2();
       }
-      j6g(style) {
+      k6g(style) {
         var tmp;
         if (style == null || equals(style, get_DEFAULT_STYLE())) {
           tmp = this;
         } else {
           // Inline function 'kotlin.collections.map' call
-          var this_0 = this.u6d_1;
+          var this_0 = this.v6d_1;
           // Inline function 'kotlin.collections.mapTo' call
           var destination = ArrayList().w2(collectionSizeOrDefault(this_0, 10));
           var _iterator__ex2g4s = this_0.q1();
@@ -84,10 +84,10 @@ function Lines() {
             var _iterator__ex2g4s_0 = item.q1();
             while (_iterator__ex2g4s_0.r1()) {
               var item_0 = _iterator__ex2g4s_0.s1();
-              var tmp$ret$0 = item_0.k6g(style);
+              var tmp$ret$0 = item_0.l6g(style);
               destination_0.t2(tmp$ret$0);
             }
-            var tmp$ret$3 = Line().b6e(destination_0, item.w6d_1.a6e(style));
+            var tmp$ret$3 = Line().c6e(destination_0, item.x6d_1.b6e(style));
             destination.t2(tmp$ret$3);
           }
           tmp = new (Lines())(destination);
@@ -104,63 +104,63 @@ var LineClass;
 function Line() {
   if (LineClass === VOID) {
     class $ {
-      static b6e(spans, endStyle) {
+      static c6e(spans, endStyle) {
         var $this = createThis(this);
-        $this.v6d_1 = spans;
-        $this.w6d_1 = endStyle;
+        $this.w6d_1 = spans;
+        $this.x6d_1 = endStyle;
         return $this;
       }
-      l6g(element) {
-        return this.v6d_1.p3(element);
+      m6g(element) {
+        return this.w6d_1.p3(element);
       }
       p3(element) {
         if (!(element instanceof Span()))
           return false;
-        return this.l6g(element instanceof Span() ? element : THROW_CCE());
+        return this.m6g(element instanceof Span() ? element : THROW_CCE());
       }
-      m6g(elements) {
-        return this.v6d_1.k4(elements);
+      n6g(elements) {
+        return this.w6d_1.k4(elements);
       }
       k4(elements) {
-        return this.m6g(elements);
+        return this.n6g(elements);
       }
       u2(index) {
-        return this.v6d_1.u2(index);
+        return this.w6d_1.u2(index);
       }
-      n6g(element) {
-        return this.v6d_1.l4(element);
+      o6g(element) {
+        return this.w6d_1.l4(element);
       }
       l4(element) {
         if (!(element instanceof Span()))
           return -1;
-        return this.n6g(element instanceof Span() ? element : THROW_CCE());
+        return this.o6g(element instanceof Span() ? element : THROW_CCE());
       }
       o1() {
-        return this.v6d_1.o1();
+        return this.w6d_1.o1();
       }
       q1() {
-        return this.v6d_1.q1();
+        return this.w6d_1.q1();
       }
       z2(index) {
-        return this.v6d_1.z2(index);
+        return this.w6d_1.z2(index);
       }
       d3(fromIndex, toIndex) {
-        return this.v6d_1.d3(fromIndex, toIndex);
+        return this.w6d_1.d3(fromIndex, toIndex);
       }
       v2() {
-        return this.v6d_1.v2();
+        return this.w6d_1.v2();
       }
-      static o6e(spans) {
+      static p6e(spans) {
         var tmp44_safe_receiver = lastOrNull(spans);
-        var tmp0_elvis_lhs = tmp44_safe_receiver == null ? null : tmp44_safe_receiver.y6d_1;
-        return this.b6e(spans, tmp0_elvis_lhs == null ? get_DEFAULT_STYLE() : tmp0_elvis_lhs);
+        var tmp0_elvis_lhs = tmp44_safe_receiver == null ? null : tmp44_safe_receiver.z6d_1;
+        return this.c6e(spans, tmp0_elvis_lhs == null ? get_DEFAULT_STYLE() : tmp0_elvis_lhs);
       }
       toString() {
-        return 'Line(spans=' + toString(this.v6d_1) + ', endStyle=' + toString(this.w6d_1) + ')';
+        return 'Line(spans=' + toString(this.w6d_1) + ', endStyle=' + toString(this.x6d_1) + ')';
       }
       hashCode() {
-        var result = hashCode(this.v6d_1);
-        result = imul(result, 31) + hashCode(this.w6d_1) | 0;
+        var result = hashCode(this.w6d_1);
+        result = imul(result, 31) + hashCode(this.x6d_1) | 0;
         return result;
       }
       equals(other) {
@@ -169,10 +169,10 @@ function Line() {
         if (!(other instanceof Line()))
           return false;
         var tmp0_other_with_cast = other instanceof Line() ? other : THROW_CCE();
-        if (!equals(this.v6d_1, tmp0_other_with_cast.v6d_1))
-          return false;
         if (!equals(this.w6d_1, tmp0_other_with_cast.w6d_1))
           return false;
+        if (!equals(this.x6d_1, tmp0_other_with_cast.x6d_1))
+          return false;
         return true;
       }
     }
@@ -184,11 +184,11 @@ function Line() {
 function get_lineWidth(_this__u8e3s4) {
   // Inline function 'kotlin.collections.sumOf' call
   var sum = 0;
-  var _iterator__ex2g4s = _this__u8e3s4.v6d_1.q1();
+  var _iterator__ex2g4s = _this__u8e3s4.w6d_1.q1();
   while (_iterator__ex2g4s.r1()) {
     var element = _iterator__ex2g4s.s1();
     var tmp = sum;
-    sum = tmp + element.o6g() | 0;
+    sum = tmp + element.p6g() | 0;
   }
   return sum;
 }
@@ -236,10 +236,10 @@ function flatLine(parts) {
       }
     }
   }
-  return Line().o6e(line);
+  return Line().p6e(line);
 }
 function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, scrollRight, scrollDown) {
-  newHeight = newHeight === VOID ? _this__u8e3s4.u6d_1.v2() : newHeight;
+  newHeight = newHeight === VOID ? _this__u8e3s4.v6d_1.v2() : newHeight;
   verticalAlign = verticalAlign === VOID ? VerticalAlign_TOP_getInstance() : verticalAlign;
   textAlign = textAlign === VOID ? TextAlign_NONE_getInstance() : textAlign;
   scrollRight = scrollRight === VOID ? 0 : scrollRight;
@@ -262,19 +262,19 @@ function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, s
        while (inductionVariable < newHeight);
     return new (Lines())(list);
   }
-  var emptyLine = Line().o6e(listOf(Companion_instance.c6e(newWidth)));
+  var emptyLine = Line().p6e(listOf(Companion_instance.d6e(newWidth)));
   var tmp;
   if (scrollDown === 0) {
-    tmp = _this__u8e3s4.u6d_1;
+    tmp = _this__u8e3s4.v6d_1;
   } else {
-    var containsLower = -get_lastIndex(_this__u8e3s4.u6d_1) | 0;
-    if (!(scrollDown <= get_lastIndex(_this__u8e3s4.u6d_1) ? containsLower <= scrollDown : false)) {
+    var containsLower = -get_lastIndex(_this__u8e3s4.v6d_1) | 0;
+    if (!(scrollDown <= get_lastIndex(_this__u8e3s4.v6d_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.u6d_1.v2() - scrollDown | 0;
+        var capacity = _this__u8e3s4.v6d_1.v2() - scrollDown | 0;
         checkBuilderCapacity(capacity);
         // Inline function 'kotlin.apply' call
         var this_0 = ArrayList().w2(capacity);
@@ -288,10 +288,10 @@ function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, s
             this_0.t2(emptyLine);
           }
            while (inductionVariable_0 < times);
-        this_0.x2(_this__u8e3s4.u6d_1);
+        this_0.x2(_this__u8e3s4.v6d_1);
         tmp = this_0.k8();
       } else {
-        tmp = _this__u8e3s4.u6d_1.d3(scrollDown, _this__u8e3s4.u6d_1.v2());
+        tmp = _this__u8e3s4.v6d_1.d3(scrollDown, _this__u8e3s4.v6d_1.v2());
       }
     }
   }
@@ -331,7 +331,7 @@ function setSize(_this__u8e3s4, newWidth, newHeight, verticalAlign, textAlign, s
   var _iterator__ex2g4s = offsetLines.d3(0, coerceAtMost(newHeight, offsetLines.v2())).q1();
   while (_iterator__ex2g4s.r1()) {
     var item = _iterator__ex2g4s.s1();
-    var tmp$ret$13 = Line().o6e(resizeLine(item, scrollRight, newWidth, textAlign));
+    var tmp$ret$13 = Line().p6e(resizeLine(item, scrollRight, newWidth, textAlign));
     this_1.t2(tmp$ret$13);
   }
   // Inline function 'kotlin.repeat' call
@@ -350,7 +350,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.p6g(-scrollRight | 0, get_startStyle(line))), line.v6d_1) : line.v6d_1;
+  var inputLine = scrollRight < 0 ? plus(listOf(Companion_instance.q6g(-scrollRight | 0, get_startStyle(line))), line.w6d_1) : line.w6d_1;
   var startIndex = 0;
   var endIndex = inputLine.v2();
   var startSpan = null;
@@ -361,24 +361,24 @@ function resizeLine(line, scrollRight, newWidth, textAlign) {
     var j = index;
     index = index + 1 | 0;
     var span = iterator.s1();
-    if (scrollRight > 0 && (offset + span.o6g() | 0) < scrollRight) {
-      offset = offset + span.o6g() | 0;
+    if (scrollRight > 0 && (offset + span.p6g() | 0) < scrollRight) {
+      offset = offset + span.p6g() | 0;
       startIndex = j + 1 | 0;
     } else if (scrollRight > 0 && offset < scrollRight) {
-      if ((offset + span.o6g() | 0) > scrollRight) {
-        startSpan = span.r6g(scrollRight - offset | 0).q6g(newWidth - width | 0);
+      if ((offset + span.p6g() | 0) > scrollRight) {
+        startSpan = span.s6g(scrollRight - offset | 0).r6g(newWidth - width | 0);
         startIndex = j;
-        width = width + startSpan.o6g() | 0;
+        width = width + startSpan.p6g() | 0;
       }
       offset = scrollRight;
       startIndex = j + 1 | 0;
-    } else if ((width + span.o6g() | 0) <= newWidth) {
-      width = width + span.o6g() | 0;
+    } else if ((width + span.p6g() | 0) <= newWidth) {
+      width = width + span.p6g() | 0;
       endIndex = j + 1 | 0;
     } else {
       endIndex = j;
       if (width < newWidth) {
-        endSpan = span.q6g(newWidth - width | 0);
+        endSpan = span.r6g(newWidth - width | 0);
         width = newWidth;
       }
       break $l$loop;
@@ -407,24 +407,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.y6d_1;
-  var beginStyle = tmp0_elvis_lhs == null ? line.w6d_1 : tmp0_elvis_lhs;
-  var endStyle = line.w6d_1;
+  var tmp0_elvis_lhs = tmp50_safe_receiver == null ? null : tmp50_safe_receiver.z6d_1;
+  var beginStyle = tmp0_elvis_lhs == null ? line.x6d_1 : tmp0_elvis_lhs;
+  var endStyle = line.x6d_1;
   var tmp_0;
   switch (textAlign.x1_1) {
     case 0:
-      tmp_0 = plus_0(outputLine, Companion_instance.p6g(remainingWidth, endStyle));
+      tmp_0 = plus_0(outputLine, Companion_instance.q6g(remainingWidth, endStyle));
       break;
     case 4:
-      tmp_0 = plus_0(outputLine, Companion_instance.c6e(remainingWidth));
+      tmp_0 = plus_0(outputLine, Companion_instance.d6e(remainingWidth));
       break;
     case 1:
-      tmp_0 = plus(listOf(Companion_instance.p6g(remainingWidth, beginStyle)), outputLine);
+      tmp_0 = plus(listOf(Companion_instance.q6g(remainingWidth, beginStyle)), outputLine);
       break;
     case 2:
     case 3:
-      var l = Companion_instance.p6g(remainingWidth / 2 | 0, beginStyle);
-      var r = Companion_instance.p6g((remainingWidth / 2 | 0) + (remainingWidth % 2 | 0) | 0, endStyle);
+      var l = Companion_instance.q6g(remainingWidth / 2 | 0, beginStyle);
+      var r = Companion_instance.q6g((remainingWidth / 2 | 0) + (remainingWidth % 2 | 0) | 0, endStyle);
       // Inline function 'kotlin.collections.buildList' call
 
       // Inline function 'kotlin.collections.buildListInternal' call
@@ -447,7 +447,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.y6d_1;
+  var tmp0_elvis_lhs = tmp45_safe_receiver == null ? null : tmp45_safe_receiver.z6d_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.s6g_1 = width;
-        this.t6g_1 = height;
+        this.t6g_1 = width;
+        this.u6g_1 = height;
       }
       toString() {
-        return '' + this.s6g_1 + '\xD7' + this.t6g_1;
+        return '' + this.t6g_1 + '\xD7' + this.u6g_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 $ {
-      n6e(text, style) {
+      o6e(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);
       }
-      p6g(width, style) {
+      q6g(width, style) {
         return new (Span())(repeat(' ', width), style);
       }
-      c6e(width, style, $super) {
+      d6e(width, style, $super) {
         width = width === VOID ? 1 : width;
         style = style === VOID ? get_DEFAULT_STYLE() : style;
-        return $super === VOID ? this.p6g(width, style) : $super.p6g.call(this, width, style);
+        return $super === VOID ? this.q6g(width, style) : $super.q6g.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.x6d_1);
+  return () => stringCellWidth(this$0.y6d_1);
 }
 function Span$_get_cellWidth_$ref_bfbm2m() {
-  return (p0) => p0.o6g();
+  return (p0) => p0.p6g();
 }
 var SpanClass;
 function Span() {
@@ -99,36 +99,36 @@ function Span() {
     class $ {
       constructor(text, style) {
         style = style === VOID ? get_DEFAULT_STYLE() : style;
-        this.x6d_1 = text;
-        this.y6d_1 = style;
+        this.y6d_1 = text;
+        this.z6d_1 = style;
         var tmp = this;
         var tmp_0 = LazyThreadSafetyMode_PUBLICATION_getInstance();
-        tmp.z6d_1 = lazy(tmp_0, Span$cellWidth$delegate$lambda(this));
+        tmp.a6e_1 = lazy(tmp_0, Span$cellWidth$delegate$lambda(this));
       }
-      o6g() {
-        var tmp0 = this.z6d_1;
+      p6g() {
+        var tmp0 = this.a6e_1;
         var tmp = KProperty1();
         // Inline function 'kotlin.getValue' call
         getPropertyCallableRef('cellWidth', 1, tmp, Span$_get_cellWidth_$ref_bfbm2m(), null);
         return tmp0.h3();
       }
-      q6g(n) {
-        return new (Span())(take(this.x6d_1, n), this.y6d_1);
-      }
       r6g(n) {
-        return new (Span())(drop(this.x6d_1, n), this.y6d_1);
+        return new (Span())(take(this.y6d_1, n), this.z6d_1);
       }
-      u6g() {
-        return isWhitespace(charCodeAt(this.x6d_1, 0));
+      s6g(n) {
+        return new (Span())(drop(this.y6d_1, n), this.z6d_1);
       }
       v6g() {
-        return charCodeAt(this.x6d_1, 0) === _Char___init__impl__6a9atx(9);
+        return isWhitespace(charCodeAt(this.y6d_1, 0));
+      }
+      w6g() {
+        return charCodeAt(this.y6d_1, 0) === _Char___init__impl__6a9atx(9);
       }
-      k6g(style) {
-        return new (Span())(this.x6d_1, this.y6d_1.a6e(style));
+      l6g(style) {
+        return new (Span())(this.y6d_1, this.z6d_1.b6e(style));
       }
       toString() {
-        return "<Span '" + this.x6d_1 + "', " + toString(this.y6d_1) + '>';
+        return "<Span '" + this.y6d_1 + "', " + toString(this.z6d_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.k6d();
-    var tmp_0 = tmp0_elvis_lhs == null ? this.k6d() : tmp0_elvis_lhs;
-    var tmp1_elvis_lhs = other.l6d();
-    var tmp_1 = tmp1_elvis_lhs == null ? this.l6d() : tmp1_elvis_lhs;
-    var tmp2_elvis_lhs = other.q6d();
-    var tmp_2 = tmp2_elvis_lhs == null ? this.q6d() : tmp2_elvis_lhs;
-    var tmp3_elvis_lhs = other.m6d();
-    var tmp_3 = tmp3_elvis_lhs == null ? this.m6d() : tmp3_elvis_lhs;
-    var tmp4_elvis_lhs = other.n6d();
-    var tmp_4 = tmp4_elvis_lhs == null ? this.n6d() : tmp4_elvis_lhs;
-    var tmp5_elvis_lhs = other.r6d();
-    var tmp_5 = tmp5_elvis_lhs == null ? this.r6d() : tmp5_elvis_lhs;
-    var tmp6_elvis_lhs = other.o6d();
-    var tmp_6 = tmp6_elvis_lhs == null ? this.o6d() : tmp6_elvis_lhs;
-    var tmp7_elvis_lhs = other.p6d();
-    var tmp_7 = tmp7_elvis_lhs == null ? this.p6d() : tmp7_elvis_lhs;
-    var tmp8_elvis_lhs = other.s6d();
-    var tmp_8 = tmp8_elvis_lhs == null ? this.s6d() : tmp8_elvis_lhs;
-    var tmp9_elvis_lhs = other.t6d();
-    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.t6d() : tmp9_elvis_lhs);
+    var tmp0_elvis_lhs = other.l6d();
+    var tmp_0 = tmp0_elvis_lhs == null ? this.l6d() : tmp0_elvis_lhs;
+    var tmp1_elvis_lhs = other.m6d();
+    var tmp_1 = tmp1_elvis_lhs == null ? this.m6d() : tmp1_elvis_lhs;
+    var tmp2_elvis_lhs = other.r6d();
+    var tmp_2 = tmp2_elvis_lhs == null ? this.r6d() : tmp2_elvis_lhs;
+    var tmp3_elvis_lhs = other.n6d();
+    var tmp_3 = tmp3_elvis_lhs == null ? this.n6d() : tmp3_elvis_lhs;
+    var tmp4_elvis_lhs = other.o6d();
+    var tmp_4 = tmp4_elvis_lhs == null ? this.o6d() : tmp4_elvis_lhs;
+    var tmp5_elvis_lhs = other.s6d();
+    var tmp_5 = tmp5_elvis_lhs == null ? this.s6d() : tmp5_elvis_lhs;
+    var tmp6_elvis_lhs = other.p6d();
+    var tmp_6 = tmp6_elvis_lhs == null ? this.p6d() : tmp6_elvis_lhs;
+    var tmp7_elvis_lhs = other.q6d();
+    var tmp_7 = tmp7_elvis_lhs == null ? this.q6d() : tmp7_elvis_lhs;
+    var tmp8_elvis_lhs = other.t6d();
+    var tmp_8 = tmp8_elvis_lhs == null ? this.t6d() : tmp8_elvis_lhs;
+    var tmp9_elvis_lhs = other.u6d();
+    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.u6d() : 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.w6g_1 = color;
-        this.x6g_1 = bgColor;
-        this.y6g_1 = bold;
-        this.z6g_1 = italic;
-        this.a6h_1 = underline;
-        this.b6h_1 = dim;
-        this.c6h_1 = inverse;
-        this.d6h_1 = strikethrough;
-        this.e6h_1 = hyperlink;
-        this.f6h_1 = hyperlinkId;
-      }
-      k6d() {
-        return this.w6g_1;
+        this.x6g_1 = color;
+        this.y6g_1 = bgColor;
+        this.z6g_1 = bold;
+        this.a6h_1 = italic;
+        this.b6h_1 = underline;
+        this.c6h_1 = dim;
+        this.d6h_1 = inverse;
+        this.e6h_1 = strikethrough;
+        this.f6h_1 = hyperlink;
+        this.g6h_1 = hyperlinkId;
       }
       l6d() {
         return this.x6g_1;
       }
-      q6d() {
+      m6d() {
         return this.y6g_1;
       }
-      m6d() {
+      r6d() {
         return this.z6g_1;
       }
       n6d() {
         return this.a6h_1;
       }
-      r6d() {
+      o6d() {
         return this.b6h_1;
       }
-      o6d() {
+      s6d() {
         return this.c6h_1;
       }
       p6d() {
         return this.d6h_1;
       }
-      s6d() {
+      q6d() {
         return this.e6h_1;
       }
       t6d() {
         return this.f6h_1;
       }
+      u6d() {
+        return this.g6h_1;
+      }
       toString() {
-        return 'TxtStyle(color=' + toString(this.w6g_1) + ', bgColor=' + toString(this.x6g_1) + ', bold=' + this.y6g_1 + ', italic=' + this.z6g_1 + ', underline=' + this.a6h_1 + ', dim=' + this.b6h_1 + ', inverse=' + this.c6h_1 + ', strikethrough=' + this.d6h_1 + ', hyperlink=' + this.e6h_1 + ', hyperlinkId=' + this.f6h_1 + ')';
+        return 'TxtStyle(color=' + toString(this.x6g_1) + ', bgColor=' + toString(this.y6g_1) + ', bold=' + this.z6g_1 + ', italic=' + this.a6h_1 + ', underline=' + this.b6h_1 + ', dim=' + this.c6h_1 + ', inverse=' + this.d6h_1 + ', strikethrough=' + this.e6h_1 + ', hyperlink=' + this.f6h_1 + ', hyperlinkId=' + this.g6h_1 + ')';
       }
       hashCode() {
-        var result = this.w6g_1 == null ? 0 : hashCode(this.w6g_1);
-        result = imul(result, 31) + (this.x6g_1 == null ? 0 : hashCode(this.x6g_1)) | 0;
-        result = imul(result, 31) + (this.y6g_1 == null ? 0 : getBooleanHashCode(this.y6g_1)) | 0;
+        var result = this.x6g_1 == null ? 0 : hashCode(this.x6g_1);
+        result = imul(result, 31) + (this.y6g_1 == null ? 0 : hashCode(this.y6g_1)) | 0;
         result = imul(result, 31) + (this.z6g_1 == null ? 0 : getBooleanHashCode(this.z6g_1)) | 0;
         result = imul(result, 31) + (this.a6h_1 == null ? 0 : getBooleanHashCode(this.a6h_1)) | 0;
         result = imul(result, 31) + (this.b6h_1 == null ? 0 : getBooleanHashCode(this.b6h_1)) | 0;
         result = imul(result, 31) + (this.c6h_1 == null ? 0 : getBooleanHashCode(this.c6h_1)) | 0;
         result = imul(result, 31) + (this.d6h_1 == null ? 0 : getBooleanHashCode(this.d6h_1)) | 0;
-        result = imul(result, 31) + (this.e6h_1 == null ? 0 : getStringHashCode(this.e6h_1)) | 0;
+        result = imul(result, 31) + (this.e6h_1 == null ? 0 : getBooleanHashCode(this.e6h_1)) | 0;
         result = imul(result, 31) + (this.f6h_1 == null ? 0 : getStringHashCode(this.f6h_1)) | 0;
+        result = imul(result, 31) + (this.g6h_1 == null ? 0 : getStringHashCode(this.g6h_1)) | 0;
         return result;
       }
       equals(other) {
@@ -149,11 +149,9 @@ function TxtStyle() {
         if (!(other instanceof TxtStyle()))
           return false;
         var tmp0_other_with_cast = other instanceof TxtStyle() ? other : THROW_CCE();
-        if (!equals(this.w6g_1, tmp0_other_with_cast.w6g_1))
-          return false;
         if (!equals(this.x6g_1, tmp0_other_with_cast.x6g_1))
           return false;
-        if (!(this.y6g_1 == tmp0_other_with_cast.y6g_1))
+        if (!equals(this.y6g_1, tmp0_other_with_cast.y6g_1))
           return false;
         if (!(this.z6g_1 == tmp0_other_with_cast.z6g_1))
           return false;
@@ -169,22 +167,24 @@ function TxtStyle() {
           return false;
         if (!(this.f6h_1 == tmp0_other_with_cast.f6h_1))
           return false;
+        if (!(this.g6h_1 == tmp0_other_with_cast.g6h_1))
+          return false;
         return true;
       }
     }
-    protoOf($).l6a = invoke;
-    protoOf($).a6e = plus;
+    protoOf($).m6a = invoke;
+    protoOf($).b6e = plus;
     initMetadataForClass($, 'TxtStyle', VOID, VOID, [TextStyle()]);
     TxtStyleClass = $;
   }
   return TxtStyleClass;
 }
 function copy(_this__u8e3s4, fg, bg, hyperlink, hyperlinkId) {
-  fg = fg === VOID ? _this__u8e3s4.k6d() : fg;
-  bg = bg === VOID ? _this__u8e3s4.l6d() : bg;
-  hyperlink = hyperlink === VOID ? _this__u8e3s4.s6d() : hyperlink;
-  hyperlinkId = hyperlinkId === VOID ? _this__u8e3s4.t6d() : hyperlinkId;
-  return new (TxtStyle())(fg, bg, _this__u8e3s4.q6d(), _this__u8e3s4.m6d(), _this__u8e3s4.n6d(), _this__u8e3s4.r6d(), _this__u8e3s4.o6d(), _this__u8e3s4.p6d(), hyperlink, hyperlinkId);
+  fg = fg === VOID ? _this__u8e3s4.l6d() : fg;
+  bg = bg === VOID ? _this__u8e3s4.m6d() : bg;
+  hyperlink = hyperlink === VOID ? _this__u8e3s4.t6d() : hyperlink;
+  hyperlinkId = hyperlinkId === VOID ? _this__u8e3s4.u6d() : hyperlinkId;
+  return new (TxtStyle())(fg, bg, _this__u8e3s4.r6d(), _this__u8e3s4.n6d(), _this__u8e3s4.o6d(), _this__u8e3s4.s6d(), _this__u8e3s4.p6d(), _this__u8e3s4.q6d(), 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.a6e(style);
+    style = style == null ? s : s.b6e(style);
   }
   return style;
 }