npm - @guardian/feast-multiplatform-library - Versions diffs - 12.0.0 → 13.0.0 - Mend

@guardian/feast-multiplatform-library 12.0.0 → 13.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/kotlin/feast-multiplatform-library-library.js +794 -666
package/kotlin/feast-multiplatform-library-library.js.map +1 -1
package/kotlin/kotlin-kotlin-stdlib.js +6 -6
package/kotlin/kotlin-kotlin-stdlib.js.map +1 -1
package/package.json +1 -1

package/kotlin/feast-multiplatform-library-library.js CHANGED Viewed

@@ -18,6 +18,7 @@
   var listOfNotNull = kotlin_kotlin.$_$.c5;
   var joinToString = kotlin_kotlin.$_$.x4;
   var noWhenBranchMatchedException = kotlin_kotlin.$_$.bb;
+  var isBlank = kotlin_kotlin.$_$.v8;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.d4;
   var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
   var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.d1;
@@ -79,7 +80,6 @@
   var print = kotlin_kotlin.$_$.w5;
   var Exception = kotlin_kotlin.$_$.ba;
   var substring_0 = kotlin_kotlin.$_$.d9;
-  var isBlank = kotlin_kotlin.$_$.v8;
   var Json = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.c;
   var initMetadataForInterface = kotlin_kotlin.$_$.g7;
   var Enum = kotlin_kotlin.$_$.aa;
@@ -139,6 +139,9 @@
   initMetadataForObject(Imperial, 'Imperial');
   initMetadataForObject(Metric, 'Metric');
   initMetadataForObject(USCustomary, 'USCustomary');
+  initMetadataForObject(USCustomaryWithMetric, 'USCustomaryWithMetric');
+  initMetadataForObject(USCustomaryWithImperial, 'USCustomaryWithImperial');
+  initMetadataForObject(USCombined, 'USCombined');
   initMetadataForClass(UnitType, 'UnitType', VOID, Enum);
   initMetadataForClass(MeasurementUnit, 'MeasurementUnit');
   initMetadataForObject(Units, 'Units');
@@ -201,7 +204,7 @@
     var integerPart = numberToInt(number);
     var integerPartStr = integerPart > 0 ? integerPart.toString() : '';
     var fractionalPart = number - integerPart;
-    return (0.0 <= fractionalPart ? fractionalPart <= 0.0625 : false) ? integerPartStr : (0.0625 <= fractionalPart ? fractionalPart <= 0.1875 : false) ? integerPartStr + '\u215B' : (0.1875 <= fractionalPart ? fractionalPart <= 0.291667 : false) ? integerPartStr + '\xBC' : (0.291667 <= fractionalPart ? fractionalPart <= 0.354167 : false) ? integerPartStr + '\u2153' : (0.354167 <= fractionalPart ? fractionalPart <= 0.4375 : false) ? integerPartStr + '\u215C' : (0.4375 <= fractionalPart ? fractionalPart <= 0.5625 : false) ? integerPartStr + '\xBD' : (0.5625 <= fractionalPart ? fractionalPart <= 0.645833 : false) ? integerPartStr + '\u215D' : (0.645833 <= fractionalPart ? fractionalPart <= 0.708333 : false) ? integerPartStr + '\u2154' : (0.708333 <= fractionalPart ? fractionalPart <= 0.8125 : false) ? integerPartStr + '\xBE' : (0.8125 <= fractionalPart ? fractionalPart <= 0.9375 : false) ? integerPartStr + '\u215E' : '' + (integerPart + 1 | 0);
+    return (0.0 <= fractionalPart ? fractionalPart <= 0.125 : false) ? integerPartStr : (0.125 <= fractionalPart ? fractionalPart <= 0.291667 : false) ? integerPartStr + '\xBC' : (0.291667 <= fractionalPart ? fractionalPart <= 0.416667 : false) ? integerPartStr + '\u2153' : (0.416667 <= fractionalPart ? fractionalPart <= 0.583333 : false) ? integerPartStr + '\xBD' : (0.583333 <= fractionalPart ? fractionalPart <= 0.708333 : false) ? integerPartStr + '\u2154' : (0.708333 <= fractionalPart ? fractionalPart <= 0.875 : false) ? integerPartStr + '\xBE' : '' + (integerPart + 1 | 0);
   };
   protoOf(FormatUtils).i1d = function (number, decimals, fraction) {
     if (fraction) {
@@ -303,11 +306,11 @@
       tmp_1 = this.k1d_1.p1e(tmp1_safe_receiver);
     }
     var density = tmp_1;
-    amount = UnitConversions_getInstance().x1e(amount, measuringSystem, factorToUse, density);
+    amount = UnitConversions_getInstance().y1e(amount, measuringSystem, factorToUse, density);
     var tmp2_subject = amount.c1d_1;
-    var decimals = equals(tmp2_subject, Units_getInstance().n1d_1) || (equals(tmp2_subject, Units_getInstance().r1d_1) || equals(tmp2_subject, Units_getInstance().e1e_1)) ? 0 : equals(tmp2_subject, Units_getInstance().f1e_1) || equals(tmp2_subject, Units_getInstance().g1e_1) ? 1 : 1;
+    var decimals = equals(tmp2_subject, Units_getInstance().n1d_1) || (equals(tmp2_subject, Units_getInstance().r1d_1) || equals(tmp2_subject, Units_getInstance().e1e_1)) || (equals(tmp2_subject, Units_getInstance().w1d_1) || equals(tmp2_subject, Units_getInstance().u1d_1) || (equals(tmp2_subject, Units_getInstance().x1d_1) || equals(tmp2_subject, Units_getInstance().v1d_1))) ? 0 : equals(tmp2_subject, Units_getInstance().f1e_1) || equals(tmp2_subject, Units_getInstance().g1e_1) ? 1 : 1;
     var tmp3_subject = amount.c1d_1;
-    var fraction = equals(tmp3_subject, Units_getInstance().s1d_1) || (equals(tmp3_subject, Units_getInstance().r1d_1) || equals(tmp3_subject, Units_getInstance().f1e_1)) || (equals(tmp3_subject, Units_getInstance().n1d_1) || (equals(tmp3_subject, Units_getInstance().o1d_1) || equals(tmp3_subject, Units_getInstance().e1e_1))) ? false : true;
+    var fraction = equals(tmp3_subject, Units_getInstance().s1d_1) || (equals(tmp3_subject, Units_getInstance().r1d_1) || equals(tmp3_subject, Units_getInstance().f1e_1)) || (equals(tmp3_subject, Units_getInstance().n1d_1) || (equals(tmp3_subject, Units_getInstance().o1d_1) || equals(tmp3_subject, Units_getInstance().e1e_1))) ? false : equals(tmp3_subject, Units_getInstance().u1d_1) || equals(tmp3_subject, Units_getInstance().v1d_1) || (equals(tmp3_subject, Units_getInstance().x1d_1) || equals(tmp3_subject, Units_getInstance().w1d_1)) ? amount.a1d_1 < 1.0 : true;
     var tmp_2;
     if (!(amount.c1d_1 == null)) {
       var tmp_3;
@@ -316,9 +319,9 @@
       // Inline function 'kotlin.math.max' call
       var b = tmp4_elvis_lhs == null ? amount.a1d_1 : tmp4_elvis_lhs;
       if (Math.max(tmp0, b) > 1.1) {
-        tmp_3 = ' ' + amount.c1d_1.b1f_1;
+        tmp_3 = ' ' + amount.c1d_1.c1f_1;
       } else {
-        tmp_3 = ' ' + amount.c1d_1.a1f_1;
+        tmp_3 = ' ' + amount.c1d_1.b1f_1;
       }
       tmp_2 = tmp_3;
     } else {
@@ -336,13 +339,94 @@
     }
     return joinToString(listOfNotNull([tmp_4, tmp_5, unitString]), '');
   };
-  protoOf(TemplateSession).f1f = function (element, factor, measuringSystem) {
+  protoOf(TemplateSession).g1f = function (element, factor, measuringSystem) {
     var tmp;
     if (element instanceof TemplateConst) {
       tmp = element.value;
     } else {
       if (element instanceof QuantityPlaceholder) {
-        tmp = this.m1d(element, factor, measuringSystem);
+        var tmp_0;
+        var tmp_1;
+        if (measuringSystem instanceof Metric) {
+          tmp_1 = true;
+        } else {
+          var tmp_2;
+          if (measuringSystem instanceof Imperial) {
+            tmp_2 = true;
+          } else {
+            tmp_2 = measuringSystem instanceof USCustomary;
+          }
+          tmp_1 = tmp_2;
+        }
+        if (tmp_1) {
+          tmp_0 = this.m1d(element, factor, measuringSystem);
+        } else {
+          if (measuringSystem instanceof USCustomaryWithMetric) {
+            var tmp_3;
+            // Inline function 'kotlin.text.isNullOrBlank' call
+            var this_0 = element.unit;
+            if (this_0 == null || isBlank(this_0)) {
+              tmp_3 = this.m1d(element, factor, USCustomary_instance);
+            } else {
+              var cupsPart = this.m1d(element, factor, USCustomary_instance);
+              var metricPart = this.m1d(element, factor, Metric_instance);
+              var tmp_4;
+              if (cupsPart === metricPart) {
+                tmp_4 = cupsPart;
+              } else {
+                tmp_4 = metricPart + ' (' + cupsPart + ')';
+              }
+              tmp_3 = tmp_4;
+            }
+            tmp_0 = tmp_3;
+          } else {
+            if (measuringSystem instanceof USCustomaryWithImperial) {
+              var tmp_5;
+              // Inline function 'kotlin.text.isNullOrBlank' call
+              var this_1 = element.unit;
+              if (this_1 == null || isBlank(this_1)) {
+                tmp_5 = this.m1d(element, factor, USCustomary_instance);
+              } else {
+                var cupsPart_0 = this.m1d(element, factor, USCustomary_instance);
+                var imperialPart = this.m1d(element, factor, Imperial_instance);
+                var tmp_6;
+                if (cupsPart_0 === imperialPart) {
+                  tmp_6 = cupsPart_0;
+                } else {
+                  tmp_6 = imperialPart + ' (' + cupsPart_0 + ')';
+                }
+                tmp_5 = tmp_6;
+              }
+              tmp_0 = tmp_5;
+            } else {
+              if (measuringSystem instanceof USCombined) {
+                var tmp_7;
+                // Inline function 'kotlin.text.isNullOrBlank' call
+                var this_2 = element.unit;
+                if (this_2 == null || isBlank(this_2)) {
+                  tmp_7 = this.m1d(element, factor, USCustomary_instance);
+                } else {
+                  var cupsPart_1 = this.m1d(element, factor, USCustomary_instance);
+                  var imperialPart_0 = this.m1d(element, factor, Imperial_instance);
+                  var metricPart_0 = this.m1d(element, factor, Metric_instance);
+                  var tmp_8;
+                  if (cupsPart_1 === metricPart_0 && cupsPart_1 === imperialPart_0) {
+                    tmp_8 = metricPart_0;
+                  } else if (cupsPart_1 === imperialPart_0) {
+                    tmp_8 = metricPart_0 + ' (' + cupsPart_1 + ')';
+                  } else {
+                    tmp_8 = metricPart_0 + ' (' + imperialPart_0 + ' \u2022 ' + cupsPart_1 + ')';
+                  }
+                  tmp_7 = tmp_8;
+                }
+                tmp_0 = tmp_7;
+              } else {
+                noWhenBranchMatchedException();
+              }
+            }
+          }
+        }
+        tmp = tmp_0;
       } else {
         if (element instanceof OvenTemperaturePlaceholder) {
           tmp = this.l1d(element);
@@ -353,22 +437,22 @@
     }
     return tmp;
   };
-  protoOf(TemplateSession).g1f = function (template, factor, measuringSystem) {
+  protoOf(TemplateSession).h1f = function (template, factor, measuringSystem) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = template.h1f_1;
+    var this_0 = template.i1f_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.s();
     while (_iterator__ex2g4s.t()) {
       var item = _iterator__ex2g4s.u();
-      var tmp$ret$0 = this.f1f(item, factor, measuringSystem);
+      var tmp$ret$0 = this.g1f(item, factor, measuringSystem);
       destination.w(tmp$ret$0);
     }
     var renderedParts = destination;
     return FormatUtils_getInstance().j1d(joinToString(renderedParts, ''));
   };
   protoOf(TemplateSession).scaleAndConvertUnitRecipe = function (recipe, factor, measuringSystem) {
-    var tmp0_safe_receiver = recipe.u1f_1;
+    var tmp0_safe_receiver = recipe.v1f_1;
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
@@ -379,7 +463,7 @@
       var _iterator__ex2g4s = tmp0_safe_receiver.s();
       while (_iterator__ex2g4s.t()) {
         var item = _iterator__ex2g4s.u();
-        var tmp0_safe_receiver_0 = item.f1g_1;
+        var tmp0_safe_receiver_0 = item.g1g_1;
         var tmp_0;
         if (tmp0_safe_receiver_0 == null) {
           tmp_0 = null;
@@ -390,28 +474,28 @@
           var _iterator__ex2g4s_0 = tmp0_safe_receiver_0.s();
           while (_iterator__ex2g4s_0.t()) {
             var item_0 = _iterator__ex2g4s_0.u();
-            var tmp0_safe_receiver_1 = item_0.n1g_1;
+            var tmp0_safe_receiver_1 = item_0.o1g_1;
             var tmp_1;
             if (tmp0_safe_receiver_1 == null) {
               tmp_1 = null;
             } else {
               // Inline function 'kotlin.let' call
-              tmp_1 = wrapWithStrongTag(this.g1f(parseTemplate(tmp0_safe_receiver_1), factor, measuringSystem));
+              tmp_1 = wrapWithStrongTag(this.h1f(parseTemplate(tmp0_safe_receiver_1), factor, measuringSystem));
             }
             var tmp1_elvis_lhs = tmp_1;
-            var scaledText = tmp1_elvis_lhs == null ? item_0.o1g_1 : tmp1_elvis_lhs;
-            var tmp$ret$2 = item_0.q1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledText);
+            var scaledText = tmp1_elvis_lhs == null ? item_0.p1g_1 : tmp1_elvis_lhs;
+            var tmp$ret$2 = item_0.r1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledText);
             destination_0.w(tmp$ret$2);
           }
           tmp_0 = destination_0;
         }
-        var tmp$ret$5 = new IngredientsList(tmp_0, item.g1g_1);
+        var tmp$ret$5 = new IngredientsList(tmp_0, item.h1g_1);
         destination.w(tmp$ret$5);
       }
       tmp = destination;
     }
     var scaledIngredients = tmp;
-    var tmp1_safe_receiver = recipe.v1f_1;
+    var tmp1_safe_receiver = recipe.w1f_1;
     var tmp_2;
     if (tmp1_safe_receiver == null) {
       tmp_2 = null;
@@ -422,22 +506,22 @@
       var _iterator__ex2g4s_1 = tmp1_safe_receiver.s();
       while (_iterator__ex2g4s_1.t()) {
         var item_1 = _iterator__ex2g4s_1.u();
-        var tmp0_safe_receiver_2 = item_1.s1g_1;
+        var tmp0_safe_receiver_2 = item_1.t1g_1;
         var tmp_3;
         if (tmp0_safe_receiver_2 == null) {
           tmp_3 = null;
         } else {
           // Inline function 'kotlin.let' call
-          tmp_3 = this.g1f(parseTemplate(tmp0_safe_receiver_2), factor, measuringSystem);
+          tmp_3 = this.h1f(parseTemplate(tmp0_safe_receiver_2), factor, measuringSystem);
         }
         var description = tmp_3;
-        var tmp$ret$10 = item_1.v1g(description == null ? item_1.r1g_1 : description);
+        var tmp$ret$10 = item_1.w1g(description == null ? item_1.s1g_1 : description);
         destination_1.w(tmp$ret$10);
       }
       tmp_2 = destination_1;
     }
     var scaledInstructions = tmp_2;
-    return recipe.w1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledIngredients, scaledInstructions);
+    return recipe.x1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledIngredients, scaledInstructions);
   };
   function splitBeforeSuffix(value) {
     // Inline function 'kotlin.charArrayOf' call
@@ -493,7 +577,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.x1g_1 = [null, tmp_1, lazy(tmp_2, TableSchema$Companion$$childSerializers$_anonymous__48gmsb_0)];
+    tmp.y1g_1 = [null, tmp_1, lazy(tmp_2, TableSchema$Companion$$childSerializers$_anonymous__48gmsb_0)];
   }
   var Companion_instance_0;
   function Companion_getInstance() {
@@ -507,22 +591,22 @@
     tmp0_serialDesc.rs('prepared_at', false);
     tmp0_serialDesc.rs('key', false);
     tmp0_serialDesc.rs('values', false);
-    this.y1g_1 = tmp0_serialDesc;
+    this.z1g_1 = tmp0_serialDesc;
   }
