igniteui-angular-core 16.1.2-beta.0 → 17.0.0-beta.0

package/esm2015/lib/CodeGeneratingComponentRendererCodeEmitter_combined.js

@@ -4,7 +4,7 @@ https://www.infragistics.com/legal/license/igultimate-la
 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 { Base, IList_$type, NotSupportedException, String_$type, typeCast, Array_$type, fromEnum, Boolean_$type, markType, EnumUtil, fromEn, Number_$type, runOn } from "./type";
+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 { CodeGenerationTargetPlatforms_$type } from "./CodeGenerationTargetPlatforms";
 import { CodeGeneratingRendererResult } from "./CodeGeneratingRendererResult";
 import { CodeGeneratingCodeWriter } from "./CodeGeneratingCodeWriter";
@@ -13,8 +13,11 @@ import { CodeGenerationItemBuilderPropertyInfo } from "./CodeGenerationItemBuild
 import { List$1 } from "./List$1";
 import { TypeDescriptionContext } from "./TypeDescriptionContext";
 import { TypeDescriptionMetadata } from "./TypeDescriptionMetadata";
+import { Rect } from "./Rect";
+import { Size } from "./Size";
 import { CodeGenerationSpecialValue } from "./CodeGenerationSpecialValue";
 import { ColorUtil } from "./ColorUtil";
+import { Brush } from "./Brush";
 import { StringBuilder } from "./StringBuilder";
 import { CodeGeneratingImportManager } from "./CodeGeneratingImportManager";
 import { stringIsNullOrEmpty, stringReplace, stringStartsWith, stringEndsWith, stringContains } from "./string";
@@ -27,6 +30,8 @@ import { Dictionary$2 } from "./Dictionary$2";
 import { JsonDictionaryValue } from "./JsonDictionaryValue";
 import { JsonDictionaryObject } from "./JsonDictionaryObject";
 import { JsonDictionaryArray } from "./JsonDictionaryArray";
+import { isNaN_ } from "./number";
+import { timeSpanFromMilliseconds } from "./timespan";
 import { ComponentRenderer } from "./ComponentRenderer";
 import { DotNetCodeGeneratingComponentRendererHandlerEmitter } from "./DotNetCodeGeneratingComponentRendererHandlerEmitter";
 import { TSCodeGeneratingComponentRendererTemplateEmitter } from "./TSCodeGeneratingComponentRendererTemplateEmitter";
@@ -46,17 +51,17 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
             super();
             this.l = null;
             this.j = null;
-            this.y = new List$1(CodeGenerationItemBuilderPropertyInfo.$, 0);
+            this.z = new List$1(CodeGenerationItemBuilderPropertyInfo.$, 0);
             this.d = null;
             this.a = null;
             this.c = null;
             this.b = null;
-            this.z = new List$1(String_$type, 0);
-            this.ac = new Stack$1(String_$type);
-            this.aa = new Stack$1(String_$type);
-            this.ab = new Stack$1(Boolean_$type);
+            this.aa = new List$1(String_$type, 0);
+            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.a1 = null;
             this.l = a;
             this.j = b;
             this.d = new CodeGeneratingCodeWriter(this.l);
@@ -64,7 +69,7 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
             this.c = new CodeGeneratingCodeWriter(this.l);
             this.b = new CodeGeneratingCodeWriter(this.l);
         }
