igniteui-angular-core 17.3.0-beta.0 → 17.3.1-alpha.0

package/esm5/lib/CodeGeneratingComponentRendererCodeEmitter_combined.js

@@ -5,7 +5,7 @@ https://www.infragistics.com/legal/license/igultimate-eula
 GOVERNS THE LICENSING, INSTALLATION AND USE OF INFRAGISTICS SOFTWARE. BY DOWNLOADING AND/OR INSTALLING AND USING INFRAGISTICS SOFTWARE:  you are indicating that you have read and understand this Agreement, and agree to be legally bound by it on behalf of the yourself and your company.
 */
 import { __extends, __values } from "tslib";
-import { Base, IList_$type, NotSupportedException, String_$type, typeCast, Array_$type, fromEnum, Boolean_$type, markType, EnumUtil, fromEn, Number_$type, Point_$type, typeGetValue, runOn } from "./type";
+import { Base, NotSupportedException, IList_$type, String_$type, typeCast, Array_$type, fromEnum, Boolean_$type, markType, EnumUtil, fromEn, Number_$type, Point_$type, typeGetValue, runOn } from "./type";
 import { CodeGenerationTargetPlatforms_$type } from "./CodeGenerationTargetPlatforms";
 import { CodeGeneratingRendererResult } from "./CodeGeneratingRendererResult";
 import { CodeGeneratingCodeWriter } from "./CodeGeneratingCodeWriter";
@@ -21,7 +21,7 @@ import { ColorUtil } from "./ColorUtil";
 import { Brush } from "./Brush";
 import { StringBuilder } from "./StringBuilder";
 import { CodeGeneratingImportManager } from "./CodeGeneratingImportManager";
-import { stringIsNullOrEmpty, stringReplace, stringStartsWith, stringEndsWith, stringContains } from "./string";
+import { stringJoin1, stringIsNullOrEmpty, stringReplace, stringStartsWith, stringEndsWith, stringContains } from "./string";
 import { HashSet$1 } from "./HashSet$1";
 import { WebImportsHalper } from "./WebImportsHalper";
 import { CodeGeneratingComponentRendererHandlerEmitter } from "./CodeGeneratingComponentRendererHandlerEmitter";
@@ -58,11 +58,11 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         _this.c = null;
         _this.b = null;
         _this.aa = new List$1(String_$type, 0);
+        _this.af = new Stack$1(String_$type);
         _this.ad = new Stack$1(String_$type);
-        _this.ab = new Stack$1(String_$type);
-        _this.ac = new Stack$1(Boolean_$type);
-        _this.a3 = null;
-        _this.a2 = null;
+        _this.ae = new Stack$1(Boolean_$type);
+        _this.a5 = null;
+        _this.a4 = null;
         _this.l = a;
         _this.j = b;
         _this.d = new CodeGeneratingCodeWriter(_this.l);
@@ -71,7 +71,7 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         _this.b = new CodeGeneratingCodeWriter(_this.l);
         return _this;
     }