-  protoOf($serializer).z1g = function (encoder, value) {
-    var tmp0_desc = this.y1g_1;
+  protoOf($serializer).a1h = function (encoder, value) {
+    var tmp0_desc = this.z1g_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    var tmp2_cached = Companion_getInstance().x1g_1;
-    tmp1_output.wm(tmp0_desc, 0, value.a1h_1);
-    tmp1_output.ym(tmp0_desc, 1, tmp2_cached[1].h2(), value.b1h_1);
-    tmp1_output.ym(tmp0_desc, 2, tmp2_cached[2].h2(), value.c1h_1);
+    var tmp2_cached = Companion_getInstance().y1g_1;
+    tmp1_output.wm(tmp0_desc, 0, value.b1h_1);
+    tmp1_output.ym(tmp0_desc, 1, tmp2_cached[1].h2(), value.c1h_1);
+    tmp1_output.ym(tmp0_desc, 2, tmp2_cached[2].h2(), value.d1h_1);
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer).li = function (encoder, value) {
-    return this.z1g(encoder, value instanceof TableSchema ? value : THROW_CCE());
+    return this.a1h(encoder, value instanceof TableSchema ? value : THROW_CCE());
   };
   protoOf($serializer).mi = function (decoder) {
-    var tmp0_desc = this.y1g_1;
+    var tmp0_desc = this.z1g_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -530,7 +614,7 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_input = decoder.il(tmp0_desc);
-    var tmp8_cached = Companion_getInstance().x1g_1;
+    var tmp8_cached = Companion_getInstance().y1g_1;
     if (tmp7_input.yl()) {
       tmp4_local0 = tmp7_input.sl(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
@@ -565,10 +649,10 @@
     return TableSchema_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
   protoOf($serializer).ki = function () {
-    return this.y1g_1;
+    return this.z1g_1;
   };
   protoOf($serializer).ts = function () {
-    var tmp0_cached = Companion_getInstance().x1g_1;
+    var tmp0_cached = Companion_getInstance().y1g_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -582,11 +666,11 @@
   }
   function TableSchema_init_$Init$(seen0, preparedAt, key, values, serializationConstructorMarker, $this) {
     if (!(7 === (7 & seen0))) {
-      throwMissingFieldException(seen0, 7, $serializer_getInstance().y1g_1);
+      throwMissingFieldException(seen0, 7, $serializer_getInstance().z1g_1);
     }
-    $this.a1h_1 = preparedAt;
-    $this.b1h_1 = key;
-    $this.c1h_1 = values;
+    $this.b1h_1 = preparedAt;
+    $this.c1h_1 = key;
+    $this.d1h_1 = values;
     return $this;
   }
   function TableSchema_init_$Create$(seen0, preparedAt, key, values, serializationConstructorMarker) {
@@ -594,17 +678,17 @@
   }
   function TableSchema(preparedAt, key, values) {
     Companion_getInstance();
-    this.a1h_1 = preparedAt;
-    this.b1h_1 = key;
-    this.c1h_1 = values;
+    this.b1h_1 = preparedAt;
+    this.c1h_1 = key;
+    this.d1h_1 = values;
   }
   protoOf(TableSchema).toString = function () {
-    return 'TableSchema(preparedAt=' + this.a1h_1 + ', key=' + toString_0(this.b1h_1) + ', values=' + toString_0(this.c1h_1) + ')';
+    return 'TableSchema(preparedAt=' + this.b1h_1 + ', key=' + toString_0(this.c1h_1) + ', values=' + toString_0(this.d1h_1) + ')';
   };
   protoOf(TableSchema).hashCode = function () {
-    var result = getStringHashCode(this.a1h_1);
-    result = imul(result, 31) + hashCode(this.b1h_1) | 0;
+    var result = getStringHashCode(this.b1h_1);
     result = imul(result, 31) + hashCode(this.c1h_1) | 0;
+    result = imul(result, 31) + hashCode(this.d1h_1) | 0;
     return result;
   };
   protoOf(TableSchema).equals = function (other) {
@@ -612,12 +696,12 @@
       return true;
     if (!(other instanceof TableSchema))
       return false;
-    if (!(this.a1h_1 === other.a1h_1))
-      return false;
-    if (!equals(this.b1h_1, other.b1h_1))
+    if (!(this.b1h_1 === other.b1h_1))
       return false;
     if (!equals(this.c1h_1, other.c1h_1))
       return false;
+    if (!equals(this.d1h_1, other.d1h_1))
+      return false;
     return true;
   };
   function Companion_0() {
@@ -633,22 +717,22 @@
     tmp0_serialDesc.rs('name', false);
     tmp0_serialDesc.rs('normalised_name', false);
     tmp0_serialDesc.rs('density', false);
-    this.d1h_1 = tmp0_serialDesc;
+    this.e1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_0).e1h = function (encoder, value) {
-    var tmp0_desc = this.d1h_1;
+  protoOf($serializer_0).f1h = function (encoder, value) {
+    var tmp0_desc = this.e1h_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    tmp1_output.rm(tmp0_desc, 0, value.f1h_1);
-    tmp1_output.wm(tmp0_desc, 1, value.g1h_1);
-    tmp1_output.wm(tmp0_desc, 2, value.h1h_1);
-    tmp1_output.tm(tmp0_desc, 3, value.i1h_1);
+    tmp1_output.rm(tmp0_desc, 0, value.g1h_1);
+    tmp1_output.wm(tmp0_desc, 1, value.h1h_1);
+    tmp1_output.wm(tmp0_desc, 2, value.i1h_1);
+    tmp1_output.tm(tmp0_desc, 3, value.j1h_1);
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_0).li = function (encoder, value) {
-    return this.e1h(encoder, value instanceof Ingredient ? value : THROW_CCE());
+    return this.f1h(encoder, value instanceof Ingredient ? value : THROW_CCE());
   };
   protoOf($serializer_0).mi = function (decoder) {
-    var tmp0_desc = this.d1h_1;
+    var tmp0_desc = this.e1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -697,7 +781,7 @@
     return Ingredient_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
   protoOf($serializer_0).ki = function () {
-    return this.d1h_1;
+    return this.e1h_1;
   };
   protoOf($serializer_0).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -713,31 +797,31 @@
   }
   function Ingredient_init_$Init$(seen0, id, name, normalised_name, density, serializationConstructorMarker, $this) {
     if (!(15 === (15 & seen0))) {
-      throwMissingFieldException(seen0, 15, $serializer_getInstance_0().d1h_1);
+      throwMissingFieldException(seen0, 15, $serializer_getInstance_0().e1h_1);
     }
-    $this.f1h_1 = id;
-    $this.g1h_1 = name;
-    $this.h1h_1 = normalised_name;
-    $this.i1h_1 = density;
+    $this.g1h_1 = id;
+    $this.h1h_1 = name;
+    $this.i1h_1 = normalised_name;
+    $this.j1h_1 = density;
     return $this;
   }
   function Ingredient_init_$Create$(seen0, id, name, normalised_name, density, serializationConstructorMarker) {
     return Ingredient_init_$Init$(seen0, id, name, normalised_name, density, serializationConstructorMarker, objectCreate(protoOf(Ingredient)));
   }
   function Ingredient(id, name, normalised_name, density) {
-    this.f1h_1 = id;
-    this.g1h_1 = name;
-    this.h1h_1 = normalised_name;
-    this.i1h_1 = density;
+    this.g1h_1 = id;
+    this.h1h_1 = name;
+    this.i1h_1 = normalised_name;
+    this.j1h_1 = density;
   }
   protoOf(Ingredient).toString = function () {
-    return 'Ingredient(id=' + this.f1h_1 + ', name=' + this.g1h_1 + ', normalised_name=' + this.h1h_1 + ', density=' + this.i1h_1 + ')';
+    return 'Ingredient(id=' + this.g1h_1 + ', name=' + this.h1h_1 + ', normalised_name=' + this.i1h_1 + ', density=' + this.j1h_1 + ')';
   };
   protoOf(Ingredient).hashCode = function () {
-    var result = this.f1h_1;
-    result = imul(result, 31) + getStringHashCode(this.g1h_1) | 0;
+    var result = this.g1h_1;
     result = imul(result, 31) + getStringHashCode(this.h1h_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.i1h_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.i1h_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.j1h_1) | 0;
     return result;
   };
   protoOf(Ingredient).equals = function (other) {
@@ -745,13 +829,13 @@
       return true;
     if (!(other instanceof Ingredient))
       return false;
-    if (!(this.f1h_1 === other.f1h_1))
-      return false;
     if (!(this.g1h_1 === other.g1h_1))
       return false;
     if (!(this.h1h_1 === other.h1h_1))
       return false;
-    if (!equals(this.i1h_1, other.i1h_1))
+    if (!(this.i1h_1 === other.i1h_1))
+      return false;
+    if (!equals(this.j1h_1, other.j1h_1))
       return false;
     return true;
   };
@@ -767,7 +851,7 @@
       tmp = null;
     } else {
       // Inline function 'kotlin.let' call
-      return tmp0_safe_receiver.i1h_1;
+      return tmp0_safe_receiver.j1h_1;
     }
     return tmp;
   };
@@ -785,7 +869,7 @@
       var tmp$ret$1 = isInterface(this_2, KSerializer) ? this_2 : THROW_CCE();
       var data = this_0.u11(tmp$ret$1, raw);
       // Inline function 'kotlin.collections.map' call
-      var this_3 = data.c1h_1;
+      var this_3 = data.d1h_1;
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_3, 10));
       var _iterator__ex2g4s = this_3.s();
@@ -803,7 +887,7 @@
       while (_iterator__ex2g4s_0.t()) {
         var element = _iterator__ex2g4s_0.u();
         // Inline function 'kotlin.collections.plusAssign' call
-        var pair = to(element.h1h_1, element);
+        var pair = to(element.i1h_1, element);
         destination_0.o2(pair.fd_1, pair.gd_1);
       }
       var normalised_map = destination_0;
@@ -815,11 +899,11 @@
       while (_iterator__ex2g4s_1.t()) {
         var element_0 = _iterator__ex2g4s_1.u();
         // Inline function 'kotlin.collections.plusAssign' call
-        var pair_0 = to(element_0.g1h_1, element_0);
+        var pair_0 = to(element_0.h1h_1, element_0);
         destination_1.o2(pair_0.fd_1, pair_0.gd_1);
       }
       var name_map = destination_1;
-      var table = new DensityTable(data.a1h_1, normalised_map, name_map);
+      var table = new DensityTable(data.b1h_1, normalised_map, name_map);
       // Inline function 'kotlin.Companion.success' call
       return _Result___init__impl__xyqfz8(table);
     } catch ($p) {
@@ -927,7 +1011,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.j1h_1 = [null, tmp_1, null, tmp_3, tmp_5, null, tmp_7, tmp_9, null, null, null, null, tmp_11, tmp_13, null, tmp_15, tmp_17, tmp_19, tmp_21, tmp_23, null, lazy(tmp_24, RecipeV3$Companion$$childSerializers$_anonymous__7om4qn_11), null];
+    tmp.k1h_1 = [null, tmp_1, null, tmp_3, tmp_5, null, tmp_7, tmp_9, null, null, null, null, tmp_11, tmp_13, null, tmp_15, tmp_17, tmp_19, tmp_21, tmp_23, null, lazy(tmp_24, RecipeV3$Companion$$childSerializers$_anonymous__7om4qn_11), null];
   }
   var Companion_instance_2;
   function Companion_getInstance_1() {
@@ -961,86 +1045,86 @@
     tmp0_serialDesc.rs('title', true);
     tmp0_serialDesc.rs('utensilsAndApplianceIds', true);
     tmp0_serialDesc.rs('webPublicationDate', true);
-    this.k1h_1 = tmp0_serialDesc;
+    this.l1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_1).l1h = function (encoder, value) {
-    var tmp0_desc = this.k1h_1;
+  protoOf($serializer_1).m1h = function (encoder, value) {
+    var tmp0_desc = this.l1h_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_1().j1h_1;
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.i1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, StringSerializer_getInstance(), value.i1f_1);
+    var tmp2_cached = Companion_getInstance_1().k1h_1;
+    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.j1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 0, StringSerializer_getInstance(), value.j1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.j1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, tmp2_cached[1].h2(), value.j1f_1);
+    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.k1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 1, tmp2_cached[1].h2(), value.k1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.k1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.k1f_1);
+    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.l1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.l1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.l1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 3, tmp2_cached[3].h2(), value.l1f_1);
+    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.m1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 3, tmp2_cached[3].h2(), value.m1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 4) ? true : !(value.m1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 4, tmp2_cached[4].h2(), value.m1f_1);
+    if (tmp1_output.en(tmp0_desc, 4) ? true : !(value.n1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 4, tmp2_cached[4].h2(), value.n1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.n1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.n1f_1);
+    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.o1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.o1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.o1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 6, tmp2_cached[6].h2(), value.o1f_1);
+    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.p1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 6, tmp2_cached[6].h2(), value.p1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 7) ? true : !(value.p1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 7, tmp2_cached[7].h2(), value.p1f_1);
+    if (tmp1_output.en(tmp0_desc, 7) ? true : !(value.q1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 7, tmp2_cached[7].h2(), value.q1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 8) ? true : !(value.q1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 8, StringSerializer_getInstance(), value.q1f_1);
+    if (tmp1_output.en(tmp0_desc, 8) ? true : !(value.r1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 8, StringSerializer_getInstance(), value.r1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 9) ? true : !(value.r1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 9, StringSerializer_getInstance(), value.r1f_1);
+    if (tmp1_output.en(tmp0_desc, 9) ? true : !(value.s1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 9, StringSerializer_getInstance(), value.s1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 10) ? true : !(value.s1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 10, $serializer_getInstance_3(), value.s1f_1);
+    if (tmp1_output.en(tmp0_desc, 10) ? true : !(value.t1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 10, $serializer_getInstance_3(), value.t1f_1);
     }
-    tmp1_output.wm(tmp0_desc, 11, value.t1f_1);
-    if (tmp1_output.en(tmp0_desc, 12) ? true : !(value.u1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 12, tmp2_cached[12].h2(), value.u1f_1);
+    tmp1_output.wm(tmp0_desc, 11, value.u1f_1);
+    if (tmp1_output.en(tmp0_desc, 12) ? true : !(value.v1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 12, tmp2_cached[12].h2(), value.v1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 13) ? true : !(value.v1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 13, tmp2_cached[13].h2(), value.v1f_1);
+    if (tmp1_output.en(tmp0_desc, 13) ? true : !(value.w1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 13, tmp2_cached[13].h2(), value.w1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 14) ? true : !(value.w1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 14, BooleanSerializer_getInstance(), value.w1f_1);
+    if (tmp1_output.en(tmp0_desc, 14) ? true : !(value.x1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 14, BooleanSerializer_getInstance(), value.x1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 15) ? true : !(value.x1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 15, tmp2_cached[15].h2(), value.x1f_1);
+    if (tmp1_output.en(tmp0_desc, 15) ? true : !(value.y1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 15, tmp2_cached[15].h2(), value.y1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 16) ? true : !(value.y1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 16, tmp2_cached[16].h2(), value.y1f_1);
+    if (tmp1_output.en(tmp0_desc, 16) ? true : !(value.z1f_1 == null)) {
+      tmp1_output.an(tmp0_desc, 16, tmp2_cached[16].h2(), value.z1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 17) ? true : !(value.z1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 17, tmp2_cached[17].h2(), value.z1f_1);
+    if (tmp1_output.en(tmp0_desc, 17) ? true : !(value.a1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 17, tmp2_cached[17].h2(), value.a1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 18) ? true : !(value.a1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 18, tmp2_cached[18].h2(), value.a1g_1);
+    if (tmp1_output.en(tmp0_desc, 18) ? true : !(value.b1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 18, tmp2_cached[18].h2(), value.b1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 19) ? true : !(value.b1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 19, tmp2_cached[19].h2(), value.b1g_1);
+    if (tmp1_output.en(tmp0_desc, 19) ? true : !(value.c1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 19, tmp2_cached[19].h2(), value.c1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 20) ? true : !(value.c1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 20, StringSerializer_getInstance(), value.c1g_1);
+    if (tmp1_output.en(tmp0_desc, 20) ? true : !(value.d1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 20, StringSerializer_getInstance(), value.d1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 21) ? true : !(value.d1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 21, tmp2_cached[21].h2(), value.d1g_1);
+    if (tmp1_output.en(tmp0_desc, 21) ? true : !(value.e1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 21, tmp2_cached[21].h2(), value.e1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 22) ? true : !(value.e1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 22, StringSerializer_getInstance(), value.e1g_1);
+    if (tmp1_output.en(tmp0_desc, 22) ? true : !(value.f1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 22, StringSerializer_getInstance(), value.f1g_1);
     }
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_1).li = function (encoder, value) {
-    return this.l1h(encoder, value instanceof RecipeV3 ? value : THROW_CCE());
+    return this.m1h(encoder, value instanceof RecipeV3 ? value : THROW_CCE());
   };
   protoOf($serializer_1).mi = function (decoder) {
-    var tmp0_desc = this.k1h_1;
+    var tmp0_desc = this.l1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1068,7 +1152,7 @@
     var tmp25_local21 = null;
     var tmp26_local22 = null;
     var tmp27_input = decoder.il(tmp0_desc);
-    var tmp28_cached = Companion_getInstance_1().j1h_1;
+    var tmp28_cached = Companion_getInstance_1().k1h_1;
     if (tmp27_input.yl()) {
       tmp4_local0 = tmp27_input.wl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
@@ -1223,10 +1307,10 @@
     return RecipeV3_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, tmp12_local8, tmp13_local9, tmp14_local10, tmp15_local11, tmp16_local12, tmp17_local13, tmp18_local14, tmp19_local15, tmp20_local16, tmp21_local17, tmp22_local18, tmp23_local19, tmp24_local20, tmp25_local21, tmp26_local22, null);
   };
   protoOf($serializer_1).ki = function () {
-    return this.k1h_1;
+    return this.l1h_1;
   };
   protoOf($serializer_1).ts = function () {
-    var tmp0_cached = Companion_getInstance_1().j1h_1;
+    var tmp0_cached = Companion_getInstance_1().k1h_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1240,97 +1324,97 @@
   }
   function RecipeV3_init_$Init$(seen0, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, serializationConstructorMarker, $this) {
     if (!(2048 === (2048 & seen0))) {
-      throwMissingFieldException(seen0, 2048, $serializer_getInstance_1().k1h_1);
+      throwMissingFieldException(seen0, 2048, $serializer_getInstance_1().l1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.i1f_1 = null;
+      $this.j1f_1 = null;
     else
-      $this.i1f_1 = bookCredit;
+      $this.j1f_1 = bookCredit;
     if (0 === (seen0 & 2))
-      $this.j1f_1 = null;
+      $this.k1f_1 = null;
     else
-      $this.j1f_1 = byline;
+      $this.k1f_1 = byline;
     if (0 === (seen0 & 4))
-      $this.k1f_1 = null;
+      $this.l1f_1 = null;
     else
-      $this.k1f_1 = canonicalArticle;
+      $this.l1f_1 = canonicalArticle;
     if (0 === (seen0 & 8))
-      $this.l1f_1 = null;
+      $this.m1f_1 = null;
     else
-      $this.l1f_1 = celebrationIds;
+      $this.m1f_1 = celebrationIds;
     if (0 === (seen0 & 16))
-      $this.m1f_1 = null;
+      $this.n1f_1 = null;
     else
-      $this.m1f_1 = commerceCtas;
+      $this.n1f_1 = commerceCtas;
     if (0 === (seen0 & 32))
-      $this.n1f_1 = null;
+      $this.o1f_1 = null;
     else
-      $this.n1f_1 = composerId;
+      $this.o1f_1 = composerId;
     if (0 === (seen0 & 64))
-      $this.o1f_1 = null;
+      $this.p1f_1 = null;
     else
-      $this.o1f_1 = contributors;
+      $this.p1f_1 = contributors;
     if (0 === (seen0 & 128))
-      $this.p1f_1 = null;
+      $this.q1f_1 = null;
     else
-      $this.p1f_1 = cuisineIds;
+      $this.q1f_1 = cuisineIds;
     if (0 === (seen0 & 256))
-      $this.q1f_1 = null;
+      $this.r1f_1 = null;
     else
-      $this.q1f_1 = description;
+      $this.r1f_1 = description;
     if (0 === (seen0 & 512))
-      $this.r1f_1 = null;
+      $this.s1f_1 = null;
     else
-      $this.r1f_1 = difficultyLevel;
+      $this.s1f_1 = difficultyLevel;
     if (0 === (seen0 & 1024))
-      $this.s1f_1 = null;
+      $this.t1f_1 = null;
     else
-      $this.s1f_1 = featuredImage;
-    $this.t1f_1 = id;
+      $this.t1f_1 = featuredImage;
+    $this.u1f_1 = id;
     if (0 === (seen0 & 4096))
-      $this.u1f_1 = null;
+      $this.v1f_1 = null;
     else
-      $this.u1f_1 = ingredients;
+      $this.v1f_1 = ingredients;
     if (0 === (seen0 & 8192))
-      $this.v1f_1 = null;
+      $this.w1f_1 = null;
     else
-      $this.v1f_1 = instructions;
+      $this.w1f_1 = instructions;
     if (0 === (seen0 & 16384))
-      $this.w1f_1 = null;
+      $this.x1f_1 = null;
     else
-      $this.w1f_1 = isAppReady;
+      $this.x1f_1 = isAppReady;
     if (0 === (seen0 & 32768))
-      $this.x1f_1 = null;
+      $this.y1f_1 = null;
     else
-      $this.x1f_1 = mealTypeIds;
+      $this.y1f_1 = mealTypeIds;
     if (0 === (seen0 & 65536))
-      $this.y1f_1 = null;
+      $this.z1f_1 = null;
     else
-      $this.y1f_1 = serves;
+      $this.z1f_1 = serves;
     if (0 === (seen0 & 131072))
-      $this.z1f_1 = null;
+      $this.a1g_1 = null;
     else
-      $this.z1f_1 = suitableForDietIds;
+      $this.a1g_1 = suitableForDietIds;
     if (0 === (seen0 & 262144))
-      $this.a1g_1 = null;
+      $this.b1g_1 = null;
     else
-      $this.a1g_1 = techniquesUsedIds;
+      $this.b1g_1 = techniquesUsedIds;
     if (0 === (seen0 & 524288))
-      $this.b1g_1 = null;
+      $this.c1g_1 = null;
     else
-      $this.b1g_1 = timings;
+      $this.c1g_1 = timings;
     if (0 === (seen0 & 1048576))
-      $this.c1g_1 = null;
+      $this.d1g_1 = null;
     else
-      $this.c1g_1 = title;
+      $this.d1g_1 = title;
     if (0 === (seen0 & 2097152))
-      $this.d1g_1 = null;
+      $this.e1g_1 = null;
     else
-      $this.d1g_1 = utensilsAndApplianceIds;
+      $this.e1g_1 = utensilsAndApplianceIds;
     if (0 === (seen0 & 4194304))
-      $this.e1g_1 = null;
+      $this.f1g_1 = null;
     else
-      $this.e1g_1 = webPublicationDate;
+      $this.f1g_1 = webPublicationDate;
     return $this;
   }
   function RecipeV3_init_$Create$(seen0, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, serializationConstructorMarker) {
@@ -1360,86 +1444,86 @@
     title = title === VOID ? null : title;
     utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? null : utensilsAndApplianceIds;
     webPublicationDate = webPublicationDate === VOID ? null : webPublicationDate;
-    this.i1f_1 = bookCredit;
-    this.j1f_1 = byline;
-    this.k1f_1 = canonicalArticle;
-    this.l1f_1 = celebrationIds;
-    this.m1f_1 = commerceCtas;
-    this.n1f_1 = composerId;
-    this.o1f_1 = contributors;
-    this.p1f_1 = cuisineIds;
-    this.q1f_1 = description;
-    this.r1f_1 = difficultyLevel;
-    this.s1f_1 = featuredImage;
-    this.t1f_1 = id;
-    this.u1f_1 = ingredients;
-    this.v1f_1 = instructions;
-    this.w1f_1 = isAppReady;
-    this.x1f_1 = mealTypeIds;
-    this.y1f_1 = serves;
-    this.z1f_1 = suitableForDietIds;
-    this.a1g_1 = techniquesUsedIds;
-    this.b1g_1 = timings;
-    this.c1g_1 = title;
-    this.d1g_1 = utensilsAndApplianceIds;
-    this.e1g_1 = webPublicationDate;
-  }
-  protoOf(RecipeV3).m1h = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) {
+    this.j1f_1 = bookCredit;
+    this.k1f_1 = byline;
+    this.l1f_1 = canonicalArticle;
+    this.m1f_1 = celebrationIds;
+    this.n1f_1 = commerceCtas;
+    this.o1f_1 = composerId;
+    this.p1f_1 = contributors;
+    this.q1f_1 = cuisineIds;
+    this.r1f_1 = description;
+    this.s1f_1 = difficultyLevel;
+    this.t1f_1 = featuredImage;
+    this.u1f_1 = id;
+    this.v1f_1 = ingredients;
+    this.w1f_1 = instructions;
+    this.x1f_1 = isAppReady;
+    this.y1f_1 = mealTypeIds;
+    this.z1f_1 = serves;
+    this.a1g_1 = suitableForDietIds;
+    this.b1g_1 = techniquesUsedIds;
+    this.c1g_1 = timings;
+    this.d1g_1 = title;
+    this.e1g_1 = utensilsAndApplianceIds;
+    this.f1g_1 = webPublicationDate;
+  }
+  protoOf(RecipeV3).n1h = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) {
     return new RecipeV3(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
   };
-  protoOf(RecipeV3).w1g = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, $super) {
-    bookCredit = bookCredit === VOID ? this.i1f_1 : bookCredit;
-    byline = byline === VOID ? this.j1f_1 : byline;
-    canonicalArticle = canonicalArticle === VOID ? this.k1f_1 : canonicalArticle;
-    celebrationIds = celebrationIds === VOID ? this.l1f_1 : celebrationIds;
-    commerceCtas = commerceCtas === VOID ? this.m1f_1 : commerceCtas;
-    composerId = composerId === VOID ? this.n1f_1 : composerId;
-    contributors = contributors === VOID ? this.o1f_1 : contributors;
-    cuisineIds = cuisineIds === VOID ? this.p1f_1 : cuisineIds;
-    description = description === VOID ? this.q1f_1 : description;
-    difficultyLevel = difficultyLevel === VOID ? this.r1f_1 : difficultyLevel;
-    featuredImage = featuredImage === VOID ? this.s1f_1 : featuredImage;
-    id = id === VOID ? this.t1f_1 : id;
-    ingredients = ingredients === VOID ? this.u1f_1 : ingredients;
-    instructions = instructions === VOID ? this.v1f_1 : instructions;
-    isAppReady = isAppReady === VOID ? this.w1f_1 : isAppReady;
-    mealTypeIds = mealTypeIds === VOID ? this.x1f_1 : mealTypeIds;
-    serves = serves === VOID ? this.y1f_1 : serves;
-    suitableForDietIds = suitableForDietIds === VOID ? this.z1f_1 : suitableForDietIds;
-    techniquesUsedIds = techniquesUsedIds === VOID ? this.a1g_1 : techniquesUsedIds;
-    timings = timings === VOID ? this.b1g_1 : timings;
-    title = title === VOID ? this.c1g_1 : title;
-    utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? this.d1g_1 : utensilsAndApplianceIds;
-    webPublicationDate = webPublicationDate === VOID ? this.e1g_1 : webPublicationDate;
-    return $super === VOID ? this.m1h(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) : $super.m1h.call(this, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
+  protoOf(RecipeV3).x1g = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, $super) {
+    bookCredit = bookCredit === VOID ? this.j1f_1 : bookCredit;
+    byline = byline === VOID ? this.k1f_1 : byline;
+    canonicalArticle = canonicalArticle === VOID ? this.l1f_1 : canonicalArticle;
+    celebrationIds = celebrationIds === VOID ? this.m1f_1 : celebrationIds;
+    commerceCtas = commerceCtas === VOID ? this.n1f_1 : commerceCtas;
+    composerId = composerId === VOID ? this.o1f_1 : composerId;
+    contributors = contributors === VOID ? this.p1f_1 : contributors;
+    cuisineIds = cuisineIds === VOID ? this.q1f_1 : cuisineIds;
+    description = description === VOID ? this.r1f_1 : description;
+    difficultyLevel = difficultyLevel === VOID ? this.s1f_1 : difficultyLevel;
+    featuredImage = featuredImage === VOID ? this.t1f_1 : featuredImage;
+    id = id === VOID ? this.u1f_1 : id;
+    ingredients = ingredients === VOID ? this.v1f_1 : ingredients;
+    instructions = instructions === VOID ? this.w1f_1 : instructions;
+    isAppReady = isAppReady === VOID ? this.x1f_1 : isAppReady;
+    mealTypeIds = mealTypeIds === VOID ? this.y1f_1 : mealTypeIds;
+    serves = serves === VOID ? this.z1f_1 : serves;
+    suitableForDietIds = suitableForDietIds === VOID ? this.a1g_1 : suitableForDietIds;
+    techniquesUsedIds = techniquesUsedIds === VOID ? this.b1g_1 : techniquesUsedIds;
+    timings = timings === VOID ? this.c1g_1 : timings;
+    title = title === VOID ? this.d1g_1 : title;
+    utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? this.e1g_1 : utensilsAndApplianceIds;
+    webPublicationDate = webPublicationDate === VOID ? this.f1g_1 : webPublicationDate;
+    return $super === VOID ? this.n1h(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) : $super.n1h.call(this, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
   };
   protoOf(RecipeV3).toString = function () {
-    return 'RecipeV3(bookCredit=' + this.i1f_1 + ', byline=' + toString(this.j1f_1) + ', canonicalArticle=' + this.k1f_1 + ', celebrationIds=' + toString(this.l1f_1) + ', commerceCtas=' + toString(this.m1f_1) + ', composerId=' + this.n1f_1 + ', contributors=' + toString(this.o1f_1) + ', cuisineIds=' + toString(this.p1f_1) + ', description=' + this.q1f_1 + ', difficultyLevel=' + this.r1f_1 + ', featuredImage=' + toString(this.s1f_1) + ', id=' + this.t1f_1 + ', ingredients=' + toString(this.u1f_1) + ', instructions=' + toString(this.v1f_1) + ', isAppReady=' + this.w1f_1 + ', mealTypeIds=' + toString(this.x1f_1) + ', serves=' + toString(this.y1f_1) + ', suitableForDietIds=' + toString(this.z1f_1) + ', techniquesUsedIds=' + toString(this.a1g_1) + ', timings=' + toString(this.b1g_1) + ', title=' + this.c1g_1 + ', utensilsAndApplianceIds=' + toString(this.d1g_1) + ', webPublicationDate=' + this.e1g_1 + ')';
+    return 'RecipeV3(bookCredit=' + this.j1f_1 + ', byline=' + toString(this.k1f_1) + ', canonicalArticle=' + this.l1f_1 + ', celebrationIds=' + toString(this.m1f_1) + ', commerceCtas=' + toString(this.n1f_1) + ', composerId=' + this.o1f_1 + ', contributors=' + toString(this.p1f_1) + ', cuisineIds=' + toString(this.q1f_1) + ', description=' + this.r1f_1 + ', difficultyLevel=' + this.s1f_1 + ', featuredImage=' + toString(this.t1f_1) + ', id=' + this.u1f_1 + ', ingredients=' + toString(this.v1f_1) + ', instructions=' + toString(this.w1f_1) + ', isAppReady=' + this.x1f_1 + ', mealTypeIds=' + toString(this.y1f_1) + ', serves=' + toString(this.z1f_1) + ', suitableForDietIds=' + toString(this.a1g_1) + ', techniquesUsedIds=' + toString(this.b1g_1) + ', timings=' + toString(this.c1g_1) + ', title=' + this.d1g_1 + ', utensilsAndApplianceIds=' + toString(this.e1g_1) + ', webPublicationDate=' + this.f1g_1 + ')';
   };
   protoOf(RecipeV3).hashCode = function () {
-    var result = this.i1f_1 == null ? 0 : getStringHashCode(this.i1f_1);
-    result = imul(result, 31) + (this.j1f_1 == null ? 0 : hashCode(this.j1f_1)) | 0;
-    result = imul(result, 31) + (this.k1f_1 == null ? 0 : getStringHashCode(this.k1f_1)) | 0;
-    result = imul(result, 31) + (this.l1f_1 == null ? 0 : hashCode(this.l1f_1)) | 0;
+    var result = this.j1f_1 == null ? 0 : getStringHashCode(this.j1f_1);
+    result = imul(result, 31) + (this.k1f_1 == null ? 0 : hashCode(this.k1f_1)) | 0;
+    result = imul(result, 31) + (this.l1f_1 == null ? 0 : getStringHashCode(this.l1f_1)) | 0;
     result = imul(result, 31) + (this.m1f_1 == null ? 0 : hashCode(this.m1f_1)) | 0;
-    result = imul(result, 31) + (this.n1f_1 == null ? 0 : getStringHashCode(this.n1f_1)) | 0;
-    result = imul(result, 31) + (this.o1f_1 == null ? 0 : hashCode(this.o1f_1)) | 0;
+    result = imul(result, 31) + (this.n1f_1 == null ? 0 : hashCode(this.n1f_1)) | 0;
+    result = imul(result, 31) + (this.o1f_1 == null ? 0 : getStringHashCode(this.o1f_1)) | 0;
     result = imul(result, 31) + (this.p1f_1 == null ? 0 : hashCode(this.p1f_1)) | 0;
-    result = imul(result, 31) + (this.q1f_1 == null ? 0 : getStringHashCode(this.q1f_1)) | 0;
+    result = imul(result, 31) + (this.q1f_1 == null ? 0 : hashCode(this.q1f_1)) | 0;
     result = imul(result, 31) + (this.r1f_1 == null ? 0 : getStringHashCode(this.r1f_1)) | 0;
-    result = imul(result, 31) + (this.s1f_1 == null ? 0 : this.s1f_1.hashCode()) | 0;
-    result = imul(result, 31) + getStringHashCode(this.t1f_1) | 0;
-    result = imul(result, 31) + (this.u1f_1 == null ? 0 : hashCode(this.u1f_1)) | 0;
+    result = imul(result, 31) + (this.s1f_1 == null ? 0 : getStringHashCode(this.s1f_1)) | 0;
+    result = imul(result, 31) + (this.t1f_1 == null ? 0 : this.t1f_1.hashCode()) | 0;
+    result = imul(result, 31) + getStringHashCode(this.u1f_1) | 0;
     result = imul(result, 31) + (this.v1f_1 == null ? 0 : hashCode(this.v1f_1)) | 0;
-    result = imul(result, 31) + (this.w1f_1 == null ? 0 : getBooleanHashCode(this.w1f_1)) | 0;
-    result = imul(result, 31) + (this.x1f_1 == null ? 0 : hashCode(this.x1f_1)) | 0;
+    result = imul(result, 31) + (this.w1f_1 == null ? 0 : hashCode(this.w1f_1)) | 0;
+    result = imul(result, 31) + (this.x1f_1 == null ? 0 : getBooleanHashCode(this.x1f_1)) | 0;
     result = imul(result, 31) + (this.y1f_1 == null ? 0 : hashCode(this.y1f_1)) | 0;
     result = imul(result, 31) + (this.z1f_1 == null ? 0 : hashCode(this.z1f_1)) | 0;
     result = imul(result, 31) + (this.a1g_1 == null ? 0 : hashCode(this.a1g_1)) | 0;
     result = imul(result, 31) + (this.b1g_1 == null ? 0 : hashCode(this.b1g_1)) | 0;
-    result = imul(result, 31) + (this.c1g_1 == null ? 0 : getStringHashCode(this.c1g_1)) | 0;
-    result = imul(result, 31) + (this.d1g_1 == null ? 0 : hashCode(this.d1g_1)) | 0;
-    result = imul(result, 31) + (this.e1g_1 == null ? 0 : getStringHashCode(this.e1g_1)) | 0;
+    result = imul(result, 31) + (this.c1g_1 == null ? 0 : hashCode(this.c1g_1)) | 0;
+    result = imul(result, 31) + (this.d1g_1 == null ? 0 : getStringHashCode(this.d1g_1)) | 0;
+    result = imul(result, 31) + (this.e1g_1 == null ? 0 : hashCode(this.e1g_1)) | 0;
+    result = imul(result, 31) + (this.f1g_1 == null ? 0 : getStringHashCode(this.f1g_1)) | 0;
     return result;
   };
   protoOf(RecipeV3).equals = function (other) {
@@ -1447,37 +1531,35 @@
       return true;
     if (!(other instanceof RecipeV3))
       return false;
-    if (!(this.i1f_1 == other.i1f_1))
-      return false;
-    if (!equals(this.j1f_1, other.j1f_1))
+    if (!(this.j1f_1 == other.j1f_1))
       return false;
-    if (!(this.k1f_1 == other.k1f_1))
+    if (!equals(this.k1f_1, other.k1f_1))
       return false;
-    if (!equals(this.l1f_1, other.l1f_1))
+    if (!(this.l1f_1 == other.l1f_1))
       return false;
     if (!equals(this.m1f_1, other.m1f_1))
       return false;
-    if (!(this.n1f_1 == other.n1f_1))
+    if (!equals(this.n1f_1, other.n1f_1))
       return false;
-    if (!equals(this.o1f_1, other.o1f_1))
+    if (!(this.o1f_1 == other.o1f_1))
       return false;
     if (!equals(this.p1f_1, other.p1f_1))
       return false;
-    if (!(this.q1f_1 == other.q1f_1))
+    if (!equals(this.q1f_1, other.q1f_1))
       return false;
     if (!(this.r1f_1 == other.r1f_1))
       return false;
-    if (!equals(this.s1f_1, other.s1f_1))
+    if (!(this.s1f_1 == other.s1f_1))
       return false;
-    if (!(this.t1f_1 === other.t1f_1))
+    if (!equals(this.t1f_1, other.t1f_1))
       return false;
-    if (!equals(this.u1f_1, other.u1f_1))
+    if (!(this.u1f_1 === other.u1f_1))
       return false;
     if (!equals(this.v1f_1, other.v1f_1))
       return false;
-    if (!(this.w1f_1 == other.w1f_1))
+    if (!equals(this.w1f_1, other.w1f_1))
       return false;
-    if (!equals(this.x1f_1, other.x1f_1))
+    if (!(this.x1f_1 == other.x1f_1))
       return false;
     if (!equals(this.y1f_1, other.y1f_1))
       return false;
@@ -1487,11 +1569,13 @@
       return false;
     if (!equals(this.b1g_1, other.b1g_1))
       return false;
-    if (!(this.c1g_1 == other.c1g_1))
+    if (!equals(this.c1g_1, other.c1g_1))
       return false;
-    if (!equals(this.d1g_1, other.d1g_1))
+    if (!(this.d1g_1 == other.d1g_1))
       return false;
-    if (!(this.e1g_1 == other.e1g_1))
+    if (!equals(this.e1g_1, other.e1g_1))
+      return false;
+    if (!(this.f1g_1 == other.f1g_1))
       return false;
     return true;
   };
@@ -1501,21 +1585,21 @@
     tmp0_serialDesc.rs('sponsorName', false);
     tmp0_serialDesc.rs('territory', false);
     tmp0_serialDesc.rs('url', false);
-    this.n1h_1 = tmp0_serialDesc;
+    this.o1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_2).o1h = function (encoder, value) {
-    var tmp0_desc = this.n1h_1;
+  protoOf($serializer_2).p1h = function (encoder, value) {
+    var tmp0_desc = this.o1h_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    tmp1_output.wm(tmp0_desc, 0, value.p1h_1);
-    tmp1_output.wm(tmp0_desc, 1, value.q1h_1);
-    tmp1_output.wm(tmp0_desc, 2, value.r1h_1);
+    tmp1_output.wm(tmp0_desc, 0, value.q1h_1);
+    tmp1_output.wm(tmp0_desc, 1, value.r1h_1);
+    tmp1_output.wm(tmp0_desc, 2, value.s1h_1);
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_2).li = function (encoder, value) {
-    return this.o1h(encoder, value instanceof CommerceCta ? value : THROW_CCE());
+    return this.p1h(encoder, value instanceof CommerceCta ? value : THROW_CCE());
   };
   protoOf($serializer_2).mi = function (decoder) {
-    var tmp0_desc = this.n1h_1;
+    var tmp0_desc = this.o1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1557,7 +1641,7 @@
     return CommerceCta_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
   protoOf($serializer_2).ki = function () {
-    return this.n1h_1;
+    return this.o1h_1;
   };
   protoOf($serializer_2).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -1573,11 +1657,11 @@
   }
   function CommerceCta_init_$Init$(seen0, sponsorName, territory, url, serializationConstructorMarker, $this) {
     if (!(7 === (7 & seen0))) {
-      throwMissingFieldException(seen0, 7, $serializer_getInstance_2().n1h_1);
+      throwMissingFieldException(seen0, 7, $serializer_getInstance_2().o1h_1);
     }
-    $this.p1h_1 = sponsorName;
-    $this.q1h_1 = territory;
-    $this.r1h_1 = url;
+    $this.q1h_1 = sponsorName;
+    $this.r1h_1 = territory;
+    $this.s1h_1 = url;
     return $this;
   }
   function CommerceCta_init_$Create$(seen0, sponsorName, territory, url, serializationConstructorMarker) {
@@ -1586,12 +1670,12 @@
   function CommerceCta() {
   }
   protoOf(CommerceCta).toString = function () {
-    return 'CommerceCta(sponsorName=' + this.p1h_1 + ', territory=' + this.q1h_1 + ', url=' + this.r1h_1 + ')';
+    return 'CommerceCta(sponsorName=' + this.q1h_1 + ', territory=' + this.r1h_1 + ', url=' + this.s1h_1 + ')';
   };
   protoOf(CommerceCta).hashCode = function () {
-    var result = getStringHashCode(this.p1h_1);
-    result = imul(result, 31) + getStringHashCode(this.q1h_1) | 0;
+    var result = getStringHashCode(this.q1h_1);
     result = imul(result, 31) + getStringHashCode(this.r1h_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.s1h_1) | 0;
     return result;
   };
   protoOf(CommerceCta).equals = function (other) {
@@ -1599,12 +1683,12 @@
       return true;
     if (!(other instanceof CommerceCta))
       return false;
-    if (!(this.p1h_1 === other.p1h_1))
-      return false;
     if (!(this.q1h_1 === other.q1h_1))
       return false;
     if (!(this.r1h_1 === other.r1h_1))
       return false;
+    if (!(this.s1h_1 === other.s1h_1))
+      return false;
     return true;
   };
   function $serializer_3() {
@@ -1618,36 +1702,36 @@
     tmp0_serialDesc.rs('photographer', true);
     tmp0_serialDesc.rs('source', true);
     tmp0_serialDesc.rs('url', false);
-    this.s1h_1 = tmp0_serialDesc;
+    this.t1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_3).t1h = function (encoder, value) {
-    var tmp0_desc = this.s1h_1;
+  protoOf($serializer_3).u1h = function (encoder, value) {
+    var tmp0_desc = this.t1h_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.u1h_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, StringSerializer_getInstance(), value.u1h_1);
+    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.v1h_1 == null)) {
+      tmp1_output.an(tmp0_desc, 0, StringSerializer_getInstance(), value.v1h_1);
     }
-    tmp1_output.wm(tmp0_desc, 1, value.v1h_1);
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.w1h_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.w1h_1);
+    tmp1_output.wm(tmp0_desc, 1, value.w1h_1);
+    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.x1h_1 == null)) {
+      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.x1h_1);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.x1h_1 == null)) {
-      tmp1_output.an(tmp0_desc, 3, StringSerializer_getInstance(), value.x1h_1);
+    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.y1h_1 == null)) {
+      tmp1_output.an(tmp0_desc, 3, StringSerializer_getInstance(), value.y1h_1);
     }
-    tmp1_output.wm(tmp0_desc, 4, value.y1h_1);
-    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.z1h_1 == null)) {
-      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.z1h_1);
+    tmp1_output.wm(tmp0_desc, 4, value.z1h_1);
+    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.a1i_1 == null)) {
+      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.a1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.a1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 6, StringSerializer_getInstance(), value.a1i_1);
+    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.b1i_1 == null)) {
+      tmp1_output.an(tmp0_desc, 6, StringSerializer_getInstance(), value.b1i_1);
     }
-    tmp1_output.wm(tmp0_desc, 7, value.b1i_1);
+    tmp1_output.wm(tmp0_desc, 7, value.c1i_1);
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_3).li = function (encoder, value) {
-    return this.t1h(encoder, value instanceof Image ? value : THROW_CCE());
+    return this.u1h(encoder, value instanceof Image ? value : THROW_CCE());
   };
   protoOf($serializer_3).mi = function (decoder) {
-    var tmp0_desc = this.s1h_1;
+    var tmp0_desc = this.t1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1724,7 +1808,7 @@
     return Image_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, null);
   };
   protoOf($serializer_3).ki = function () {
-    return this.s1h_1;
+    return this.t1h_1;
   };
   protoOf($serializer_3).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -1740,31 +1824,31 @@
   }
   function Image_init_$Init$(seen0, caption, cropId, imageType, mediaApiUrl, mediaId, photographer, source, url, serializationConstructorMarker, $this) {
     if (!(146 === (146 & seen0))) {
-      throwMissingFieldException(seen0, 146, $serializer_getInstance_3().s1h_1);
+      throwMissingFieldException(seen0, 146, $serializer_getInstance_3().t1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.u1h_1 = null;
+      $this.v1h_1 = null;
     else
-      $this.u1h_1 = caption;
-    $this.v1h_1 = cropId;
+      $this.v1h_1 = caption;
+    $this.w1h_1 = cropId;
     if (0 === (seen0 & 4))
-      $this.w1h_1 = null;
+      $this.x1h_1 = null;
     else
-      $this.w1h_1 = imageType;
+      $this.x1h_1 = imageType;
     if (0 === (seen0 & 8))
-      $this.x1h_1 = null;
+      $this.y1h_1 = null;
     else
-      $this.x1h_1 = mediaApiUrl;
-    $this.y1h_1 = mediaId;
+      $this.y1h_1 = mediaApiUrl;
+    $this.z1h_1 = mediaId;
     if (0 === (seen0 & 32))
-      $this.z1h_1 = null;
+      $this.a1i_1 = null;
     else
-      $this.z1h_1 = photographer;
+      $this.a1i_1 = photographer;
     if (0 === (seen0 & 64))
-      $this.a1i_1 = null;
+      $this.b1i_1 = null;
     else
-      $this.a1i_1 = source;
-    $this.b1i_1 = url;
+      $this.b1i_1 = source;
+    $this.c1i_1 = url;
     return $this;
   }
   function Image_init_$Create$(seen0, caption, cropId, imageType, mediaApiUrl, mediaId, photographer, source, url, serializationConstructorMarker) {
@@ -1773,17 +1857,17 @@
   function Image() {
   }
   protoOf(Image).toString = function () {
-    return 'Image(caption=' + this.u1h_1 + ', cropId=' + this.v1h_1 + ', imageType=' + this.w1h_1 + ', mediaApiUrl=' + this.x1h_1 + ', mediaId=' + this.y1h_1 + ', photographer=' + this.z1h_1 + ', source=' + this.a1i_1 + ', url=' + this.b1i_1 + ')';
+    return 'Image(caption=' + this.v1h_1 + ', cropId=' + this.w1h_1 + ', imageType=' + this.x1h_1 + ', mediaApiUrl=' + this.y1h_1 + ', mediaId=' + this.z1h_1 + ', photographer=' + this.a1i_1 + ', source=' + this.b1i_1 + ', url=' + this.c1i_1 + ')';
   };
   protoOf(Image).hashCode = function () {
-    var result = this.u1h_1 == null ? 0 : getStringHashCode(this.u1h_1);
-    result = imul(result, 31) + getStringHashCode(this.v1h_1) | 0;
-    result = imul(result, 31) + (this.w1h_1 == null ? 0 : getStringHashCode(this.w1h_1)) | 0;
+    var result = this.v1h_1 == null ? 0 : getStringHashCode(this.v1h_1);
+    result = imul(result, 31) + getStringHashCode(this.w1h_1) | 0;
     result = imul(result, 31) + (this.x1h_1 == null ? 0 : getStringHashCode(this.x1h_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.y1h_1) | 0;
-    result = imul(result, 31) + (this.z1h_1 == null ? 0 : getStringHashCode(this.z1h_1)) | 0;
+    result = imul(result, 31) + (this.y1h_1 == null ? 0 : getStringHashCode(this.y1h_1)) | 0;
+    result = imul(result, 31) + getStringHashCode(this.z1h_1) | 0;
     result = imul(result, 31) + (this.a1i_1 == null ? 0 : getStringHashCode(this.a1i_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.b1i_1) | 0;
+    result = imul(result, 31) + (this.b1i_1 == null ? 0 : getStringHashCode(this.b1i_1)) | 0;
+    result = imul(result, 31) + getStringHashCode(this.c1i_1) | 0;
     return result;
   };
   protoOf(Image).equals = function (other) {
@@ -1791,21 +1875,21 @@
       return true;
     if (!(other instanceof Image))
       return false;
-    if (!(this.u1h_1 == other.u1h_1))
+    if (!(this.v1h_1 == other.v1h_1))
       return false;
-    if (!(this.v1h_1 === other.v1h_1))
-      return false;
-    if (!(this.w1h_1 == other.w1h_1))
+    if (!(this.w1h_1 === other.w1h_1))
       return false;
     if (!(this.x1h_1 == other.x1h_1))
       return false;
-    if (!(this.y1h_1 === other.y1h_1))
+    if (!(this.y1h_1 == other.y1h_1))
       return false;
-    if (!(this.z1h_1 == other.z1h_1))
+    if (!(this.z1h_1 === other.z1h_1))
       return false;
     if (!(this.a1i_1 == other.a1i_1))
       return false;
-    if (!(this.b1i_1 === other.b1i_1))
+    if (!(this.b1i_1 == other.b1i_1))
+      return false;
+    if (!(this.c1i_1 === other.c1i_1))
       return false;
     return true;
   };
@@ -1819,7 +1903,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.c1i_1 = [lazy(tmp_0, IngredientsList$Companion$$childSerializers$_anonymous__y7k6ja), null];
+    tmp.d1i_1 = [lazy(tmp_0, IngredientsList$Companion$$childSerializers$_anonymous__y7k6ja), null];
   }
   var Companion_instance_3;
   function Companion_getInstance_2() {
@@ -1832,32 +1916,32 @@
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientsList', this, 2);
     tmp0_serialDesc.rs('ingredientsList', true);
     tmp0_serialDesc.rs('recipeSection', true);
-    this.d1i_1 = tmp0_serialDesc;
+    this.e1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_4).e1i = function (encoder, value) {
-    var tmp0_desc = this.d1i_1;
+  protoOf($serializer_4).f1i = function (encoder, value) {
+    var tmp0_desc = this.e1i_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_2().c1i_1;
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.f1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, tmp2_cached[0].h2(), value.f1g_1);
+    var tmp2_cached = Companion_getInstance_2().d1i_1;
+    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.g1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 0, tmp2_cached[0].h2(), value.g1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.g1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.g1g_1);
+    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.h1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.h1g_1);
     }
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_4).li = function (encoder, value) {
-    return this.e1i(encoder, value instanceof IngredientsList ? value : THROW_CCE());
+    return this.f1i(encoder, value instanceof IngredientsList ? value : THROW_CCE());
   };
   protoOf($serializer_4).mi = function (decoder) {
-    var tmp0_desc = this.d1i_1;
+    var tmp0_desc = this.e1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
     var tmp4_local0 = null;
     var tmp5_local1 = null;
     var tmp6_input = decoder.il(tmp0_desc);
-    var tmp7_cached = Companion_getInstance_2().c1i_1;
+    var tmp7_cached = Companion_getInstance_2().d1i_1;
     if (tmp6_input.yl()) {
       tmp4_local0 = tmp6_input.wl(tmp0_desc, 0, tmp7_cached[0].h2(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
@@ -1886,10 +1970,10 @@
     return IngredientsList_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
   protoOf($serializer_4).ki = function () {
-    return this.d1i_1;
+    return this.e1i_1;
   };
   protoOf($serializer_4).ts = function () {
-    var tmp0_cached = Companion_getInstance_2().c1i_1;
+    var tmp0_cached = Companion_getInstance_2().d1i_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1903,16 +1987,16 @@
   }
   function IngredientsList_init_$Init$(seen0, ingredientsList, recipeSection, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_4().d1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_4().e1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.f1g_1 = null;
+      $this.g1g_1 = null;
     else
-      $this.f1g_1 = ingredientsList;
+      $this.g1g_1 = ingredientsList;
     if (0 === (seen0 & 2))
-      $this.g1g_1 = null;
+      $this.h1g_1 = null;
     else
-      $this.g1g_1 = recipeSection;
+      $this.h1g_1 = recipeSection;
     return $this;
   }
   function IngredientsList_init_$Create$(seen0, ingredientsList, recipeSection, serializationConstructorMarker) {
@@ -1922,15 +2006,15 @@
     Companion_getInstance_2();
     ingredientsList = ingredientsList === VOID ? null : ingredientsList;
     recipeSection = recipeSection === VOID ? null : recipeSection;
-    this.f1g_1 = ingredientsList;
-    this.g1g_1 = recipeSection;
+    this.g1g_1 = ingredientsList;
+    this.h1g_1 = recipeSection;
   }
   protoOf(IngredientsList).toString = function () {
-    return 'IngredientsList(ingredientsList=' + toString(this.f1g_1) + ', recipeSection=' + this.g1g_1 + ')';
+    return 'IngredientsList(ingredientsList=' + toString(this.g1g_1) + ', recipeSection=' + this.h1g_1 + ')';
   };
   protoOf(IngredientsList).hashCode = function () {
-    var result = this.f1g_1 == null ? 0 : hashCode(this.f1g_1);
-    result = imul(result, 31) + (this.g1g_1 == null ? 0 : getStringHashCode(this.g1g_1)) | 0;
+    var result = this.g1g_1 == null ? 0 : hashCode(this.g1g_1);
+    result = imul(result, 31) + (this.h1g_1 == null ? 0 : getStringHashCode(this.h1g_1)) | 0;
     return result;
   };
   protoOf(IngredientsList).equals = function (other) {
@@ -1938,9 +2022,9 @@
       return true;
     if (!(other instanceof IngredientsList))
       return false;
-    if (!equals(this.f1g_1, other.f1g_1))
+    if (!equals(this.g1g_1, other.g1g_1))
       return false;
-    if (!(this.g1g_1 == other.g1g_1))
+    if (!(this.h1g_1 == other.h1g_1))
       return false;
     return true;
   };
@@ -1962,45 +2046,45 @@
     tmp0_serialDesc.rs('template', true);
     tmp0_serialDesc.rs('text', true);
     tmp0_serialDesc.rs('unit', true);
-    this.f1i_1 = tmp0_serialDesc;
+    this.g1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_5).g1i = function (encoder, value) {
-    var tmp0_desc = this.f1i_1;
+  protoOf($serializer_5).h1i = function (encoder, value) {
+    var tmp0_desc = this.g1i_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.h1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.h1g_1);
+    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.i1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.i1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.i1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.i1g_1);
+    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.j1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.j1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.j1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.j1g_1);
+    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.k1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.k1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.k1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 3, BooleanSerializer_getInstance(), value.k1g_1);
+    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.l1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 3, BooleanSerializer_getInstance(), value.l1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 4) ? true : !(value.l1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 4, StringSerializer_getInstance(), value.l1g_1);
+    if (tmp1_output.en(tmp0_desc, 4) ? true : !(value.m1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 4, StringSerializer_getInstance(), value.m1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.m1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.m1g_1);
+    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.n1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.n1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.n1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 6, StringSerializer_getInstance(), value.n1g_1);
+    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.o1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 6, StringSerializer_getInstance(), value.o1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 7) ? true : !(value.o1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 7, StringSerializer_getInstance(), value.o1g_1);
+    if (tmp1_output.en(tmp0_desc, 7) ? true : !(value.p1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 7, StringSerializer_getInstance(), value.p1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 8) ? true : !(value.p1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 8, StringSerializer_getInstance(), value.p1g_1);
+    if (tmp1_output.en(tmp0_desc, 8) ? true : !(value.q1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 8, StringSerializer_getInstance(), value.q1g_1);
     }
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_5).li = function (encoder, value) {
-    return this.g1i(encoder, value instanceof IngredientItem ? value : THROW_CCE());
+    return this.h1i(encoder, value instanceof IngredientItem ? value : THROW_CCE());
   };
   protoOf($serializer_5).mi = function (decoder) {
-    var tmp0_desc = this.f1i_1;
+    var tmp0_desc = this.g1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2084,7 +2168,7 @@
     return IngredientItem_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, tmp12_local8, null);
   };
   protoOf($serializer_5).ki = function () {
-    return this.f1i_1;
+    return this.g1i_1;
   };
   protoOf($serializer_5).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -2100,44 +2184,44 @@
   }
   function IngredientItem_init_$Init$(seen0, amount, ingredientId, name, optional, prefix, suffix, template, text, unit, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_5().f1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_5().g1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.h1g_1 = null;
+      $this.i1g_1 = null;
     else
-      $this.h1g_1 = amount;
+      $this.i1g_1 = amount;
     if (0 === (seen0 & 2))
-      $this.i1g_1 = null;
+      $this.j1g_1 = null;
     else
-      $this.i1g_1 = ingredientId;
+      $this.j1g_1 = ingredientId;
     if (0 === (seen0 & 4))
-      $this.j1g_1 = null;
+      $this.k1g_1 = null;
     else
-      $this.j1g_1 = name;
+      $this.k1g_1 = name;
     if (0 === (seen0 & 8))
-      $this.k1g_1 = null;
+      $this.l1g_1 = null;
     else
-      $this.k1g_1 = optional;
+      $this.l1g_1 = optional;
     if (0 === (seen0 & 16))
-      $this.l1g_1 = null;
+      $this.m1g_1 = null;
     else
-      $this.l1g_1 = prefix;
+      $this.m1g_1 = prefix;
     if (0 === (seen0 & 32))
-      $this.m1g_1 = null;
+      $this.n1g_1 = null;
     else
-      $this.m1g_1 = suffix;
+      $this.n1g_1 = suffix;
     if (0 === (seen0 & 64))
-      $this.n1g_1 = null;
+      $this.o1g_1 = null;
     else
-      $this.n1g_1 = template;
+      $this.o1g_1 = template;
     if (0 === (seen0 & 128))
-      $this.o1g_1 = null;
+      $this.p1g_1 = null;
     else
-      $this.o1g_1 = text;
+      $this.p1g_1 = text;
     if (0 === (seen0 & 256))
-      $this.p1g_1 = null;
+      $this.q1g_1 = null;
     else
-      $this.p1g_1 = unit;
+      $this.q1g_1 = unit;
     return $this;
   }
   function IngredientItem_init_$Create$(seen0, amount, ingredientId, name, optional, prefix, suffix, template, text, unit, serializationConstructorMarker) {
@@ -2153,44 +2237,44 @@
     template = template === VOID ? null : template;
     text = text === VOID ? null : text;
     unit = unit === VOID ? null : unit;
-    this.h1g_1 = amount;
-    this.i1g_1 = ingredientId;
-    this.j1g_1 = name;
-    this.k1g_1 = optional;
-    this.l1g_1 = prefix;
-    this.m1g_1 = suffix;
-    this.n1g_1 = template;
-    this.o1g_1 = text;
-    this.p1g_1 = unit;
-  }
-  protoOf(IngredientItem).h1i = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit) {
+    this.i1g_1 = amount;
+    this.j1g_1 = ingredientId;
+    this.k1g_1 = name;
+    this.l1g_1 = optional;
+    this.m1g_1 = prefix;
+    this.n1g_1 = suffix;
+    this.o1g_1 = template;
+    this.p1g_1 = text;
+    this.q1g_1 = unit;
+  }
+  protoOf(IngredientItem).i1i = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit) {
     return new IngredientItem(amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
   };
-  protoOf(IngredientItem).q1g = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit, $super) {
-    amount = amount === VOID ? this.h1g_1 : amount;
-    ingredientId = ingredientId === VOID ? this.i1g_1 : ingredientId;
-    name = name === VOID ? this.j1g_1 : name;
-    optional = optional === VOID ? this.k1g_1 : optional;
-    prefix = prefix === VOID ? this.l1g_1 : prefix;
-    suffix = suffix === VOID ? this.m1g_1 : suffix;
-    template = template === VOID ? this.n1g_1 : template;
-    text = text === VOID ? this.o1g_1 : text;
-    unit = unit === VOID ? this.p1g_1 : unit;
-    return $super === VOID ? this.h1i(amount, ingredientId, name, optional, prefix, suffix, template, text, unit) : $super.h1i.call(this, amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
+  protoOf(IngredientItem).r1g = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit, $super) {
+    amount = amount === VOID ? this.i1g_1 : amount;
+    ingredientId = ingredientId === VOID ? this.j1g_1 : ingredientId;
+    name = name === VOID ? this.k1g_1 : name;
+    optional = optional === VOID ? this.l1g_1 : optional;
+    prefix = prefix === VOID ? this.m1g_1 : prefix;
+    suffix = suffix === VOID ? this.n1g_1 : suffix;
+    template = template === VOID ? this.o1g_1 : template;
+    text = text === VOID ? this.p1g_1 : text;
+    unit = unit === VOID ? this.q1g_1 : unit;
+    return $super === VOID ? this.i1i(amount, ingredientId, name, optional, prefix, suffix, template, text, unit) : $super.i1i.call(this, amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
   };
   protoOf(IngredientItem).toString = function () {
-    return 'IngredientItem(amount=' + toString(this.h1g_1) + ', ingredientId=' + this.i1g_1 + ', name=' + this.j1g_1 + ', optional=' + this.k1g_1 + ', prefix=' + this.l1g_1 + ', suffix=' + this.m1g_1 + ', template=' + this.n1g_1 + ', text=' + this.o1g_1 + ', unit=' + this.p1g_1 + ')';
+    return 'IngredientItem(amount=' + toString(this.i1g_1) + ', ingredientId=' + this.j1g_1 + ', name=' + this.k1g_1 + ', optional=' + this.l1g_1 + ', prefix=' + this.m1g_1 + ', suffix=' + this.n1g_1 + ', template=' + this.o1g_1 + ', text=' + this.p1g_1 + ', unit=' + this.q1g_1 + ')';
   };
   protoOf(IngredientItem).hashCode = function () {
-    var result = this.h1g_1 == null ? 0 : this.h1g_1.hashCode();
-    result = imul(result, 31) + (this.i1g_1 == null ? 0 : getStringHashCode(this.i1g_1)) | 0;
+    var result = this.i1g_1 == null ? 0 : this.i1g_1.hashCode();
     result = imul(result, 31) + (this.j1g_1 == null ? 0 : getStringHashCode(this.j1g_1)) | 0;
-    result = imul(result, 31) + (this.k1g_1 == null ? 0 : getBooleanHashCode(this.k1g_1)) | 0;
-    result = imul(result, 31) + (this.l1g_1 == null ? 0 : getStringHashCode(this.l1g_1)) | 0;
+    result = imul(result, 31) + (this.k1g_1 == null ? 0 : getStringHashCode(this.k1g_1)) | 0;
+    result = imul(result, 31) + (this.l1g_1 == null ? 0 : getBooleanHashCode(this.l1g_1)) | 0;
     result = imul(result, 31) + (this.m1g_1 == null ? 0 : getStringHashCode(this.m1g_1)) | 0;
     result = imul(result, 31) + (this.n1g_1 == null ? 0 : getStringHashCode(this.n1g_1)) | 0;
     result = imul(result, 31) + (this.o1g_1 == null ? 0 : getStringHashCode(this.o1g_1)) | 0;
     result = imul(result, 31) + (this.p1g_1 == null ? 0 : getStringHashCode(this.p1g_1)) | 0;
+    result = imul(result, 31) + (this.q1g_1 == null ? 0 : getStringHashCode(this.q1g_1)) | 0;
     return result;
   };
   protoOf(IngredientItem).equals = function (other) {
@@ -2198,9 +2282,7 @@
       return true;
     if (!(other instanceof IngredientItem))
       return false;
-    if (!equals(this.h1g_1, other.h1g_1))
-      return false;
-    if (!(this.i1g_1 == other.i1g_1))
+    if (!equals(this.i1g_1, other.i1g_1))
       return false;
     if (!(this.j1g_1 == other.j1g_1))
       return false;
@@ -2216,6 +2298,8 @@
       return false;
     if (!(this.p1g_1 == other.p1g_1))
       return false;
+    if (!(this.q1g_1 == other.q1g_1))
+      return false;
     return true;
   };
   function Companion_4() {
@@ -2229,24 +2313,24 @@
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Range', this, 2);
     tmp0_serialDesc.rs('max', true);
     tmp0_serialDesc.rs('min', true);
-    this.i1i_1 = tmp0_serialDesc;
+    this.j1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_6).j1i = function (encoder, value) {
-    var tmp0_desc = this.i1i_1;
+  protoOf($serializer_6).k1i = function (encoder, value) {
+    var tmp0_desc = this.j1i_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.k1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, DoubleSerializer_getInstance(), value.k1i_1);
+    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.l1i_1 == null)) {
+      tmp1_output.an(tmp0_desc, 0, DoubleSerializer_getInstance(), value.l1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.l1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, DoubleSerializer_getInstance(), value.l1i_1);
+    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.m1i_1 == null)) {
+      tmp1_output.an(tmp0_desc, 1, DoubleSerializer_getInstance(), value.m1i_1);
     }
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_6).li = function (encoder, value) {
-    return this.j1i(encoder, value instanceof Range ? value : THROW_CCE());
+    return this.k1i(encoder, value instanceof Range ? value : THROW_CCE());
   };
   protoOf($serializer_6).mi = function (decoder) {
-    var tmp0_desc = this.i1i_1;
+    var tmp0_desc = this.j1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2281,7 +2365,7 @@
     return Range_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
   protoOf($serializer_6).ki = function () {
-    return this.i1i_1;
+    return this.j1i_1;
   };
   protoOf($serializer_6).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -2297,16 +2381,16 @@
   }
   function Range_init_$Init$(seen0, max, min, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_6().i1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_6().j1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.k1i_1 = null;
+      $this.l1i_1 = null;
     else
-      $this.k1i_1 = max;
+      $this.l1i_1 = max;
     if (0 === (seen0 & 2))
-      $this.l1i_1 = null;
+      $this.m1i_1 = null;
     else
-      $this.l1i_1 = min;
+      $this.m1i_1 = min;
     return $this;
   }
   function Range_init_$Create$(seen0, max, min, serializationConstructorMarker) {
@@ -2315,15 +2399,15 @@
   function Range(max, min) {
     max = max === VOID ? null : max;
     min = min === VOID ? null : min;
-    this.k1i_1 = max;
-    this.l1i_1 = min;
+    this.l1i_1 = max;
+    this.m1i_1 = min;
   }
   protoOf(Range).toString = function () {
-    return 'Range(max=' + this.k1i_1 + ', min=' + this.l1i_1 + ')';
+    return 'Range(max=' + this.l1i_1 + ', min=' + this.m1i_1 + ')';
   };
   protoOf(Range).hashCode = function () {
-    var result = this.k1i_1 == null ? 0 : getNumberHashCode(this.k1i_1);
-    result = imul(result, 31) + (this.l1i_1 == null ? 0 : getNumberHashCode(this.l1i_1)) | 0;
+    var result = this.l1i_1 == null ? 0 : getNumberHashCode(this.l1i_1);
+    result = imul(result, 31) + (this.m1i_1 == null ? 0 : getNumberHashCode(this.m1i_1)) | 0;
     return result;
   };
   protoOf(Range).equals = function (other) {
@@ -2331,10 +2415,10 @@
       return true;
     if (!(other instanceof Range))
       return false;
-    if (!equals(this.k1i_1, other.k1i_1))
-      return false;
     if (!equals(this.l1i_1, other.l1i_1))
       return false;
+    if (!equals(this.m1i_1, other.m1i_1))
+      return false;
     return true;
   };
   function Instruction$Companion$$childSerializers$_anonymous__sbbefw() {
@@ -2347,7 +2431,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.m1i_1 = [null, null, lazy(tmp_0, Instruction$Companion$$childSerializers$_anonymous__sbbefw), null];
+    tmp.n1i_1 = [null, null, lazy(tmp_0, Instruction$Companion$$childSerializers$_anonymous__sbbefw), null];
   }
   var Companion_instance_6;
   function Companion_getInstance_5() {
@@ -2362,29 +2446,29 @@
     tmp0_serialDesc.rs('descriptionTemplate', true);
     tmp0_serialDesc.rs('images', true);
     tmp0_serialDesc.rs('stepNumber', true);
-    this.n1i_1 = tmp0_serialDesc;
+    this.o1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_7).o1i = function (encoder, value) {
-    var tmp0_desc = this.n1i_1;
+  protoOf($serializer_7).p1i = function (encoder, value) {
+    var tmp0_desc = this.o1i_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_5().m1i_1;
-    tmp1_output.wm(tmp0_desc, 0, value.r1g_1);
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.s1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.s1g_1);
+    var tmp2_cached = Companion_getInstance_5().n1i_1;
+    tmp1_output.wm(tmp0_desc, 0, value.s1g_1);
+    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.t1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.t1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.t1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, tmp2_cached[2].h2(), value.t1g_1);
+    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.u1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 2, tmp2_cached[2].h2(), value.u1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.u1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 3, DoubleSerializer_getInstance(), value.u1g_1);
+    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.v1g_1 == null)) {
+      tmp1_output.an(tmp0_desc, 3, DoubleSerializer_getInstance(), value.v1g_1);
     }
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_7).li = function (encoder, value) {
-    return this.o1i(encoder, value instanceof Instruction ? value : THROW_CCE());
+    return this.p1i(encoder, value instanceof Instruction ? value : THROW_CCE());
   };
   protoOf($serializer_7).mi = function (decoder) {
-    var tmp0_desc = this.n1i_1;
+    var tmp0_desc = this.o1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2393,7 +2477,7 @@
     var tmp6_local2 = null;
     var tmp7_local3 = null;
     var tmp8_input = decoder.il(tmp0_desc);
-    var tmp9_cached = Companion_getInstance_5().m1i_1;
+    var tmp9_cached = Companion_getInstance_5().n1i_1;
     if (tmp8_input.yl()) {
       tmp4_local0 = tmp8_input.sl(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
@@ -2434,10 +2518,10 @@
     return Instruction_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
   protoOf($serializer_7).ki = function () {
-    return this.n1i_1;
+    return this.o1i_1;
   };
   protoOf($serializer_7).ts = function () {
-    var tmp0_cached = Companion_getInstance_5().m1i_1;
+    var tmp0_cached = Companion_getInstance_5().n1i_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2451,21 +2535,21 @@
   }
   function Instruction_init_$Init$(seen0, description, descriptionTemplate, images, stepNumber, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_7().n1i_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_7().o1i_1);
     }
-    $this.r1g_1 = description;
+    $this.s1g_1 = description;
     if (0 === (seen0 & 2))
-      $this.s1g_1 = null;
+      $this.t1g_1 = null;
     else
-      $this.s1g_1 = descriptionTemplate;
+      $this.t1g_1 = descriptionTemplate;
     if (0 === (seen0 & 4))
-      $this.t1g_1 = null;
+      $this.u1g_1 = null;
     else
-      $this.t1g_1 = images;
+      $this.u1g_1 = images;
     if (0 === (seen0 & 8))
-      $this.u1g_1 = null;
+      $this.v1g_1 = null;
     else
-      $this.u1g_1 = stepNumber;
+      $this.v1g_1 = stepNumber;
     return $this;
   }
   function Instruction_init_$Create$(seen0, description, descriptionTemplate, images, stepNumber, serializationConstructorMarker) {
@@ -2476,29 +2560,29 @@
     descriptionTemplate = descriptionTemplate === VOID ? null : descriptionTemplate;
     images = images === VOID ? null : images;
     stepNumber = stepNumber === VOID ? null : stepNumber;
-    this.r1g_1 = description;
-    this.s1g_1 = descriptionTemplate;
-    this.t1g_1 = images;
-    this.u1g_1 = stepNumber;
+    this.s1g_1 = description;
+    this.t1g_1 = descriptionTemplate;
+    this.u1g_1 = images;
+    this.v1g_1 = stepNumber;
   }
-  protoOf(Instruction).p1i = function (description, descriptionTemplate, images, stepNumber) {
+  protoOf(Instruction).q1i = function (description, descriptionTemplate, images, stepNumber) {
     return new Instruction(description, descriptionTemplate, images, stepNumber);
   };
-  protoOf(Instruction).v1g = function (description, descriptionTemplate, images, stepNumber, $super) {
-    description = description === VOID ? this.r1g_1 : description;
-    descriptionTemplate = descriptionTemplate === VOID ? this.s1g_1 : descriptionTemplate;
-    images = images === VOID ? this.t1g_1 : images;
-    stepNumber = stepNumber === VOID ? this.u1g_1 : stepNumber;
-    return $super === VOID ? this.p1i(description, descriptionTemplate, images, stepNumber) : $super.p1i.call(this, description, descriptionTemplate, images, stepNumber);
+  protoOf(Instruction).w1g = function (description, descriptionTemplate, images, stepNumber, $super) {
+    description = description === VOID ? this.s1g_1 : description;
+    descriptionTemplate = descriptionTemplate === VOID ? this.t1g_1 : descriptionTemplate;
+    images = images === VOID ? this.u1g_1 : images;
+    stepNumber = stepNumber === VOID ? this.v1g_1 : stepNumber;
+    return $super === VOID ? this.q1i(description, descriptionTemplate, images, stepNumber) : $super.q1i.call(this, description, descriptionTemplate, images, stepNumber);
   };
   protoOf(Instruction).toString = function () {
-    return 'Instruction(description=' + this.r1g_1 + ', descriptionTemplate=' + this.s1g_1 + ', images=' + toString(this.t1g_1) + ', stepNumber=' + this.u1g_1 + ')';
+    return 'Instruction(description=' + this.s1g_1 + ', descriptionTemplate=' + this.t1g_1 + ', images=' + toString(this.u1g_1) + ', stepNumber=' + this.v1g_1 + ')';
   };
   protoOf(Instruction).hashCode = function () {
-    var result = getStringHashCode(this.r1g_1);
-    result = imul(result, 31) + (this.s1g_1 == null ? 0 : getStringHashCode(this.s1g_1)) | 0;
-    result = imul(result, 31) + (this.t1g_1 == null ? 0 : hashCode(this.t1g_1)) | 0;
-    result = imul(result, 31) + (this.u1g_1 == null ? 0 : getNumberHashCode(this.u1g_1)) | 0;
+    var result = getStringHashCode(this.s1g_1);
+    result = imul(result, 31) + (this.t1g_1 == null ? 0 : getStringHashCode(this.t1g_1)) | 0;
+    result = imul(result, 31) + (this.u1g_1 == null ? 0 : hashCode(this.u1g_1)) | 0;
+    result = imul(result, 31) + (this.v1g_1 == null ? 0 : getNumberHashCode(this.v1g_1)) | 0;
     return result;
   };
   protoOf(Instruction).equals = function (other) {
@@ -2506,14 +2590,14 @@
       return true;
     if (!(other instanceof Instruction))
       return false;
-    if (!(this.r1g_1 === other.r1g_1))
-      return false;
-    if (!(this.s1g_1 == other.s1g_1))
+    if (!(this.s1g_1 === other.s1g_1))
       return false;
-    if (!equals(this.t1g_1, other.t1g_1))
+    if (!(this.t1g_1 == other.t1g_1))
       return false;
     if (!equals(this.u1g_1, other.u1g_1))
       return false;
+    if (!equals(this.v1g_1, other.v1g_1))
+      return false;
     return true;
   };
   function $serializer_8() {
@@ -2522,25 +2606,25 @@
     tmp0_serialDesc.rs('amount', true);
     tmp0_serialDesc.rs('text', true);
     tmp0_serialDesc.rs('unit', false);
-    this.q1i_1 = tmp0_serialDesc;
+    this.r1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_8).r1i = function (encoder, value) {
-    var tmp0_desc = this.q1i_1;
+  protoOf($serializer_8).s1i = function (encoder, value) {
+    var tmp0_desc = this.r1i_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.s1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.s1i_1);
+    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.t1i_1 == null)) {
+      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.t1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.t1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.t1i_1);
+    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.u1i_1 == null)) {
+      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.u1i_1);
     }