-        get_ai() {
+        get_aj() {
             switch (this.j.platform) {
                 case 1: return "Igx";
                 case 2: return "Igr";
@@ -75,10 +80,10 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
             }
             return "";
         }
-        get ai() {
-            return this.get_ai();
+        get aj() {
+            return this.get_aj();
         }
-        get_aj() {
+        get_ak() {
             switch (this.j.platform) {
                 case 1: return "Component";
                 case 2: return "";
@@ -88,10 +93,10 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
             }
             return "";
         }
-        get aj() {
-            return this.get_aj();
+        get ak() {
+            return this.get_ak();
         }
-        get a3() {
+        get a4() {
             switch (this.j.platform) {
                 case 1: return "angular";
                 case 2: return "react";
@@ -102,7 +107,7 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
         get m() {
             return this.l;
         }
-        bn(a) {
+        bp(a) {
             this.j.af(a);
         }
         get k() {
@@ -120,13 +125,13 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
         get f() {
             return this.b;
         }
-        a7(a) {
+        a9(a) {
             if (a == null || a == "any") {
                 return;
             }
-            this.z.add(a);
+            this.aa.add(a);
         }
-        v(a, b) {
+        w(a, b) {
             if (this.r) {
                 return false;
             }
@@ -151,7 +156,7 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
                 }
             }
             if (b.b != null && (b.b.knownType == 8 || b.b.knownType == 9 || b.b.knownType == 10)) {
-                if (this.v(a, b)) {
+                if (this.w(a, b)) {
                     return true;
                 }
             }
@@ -165,50 +170,57 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        get an() {
-            return this.ac.d();
+        get ao() {
+            return this.ad.d();
         }
-        a8(a, b, c) {
-            this.ac.h(a);
+        ba(a, b, c) {
+            this.ad.h(a);
         }
-        bm() {
+        u(a, b) {
+            let c = false;
+            if (b.getMetadata(a, "__isPlainObject") != null) {
+                c = true;
+            }
+            return c;
         }
-        bg(a) {
+        bo() {
         }
-        bh(a) {
-            this.ac.e();
+        bi(a) {
         }
-        be(a, b, c, d) {
+        bj(a) {
+            this.ad.e();
         }
-        bf(a, b, c, d) {
-            this.be(a, b, c, d);
+        bg(a, b, c, d) {
+        }
+        bh(a, b, c, d) {
+            this.bg(a, b, c, d);
         }
         toString() {
             return this.d.toString();
         }
-        ax() {
+        ay() {
             return "null";
         }
-        a0(a, b, c) {
+        a1(a, b, c) {
             if (b.b == null) {
                 return b.c;
             }
             if (typeCast(CodeGenerationSpecialValue.$, b.c) !== null) {
-                b.c = this.ad(b);
+                b.c = this.ae(b);
             }
             switch (b.b.knownType) {
                 case 10:
-                    if (this.v(a, b)) {
-                        return this.al(a, b);
+                    if (this.w(a, b)) {
+                        return this.am(a, b);
                     }
-                    return this.aq(a, b);
+                    return this.ar(a, b);
                 case 23:
-                    if (this.v(a, b)) {
-                        return this.al(a, b);
+                    if (this.w(a, b)) {
+                        return this.am(a, b);
                     }
-                    return this.aq(a, b);
+                    return this.ar(a, b);
                 case 7: return b.c ? "true" : "false";
-                case 4: return this.af(b);
+                case 4: return this.ag(b);
                 case 6:
                     {
                         let d = "";
@@ -217,17 +229,17 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
                             if (f >= 1) {
                                 d += " ";
                             }
-                            d += this.ae(e.item(f));
+                            d += this.af(e.item(f));
                         }
                         return d;
                     }
                     break;
                 case 9:
-                    if (this.v(a, b)) {
-                        return this.al(a, b);
+                    if (this.w(a, b)) {
+                        return this.am(a, b);
                     }
                     throw new NotSupportedException(1, "shouldn't get here");
-                case 5: return this.ah(b);
+                case 5: return this.ai(b);
                 case 16:
                     {
                         let g = "";
@@ -236,55 +248,55 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
                             if (i >= 1) {
                                 g += " ";
                             }
-                            g += this.ag(h.item(i));
+                            g += this.ah(h.item(i));
                         }
                         return g;
                     }
                     break;
                 case 20:
                     if (b.a != null) {
-                        return this.az(b);
+                        return this.a0(b);
                     }
                     if (b.c == null) {
-                        return this.ax();
+                        return this.ay();
                     }
                     break;
                 case 22:
                     if (b.a != null) {
-                        return this.az(b);
+                        return this.a0(b);
                     }
                     if (b.c == null) {
-                        return this.ax();
+                        return this.ay();
                     }
                     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.au(b);
+                        return this.av(b);
                     }
                     else {
-                        return this.ax();
+                        return this.ay();
                     }
                     break;
                 case 8:
                     if (b.b.specificExternalType == "string") {
-                        return this.at(b);
+                        return this.au(b);
                     }
                     if (b.a != null) {
-                        return this.av(b);
+                        return this.aw(b);
                     }
-                    if (this.v(a, b)) {
-                        return this.al(a, b);
+                    if (this.w(a, b)) {
+                        return this.am(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.aw(b);
+                        return this.ax(b);
                     }
                     else {
-                        return this.ax();
+                        return this.ay();
                     }
                     break;
                 case 1: return b.c.toString();
@@ -303,8 +315,8 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
                         let l = b.c;
                         return l.width + ", " + l.height;
                     }
-                case 2: return b.c != null ? b.c.toString() : this.ax();
-                case 21: return b.c.toString();
+                case 2: return b.c != null ? b.c.toString() : this.ay();
+                case 21: return this.a7(b.c);
                 case 17:
                     if (b.c == null) {
                         return "null";
@@ -317,63 +329,73 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
             }
             return "";
         }
-        al(a, b) {
-            let c = this.a5(a, b);
+        a7(a) {
+            if (a == null) {
+                return "";
+            }
+            return a.toString();
+        }
+        am(a, b) {
+            let c = this.a6(a, b);
             if (b.c != null) {
-                if (typeCast(CodeGenerationItemBuilder.$, b.c) !== null) {
-                    let d = this.i(this.l, this.j);
-                    let e = this.ak(c, b.c, d);
-                    c = this.ao(a, b.c, e, c);
-                }
-                else if (typeCast(Array_$type, b.c) !== null) {
-                    let f = b.c;
-                    let g = new List$1(CodeGenerationItemBuilder.$, 0);
-                    let h = new List$1(String_$type, 0);
-                    for (let i = 0; i < f.length; i++) {
-                        if (typeCast(CodeGenerationItemBuilder.$, f[i]) !== null) {
-                            let j = this.i(this.l, this.j);
-                            let k = c;
-                            let l = f[i].o();
-                            if (l == null) {
-                                l = f[i].m();
-                                l = this.ar(l);
+                let d = b.c;
+                if (typeCast(List$1.$.specialize(Base.$), d) !== null) {
+                    d = d.toArray();
+                }
+                if (typeCast(CodeGenerationItemBuilder.$, d) !== null) {
+                    let e = this.i(this.l, this.j);
+                    let f = this.al(c, b.c, e);
+                    c = this.ap(a, b.c, f, c);
+                }
+                else if (typeCast(Array_$type, d) !== null) {
+                    let g = d;
+                    let h = new List$1(CodeGenerationItemBuilder.$, 0);
+                    let i = new List$1(String_$type, 0);
+                    for (let j = 0; j < g.length; j++) {
+                        if (typeCast(CodeGenerationItemBuilder.$, g[j]) !== null) {
+                            let k = this.i(this.l, this.j);
+                            let l = c;
+                            let m = g[j].o();
+                            if (m == null) {
+                                m = g[j].m();
+                                m = this.as(m);
                             }
-                            if (l != null) {
-                                if (l != k) {
-                                    k = l;
+                            if (m != null) {
+                                if (m != l) {
+                                    l = m;
                                 }
                                 else {
-                                    k = c + "_" + i.toString();
+                                    l = c + "_" + j.toString();
                                 }
                             }
-                            let m = this.ak(k, f[i], j);
-                            g.add(f[i]);
-                            h.add(m);
+                            let n = this.al(l, g[j], k);
+                            h.add(g[j]);
+                            i.add(n);
                         }
                     }
-                    c = this.ap(b, a, g, h, c);
+                    c = this.aq(b, a, h, i, c);
                 }
             }
             return c;
         }
-        ak(a, b, c) {
+        al(a, b, c) {
             b.t = a;
             b.u(c, true);
             let d = c.toString();
-            for (let e of fromEnum(c.z)) {
-                this.z.add(e);
+            for (let e of fromEnum(c.aa)) {
+                this.aa.add(e);
             }
             return d;
         }
-        ao(a, b, c, d) {
+        ap(a, b, c, d) {
             return d;
         }
-        ap(a, b, c, d, e) {
+        aq(a, b, c, d, e) {
             return e;
         }
-        a5(a, b) {
+        a6(a, b) {
             if (b.c == null) {
-                return this.ax();
+                return this.ay();
             }
             if (typeCast(CodeGenerationItemBuilder.$, b.c) !== null) {
                 let c = b.c.o();
@@ -381,7 +403,7 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
                     return c;
                 }
                 let d = b.c.m();
-                let e = this.ar(d);
+                let e = this.as(d);
                 return e;
             }
             else if (typeCast(IList_$type, b.c) !== null) {
@@ -393,10 +415,10 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
                         return h;
                     }
                     let i = g.m();
-                    let j = this.ar(i);
+                    let j = this.as(i);
                     return j;
                 }
-                return this.ar(b.b.propertyName);
+                return this.as(b.b.propertyName);
             }
             else if (typeCast(Array_$type, b.c) !== null) {
                 let k = b.c;
@@ -406,29 +428,29 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
                         return l;
                     }
                     let m = b.c.m();
-                    let n = this.ar(m);
+                    let n = this.as(m);
                     return n;
                 }
-                return this.ar(b.b.propertyName);
+                return this.as(b.b.propertyName);
             }
-            return this.ax();
+            return this.ay();
         }
-        aq(a, b) {
+        ar(a, b) {
             return "";
         }
-        ad(a) {
+        ae(a) {
             return a.c;
         }
-        az(a) {
+        a0(a) {
             if (!stringIsNullOrEmpty(a.a.e)) {
                 if (a.a.a) {
-                    return this.as(a);
+                    return this.at(a);
                 }
                 else {
-                    return this.ay(a);
+                    return this.az(a);
                 }
             }
-            return this.ax();
+            return this.ay();
         }
         s(a) {
             if (a.a != null && !stringIsNullOrEmpty(a.a.e)) {
@@ -438,110 +460,110 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        ay(a) {
+        az(a) {
             return "";
         }
-        as(a) {
+        at(a) {
             return "";
         }
-        av(a) {
+        aw(a) {
             if (!stringIsNullOrEmpty(a.a.e)) {
                 return a.a.e;
             }
-            return this.ax();
+            return this.ay();
         }
-        at(a) {
+        au(a) {
             return a.c != null ? a.c.toString() : "";
         }
-        aw(a) {
-            return this.au(a);
+        ax(a) {
+            return this.av(a);
         }
-        au(a) {
+        av(a) {
             if (!stringIsNullOrEmpty(a.a.e)) {
-                this.bn(a);
+                this.bp(a);
                 return a.a.e;
             }
-            return this.ax();
+            return this.ay();
         }
-        get_w() {
+        get_x() {
             return false;
         }
-        get w() {
-            return this.get_w();
+        get x() {
+            return this.get_x();
         }
-        ah(a) {
+        ai(a) {
             let b = a.c;
-            return ColorUtil.i(b, this.w);
+            return ColorUtil.i(b, this.x);
         }
-        ag(a) {
+        ah(a) {
             let b = a;
-            return ColorUtil.i(b, this.w);
+            return ColorUtil.i(b, this.x);
         }
-        af(a) {
+        ag(a) {
             if (a.c == null) {
                 return "";
             }
             let b = a.c;
-            return ColorUtil.i(b.color, this.w);
+            return ColorUtil.i(b.color, this.x);
         }
-        ae(a) {
+        af(a) {
             if (a == null) {
                 return "";
             }
             let b = a;
-            return ColorUtil.i(b.color, this.w);
+            return ColorUtil.i(b.color, this.x);
         }
-        bl(a) {
-            this.aa.h(a);
-            this.ab.h(false);
+        bn(a) {
+            this.ab.h(a);
+            this.ac.h(false);
         }
-        bk(a) {
-            let b = this.ar(a);
-            this.aa.h(b);
-            this.ab.h(true);
+        bm(a) {
+            let b = this.as(a);
+            this.ab.h(b);
+            this.ac.h(true);
         }
-        ar(a) {
-            let b = stringReplace(stringReplace(a, this.a4, ""), "Component", "");
+        as(a) {
+            let b = stringReplace(stringReplace(a, this.a5, ""), "Component", "");
             b = CodeGeneratingComponentRenderer.d4(b);
             return this.j.v(b);
         }
-        bi() {
-            this.a1 = this.aa.e();
-            this.ab.e();
+        bk() {
+            this.a2 = this.ab.e();
+            this.ac.e();
         }
-        get_a4() {
+        get_a5() {
             return "";
         }
-        get a4() {
-            return this.get_a4();
+        get a5() {
+            return this.get_a5();
         }
-        get am() {
-            if (this.aa.f > 0) {
-                return this.aa.d();
+        get an() {
+            if (this.ab.f > 0) {
+                return this.ab.d();
             }
-            let a = stringReplace(stringReplace(this.an, this.a4, ""), "Component", "");
+            let a = stringReplace(stringReplace(this.ao, this.a5, ""), "Component", "");
             return CodeGeneratingComponentRenderer.d4(a);
         }
-        get u() {
-            return this.ac.f == 1;
+        get v() {
+            return this.ad.f == 1;
         }
         get o() {
-            if (this.ab.f == 0) {
+            if (this.ac.f == 0) {
                 return false;
             }
-            return this.ab.d();
+            return this.ac.d();
         }
         get p() {
-            if (this.aa.f > 0) {
+            if (this.ab.f > 0) {
                 return true;
             }
             return false;
         }
-        get_x() {
+        get_y() {
             return true;
         }
-        get x() {
-            return this.get_x();
+        get y() {
+            return this.get_y();
         }
         get_n() {
             return this.r;
@@ -549,33 +571,33 @@ export let CodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (() => {
         get n() {
             return this.get_n();
         }
-        bj() {
-            this.a1 = this.aa.e();
+        bl() {
+            this.a2 = this.ab.e();
         }
-        ba(a) {
+        bc(a) {
             let b = this.f.toString();
             if (b.length > 0) {
                 a.l(b);
             }
         }
-        bd(a) {
+        bf(a) {
             let b = this.g.toString();
             if (b.length > 0) {
                 a.l(b);
             }
         }
-        a9(a) {
+        bb(a) {
             let b = this.e.toString();
             if (b.length > 0) {
                 a.l(b);
             }
         }
-        bb(a, b) {
-            if (this.z.count > 0) {
-                this.bc(a, this.z, b);
+        bd(a, b) {
+            if (this.aa.count > 0) {
+                this.be(a, this.aa, b);
             }
         }
-        bc(a, b, c) {
+        be(a, b, c) {
         }
     }
     CodeGeneratingComponentRendererCodeEmitter.$t = markType(CodeGeneratingComponentRendererCodeEmitter, 'CodeGeneratingComponentRendererCodeEmitter');
@@ -588,9 +610,9 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
     class BlazorRazorCodeGeneratingComponentRendererCodeEmitter extends CodeGeneratingComponentRendererCodeEmitter {
         constructor(a, b) {
             super(a, b);
-            this.bq = 0;
-            this.bo = new HashSet$1(String_$type, 0);
-            this.bp = new HashSet$1(String_$type, 0);
+            this.bs = 0;
+            this.bq = new HashSet$1(String_$type, 0);
+            this.br = new HashSet$1(String_$type, 0);
         }
         get_r() {
             return false;
@@ -598,8 +620,8 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
         get r() {
             return this.get_r();
         }
-        ao(a, b, c, d) {
-            d = super.ao(a, b, c, d);
+        ap(a, b, c, d) {
+            d = super.ap(a, b, c, d);
             this.f.l("private " + b.m() + " _" + CodeGeneratingComponentRenderer.d4(d) + " = null;");
             this.f.l("public " + b.m() + " " + CodeGeneratingComponentRenderer.d5(d));
             this.f.l("{");
@@ -621,15 +643,15 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
             this.f.l("}");
             return CodeGeneratingComponentRenderer.d5(d);
         }
-        ap(a, b, c, d, e) {
-            e = super.ap(a, b, c, d, e);
+        aq(a, b, c, d, e) {
+            e = super.aq(a, b, c, d, e);
             let f = null;
             if (c.count > 0) {
                 f = c._inner[0].q() + "[]";
             }
             else {
                 let g = a.b.specificExternalType;
-                f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.ai, this.aj) + "[]";
+                f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.aj, this.ak) + "[]";
             }
             this.f.l("private " + f + " _" + CodeGeneratingComponentRenderer.d4(e) + " = null;");
             this.f.l("public " + f + " " + CodeGeneratingComponentRenderer.d5(e));
@@ -659,10 +681,10 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
         i(a, b) {
             return new BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        get_x() {
+        get_y() {
             return false;
         }
-        br(a, b, c) {
+        bt(a, b, c) {
             if (c.c == null) {
                 return "null";
             }
@@ -688,7 +710,7 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 f.b.knownType = 1;
             }
             if (f.b.knownType == 8) {
-                e = this.a4 + e;
+                e = this.a5 + e;
             }
             let g = "@(new " + e + "[] { ";
             for (let h = 0; h < d.length; h++) {
@@ -697,55 +719,55 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 }
                 f.c = d[h];
                 if (f.b.knownType == 2) {
-                    g += "\"" + this.a0(a, f, true) + "\"";
+                    g += "\"" + this.a1(a, f, true) + "\"";
                 }
                 else {
-                    g += this.a0(a, f, true);
+                    g += this.a1(a, f, true);
                 }
             }
             g += " })";
             return g;
         }
-        aq(a, b) {
+        ar(a, b) {
             let c = b.b.specificType;
             if (c == null) {
                 c = b.b.specificExternalType;
             }
-            return this.br(a, c, b);
+            return this.bt(a, c, b);
         }
-        a8(a, b, c) {
-            super.a8(a, b, c);
+        ba(a, b, c) {
+            super.ba(a, b, c);
             this.h.l("<" + a + "");
-            if (!this.bo.contains(this.am)) {
-                this.bo.add_1(this.am);
-                if (!this.bp.contains(this.an)) {
-                    this.bp.add_1(this.an);
-                    this.a7(this.an);
+            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.an + " " + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                this.f.l("private " + this.ao + " " + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                 if (!this.p) {
-                    if (this.u) {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                    if (this.v) {
+                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                     }
                 }
                 else {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                 }
             }
         }
-        bm() {
+        bo() {
             this.h.l(">");
             this.h.h();
         }
-        bh(a) {
+        bj(a) {
             this.h.f();
             this.h.l("</" + a + ">");
             this.h.l("");
-            super.bh(a);
+            super.bj(a);
         }
-        be(a, b, c, d) {
+        bg(a, b, c, d) {
             if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.d5(c.b.propertyName)) && this.q(d, c)) {
-                this.bn(c);
+                this.bp(c);
                 if (a > 0) {
                     this.h.l("");
                 }
@@ -758,29 +780,29 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 return;
             }
             if (this.s(c)) {
-                this.bn(c);
-                if (!this.bo.contains(this.am)) {
-                    this.bo.add_1(this.am);
-                    if (!this.bp.contains(this.an)) {
-                        this.bp.add_1(this.an);
-                        this.a7(this.an);
-                    }
-                    this.f.l("private " + this.an + " " + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                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.d4(this.an) + ";");
                     if (!this.p) {
-                        if (this.u) {
-                            this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                        if (this.v) {
+                            this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                         }
                     }
                     else {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                     }
                 }
-                let e = CodeGeneratingComponentRenderer.d4(this.a0(d, c, true));
+                let e = CodeGeneratingComponentRenderer.d4(this.a1(d, c, true));
                 let f = e;
                 if (f != "null" && !stringStartsWith(f, "this.")) {
                     f = "this." + f;
                 }
-                this.e.l(CodeGeneratingComponentRenderer.d4(this.am) + "." + b + " = " + f + ";");
+                this.e.l(CodeGeneratingComponentRenderer.d4(this.an) + "." + b + " = " + f + ";");
                 return;
             }
             if (a > 0) {
@@ -807,24 +829,24 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 this.h.j(b);
                 this.h.j("=");
                 this.h.j("\"");
-                this.h.j(this.a0(d, c, true));
+                this.h.j(this.a1(d, c, true));
                 this.h.j("\"");
             }
             if (b == "Name") {
                 this.h.l("");
-                this.h.j("@ref=\"" + CodeGeneratingComponentRenderer.d4(this.a0(d, c, true)) + "\"");
+                this.h.j("@ref=\"" + CodeGeneratingComponentRenderer.d4(this.a1(d, c, true)) + "\"");
             }
         }
-        at(a) {
+        au(a) {
             let b = a.b != null ? a.b.specificType + "." : "";
             return b + (a.c != null ? a.c.toString() : "");
         }
-        a0(a, b, c) {
+        a1(a, b, c) {
             if (b.b == null) {
                 return b.c;
             }
             if (typeCast(CodeGenerationSpecialValue.$, b.c) !== null) {
-                b.c = this.ad(b);
+                b.c = this.ae(b);
             }
             switch (b.b.knownType) {
                 case 11:
@@ -854,9 +876,9 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                     }
                     return b.c.toString();
             }
-            return super.a0(a, b, c);
+            return super.a1(a, b, c);
         }
-        ad(a) {
+        ae(a) {
             let b = a.c;
             switch (b.a) {
                 case 3: return b.b;
@@ -866,21 +888,21 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
             }
             return b.b;
         }
-        ax() {
+        ay() {
             return "@null";
         }
-        as(a) {
+        at(a) {
             return CodeGeneratingComponentRenderer.d4(CodeGeneratingComponentRenderer.d4(a.a.e));
         }
-        bs(a) {
+        bu(a) {
             a = stringReplace(a, "-", "_");
             return CodeGeneratingComponentRenderer.d5(a);
         }
-        ay(a) {
-            this.bn(a);
+        az(a) {
+            this.bp(a);
             return CodeGeneratingComponentRenderer.d5(a.a.e);
         }
-        bf(a, b, c, d) {
+        bh(a, b, c, d) {
             if (c.b.knownType == 9) {
                 let e = typeCast(IList_$type, c.c);
                 if (e != null) {
@@ -899,7 +921,7 @@ export let BlazorRazorCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 }
             }
         }
-        get_a4() {
+        get_a5() {
             return "Igb";
         }
     }
@@ -913,9 +935,9 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
     class BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter extends CodeGeneratingComponentRendererCodeEmitter {
         constructor(a, b) {
             super(a, b);
-            this.bq = 0;
-            this.bo = new HashSet$1(String_$type, 0);
-            this.bp = new HashSet$1(String_$type, 0);
+            this.bs = 0;
+            this.bq = new HashSet$1(String_$type, 0);
+            this.br = new HashSet$1(String_$type, 0);
         }
         get_r() {
             return true;
@@ -926,10 +948,10 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
         i(a, b) {
             return new BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        get_x() {
+        get_y() {
             return false;
         }
-        br(a, b) {
+        bt(a, b) {
             if (b.c == null) {
                 return "null";
             }
@@ -944,9 +966,9 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
             d += " }";
             return d;
         }
-        aq(a, b) {
+        ar(a, b) {
             if (b.b.specificExternalType == "string") {
-                return this.br(b.b.specificExternalType, b);
+                return this.bt(b.b.specificExternalType, b);
             }
             if (b.c == null) {
                 return "null";
@@ -961,74 +983,74 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
             }
             return d;
         }
-        a8(a, b, c) {
-            super.a8(a, b, c);
-            if (this.u) {
-                this.h.l("var " + this.am + " = new " + a + "();");
+        ba(a, b, c) {
+            super.ba(a, b, c);
+            if (this.v) {
+                this.h.l("var " + this.an + " = new " + a + "();");
             }
             else {
-                this.h.l("var " + this.am + " = new " + a + "();");
+                this.h.l("var " + this.an + " = new " + a + "();");
             }
-            if (!this.bo.contains(this.am)) {
-                this.bo.add_1(this.am);
-                if (!this.bp.contains(this.an)) {
-                    this.bp.add_1(this.an);
-                    this.a7(this.an);
+            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.an + " " + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                this.f.l("private " + this.ao + " " + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                 if (!this.p) {
-                    if (this.u) {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                    if (this.v) {
+                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                     }
                 }
                 else {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                 }
             }
         }
-        bm() {
+        bo() {
         }
-        bh(a) {
-            super.bh(a);
+        bj(a) {
+            super.bj(a);
         }
-        be(a, b, c, d) {
+        bg(a, b, c, d) {
             if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.d5(c.b.propertyName)) && this.q(d, c)) {
-                this.bn(c);
+                this.bp(c);
                 if (a > 0) {
                     this.h.l("");
                 }
                 if (c.a == null || c.a.e == null) {
-                    this.h.j(this.am + "." + b + "Name = null;");
+                    this.h.j(this.an + "." + b + "Name = null;");
                 }
                 else {
-                    this.h.j(this.am + "." + b + "Name = " + c.a.e + ";");
+                    this.h.j(this.an + "." + b + "Name = " + c.a.e + ";");
                 }
                 return;
             }
             if (this.s(c)) {
-                this.bn(c);
-                if (!this.bo.contains(this.am)) {
-                    this.bo.add_1(this.am);
-                    if (!this.bp.contains(this.an)) {
-                        this.bp.add_1(this.an);
-                        this.a7(this.an);
-                    }
-                    this.f.l("private " + this.an + " " + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                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.d4(this.an) + ";");
                     if (!this.p) {
-                        if (this.u) {
-                            this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                        if (this.v) {
+                            this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                         }
                     }
                     else {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + ";");
+                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + ";");
                     }
                 }
-                let e = CodeGeneratingComponentRenderer.d4(this.a0(d, c, true));
+                let e = CodeGeneratingComponentRenderer.d4(this.a1(d, c, true));
                 let f = e;
                 if (f != "null" && !stringStartsWith(f, "this.")) {
                     f = "this." + f;
                 }
-                this.e.l(CodeGeneratingComponentRenderer.d4(this.am) + "." + b + " = " + f + ";");
+                this.e.l(CodeGeneratingComponentRenderer.d4(this.an) + "." + b + " = " + f + ";");
                 return;
             }
             if (a > 0) {
@@ -1054,28 +1076,28 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
                         }
                     }
                 }
-                this.h.j(this.am + ".");
+                this.h.j(this.an + ".");
                 this.h.j(b);
                 this.h.j(" = ");
                 if (h) {
-                    this.h.j("\"" + this.a0(d, c, true) + "\"");
+                    this.h.j("\"" + this.a1(d, c, true) + "\"");
                 }
                 else {
-                    this.h.j(this.a0(d, c, true));
+                    this.h.j(this.a1(d, c, true));
                 }
                 this.h.j(";");
             }
         }
-        at(a) {
+        au(a) {
             let b = a.b != null ? a.b.specificType + "." : "";
             return b + (a.c != null ? a.c.toString() : "");
         }
-        a0(a, b, c) {
+        a1(a, b, c) {
             if (b.b == null) {
                 return "\"" + b.c + "\"";
             }
             if (typeCast(CodeGenerationSpecialValue.$, b.c) !== null) {
-                b.c = this.ad(b);
+                b.c = this.ae(b);
             }
             switch (b.b.knownType) {
                 case 11:
@@ -1107,12 +1129,12 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
                 case 5:
                 case 6:
                 case 16:
-                case 2: return "\"" + super.a0(a, b, c) + "\"";
+                case 2: return "\"" + super.a1(a, b, c) + "\"";
                 case 9: throw new NotSupportedException(1, "shouldn't get here");
             }
-            return super.a0(a, b, c);
+            return super.a1(a, b, c);
         }
-        ad(a) {
+        ae(a) {
             let b = a.c;
             switch (b.a) {
                 case 3: return b.b;
@@ -1122,21 +1144,21 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
             }
             return b.b;
         }
-        ax() {
+        ay() {
             return "null";
         }
-        as(a) {
+        at(a) {
             return CodeGeneratingComponentRenderer.d4(CodeGeneratingComponentRenderer.d4(a.a.e));
         }
-        bs(a) {
+        bu(a) {
             a = stringReplace(a, "-", "_");
             return CodeGeneratingComponentRenderer.d5(a);
         }
-        ay(a) {
-            this.bn(a);
+        az(a) {
+            this.bp(a);
             return CodeGeneratingComponentRenderer.d5(a.a.e);
         }
-        bf(a, b, c, d) {
+        bh(a, b, c, d) {
             if (c.b.knownType == 9) {
                 let e = typeCast(IList_$type, c.c);
                 if (e != null) {
@@ -1144,7 +1166,7 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
                         if (typeCast(CodeGenerationItemBuilder.$, f) !== null) {
                             let g = f;
                             g.u(this, false);
-                            this.h.l(this.am + "." + b + ".Add(" + this.a1 + ");");
+                            this.h.l(this.an + "." + b + ".Add(" + this.a2 + ");");
                         }
                     }
                 }
@@ -1153,11 +1175,11 @@ export let BlazorCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PUR
                 if (typeCast(CodeGenerationItemBuilder.$, c.c) !== null) {
                     let h = c.c;
                     h.u(this, false);
-                    this.h.l(this.am + "." + b + " = " + this.a1 + ";");
+                    this.h.l(this.an + "." + b + " = " + this.a2 + ";");
                 }
             }
         }
-        get_a4() {
+        get_a5() {
             return "Igb";
         }
     }
@@ -1171,8 +1193,8 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
     class ReactMarkupCodeGeneratingComponentRendererCodeEmitter extends CodeGeneratingComponentRendererCodeEmitter {
         constructor(a, b) {
             super(a, b);
-            this.bo = new HashSet$1(String_$type, 0);
-            this.bp = new HashSet$1(String_$type, 0);
+            this.bq = new HashSet$1(String_$type, 0);
+            this.br = new HashSet$1(String_$type, 0);
         }
         get_r() {
             return false;
@@ -1180,8 +1202,8 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
         get r() {
             return this.get_r();
         }
-        ao(a, b, c, d) {
-            d = super.ao(a, b, c, d);
+        ap(a, b, c, d) {
+            d = super.ap(a, b, c, d);
             let e = b.q();
             this.f.l("private " + " _" + CodeGeneratingComponentRenderer.d4(d) + ": " + e + " | null = null;");
             this.f.l("public get " + CodeGeneratingComponentRenderer.d4(d) + "(): " + e + " {");
@@ -1198,15 +1220,15 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
             this.f.l("}");
             return CodeGeneratingComponentRenderer.d5(d);
         }
-        ap(a, b, c, d, e) {
-            e = super.ap(a, b, c, d, e);
+        aq(a, b, c, d, e) {
+            e = super.aq(a, b, c, d, e);
             let f = null;
             if (c.count > 0) {
                 f = c._inner[0].q() + "[]";
             }
             else {
                 let g = a.b.specificExternalType;
-                f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.ai, this.aj) + "[]";
+                f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.aj, this.ak) + "[]";
             }
             this.f.l("private" + " _" + CodeGeneratingComponentRenderer.d4(e) + ": " + f + " | null = null;");
             this.f.l("public get " + CodeGeneratingComponentRenderer.d4(e) + "(): " + f + " {");
@@ -1230,7 +1252,7 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
         i(a, b) {
             return new ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        aq(a, b) {
+        ar(a, b) {
             if (b.c == null) {
                 return "{null}";
             }
@@ -1251,48 +1273,53 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 if (h > 0) {
                     g += ", ";
                 }
-                g += "\"" + f[h].toString() + "\"";
+                if (b.b != null && (b.b.specificExternalType == "int" || b.b.specificExternalType == "double")) {
+                    g += f[h].toString();
+                }
+                else {
+                    g += "\"" + f[h].toString() + "\"";
+                }
             }
             g += "]";
             return g;
         }
-        get_w() {
+        get_x() {
             return true;
         }
-        get_a4() {
+        get_a5() {
             return "Igr";
         }
-        a8(a, b, c) {
-            super.a8(a, b, c);
-            this.h.l("<" + this.br(a) + "");
+        ba(a, b, c) {
+            super.ba(a, b, c);
+            this.h.l("<" + this.bt(a) + "");
             this.h.h();
-            if (!this.bp.contains(this.an)) {
-                this.bp.add_1(this.an);
-                this.a7(this.an);
-            }
-            if (!this.bo.contains(this.am)) {
-                this.bo.add_1(this.am);
-                this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.am) + ": " + this.an);
-                if (this.u) {
-                    this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.am) + "Ref(r: " + this.an + ") {");
+            if (!this.br.contains(this.ao)) {
+                this.br.add_1(this.ao);
+                this.a9(this.ao);
+            }
+            if (!this.bq.contains(this.an)) {
+                this.bq.add_1(this.an);
+                this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.an) + ": " + this.ao);
+                if (this.v) {
+                    this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.an) + "Ref(r: " + this.ao + ") {");
                     this.f.h();
-                    this.f.l("this." + CodeGeneratingComponentRenderer.d4(this.am) + " = r;");
+                    this.f.l("this." + CodeGeneratingComponentRenderer.d4(this.an) + " = r;");
                     this.f.l("this.setState({});");
                     this.f.f();
                     this.f.l("}");
-                    this.g.l("this." + CodeGeneratingComponentRenderer.d4(this.am) + "Ref = " + "this." + CodeGeneratingComponentRenderer.d4(this.am) + "Ref.bind(this);");
+                    this.g.l("this." + CodeGeneratingComponentRenderer.d4(this.an) + "Ref = " + "this." + CodeGeneratingComponentRenderer.d4(this.an) + "Ref.bind(this);");
                 }
             }
         }
-        br(a) {
+        bt(a) {
             if (stringEndsWith(a, "Component")) {
                 a = a.substr(0, a.length - ("Component").length);
             }
             return CodeGeneratingComponentRenderer.d5(a);
         }
-        bm() {
-            if (!this.u && !this.p) {
-                let a = this.bq();
+        bo() {
+            if (!this.v && !this.p) {
+                let a = this.bs();
                 this.h.l("");
                 this.h.l("name=\"" + a + "\"");
             }
@@ -1300,31 +1327,31 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
             this.h.l(">");
             this.h.h();
         }
-        bq() {
-            let a = CodeGeneratingComponentRenderer.d4(stringReplace(stringReplace(this.an, this.a4, ""), "Component", ""));
+        bs() {
+            let a = CodeGeneratingComponentRenderer.d4(stringReplace(stringReplace(this.ao, this.a5, ""), "Component", ""));
             a = this.k.u(a);
             return a;
         }
-        au(a) {
+        av(a) {
             if (!stringIsNullOrEmpty(a.a.e)) {
-                this.bn(a);
-                if (!this.bo.contains(a.a.e)) {
+                this.bp(a);
+                if (!this.bq.contains(a.a.e)) {
                     this.g.l("this." + CodeGeneratingComponentRenderer.d4(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.d4(a.a.e) + ".bind(this);");
                 }
                 return "this." + CodeGeneratingComponentRenderer.d4(a.a.e);
             }
-            return this.ax();
+            return this.ay();
         }
-        bh(a) {
+        bj(a) {
             this.h.f();
-            this.h.l("</" + this.br(a) + ">");
-            super.bh(a);
+            this.h.l("</" + this.bt(a) + ">");
+            super.bj(a);
         }
-        be(a, b, c, d) {
+        bg(a, b, c, d) {
             let e = CodeGeneratingComponentRenderer.d4(b);
-            let f = this.a0(d, c, true);
+            let f = this.a1(d, c, true);
             if (c.b != null && d.hasNameBinding(c.b.owningType, CodeGeneratingComponentRenderer.d5(c.b.propertyName)) && this.q(d, c)) {
-                this.bn(c);
+                this.bp(c);
                 if (a > 0) {
                     this.h.l("");
                 }
@@ -1336,10 +1363,18 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 }
                 return;
             }
-            if (!(e == "name") || !this.u) {
+            if (!(e == "name") || !this.v) {
                 let g = (c.b != null && c.b.knownType == 10);
-                if (this.q(d, c) || g) {
-                    this.bn(c);
+                if (this.q(d, c)) {
+                    this.bp(c);
+                    let h = CodeGeneratingComponentRenderer.d4(f);
+                    let i = h;
+                    if (i != "null" && !stringStartsWith(i, "this.")) {
+                        i = "this." + i;
+                    }
+                    f = "{" + i + "}";
+                }
+                else if (g) {
                     f = "{" + f + "}";
                 }
                 if (a > 0) {
@@ -1357,15 +1392,15 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 a++;
             }
             if (e == "name") {
-                if (this.u) {
+                if (this.v) {
                     if (a > 0) {
                         this.h.l("");
                     }
-                    this.h.j("ref={this." + CodeGeneratingComponentRenderer.d4(this.a0(d, c, true)) + "Ref}");
+                    this.h.j("ref={this." + CodeGeneratingComponentRenderer.d4(this.a1(d, c, true)) + "Ref}");
                 }
             }
         }
-        ad(a) {
+        ae(a) {
             let b = a.c;
             switch (b.a) {
                 case 3: return b.b;
@@ -1375,16 +1410,16 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
             }
             return b.b;
         }
-        ax() {
+        ay() {
             return "null";
         }
-        as(a) {
+        at(a) {
             return "this." + CodeGeneratingComponentRenderer.d4(a.a.e);
         }
-        ay(a) {
+        az(a) {
             return "this." + CodeGeneratingComponentRenderer.d4(a.a.e);
         }
-        bf(a, b, c, d) {
+        bh(a, b, c, d) {
             if (c.b.knownType == 9) {
                 let e = typeCast(IList_$type, c.c);
                 if (e != null) {
@@ -1403,9 +1438,9 @@ export let ReactMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/
                 }
             }
         }
-        bc(a, b, c) {
-            super.bc(a, b, c);
-            WebImportsHalper.a(this.k, this.a3, this.a2, this.a4, a, b, c);
+        be(a, b, c) {
+            super.be(a, b, c);
+            WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
         }
     }
     ReactMarkupCodeGeneratingComponentRendererCodeEmitter.$t = markType(ReactMarkupCodeGeneratingComponentRendererCodeEmitter, 'ReactMarkupCodeGeneratingComponentRendererCodeEmitter', CodeGeneratingComponentRendererCodeEmitter.$);
@@ -1418,9 +1453,9 @@ export let WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
     class WebCodeBehindCodeGeneratingComponentRendererCodeEmitter extends CodeGeneratingComponentRendererCodeEmitter {
         constructor(a, b) {
             super(a, b);
-            this.br = 0;
-            this.bp = new HashSet$1(String_$type, 0);
-            this.bq = new HashSet$1(String_$type, 0);
+            this.bt = 0;
+            this.br = new HashSet$1(String_$type, 0);
+            this.bs = new HashSet$1(String_$type, 0);
         }
         get_r() {
             return true;
@@ -1428,42 +1463,42 @@ export let WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
         get r() {
             return this.get_r();
         }
-        bo(a) {
+        bq(a) {
             if (!a.b.owningContext.hasStringUnionPlatforms(a.b.owningType, a.b.propertyName)) {
                 return false;
             }
             let b = a.b.owningContext.getStringUnionPlatforms(a.b.owningType, a.b.propertyName);
             for (let c = 0; c < b.length; c++) {
-                if (b[c].toLowerCase() == this.a3) {
+                if (b[c].toLowerCase() == this.a4) {
                     return true;
                 }
             }
             return false;
         }
-        at(a) {
-            if (this.bo(a)) {
+        au(a) {
+            if (this.bq(a)) {
                 return "\"" + CodeGeneratingComponentRenderer.d6(a.c.toString()) + "\"";
             }
             else {
-                if (!this.bq.contains(a.b.specificType)) {
-                    this.bq.add_1(a.b.specificType);
+                if (!this.bs.contains(a.b.specificType)) {
+                    this.bs.add_1(a.b.specificType);
                     if (a.b.owningContext.getMetadata(a.b.owningType, "__importTypes" + EnumUtil.getName(CodeGenerationTargetPlatforms_$type, this.k.platform)) != null) {
                         let b = a.b.owningContext.getMetadata(a.b.owningType, "__importTypes" + EnumUtil.getName(CodeGenerationTargetPlatforms_$type, this.k.platform)).specificExternalType;
-                        this.a7(a.b.specificType + ":" + b);
+                        this.a9(a.b.specificType + ":" + b);
                     }
                     else if (a.b.owningContext.getMetadata("Web" + a.b.owningType, "__importTypes" + EnumUtil.getName(CodeGenerationTargetPlatforms_$type, this.k.platform)) != null) {
                         let c = a.b.owningContext.getMetadata("Web" + a.b.owningType, "__importTypes" + EnumUtil.getName(CodeGenerationTargetPlatforms_$type, this.k.platform)).specificExternalType;
-                        this.a7(a.b.specificType + ":" + c);
+                        this.a9(a.b.specificType + ":" + c);
                     }
                     else {
-                        this.a7(a.b.specificType);
+                        this.a9(a.b.specificType);
                     }
                 }
                 let d = a.b != null ? a.b.specificType + "." : "";
                 return d + (a.c != null ? a.c.toString() : "");
             }
         }
-        aq(a, b) {
+        ar(a, b) {
             if (b.c == null) {
                 return "null";
             }
@@ -1477,102 +1512,99 @@ export let WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
             }
             return d + "]";
         }
-        get_w() {
+        get_x() {
             return true;
         }
-        a8(a, b, c) {
-            super.a8(a, b, c);
-            let d = false;
-            if (c.getMetadata(b, "__isPlainObject") != null) {
-                d = true;
-            }
+        ba(a, b, c) {
+            super.ba(a, b, c);
+            let d = this.u(b, c);
             if (d) {
-                if (this.u) {
-                    this.h.l("var " + this.am + ": " + a + " = {} as " + a + ";");
+                if (this.v) {
+                    this.h.l("var " + this.an + ": " + a + " = {} as " + a + ";");
                 }
                 else {
-                    this.h.l("var " + this.am + ": " + a + " = {} as " + a + ";");
+                    this.h.l("var " + this.an + ": " + a + " = {} as " + a + ";");
                 }
             }
             else {
-                if (this.u) {
-                    this.h.l("var " + this.am + " = new " + a + "();");
+                if (this.v) {
+                    this.h.l("var " + this.an + " = new " + a + "();");
                 }
                 else {
-                    this.h.l("var " + this.am + " = new " + a + "();");
+                    this.h.l("var " + this.an + " = new " + a + "();");
                 }
             }
-            if (!this.bp.contains(this.am)) {
-                this.bp.add_1(this.am);
-                if (!this.bq.contains(this.an)) {
-                    this.bq.add_1(this.an);
-                    this.a7(this.an);
+            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.d4(this.am) + ": " + this.an);
+                this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.an) + ": " + this.ao);
                 if (!this.p) {
-                    if (this.u) {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + " = document.querySelector('" + CodeGeneratingComponentRenderer.d7(stringReplace(this.an, "Component", "")) + "') as " + this.an + ";");
+                    if (this.v) {
+                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + " = document.querySelector('" + CodeGeneratingComponentRenderer.d7(stringReplace(this.ao, "Component", "")) + "') as " + this.ao + ";");
                     }
                 }
                 else {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + " = document.getElementById('" + this.am + "') as " + this.an + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + " = document.getElementById('" + this.an + "') as " + this.ao + ";");
                 }
             }
         }
-        bs(a) {
+        bu(a) {
             if (stringEndsWith(a, "Component")) {
                 a = a.substr(0, a.length - ("Component").length);
             }
             return CodeGeneratingComponentRenderer.d7(a);
         }
-        bm() {
+        bo() {
             this.h.l("");
         }
-        bg(a) {
+        bi(a) {
         }
-        bh(a) {
+        bj(a) {
             {
                 this.h.l("");
             }
-            super.bh(a);
+            super.bj(a);
         }
-        be(a, b, c, d) {
+        bg(a, b, c, d) {
             let e = CodeGeneratingComponentRenderer.d4(b);
             if (e == "name" && c.b == null) {
                 return;
             }
             if (this.s(c)) {
-                this.bn(c);
-                if (!this.bp.contains(this.am)) {
-                    this.bp.add_1(this.am);
-                    if (!this.bq.contains(this.an)) {
-                        this.bq.add_1(this.an);
-                        this.a7(this.an);
-                    }
-                    this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.am) + ": " + this.an);
+                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.d4(this.an) + ": " + this.ao);
                     if (!this.p) {
-                        if (this.u) {
-                            this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + " = document.querySelector('" + CodeGeneratingComponentRenderer.d7(stringReplace(this.an, "Component", "")) + "') as " + this.an + ";");
+                        if (this.v) {
+                            this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + " = document.querySelector('" + CodeGeneratingComponentRenderer.d7(stringReplace(this.ao, "Component", "")) + "') as " + this.ao + ";");
                         }
                     }
                     else {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + " = document.getElementById('" + this.am + "') as " + this.an + ";");
+                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + " = document.getElementById('" + this.an + "') as " + this.ao + ";");
                     }
                 }
-                let f = CodeGeneratingComponentRenderer.d4(this.a0(d, c, true));
+                let f = CodeGeneratingComponentRenderer.d4(this.a1(d, c, true));
                 let g = f;
                 if (g != "null" && !stringStartsWith(g, "this.")) {
                     g = "this." + g;
                 }
-                if (this.an == "any" && stringContains(e, "-")) {
-                    this.e.l(CodeGeneratingComponentRenderer.d4(this.am) + "['" + e + "'] = " + g + ";");
+                if (this.ao == "any" && stringContains(e, "-")) {
+                    this.e.l(CodeGeneratingComponentRenderer.d4(this.an) + "['" + e + "'] = " + g + ";");
                 }
                 else {
                     if (c.b != null && c.b.isCustomEvent) {
-                        this.e.l(CodeGeneratingComponentRenderer.d4(this.am) + ".addEventListener(\"" + e + "\", " + g + ");");
+                        this.e.l(CodeGeneratingComponentRenderer.d4(this.an) + ".addEventListener(\"" + e + "\", " + g + ");");
                     }
                     else {
-                        this.e.l(CodeGeneratingComponentRenderer.d4(this.am) + "." + e + " = " + g + ";");
+                        this.e.l(CodeGeneratingComponentRenderer.d4(this.an) + "." + e + " = " + g + ";");
                     }
                 }
                 return;
@@ -1580,17 +1612,17 @@ export let WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
             if (a > 0) {
                 this.h.l("");
             }
-            if (this.an == "any" && stringContains(e, "-")) {
-                this.h.j(this.am + "." + CodeGeneratingComponentRenderer.d4(this.am) + "['" + e + "']");
+            if (this.ao == "any" && stringContains(e, "-")) {
+                this.h.j(this.an + "." + CodeGeneratingComponentRenderer.d4(this.an) + "['" + e + "']");
             }
             else {
-                this.h.j(this.am + "." + CodeGeneratingComponentRenderer.d4(e));
+                this.h.j(this.an + "." + CodeGeneratingComponentRenderer.d4(e));
             }
             this.h.j(" = ");
-            this.h.j(this.a0(d, c, true));
+            this.h.j(this.a1(d, c, true));
             this.h.j(";");
         }
-        ad(a) {
+        ae(a) {
             let b = a.c;
             switch (b.a) {
                 case 3: return b.b;
@@ -1600,31 +1632,31 @@ export let WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
             }
             return b.b;
         }
-        ax() {
+        ay() {
             return "null";
         }
-        as(a) {
+        at(a) {
             return CodeGeneratingComponentRenderer.d4(a.a.e);
         }
-        ay(a) {
+        az(a) {
             return CodeGeneratingComponentRenderer.d4(a.a.e);
         }
-        au(a) {
+        av(a) {
             if (!stringIsNullOrEmpty(a.a.e)) {
-                this.bn(a);
-                if (!this.bp.contains(a.a.e)) {
+                this.bp(a);
+                if (!this.br.contains(a.a.e)) {
                     this.g.l("this." + CodeGeneratingComponentRenderer.d4(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.d4(a.a.e) + ".bind(this);");
                 }
                 return "this." + CodeGeneratingComponentRenderer.d4(a.a.e);
             }
-            return this.ax();
+            return this.ay();
         }
-        a0(a, b, c) {
+        a1(a, b, c) {
             if (b.b == null) {
                 return "\"" + b.c + "\"";
             }
             if (typeCast(CodeGenerationSpecialValue.$, b.c) !== null) {
-                b.c = this.ad(b);
+                b.c = this.ae(b);
             }
             switch (b.b.knownType) {
                 case 11:
@@ -1657,12 +1689,12 @@ export let WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
                 case 23:
                 case 6:
                 case 16:
-                case 2: return "\"" + super.a0(a, b, c) + "\"";
+                case 2: return "\"" + super.a1(a, b, c) + "\"";
                 case 9: throw new NotSupportedException(1, "shouldn't get here");
             }
-            return super.a0(a, b, c);
+            return super.a1(a, b, c);
         }
-        bf(a, b, c, d) {
+        bh(a, b, c, d) {
             if (c.b.knownType == 9) {
                 let e = typeCast(IList_$type, c.c);
                 if (e != null) {
@@ -1680,12 +1712,12 @@ export let WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
                             if (k) {
                                 if (f) {
                                     f = false;
-                                    this.h.l(this.am + "." + b + " = []");
+                                    this.h.l(this.an + "." + b + " = []");
                                 }
-                                this.h.l(this.am + "." + b + ".push(" + this.a1 + ");");
+                                this.h.l(this.an + "." + b + ".push(" + this.a2 + ");");
                             }
                             else {
-                                this.h.l(this.am + "." + b + ".add(" + this.a1 + ");");
+                                this.h.l(this.an + "." + b + ".add(" + this.a2 + ");");
                             }
                         }
                     }
@@ -1695,7 +1727,7 @@ export let WebCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
                 if (typeCast(CodeGenerationItemBuilder.$, c.c) !== null) {
                     let l = c.c;
                     l.u(this, false);
-                    this.h.l(this.am + "." + b + " = " + this.a1 + ";");
+                    this.h.l(this.an + "." + b + " = " + this.a2 + ";");
                 }
             }
         }
@@ -1717,12 +1749,19 @@ export let ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE
         i(a, b) {
             return new ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        get_a4() {
+        get_a5() {
             return "Igc";
         }
-        bc(a, b, c) {
-            super.bc(a, b, c);
-            WebImportsHalper.a(this.k, this.a3, this.a2, this.a4, a, b, c);
+        be(a, b, c) {
+            super.be(a, b, c);
+            WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
+        }
+        bv(a, b) {
+            let c = false;
+            if (b.getMetadata(a, "__isPlainObject") != null && b.getMetadata(a, "__marshalByValue") == null) {
+                c = true;
+            }
+            return c;
         }
     }
     ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter.$t = markType(ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter, 'ReactCodeBehindCodeGeneratingComponentRendererCodeEmitter', WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.$);
@@ -1735,9 +1774,9 @@ export let WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__
     class WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter extends CodeGeneratingComponentRendererCodeEmitter {
         constructor(a, b) {
             super(a, b);
-            this.br = 0;
-            this.bp = new HashSet$1(String_$type, 0);
-            this.bq = new HashSet$1(String_$type, 0);
+            this.bt = 0;
+            this.br = new HashSet$1(String_$type, 0);
+            this.bs = new HashSet$1(String_$type, 0);
         }
         get_r() {
             return false;
@@ -1745,31 +1784,31 @@ export let WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__
         get r() {
             return this.get_r();
         }
-        bo(a) {
+        bq(a) {
             if (!a.b.owningContext.hasStringUnionPlatforms(a.b.owningType, a.b.propertyName)) {
                 return false;
             }
             let b = a.b.owningContext.getStringUnionPlatforms(a.b.owningType, a.b.propertyName);
             for (let c = 0; c < b.length; c++) {
-                if (b[c].toLowerCase() == this.a3) {
+                if (b[c].toLowerCase() == this.a4) {
                     return true;
                 }
             }
             return false;
         }
-        at(a) {
-            if (this.bo(a)) {
+        au(a) {
+            if (this.bq(a)) {
                 return CodeGeneratingComponentRenderer.d6(a.c.toString());
             }
             else {
-                return super.at(a);
+                return super.au(a);
             }
         }
         i(a, b) {
             return new WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        ao(a, b, c, d) {
-            d = super.ao(a, b, c, d);
+        ap(a, b, c, d) {
+            d = super.ap(a, b, c, d);
             let e = b.q();
             this.f.l("private" + " _" + CodeGeneratingComponentRenderer.d4(d) + ": " + e + " | null = null;");
             this.f.l("public get " + CodeGeneratingComponentRenderer.d4(d) + "(): " + e + " {");
@@ -1786,15 +1825,15 @@ export let WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__
             this.f.l("}");
             return CodeGeneratingComponentRenderer.d5(d);
         }
-        ap(a, b, c, d, e) {
-            e = super.ap(a, b, c, d, e);
+        aq(a, b, c, d, e) {
+            e = super.aq(a, b, c, d, e);
             let f = null;
             if (c.count > 0) {
                 f = c._inner[0].q() + "[]";
             }
             else {
                 let g = a.b.specificExternalType;
-                f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.ai, this.aj) + "[]";
+                f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.aj, this.ak) + "[]";
             }
             this.f.l("private" + " _" + CodeGeneratingComponentRenderer.d4(e) + ": " + f + " | null = null;");
             this.f.l("public get " + CodeGeneratingComponentRenderer.d4(e) + "(): " + f + " {");
@@ -1815,7 +1854,7 @@ export let WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__
             this.f.l("}");
             return CodeGeneratingComponentRenderer.d5(e);
         }
-        aq(a, b) {
+        ar(a, b) {
             if (b.c == null) {
                 return "null";
             }
@@ -1829,81 +1868,81 @@ export let WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__
             }
             return d;
         }
-        get_w() {
+        get_x() {
             return true;
         }
-        a8(a, b, c) {
-            super.a8(a, b, c);
-            this.h.l("<" + this.bs(a) + "");
-            if (!this.bp.contains(this.am)) {
-                this.bp.add_1(this.am);
-                if (!this.bq.contains(this.an)) {
-                    this.bq.add_1(this.an);
-                    this.a7(this.an);
+        ba(a, b, c) {
+            super.ba(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);
                 }
-                this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.am) + ": " + this.an);
+                this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.an) + ": " + this.ao);
                 if (!this.p) {
-                    if (this.u) {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + " = document.querySelector('" + CodeGeneratingComponentRenderer.d7(stringReplace(this.an, "Component", "")) + "') as " + this.an + ";");
+                    if (this.v) {
+                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + " = document.querySelector('" + CodeGeneratingComponentRenderer.d7(stringReplace(this.ao, "Component", "")) + "') as " + this.ao + ";");
                     }
                 }
                 else {
-                    this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + " = document.getElementById('" + this.am + "') as " + this.an + ";");
+                    this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + " = document.getElementById('" + this.an + "') as " + this.ao + ";");
                 }
             }
         }
-        bs(a) {
+        bu(a) {
             if (stringEndsWith(a, "Component")) {
                 a = a.substr(0, a.length - ("Component").length);
             }
             return CodeGeneratingComponentRenderer.d7(a);
         }
-        bm() {
+        bo() {
             this.h.l(">");
             this.h.h();
         }
-        bh(a) {
+        bj(a) {
             this.h.f();
-            this.h.l("</" + this.bs(a) + ">");
-            super.bh(a);
+            this.h.l("</" + this.bu(a) + ">");
+            super.bj(a);
         }
-        get_a4() {
+        get_a5() {
             return "Igc";
         }
-        bc(a, b, c) {
-            super.bc(a, b, c);
-            WebImportsHalper.a(this.k, this.a3, this.a2, this.a4, a, b, c);
+        be(a, b, c) {
+            super.be(a, b, c);
+            WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
         }
-        be(a, b, c, d) {
+        bg(a, b, c, d) {
             let e = CodeGeneratingComponentRenderer.d4(b);
             if (this.q(d, c)) {
-                this.bn(c);
-                if (!this.bp.contains(this.am)) {
-                    this.bp.add_1(this.am);
-                    if (!this.bq.contains(this.an)) {
-                        this.bq.add_1(this.an);
-                        this.a7(this.an);
-                    }
-                    this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.am) + ": " + this.an);
+                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.d4(this.an) + ": " + this.ao);
                     if (!this.p) {
-                        if (this.u) {
-                            this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + " = document.querySelector('" + CodeGeneratingComponentRenderer.d7(stringReplace(this.an, "Component", "")) + "') as " + this.an + ";");
+                        if (this.v) {
+                            this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + " = document.querySelector('" + CodeGeneratingComponentRenderer.d7(stringReplace(this.ao, "Component", "")) + "') as " + this.ao + ";");
                         }
                     }
                     else {
-                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.am) + " = this." + CodeGeneratingComponentRenderer.d4(this.am) + " = document.getElementById('" + this.am + "') as " + this.an + ";");
+                        this.g.l("var " + CodeGeneratingComponentRenderer.d4(this.an) + " = this." + CodeGeneratingComponentRenderer.d4(this.an) + " = document.getElementById('" + this.an + "') as " + this.ao + ";");
                     }
                 }
-                let f = CodeGeneratingComponentRenderer.d4(this.a0(d, c, true));
+                let f = CodeGeneratingComponentRenderer.d4(this.a1(d, c, true));
                 let g = f;
                 if (g != "null" && !stringStartsWith(g, "this.")) {
                     g = "this." + g;
                 }
                 if (c.b.isCustomEvent) {
-                    this.e.l(CodeGeneratingComponentRenderer.d4(this.am) + ".addEventListener(\"" + e + "\", " + g + ");");
+                    this.e.l(CodeGeneratingComponentRenderer.d4(this.an) + ".addEventListener(\"" + e + "\", " + g + ");");
                 }
                 else {
-                    this.e.l(CodeGeneratingComponentRenderer.d4(this.am) + "." + e + " = " + g + ";");
+                    this.e.l(CodeGeneratingComponentRenderer.d4(this.an) + "." + e + " = " + g + ";");
                 }
                 return;
             }
@@ -1913,14 +1952,14 @@ export let WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__
             this.h.j(CodeGeneratingComponentRenderer.d7(e));
             this.h.j("=");
             this.h.j("\"");
-            this.h.j(this.a0(d, c, true));
+            this.h.j(this.a1(d, c, true));
             this.h.j("\"");
             if (e == "name") {
                 this.h.l("");
-                this.h.j("id=\"" + this.a0(d, c, true) + "\"");
+                this.h.j("id=\"" + this.a1(d, c, true) + "\"");
             }
         }
-        ad(a) {
+        ae(a) {
             let b = a.c;
             switch (b.a) {
                 case 3: return b.b;
@@ -1930,26 +1969,26 @@ export let WebComponentsMarkupCodeGeneratingComponentRendererCodeEmitter = /*@__
             }
             return b.b;
         }
-        ax() {
+        ay() {
             return "null";
         }
-        as(a) {
+        at(a) {
             return CodeGeneratingComponentRenderer.d4(a.a.e);
         }
-        ay(a) {
+        az(a) {
             return CodeGeneratingComponentRenderer.d4(a.a.e);
         }
-        au(a) {
+        av(a) {
             if (!stringIsNullOrEmpty(a.a.e)) {
-                this.bn(a);
-                if (!this.bp.contains(a.a.e)) {
+                this.bp(a);
+                if (!this.br.contains(a.a.e)) {
                     this.g.l("this." + CodeGeneratingComponentRenderer.d4(a.a.e) + " = " + "this." + CodeGeneratingComponentRenderer.d4(a.a.e) + ".bind(this);");
                 }
                 return "this." + CodeGeneratingComponentRenderer.d4(a.a.e);
             }
-            return this.ax();
+            return this.ay();
         }
-        bf(a, b, c, d) {
+        bh(a, b, c, d) {
             if (c.b.knownType == 9) {
                 let e = typeCast(IList_$type, c.c);
                 if (e != null) {
@@ -1983,12 +2022,12 @@ export let WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter = /
         i(a, b) {
             return new WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        get_a4() {
+        get_a5() {
             return "Igc";
         }
-        bc(a, b, c) {
-            super.bc(a, b, c);
-            WebImportsHalper.a(this.k, this.a3, this.a2, this.a4, a, b, c);
+        be(a, b, c) {
+            super.be(a, b, c);
+            WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
         }
     }
     WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter.$t = markType(WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter, 'WebComponentsCodeBehindCodeGeneratingComponentRendererCodeEmitter', WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.$);
@@ -2012,7 +2051,7 @@ export let TSCodeGeneratingComponentRendererHandlerEmitter = /*@__PURE__*/ (() =
             super.u(a, b);
             this.h.l("this." + CodeGeneratingComponentRenderer.d4(a) + "();");
         }
-        get x() {
+        get z() {
             switch (this.w) {
                 case 1: return "angular";
                 case 2: return "react";
@@ -2020,7 +2059,7 @@ export let TSCodeGeneratingComponentRendererHandlerEmitter = /*@__PURE__*/ (() =
             }
             return "";
         }
-        get y() {
+        get aa() {
             switch (this.w) {
                 case 1: return "Igx";
                 case 2: return "Igr";
@@ -2034,21 +2073,26 @@ export let TSCodeGeneratingComponentRendererHandlerEmitter = /*@__PURE__*/ (() =
             c.execute(b, (d, e, f) => {
                 let g = d(1);
                 let h = d(2);
-                h = stringReplace(h, "webcomponents", this.x);
-                h = stringReplace(h, "react", this.x);
-                h = stringReplace(h, "angular", this.x);
+                h = stringReplace(h, "webcomponents", this.z);
+                h = stringReplace(h, "react", this.z);
+                h = stringReplace(h, "angular", this.z);
+                if (this.z == "angular" || this.z == "react") {
+                    if (stringContains(h, "/grids")) {
+                        h = stringReplace(h, "/grids", "");
+                    }
+                }
                 let i = g.split(',');
                 for (let k = 0; k < i.length; k++) {
                     let j = i[k];
                     let l = j.trim();
                     if (stringStartsWith(l, "Igc")) {
-                        l = this.y + l.substr(3);
+                        l = this.aa + l.substr(3);
                     }
                     if (stringStartsWith(l, "Igr")) {
-                        l = this.y + l.substr(3);
+                        l = this.aa + l.substr(3);
                     }
                     if (stringStartsWith(l, "Igx")) {
-                        l = this.y + l.substr(3);
+                        l = this.aa + l.substr(3);
                     }
                     if (stringStartsWith(l, "Igr") && stringEndsWith(l, "Component")) {
                         l = l.substr(0, l.length - ("Component").length);
@@ -2058,7 +2102,34 @@ export let TSCodeGeneratingComponentRendererHandlerEmitter = /*@__PURE__*/ (() =
                 return null;
             });
         }
-        q(a) {
+        get_y() {
+            switch (this.n.platform) {
+                case 1: return "Component";
+                case 2: return "";
+                case 3: return "Component";
+                case 4: return "";
+                case 0: return "";
+            }
+            return "";
+        }
+        get y() {
+            return this.get_y();
+        }
+        get_x() {
+            switch (this.n.platform) {
+                case 1: return "Igx";
+                case 2: return "Igr";
+                case 3: return "Igc";
+                case 4: return "Ultra";
+                case 0: return "Xam";
+                case 5: return "Igb";
+            }
+            return "";
+        }
+        get x() {
+            return this.get_x();
+        }
+        q(a, b) {
             return a;
         }
     }
@@ -2360,9 +2431,9 @@ export let AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /*@__PURE
     class AngularTemplateCodeGeneratingComponentRendererCodeEmitter extends CodeGeneratingComponentRendererCodeEmitter {
         constructor(a, b) {
             super(a, b);
-            this.bq = 0;
-            this.bo = new HashSet$1(String_$type, 0);
-            this.bp = new HashSet$1(String_$type, 0);
+            this.bs = 0;
+            this.bq = new HashSet$1(String_$type, 0);
+            this.br = new HashSet$1(String_$type, 0);
         }
         get_r() {
             return false;
@@ -2370,8 +2441,8 @@ export let AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /*@__PURE
         get r() {
             return this.get_r();
         }
-        ao(a, b, c, d) {
-            d = super.ao(a, b, c, d);
+        ap(a, b, c, d) {
+            d = super.ap(a, b, c, d);
             let e = b.q();
             this.f.l("private " + " _" + CodeGeneratingComponentRenderer.d4(d) + ": " + e + " | null = null;");
             this.f.l("public get " + CodeGeneratingComponentRenderer.d4(d) + "(): " + e + " {");
@@ -2388,15 +2459,15 @@ export let AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /*@__PURE
             this.f.l("}");
             return CodeGeneratingComponentRenderer.d5(d);
         }
-        ap(a, b, c, d, e) {
-            e = super.ap(a, b, c, d, e);
+        aq(a, b, c, d, e) {
+            e = super.aq(a, b, c, d, e);
             let f = null;
             if (c.count > 0) {
                 f = c._inner[0].q() + "[]";
             }
             else {
                 let g = a.b.specificExternalType;
-                f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.ai, this.aj) + "[]";
+                f = CodeGenerationItemBuilder.n(this.k.platform, g, b, this.aj, this.ak) + "[]";
             }
             this.f.l("private" + " _" + CodeGeneratingComponentRenderer.d4(e) + ": " + f + " | null = null;");
             this.f.l("public get " + CodeGeneratingComponentRenderer.d4(e) + "(): " + f + " {");
@@ -2420,7 +2491,7 @@ export let AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /*@__PURE
         i(a, b) {
             return new AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        aq(a, b) {
+        ar(a, b) {
             if (b.c == null) {
                 return "null";
             }
@@ -2434,48 +2505,48 @@ export let AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /*@__PURE
             }
             return d;
         }
-        get_w() {
+        get_x() {
             return true;
         }
-        get_a4() {
+        get_a5() {
             return "Igx";
         }
-        a8(a, b, c) {
-            super.a8(a, b, c);
-            this.h.l("<" + this.br(a) + "");
-            if (!this.bo.contains(this.am)) {
-                this.bo.add_1(this.am);
-                if (!this.bp.contains(this.an)) {
-                    this.bp.add_1(this.an);
-                    this.a7(this.an);
+        ba(a, b, c) {
+            super.ba(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);
                 }
-                this.f.l("@ViewChild(\"" + CodeGeneratingComponentRenderer.d4(this.am) + "\", { static: true } )");
-                this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.am) + ": " + this.an);
+                this.f.l("@ViewChild(\"" + CodeGeneratingComponentRenderer.d4(this.an) + "\", { static: true } )");
+                this.f.l("private " + CodeGeneratingComponentRenderer.d4(this.an) + ": " + this.ao);
             }
         }
-        bc(a, b, c) {
-            super.bc(a, b, c);
-            WebImportsHalper.a(this.k, this.a3, this.a2, this.a4, a, b, c);
+        be(a, b, c) {
+            super.be(a, b, c);
+            WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
         }
-        br(a) {
+        bt(a) {
             if (stringEndsWith(a, "Component")) {
                 a = a.substr(0, a.length - ("Component").length);
             }
             return CodeGeneratingComponentRenderer.d7(a);
         }
-        bm() {
+        bo() {
             this.h.l(">");
             this.h.h();
         }
-        bh(a) {
+        bj(a) {
             this.h.f();
-            this.h.l("</" + this.br(a) + ">");
-            super.bh(a);
+            this.h.l("</" + this.bt(a) + ">");
+            super.bj(a);
         }
-        be(a, b, c, d) {
+        bg(a, b, c, d) {
             let e = CodeGeneratingComponentRenderer.d4(b);
             if (this.q(d, c)) {
-                this.bn(c);
+                this.bp(c);
                 if (this.t(c)) {
                     e = "(" + e + ")";
                 }
@@ -2489,21 +2560,21 @@ export let AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /*@__PURE
             this.h.j(e);
             this.h.j("=");
             this.h.j("\"");
-            this.h.j(this.a0(d, c, true));
+            this.h.j(this.a1(d, c, true));
             this.h.j("\"");
             if (e == "name") {
                 this.h.l("");
-                this.h.j("#" + CodeGeneratingComponentRenderer.d4(this.a0(d, c, true)));
+                this.h.j("#" + CodeGeneratingComponentRenderer.d4(this.a1(d, c, true)));
             }
         }
-        au(a) {
+        av(a) {
             if (!stringIsNullOrEmpty(a.a.e)) {
-                this.bn(a);
+                this.bp(a);
                 return "this." + CodeGeneratingComponentRenderer.d4(a.a.e) + "($event)";
             }
-            return this.ax();
+            return this.ay();
         }
-        ad(a) {
+        ae(a) {
             let b = a.c;
             switch (b.a) {
                 case 3: return b.b;
@@ -2513,16 +2584,16 @@ export let AngularTemplateCodeGeneratingComponentRendererCodeEmitter = /*@__PURE
             }
             return b.b;
         }
-        ax() {
+        ay() {
             return "null";
         }
-        as(a) {
+        at(a) {
             return CodeGeneratingComponentRenderer.d4(a.a.e);
         }
-        ay(a) {
+        az(a) {
             return CodeGeneratingComponentRenderer.d4(a.a.e);
         }
-        bf(a, b, c, d) {
+        bh(a, b, c, d) {
             if (c.b.knownType == 9) {
                 let e = typeCast(IList_$type, c.c);
                 if (e != null) {
@@ -2559,12 +2630,12 @@ export let AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PU
         i(a, b) {
             return new AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        get_a4() {
+        get_a5() {
             return "Igc";
         }
-        bc(a, b, c) {
-            super.bc(a, b, c);
-            WebImportsHalper.a(this.k, this.a3, this.a2, this.a4, a, b, c);
+        be(a, b, c) {
+            super.be(a, b, c);
+            WebImportsHalper.b(this.k, this.a4, this.a3, this.a5, a, b, c);
         }
     }
     AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter.$t = markType(AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter, 'AngularCodeBehindCodeGeneratingComponentRendererCodeEmitter', WebCodeBehindCodeGeneratingComponentRendererCodeEmitter.$);
@@ -2850,6 +2921,12 @@ export let WPFXamlCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (()
         constructor(a, b) {
             super(a, b);
         }
+        a7(a) {
+            if (a == null || isNaN_(a)) {
+                return "";
+            }
+            return timeSpanFromMilliseconds(a).toString();
+        }
         get_r() {
             return false;
         }
@@ -2859,10 +2936,10 @@ export let WPFXamlCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (()
         i(a, b) {
             return new WPFCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        get_x() {
+        get_y() {
             return false;
         }
-        aq(a, b) {
+        ar(a, b) {
             if (b.c == null) {
                 return "null";
             }
@@ -2876,20 +2953,20 @@ export let WPFXamlCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (()
             }
             return d;
         }
-        a8(a, b, c) {
-            super.a8(a, b, c);
+        ba(a, b, c) {
+            super.ba(a, b, c);
             this.h.l("<ig:" + a + "");
         }
-        bm() {
+        bo() {
             this.h.l(">");
             this.h.h();
         }
-        bh(a) {
+        bj(a) {
             this.h.f();
             this.h.l("</ig:" + a + ">");
-            super.bh(a);
+            super.bj(a);
         }
-        be(a, b, c, d) {
+        bg(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) {
@@ -2898,7 +2975,7 @@ export let WPFXamlCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (()
                     this.h.j(b);
                     this.h.j("=");
                     this.h.j("\"");
-                    this.h.j("{}" + this.a0(d, c, true));
+                    this.h.j("{}" + this.a1(d, c, true));
                     this.h.j("\"");
                     return;
                 }
@@ -2909,10 +2986,10 @@ export let WPFXamlCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (()
             this.h.j(b);
             this.h.j("=");
             this.h.j("\"");
-            this.h.j(this.a0(d, c, true));
+            this.h.j(this.a1(d, c, true));
             this.h.j("\"");
         }
-        ad(a) {
+        ae(a) {
             let b = a.c;
             switch (b.a) {
                 case 3: return b.b;
@@ -2922,24 +2999,24 @@ export let WPFXamlCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (()
             }
             return b.b;
         }
-        ax() {
+        ay() {
             return "{x:Null}";
         }
-        as(a) {
+        at(a) {
             return "{Binding ElementName=" + a.a.e + "}";
         }
-        bo(a) {
+        bq(a) {
             a = stringReplace(a, "-", "_");
             return CodeGeneratingComponentRenderer.d5(a);
         }
-        ay(a) {
-            this.bn(a);
-            return "{Binding " + this.bo(a.a.e) + "}";
+        az(a) {
+            this.bp(a);
+            return "{Binding " + this.bq(a.a.e) + "}";
         }
-        bf(a, b, c, d) {
+        bh(a, b, c, d) {
             this.h.j("<ig:");
             {
-                this.h.j(this.an);
+                this.h.j(this.ao);
                 this.h.j(".");
             }
             this.h.j(b);
@@ -2965,13 +3042,13 @@ export let WPFXamlCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__*/ (()
             this.h.f();
             this.h.j("</ig:");
             {
-                this.h.j(this.an);
+                this.h.j(this.ao);
                 this.h.j(".");
             }
             this.h.j(b);
             this.h.l(">");
         }
-        get_a4() {
+        get_a5() {
             return "Xam";
         }
     }
@@ -2986,6 +3063,12 @@ export let WPFCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
         constructor(a, b) {
             super(a, b);
         }
+        a7(a) {
+            if (a == null || isNaN_(a)) {
+                return "";
+            }
+            return;
+        }
         get_r() {
             return true;
         }
@@ -2995,7 +3078,7 @@ export let WPFCodeBehindCodeGeneratingComponentRendererCodeEmitter = /*@__PURE__
         i(a, b) {
             return new WPFCodeBehindCodeGeneratingComponentRendererCodeEmitter(a, b);
         }
-        get_x() {
+        get_y() {
             return false;
         }
     }
@@ -3105,6 +3188,43 @@ export let CodeGeneratingComponentRenderer = /*@__PURE__*/ (() => {
         aq() {
             return true;
         }
+        bo(a) {
+            let b = a.g;
+            return b == null ? { $type: Point_$type, x: NaN, y: NaN } : { $type: Point_$type, x: b.x, y: b.y };
+        }
+        bp(a) {
+            let b = a.g;
+            return b == null ? Rect.empty : new Rect(0, b.left, b.top, b.width, b.height);
+        }
+        bq(a) {
+            let b = a.g;
+            return b == null ? new Size(1, NaN, NaN) : new Size(1, b.width, b.height);
+        }
+        bs(a) {
+            let b = a.g;
+            if (typeof b === 'number') {
+                return typeGetValue(b);
+            }
+            if (typeof b === 'number') {
+                return b;
+            }
+            if (typeof b === 'string') {
+                return parseFloat(b);
+            }
+            return NaN;
+        }
+        b6(a) {
+            if (a == null) {
+                return null;
+            }
+            return Brush.create(a);
+        }
+        b7(a) {
+            if (a == null) {
+                return null;
+            }
+            return Brush.create(a).color;
+        }
         ad(a) {
             super.ad(a);
             this.d0 = a;
@@ -3365,10 +3485,10 @@ export let CodeGenerationContainer = /*@__PURE__*/ (() => {
                 i.u(j, true);
                 let k = j.toString();
                 b.addContainerResult(this.id, k);
-                j.ba(e);
-                j.bd(f);
-                j.a9(g);
-                j.bb(a, h);
+                j.bc(e);
+                j.bf(f);
+                j.bb(g);
+                j.bd(a, h);
             }
             b.addContainerResult("bindingFields", e.toString());
             b.addContainerResult("bindingInit", f.toString());
@@ -3465,31 +3585,31 @@ export let CodeGenerationItemBuilder = /*@__PURE__*/ (() => {
             let c = this.m();
             if (b) {
                 let d = this.p();
-                a.a2 = d;
+                a.a3 = d;
             }
             let e = false;
             let f = false;
             if (this.f.containsKey("Name")) {
                 e = true;
-                a.bl(this.f.item("Name").c);
+                a.bn(this.f.item("Name").c);
             }
             else if (this.f.containsKey("name")) {
                 e = true;
-                a.bl(this.f.item("name").c);
+                a.bn(this.f.item("name").c);
             }
             else {
                 if (b && this.t != null) {
                     e = true;
-                    a.bl(this.t);
+                    a.bn(this.t);
                 }
                 else if (this.e(this.c, a)) {
                     f = true;
-                    a.bk(c);
-                    if (a.x) {
+                    a.bm(c);
+                    if (a.y) {
                         this.g.add("name");
                         this.f.addItem("name", ((() => {
                             let $ret = new CodeGenerationItemBuilderPropertyInfo();
-                            $ret.c = a.am;
+                            $ret.c = a.an;
                             return $ret;
                         })()));
                     }
@@ -3497,13 +3617,13 @@ export let CodeGenerationItemBuilder = /*@__PURE__*/ (() => {
                         this.g.add("Name");
                         this.f.addItem("Name", ((() => {
                             let $ret = new CodeGenerationItemBuilderPropertyInfo();
-                            $ret.c = a.am;
+                            $ret.c = a.an;
                             return $ret;
                         })()));
                     }
                 }
             }
-            a.a8(this.q(), this.j, this.c);
+            a.ba(this.q(), this.j, this.c);
             let g = 0;
             for (let h of fromEnum(this.g)) {
                 let i = this.f.item(h);
@@ -3511,11 +3631,11 @@ export let CodeGenerationItemBuilder = /*@__PURE__*/ (() => {
                     continue;
                 }
                 if (this.d(a, h, i)) {
-                    a.be(g, h, i, this.c);
+                    a.bg(g, h, i, this.c);
                     g++;
                 }
             }
-            a.bm();
+            a.bo();
             let j = 0;
             for (let k of fromEnum(this.g)) {
                 let l = this.f.item(k);
@@ -3523,18 +3643,18 @@ export let CodeGenerationItemBuilder = /*@__PURE__*/ (() => {
                     continue;
                 }
                 if (!this.d(a, k, l)) {
-                    a.bf(j, k, l, this.c);
+                    a.bh(j, k, l, this.c);
                     j++;
                 }
             }
-            a.bg(j);
-            a.bh(c);
+            a.bi(j);
+            a.bj(c);
             if (e) {
-                a.bj();
+                a.bl();
             }
             else {
                 if (f) {
-                    a.bi();
+                    a.bk();
                 }
             }
         }
@@ -3565,7 +3685,7 @@ export let CodeGenerationItemBuilder = /*@__PURE__*/ (() => {
                     break;
                 case 23: return true;
                 case 9:
-                    if (a.v(this.c, c)) {
+                    if (a.w(this.c, c)) {
                         return true;
                     }
                     return false;
@@ -3577,7 +3697,7 @@ export let CodeGenerationItemBuilder = /*@__PURE__*/ (() => {
                 case 3: return true;
                 case 19: return true;
                 case 8:
-                    if (a.v(this.c, c)) {
+                    if (a.w(this.c, c)) {
                         return true;
                     }
                     if (c.b.specificExternalType == "string") {
@@ -3629,6 +3749,9 @@ export let CodeGenerationItemBuilder = /*@__PURE__*/ (() => {
                 return d + i.specificExternalType + e;
             }
             else {
+                if (c.getMetadata(b, "__skipSuffix") != null) {
+                    return d + b;
+                }
                 return d + b + e;
             }
         }
@@ -3644,6 +3767,13 @@ export let CodeGenerationItemBuilder = /*@__PURE__*/ (() => {
                     return c[c.length - 2].toLowerCase();
                 }
             }
+            if (this.b == 1 || this.b == 3 || this.b == 2 || this.b == 5) {
+                a = this.c.getMetadata(this.j, "__packageNameWC");
+                if (a != null) {
+                    let d = a.specificExternalType;
+                    return d;
+                }
+            }
             if (this.j == "Legend" || this.j == "ItemLegend") {
                 return "charts";
             }