@lightningjs/renderer 3.0.4 → 3.0.5

package/dist/src/core/text-rendering/CanvasFont.js

@@ -26,19 +26,15 @@ export class CanvasFont extends CoreFont {
     constructor(textRenderer, props, measureContext) {
         super(textRenderer, props);
         this.measureContext = measureContext;
-        this.url = props.fontUrl;
+        this.url = props.url;
         this.metrics = props.metrics;
     }
     load() {
         if (this.state !== FontState.Created) {
             return;
         }
-        if (this.family === 'sans-serif') {
-            // Default font, skip loading
-            this.onLoaded();
-            return;
-        }
         this.state = FontState.Loading;
+        const waitingNodes = this.waitingNodes;
         new FontFace(this.family, `url(${this.url})`)
             .load()
             .then((loadedFont) => {
@@ -77,7 +73,6 @@ export class CanvasFont extends CoreFont {
             metrics = calculateCanvasMetrics(this.family, fontSize, this.measureContext);
         }
         m = this.normalizedMetrics[fontSize] = normalizeFontMetrics(metrics, fontSize);
-        console.log('normalized metrics for font', this.family, 'at size', fontSize, 'calculated as', m);
         return m;
     }
 }
@@ -96,11 +91,7 @@ function calculateCanvasMetrics(fontFamily, fontSize, measureContext) {
     // as it's browser support is limited and it also tends to produce higher than
     // expected values. It is instead HIGHLY RECOMMENDED that developers provide
     // explicit metrics in the font face definition.
-    // Ensure font is loaded by checking document.fonts
-    if (!document.fonts.check(`${fontSize}px ${fontFamily}`)) {
-        console.warn(`Font ${fontFamily} may not be fully loaded yet when calculating metrics`);
-    }
-    measureContext.font = `${fontSize}px ${fontFamily}`;
+    measureContext.font = `normal ${fontSize}px Unknown, ${fontFamily}`;
     const metrics = measureContext.measureText('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz');
     console.warn(`Font metrics not provided for Canvas Web font ${fontFamily}. ` +
         'Using fallback values. It is HIGHLY recommended you use the latest ' +
@@ -108,13 +99,13 @@ function calculateCanvasMetrics(fontFamily, fontSize, measureContext) {
         'metrics for the font and provide them in the Canvas Web font definition.');
     const ascender = metrics.fontBoundingBoxAscent ?? metrics.actualBoundingBoxAscent ?? 0;
     const descender = metrics.fontBoundingBoxDescent ?? metrics.actualBoundingBoxDescent ?? 0;
-    const emHeight = (metrics.emHeightAscent ?? 0) + (metrics.emHeightDescent ?? 0);
-    const unitsPerEm = emHeight > 0 ? emHeight : ascender + descender;
     return {
         ascender,
         descender: -descender,
-        lineGap: emHeight - (ascender + descender),
-        unitsPerEm,
+        lineGap: (metrics.emHeightAscent ?? 0) +
+            (metrics.emHeightDescent ?? 0) -
+            (ascender + descender),
+        unitsPerEm: (metrics.emHeightAscent ?? 0) + (metrics.emHeightDescent ?? 0),
     };
 }
 //# sourceMappingURL=CanvasFont.js.map

package/dist/src/core/text-rendering/CanvasFont.js.map

@@ -1 +1 @@
-{"version":3,"file":"CanvasFont.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/CanvasFont.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAsB,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAa/C,MAAM,OAAO,UAAW,SAAQ,QAAQ;IAO5B;IANH,IAAI,GAAG,QAAQ,CAAC;IAChB,GAAG,CAAS;IAEnB,YACE,YAA0B,EAC1B,KAAsB,EACd,cAE6B;QAErC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAJnB,mBAAc,GAAd,cAAc,CAEe;QAGrC,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;YACrC,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YACjC,6BAA6B;YAC7B,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC;QAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,IAAI,CAAC,GAAG,GAAG,CAAC;aAC1C,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;YAClB,QAAQ,CAAC,KAA4B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACvD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC;YAC9B,OAAO,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpB,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CAAC,IAAY,EAAE,aAAqB;QAC7C,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;QACrD,CAAC;QACD,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC;YACtC,OAAO,CACL,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK;gBAC3C,aAAa,GAAG,IAAI,CAAC,MAAM,CAC5B,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACzC,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACrC,OAAO,GAAG,CAAC;YACb,CAAC;YACD,OAAO,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,aAAa,CAAC;QAC3E,CAAC,EAAE,CAAC,CAAC,CAAC;IACR,CAAC;IAEQ,UAAU,CAAC,QAAgB;QAClC,IAAI,CAAC,GAAG,IAAI,CAAC,iBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAE3B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,GAAG,sBAAsB,CAC9B,IAAI,CAAC,MAAM,EACX,QAAQ,EACR,IAAI,CAAC,cAAc,CACpB,CAAC;QACJ,CAAC;QACD,CAAC,GAAG,IAAI,CAAC,iBAAkB,CAAC,QAAQ,CAAC,GAAG,oBAAoB,CAC1D,OAAO,EACP,QAAQ,CACT,CAAC;QAEF,OAAO,CAAC,GAAG,CACT,6BAA6B,EAC7B,IAAI,CAAC,MAAM,EACX,SAAS,EACT,QAAQ,EACR,eAAe,EACf,CAAC,CACF,CAAC;QACF,OAAO,CAAC,CAAC;IACX,CAAC;CACF;AAED,SAAS,sBAAsB,CAC7B,UAAkB,EAClB,QAAgB,EAChB,cAA4E;IAE5E,0EAA0E;IAC1E,0EAA0E;IAC1E,yBAAyB;IACzB,4EAA4E;IAC5E,wEAAwE;IACxE,yDAAyD;IACzD,wEAAwE;IACxE,oEAAoE;IACpE,uEAAuE;IACvE,oDAAoD;IACpD,yEAAyE;IACzE,8EAA8E;IAC9E,4EAA4E;IAC5E,gDAAgD;IAEhD,mDAAmD;IACnD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,QAAQ,MAAM,UAAU,EAAE,CAAC,EAAE,CAAC;QACzD,OAAO,CAAC,IAAI,CACV,QAAQ,UAAU,uDAAuD,CAC1E,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,IAAI,GAAG,GAAG,QAAQ,MAAM,UAAU,EAAE,CAAC;IAEpD,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,CACxC,sDAAsD,CACvD,CAAC;IACF,OAAO,CAAC,IAAI,CACV,iDAAiD,UAAU,IAAI;QAC7D,qEAAqE;QACrE,0EAA0E;QAC1E,0EAA0E,CAC7E,CAAC;IACF,MAAM,QAAQ,GACZ,OAAO,CAAC,qBAAqB,IAAI,OAAO,CAAC,uBAAuB,IAAI,CAAC,CAAC;IACxE,MAAM,SAAS,GACb,OAAO,CAAC,sBAAsB,IAAI,OAAO,CAAC,wBAAwB,IAAI,CAAC,CAAC;IAE1E,MAAM,QAAQ,GACZ,CAAC,OAAO,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,SAAS,CAAC;IAElE,OAAO;QACL,QAAQ;QACR,SAAS,EAAE,CAAC,SAAS;QACrB,OAAO,EAAE,QAAQ,GAAG,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1C,UAAU;KACX,CAAC;AACJ,CAAC"}
+{"version":3,"file":"CanvasFont.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/CanvasFont.ts"],"names":[],"mappings":"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"}

package/dist/src/core/text-rendering/CoreFont.d.ts

@@ -8,7 +8,7 @@ export declare enum FontState {
     Failed = 3
 }
 export interface CoreFontProps {
-    fontFamily: string;
+    family: string;
     metrics?: FontMetrics;
 }
 /**

package/dist/src/core/text-rendering/CoreFont.js

@@ -19,7 +19,7 @@ export class CoreFont extends EventEmitter {
     metrics;
     constructor(textRenderer, props) {
         super();
-        this.family = props.fontFamily;
+        this.family = props.family;
         this.state = FontState.Created;
         this.textRenderer = textRenderer;
     }

package/dist/src/core/text-rendering/CoreFont.js.map

@@ -1 +1 @@
-{"version":3,"file":"CoreFont.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/CoreFont.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,+CAAO,CAAA;IACP,+CAAO,CAAA;IACP,6CAAM,CAAA;IACN,6CAAM,CAAA;AACR,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAOD;;GAEG;AACH,MAAM,OAAgB,QAAS,SAAQ,YAAY;IACvC,YAAY,GAAkC,MAAM,CAAC,MAAM,CACnE,IAAI,CAC2B,CAAC;IACxB,iBAAiB,GACzB,MAAM,CAAC,MAAM,CAAC,IAAI,CAA0C,CAAC;IAExD,YAAY,CAAe;IAC3B,KAAK,CAAY;IACjB,MAAM,CAAS;IACf,OAAO,CAAe;IAE7B,YAAY,YAA0B,EAAE,KAAoB;QAC1D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAES,QAAQ;QAChB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,KAAK,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;YAC7B,YAAY,CAAC,GAAG,CAAE,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACnD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC;IAChC,CAAC;IAEM,OAAO,CAAC,IAAkB;QAC/B,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IACrC,CAAC;IAEM,WAAW,CAAC,IAAkB;QACnC,IAAI,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CAMF"}
+{"version":3,"file":"CoreFont.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/CoreFont.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,+CAAO,CAAA;IACP,+CAAO,CAAA;IACP,6CAAM,CAAA;IACN,6CAAM,CAAA;AACR,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAOD;;GAEG;AACH,MAAM,OAAgB,QAAS,SAAQ,YAAY;IACvC,YAAY,GAAkC,MAAM,CAAC,MAAM,CACnE,IAAI,CAC2B,CAAC;IACxB,iBAAiB,GACzB,MAAM,CAAC,MAAM,CAAC,IAAI,CAA0C,CAAC;IAExD,YAAY,CAAe;IAC3B,KAAK,CAAY;IACjB,MAAM,CAAS;IACf,OAAO,CAAe;IAE7B,YAAY,YAA0B,EAAE,KAAoB;QAC1D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAES,QAAQ;QAChB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,KAAK,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;YAC7B,YAAY,CAAC,GAAG,CAAE,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACnD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC;IAChC,CAAC;IAEM,OAAO,CAAC,IAAkB;QAC/B,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IACrC,CAAC;IAEM,WAAW,CAAC,IAAkB;QACnC,IAAI,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CAMF"}

package/dist/src/core/text-rendering/FontManager.js

@@ -4,8 +4,8 @@ export class CoreFontManager {
     constructor(stage, textRenderers) {
         for (let i = 0; i < textRenderers.length; i++) {
             const renderer = textRenderers[i];
+            renderer.init(stage);
             this.renderers[renderer.type] = renderer;
-            renderer.init(stage, this);
         }
     }
     loadFont(type, options) {
@@ -14,6 +14,7 @@ export class CoreFontManager {
             console.error('renderer type for this font does not exist');
             return;
         }
+        console.log('loadFOnt', type, options);
         const font = targetRenderer.createFont(options);
         if (font === undefined) {
             return;

package/dist/src/core/text-rendering/FontManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"FontManager.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/FontManager.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,eAAe;IAClB,KAAK,GAA6B,MAAM,CAAC,MAAM,CAAC,IAAI,CAG3D,CAAC;IACM,SAAS,GAAiC,MAAM,CAAC,MAAM,CAC7D,IAAI,CAC2B,CAAC;IAElC,YAAY,KAAY,EAAE,aAA6B;QACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAE,CAAC;YACnC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;YACzC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,IAAmB,EAAE,OAAwB;QACpD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC5D,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,UAAkB;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,UAAU,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,UAAkB;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"FontManager.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/FontManager.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,eAAe;IAClB,KAAK,GAA6B,MAAM,CAAC,MAAM,CAAC,IAAI,CAG3D,CAAC;IACM,SAAS,GAAiC,MAAM,CAAC,MAAM,CAC7D,IAAI,CAC2B,CAAC;IAElC,YAAY,KAAY,EAAE,aAA6B;QACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAE,CAAC;YACnC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,IAAmB,EAAE,OAAwB;QACpD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC5D,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,UAAkB;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,UAAU,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,UAAkB;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/src/core/text-rendering/canvas/Settings.d.ts

@@ -0,0 +1,64 @@
+import type { RGBA } from '../../lib/utils.js';
+/**
+ * Text Overflow Values
+ */
+export type TextOverflow = 'ellipsis' | 'clip' | (string & Record<never, never>);
+/***
+ * Text Horizontal Align Values
+ */
+export type TextAlign = 'left' | 'center' | 'right';
+/***
+ * Text Baseline Values
+ */
+export type TextBaseline = 'alphabetic' | 'top' | 'hanging' | 'middle' | 'ideographic' | 'bottom';
+/***
+ * Text Vertical Align Values
+ */
+export type TextVerticalAlign = 'top' | 'middle' | 'bottom';
+/**
+ * Text Texture Settings
+ */
+export interface Settings {
+    w: number;
+    h: number;
+    text: string;
+    fontStyle: string;
+    fontSize: number;
+    fontBaselineRatio: number;
+    fontFamily: string | null;
+    wordWrap: boolean;
+    wordWrapWidth: number;
+    wordBreak: 'normal' | 'break-all' | 'break-word';
+    textOverflow: TextOverflow | null;
+    lineHeight: number | null;
+    textBaseline: TextBaseline;
+    textAlign: TextAlign;
+    verticalAlign: TextVerticalAlign;
+    offsetY: number | null;
+    maxLines: number;
+    maxHeight: number | null;
+    overflowSuffix: string;
+    precision: number;
+    textColor: RGBA;
+    paddingLeft: number;
+    paddingRight: number;
+    shadow: boolean;
+    shadowColor: RGBA;
+    shadowOffsetX: number;
+    shadowOffsetY: number;
+    shadowBlur: number;
+    highlight: boolean;
+    highlightHeight: number;
+    highlightColor: RGBA;
+    highlightOffset: number;
+    highlightPaddingLeft: number;
+    highlightPaddingRight: number;
+    letterSpacing: number;
+    textIndent: number;
+    cutSx: number;
+    cutSy: number;
+    cutEx: number;
+    cutEy: number;
+    advancedRenderer: boolean;
+    textRenderIssueMargin: number;
+}

package/dist/src/core/text-rendering/canvas/Settings.js

@@ -0,0 +1,20 @@
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
+ *
+ * Copyright 2025 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {};
+//# sourceMappingURL=Settings.js.map

package/dist/src/core/text-rendering/canvas/Settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Settings.js","sourceRoot":"","sources":["../../../../../src/core/text-rendering/canvas/Settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG"}

package/dist/src/core/text-rendering/canvas/Utils.d.ts

@@ -0,0 +1,20 @@
+import type { NormalizedFontMetrics } from '../TextRenderer.js';
+import type { TextBaseline } from './Settings.js';
+export declare const measureText: (context: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, word: string, space?: number) => number;
+export declare const wrapWord: (context: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, word: string, wordWrapWidth: number, suffix: string, letterSpacing: number) => string;
+export declare const wrapText: (context: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, text: string, wordWrapWidth: number, letterSpacing: number, indent: number) => {
+    l: string[];
+    n: number[];
+};
+export declare const isNormalizedFontMetrics: (obj: unknown) => obj is NormalizedFontMetrics;
+/**
+ * Calculate height for the canvas
+ *
+ * @param textBaseline
+ * @param fontSize
+ * @param lineHeight
+ * @param numLines
+ * @param offsetY
+ * @returns
+ */
+export declare const calcHeight: (textBaseline: TextBaseline, fontSize: number, lineHeight: number, numLines: number, offsetY: number) => number;

package/dist/src/core/text-rendering/canvas/Utils.js

@@ -0,0 +1,144 @@
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
+ *
+ * Copyright 2025 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { isZeroWidthSpace } from '../Utils.js';
+export const measureText = (context, word, space = 0) => {
+    if (space === 0) {
+        return context.measureText(word).width;
+    }
+    return word.split('').reduce((acc, char) => {
+        if (isZeroWidthSpace(char) === true) {
+            return acc;
+        }
+        return acc + context.measureText(char).width + space;
+    }, 0);
+};
+// Helper functions
+export const wrapWord = (context, word, wordWrapWidth, suffix, letterSpacing) => {
+    const suffixWidth = measureText(context, suffix, letterSpacing);
+    const wordLen = word.length;
+    const wordWidth = measureText(context, word, letterSpacing);
+    if (wordWidth <= wordWrapWidth) {
+        return word;
+    }
+    let cutoffIndex = Math.floor((wordWrapWidth * wordLen) / wordWidth);
+    let truncWordWidth = measureText(context, word.substring(0, cutoffIndex), letterSpacing) +
+        suffixWidth;
+    if (truncWordWidth > wordWrapWidth) {
+        while (cutoffIndex > 0) {
+            truncWordWidth =
+                measureText(context, word.substring(0, cutoffIndex), letterSpacing) +
+                    suffixWidth;
+            if (truncWordWidth > wordWrapWidth) {
+                cutoffIndex -= 1;
+            }
+            else {
+                break;
+            }
+        }
+    }
+    else {
+        while (cutoffIndex < wordLen) {
+            truncWordWidth =
+                measureText(context, word.substring(0, cutoffIndex), letterSpacing) +
+                    suffixWidth;
+            if (truncWordWidth < wordWrapWidth) {
+                cutoffIndex += 1;
+            }
+            else {
+                cutoffIndex -= 1;
+                break;
+            }
+        }
+    }
+    return (word.substring(0, cutoffIndex) +
+        (wordWrapWidth >= suffixWidth ? suffix : ''));
+};
+export const wrapText = (context, text, wordWrapWidth, letterSpacing, indent) => {
+    const spaceRegex = / |\u200B/g;
+    const lines = text.split(/\r?\n/g);
+    let allLines = [];
+    const realNewlines = [];
+    for (let i = 0; i < lines.length; i++) {
+        const resultLines = [];
+        let result = '';
+        let spaceLeft = wordWrapWidth - indent;
+        const line = lines[i] ?? '';
+        const words = line.split(spaceRegex);
+        const spaces = line.match(spaceRegex) || [];
+        for (let j = 0; j < words.length; j++) {
+            const space = spaces[j - 1] || '';
+            const word = words[j] || '';
+            const wordWidth = measureText(context, word, letterSpacing);
+            const wordWidthWithSpace = wordWidth + measureText(context, space, letterSpacing);
+            if (j === 0 || wordWidthWithSpace > spaceLeft) {
+                if (j > 0) {
+                    resultLines.push(result);
+                    result = '';
+                }
+                result += word;
+                spaceLeft = wordWrapWidth - wordWidth - (j === 0 ? indent : 0);
+            }
+            else {
+                spaceLeft -= wordWidthWithSpace;
+                // Don't add ZWSP to the output since it's invisible
+                if (space !== '\u200B') {
+                    result += space + word;
+                }
+                else {
+                    result += word;
+                }
+            }
+        }
+        resultLines.push(result);
+        result = '';
+        allLines = allLines.concat(resultLines);
+        if (i < lines.length - 1) {
+            realNewlines.push(allLines.length);
+        }
+    }
+    return { l: allLines, n: realNewlines };
+};
+export const isNormalizedFontMetrics = (obj) => {
+    return (typeof obj === 'object' &&
+        obj !== null &&
+        'ascender' in obj &&
+        typeof obj.ascender === 'number' &&
+        'descender' in obj &&
+        typeof obj.descender === 'number' &&
+        'lineGap' in obj &&
+        typeof obj.lineGap === 'number');
+};
+/**
+ * Calculate height for the canvas
+ *
+ * @param textBaseline
+ * @param fontSize
+ * @param lineHeight
+ * @param numLines
+ * @param offsetY
+ * @returns
+ */
+export const calcHeight = (textBaseline, fontSize, lineHeight, numLines, offsetY) => {
+    const baselineOffset = textBaseline !== 'bottom' ? 0.5 * fontSize : 0;
+    return (lineHeight * (numLines - 1) +
+        baselineOffset +
+        Math.max(lineHeight, fontSize) +
+        offsetY);
+};
+//# sourceMappingURL=Utils.js.map

package/dist/src/core/text-rendering/canvas/Utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../../../src/core/text-rendering/canvas/Utils.ts"],"names":[],"mappings":"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"}

package/dist/src/core/text-rendering/canvas/calculateRenderInfo.d.ts

@@ -0,0 +1,60 @@
+import type { NormalizedFontMetrics, TextBaseline, TextVerticalAlign } from '../TextRenderer.js';
+import type { TextAlign, TextOverflow } from './Settings.js';
+export interface RenderInfo {
+    lines: string[];
+    precision: number;
+    remainingText: string;
+    moreTextLines: boolean;
+    width: number;
+    innerWidth: number;
+    height: number;
+    fontSize: number;
+    cutSx: number;
+    cutSy: number;
+    cutEx: number;
+    cutEy: number;
+    lineHeight: number | null;
+    defLineHeight: number;
+    lineWidths: number[];
+    offsetY: number;
+    paddingLeft: number;
+    paddingRight: number;
+    letterSpacing: number;
+    textIndent: number;
+    metrics: NormalizedFontMetrics;
+    text: string;
+    fontStyle: string;
+    fontBaselineRatio: number;
+    fontFamily: string | null;
+    wordWrap: boolean;
+    wordWrapWidth: number;
+    wordBreak: 'normal' | 'break-all' | 'break-word';
+    textOverflow: TextOverflow | null;
+    textBaseline: TextBaseline;
+    textAlign: TextAlign;
+    verticalAlign: TextVerticalAlign;
+    maxLines: number;
+    maxHeight: number | null;
+    overflowSuffix: string;
+    textColor: number;
+    shadow: boolean;
+    shadowColor: number;
+    shadowOffsetX: number;
+    shadowOffsetY: number;
+    shadowBlur: number;
+    highlight: boolean;
+    highlightHeight: number;
+    highlightColor: number;
+    highlightOffset: number;
+    highlightPaddingLeft: number;
+    highlightPaddingRight: number;
+    advancedRenderer: boolean;
+    textRenderIssueMargin: number;
+}
+export interface LineType {
+    text: string;
+    x: number;
+    y: number;
+    w: number;
+}
+export declare function calculateRenderInfo(context: OffscreenCanvasRenderingContext2D | CanvasRenderingContext2D, renderInfo: RenderInfo): void;

package/dist/src/core/text-rendering/canvas/calculateRenderInfo.js

@@ -0,0 +1,183 @@
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
+ *
+ * Copyright 2025 Comcast Cable Communications Management, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { calculateFontMetrics } from '../Utils.js';
+import { wrapText, wrapWord, measureText, calcHeight } from './Utils.js';
+import { getFontMetrics, setFontMetrics } from '../CanvasFontHandler.js';
+export function calculateRenderInfo(context, renderInfo) {
+    const precision = renderInfo.precision;
+    const paddingLeft = renderInfo.paddingLeft * precision;
+    const paddingRight = renderInfo.paddingRight * precision;
+    const fontSize = renderInfo.fontSize * precision;
+    let offsetY = renderInfo.offsetY === null ? null : renderInfo.offsetY * precision;
+    const w = renderInfo.width * precision;
+    const h = renderInfo.height * precision;
+    let wordWrapWidth = renderInfo.wordWrapWidth * precision;
+    const cutSx = renderInfo.cutSx * precision;
+    const cutEx = renderInfo.cutEx * precision;
+    const cutSy = renderInfo.cutSy * precision;
+    const cutEy = renderInfo.cutEy * precision;
+    const letterSpacing = (renderInfo.letterSpacing || 0) * precision;
+    const textIndent = renderInfo.textIndent * precision;
+    const fontFamily = renderInfo.fontFamily;
+    // Set font properties
+    context.font = `${renderInfo.fontStyle} ${fontSize}px ${fontFamily}`;
+    context.textBaseline = renderInfo.textBaseline;
+    let metrics = getFontMetrics(fontFamily, fontSize);
+    if (metrics === null) {
+        metrics = calculateFontMetrics(context, fontFamily, fontSize);
+        setFontMetrics(fontFamily, metrics);
+    }
+    const defLineHeight = fontSize *
+        (metrics.ascender - metrics.descender + metrics.lineGap) *
+        precision;
+    const lineHeight = renderInfo.lineHeight !== null
+        ? renderInfo.lineHeight * precision
+        : defLineHeight;
+    const maxHeight = renderInfo.maxHeight;
+    const containedMaxLines = maxHeight !== null && lineHeight > 0
+        ? Math.floor(maxHeight / lineHeight)
+        : 0;
+    const setMaxLines = renderInfo.maxLines;
+    const calcMaxLines = containedMaxLines > 0 && setMaxLines > 0
+        ? Math.min(containedMaxLines, setMaxLines)
+        : Math.max(containedMaxLines, setMaxLines);
+    const textOverflow = renderInfo.textOverflow;
+    const wordWrap = renderInfo.wordWrap;
+    // Total width
+    let width = w || 2048 / precision;
+    // Inner width
+    let innerWidth = width - paddingLeft;
+    if (innerWidth < 10) {
+        width += 10 - innerWidth;
+        innerWidth = 10;
+    }
+    if (wordWrapWidth === 0) {
+        wordWrapWidth = innerWidth;
+    }
+    // Text overflow
+    let text = renderInfo.text;
+    if (textOverflow !== null && wordWrap === false) {
+        let suffix;
+        switch (textOverflow) {
+            case 'clip':
+                suffix = '';
+                break;
+            case 'ellipsis':
+                suffix = renderInfo.overflowSuffix;
+                break;
+            default:
+                suffix = String(textOverflow);
+        }
+        text = wrapWord(context, text, wordWrapWidth - textIndent, suffix, letterSpacing);
+    }
+    // Word wrap
+    let linesInfo;
+    if (wordWrap) {
+        linesInfo = wrapText(context, text, wordWrapWidth, letterSpacing, textIndent);
+    }
+    else {
+        linesInfo = { l: text.split(/(?:\r\n|\r|\n)/), n: [] };
+        const n = linesInfo.l.length;
+        for (let i = 0; i < n - 1; i++) {
+            linesInfo.n.push(i);
+        }
+    }
+    let lines = linesInfo.l;
+    let remainingText = '';
+    let moreTextLines = false;
+    if (calcMaxLines > 0 && lines.length > calcMaxLines) {
+        const usedLines = lines.slice(0, calcMaxLines);
+        let otherLines = [];
+        const overflowSuffix = renderInfo.overflowSuffix;
+        if (overflowSuffix.length > 0) {
+            const w = measureText(context, overflowSuffix, letterSpacing);
+            const al = wrapText(context, usedLines[usedLines.length - 1], wordWrapWidth - w, letterSpacing, textIndent);
+            usedLines[usedLines.length - 1] = `${al.l[0]}${overflowSuffix}`;
+            otherLines = [al.l.length > 1 ? al.l[1] : ''];
+        }
+        else {
+            otherLines = [''];
+        }
+        // Re-assemble the remaining text
+        let i;
+        const n = lines.length;
+        let j = 0;
+        const m = linesInfo.n.length;
+        for (i = calcMaxLines; i < n; i++) {
+            otherLines[j] += `${otherLines[j] ? ' ' : ''}${lines[i] ?? ''}`;
+            if (i + 1 < m && linesInfo.n[i + 1] !== undefined) {
+                j++;
+            }
+        }
+        remainingText = otherLines.join('\n');
+        moreTextLines = true;
+        lines = usedLines;
+    }
+    // Calculate text width
+    let maxLineWidth = 0;
+    const lineWidths = [];
+    for (let i = 0; i < lines.length; i++) {
+        const lineWidth = measureText(context, lines[i], letterSpacing) +
+            (i === 0 ? textIndent : 0);
+        lineWidths.push(lineWidth);
+        maxLineWidth = Math.max(maxLineWidth, lineWidth);
+    }
+    if (w === 0) {
+        width = maxLineWidth + paddingLeft + paddingRight;
+        innerWidth = maxLineWidth;
+    }
+    if (wordWrap === true &&
+        w > maxLineWidth &&
+        renderInfo.textAlign === 'left' &&
+        lines.length === 1) {
+        width = maxLineWidth + paddingLeft + paddingRight;
+    }
+    let height;
+    if (h > 0) {
+        height = h;
+    }
+    else {
+        height = calcHeight(renderInfo.textBaseline, fontSize, lineHeight, lines.length, offsetY);
+    }
+    if (offsetY === null) {
+        offsetY = fontSize;
+    }
+    renderInfo.width = width;
+    renderInfo.height = height;
+    renderInfo.lines = lines;
+    renderInfo.precision = precision;
+    renderInfo.remainingText = remainingText;
+    renderInfo.moreTextLines = moreTextLines;
+    renderInfo.innerWidth = innerWidth;
+    renderInfo.fontSize = fontSize;
+    renderInfo.cutSx = cutSx;
+    renderInfo.cutSy = cutSy;
+    renderInfo.cutEx = cutEx;
+    renderInfo.cutEy = cutEy;
+    renderInfo.lineHeight = lineHeight;
+    renderInfo.defLineHeight = defLineHeight;
+    renderInfo.lineWidths = lineWidths;
+    renderInfo.offsetY = offsetY;
+    renderInfo.paddingLeft = paddingLeft;
+    renderInfo.paddingRight = paddingRight;
+    renderInfo.letterSpacing = letterSpacing;
+    renderInfo.textIndent = textIndent;
+    renderInfo.metrics = metrics;
+}
+//# sourceMappingURL=calculateRenderInfo.js.map

package/dist/src/core/text-rendering/canvas/calculateRenderInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calculateRenderInfo.js","sourceRoot":"","sources":["../../../../../src/core/text-rendering/canvas/calculateRenderInfo.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAqEzE,MAAM,UAAU,mBAAmB,CACjC,OAAqE,EACrE,UAAsB;IAEtB,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IACvC,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC;IACvD,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,GAAG,SAAS,CAAC;IACzD,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC;IACjD,IAAI,OAAO,GACT,UAAU,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,GAAG,SAAS,CAAC;IACtE,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;IACvC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;IACxC,IAAI,aAAa,GAAG,UAAU,CAAC,aAAa,GAAG,SAAS,CAAC;IACzD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;IAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;IAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;IAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;IAC3C,MAAM,aAAa,GAAG,CAAC,UAAU,CAAC,aAAa,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAClE,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;IAErD,MAAM,UAAU,GAAG,UAAU,CAAC,UAAW,CAAC;IAE1C,sBAAsB;IACtB,OAAO,CAAC,IAAI,GAAG,GAAG,UAAU,CAAC,SAAS,IAAI,QAAQ,MAAM,UAAU,EAAE,CAAC;IACrE,OAAO,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAE/C,IAAI,OAAO,GAAG,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAEnD,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC9D,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,aAAa,GACjB,QAAQ;QACR,CAAC,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;QACxD,SAAS,CAAC;IACZ,MAAM,UAAU,GACd,UAAU,CAAC,UAAU,KAAK,IAAI;QAC5B,CAAC,CAAC,UAAU,CAAC,UAAU,GAAG,SAAS;QACnC,CAAC,CAAC,aAAa,CAAC;IAEpB,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IACvC,MAAM,iBAAiB,GACrB,SAAS,KAAK,IAAI,IAAI,UAAU,GAAG,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,UAAU,CAAC;QACpC,CAAC,CAAC,CAAC,CAAC;IACR,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC;IACxC,MAAM,YAAY,GAChB,iBAAiB,GAAG,CAAC,IAAI,WAAW,GAAG,CAAC;QACtC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,WAAW,CAAC;QAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAC7C,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;IAErC,cAAc;IACd,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,GAAG,SAAS,CAAC;IAClC,cAAc;IACd,IAAI,UAAU,GAAG,KAAK,GAAG,WAAW,CAAC;IACrC,IAAI,UAAU,GAAG,EAAE,EAAE,CAAC;QACpB,KAAK,IAAI,EAAE,GAAG,UAAU,CAAC;QACzB,UAAU,GAAG,EAAE,CAAC;IAClB,CAAC;IACD,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QACxB,aAAa,GAAG,UAAU,CAAC;IAC7B,CAAC;IAED,gBAAgB;IAChB,IAAI,IAAI,GAAW,UAAU,CAAC,IAAI,CAAC;IACnC,IAAI,YAAY,KAAK,IAAI,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;QAChD,IAAI,MAAc,CAAC;QACnB,QAAQ,YAAY,EAAE,CAAC;YACrB,KAAK,MAAM;gBACT,MAAM,GAAG,EAAE,CAAC;gBACZ,MAAM;YACR,KAAK,UAAU;gBACb,MAAM,GAAG,UAAU,CAAC,cAAc,CAAC;gBACnC,MAAM;YACR;gBACE,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,GAAG,QAAQ,CACb,OAAO,EACP,IAAI,EACJ,aAAa,GAAG,UAAU,EAC1B,MAAM,EACN,aAAa,CACd,CAAC;IACJ,CAAC;IAED,YAAY;IACZ,IAAI,SAAuC,CAAC;IAC5C,IAAI,QAAQ,EAAE,CAAC;QACb,SAAS,GAAG,QAAQ,CAClB,OAAO,EACP,IAAI,EACJ,aAAa,EACb,aAAa,EACb,UAAU,CACX,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,SAAS,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QACvD,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/B,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IACD,IAAI,KAAK,GAAa,SAAS,CAAC,CAAC,CAAC;IAElC,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,YAAY,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,YAAY,EAAE,CAAC;QACpD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;QAC/C,IAAI,UAAU,GAAa,EAAE,CAAC;QAC9B,MAAM,cAAc,GAAG,UAAU,CAAC,cAAc,CAAC;QAEjD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,GAAG,WAAW,CAAC,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;YAC9D,MAAM,EAAE,GAAG,QAAQ,CACjB,OAAO,EACP,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAE,EAChC,aAAa,GAAG,CAAC,EACjB,aAAa,EACb,UAAU,CACX,CAAC;YACF,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAE,GAAG,cAAc,EAAE,CAAC;YACjE,UAAU,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;QACD,iCAAiC;QACjC,IAAI,CAAS,CAAC;QACd,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7B,KAAK,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAClC,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAChE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBAClD,CAAC,EAAE,CAAC;YACN,CAAC;QACH,CAAC;QACD,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,aAAa,GAAG,IAAI,CAAC;QACrB,KAAK,GAAG,SAAS,CAAC;IACpB,CAAC;IAED,uBAAuB;IACvB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,SAAS,GACb,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,aAAa,CAAC;YAC9C,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACZ,KAAK,GAAG,YAAY,GAAG,WAAW,GAAG,YAAY,CAAC;QAClD,UAAU,GAAG,YAAY,CAAC;IAC5B,CAAC;IACD,IACE,QAAQ,KAAK,IAAI;QACjB,CAAC,GAAG,YAAY;QAChB,UAAU,CAAC,SAAS,KAAK,MAAM;QAC/B,KAAK,CAAC,MAAM,KAAK,CAAC,EAClB,CAAC;QACD,KAAK,GAAG,YAAY,GAAG,WAAW,GAAG,YAAY,CAAC;IACpD,CAAC;IAED,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACV,MAAM,GAAG,CAAC,CAAC;IACb,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,UAAU,CACjB,UAAU,CAAC,YAAY,EACvB,QAAQ,EACR,UAAU,EACV,KAAK,CAAC,MAAM,EACZ,OAAiB,CAClB,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,GAAG,QAAQ,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;IAC3B,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;IACjC,UAAU,CAAC,aAAa,GAAG,aAAa,CAAC;IACzC,UAAU,CAAC,aAAa,GAAG,aAAa,CAAC;IACzC,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC;IACnC,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC/B,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC;IACnC,UAAU,CAAC,aAAa,GAAG,aAAa,CAAC;IACzC,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC;IACnC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;IAC7B,UAAU,CAAC,WAAW,GAAG,WAAW,CAAC;IACrC,UAAU,CAAC,YAAY,GAAG,YAAY,CAAC;IACvC,UAAU,CAAC,aAAa,GAAG,aAAa,CAAC;IACzC,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC;IACnC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;AAC/B,CAAC"}