-    tmp1_output.wm(tmp0_desc, 2, value.u1i_1);
+    tmp1_output.wm(tmp0_desc, 2, value.v1i_1);
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_8).li = function (encoder, value) {
-    return this.r1i(encoder, value instanceof Serves ? value : THROW_CCE());
+    return this.s1i(encoder, value instanceof Serves ? value : THROW_CCE());
   };
   protoOf($serializer_8).mi = function (decoder) {
-    var tmp0_desc = this.q1i_1;
+    var tmp0_desc = this.r1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2582,7 +2666,7 @@
     return Serves_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
   protoOf($serializer_8).ki = function () {
-    return this.q1i_1;
+    return this.r1i_1;
   };
   protoOf($serializer_8).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -2598,17 +2682,17 @@
   }
   function Serves_init_$Init$(seen0, amount, text, unit, serializationConstructorMarker, $this) {
     if (!(4 === (4 & seen0))) {
-      throwMissingFieldException(seen0, 4, $serializer_getInstance_8().q1i_1);
+      throwMissingFieldException(seen0, 4, $serializer_getInstance_8().r1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.s1i_1 = null;
+      $this.t1i_1 = null;
     else
-      $this.s1i_1 = amount;
+      $this.t1i_1 = amount;
     if (0 === (seen0 & 2))
-      $this.t1i_1 = null;
+      $this.u1i_1 = null;
     else
-      $this.t1i_1 = text;
-    $this.u1i_1 = unit;
+      $this.u1i_1 = text;
+    $this.v1i_1 = unit;
     return $this;
   }
   function Serves_init_$Create$(seen0, amount, text, unit, serializationConstructorMarker) {
@@ -2617,12 +2701,12 @@
   function Serves() {
   }
   protoOf(Serves).toString = function () {
-    return 'Serves(amount=' + toString(this.s1i_1) + ', text=' + this.t1i_1 + ', unit=' + this.u1i_1 + ')';
+    return 'Serves(amount=' + toString(this.t1i_1) + ', text=' + this.u1i_1 + ', unit=' + this.v1i_1 + ')';
   };
   protoOf(Serves).hashCode = function () {
-    var result = this.s1i_1 == null ? 0 : this.s1i_1.hashCode();
-    result = imul(result, 31) + (this.t1i_1 == null ? 0 : getStringHashCode(this.t1i_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.u1i_1) | 0;
+    var result = this.t1i_1 == null ? 0 : this.t1i_1.hashCode();
+    result = imul(result, 31) + (this.u1i_1 == null ? 0 : getStringHashCode(this.u1i_1)) | 0;
+    result = imul(result, 31) + getStringHashCode(this.v1i_1) | 0;
     return result;
   };
   protoOf(Serves).equals = function (other) {
@@ -2630,11 +2714,11 @@
       return true;
     if (!(other instanceof Serves))
       return false;
-    if (!equals(this.s1i_1, other.s1i_1))
+    if (!equals(this.t1i_1, other.t1i_1))
       return false;
-    if (!(this.t1i_1 == other.t1i_1))
+    if (!(this.u1i_1 == other.u1i_1))
       return false;
-    if (!(this.u1i_1 === other.u1i_1))
+    if (!(this.v1i_1 === other.v1i_1))
       return false;
     return true;
   };
@@ -2650,27 +2734,27 @@
     tmp0_serialDesc.rs('durationInMins', true);
     tmp0_serialDesc.rs('qualifier', true);
     tmp0_serialDesc.rs('text', true);
-    this.v1i_1 = tmp0_serialDesc;
+    this.w1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_9).w1i = function (encoder, value) {
-    var tmp0_desc = this.v1i_1;
+  protoOf($serializer_9).x1i = function (encoder, value) {
+    var tmp0_desc = this.w1i_1;
     var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.x1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.x1i_1);
+    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.y1i_1 == null)) {
+      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.y1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.y1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.y1i_1);
+    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.z1i_1 == null)) {
+      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.z1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.z1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.z1i_1);
+    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.a1j_1 == null)) {
+      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.a1j_1);
     }
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_9).li = function (encoder, value) {
-    return this.w1i(encoder, value instanceof Timing ? value : THROW_CCE());
+    return this.x1i(encoder, value instanceof Timing ? value : THROW_CCE());
   };
   protoOf($serializer_9).mi = function (decoder) {
-    var tmp0_desc = this.v1i_1;
+    var tmp0_desc = this.w1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2712,7 +2796,7 @@
     return Timing_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
   protoOf($serializer_9).ki = function () {
-    return this.v1i_1;
+    return this.w1i_1;
   };
   protoOf($serializer_9).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -2728,20 +2812,20 @@
   }
   function Timing_init_$Init$(seen0, durationInMins, qualifier, text, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_9().v1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_9().w1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.x1i_1 = null;
+      $this.y1i_1 = null;
     else
-      $this.x1i_1 = durationInMins;
+      $this.y1i_1 = durationInMins;
     if (0 === (seen0 & 2))
-      $this.y1i_1 = null;
+      $this.z1i_1 = null;
     else
-      $this.y1i_1 = qualifier;
+      $this.z1i_1 = qualifier;
     if (0 === (seen0 & 4))
-      $this.z1i_1 = null;
+      $this.a1j_1 = null;
     else
-      $this.z1i_1 = text;
+      $this.a1j_1 = text;
     return $this;
   }
   function Timing_init_$Create$(seen0, durationInMins, qualifier, text, serializationConstructorMarker) {
@@ -2751,17 +2835,17 @@
     durationInMins = durationInMins === VOID ? null : durationInMins;
     qualifier = qualifier === VOID ? null : qualifier;
     text = text === VOID ? null : text;
-    this.x1i_1 = durationInMins;
-    this.y1i_1 = qualifier;
-    this.z1i_1 = text;
+    this.y1i_1 = durationInMins;
+    this.z1i_1 = qualifier;
+    this.a1j_1 = text;
   }
   protoOf(Timing).toString = function () {
-    return 'Timing(durationInMins=' + toString(this.x1i_1) + ', qualifier=' + this.y1i_1 + ', text=' + this.z1i_1 + ')';
+    return 'Timing(durationInMins=' + toString(this.y1i_1) + ', qualifier=' + this.z1i_1 + ', text=' + this.a1j_1 + ')';
   };
   protoOf(Timing).hashCode = function () {
-    var result = this.x1i_1 == null ? 0 : this.x1i_1.hashCode();
-    result = imul(result, 31) + (this.y1i_1 == null ? 0 : getStringHashCode(this.y1i_1)) | 0;
+    var result = this.y1i_1 == null ? 0 : this.y1i_1.hashCode();
     result = imul(result, 31) + (this.z1i_1 == null ? 0 : getStringHashCode(this.z1i_1)) | 0;
+    result = imul(result, 31) + (this.a1j_1 == null ? 0 : getStringHashCode(this.a1j_1)) | 0;
     return result;
   };
   protoOf(Timing).equals = function (other) {
@@ -2769,29 +2853,29 @@
       return true;
     if (!(other instanceof Timing))
       return false;
-    if (!equals(this.x1i_1, other.x1i_1))
-      return false;
-    if (!(this.y1i_1 == other.y1i_1))
+    if (!equals(this.y1i_1, other.y1i_1))
       return false;
     if (!(this.z1i_1 == other.z1i_1))
       return false;
+    if (!(this.a1j_1 == other.a1j_1))
+      return false;
     return true;
   };
   function ParsedTemplate(elements) {
-    this.h1f_1 = elements;
+    this.i1f_1 = elements;
   }
   protoOf(ParsedTemplate).toString = function () {
-    return 'ParsedTemplate(elements=' + toString_0(this.h1f_1) + ')';
+    return 'ParsedTemplate(elements=' + toString_0(this.i1f_1) + ')';
   };
   protoOf(ParsedTemplate).hashCode = function () {
-    return hashCode(this.h1f_1);
+    return hashCode(this.i1f_1);
   };
   protoOf(ParsedTemplate).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof ParsedTemplate))
       return false;