-    CodeGeneratingComponentRendererCodeEmitter.prototype.get_aj = function () {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.get_al = function () {
         switch (this.j.platform) {
             case 1: return "Igx";
             case 2: return "Igr";
@@ -82,14 +82,14 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         }
         return "";
     };
-    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "aj", {
+    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "al", {
         get: function () {
-            return this.get_aj();
+            return this.get_al();
         },
         enumerable: false,
         configurable: true
     });
-    CodeGeneratingComponentRendererCodeEmitter.prototype.get_ak = function () {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.get_am = function () {
         switch (this.j.platform) {
             case 1: return "Component";
             case 2: return "";
@@ -99,14 +99,14 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         }
         return "";
     };
-    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "ak", {
+    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "am", {
         get: function () {
-            return this.get_ak();
+            return this.get_am();
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "a4", {
+    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "a6", {
         get: function () {
             switch (this.j.platform) {
                 case 1: return "angular";
@@ -125,7 +125,7 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         enumerable: false,
         configurable: true
     });
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bp = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.br = function (a) {
         this.j.af(a);
     };
     Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "k", {
@@ -163,7 +163,7 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         enumerable: false,
         configurable: true
     });
-    CodeGeneratingComponentRendererCodeEmitter.prototype.a9 = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bb = function (a) {
         if (a == null || a == "any") {
             return;
         }
@@ -214,15 +214,15 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         }
         return false;
     };
-    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "ao", {
+    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "aq", {
         get: function () {
-            return this.ad.d();
+            return this.af.d();
         },
         enumerable: false,
         configurable: true
     });
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ba = function (a, b, c) {
-        this.ad.h(a);
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a, b, c) {
+        this.af.h(a);
     };
     CodeGeneratingComponentRendererCodeEmitter.prototype.u = function (a, b) {
         var c = false;
@@ -231,140 +231,118 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         }
         return c;
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bo = function () {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bq = function () {
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bk = function (a) {
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a) {
-        this.ad.e();
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bl = function (a) {
+        this.af.e();
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c, d) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a, b, c, d) {
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a, b, c, d) {
-        this.bg(a, b, c, d);
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a, b, c, d) {
+        this.bi(a, b, c, d);
     };
     CodeGeneratingComponentRendererCodeEmitter.prototype.toString = function () {
         return this.d.toString();
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ay = function () {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function () {
         return "null";
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a, b, c) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.a3 = function (a, b, c) {
         if (b.b == null) {
             return b.c;
         }
         if (typeCast(CodeGenerationSpecialValue.$, b.c) !== null) {
-            b.c = this.ae(b);
+            b.c = this.ag(b);
         }
         switch (b.b.knownType) {
             case 10:
                 if (this.w(a, b)) {
-                    return this.am(a, b);
+                    return this.ao(a, b);
                 }
-                return this.ar(a, b);
+                return this.at(a, b);
             case 23:
                 if (this.w(a, b)) {
-                    return this.am(a, b);
+                    return this.ao(a, b);
                 }
-                return this.ar(a, b);
+                return this.at(a, b);
             case 7: return b.c ? "true" : "false";
-            case 4: return this.ag(b);
+            case 4: return this.ai(b);
             case 6:
                 {
-                    var d = "";
-                    var e = b.c;
-                    for (var f = 0; f < e.count; f++) {
-                        if (f >= 1) {
-                            d += " ";
-                        }
-                        d += this.af(e.item(f));
-                    }
-                    return d;
+                    return stringJoin1(String_$type, " ", this.ab(b, c));
                 }
-                break;
             case 9:
                 if (this.w(a, b)) {
-                    return this.am(a, b);
+                    return this.ao(a, b);
                 }
                 throw new NotSupportedException(1, "shouldn't get here");
-            case 5: return this.ai(b);
+            case 5: return this.ak(b);
             case 16:
                 {
-                    var g = "";
-                    var h = b.c;
-                    for (var i = 0; i < h.count; i++) {
-                        if (i >= 1) {
-                            g += " ";
-                        }
-                        g += this.ah(h.item(i));
-                    }
-                    return g;
+                    return stringJoin1(String_$type, " ", this.ac(b, c));
                 }
-                break;
             case 20:
                 if (b.a != null) {
-                    return this.a0(b);
+                    return this.a2(b);
                 }
                 if (b.c == null) {
-                    return this.ay();
+                    return this.a0();
                 }
                 break;
             case 22:
                 if (b.a != null) {
-                    return this.a0(b);
+                    return this.a2(b);
                 }
                 if (b.c == null) {
-                    return this.ay();
+                    return this.a0();
                 }
                 break;
             case 15: throw new NotSupportedException(1, "need to figure this out");
             case 3: throw new NotSupportedException(1, "need to figure this out");
-            case 19:
-                if (b.a != null) {
-                    return this.av(b);
-                }
-                else {
-                    return this.ay();
-                }
-                break;
+            case 19: if (b.a != null) {
+                return this.ax(b);
+            }
+            else {
+                return this.a0();
+            }
             case 8:
                 if (b.b.specificExternalType == "string") {
-                    return this.au(b);
+                    return this.aw(b);
                 }
                 if (b.a != null) {
-                    return this.aw(b);
+                    return this.ay(b);
                 }
                 if (this.w(a, b)) {
-                    return this.am(a, b);
+                    return this.ao(a, b);
                 }
                 throw new NotSupportedException(1, "shouldn't get here");
             case 13: throw new NotSupportedException(1, "shouldn't get here");
-            case 18:
-                if (b.a != null) {
-                    return this.ax(b);
-                }
-                else {
-                    return this.ay();
-                }
-                break;
+            case 18: if (b.a != null) {
+                return this.az(b);
+            }
+            else {
+                return this.a0();
+            }
             case 1: return b.c.toString();
             case 11:
                 {
-                    var j = b.c;
-                    return j.x + ", " + j.y;
+                    var d = b.c;
+                    return d.x + ", " + d.y;
                 }
             case 14:
                 {
-                    var k = b.c;
-                    return k.left + ", " + k.top + ", " + k.width + ", " + k.height;
+                    var e = b.c;
+                    return e.left + ", " + e.top + ", " + e.width + ", " + e.height;
                 }
             case 12:
                 {
-                    var l = b.c;
-                    return l.width + ", " + l.height;
+                    var f = b.c;
+                    return f.width + ", " + f.height;
                 }
-            case 2: return b.c != null ? b.c.toString() : this.ay();
-            case 21: return this.a7(b.c);
+            case 2: return b.c != null ? b.c.toString() : this.a0();
+            case 21: return this.a9(b.c);
             case 17:
                 if (b.c == null) {
                     return "null";
@@ -377,14 +355,50 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         }
         return "";
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.a7 = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ab = function (a, b) {
+        if (a.b == null) {
+            return ((function () {
+                var $ret = new List$1(String_$type, 0);
+                $ret.add(a.c);
+                return $ret;
+            })());
+        }
+        if (typeCast(CodeGenerationSpecialValue.$, a.c) !== null) {
+            a.c = this.ag(a);
+        }
+        var c = a.c;
+        var d = new List$1(String_$type, 0);
+        for (var e = 0; e < c.count; e++) {
+            d.add(this.ah(c.item(e)));
+        }
+        return d;
+    };
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ac = function (a, b) {
+        if (a.b == null) {
+            return ((function () {
+                var $ret = new List$1(String_$type, 0);
+                $ret.add(a.c);
+                return $ret;
+            })());
+        }
+        if (typeCast(CodeGenerationSpecialValue.$, a.c) !== null) {
+            a.c = this.ag(a);
+        }
+        var c = a.c;
+        var d = new List$1(String_$type, 0);
+        for (var e = 0; e < c.count; e++) {
+            d.add(this.aj(c.item(e)));
+        }
+        return d;
+    };
+    CodeGeneratingComponentRendererCodeEmitter.prototype.a9 = function (a) {
         if (a == null) {
             return "";
         }
         return a.toString();
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.am = function (a, b) {
-        var c = this.a6(a, b);
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ao = function (a, b) {
+        var c = this.a8(a, b);
         if (b.c != null) {
             var d = b.c;
             if (typeCast(List$1.$.specialize(Base.$), d) !== null) {
@@ -392,8 +406,8 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
             }
             if (typeCast(CodeGenerationItemBuilder.$, d) !== null) {
                 var e = this.i(this.l, this.j);
-                var f = this.al(c, b.c, e);
-                c = this.ap(a, b.c, f, c);
+                var f = this.an(c, b.c, e);
+                c = this.ar(a, b.c, f, c);
             }
             else if (typeCast(Array_$type, d) !== null) {
                 var g = d;
@@ -406,7 +420,7 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
                         var m = g[j].o();
                         if (m == null) {
                             m = g[j].m();
-                            m = this.as(m);
+                            m = this.au(m);
                         }
                         if (m != null) {
                             if (m != l) {
@@ -416,17 +430,17 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
                                 l = c + "_" + j.toString();
                             }
                         }
-                        var n = this.al(l, g[j], k);
+                        var n = this.an(l, g[j], k);
                         h.add(g[j]);
                         i.add(n);
                     }
                 }
-                c = this.aq(b, a, h, i, c);
+                c = this.as(b, a, h, i, c);
             }
         }
         return c;
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.al = function (a, b, c) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.an = function (a, b, c) {
         var e_1, _a;
         b.t = a;
         b.u(c, true);
@@ -452,15 +466,15 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         }
         return d;
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ap = function (a, b, c, d) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b, c, d) {
         return d;
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.aq = function (a, b, c, d, e) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.as = function (a, b, c, d, e) {
         return e;
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.a6 = function (a, b) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.a8 = function (a, b) {
         if (b.c == null) {
-            return this.ay();
+            return this.a0();
         }
         if (typeCast(CodeGenerationItemBuilder.$, b.c) !== null) {
             var c = b.c.o();
@@ -468,7 +482,7 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
                 return c;
             }
             var d = b.c.m();
-            var e = this.as(d);
+            var e = this.au(d);
             return e;
         }
         else if (typeCast(IList_$type, b.c) !== null) {
@@ -480,10 +494,10 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
                     return h;
                 }
                 var i = g.m();
-                var j = this.as(i);
+                var j = this.au(i);
                 return j;
             }
-            return this.as(b.b.propertyName);
+            return this.au(b.b.propertyName);
         }
         else if (typeCast(Array_$type, b.c) !== null) {
             var k = b.c;
@@ -493,29 +507,29 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
                     return l;
                 }
                 var m = b.c.m();
-                var n = this.as(m);
+                var n = this.au(m);
                 return n;
             }
-            return this.as(b.b.propertyName);
+            return this.au(b.b.propertyName);
         }
-        return this.ay();
+        return this.a0();
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a, b) {
         return "";
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ae = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
         return a.c;
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.a2 = function (a) {
         if (!stringIsNullOrEmpty(a.a.e)) {
             if (a.a.a) {
-                return this.at(a);
+                return this.av(a);
             }
             else {
-                return this.az(a);
+                return this.a1(a);
             }
         }
-        return this.ay();
+        return this.a0();
     };
     CodeGeneratingComponentRendererCodeEmitter.prototype.s = function (a) {
         if (a.a != null && !stringIsNullOrEmpty(a.a.e)) {
@@ -525,30 +539,30 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         }
         return false;
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a) {
         return "";
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
         return "";
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.aw = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ay = function (a) {
         if (!stringIsNullOrEmpty(a.a.e)) {
             return a.a.e;
         }
-        return this.ay();
+        return this.a0();
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.au = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.aw = function (a) {
         return a.c != null ? a.c.toString() : "";
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ax = function (a) {
-        return this.av(a);
+    CodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
+        return this.ax(a);
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ax = function (a) {
         if (!stringIsNullOrEmpty(a.a.e)) {
-            this.bp(a);
+            this.br(a);
             return a.a.e;
         }
-        return this.ay();
+        return this.a0();
     };
     CodeGeneratingComponentRendererCodeEmitter.prototype.get_x = function () {
         return false;
@@ -560,87 +574,87 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         enumerable: false,
         configurable: true
     });
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ai = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ak = function (a) {
         var b = a.c;
         return ColorUtil.i(b, this.x);
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ah = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.aj = function (a) {
         var b = a;
         return ColorUtil.i(b, this.x);
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ai = function (a) {
         if (a.c == null) {
             return "";
         }
         var b = a.c;
         return ColorUtil.i(b.color, this.x);
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.af = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.ah = function (a) {
         if (a == null) {
             return "";
         }
         var b = a;
         return ColorUtil.i(b.color, this.x);
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bn = function (a) {
-        this.ab.h(a);
-        this.ac.h(false);
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bp = function (a) {
+        this.ad.h(a);
+        this.ae.h(false);
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bm = function (a) {
-        var b = this.as(a);
-        this.ab.h(b);
-        this.ac.h(true);
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bo = function (a) {
+        var b = this.au(a);
+        this.ad.h(b);
+        this.ae.h(true);
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.as = function (a) {
-        var b = stringReplace(stringReplace(a, this.a5, ""), "Component", "");
-        b = CodeGeneratingComponentRenderer.em(b);
+    CodeGeneratingComponentRendererCodeEmitter.prototype.au = function (a) {
+        var b = stringReplace(stringReplace(a, this.a7, ""), "Component", "");
+        b = CodeGeneratingComponentRenderer.er(b);
         return this.j.v(b);
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bk = function () {
-        this.a2 = this.ab.e();
-        this.ac.e();
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bm = function () {
+        this.a4 = this.ad.e();
+        this.ae.e();
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "";
     };
-    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "a5", {
+    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "a7", {
         get: function () {
-            return this.get_a5();
+            return this.get_a7();
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "an", {
+    Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "ap", {
         get: function () {
-            if (this.ab.f > 0) {
-                return this.ab.d();
+            if (this.ad.f > 0) {
+                return this.ad.d();
             }
-            var a = stringReplace(stringReplace(this.ao, this.a5, ""), "Component", "");
-            return CodeGeneratingComponentRenderer.em(a);
+            var a = stringReplace(stringReplace(this.aq, this.a7, ""), "Component", "");
+            return CodeGeneratingComponentRenderer.er(a);
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "v", {
         get: function () {
-            return this.ad.f == 1;
+            return this.af.f == 1;
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "o", {
         get: function () {
-            if (this.ac.f == 0) {
+            if (this.ae.f == 0) {
                 return false;
             }
-            return this.ac.d();
+            return this.ae.d();
         },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(CodeGeneratingComponentRendererCodeEmitter.prototype, "p", {
         get: function () {
-            if (this.ab.f > 0) {
+            if (this.ad.f > 0) {
                 return true;
             }
             return false;
@@ -668,33 +682,33 @@ var CodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE__*/ (fu
         enumerable: false,
         configurable: true
     });
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bl = function () {
-        this.a2 = this.ab.e();
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bn = function () {
+        this.a4 = this.ad.e();
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.be = function (a) {
         var b = this.f.toString();
         if (b.length > 0) {
             a.l(b);
         }
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bf = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a) {
         var b = this.g.toString();
         if (b.length > 0) {
             a.l(b);
         }
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bb = function (a) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bd = function (a) {
         var b = this.e.toString();
         if (b.length > 0) {
             a.l(b);
         }
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.bd = function (a, b) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bf = function (a, b) {
         if (this.aa.count > 0) {
-            this.be(a, this.aa, b);
+            this.bg(a, this.aa, b);
         }
     };
-    CodeGeneratingComponentRendererCodeEmitter.prototype.be = function (a, b, c) {
+    CodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c) {
     };
     CodeGeneratingComponentRendererCodeEmitter.$t = markType(CodeGeneratingComponentRendererCodeEmitter, 'CodeGeneratingComponentRendererCodeEmitter');
     return CodeGeneratingComponentRendererCodeEmitter;
@@ -707,9 +721,9 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
     __extends(BlazorRazorCodeGeneratingComponentRendererCodeEmitter, _super);
     function BlazorRazorCodeGeneratingComponentRendererCodeEmitter(a, b) {
         var _this = _super.call(this, a, b) || this;
-        _this.bs = 0;
-        _this.bq = new HashSet$1(String_$type, 0);
-        _this.br = new HashSet$1(String_$type, 0);
+        _this.bu = 0;
+        _this.bs = new HashSet$1(String_$type, 0);
+        _this.bt = new HashSet$1(String_$type, 0);
         return _this;
     }
     BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.get_r = function () {
@@ -722,63 +736,63 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
         enumerable: false,
         configurable: true
     });
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.ap = function (a, b, c, d) {
-        d = _super.prototype.ap.call(this, a, b, c, d);
-        this.f.l("private " + b.m() + " _" + CodeGeneratingComponentRenderer.em(d) + " = null;");
-        this.f.l("public " + b.m() + " " + CodeGeneratingComponentRenderer.en(d));
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b, c, d) {
+        d = _super.prototype.ar.call(this, a, b, c, d);
+        this.f.l("private " + b.m() + " _" + CodeGeneratingComponentRenderer.er(d) + " = null;");
+        this.f.l("public " + b.m() + " " + CodeGeneratingComponentRenderer.es(d));
         this.f.l("{");
         this.f.h();
         this.f.l("get");
         this.f.l("{");
         this.f.h();
-        this.f.l("if (this._" + CodeGeneratingComponentRenderer.em(d) + " == null)");
+        this.f.l("if (this._" + CodeGeneratingComponentRenderer.er(d) + " == null)");
         this.f.l("{");
         this.f.h();
         this.f.k(c);
-        this.f.l("this._" + CodeGeneratingComponentRenderer.em(d) + " = " + d + ";");
+        this.f.l("this._" + CodeGeneratingComponentRenderer.er(d) + " = " + d + ";");
         this.f.f();
         this.f.l("}");
-        this.f.l("return this._" + CodeGeneratingComponentRenderer.em(d) + ";");
+        this.f.l("return this._" + CodeGeneratingComponentRenderer.er(d) + ";");
         this.f.f();
         this.f.l("}");
         this.f.f();
         this.f.l("}");
-        return CodeGeneratingComponentRenderer.en(d);
+        return CodeGeneratingComponentRenderer.es(d);
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.aq = function (a, b, c, d, e) {
-        e = _super.prototype.aq.call(this, a, b, c, d, e);
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.as = function (a, b, c, d, e) {
+        e = _super.prototype.as.call(this, a, b, c, d, e);
         var f = null;
         if (c.count > 0) {
             f = c._inner[0].q() + "[]";
         }
         else {
             var g = a.b.specificExternalType;
-            f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.aj, this.ak) + "[]";
+            f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.al, this.am) + "[]";
         }
-        this.f.l("private " + f + " _" + CodeGeneratingComponentRenderer.em(e) + " = null;");
-        this.f.l("public " + f + " " + CodeGeneratingComponentRenderer.en(e));
+        this.f.l("private " + f + " _" + CodeGeneratingComponentRenderer.er(e) + " = null;");
+        this.f.l("public " + f + " " + CodeGeneratingComponentRenderer.es(e));
         this.f.l("{");
         this.f.h();
         this.f.l("get");
         this.f.l("{");
         this.f.h();
-        this.f.l("if (this._" + CodeGeneratingComponentRenderer.em(e) + " == null)");
+        this.f.l("if (this._" + CodeGeneratingComponentRenderer.er(e) + " == null)");
         this.f.l("{");
         this.f.h();
-        this.f.k("var " + CodeGeneratingComponentRenderer.em(e) + " = new " + stringReplace(f, "[]", "") + "[" + c.count + "];");
+        this.f.k("var " + CodeGeneratingComponentRenderer.er(e) + " = new " + stringReplace(f, "[]", "") + "[" + c.count + "];");
         for (var h = 0; h < c.count; h++) {
             this.f.k(d._inner[h]);
             this.f.k(e + "[" + h + "] = " + c._inner[h].t + ";");
         }
-        this.f.l("this._" + CodeGeneratingComponentRenderer.em(e) + " = " + e + ";");
+        this.f.l("this._" + CodeGeneratingComponentRenderer.er(e) + " = " + e + ";");
         this.f.f();
         this.f.l("}");
-        this.f.l("return this._" + CodeGeneratingComponentRenderer.em(e) + ";");
+        this.f.l("return this._" + CodeGeneratingComponentRenderer.er(e) + ";");
         this.f.f();
         this.f.l("}");
         this.f.f();
         this.f.l("}");
-        return CodeGeneratingComponentRenderer.en(e);
+        return CodeGeneratingComponentRenderer.es(e);
     };
     BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.i = function (a, b) {
         return new BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
@@ -786,7 +800,7 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
     BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.get_y = function () {
         return false;
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bt = function (a, b, c) {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bv = function (a, b, c) {
         if (c.c == null) {
             return "null";
         }
@@ -812,7 +826,7 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
             f.b.knownType = 1;
         }
         if (f.b.knownType == 8) {
-            e = this.a5 + e;
+            e = this.a7 + e;
         }
         var g = "@(new " + e + "[] { ";
         for (var h = 0; h < d.length; h++) {
@@ -821,55 +835,55 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
             }
             f.c = d[h];
             if (f.b.knownType == 2) {
-                g += "\"" + this.a1(a, f, true) + "\"";
+                g += "\"" + this.a3(a, f, true) + "\"";
             }
             else {
-                g += this.a1(a, f, true);
+                g += this.a3(a, f, true);
             }
         }
         g += " })";
         return g;
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b) {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a, b) {
         var c = b.b.specificType;
         if (c == null) {
             c = b.b.specificExternalType;
         }
-        return this.bt(a, c, b);
+        return this.bv(a, c, b);
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.ba = function (a, b, c) {
-        _super.prototype.ba.call(this, a, b, c);
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a, b, c) {
+        _super.prototype.bc.call(this, a, b, c);
         this.h.l("<" + a + "");
-        if (!this.bq.contains(this.an)) {
-            this.bq.add_1(this.an);
-            if (!this.br.contains(this.ao)) {
-                this.br.add_1(this.ao);
-                this.a9(this.ao);
+        if (!this.bs.contains(this.ap)) {
+            this.bs.add_1(this.ap);
+            if (!this.bt.contains(this.aq)) {
+                this.bt.add_1(this.aq);
+                this.bb(this.aq);
             }
-            this.f.l("private " + this.ao + " " + CodeGeneratingComponentRenderer.em(this.an) + ";");
+            this.f.l("private " + this.aq + " " + CodeGeneratingComponentRenderer.er(this.ap) + ";");
             if (!this.p) {
                 if (this.v) {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + ";");
                 }
             }
             else {
-                this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + ";");
+                this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + ";");
             }
         }
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bo = function () {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function () {
         this.h.l(">");
         this.h.h();
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a) {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bl = function (a) {
         this.h.f();
         this.h.l("</" + a + ">");
         this.h.l("");
-        _super.prototype.bj.call(this, a);
+        _super.prototype.bl.call(this, a);
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c, d) {
-        if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.en(c.b.propertyName)) && this.q(d, c)) {
-            this.bp(c);
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a, b, c, d) {
+        if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.es(c.b.propertyName)) && this.q(d, c)) {
+            this.br(c);
             if (a > 0) {
                 this.h.l("");
             }
@@ -882,29 +896,29 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
             return;
         }
         if (this.s(c)) {
-            this.bp(c);
-            if (!this.bq.contains(this.an)) {
-                this.bq.add_1(this.an);
-                if (!this.br.contains(this.ao)) {
-                    this.br.add_1(this.ao);
-                    this.a9(this.ao);
-                }
-                this.f.l("private " + this.ao + " " + CodeGeneratingComponentRenderer.em(this.an) + ";");
+            this.br(c);
+            if (!this.bs.contains(this.ap)) {
+                this.bs.add_1(this.ap);
+                if (!this.bt.contains(this.aq)) {
+                    this.bt.add_1(this.aq);
+                    this.bb(this.aq);
+                }
+                this.f.l("private " + this.aq + " " + CodeGeneratingComponentRenderer.er(this.ap) + ";");
                 if (!this.p) {
                     if (this.v) {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + ";");
+                        this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + ";");
                     }
                 }
                 else {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + ";");
                 }
             }
-            var e = CodeGeneratingComponentRenderer.em(this.a1(d, c, true));
+            var e = CodeGeneratingComponentRenderer.er(this.a3(d, c, true));
             var f = e;
             if (f != "null" && !stringStartsWith(f, "this.")) {
                 f = "this." + f;
             }
-            this.e.l(CodeGeneratingComponentRenderer.em(this.an) + "." + b + " = " + f + ";");
+            this.e.l(CodeGeneratingComponentRenderer.er(this.ap) + "." + b + " = " + f + ";");
             return;
         }
         if (a > 0) {
@@ -931,24 +945,24 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
             this.h.j(b);
             this.h.j("=");
             this.h.j("\"");
-            this.h.j(this.a1(d, c, true));
+            this.h.j(this.a3(d, c, true));
             this.h.j("\"");
         }
         if (b == "Name") {
             this.h.l("");
-            this.h.j("@ref=\"" + CodeGeneratingComponentRenderer.em(this.a1(d, c, true)) + "\"");
+            this.h.j("@ref=\"" + CodeGeneratingComponentRenderer.er(this.a3(d, c, true)) + "\"");
         }
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.au = function (a) {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.aw = function (a) {
         var b = a.b != null ? a.b.specificType + "." : "";
         return b + (a.c != null ? a.c.toString() : "");
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a, b, c) {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.a3 = function (a, b, c) {
         if (b.b == null) {
             return b.c;
         }
         if (typeCast(CodeGenerationSpecialValue.$, b.c) !== null) {
-            b.c = this.ae(b);
+            b.c = this.ag(b);
         }
         switch (b.b.knownType) {
             case 11:
@@ -978,9 +992,9 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
                 }
                 return b.c.toString();
         }
-        return _super.prototype.a1.call(this, a, b, c);
+        return _super.prototype.a3.call(this, a, b, c);
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.ae = function (a) {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
         var b = a.c;
         switch (b.a) {
             case 3: return b.b;
@@ -990,21 +1004,21 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
         }
         return b.b;
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.ay = function () {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function () {
         return "@null";
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a) {
-        return CodeGeneratingComponentRenderer.em(CodeGeneratingComponentRenderer.em(a.a.e));
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+        return CodeGeneratingComponentRenderer.er(CodeGeneratingComponentRenderer.er(a.a.e));
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bu = function (a) {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bw = function (a) {
         a = stringReplace(a, "-", "_");
-        return CodeGeneratingComponentRenderer.en(a);
+        return CodeGeneratingComponentRenderer.es(a);
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
-        this.bp(a);
-        return CodeGeneratingComponentRenderer.en(a.a.e);
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a) {
+        this.br(a);
+        return CodeGeneratingComponentRenderer.es(a.a.e);
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a, b, c, d) {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a, b, c, d) {
         var e_2, _a;
         if (c.b.knownType == 9) {
             var e = typeCast(IList_$type, c.c);
@@ -1040,7 +1054,7 @@ var BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
             }
         }
     };
-    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    BlazorRazorCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Igb";
     };
     BlazorRazorCodeGeneratingComponentRendererCodeEmitter.$t = markType(BlazorRazorCodeGeneratingComponentRendererCodeEmitter, 'BlazorRazorCodeGeneratingComponentRendererCodeEmitter', CodeGeneratingComponentRendererCodeEmitter.$);
@@ -1054,9 +1068,9 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
     __extends(BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter, _super);
     function BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b) {
         var _this = _super.call(this, a, b) || this;
-        _this.bs = 0;
-        _this.bq = new HashSet$1(String_$type, 0);
-        _this.br = new HashSet$1(String_$type, 0);
+        _this.bu = 0;
+        _this.bs = new HashSet$1(String_$type, 0);
+        _this.bt = new HashSet$1(String_$type, 0);
         return _this;
     }
     BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_r = function () {
@@ -1075,7 +1089,7 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
     BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_y = function () {
         return false;
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bt = function (a, b) {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bv = function (a, b) {
         if (b.c == null) {
             return "null";
         }
@@ -1090,9 +1104,9 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
         d += " }";
         return d;
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b) {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a, b) {
         if (b.b.specificExternalType == "string") {
-            return this.bt(b.b.specificExternalType, b);
+            return this.bv(b.b.specificExternalType, b);
         }
         if (b.c == null) {
             return "null";
@@ -1107,74 +1121,74 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
         }
         return d;
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ba = function (a, b, c) {
-        _super.prototype.ba.call(this, a, b, c);
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a, b, c) {
+        _super.prototype.bc.call(this, a, b, c);
         if (this.v) {
-            this.h.l("var " + this.an + " = new " + a + "();");
+            this.h.l("var " + this.ap + " = new " + a + "();");
         }
         else {
-            this.h.l("var " + this.an + " = new " + a + "();");
+            this.h.l("var " + this.ap + " = new " + a + "();");
         }
-        if (!this.bq.contains(this.an)) {
-            this.bq.add_1(this.an);
-            if (!this.br.contains(this.ao)) {
-                this.br.add_1(this.ao);
-                this.a9(this.ao);
+        if (!this.bs.contains(this.ap)) {
+            this.bs.add_1(this.ap);
+            if (!this.bt.contains(this.aq)) {
+                this.bt.add_1(this.aq);
+                this.bb(this.aq);
             }
-            this.f.l("private " + this.ao + " " + CodeGeneratingComponentRenderer.em(this.an) + ";");
+            this.f.l("private " + this.aq + " " + CodeGeneratingComponentRenderer.er(this.ap) + ";");
             if (!this.p) {
                 if (this.v) {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + ";");
                 }
             }
             else {
-                this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + ";");
+                this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + ";");
             }
         }
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bo = function () {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function () {
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a) {
-        _super.prototype.bj.call(this, a);
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bl = function (a) {
+        _super.prototype.bl.call(this, a);
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c, d) {
-        if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.en(c.b.propertyName)) && this.q(d, c)) {
-            this.bp(c);
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a, b, c, d) {
+        if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.es(c.b.propertyName)) && this.q(d, c)) {
+            this.br(c);
             if (a > 0) {
                 this.h.l("");
             }
             if (c.a == null || c.a.e == null) {
-                this.h.j(this.an + "." + b + "Name = null;");
+                this.h.j(this.ap + "." + b + "Name = null;");
             }
             else {
-                this.h.j(this.an + "." + b + "Name = " + c.a.e + ";");
+                this.h.j(this.ap + "." + b + "Name = " + c.a.e + ";");
             }
             return;
         }
         if (this.s(c)) {
-            this.bp(c);
-            if (!this.bq.contains(this.an)) {
-                this.bq.add_1(this.an);
-                if (!this.br.contains(this.ao)) {
-                    this.br.add_1(this.ao);
-                    this.a9(this.ao);
-                }
-                this.f.l("private " + this.ao + " " + CodeGeneratingComponentRenderer.em(this.an) + ";");
+            this.br(c);
+            if (!this.bs.contains(this.ap)) {
+                this.bs.add_1(this.ap);
+                if (!this.bt.contains(this.aq)) {
+                    this.bt.add_1(this.aq);
+                    this.bb(this.aq);
+                }
+                this.f.l("private " + this.aq + " " + CodeGeneratingComponentRenderer.er(this.ap) + ";");
                 if (!this.p) {
                     if (this.v) {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + ";");
+                        this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + ";");
                     }
                 }
                 else {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + ";");
                 }
             }
-            var e = CodeGeneratingComponentRenderer.em(this.a1(d, c, true));
+            var e = CodeGeneratingComponentRenderer.er(this.a3(d, c, true));
             var f = e;
             if (f != "null" && !stringStartsWith(f, "this.")) {
                 f = "this." + f;
             }
-            this.e.l(CodeGeneratingComponentRenderer.em(this.an) + "." + b + " = " + f + ";");
+            this.e.l(CodeGeneratingComponentRenderer.er(this.ap) + "." + b + " = " + f + ";");
             return;
         }
         if (a > 0) {
@@ -1200,28 +1214,28 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
                     }
                 }
             }
-            this.h.j(this.an + ".");
+            this.h.j(this.ap + ".");
             this.h.j(b);
             this.h.j(" = ");
             if (h) {
-                this.h.j("\"" + this.a1(d, c, true) + "\"");
+                this.h.j("\"" + this.a3(d, c, true) + "\"");
             }
             else {
-                this.h.j(this.a1(d, c, true));
+                this.h.j(this.a3(d, c, true));
             }
             this.h.j(";");
         }
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.au = function (a) {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.aw = function (a) {
         var b = a.b != null ? a.b.specificType + "." : "";
         return b + (a.c != null ? a.c.toString() : "");
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a, b, c) {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a3 = function (a, b, c) {
         if (b.b == null) {
             return "\"" + b.c + "\"";
         }
         if (typeCast(CodeGenerationSpecialValue.$, b.c) !== null) {
-            b.c = this.ae(b);
+            b.c = this.ag(b);
         }
         switch (b.b.knownType) {
             case 11:
@@ -1253,12 +1267,12 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
             case 5:
             case 6:
             case 16:
-            case 2: return "\"" + _super.prototype.a1.call(this, a, b, c) + "\"";
+            case 2: return "\"" + _super.prototype.a3.call(this, a, b, c) + "\"";
             case 9: throw new NotSupportedException(1, "shouldn't get here");
         }
-        return _super.prototype.a1.call(this, a, b, c);
+        return _super.prototype.a3.call(this, a, b, c);
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ae = function (a) {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
         var b = a.c;
         switch (b.a) {
             case 3: return b.b;
@@ -1268,21 +1282,21 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
         }
         return b.b;
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ay = function () {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function () {
         return "null";
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a) {
-        return CodeGeneratingComponentRenderer.em(CodeGeneratingComponentRenderer.em(a.a.e));
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+        return CodeGeneratingComponentRenderer.er(CodeGeneratingComponentRenderer.er(a.a.e));
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bu = function (a) {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bw = function (a) {
         a = stringReplace(a, "-", "_");
-        return CodeGeneratingComponentRenderer.en(a);
+        return CodeGeneratingComponentRenderer.es(a);
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
-        this.bp(a);
-        return CodeGeneratingComponentRenderer.en(a.a.e);
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a) {
+        this.br(a);
+        return CodeGeneratingComponentRenderer.es(a.a.e);
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a, b, c, d) {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a, b, c, d) {
         var e_3, _a;
         if (c.b.knownType == 9) {
             var e = typeCast(IList_$type, c.c);
@@ -1293,7 +1307,7 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
                         if (typeCast(CodeGenerationItemBuilder.$, f) !== null) {
                             var g = f;
                             g.u(this, false);
-                            this.h.l(this.an + "." + b + ".Add(" + this.a2 + ");");
+                            this.h.l(this.ap + "." + b + ".Add(" + this.a4 + ");");
                         }
                     }
                 }
@@ -1316,11 +1330,11 @@ var BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /
             if (typeCast(CodeGenerationItemBuilder.$, c.c) !== null) {
                 var h = c.c;
                 h.u(this, false);
-                this.h.l(this.an + "." + b + " = " + this.a2 + ";");
+                this.h.l(this.ap + "." + b + " = " + this.a4 + ";");
             }
         }
     };
-    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Igb";
     };
     BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter.$t = markType(BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter, 'BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter', CodeGeneratingComponentRendererCodeEmitter.$);
@@ -1334,8 +1348,8 @@ var ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
     __extends(ReactMarkupCodeGeneratingComponentRendererCodeEmitter, _super);
     function ReactMarkupCodeGeneratingComponentRendererCodeEmitter(a, b) {
         var _this = _super.call(this, a, b) || this;
-        _this.bq = new HashSet$1(String_$type, 0);
-        _this.br = new HashSet$1(String_$type, 0);
+        _this.bs = new HashSet$1(String_$type, 0);
+        _this.bt = new HashSet$1(String_$type, 0);
         return _this;
     }
     ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.get_r = function () {
@@ -1348,57 +1362,57 @@ var ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
         enumerable: false,
         configurable: true
     });
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ap = function (a, b, c, d) {
-        d = _super.prototype.ap.call(this, a, b, c, d);
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b, c, d) {
+        d = _super.prototype.ar.call(this, a, b, c, d);
         var e = b.q();
-        this.f.l("private " + " _" + CodeGeneratingComponentRenderer.em(d) + ": " + e + " | null = null;");
-        this.f.l("public get " + CodeGeneratingComponentRenderer.em(d) + "(): " + e + " {");
+        this.f.l("private " + " _" + CodeGeneratingComponentRenderer.er(d) + ": " + e + " | null = null;");
+        this.f.l("public get " + CodeGeneratingComponentRenderer.er(d) + "(): " + e + " {");
         this.f.h();
-        this.f.l("if (this._" + CodeGeneratingComponentRenderer.em(d) + " == null)");
+        this.f.l("if (this._" + CodeGeneratingComponentRenderer.er(d) + " == null)");
         this.f.l("{");
         this.f.h();
         this.f.k(c);
-        this.f.l("this._" + CodeGeneratingComponentRenderer.em(d) + " = " + d + ";");
+        this.f.l("this._" + CodeGeneratingComponentRenderer.er(d) + " = " + d + ";");
         this.f.f();
         this.f.l("}");
-        this.f.l("return this._" + CodeGeneratingComponentRenderer.em(d) + ";");
+        this.f.l("return this._" + CodeGeneratingComponentRenderer.er(d) + ";");
         this.f.f();
         this.f.l("}");
-        return CodeGeneratingComponentRenderer.en(d);
+        return CodeGeneratingComponentRenderer.es(d);
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.aq = function (a, b, c, d, e) {
-        e = _super.prototype.aq.call(this, a, b, c, d, e);
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.as = function (a, b, c, d, e) {
+        e = _super.prototype.as.call(this, a, b, c, d, e);
         var f = null;
         if (c.count > 0) {
             f = c._inner[0].q() + "[]";
         }
         else {
             var g = a.b.specificExternalType;
-            f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.aj, this.ak) + "[]";
+            f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.al, this.am) + "[]";
         }
-        this.f.l("private" + " _" + CodeGeneratingComponentRenderer.em(e) + ": " + f + " | null = null;");
-        this.f.l("public get " + CodeGeneratingComponentRenderer.em(e) + "(): " + f + " {");
+        this.f.l("private" + " _" + CodeGeneratingComponentRenderer.er(e) + ": " + f + " | null = null;");
+        this.f.l("public get " + CodeGeneratingComponentRenderer.er(e) + "(): " + f + " {");
         this.f.h();
-        this.f.l("if (this._" + CodeGeneratingComponentRenderer.em(e) + " == null)");
+        this.f.l("if (this._" + CodeGeneratingComponentRenderer.er(e) + " == null)");
         this.f.l("{");
         this.f.h();
-        this.f.k("let " + CodeGeneratingComponentRenderer.em(e) + ": " + f + " = [];");
+        this.f.k("let " + CodeGeneratingComponentRenderer.er(e) + ": " + f + " = [];");
         for (var h = 0; h < c.count; h++) {
             this.f.k(d._inner[h]);
             this.f.k(e + ".push(" + c._inner[h].t + ")");
         }
-        this.f.l("this._" + CodeGeneratingComponentRenderer.em(e) + " = " + e + ";");
+        this.f.l("this._" + CodeGeneratingComponentRenderer.er(e) + " = " + e + ";");
         this.f.f();
         this.f.l("}");
-        this.f.l("return this._" + CodeGeneratingComponentRenderer.em(e) + ";");
+        this.f.l("return this._" + CodeGeneratingComponentRenderer.er(e) + ";");
         this.f.f();
         this.f.l("}");
-        return CodeGeneratingComponentRenderer.en(e);
+        return CodeGeneratingComponentRenderer.es(e);
     };
     ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.i = function (a, b) {
         return new ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b) {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a, b) {
         if (b.c == null) {
             return "{null}";
         }
@@ -1432,40 +1446,40 @@ var ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
     ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.get_x = function () {
         return true;
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Igr";
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ba = function (a, b, c) {
-        _super.prototype.ba.call(this, a, b, c);
-        this.h.l("<" + this.bt(a) + "");
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a, b, c) {
+        _super.prototype.bc.call(this, a, b, c);
+        this.h.l("<" + this.bv(a) + "");
         this.h.h();
-        if (!this.br.contains(this.ao)) {
-            this.br.add_1(this.ao);
-            this.a9(this.ao);
+        if (!this.bt.contains(this.aq)) {
+            this.bt.add_1(this.aq);
+            this.bb(this.aq);
         }
-        if (!this.bq.contains(this.an)) {
-            this.bq.add_1(this.an);
-            this.f.l("private " + CodeGeneratingComponentRenderer.em(this.an) + ": " + this.ao);
+        if (!this.bs.contains(this.ap)) {
+            this.bs.add_1(this.ap);
+            this.f.l("private " + CodeGeneratingComponentRenderer.er(this.ap) + ": " + this.aq);
             if (this.v) {
-                this.f.l("private " + CodeGeneratingComponentRenderer.em(this.an) + "Ref(r: " + this.ao + ") {");
+                this.f.l("private " + CodeGeneratingComponentRenderer.er(this.ap) + "Ref(r: " + this.aq + ") {");
                 this.f.h();
-                this.f.l("this." + CodeGeneratingComponentRenderer.em(this.an) + " = r;");
+                this.f.l("this." + CodeGeneratingComponentRenderer.er(this.ap) + " = r;");
                 this.f.l("this.setState({});");
                 this.f.f();
                 this.f.l("}");
-                this.g.l("this." + CodeGeneratingComponentRenderer.em(this.an) + "Ref = " + "this." + CodeGeneratingComponentRenderer.em(this.an) + "Ref.bind(this);");
+                this.g.l("this." + CodeGeneratingComponentRenderer.er(this.ap) + "Ref = " + "this." + CodeGeneratingComponentRenderer.er(this.ap) + "Ref.bind(this);");
             }
         }
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bt = function (a) {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bv = function (a) {
         if (stringEndsWith(a, "Component")) {
             a = a.substr(0, a.length - ("Component").length);
         }
-        return CodeGeneratingComponentRenderer.en(a);
+        return CodeGeneratingComponentRenderer.es(a);
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bo = function () {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function () {
         if (!this.v && !this.p) {
-            var a = this.bs();
+            var a = this.bu();
             this.h.l("");
             this.h.l("name=\"" + a + "\"");
         }
@@ -1473,31 +1487,31 @@ var ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
         this.h.l(">");
         this.h.h();
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bs = function () {
-        var a = CodeGeneratingComponentRenderer.em(stringReplace(stringReplace(this.ao, this.a5, ""), "Component", ""));
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bu = function () {
+        var a = CodeGeneratingComponentRenderer.er(stringReplace(stringReplace(this.aq, this.a7, ""), "Component", ""));
         a = this.k.u(a);
         return a;
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ax = function (a) {
         if (!stringIsNullOrEmpty(a.a.e)) {
-            this.bp(a);
-            if (!this.bq.contains(a.a.e)) {
-                this.g.l("this." + CodeGeneratingComponentRenderer.em(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.em(a.a.e) + ".bind(this);");
+            this.br(a);
+            if (!this.bs.contains(a.a.e)) {
+                this.g.l("this." + CodeGeneratingComponentRenderer.er(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.er(a.a.e) + ".bind(this);");
             }
-            return "this." + CodeGeneratingComponentRenderer.em(a.a.e);
+            return "this." + CodeGeneratingComponentRenderer.er(a.a.e);
         }
-        return this.ay();
+        return this.a0();
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a) {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bl = function (a) {
         this.h.f();
-        this.h.l("</" + this.bt(a) + ">");
-        _super.prototype.bj.call(this, a);
-    };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c, d) {
-        var e = CodeGeneratingComponentRenderer.em(b);
-        var f = this.a1(d, c, true);
-        if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.en(c.b.propertyName)) && this.q(d, c)) {
-            this.bp(c);
+        this.h.l("</" + this.bv(a) + ">");
+        _super.prototype.bl.call(this, a);
+    };
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a, b, c, d) {
+        var e = CodeGeneratingComponentRenderer.er(b);
+        var f = this.a3(d, c, true);
+        if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.es(c.b.propertyName)) && this.q(d, c)) {
+            this.br(c);
             if (a > 0) {
                 this.h.l("");
             }
@@ -1512,8 +1526,8 @@ var ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
         if (!(e == "name") || !this.v) {
             var g = (c.b != null && c.b.knownType == 10);
             if (this.q(d, c)) {
-                this.bp(c);
-                var h = CodeGeneratingComponentRenderer.em(f);
+                this.br(c);
+                var h = CodeGeneratingComponentRenderer.er(f);
                 var i = h;
                 if (i != "null" && !stringStartsWith(i, "this.")) {
                     i = "this." + i;
@@ -1542,11 +1556,11 @@ var ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
                 if (a > 0) {
                     this.h.l("");
                 }
-                this.h.j("ref={this." + CodeGeneratingComponentRenderer.em(this.a1(d, c, true)) + "Ref}");
+                this.h.j("ref={this." + CodeGeneratingComponentRenderer.er(this.a3(d, c, true)) + "Ref}");
             }
         }
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ae = function (a) {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
         var b = a.c;
         switch (b.a) {
             case 3: return b.b;
@@ -1556,16 +1570,16 @@ var ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
         }
         return b.b;
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ay = function () {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function () {
         return "null";
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a) {
-        return "this." + CodeGeneratingComponentRenderer.em(a.a.e);
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+        return "this." + CodeGeneratingComponentRenderer.er(a.a.e);
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
-        return "this." + CodeGeneratingComponentRenderer.em(a.a.e);
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a) {
+        return "this." + CodeGeneratingComponentRenderer.er(a.a.e);
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a, b, c, d) {
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a, b, c, d) {
         var e_4, _a;
         if (c.b.knownType == 9) {
             var e = typeCast(IList_$type, c.c);
@@ -1601,9 +1615,9 @@ var ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__P
             }
         }
     };
-    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.be = function (a, b, c) {
-        _super.prototype.be.call(this, a, b, c);
-        WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
+    ReactMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c) {
+        _super.prototype.bg.call(this, a, b, c);
+        WebImportsHalper.b(this.k, this.a6, this.a5, this.a7, a, b, c);
     };
     ReactMarkupCodeGeneratingComponentRendererCodeEmitter.$t = markType(ReactMarkupCodeGeneratingComponentRendererCodeEmitter, 'ReactMarkupCodeGeneratingComponentRendererCodeEmitter', CodeGeneratingComponentRendererCodeEmitter.$);
     return ReactMarkupCodeGeneratingComponentRendererCodeEmitter;
@@ -1616,9 +1630,9 @@ var WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
     __extends(WebCodeBehindCodeGeneratingComponentRendererCodeEmitter, _super);
     function WebCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b) {
         var _this = _super.call(this, a, b) || this;
-        _this.bt = 0;
-        _this.br = new HashSet$1(String_$type, 0);
-        _this.bs = new HashSet$1(String_$type, 0);
+        _this.bv = 0;
+        _this.bt = new HashSet$1(String_$type, 0);
+        _this.bu = new HashSet$1(String_$type, 0);
         return _this;
     }
     WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_r = function () {
@@ -1631,42 +1645,42 @@ var WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
         enumerable: false,
         configurable: true
     });
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function (a) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bs = function (a) {
         if (!a.b.owningContext.hasStringUnionPlatforms(a.b.owningType, a.b.propertyName)) {
             return false;
         }
         var b = a.b.owningContext.getStringUnionPlatforms(a.b.owningType, a.b.propertyName);
         for (var c = 0; c < b.length; c++) {
-            if (b[c].toLowerCase() == this.a4) {
+            if (b[c].toLowerCase() == this.a6) {
                 return true;
             }
         }
         return false;
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.au = function (a) {
-        if (this.bq(a)) {
-            return "\"" + CodeGeneratingComponentRenderer.eo(a.c.toString()) + "\"";
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.aw = function (a) {
+        if (this.bs(a)) {
+            return "\"" + CodeGeneratingComponentRenderer.et(a.c.toString()) + "\"";
         }
         else {
-            if (!this.bs.contains(a.b.specificType)) {
-                this.bs.add_1(a.b.specificType);
+            if (!this.bu.contains(a.b.specificType)) {
+                this.bu.add_1(a.b.specificType);
                 if (a.b.owningContext.getMetadata(a.b.owningType, "__importTypes" + EnumUtil.getName(CodeGenerationTargetPlatforms_$type, this.k.platform)) != null) {
                     var b = a.b.owningContext.getMetadata(a.b.owningType, "__importTypes" + EnumUtil.getName(CodeGenerationTargetPlatforms_$type, this.k.platform)).specificExternalType;
-                    this.a9(a.b.specificType + ":" + b);
+                    this.bb(a.b.specificType + ":" + b);
                 }
                 else if (a.b.owningContext.getMetadata("Web" + a.b.owningType, "__importTypes" + EnumUtil.getName(CodeGenerationTargetPlatforms_$type, this.k.platform)) != null) {
                     var c = a.b.owningContext.getMetadata("Web" + a.b.owningType, "__importTypes" + EnumUtil.getName(CodeGenerationTargetPlatforms_$type, this.k.platform)).specificExternalType;
-                    this.a9(a.b.specificType + ":" + c);
+                    this.bb(a.b.specificType + ":" + c);
                 }
                 else {
-                    this.a9(a.b.specificType);
+                    this.bb(a.b.specificType);
                 }
             }
             var d = a.b != null ? a.b.specificType + "." : "";
             return d + (a.c != null ? a.c.toString() : "");
         }
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a, b) {
         if (b.c == null) {
             return "null";
         }
@@ -1683,96 +1697,96 @@ var WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
     WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_x = function () {
         return true;
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ba = function (a, b, c) {
-        _super.prototype.ba.call(this, a, b, c);
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a, b, c) {
+        _super.prototype.bc.call(this, a, b, c);
         var d = this.u(b, c);
         if (d) {
             if (this.v) {
-                this.h.l("var " + this.an + ": " + a + " = {} as " + a + ";");
+                this.h.l("var " + this.ap + ": " + a + " = {} as " + a + ";");
             }
             else {
-                this.h.l("var " + this.an + ": " + a + " = {} as " + a + ";");
+                this.h.l("var " + this.ap + ": " + a + " = {} as " + a + ";");
             }
         }
         else {
             if (this.v) {
-                this.h.l("var " + this.an + " = new " + a + "();");
+                this.h.l("var " + this.ap + " = new " + a + "();");
             }
             else {
-                this.h.l("var " + this.an + " = new " + a + "();");
+                this.h.l("var " + this.ap + " = new " + a + "();");
             }
         }
-        if (!this.br.contains(this.an)) {
-            this.br.add_1(this.an);
-            if (!this.bs.contains(this.ao)) {
-                this.bs.add_1(this.ao);
-                this.a9(this.ao);
+        if (!this.bt.contains(this.ap)) {
+            this.bt.add_1(this.ap);
+            if (!this.bu.contains(this.aq)) {
+                this.bu.add_1(this.aq);
+                this.bb(this.aq);
             }
-            this.f.l("private " + CodeGeneratingComponentRenderer.em(this.an) + ": " + this.ao);
+            this.f.l("private " + CodeGeneratingComponentRenderer.er(this.ap) + ": " + this.aq);
             if (!this.p) {
                 if (this.v) {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + " = document.querySelector('" + CodeGeneratingComponentRenderer.ep(stringReplace(this.ao, "Component", "")) + "') as " + this.ao + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + " = document.querySelector('" + CodeGeneratingComponentRenderer.eu(stringReplace(this.aq, "Component", "")) + "') as " + this.aq + ";");
                 }
             }
             else {
-                this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + " = document.getElementById('" + this.an + "') as " + this.ao + ";");
+                this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + " = document.getElementById('" + this.ap + "') as " + this.aq + ";");
             }
         }
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bu = function (a) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bw = function (a) {
         if (stringEndsWith(a, "Component")) {
             a = a.substr(0, a.length - ("Component").length);
         }
-        return CodeGeneratingComponentRenderer.ep(a);
+        return CodeGeneratingComponentRenderer.eu(a);
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bo = function () {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function () {
         this.h.l("");
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bk = function (a) {
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bl = function (a) {
         {
             this.h.l("");
         }
-        _super.prototype.bj.call(this, a);
+        _super.prototype.bl.call(this, a);
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c, d) {
-        var e = CodeGeneratingComponentRenderer.em(b);
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a, b, c, d) {
+        var e = CodeGeneratingComponentRenderer.er(b);
         if (e == "name" && c.b == null) {
             return;
         }
         if (this.s(c)) {
-            this.bp(c);
-            if (!this.br.contains(this.an)) {
-                this.br.add_1(this.an);
-                if (!this.bs.contains(this.ao)) {
-                    this.bs.add_1(this.ao);
-                    this.a9(this.ao);
-                }
-                this.f.l("private " + CodeGeneratingComponentRenderer.em(this.an) + ": " + this.ao);
+            this.br(c);
+            if (!this.bt.contains(this.ap)) {
+                this.bt.add_1(this.ap);
+                if (!this.bu.contains(this.aq)) {
+                    this.bu.add_1(this.aq);
+                    this.bb(this.aq);
+                }
+                this.f.l("private " + CodeGeneratingComponentRenderer.er(this.ap) + ": " + this.aq);
                 if (!this.p) {
                     if (this.v) {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + " = document.querySelector('" + CodeGeneratingComponentRenderer.ep(stringReplace(this.ao, "Component", "")) + "') as " + this.ao + ";");
+                        this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + " = document.querySelector('" + CodeGeneratingComponentRenderer.eu(stringReplace(this.aq, "Component", "")) + "') as " + this.aq + ";");
                     }
                 }
                 else {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + " = document.getElementById('" + this.an + "') as " + this.ao + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + " = document.getElementById('" + this.ap + "') as " + this.aq + ";");
                 }
             }
-            var f = CodeGeneratingComponentRenderer.em(this.a1(d, c, true));
+            var f = CodeGeneratingComponentRenderer.er(this.a3(d, c, true));
             var g = f;
             if (g != "null" && !stringStartsWith(g, "this.")) {
                 g = "this." + g;
             }
-            if (this.ao == "any" && stringContains(e, "-")) {
-                this.e.l(CodeGeneratingComponentRenderer.em(this.an) + "['" + e + "'] = " + g + ";");
+            if (this.aq == "any" && stringContains(e, "-")) {
+                this.e.l(CodeGeneratingComponentRenderer.er(this.ap) + "['" + e + "'] = " + g + ";");
             }
             else {
                 if (c.b != null && c.b.isCustomEvent) {
-                    this.e.l(CodeGeneratingComponentRenderer.em(this.an) + ".addEventListener(\"" + e + "\", " + g + ");");
+                    this.e.l(CodeGeneratingComponentRenderer.er(this.ap) + ".addEventListener(\"" + e + "\", " + g + ");");
                 }
                 else {
-                    this.e.l(CodeGeneratingComponentRenderer.em(this.an) + "." + e + " = " + g + ";");
+                    this.e.l(CodeGeneratingComponentRenderer.er(this.ap) + "." + e + " = " + g + ";");
                 }
             }
             return;
@@ -1780,17 +1794,17 @@ var WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
         if (a > 0) {
             this.h.l("");
         }
-        if (this.ao == "any" && stringContains(e, "-")) {
-            this.h.j(this.an + "." + CodeGeneratingComponentRenderer.em(this.an) + "['" + e + "']");
+        if (this.aq == "any" && stringContains(e, "-")) {
+            this.h.j(this.ap + "." + CodeGeneratingComponentRenderer.er(this.ap) + "['" + e + "']");
         }
         else {
-            this.h.j(this.an + "." + CodeGeneratingComponentRenderer.em(e));
+            this.h.j(this.ap + "." + CodeGeneratingComponentRenderer.er(e));
         }
         this.h.j(" = ");
-        this.h.j(this.a1(d, c, true));
+        this.h.j(this.a3(d, c, true));
         this.h.j(";");
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ae = function (a) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
         var b = a.c;
         switch (b.a) {
             case 3: return b.b;
@@ -1800,31 +1814,31 @@ var WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
         }
         return b.b;
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ay = function () {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function () {
         return "null";
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a) {
-        return CodeGeneratingComponentRenderer.em(a.a.e);
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+        return CodeGeneratingComponentRenderer.er(a.a.e);
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
-        return CodeGeneratingComponentRenderer.em(a.a.e);
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a) {
+        return CodeGeneratingComponentRenderer.er(a.a.e);
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.ax = function (a) {
         if (!stringIsNullOrEmpty(a.a.e)) {
-            this.bp(a);
-            if (!this.br.contains(a.a.e)) {
-                this.g.l("this." + CodeGeneratingComponentRenderer.em(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.em(a.a.e) + ".bind(this);");
+            this.br(a);
+            if (!this.bt.contains(a.a.e)) {
+                this.g.l("this." + CodeGeneratingComponentRenderer.er(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.er(a.a.e) + ".bind(this);");
             }
-            return "this." + CodeGeneratingComponentRenderer.em(a.a.e);
+            return "this." + CodeGeneratingComponentRenderer.er(a.a.e);
         }
-        return this.ay();
+        return this.a0();
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a, b, c) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a3 = function (a, b, c) {
         if (b.b == null) {
             return "\"" + b.c + "\"";
         }
         if (typeCast(CodeGenerationSpecialValue.$, b.c) !== null) {
-            b.c = this.ae(b);
+            b.c = this.ag(b);
         }
         switch (b.b.knownType) {
             case 11:
@@ -1854,15 +1868,15 @@ var WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
                 }
                 return b.c.toString();
             case 5:
-            case 23:
-            case 6:
-            case 16:
-            case 2: return "\"" + _super.prototype.a1.call(this, a, b, c) + "\"";
+            case 2: return "\"" + _super.prototype.a3.call(this, a, b, c) + "\"";
+            case 23: return "[" + _super.prototype.a3.call(this, a, b, c) + "]";
+            case 6: return "[\"" + stringJoin1(String_$type, "\", \"", _super.prototype.ab.call(this, b, c)) + "\"]";
+            case 16: return "[\"" + stringJoin1(String_$type, "\", \"", _super.prototype.ac.call(this, b, c)) + "\"]";
             case 9: throw new NotSupportedException(1, "shouldn't get here");
         }
-        return _super.prototype.a1.call(this, a, b, c);
+        return _super.prototype.a3.call(this, a, b, c);
     };
-    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a, b, c, d) {
+    WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a, b, c, d) {
         var e_5, _a;
         if (c.b.knownType == 9) {
             var e = typeCast(IList_$type, c.c);
@@ -1883,12 +1897,12 @@ var WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
                             if (k) {
                                 if (f) {
                                     f = false;
-                                    this.h.l(this.an + "." + b + " = []");
+                                    this.h.l(this.ap + "." + b + " = []");
                                 }
-                                this.h.l(this.an + "." + b + ".push(" + this.a2 + ");");
+                                this.h.l(this.ap + "." + b + ".push(" + this.a4 + ");");
                             }
                             else {
-                                this.h.l(this.an + "." + b + ".add(" + this.a2 + ");");
+                                this.h.l(this.ap + "." + b + ".add(" + this.a4 + ");");
                             }
                         }
                     }
@@ -1912,7 +1926,7 @@ var WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
             if (typeCast(CodeGenerationItemBuilder.$, c.c) !== null) {
                 var l = c.c;
                 l.u(this, false);
-                this.h.l(this.an + "." + b + " = " + this.a2 + ";");
+                this.h.l(this.ap + "." + b + " = " + this.a4 + ";");
             }
         }
     };
@@ -1934,14 +1948,14 @@ var ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*
     ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.i = function (a, b) {
         return new ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
     };
-    ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Igc";
     };
-    ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.be = function (a, b, c) {
-        _super.prototype.be.call(this, a, b, c);
-        WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
+    ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c) {
+        _super.prototype.bg.call(this, a, b, c);
+        WebImportsHalper.b(this.k, this.a6, this.a5, this.a7, a, b, c);
     };
-    ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bv = function (a, b) {
+    ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bx = function (a, b) {
         var c = false;
         if (b.getMetadata(a, "__isPlainObject") != null && b.getMetadata(a, "__marshalByValue") == null) {
             c = true;
@@ -1959,9 +1973,9 @@ var WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class *
     __extends(WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter, _super);
     function WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter(a, b) {
         var _this = _super.call(this, a, b) || this;
-        _this.bt = 0;
-        _this.br = new HashSet$1(String_$type, 0);
-        _this.bs = new HashSet$1(String_$type, 0);
+        _this.bv = 0;
+        _this.bt = new HashSet$1(String_$type, 0);
+        _this.bu = new HashSet$1(String_$type, 0);
         return _this;
     }
     WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.get_r = function () {
@@ -1974,77 +1988,77 @@ var WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class *
         enumerable: false,
         configurable: true
     });
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function (a) {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bs = function (a) {
         if (!a.b.owningContext.hasStringUnionPlatforms(a.b.owningType, a.b.propertyName)) {
             return false;
         }
         var b = a.b.owningContext.getStringUnionPlatforms(a.b.owningType, a.b.propertyName);
         for (var c = 0; c < b.length; c++) {
-            if (b[c].toLowerCase() == this.a4) {
+            if (b[c].toLowerCase() == this.a6) {
                 return true;
             }
         }
         return false;
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.au = function (a) {
-        if (this.bq(a)) {
-            return CodeGeneratingComponentRenderer.eo(a.c.toString());
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.aw = function (a) {
+        if (this.bs(a)) {
+            return CodeGeneratingComponentRenderer.et(a.c.toString());
         }
         else {
-            return _super.prototype.au.call(this, a);
+            return _super.prototype.aw.call(this, a);
         }
     };
     WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.i = function (a, b) {
         return new WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ap = function (a, b, c, d) {
-        d = _super.prototype.ap.call(this, a, b, c, d);
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b, c, d) {
+        d = _super.prototype.ar.call(this, a, b, c, d);
         var e = b.q();
-        this.f.l("private" + " _" + CodeGeneratingComponentRenderer.em(d) + ": " + e + " | null = null;");
-        this.f.l("public get " + CodeGeneratingComponentRenderer.em(d) + "(): " + e + " {");
+        this.f.l("private" + " _" + CodeGeneratingComponentRenderer.er(d) + ": " + e + " | null = null;");
+        this.f.l("public get " + CodeGeneratingComponentRenderer.er(d) + "(): " + e + " {");
         this.f.h();
-        this.f.l("if (this._" + CodeGeneratingComponentRenderer.em(d) + " == null)");
+        this.f.l("if (this._" + CodeGeneratingComponentRenderer.er(d) + " == null)");
         this.f.l("{");
         this.f.h();
         this.f.k(c);
-        this.f.l("this._" + CodeGeneratingComponentRenderer.em(d) + " = " + d + ";");
+        this.f.l("this._" + CodeGeneratingComponentRenderer.er(d) + " = " + d + ";");
         this.f.f();
         this.f.l("}");
-        this.f.l("return this._" + CodeGeneratingComponentRenderer.em(d) + ";");
+        this.f.l("return this._" + CodeGeneratingComponentRenderer.er(d) + ";");
         this.f.f();
         this.f.l("}");
-        return CodeGeneratingComponentRenderer.en(d);
+        return CodeGeneratingComponentRenderer.es(d);
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.aq = function (a, b, c, d, e) {
-        e = _super.prototype.aq.call(this, a, b, c, d, e);
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.as = function (a, b, c, d, e) {
+        e = _super.prototype.as.call(this, a, b, c, d, e);
         var f = null;
         if (c.count > 0) {
             f = c._inner[0].q() + "[]";
         }
         else {
             var g = a.b.specificExternalType;
-            f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.aj, this.ak) + "[]";
+            f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.al, this.am) + "[]";
         }
-        this.f.l("private" + " _" + CodeGeneratingComponentRenderer.em(e) + ": " + f + " | null = null;");
-        this.f.l("public get " + CodeGeneratingComponentRenderer.em(e) + "(): " + f + " {");
+        this.f.l("private" + " _" + CodeGeneratingComponentRenderer.er(e) + ": " + f + " | null = null;");
+        this.f.l("public get " + CodeGeneratingComponentRenderer.er(e) + "(): " + f + " {");
         this.f.h();
-        this.f.l("if (this._" + CodeGeneratingComponentRenderer.em(e) + " == null)");
+        this.f.l("if (this._" + CodeGeneratingComponentRenderer.er(e) + " == null)");
         this.f.l("{");
         this.f.h();
-        this.f.k("let " + CodeGeneratingComponentRenderer.em(e) + ": " + f + " = [];");
+        this.f.k("let " + CodeGeneratingComponentRenderer.er(e) + ": " + f + " = [];");
         for (var h = 0; h < c.count; h++) {
             this.f.k(d._inner[h]);
             this.f.k(e + ".push(" + c._inner[h].t + ")");
         }
-        this.f.l("this._" + CodeGeneratingComponentRenderer.em(e) + " = " + e + ";");
+        this.f.l("this._" + CodeGeneratingComponentRenderer.er(e) + " = " + e + ";");
         this.f.f();
         this.f.l("}");
-        this.f.l("return this._" + CodeGeneratingComponentRenderer.em(e) + ";");
+        this.f.l("return this._" + CodeGeneratingComponentRenderer.er(e) + ";");
         this.f.f();
         this.f.l("}");
-        return CodeGeneratingComponentRenderer.en(e);
+        return CodeGeneratingComponentRenderer.es(e);
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b) {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a, b) {
         if (b.c == null) {
             return "null";
         }
@@ -2061,95 +2075,95 @@ var WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class *
     WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.get_x = function () {
         return true;
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ba = function (a, b, c) {
-        _super.prototype.ba.call(this, a, b, c);
-        this.h.l("<" + this.bu(a) + "");
-        if (!this.br.contains(this.an)) {
-            this.br.add_1(this.an);
-            if (!this.bs.contains(this.ao)) {
-                this.bs.add_1(this.ao);
-                this.a9(this.ao);
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a, b, c) {
+        _super.prototype.bc.call(this, a, b, c);
+        this.h.l("<" + this.bw(a) + "");
+        if (!this.bt.contains(this.ap)) {
+            this.bt.add_1(this.ap);
+            if (!this.bu.contains(this.aq)) {
+                this.bu.add_1(this.aq);
+                this.bb(this.aq);
             }
-            this.f.l("private " + CodeGeneratingComponentRenderer.em(this.an) + ": " + this.ao);
+            this.f.l("private " + CodeGeneratingComponentRenderer.er(this.ap) + ": " + this.aq);
             if (!this.p) {
                 if (this.v) {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + " = document.querySelector('" + CodeGeneratingComponentRenderer.ep(stringReplace(this.ao, "Component", "")) + "') as " + this.ao + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + " = document.querySelector('" + CodeGeneratingComponentRenderer.eu(stringReplace(this.aq, "Component", "")) + "') as " + this.aq + ";");
                 }
             }
             else {
-                this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + " = document.getElementById('" + this.an + "') as " + this.ao + ";");
+                this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + " = document.getElementById('" + this.ap + "') as " + this.aq + ";");
             }
         }
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bu = function (a) {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bw = function (a) {
         if (stringEndsWith(a, "Component")) {
             a = a.substr(0, a.length - ("Component").length);
         }
-        return CodeGeneratingComponentRenderer.ep(a);
+        return CodeGeneratingComponentRenderer.eu(a);
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bo = function () {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function () {
         this.h.l(">");
         this.h.h();
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a) {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bl = function (a) {
         this.h.f();
-        this.h.l("</" + this.bu(a) + ">");
-        _super.prototype.bj.call(this, a);
+        this.h.l("</" + this.bw(a) + ">");
+        _super.prototype.bl.call(this, a);
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Igc";
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.be = function (a, b, c) {
-        _super.prototype.be.call(this, a, b, c);
-        WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c) {
+        _super.prototype.bg.call(this, a, b, c);
+        WebImportsHalper.b(this.k, this.a6, this.a5, this.a7, a, b, c);
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c, d) {
-        var e = CodeGeneratingComponentRenderer.em(b);
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a, b, c, d) {
+        var e = CodeGeneratingComponentRenderer.er(b);
         if (this.q(d, c)) {
-            this.bp(c);
-            if (!this.br.contains(this.an)) {
-                this.br.add_1(this.an);
-                if (!this.bs.contains(this.ao)) {
-                    this.bs.add_1(this.ao);
-                    this.a9(this.ao);
-                }
-                this.f.l("private " + CodeGeneratingComponentRenderer.em(this.an) + ": " + this.ao);
+            this.br(c);
+            if (!this.bt.contains(this.ap)) {
+                this.bt.add_1(this.ap);
+                if (!this.bu.contains(this.aq)) {
+                    this.bu.add_1(this.aq);
+                    this.bb(this.aq);
+                }
+                this.f.l("private " + CodeGeneratingComponentRenderer.er(this.ap) + ": " + this.aq);
                 if (!this.p) {
                     if (this.v) {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + " = document.querySelector('" + CodeGeneratingComponentRenderer.ep(stringReplace(this.ao, "Component", "")) + "') as " + this.ao + ";");
+                        this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + " = document.querySelector('" + CodeGeneratingComponentRenderer.eu(stringReplace(this.aq, "Component", "")) + "') as " + this.aq + ";");
                     }
                 }
                 else {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.em(this.an) + " = this." + CodeGeneratingComponentRenderer.em(this.an) + " = document.getElementById('" + this.an + "') as " + this.ao + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.er(this.ap) + " = this." + CodeGeneratingComponentRenderer.er(this.ap) + " = document.getElementById('" + this.ap + "') as " + this.aq + ";");
                 }
             }
-            var f = CodeGeneratingComponentRenderer.em(this.a1(d, c, true));
+            var f = CodeGeneratingComponentRenderer.er(this.a3(d, c, true));
             var g = f;
             if (g != "null" && !stringStartsWith(g, "this.")) {
                 g = "this." + g;
             }
             if (c.b.isCustomEvent) {
-                this.e.l(CodeGeneratingComponentRenderer.em(this.an) + ".addEventListener(\"" + e + "\", " + g + ");");
+                this.e.l(CodeGeneratingComponentRenderer.er(this.ap) + ".addEventListener(\"" + e + "\", " + g + ");");
             }
             else {
-                this.e.l(CodeGeneratingComponentRenderer.em(this.an) + "." + e + " = " + g + ";");
+                this.e.l(CodeGeneratingComponentRenderer.er(this.ap) + "." + e + " = " + g + ";");
             }
             return;
         }
         if (a > 0) {
             this.h.l("");
         }
-        this.h.j(CodeGeneratingComponentRenderer.ep(e));
+        this.h.j(CodeGeneratingComponentRenderer.eu(e));
         this.h.j("=");
         this.h.j("\"");
-        this.h.j(this.a1(d, c, true));
+        this.h.j(this.a3(d, c, true));
         this.h.j("\"");
         if (e == "name") {
             this.h.l("");
-            this.h.j("id=\"" + this.a1(d, c, true) + "\"");
+            this.h.j("id=\"" + this.a3(d, c, true) + "\"");
         }
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ae = function (a) {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
         var b = a.c;
         switch (b.a) {
             case 3: return b.b;
@@ -2159,26 +2173,26 @@ var WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /** @class *
         }
         return b.b;
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ay = function () {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function () {
         return "null";
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a) {
-        return CodeGeneratingComponentRenderer.em(a.a.e);
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+        return CodeGeneratingComponentRenderer.er(a.a.e);
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
-        return CodeGeneratingComponentRenderer.em(a.a.e);
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a) {
+        return CodeGeneratingComponentRenderer.er(a.a.e);
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.ax = function (a) {
         if (!stringIsNullOrEmpty(a.a.e)) {
-            this.bp(a);
-            if (!this.br.contains(a.a.e)) {
-                this.g.l("this." + CodeGeneratingComponentRenderer.em(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.em(a.a.e) + ".bind(this);");
+            this.br(a);
+            if (!this.bt.contains(a.a.e)) {
+                this.g.l("this." + CodeGeneratingComponentRenderer.er(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.er(a.a.e) + ".bind(this);");
             }
-            return "this." + CodeGeneratingComponentRenderer.em(a.a.e);
+            return "this." + CodeGeneratingComponentRenderer.er(a.a.e);
         }
-        return this.ay();
+        return this.a0();
     };
-    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a, b, c, d) {
+    WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a, b, c, d) {
         var e_6, _a;
         if (c.b.knownType == 9) {
             var e = typeCast(IList_$type, c.c);
@@ -2229,12 +2243,12 @@ var WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @cla
     WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.i = function (a, b) {
         return new WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
     };
-    WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Igc";
     };
-    WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.be = function (a, b, c) {
-        _super.prototype.be.call(this, a, b, c);
-        WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
+    WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c) {
+        _super.prototype.bg.call(this, a, b, c);
+        WebImportsHalper.b(this.k, this.a6, this.a5, this.a7, a, b, c);
     };
     WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter.$t = markType(WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter, 'WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter', WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.$);
     return WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter;
@@ -2253,11 +2267,11 @@ var TSCodeGeneratingComponentRendererHandlerEmitter = /** @class */ /*@__PURE__*
     }
     TSCodeGeneratingComponentRendererHandlerEmitter.prototype.t = function (a, b) {
         _super.prototype.t.call(this, a, b);
-        this.g.l("this." + CodeGeneratingComponentRenderer.em(a) + "();");
+        this.g.l("this." + CodeGeneratingComponentRenderer.er(a) + "();");
     };
     TSCodeGeneratingComponentRendererHandlerEmitter.prototype.u = function (a, b) {
         _super.prototype.u.call(this, a, b);
-        this.h.l("this." + CodeGeneratingComponentRenderer.em(a) + "();");
+        this.h.l("this." + CodeGeneratingComponentRenderer.er(a) + "();");
     };
     Object.defineProperty(TSCodeGeneratingComponentRendererHandlerEmitter.prototype, "z", {
         get: function () {
@@ -2375,7 +2389,7 @@ var TSCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__*/ (
         if (b === void 0) {
             b = false;
         }
-        a = CodeGeneratingComponentRenderer.en(a);
+        a = CodeGeneratingComponentRenderer.es(a);
         a = stringReplace(a, "-", "_");
         if (b) {
             a += "Item";
@@ -2387,11 +2401,11 @@ var TSCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__*/ (
         if (this.p.e) {
             return a;
         }
-        return CodeGeneratingComponentRenderer.em(a);
+        return CodeGeneratingComponentRenderer.er(a);
     };
     TSCodeGeneratingComponentRendererDataEmitter.prototype.ap = function (a) {
         a = stringReplace(a, "-", "_");
-        return "_" + CodeGeneratingComponentRenderer.em(a);
+        return "_" + CodeGeneratingComponentRenderer.er(a);
     };
     TSCodeGeneratingComponentRendererDataEmitter.prototype.get_s = function () {
         return ".ts";
@@ -2468,7 +2482,7 @@ var TSCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__*/ (
         if (b == 2 || (c != null && c.isAsync)) {
             this.g.l("private " + this.ap(a) + "Fetching: boolean = false;");
         }
-        this.g.l("public get " + CodeGeneratingComponentRenderer.em(a) + "(): " + f + " {");
+        this.g.l("public get " + CodeGeneratingComponentRenderer.er(a) + "(): " + f + " {");
         this.g.h();
         if (c != null && c.isAsync) {
             this.g.l("if (this." + this.ap(a) + " == null && !this." + this.ap(a) + "Fetching)");
@@ -2506,7 +2520,7 @@ var TSCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__*/ (
     TSCodeGeneratingComponentRendererDataEmitter.prototype.ah = function (a, b) {
         _super.prototype.ah.call(this, a, b);
         this.g.l("private " + this.ap(a) + ": " + this.am(b.e) + " = " + this.an(b) + ";");
-        this.g.l("public get " + CodeGeneratingComponentRenderer.em(a) + "(): " + this.am(b.e) + " {");
+        this.g.l("public get " + CodeGeneratingComponentRenderer.er(a) + "(): " + this.am(b.e) + " {");
         this.g.h();
         this.g.l("return this." + this.ap(a) + ";");
         this.g.f();
@@ -2516,7 +2530,7 @@ var TSCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__*/ (
     TSCodeGeneratingComponentRendererDataEmitter.prototype.ai = function (a, b, c, d) {
         _super.prototype.ai.call(this, a, b, c, d);
         this.g.l("private " + this.ap(a) + ": " + this.w(a, false) + "Item = null;");
-        this.g.l("public get " + CodeGeneratingComponentRenderer.em(a) + "(): " + this.w(a, false) + "Item {");
+        this.g.l("public get " + CodeGeneratingComponentRenderer.er(a) + "(): " + this.w(a, false) + "Item {");
         this.g.h();
         this.g.l("if (this." + this.ap(a) + " == null)");
         this.g.l("{");
@@ -2574,7 +2588,7 @@ var TSCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__*/ (
     };
     TSCodeGeneratingComponentRendererDataEmitter.prototype.ao = function (a, b, c) {
         if (c.d) {
-            return a.d + "_" + CodeGeneratingComponentRenderer.en(this.v(b)) + "Item[]";
+            return a.d + "_" + CodeGeneratingComponentRenderer.es(this.v(b)) + "Item[]";
         }
         else if (c.f) {
             return a.d + "_" + this.v(b);
@@ -2639,11 +2653,11 @@ var TSCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__*/ (
                 }
                 e.j(this.v(j) + ": ");
                 if (k.d) {
-                    var l = a + "_" + CodeGeneratingComponentRenderer.en(this.v(j)) + "Item";
+                    var l = a + "_" + CodeGeneratingComponentRenderer.es(this.v(j)) + "Item";
                     this.aq(l, k.a, k.b, h.item(j), e);
                 }
                 else if (k.f) {
-                    var m = a + "_" + CodeGeneratingComponentRenderer.en(this.v(j));
+                    var m = a + "_" + CodeGeneratingComponentRenderer.es(this.v(j));
                     this.aq(m, k.a, k.b, h.item(j), e);
                 }
                 else {
@@ -2688,9 +2702,9 @@ var AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*
     __extends(AngularTemplateCodeGeneratingComponentRendererCodeEmitter, _super);
     function AngularTemplateCodeGeneratingComponentRendererCodeEmitter(a, b) {
         var _this = _super.call(this, a, b) || this;
-        _this.bs = 0;
-        _this.bq = new HashSet$1(String_$type, 0);
-        _this.br = new HashSet$1(String_$type, 0);
+        _this.bu = 0;
+        _this.bs = new HashSet$1(String_$type, 0);
+        _this.bt = new HashSet$1(String_$type, 0);
         return _this;
     }
     AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.get_r = function () {
@@ -2703,57 +2717,57 @@ var AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*
         enumerable: false,
         configurable: true
     });
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.ap = function (a, b, c, d) {
-        d = _super.prototype.ap.call(this, a, b, c, d);
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b, c, d) {
+        d = _super.prototype.ar.call(this, a, b, c, d);
         var e = b.q();
-        this.f.l("private " + " _" + CodeGeneratingComponentRenderer.em(d) + ": " + e + " | null = null;");
-        this.f.l("public get " + CodeGeneratingComponentRenderer.em(d) + "(): " + e + " {");
+        this.f.l("private " + " _" + CodeGeneratingComponentRenderer.er(d) + ": " + e + " | null = null;");
+        this.f.l("public get " + CodeGeneratingComponentRenderer.er(d) + "(): " + e + " {");
         this.f.h();
-        this.f.l("if (this._" + CodeGeneratingComponentRenderer.em(d) + " == null)");
+        this.f.l("if (this._" + CodeGeneratingComponentRenderer.er(d) + " == null)");
         this.f.l("{");
         this.f.h();
         this.f.k(c);
-        this.f.l("this._" + CodeGeneratingComponentRenderer.em(d) + " = " + d + ";");
+        this.f.l("this._" + CodeGeneratingComponentRenderer.er(d) + " = " + d + ";");
         this.f.f();
         this.f.l("}");
-        this.f.l("return this._" + CodeGeneratingComponentRenderer.em(d) + ";");
+        this.f.l("return this._" + CodeGeneratingComponentRenderer.er(d) + ";");
         this.f.f();
         this.f.l("}");
-        return CodeGeneratingComponentRenderer.en(d);
+        return CodeGeneratingComponentRenderer.er(d);
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.aq = function (a, b, c, d, e) {
-        e = _super.prototype.aq.call(this, a, b, c, d, e);
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.as = function (a, b, c, d, e) {
+        e = _super.prototype.as.call(this, a, b, c, d, e);
         var f = null;
         if (c.count > 0) {
             f = c._inner[0].q() + "[]";
         }
         else {
             var g = a.b.specificExternalType;
-            f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.aj, this.ak) + "[]";
+            f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.al, this.am) + "[]";
         }
-        this.f.l("private" + " _" + CodeGeneratingComponentRenderer.em(e) + ": " + f + " | null = null;");
-        this.f.l("public get " + CodeGeneratingComponentRenderer.em(e) + "(): " + f + " {");
+        this.f.l("private" + " _" + CodeGeneratingComponentRenderer.er(e) + ": " + f + " | null = null;");
+        this.f.l("public get " + CodeGeneratingComponentRenderer.er(e) + "(): " + f + " {");
         this.f.h();
-        this.f.l("if (this._" + CodeGeneratingComponentRenderer.em(e) + " == null)");
+        this.f.l("if (this._" + CodeGeneratingComponentRenderer.er(e) + " == null)");
         this.f.l("{");
         this.f.h();
-        this.f.k("let " + CodeGeneratingComponentRenderer.em(e) + ": " + f + " = [];");
+        this.f.k("let " + CodeGeneratingComponentRenderer.er(e) + ": " + f + " = [];");
         for (var h = 0; h < c.count; h++) {
             this.f.k(d._inner[h]);
             this.f.k(e + ".push(" + c._inner[h].t + ")");
         }
-        this.f.l("this._" + CodeGeneratingComponentRenderer.em(e) + " = " + e + ";");
+        this.f.l("this._" + CodeGeneratingComponentRenderer.er(e) + " = " + e + ";");
         this.f.f();
         this.f.l("}");
-        this.f.l("return this._" + CodeGeneratingComponentRenderer.em(e) + ";");
+        this.f.l("return this._" + CodeGeneratingComponentRenderer.er(e) + ";");
         this.f.f();
         this.f.l("}");
-        return CodeGeneratingComponentRenderer.en(e);
+        return CodeGeneratingComponentRenderer.es(e);
     };
     AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.i = function (a, b) {
         return new AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b) {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a, b) {
         if (b.c == null) {
             return "null";
         }
@@ -2770,45 +2784,45 @@ var AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*
     AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.get_x = function () {
         return true;
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Igx";
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.ba = function (a, b, c) {
-        _super.prototype.ba.call(this, a, b, c);
-        this.h.l("<" + this.bt(a) + "");
-        if (!this.bq.contains(this.an)) {
-            this.bq.add_1(this.an);
-            if (!this.br.contains(this.ao)) {
-                this.br.add_1(this.ao);
-                this.a9(this.ao);
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a, b, c) {
+        _super.prototype.bc.call(this, a, b, c);
+        this.h.l("<" + this.bv(a) + "");
+        if (!this.bs.contains(this.ap)) {
+            this.bs.add_1(this.ap);
+            if (!this.bt.contains(this.aq)) {
+                this.bt.add_1(this.aq);
+                this.bb(this.aq);
             }
-            this.f.l("@ViewChild(\"" + CodeGeneratingComponentRenderer.em(this.an) + "\", { static: true } )");
-            this.f.l("private " + CodeGeneratingComponentRenderer.em(this.an) + ": " + this.ao);
+            this.f.l("@ViewChild(\"" + CodeGeneratingComponentRenderer.er(this.ap) + "\", { static: true } )");
+            this.f.l("private " + CodeGeneratingComponentRenderer.er(this.ap) + ": " + this.aq);
         }
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.be = function (a, b, c) {
-        _super.prototype.be.call(this, a, b, c);
-        WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c) {
+        _super.prototype.bg.call(this, a, b, c);
+        WebImportsHalper.b(this.k, this.a6, this.a5, this.a7, a, b, c);
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bt = function (a) {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bv = function (a) {
         if (stringEndsWith(a, "Component")) {
             a = a.substr(0, a.length - ("Component").length);
         }
-        return CodeGeneratingComponentRenderer.ep(a);
+        return CodeGeneratingComponentRenderer.eu(a);
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bo = function () {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function () {
         this.h.l(">");
         this.h.h();
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a) {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bl = function (a) {
         this.h.f();
-        this.h.l("</" + this.bt(a) + ">");
-        _super.prototype.bj.call(this, a);
+        this.h.l("</" + this.bv(a) + ">");
+        _super.prototype.bl.call(this, a);
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c, d) {
-        var e = CodeGeneratingComponentRenderer.em(b);
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a, b, c, d) {
+        var e = CodeGeneratingComponentRenderer.er(b);
         if (this.q(d, c)) {
-            this.bp(c);
+            this.br(c);
             if (this.t(c)) {
                 e = "(" + e + ")";
             }
@@ -2822,21 +2836,21 @@ var AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*
         this.h.j(e);
         this.h.j("=");
         this.h.j("\"");
-        this.h.j(this.a1(d, c, true));
+        this.h.j(this.a3(d, c, true));
         this.h.j("\"");
         if (e == "name") {
             this.h.l("");
-            this.h.j("#" + CodeGeneratingComponentRenderer.em(this.a1(d, c, true)));
+            this.h.j("#" + CodeGeneratingComponentRenderer.er(this.a3(d, c, true)));
         }
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.ax = function (a) {
         if (!stringIsNullOrEmpty(a.a.e)) {
-            this.bp(a);
-            return "this." + CodeGeneratingComponentRenderer.em(a.a.e) + "($event)";
+            this.br(a);
+            return "this." + CodeGeneratingComponentRenderer.er(a.a.e) + "($event)";
         }
-        return this.ay();
+        return this.a0();
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.ae = function (a) {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
         var b = a.c;
         switch (b.a) {
             case 3: return b.b;
@@ -2846,16 +2860,16 @@ var AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*
         }
         return b.b;
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.ay = function () {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function () {
         return "null";
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a) {
-        return CodeGeneratingComponentRenderer.em(a.a.e);
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
+        return CodeGeneratingComponentRenderer.er(a.a.e);
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
-        return CodeGeneratingComponentRenderer.em(a.a.e);
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a) {
+        return CodeGeneratingComponentRenderer.er(a.a.e);
     };
-    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a, b, c, d) {
+    AngularTemplateCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a, b, c, d) {
         var e_8, _a;
         if (c.b.knownType == 9) {
             var e = typeCast(IList_$type, c.c);
@@ -2909,12 +2923,12 @@ var AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */
     AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.i = function (a, b) {
         return new AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
     };
-    AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Igc";
     };
-    AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.be = function (a, b, c) {
-        _super.prototype.be.call(this, a, b, c);
-        WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
+    AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c) {
+        _super.prototype.bg.call(this, a, b, c);
+        WebImportsHalper.b(this.k, this.a6, this.a5, this.a7, a, b, c);
     };
     AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter.$t = markType(AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter, 'AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter', WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.$);
     return AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter;
@@ -2953,7 +2967,7 @@ var DotNetCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__
         if (b === void 0) {
             b = false;
         }
-        a = CodeGeneratingComponentRenderer.en(a);
+        a = CodeGeneratingComponentRenderer.es(a);
         a = stringReplace(a, "-", "_");
         if (b) {
             a += "Item";
@@ -2962,11 +2976,11 @@ var DotNetCodeGeneratingComponentRendererDataEmitter = /** @class */ /*@__PURE__
     };
     DotNetCodeGeneratingComponentRendererDataEmitter.prototype.v = function (a) {
         a = stringReplace(a, "-", "_");
-        return CodeGeneratingComponentRenderer.en(a);
+        return CodeGeneratingComponentRenderer.es(a);
     };
     DotNetCodeGeneratingComponentRendererDataEmitter.prototype.ap = function (a) {
         a = stringReplace(a, "-", "_");
-        return "_" + CodeGeneratingComponentRenderer.em(a);
+        return "_" + CodeGeneratingComponentRenderer.er(a);
     };
     DotNetCodeGeneratingComponentRendererDataEmitter.prototype.ak = function (a, b, c, d, e) {
         var e_9, _a;
@@ -3221,7 +3235,7 @@ var WPFXamlCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE_
     function WPFXamlCodeGeneratingComponentRendererCodeEmitter(a, b) {
         return _super.call(this, a, b) || this;
     }
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.a7 = function (a) {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.a9 = function (a) {
         if (a == null || isNaN_(a)) {
             return "";
         }
@@ -3243,7 +3257,7 @@ var WPFXamlCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE_
     WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.get_y = function () {
         return false;
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.ar = function (a, b) {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a, b) {
         if (b.c == null) {
             return "null";
         }
@@ -3257,20 +3271,20 @@ var WPFXamlCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE_
         }
         return d;
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.ba = function (a, b, c) {
-        _super.prototype.ba.call(this, a, b, c);
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bc = function (a, b, c) {
+        _super.prototype.bc.call(this, a, b, c);
         this.h.l("<ig:" + a + "");
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bo = function () {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function () {
         this.h.l(">");
         this.h.h();
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a) {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bl = function (a) {
         this.h.f();
         this.h.l("</ig:" + a + ">");
-        _super.prototype.bj.call(this, a);
+        _super.prototype.bl.call(this, a);
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bg = function (a, b, c, d) {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bi = function (a, b, c, d) {
         if (b == "Label" && c.b != null && stringContains(c.b.owningType, "Axis")) {
             if (c.c != null && stringContains(c.c, "{")) {
                 if (a > 0) {
@@ -3279,7 +3293,7 @@ var WPFXamlCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE_
                 this.h.j(b);
                 this.h.j("=");
                 this.h.j("\"");
-                this.h.j("{}" + this.a1(d, c, true));
+                this.h.j("{}" + this.a3(d, c, true));
                 this.h.j("\"");
                 return;
             }
@@ -3290,10 +3304,10 @@ var WPFXamlCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE_
         this.h.j(b);
         this.h.j("=");
         this.h.j("\"");
-        this.h.j(this.a1(d, c, true));
+        this.h.j(this.a3(d, c, true));
         this.h.j("\"");
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.ae = function (a) {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.ag = function (a) {
         var b = a.c;
         switch (b.a) {
             case 3: return b.b;
@@ -3303,25 +3317,25 @@ var WPFXamlCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE_
         }
         return b.b;
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.ay = function () {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.a0 = function () {
         return "{x:Null}";
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.at = function (a) {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.av = function (a) {
         return "{Binding ElementName=" + a.a.e + "}";
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bq = function (a) {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bs = function (a) {
         a = stringReplace(a, "-", "_");
-        return CodeGeneratingComponentRenderer.en(a);
+        return CodeGeneratingComponentRenderer.es(a);
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.az = function (a) {
-        this.bp(a);
-        return "{Binding " + this.bq(a.a.e) + "}";
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.a1 = function (a) {
+        this.br(a);
+        return "{Binding " + this.bs(a.a.e) + "}";
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bh = function (a, b, c, d) {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.bj = function (a, b, c, d) {
         var e_10, _a;
         this.h.j("<ig:");
         {
-            this.h.j(this.ao);
+            this.h.j(this.aq);
             this.h.j(".");
         }
         this.h.j(b);
@@ -3363,13 +3377,13 @@ var WPFXamlCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@__PURE_
         this.h.f();
         this.h.j("</ig:");
         {
-            this.h.j(this.ao);
+            this.h.j(this.aq);
             this.h.j(".");
         }
         this.h.j(b);
         this.h.l(">");
     };
-    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.get_a5 = function () {
+    WPFXamlCodeGeneratingComponentRendererCodeEmitter.prototype.get_a7 = function () {
         return "Xam";
     };
     WPFXamlCodeGeneratingComponentRendererCodeEmitter.$t = markType(WPFXamlCodeGeneratingComponentRendererCodeEmitter, 'WPFXamlCodeGeneratingComponentRendererCodeEmitter', CodeGeneratingComponentRendererCodeEmitter.$);
@@ -3384,7 +3398,7 @@ var WPFCodeBehindCodeGeneratingComponentRendererCodeEmitter = /** @class */ /*@_
     function WPFCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b) {
         return _super.call(this, a, b) || this;
     }
-    WPFCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a7 = function (a) {
+    WPFCodeBehindCodeGeneratingComponentRendererCodeEmitter.prototype.a9 = function (a) {
         if (a == null || isNaN_(a)) {
             return "";
         }
@@ -3417,17 +3431,17 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
     __extends(CodeGeneratingComponentRenderer, _super);
     function CodeGeneratingComponentRenderer(a, b) {
         var _this = _super.call(this) || this;
-        _this.ee = null;
-        _this.ef = 0;
-        _this.ei = null;
         _this.ej = null;
-        _this.ek = null;
-        _this.eh = null;
-        _this.eg = null;
-        _this.ee = b;
-        _this.ef = a;
+        _this.ek = 0;
+        _this.en = null;
+        _this.eo = null;
+        _this.ep = null;
+        _this.em = null;
+        _this.el = null;
+        _this.ej = b;
+        _this.ek = a;
         _this.preserveKeyOrder = true;
-        ComponentRenderer.platform = CodeGeneratingComponentRenderer.el(a);
+        ComponentRenderer.platform = CodeGeneratingComponentRenderer.eq(a);
         _this.adapter = new CodeGenerationRendererAdapter(a, _this.adapter);
         _this.context = new TypeDescriptionContext(_this.adapter, ComponentRenderer.platform);
         _this.j = new CodeGenerationTransformer(a);
@@ -3442,13 +3456,13 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
             })());
         });
     };
-    CodeGeneratingComponentRenderer.prototype.de = function (a) {
-        this.ee.b = a;
+    CodeGeneratingComponentRenderer.prototype.dg = function (a) {
+        this.ej.b = a;
     };
     CodeGeneratingComponentRenderer.prototype.o = function () {
         return false;
     };
-    CodeGeneratingComponentRenderer.em = function (a) {
+    CodeGeneratingComponentRenderer.er = function (a) {
         if (a == null) {
             return null;
         }
@@ -3457,7 +3471,7 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
         }
         return a.substr(0, 1).toLowerCase() + a.substr(1);
     };
-    CodeGeneratingComponentRenderer.eo = function (a) {
+    CodeGeneratingComponentRenderer.et = function (a) {
         if (a == null) {
             return null;
         }
@@ -3469,7 +3483,7 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
         }
         return a.substr(0, 1).toLowerCase() + a.substr(1);
     };
-    CodeGeneratingComponentRenderer.en = function (a) {
+    CodeGeneratingComponentRenderer.es = function (a) {
         if (a == null) {
             return null;
         }
@@ -3478,7 +3492,7 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
         }
         return a.substr(0, 1).toUpperCase() + a.substr(1);
     };
-    CodeGeneratingComponentRenderer.ep = function (a) {
+    CodeGeneratingComponentRenderer.eu = function (a) {
         if (a == null) {
             return null;
         }
@@ -3516,19 +3530,19 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
     CodeGeneratingComponentRenderer.prototype.ar = function () {
         return true;
     };
-    CodeGeneratingComponentRenderer.prototype.bq = function (a) {
+    CodeGeneratingComponentRenderer.prototype.br = function (a) {
         var b = a.g;
         return b == null ? { $type: Point_$type, x: NaN, y: NaN } : { $type: Point_$type, x: b.x, y: b.y };
     };
-    CodeGeneratingComponentRenderer.prototype.br = function (a) {
+    CodeGeneratingComponentRenderer.prototype.bs = function (a) {
         var b = a.g;
         return b == null ? Rect.empty : new Rect(0, b.left, b.top, b.width, b.height);
     };
-    CodeGeneratingComponentRenderer.prototype.bs = function (a) {
+    CodeGeneratingComponentRenderer.prototype.bt = function (a) {
         var b = a.g;
         return b == null ? new Size(1, NaN, NaN) : new Size(1, b.width, b.height);
     };
-    CodeGeneratingComponentRenderer.prototype.bu = function (a) {
+    CodeGeneratingComponentRenderer.prototype.bv = function (a) {
         var b = a.g;
         if (typeof b === 'number') {
             return typeGetValue(b);
@@ -3541,13 +3555,13 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
         }
         return NaN;
     };
-    CodeGeneratingComponentRenderer.prototype.ck = function (a) {
+    CodeGeneratingComponentRenderer.prototype.cm = function (a) {
         if (a == null) {
             return null;
         }
         return Brush.create(a);
     };
-    CodeGeneratingComponentRenderer.prototype.cl = function (a) {
+    CodeGeneratingComponentRenderer.prototype.cn = function (a) {
         if (a == null) {
             return null;
         }
@@ -3555,31 +3569,31 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
     };
     CodeGeneratingComponentRenderer.prototype.ae = function (a) {
         _super.prototype.ae.call(this, a);
-        this.ei = a;
+        this.en = a;
         return true;
     };
     CodeGeneratingComponentRenderer.prototype.al = function (a) {
         _super.prototype.al.call(this, a);
-        this.ek = a;
+        this.ep = a;
         return true;
     };
     CodeGeneratingComponentRenderer.prototype.af = function (a) {
         _super.prototype.af.call(this, a);
-        this.eg = a;
+        this.el = a;
         return true;
     };
     CodeGeneratingComponentRenderer.prototype.ag = function (a) {
         _super.prototype.ag.call(this, a);
-        this.eh = a;
+        this.em = a;
         return true;
     };
     CodeGeneratingComponentRenderer.prototype.ah = function (a) {
         _super.prototype.ah.call(this, a);
-        this.ej = a;
+        this.eo = a;
         return true;
     };
-    CodeGeneratingComponentRenderer.prototype.d8 = function (a, b, c) {
-        switch (this.ef) {
+    CodeGeneratingComponentRenderer.prototype.ed = function (a, b, c) {
+        switch (this.ek) {
             case 1: if (b.forceCodeBehind) {
                 return new AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter(b, c);
             }
@@ -3614,8 +3628,8 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
         }
         return null;
     };
-    CodeGeneratingComponentRenderer.prototype.d9 = function (a, b) {
-        switch (this.ef) {
+    CodeGeneratingComponentRenderer.prototype.ee = function (a, b) {
+        switch (this.ek) {
             case 1: return new TSCodeGeneratingComponentRendererDataEmitter(a, b);
             case 2: return new TSCodeGeneratingComponentRendererDataEmitter(a, b);
             case 3: return new TSCodeGeneratingComponentRendererDataEmitter(a, b);
@@ -3625,46 +3639,46 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
         }
         return null;
     };
-    CodeGeneratingComponentRenderer.prototype.ea = function (a, b) {
-        switch (this.ef) {
-            case 1: return new TSCodeGeneratingComponentRendererHandlerEmitter(a, b, this.ef);
-            case 2: return new TSCodeGeneratingComponentRendererHandlerEmitter(a, b, this.ef);
-            case 3: return new TSCodeGeneratingComponentRendererHandlerEmitter(a, b, this.ef);
+    CodeGeneratingComponentRenderer.prototype.ef = function (a, b) {
+        switch (this.ek) {
+            case 1: return new TSCodeGeneratingComponentRendererHandlerEmitter(a, b, this.ek);
+            case 2: return new TSCodeGeneratingComponentRendererHandlerEmitter(a, b, this.ek);
+            case 3: return new TSCodeGeneratingComponentRendererHandlerEmitter(a, b, this.ek);
             case 4: break;
             case 0:
             case 5: return new DotNetCodeGeneratingComponentRendererHandlerEmitter(a, b);
         }
         return null;
     };
-    CodeGeneratingComponentRenderer.prototype.ec = function (a, b) {
-        switch (this.ef) {
-            case 1: return new TSCodeGeneratingComponentRendererTemplateEmitter(a, b, this.ef);
-            case 2: return new TSCodeGeneratingComponentRendererTemplateEmitter(a, b, this.ef);
-            case 3: return new TSCodeGeneratingComponentRendererTemplateEmitter(a, b, this.ef);
+    CodeGeneratingComponentRenderer.prototype.eh = function (a, b) {
+        switch (this.ek) {
+            case 1: return new TSCodeGeneratingComponentRendererTemplateEmitter(a, b, this.ek);
+            case 2: return new TSCodeGeneratingComponentRendererTemplateEmitter(a, b, this.ek);
+            case 3: return new TSCodeGeneratingComponentRendererTemplateEmitter(a, b, this.ek);
             case 4: break;
             case 0:
             case 5: return new DotNetCodeGeneratingComponentRendererTemplateEmitter(a, b);
         }
         return null;
     };
-    CodeGeneratingComponentRenderer.prototype.eb = function (a, b) {
-        switch (this.ef) {
-            case 1: return new TSCodeGeneratingComponentRendererModuleEmitter(this.ef, a, b);
-            case 2: return new TSCodeGeneratingComponentRendererModuleEmitter(this.ef, a, b);
-            case 3: return new TSCodeGeneratingComponentRendererModuleEmitter(this.ef, a, b);
+    CodeGeneratingComponentRenderer.prototype.eg = function (a, b) {
+        switch (this.ek) {
+            case 1: return new TSCodeGeneratingComponentRendererModuleEmitter(this.ek, a, b);
+            case 2: return new TSCodeGeneratingComponentRendererModuleEmitter(this.ek, a, b);
+            case 3: return new TSCodeGeneratingComponentRendererModuleEmitter(this.ek, a, b);
             case 4: break;
-            case 0: return new DotNetCodeGeneratingComponentRendererModuleEmitter(this.ef, a, b);
-            case 5: return new BlazorCodeGeneratingComponentRendererModuleEmitter(this.ef, a, b);
+            case 0: return new DotNetCodeGeneratingComponentRendererModuleEmitter(this.ek, a, b);
+            case 5: return new BlazorCodeGeneratingComponentRendererModuleEmitter(this.ek, a, b);
         }
         return null;
     };
     CodeGeneratingComponentRenderer.prototype.emitCode = function (a) {
         var e_11, _a, e_12, _b, e_13, _c;
         var b = new CodeGeneratingRendererResult();
-        b.platform = this.ef;
-        b.generationOptions = this.ee;
+        b.platform = this.ek;
+        b.generationOptions = this.ej;
         try {
-            for (var _d = __values(fromEnum(this.a7.keys)), _e = _d.next(); !_e.done; _e = _d.next()) {
+            for (var _d = __values(fromEnum(this.a8.keys)), _e = _d.next(); !_e.done; _e = _d.next()) {
                 var c = _e.value;
                 var d = c;
                 var e = d.id;
@@ -3708,10 +3722,10 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
             }
         }
         try {
-            for (var _h = __values(fromEnum(this.a7.keys)), _j = _h.next(); !_j.done; _j = _h.next()) {
+            for (var _h = __values(fromEnum(this.a8.keys)), _j = _h.next(); !_j.done; _j = _h.next()) {
                 var g = _j.value;
                 var h = g;
-                h.c(this.context, b, this, this.ee);
+                h.c(this.context, b, this, this.ej);
             }
         }
         catch (e_13_1) {
@@ -3727,13 +3741,13 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
                     throw e_13.error;
             }
         }
-        if (this.ei != null) {
-            var i = this.eb(this.ee, b);
-            i.n(this.ei, this.context);
+        if (this.en != null) {
+            var i = this.eg(this.ej, b);
+            i.n(this.en, this.context);
         }
-        if (this.ek != null) {
-            if (typeCast(JsonDictionaryObject.$, this.ek) !== null) {
-                var j = this.ek;
+        if (this.ep != null) {
+            if (typeCast(JsonDictionaryObject.$, this.ep) !== null) {
+                var j = this.ep;
                 var m = j.e();
                 for (var l = 0; l < m.length; l++) {
                     var k = m[l];
@@ -3742,15 +3756,15 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
             }
         }
         {
-            var n = this.d9(this.ee, b);
-            n.ab(this.ej);
+            var n = this.ee(this.ej, b);
+            n.ab(this.eo);
         }
-        var o = this.ea(this.ee, b);
+        var o = this.ef(this.ej, b);
         var p = new List$1(String_$type, 0);
         var q = new List$1(String_$type, 0);
-        if (this.eg != null) {
-            if (typeCast(JsonDictionaryArray.$, this.eg) !== null) {
-                var r = this.eg;
+        if (this.el != null) {
+            if (typeCast(JsonDictionaryArray.$, this.el) !== null) {
+                var r = this.el;
                 if (r.items != null) {
                     var u = r.items;
                     for (var t = 0; t < u.length; t++) {
@@ -3759,14 +3773,14 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
                     }
                 }
             }
-            else if (typeCast(JsonDictionaryValue.$, this.eg) !== null) {
-                var v = this.eg;
+            else if (typeCast(JsonDictionaryValue.$, this.el) !== null) {
+                var v = this.el;
                 p.add(v.value.toString());
             }
         }
-        if (this.eh != null) {
-            if (typeCast(JsonDictionaryArray.$, this.eh) !== null) {
-                var w = this.eh;
+        if (this.em != null) {
+            if (typeCast(JsonDictionaryArray.$, this.em) !== null) {
+                var w = this.em;
                 if (w.items != null) {
                     var z = w.items;
                     for (var y = 0; y < z.length; y++) {
@@ -3775,52 +3789,52 @@ var CodeGeneratingComponentRenderer = /** @class */ /*@__PURE__*/ (function (_su
                     }
                 }
             }
-            else if (typeCast(JsonDictionaryValue.$, this.eh) !== null) {
-                var aa = this.eh;
+            else if (typeCast(JsonDictionaryValue.$, this.em) !== null) {
+                var aa = this.em;
                 q.add(aa.value.toString());
             }
         }
         o.s(p.toArray(), q.toArray());
-        var ab = this.ec(this.ee, b);
+        var ab = this.eh(this.ej, b);
         ab.r();
-        this.et(b, a);
+        this.ey(b, a);
         return b;
     };
-    CodeGeneratingComponentRenderer.prototype.et = function (a, b) {
+    CodeGeneratingComponentRenderer.prototype.ey = function (a, b) {
         b.execute(a);
     };
-    CodeGeneratingComponentRenderer.prototype.bd = function () {
-        return runOn(this, this.er);
+    CodeGeneratingComponentRenderer.prototype.be = function () {
+        return runOn(this, this.ew);
     };
-    CodeGeneratingComponentRenderer.prototype.eq = function (a) {
+    CodeGeneratingComponentRenderer.prototype.ev = function (a) {
         a = stringReplace(a, "-", "_");
-        if (!this.ee.e) {
-            switch (this.ef) {
+        if (!this.ej.e) {
+            switch (this.ek) {
                 case 1:
                 case 2:
-                case 3: return CodeGeneratingComponentRenderer.em(a);
+                case 3: return CodeGeneratingComponentRenderer.er(a);
                 case 4:
                 case 0:
-                case 5: return CodeGeneratingComponentRenderer.en(a);
+                case 5: return CodeGeneratingComponentRenderer.es(a);
             }
         }
         return a;
     };
-    CodeGeneratingComponentRenderer.prototype.er = function (a) {
+    CodeGeneratingComponentRenderer.prototype.ew = function (a) {
         var b = a;
         if (stringStartsWith(a, "{")) {
             if (!stringStartsWith(a, "{[")) {
                 a = a.substr(1, a.length - 2);
-                a = "{" + this.eq(a) + "}";
+                a = "{" + this.ev(a) + "}";
                 b = a;
             }
         }
         else {
-            b = this.eq(a);
+            b = this.ev(a);
         }
         return b;
     };
-    CodeGeneratingComponentRenderer.el = function (a) {
+    CodeGeneratingComponentRenderer.eq = function (a) {
         switch (a) {
             case 1: return 3;
             case 2: return 2;
@@ -3866,14 +3880,14 @@ var CodeGenerationContainer = /** @class */ /*@__PURE__*/ (function (_super) {
         try {
             for (var _b = __values(fromEnum(this.a)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var i = _c.value;
-                var j = c.d8(i, d, b);
+                var j = c.ed(i, d, b);
                 i.u(j, true);
                 var k = j.toString();
                 b.addContainerResult(this.id, k);
-                j.bc(e);
-                j.bf(f);
-                j.bb(g);
-                j.bd(a, h);
+                j.be(e);
+                j.bh(f);
+                j.bd(g);
+                j.bf(a, h);
             }
         }
         catch (e_14_1) {
@@ -3986,31 +4000,31 @@ var CodeGenerationItemBuilder = /** @class */ /*@__PURE__*/ (function (_super) {
         var c = this.m();
         if (b) {
             var d = this.p();
-            a.a3 = d;
+            a.a5 = d;
         }
         var e = false;
         var f = false;
         if (this.f.containsKey("Name")) {
             e = true;
-            a.bn(this.f.item("Name").c);
+            a.bp(this.f.item("Name").c);
         }
         else if (this.f.containsKey("name")) {
             e = true;
-            a.bn(this.f.item("name").c);
+            a.bp(this.f.item("name").c);
         }
         else {
             if (b && this.t != null) {
                 e = true;
-                a.bn(this.t);
+                a.bp(this.t);
             }
             else if (this.e(this.c, a)) {
                 f = true;
-                a.bm(c);
+                a.bo(c);
                 if (a.y) {
                     this.g.add("name");
                     this.f.addItem("name", ((function () {
                         var $ret = new CodeGenerationItemBuilderPropertyInfo();
-                        $ret.c = a.an;
+                        $ret.c = a.ap;
                         return $ret;
                     })()));
                 }
@@ -4018,13 +4032,13 @@ var CodeGenerationItemBuilder = /** @class */ /*@__PURE__*/ (function (_super) {
                     this.g.add("Name");
                     this.f.addItem("Name", ((function () {
                         var $ret = new CodeGenerationItemBuilderPropertyInfo();
-                        $ret.c = a.an;
+                        $ret.c = a.ap;
                         return $ret;
                     })()));
                 }
             }
         }
-        a.ba(this.q(), this.j, this.c);
+        a.bc(this.q(), this.j, this.c);
         var g = 0;
         try {
             for (var _c = __values(fromEnum(this.g)), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -4034,7 +4048,7 @@ var CodeGenerationItemBuilder = /** @class */ /*@__PURE__*/ (function (_super) {
                     continue;
                 }
                 if (this.d(a, h, i)) {
-                    a.bg(g, h, i, this.c);
+                    a.bi(g, h, i, this.c);
                     g++;
                 }
             }
@@ -4052,7 +4066,7 @@ var CodeGenerationItemBuilder = /** @class */ /*@__PURE__*/ (function (_super) {
                     throw e_15.error;
             }
         }
-        a.bo();
+        a.bq();
         var j = 0;
         try {
             for (var _e = __values(fromEnum(this.g)), _f = _e.next(); !_f.done; _f = _e.next()) {
@@ -4062,7 +4076,7 @@ var CodeGenerationItemBuilder = /** @class */ /*@__PURE__*/ (function (_super) {
                     continue;
                 }
                 if (!this.d(a, k, l)) {
-                    a.bh(j, k, l, this.c);
+                    a.bj(j, k, l, this.c);
                     j++;
                 }
             }
@@ -4080,14 +4094,14 @@ var CodeGenerationItemBuilder = /** @class */ /*@__PURE__*/ (function (_super) {
                     throw e_16.error;
             }
         }
-        a.bi(j);
-        a.bj(c);
+        a.bk(j);
+        a.bl(c);
         if (e) {
-            a.bl();
+            a.bn();
         }
         else {
             if (f) {
-                a.bk();
+                a.bm();
             }
         }
     };