-    if (!equals(this.h1f_1, other.h1f_1))
+    if (!equals(this.i1f_1, other.i1f_1))
       return false;
     return true;
   };
@@ -2885,12 +2969,12 @@
   protoOf(TemplateConst).hd = function () {
     return this.value;
   };
-  protoOf(TemplateConst).a1j = function (value) {
+  protoOf(TemplateConst).b1j = function (value) {
     return new TemplateConst(value);
   };
   protoOf(TemplateConst).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return $super === VOID ? this.a1j(value) : $super.a1j.call(this, value);
+    return $super === VOID ? this.b1j(value) : $super.b1j.call(this, value);
   };
   protoOf(TemplateConst).toString = function () {
     return 'TemplateConst(value=' + this.value + ')';
@@ -2922,10 +3006,10 @@
     tmp0_serialDesc.rs('scale', true);
     tmp0_serialDesc.rs('ingredient', true);
     tmp0_serialDesc.rs('usCust', true);
-    this.b1j_1 = tmp0_serialDesc;
+    this.c1j_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_10).c1j = function (encoder, value) {
-    var tmp0_desc = this.b1j_1;
+  protoOf($serializer_10).d1j = function (encoder, value) {
+    var tmp0_desc = this.c1j_1;
     var tmp1_output = encoder.il(tmp0_desc);
     tmp1_output.tm(tmp0_desc, 0, value.min);
     if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.max == null)) {
@@ -2946,10 +3030,10 @@
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_10).li = function (encoder, value) {
-    return this.c1j(encoder, value instanceof QuantityPlaceholder ? value : THROW_CCE());
+    return this.d1j(encoder, value instanceof QuantityPlaceholder ? value : THROW_CCE());
   };
   protoOf($serializer_10).mi = function (decoder) {
-    var tmp0_desc = this.b1j_1;
+    var tmp0_desc = this.c1j_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -3012,7 +3096,7 @@
     return QuantityPlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, null);
   };
   protoOf($serializer_10).ki = function () {
-    return this.b1j_1;
+    return this.c1j_1;
   };
   protoOf($serializer_10).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -3028,7 +3112,7 @@
   }
   function QuantityPlaceholder_init_$Init$(seen0, min, max, unit, scale, ingredient, usCust, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_10().b1j_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_10().c1j_1);
     }
     $this.min = min;
     if (0 === (seen0 & 2))
@@ -3069,22 +3153,22 @@
     this.ingredient = ingredient;
     this.usCust = usCust;
   }
-  protoOf(QuantityPlaceholder).d1j = function () {
+  protoOf(QuantityPlaceholder).e1j = function () {
     return this.min;
   };
-  protoOf(QuantityPlaceholder).e1j = function () {
+  protoOf(QuantityPlaceholder).f1j = function () {
     return this.max;
   };
-  protoOf(QuantityPlaceholder).f1j = function () {
+  protoOf(QuantityPlaceholder).g1j = function () {
     return this.unit;
   };
-  protoOf(QuantityPlaceholder).g1j = function () {
+  protoOf(QuantityPlaceholder).h1j = function () {
     return this.scale;
   };
-  protoOf(QuantityPlaceholder).h1j = function () {
+  protoOf(QuantityPlaceholder).i1j = function () {
     return this.ingredient;
   };
-  protoOf(QuantityPlaceholder).i1j = function () {
+  protoOf(QuantityPlaceholder).j1j = function () {
     return this.usCust;
   };
   protoOf(QuantityPlaceholder).hd = function () {
@@ -3093,19 +3177,19 @@
   protoOf(QuantityPlaceholder).id = function () {
     return this.max;
   };
-  protoOf(QuantityPlaceholder).j1j = function () {
+  protoOf(QuantityPlaceholder).k1j = function () {
     return this.unit;
   };
-  protoOf(QuantityPlaceholder).k1j = function () {
+  protoOf(QuantityPlaceholder).l1j = function () {
     return this.scale;
   };
-  protoOf(QuantityPlaceholder).l1j = function () {
+  protoOf(QuantityPlaceholder).m1j = function () {
     return this.ingredient;
   };
-  protoOf(QuantityPlaceholder).m1j = function () {
+  protoOf(QuantityPlaceholder).n1j = function () {
     return this.usCust;
   };
-  protoOf(QuantityPlaceholder).n1j = function (min, max, unit, scale, ingredient, usCust) {
+  protoOf(QuantityPlaceholder).o1j = function (min, max, unit, scale, ingredient, usCust) {
     return new QuantityPlaceholder(min, max, unit, scale, ingredient, usCust);
   };
   protoOf(QuantityPlaceholder).copy = function (min, max, unit, scale, ingredient, usCust, $super) {
@@ -3115,7 +3199,7 @@
     scale = scale === VOID ? this.scale : scale;
     ingredient = ingredient === VOID ? this.ingredient : ingredient;
     usCust = usCust === VOID ? this.usCust : usCust;
-    return $super === VOID ? this.n1j(min, max, unit, scale, ingredient, usCust) : $super.n1j.call(this, min, max, unit, scale, ingredient, usCust);
+    return $super === VOID ? this.o1j(min, max, unit, scale, ingredient, usCust) : $super.o1j.call(this, min, max, unit, scale, ingredient, usCust);
   };
   protoOf(QuantityPlaceholder).toString = function () {
     return 'QuantityPlaceholder(min=' + this.min + ', max=' + this.max + ', unit=' + this.unit + ', scale=' + this.scale + ', ingredient=' + this.ingredient + ', usCust=' + this.usCust + ')';
@@ -3161,10 +3245,10 @@
     tmp0_serialDesc.rs('temperatureFanC', true);
     tmp0_serialDesc.rs('temperatureF', true);
     tmp0_serialDesc.rs('gasMark', true);
-    this.o1j_1 = tmp0_serialDesc;
+    this.p1j_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_11).p1j = function (encoder, value) {
-    var tmp0_desc = this.o1j_1;
+  protoOf($serializer_11).q1j = function (encoder, value) {
+    var tmp0_desc = this.p1j_1;
     var tmp1_output = encoder.il(tmp0_desc);
     if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.temperatureC == null)) {
       tmp1_output.an(tmp0_desc, 0, IntSerializer_getInstance(), value.temperatureC);
@@ -3181,10 +3265,10 @@
     tmp1_output.jl(tmp0_desc);
   };
   protoOf($serializer_11).li = function (encoder, value) {
-    return this.p1j(encoder, value instanceof OvenTemperaturePlaceholder ? value : THROW_CCE());
+    return this.q1j(encoder, value instanceof OvenTemperaturePlaceholder ? value : THROW_CCE());
   };
   protoOf($serializer_11).mi = function (decoder) {
-    var tmp0_desc = this.o1j_1;
+    var tmp0_desc = this.p1j_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -3233,7 +3317,7 @@
     return OvenTemperaturePlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
   protoOf($serializer_11).ki = function () {
-    return this.o1j_1;
+    return this.p1j_1;
   };
   protoOf($serializer_11).ts = function () {
     // Inline function 'kotlin.arrayOf' call
@@ -3249,7 +3333,7 @@
   }
   function OvenTemperaturePlaceholder_init_$Init$(seen0, temperatureC, temperatureFanC, temperatureF, gasMark, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_11().o1j_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_11().p1j_1);
     }
     if (0 === (seen0 & 1))
       $this.temperatureC = null;
@@ -3282,16 +3366,16 @@
     this.temperatureF = temperatureF;
     this.gasMark = gasMark;
   }
-  protoOf(OvenTemperaturePlaceholder).q1j = function () {
+  protoOf(OvenTemperaturePlaceholder).r1j = function () {
     return this.temperatureC;
   };
-  protoOf(OvenTemperaturePlaceholder).r1j = function () {
+  protoOf(OvenTemperaturePlaceholder).s1j = function () {
     return this.temperatureFanC;
   };
-  protoOf(OvenTemperaturePlaceholder).s1j = function () {
+  protoOf(OvenTemperaturePlaceholder).t1j = function () {
     return this.temperatureF;
   };
-  protoOf(OvenTemperaturePlaceholder).t1j = function () {
+  protoOf(OvenTemperaturePlaceholder).u1j = function () {
     return this.gasMark;
   };
   protoOf(OvenTemperaturePlaceholder).hd = function () {
@@ -3300,13 +3384,13 @@
   protoOf(OvenTemperaturePlaceholder).id = function () {
     return this.temperatureFanC;
   };
-  protoOf(OvenTemperaturePlaceholder).j1j = function () {
+  protoOf(OvenTemperaturePlaceholder).k1j = function () {
     return this.temperatureF;
   };
-  protoOf(OvenTemperaturePlaceholder).k1j = function () {
+  protoOf(OvenTemperaturePlaceholder).l1j = function () {
     return this.gasMark;
   };
-  protoOf(OvenTemperaturePlaceholder).u1j = function (temperatureC, temperatureFanC, temperatureF, gasMark) {
+  protoOf(OvenTemperaturePlaceholder).v1j = function (temperatureC, temperatureFanC, temperatureF, gasMark) {
     return new OvenTemperaturePlaceholder(temperatureC, temperatureFanC, temperatureF, gasMark);
   };
   protoOf(OvenTemperaturePlaceholder).copy = function (temperatureC, temperatureFanC, temperatureF, gasMark, $super) {
@@ -3314,7 +3398,7 @@
     temperatureFanC = temperatureFanC === VOID ? this.temperatureFanC : temperatureFanC;
     temperatureF = temperatureF === VOID ? this.temperatureF : temperatureF;
     gasMark = gasMark === VOID ? this.gasMark : gasMark;
-    return $super === VOID ? this.u1j(temperatureC, temperatureFanC, temperatureF, gasMark) : $super.u1j.call(this, temperatureC, temperatureFanC, temperatureF, gasMark);
+    return $super === VOID ? this.v1j(temperatureC, temperatureFanC, temperatureF, gasMark) : $super.v1j.call(this, temperatureC, temperatureFanC, temperatureF, gasMark);
   };
   protoOf(OvenTemperaturePlaceholder).toString = function () {
     return 'OvenTemperaturePlaceholder(temperatureC=' + this.temperatureC + ', temperatureFanC=' + this.temperatureFanC + ', temperatureF=' + this.temperatureF + ', gasMark=' + this.gasMark + ')';
@@ -3359,6 +3443,24 @@
   function USCustomary_getInstance() {
     return USCustomary_instance;
   }
+  function USCustomaryWithMetric() {
+  }
+  var USCustomaryWithMetric_instance;
+  function USCustomaryWithMetric_getInstance() {
+    return USCustomaryWithMetric_instance;
+  }
+  function USCustomaryWithImperial() {
+  }
+  var USCustomaryWithImperial_instance;
+  function USCustomaryWithImperial_getInstance() {
+    return USCustomaryWithImperial_instance;
+  }
+  function USCombined() {
+  }
+  var USCombined_instance;
+  function USCombined_getInstance() {
+    return USCombined_instance;
+  }
   var UnitType_WEIGHT_instance;
   var UnitType_VOLUME_instance;
   var UnitType_LENGTH_instance;
@@ -3375,25 +3477,25 @@
     Enum.call(this, name, ordinal);
   }
   function MeasurementUnit(singular, plural, symbol, symbolPlural, unitType, measuringSystems, quantity) {
-    this.y1e_1 = singular;
-    this.z1e_1 = plural;
-    this.a1f_1 = symbol;
-    this.b1f_1 = symbolPlural;
-    this.c1f_1 = unitType;
-    this.d1f_1 = measuringSystems;
-    this.e1f_1 = quantity;
+    this.z1e_1 = singular;
+    this.a1f_1 = plural;
+    this.b1f_1 = symbol;
+    this.c1f_1 = symbolPlural;
+    this.d1f_1 = unitType;
+    this.e1f_1 = measuringSystems;
+    this.f1f_1 = quantity;
   }
   protoOf(MeasurementUnit).toString = function () {
-    return 'MeasurementUnit(singular=' + this.y1e_1 + ', plural=' + this.z1e_1 + ', symbol=' + this.a1f_1 + ', symbolPlural=' + this.b1f_1 + ', unitType=' + toString(this.c1f_1) + ', measuringSystems=' + toString_0(this.d1f_1) + ', quantity=' + this.e1f_1 + ')';
+    return 'MeasurementUnit(singular=' + this.z1e_1 + ', plural=' + this.a1f_1 + ', symbol=' + this.b1f_1 + ', symbolPlural=' + this.c1f_1 + ', unitType=' + toString(this.d1f_1) + ', measuringSystems=' + toString_0(this.e1f_1) + ', quantity=' + this.f1f_1 + ')';
   };
   protoOf(MeasurementUnit).hashCode = function () {
-    var result = getStringHashCode(this.y1e_1);
-    result = imul(result, 31) + getStringHashCode(this.z1e_1) | 0;
+    var result = getStringHashCode(this.z1e_1);
     result = imul(result, 31) + getStringHashCode(this.a1f_1) | 0;
     result = imul(result, 31) + getStringHashCode(this.b1f_1) | 0;
-    result = imul(result, 31) + (this.c1f_1 == null ? 0 : this.c1f_1.hashCode()) | 0;
-    result = imul(result, 31) + hashCode(this.d1f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.e1f_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.c1f_1) | 0;
+    result = imul(result, 31) + (this.d1f_1 == null ? 0 : this.d1f_1.hashCode()) | 0;
+    result = imul(result, 31) + hashCode(this.e1f_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.f1f_1) | 0;
     return result;
   };
   protoOf(MeasurementUnit).equals = function (other) {
@@ -3401,20 +3503,20 @@
       return true;
     if (!(other instanceof MeasurementUnit))
       return false;
-    if (!(this.y1e_1 === other.y1e_1))
-      return false;
     if (!(this.z1e_1 === other.z1e_1))
       return false;
     if (!(this.a1f_1 === other.a1f_1))
       return false;
     if (!(this.b1f_1 === other.b1f_1))
       return false;
-    if (!equals(this.c1f_1, other.c1f_1))
+    if (!(this.c1f_1 === other.c1f_1))
       return false;
     if (!equals(this.d1f_1, other.d1f_1))
       return false;
     if (!equals(this.e1f_1, other.e1f_1))
       return false;
+    if (!equals(this.f1f_1, other.f1f_1))
+      return false;
     return true;
   };
   function Units() {
@@ -3422,20 +3524,20 @@
     this.n1d_1 = new MeasurementUnit('gram', 'grams', 'g', 'g', UnitType_WEIGHT_getInstance(), setOf(Metric_instance), 1.0);
     this.o1d_1 = new MeasurementUnit('kilogram', 'kilograms', 'kg', 'kg', UnitType_WEIGHT_getInstance(), setOf(Metric_instance), 1000.0);
     this.p1d_1 = new MeasurementUnit('ounce', 'ounces', 'oz', 'oz', UnitType_WEIGHT_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 28.3495);
-    this.q1d_1 = new MeasurementUnit('pound', 'pounds', 'lb', 'lbs', UnitType_WEIGHT_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 16 * this.p1d_1.e1f_1);
+    this.q1d_1 = new MeasurementUnit('pound', 'pounds', 'lb', 'lbs', UnitType_WEIGHT_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 16 * this.p1d_1.f1f_1);
     this.r1d_1 = new MeasurementUnit('millilitre', 'millilitres', 'ml', 'ml', UnitType_VOLUME_getInstance(), setOf(Metric_instance), 1.0);
     this.s1d_1 = new MeasurementUnit('centilitre', 'centilitres', 'cl', 'cl', UnitType_VOLUME_getInstance(), setOf(Metric_instance), 10.0);
     this.t1d_1 = new MeasurementUnit('litre', 'litres', 'l', 'l', UnitType_VOLUME_getInstance(), setOf(Metric_instance), 1000.0);
     this.u1d_1 = new MeasurementUnit('teaspoon', 'teaspoons', 'tsp', 'tsp', UnitType_VOLUME_getInstance(), setOf(Metric_instance), 5.0);
     this.v1d_1 = new MeasurementUnit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), setOf(Metric_instance), 15.0);
     this.w1d_1 = new MeasurementUnit('teaspoon', 'teaspoons', 'tsp', 'tsp', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 4.9289);
-    this.x1d_1 = new MeasurementUnit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 3 * this.w1d_1.e1f_1);
-    this.y1d_1 = new MeasurementUnit('fluid ounce', 'fluid ounces', 'fl oz', 'fl oz', UnitType_VOLUME_getInstance(), setOf(Imperial_instance), 6 * this.w1d_1.e1f_1);
-    this.z1d_1 = new MeasurementUnit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), setOf(USCustomary_instance), 48 * this.w1d_1.e1f_1);
+    this.x1d_1 = new MeasurementUnit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 3 * this.w1d_1.f1f_1);
+    this.y1d_1 = new MeasurementUnit('fluid ounce', 'fluid ounces', 'fl oz', 'fl oz', UnitType_VOLUME_getInstance(), setOf(Imperial_instance), 6 * this.w1d_1.f1f_1);
+    this.z1d_1 = new MeasurementUnit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), setOf(USCustomary_instance), 48 * this.w1d_1.f1f_1);
     this.a1e_1 = new MeasurementUnit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), setOf(Metric_instance), 250.0);
-    this.b1e_1 = new MeasurementUnit('pint', 'pints', 'pt', 'pts', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 2 * this.z1d_1.e1f_1);
-    this.c1e_1 = new MeasurementUnit('quart', 'quarts', 'qt', 'qts', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 2 * this.b1e_1.e1f_1);
-    this.d1e_1 = new MeasurementUnit('gallon', 'gallons', 'gal', 'gals', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 4 * this.c1e_1.e1f_1);
+    this.b1e_1 = new MeasurementUnit('pint', 'pints', 'pt', 'pts', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 2 * this.z1d_1.f1f_1);
+    this.c1e_1 = new MeasurementUnit('quart', 'quarts', 'qt', 'qts', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 2 * this.b1e_1.f1f_1);
+    this.d1e_1 = new MeasurementUnit('gallon', 'gallons', 'gal', 'gals', UnitType_VOLUME_getInstance(), setOf_0([Imperial_instance, USCustomary_instance]), 4 * this.c1e_1.f1f_1);
     this.e1e_1 = new MeasurementUnit('millimetre', 'millimetres', 'mm', 'mm', UnitType_LENGTH_getInstance(), setOf(Metric_instance), 1.0);
     this.f1e_1 = new MeasurementUnit('centimetre', 'centimetres', 'cm', 'cm', UnitType_LENGTH_getInstance(), setOf(Metric_instance), 10.0);
     this.g1e_1 = new MeasurementUnit('inch', 'inches', 'in', 'in', UnitType_LENGTH_getInstance(), setOf(Imperial_instance), 25.4);
@@ -3448,7 +3550,7 @@
     var _iterator__ex2g4s = tmp0.s();
     while (_iterator__ex2g4s.t()) {
       var element = _iterator__ex2g4s.u();
-      if (element.d1f_1.z(Metric_instance)) {
+      if (element.e1f_1.z(Metric_instance)) {
         destination.w(element);
       }
     }
@@ -3460,7 +3562,7 @@
     var _iterator__ex2g4s_0 = destination.s();
     while (_iterator__ex2g4s_0.t()) {
       var element_0 = _iterator__ex2g4s_0.u();
-      var tmp$ret$3 = element_0.a1f_1;
+      var tmp$ret$3 = element_0.b1f_1;
       destination_0.o2(tmp$ret$3, element_0);
     }
     var tmp_0 = destination_0;
@@ -3471,7 +3573,7 @@
     var _iterator__ex2g4s_1 = destination.s();
     while (_iterator__ex2g4s_1.t()) {
       var element_1 = _iterator__ex2g4s_1.u();
-      var tmp$ret$6 = element_1.b1f_1;
+      var tmp$ret$6 = element_1.c1f_1;
       destination_1.o2(tmp$ret$6, element_1);
     }
     var tmp_1 = plus(tmp_0, destination_1);
@@ -3482,7 +3584,7 @@
     var _iterator__ex2g4s_2 = destination.s();
     while (_iterator__ex2g4s_2.t()) {
       var element_2 = _iterator__ex2g4s_2.u();
-      var tmp$ret$9 = element_2.y1e_1;
+      var tmp$ret$9 = element_2.z1e_1;
       destination_2.o2(tmp$ret$9, element_2);
     }
     var tmp_2 = plus(tmp_1, destination_2);
@@ -3493,7 +3595,7 @@
     var _iterator__ex2g4s_3 = destination.s();
     while (_iterator__ex2g4s_3.t()) {
       var element_3 = _iterator__ex2g4s_3.u();
-      var tmp$ret$12 = element_3.z1e_1;
+      var tmp$ret$12 = element_3.a1f_1;
       destination_3.o2(tmp$ret$12, element_3);
     }
     tmp.i1e_1 = plus(tmp_2, destination_3);
@@ -3505,7 +3607,7 @@
     var _iterator__ex2g4s_4 = tmp0_0.s();
     while (_iterator__ex2g4s_4.t()) {
       var element_4 = _iterator__ex2g4s_4.u();
-      if (element_4.d1f_1.z(Imperial_instance)) {
+      if (element_4.e1f_1.z(Imperial_instance)) {
         destination_4.w(element_4);
       }
     }
@@ -3517,7 +3619,7 @@
     var _iterator__ex2g4s_5 = destination_4.s();
     while (_iterator__ex2g4s_5.t()) {
       var element_5 = _iterator__ex2g4s_5.u();
-      var tmp$ret$20 = element_5.a1f_1;
+      var tmp$ret$20 = element_5.b1f_1;
       destination_5.o2(tmp$ret$20, element_5);
     }
     var tmp_4 = destination_5;
@@ -3528,7 +3630,7 @@
     var _iterator__ex2g4s_6 = destination_4.s();
     while (_iterator__ex2g4s_6.t()) {
       var element_6 = _iterator__ex2g4s_6.u();
-      var tmp$ret$23 = element_6.b1f_1;
+      var tmp$ret$23 = element_6.c1f_1;
       destination_6.o2(tmp$ret$23, element_6);
     }
     var tmp_5 = plus(tmp_4, destination_6);
@@ -3539,7 +3641,7 @@
     var _iterator__ex2g4s_7 = destination_4.s();
     while (_iterator__ex2g4s_7.t()) {
       var element_7 = _iterator__ex2g4s_7.u();
-      var tmp$ret$26 = element_7.y1e_1;
+      var tmp$ret$26 = element_7.z1e_1;
       destination_7.o2(tmp$ret$26, element_7);
     }
     var tmp_6 = plus(tmp_5, destination_7);
@@ -3550,7 +3652,7 @@
     var _iterator__ex2g4s_8 = destination_4.s();
     while (_iterator__ex2g4s_8.t()) {
       var element_8 = _iterator__ex2g4s_8.u();
-      var tmp$ret$29 = element_8.z1e_1;
+      var tmp$ret$29 = element_8.a1f_1;
       destination_8.o2(tmp$ret$29, element_8);
     }
     tmp_3.j1e_1 = plus(tmp_6, destination_8);
@@ -3562,7 +3664,7 @@
     var _iterator__ex2g4s_9 = tmp0_1.s();
     while (_iterator__ex2g4s_9.t()) {
       var element_9 = _iterator__ex2g4s_9.u();
-      if (element_9.d1f_1.z(USCustomary_instance)) {
+      if (element_9.e1f_1.z(USCustomary_instance)) {
         destination_9.w(element_9);
       }
     }
@@ -3574,7 +3676,7 @@
     var _iterator__ex2g4s_10 = destination_9.s();
     while (_iterator__ex2g4s_10.t()) {
       var element_10 = _iterator__ex2g4s_10.u();
-      var tmp$ret$37 = element_10.a1f_1;
+      var tmp$ret$37 = element_10.b1f_1;
       destination_10.o2(tmp$ret$37, element_10);
     }
     var tmp_8 = destination_10;
@@ -3585,7 +3687,7 @@
     var _iterator__ex2g4s_11 = destination_9.s();
     while (_iterator__ex2g4s_11.t()) {
       var element_11 = _iterator__ex2g4s_11.u();
-      var tmp$ret$40 = element_11.b1f_1;
+      var tmp$ret$40 = element_11.c1f_1;
       destination_11.o2(tmp$ret$40, element_11);
     }
     var tmp_9 = plus(tmp_8, destination_11);
@@ -3596,7 +3698,7 @@
     var _iterator__ex2g4s_12 = destination_9.s();
     while (_iterator__ex2g4s_12.t()) {
       var element_12 = _iterator__ex2g4s_12.u();
-      var tmp$ret$43 = element_12.y1e_1;
+      var tmp$ret$43 = element_12.z1e_1;
       destination_12.o2(tmp$ret$43, element_12);
     }
     var tmp_10 = plus(tmp_9, destination_12);
@@ -3607,7 +3709,7 @@
     var _iterator__ex2g4s_13 = destination_9.s();
     while (_iterator__ex2g4s_13.t()) {
       var element_13 = _iterator__ex2g4s_13.u();
-      var tmp$ret$46 = element_13.z1e_1;
+      var tmp$ret$46 = element_13.a1f_1;
       destination_13.o2(tmp$ret$46, element_13);
     }
     tmp_7.k1e_1 = plus(tmp_10, destination_13);
@@ -3649,23 +3751,24 @@
     this.s1e_1 = setOf_0([Units_getInstance().u1d_1, Units_getInstance().v1d_1, Units_getInstance().a1e_1]);
     this.t1e_1 = listOf([to(0.0, Units_getInstance().n1d_1), to(1000.0, Units_getInstance().o1d_1), to(0.0, Units_getInstance().r1d_1), to(2.5, Units_getInstance().u1d_1), to(15.0, Units_getInstance().v1d_1), to(125.0, Units_getInstance().a1e_1), to(1000.0, Units_getInstance().t1d_1), to(0.0, Units_getInstance().e1e_1), to(10.0, Units_getInstance().f1e_1)]);
     this.u1e_1 = listOf([to(0.0, Units_getInstance().n1d_1), to(1000.0, Units_getInstance().o1d_1), to(0.0, Units_getInstance().r1d_1), to(1000.0, Units_getInstance().t1d_1), to(0.0, Units_getInstance().e1e_1), to(10.0, Units_getInstance().f1e_1)]);
-    this.v1e_1 = listOf([to(0.0, Units_getInstance().p1d_1), to(16.0 * Units_getInstance().p1d_1.e1f_1, Units_getInstance().q1d_1), to(0.0, Units_getInstance().w1d_1), to(3.0 * Units_getInstance().w1d_1.e1f_1, Units_getInstance().x1d_1), to(12.0 * Units_getInstance().w1d_1.e1f_1, Units_getInstance().z1d_1), to(192 * Units_getInstance().w1d_1.e1f_1, Units_getInstance().c1e_1), to(768.0 * Units_getInstance().w1d_1.e1f_1, Units_getInstance().d1e_1), to(0.0, Units_getInstance().g1e_1)]);
-    this.w1e_1 = listOf([to(0.0, Units_getInstance().p1d_1), to(16.0 * Units_getInstance().p1d_1.e1f_1, Units_getInstance().q1d_1), to(0.0, Units_getInstance().w1d_1), to(3.0 * Units_getInstance().w1d_1.e1f_1, Units_getInstance().x1d_1), to(6.0 * Units_getInstance().w1d_1.e1f_1, Units_getInstance().y1d_1), to(768.0 * Units_getInstance().w1d_1.e1f_1, Units_getInstance().d1e_1), to(0.0, Units_getInstance().g1e_1)]);
+    this.v1e_1 = listOf([to(0.0, Units_getInstance().p1d_1), to(16.0 * Units_getInstance().p1d_1.f1f_1, Units_getInstance().q1d_1), to(0.0, Units_getInstance().w1d_1), to(3.0 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().x1d_1), to(12.0 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().z1d_1), to(192 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().c1e_1), to(768.0 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().d1e_1), to(0.0, Units_getInstance().g1e_1)]);
+    this.w1e_1 = listOf([to(0.0, Units_getInstance().p1d_1), to(16.0 * Units_getInstance().p1d_1.f1f_1, Units_getInstance().q1d_1), to(0.0, Units_getInstance().w1d_1), to(3.0 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().x1d_1), to(12.0 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().z1d_1), to(0.0, Units_getInstance().g1e_1)]);
+    this.x1e_1 = listOf([to(0.0, Units_getInstance().p1d_1), to(16.0 * Units_getInstance().p1d_1.f1f_1, Units_getInstance().q1d_1), to(0.0, Units_getInstance().w1d_1), to(3.0 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().x1d_1), to(6.0 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().y1d_1), to(768.0 * Units_getInstance().w1d_1.f1f_1, Units_getInstance().d1e_1), to(0.0, Units_getInstance().g1e_1)]);
   }
-  protoOf(UnitConversions).v1j = function (amount) {
+  protoOf(UnitConversions).w1j = function (amount) {
     var tmp;
     if (!(amount.c1d_1 == null)) {
-      var tmp_0 = amount.a1d_1 * amount.c1d_1.e1f_1;
+      var tmp_0 = amount.a1d_1 * amount.c1d_1.f1f_1;
       var tmp0_safe_receiver = amount.b1d_1;
       var tmp_1;
       if (tmp0_safe_receiver == null) {
         tmp_1 = null;
       } else {
         // Inline function 'kotlin.let' call
-        tmp_1 = tmp0_safe_receiver * amount.c1d_1.e1f_1;
+        tmp_1 = tmp0_safe_receiver * amount.c1d_1.f1f_1;
       }
       var tmp_2 = tmp_1;
-      var tmp1_subject = amount.c1d_1.c1f_1;
+      var tmp1_subject = amount.c1d_1.d1f_1;
       var tmp0 = tmp1_subject == null ? -1 : tmp1_subject.s2_1;
       tmp = amount.f1d(tmp_0, tmp_2, tmp0 === 2 ? Units_getInstance().e1e_1 : tmp0 === 1 ? Units_getInstance().r1d_1 : tmp0 === 0 ? Units_getInstance().n1d_1 : amount.c1d_1);
     } else {
@@ -3673,7 +3776,7 @@
     }
     return tmp;
   };
-  protoOf(UnitConversions).x1e = function (amount, target, factor, density) {
+  protoOf(UnitConversions).y1e = function (amount, target, factor, density) {
     var tmp = amount.a1d_1 * factor;
     var tmp0_safe_receiver = amount.b1d_1;
     var tmp_0;
@@ -3687,41 +3790,54 @@
     if (scaledAmount.c1d_1 == null || (equals(target, Metric_instance) && factor === 1.0)) {
       return scaledAmount;
     }
-    var smallestUnitAmount = this.v1j(scaledAmount);
+    var smallestUnitAmount = this.w1j(scaledAmount);
     var tmp_1;
     if (equals(target, Metric_instance)) {
       tmp_1 = contains(this.s1e_1, amount.c1d_1) ? this.t1e_1 : this.u1e_1;
     } else if (equals(target, USCustomary_instance)) {
-      tmp_1 = this.v1e_1;
+      var tmp_2;
+      var tmp_3;
+      if (amount.d1d_1 === true) {
+        var tmp2_safe_receiver = amount.c1d_1;
+        tmp_3 = equals(tmp2_safe_receiver == null ? null : tmp2_safe_receiver.d1f_1, UnitType_WEIGHT_getInstance());
+      } else {
+        tmp_3 = false;
+      }
+      if (tmp_3) {
+        tmp_2 = this.w1e_1;
+      } else {
+        tmp_2 = this.v1e_1;
+      }
+      tmp_1 = tmp_2;
     } else if (equals(target, Imperial_instance)) {
-      tmp_1 = this.w1e_1;
+      tmp_1 = this.x1e_1;
     } else {
       noWhenBranchMatchedException();
     }
     var ladder = tmp_1;
-    var tmp_2;
-    var tmp_3;
-    if (amount.d1d_1 === true && !(density == null)) {
-      var tmp3_safe_receiver = amount.c1d_1;
-      tmp_3 = equals(tmp3_safe_receiver == null ? null : tmp3_safe_receiver.c1f_1, UnitType_WEIGHT_getInstance());
+    var tmp_4;
+    var tmp_5;
+    if (amount.d1d_1 === true && equals(target, USCustomary_instance) && !(density == null)) {
+      var tmp4_safe_receiver = amount.c1d_1;
+      tmp_5 = equals(tmp4_safe_receiver == null ? null : tmp4_safe_receiver.d1f_1, UnitType_WEIGHT_getInstance());
     } else {
-      tmp_3 = false;
-    }
-    if (tmp_3) {
-      var tmp_4 = smallestUnitAmount.a1d_1 / density;
-      var tmp2_safe_receiver = smallestUnitAmount.b1d_1;
-      var tmp_5;
-      if (tmp2_safe_receiver == null) {
-        tmp_5 = null;
+      tmp_5 = false;
+    }
+    if (tmp_5) {
+      var tmp_6 = smallestUnitAmount.a1d_1 / density;
+      var tmp3_safe_receiver = smallestUnitAmount.b1d_1;
+      var tmp_7;
+      if (tmp3_safe_receiver == null) {
+        tmp_7 = null;
       } else {
         // Inline function 'kotlin.let' call
-        tmp_5 = tmp2_safe_receiver / density;
+        tmp_7 = tmp3_safe_receiver / density;
       }
-      tmp_2 = new Amount(tmp_4, tmp_5, Units_getInstance().r1d_1);
+      tmp_4 = new Amount(tmp_6, tmp_7, Units_getInstance().r1d_1);
     } else {
-      tmp_2 = smallestUnitAmount;
+      tmp_4 = smallestUnitAmount;
     }
-    var amountToConvert = tmp_2;
+    var amountToConvert = tmp_4;
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$_0();
@@ -3729,7 +3845,7 @@
     while (_iterator__ex2g4s.t()) {
       var element = _iterator__ex2g4s.u();
       var tmp0_safe_receiver_0 = amountToConvert.c1d_1;
-      if (equals(element.gd_1.c1f_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.c1f_1)) {
+      if (equals(element.gd_1.d1f_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.d1f_1)) {
         destination.w(element);
       }
     }
@@ -3746,26 +3862,26 @@
       }
       tmp$ret$8 = null;
     }
-    var tmp4_safe_receiver = tmp$ret$8;
-    var mostRelevantUnit = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.gd_1;
-    var tmp_6;
+    var tmp5_safe_receiver = tmp$ret$8;
+    var mostRelevantUnit = tmp5_safe_receiver == null ? null : tmp5_safe_receiver.gd_1;
+    var tmp_8;
     if (mostRelevantUnit == null) {
-      tmp_6 = null;
+      tmp_8 = null;
     } else {
       // Inline function 'kotlin.let' call
-      var tmp_7 = amountToConvert.a1d_1 / mostRelevantUnit.e1f_1;
+      var tmp_9 = amountToConvert.a1d_1 / mostRelevantUnit.f1f_1;
       var tmp0_safe_receiver_1 = amountToConvert.b1d_1;
-      var tmp_8;
+      var tmp_10;
       if (tmp0_safe_receiver_1 == null) {
-        tmp_8 = null;
+        tmp_10 = null;
       } else {
         // Inline function 'kotlin.let' call
-        tmp_8 = tmp0_safe_receiver_1 / mostRelevantUnit.e1f_1;
+        tmp_10 = tmp0_safe_receiver_1 / mostRelevantUnit.f1f_1;
       }
-      tmp_6 = new Amount(tmp_7, tmp_8, mostRelevantUnit);
+      tmp_8 = new Amount(tmp_9, tmp_10, mostRelevantUnit);
     }
-    var tmp6_elvis_lhs = tmp_6;
-    return tmp6_elvis_lhs == null ? amountToConvert : tmp6_elvis_lhs;
+    var tmp7_elvis_lhs = tmp_8;
+    return tmp7_elvis_lhs == null ? amountToConvert : tmp7_elvis_lhs;
   };
   var UnitConversions_instance;
   function UnitConversions_getInstance() {
@@ -3799,6 +3915,15 @@
       case 'US':
         tmp = USCustomary_instance;
         break;
+      case 'USWithMetric':
+        tmp = USCustomaryWithMetric_instance;
+        break;
+      case 'USWithImperial':
+        tmp = USCustomaryWithImperial_instance;
+        break;
+      case 'Combined':
+        tmp = USCombined_instance;
+        break;
       default:
         throw IllegalArgumentException_init_$Create$('Unknown unit: ' + unit);
     }
@@ -3816,12 +3941,12 @@
   function parseTemplate_0(templateString) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
     var parsedTemplate = parseTemplate(templateString);
-    return parsedTemplate.h1f_1;
+    return parsedTemplate.i1f_1;
   }
   function renderTemplate(templateElements, session) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
     var template = new ParsedTemplate(templateElements);
-    return session.g1f(template, 1.0, Metric_instance);
+    return session.h1f(template, 1.0, Metric_instance);
   }
   function createTemplateSession(rawDensityData) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
@@ -3869,6 +3994,9 @@
   Imperial_instance = new Imperial();
   Metric_instance = new Metric();
   USCustomary_instance = new USCustomary();
+  USCustomaryWithMetric_instance = new USCustomaryWithMetric();
+  USCustomaryWithImperial_instance = new USCustomaryWithImperial();
+  USCombined_instance = new USCombined();
   //endregion
   //region block: exports
   function $jsExportAll$(_) {