ag-psd 15.3.0 → 16.0.0

package/dist-es/text.js

@@ -100,23 +100,34 @@ var styleKeys = [
 var antialias = ['none', 'crisp', 'strong', 'smooth', 'sharp'];
 var justification = ['left', 'right', 'center'];
 function upperFirst(value) {
-    return value.substr(0, 1).toUpperCase() + value.substr(1);
+    return value.substring(0, 1).toUpperCase() + value.substring(1);
 }
 function decodeColor(color) {
     var c = color.Values;
-    if (color.Type === 0) { // grayscale
-        return { r: c[1] * 255, g: c[1] * 255, b: c[1] * 255 }; // , c[0] * 255];
-    }
-    else { // rgb
-        return { r: c[1] * 255, g: c[2] * 255, b: c[3] * 255, a: c[0] }; // , c[0] * 255];
+    switch (color.Type) {
+        case 0: return { k: c[1] * 255 }; // grayscale (alpha?)
+        case 1: return c[0] === 1 ?
+            { r: c[1] * 255, g: c[2] * 255, b: c[3] * 255 } : // rgb
+            { r: c[1] * 255, g: c[2] * 255, b: c[3] * 255, a: c[0] * 255 }; // rgba
+        case 2: return { c: c[1] * 255, m: c[2] * 255, y: c[3] * 255, k: c[4] * 255 }; // cmyk (alpha?)
+        default: throw new Error('Unknown color type in text layer');
     }
 }
 function encodeColor(color) {
-    if (color && 'r' in color) {
-        return ['a' in color ? color.a : 1, color.r / 255, color.g / 255, color.b / 255];
+    if (!color) {
+        return { Type: 1, Values: [0, 0, 0, 0] };
+    }
+    else if ('r' in color) {
+        return { Type: 1, Values: ['a' in color ? color.a / 255 : 1, color.r / 255, color.g / 255, color.b / 255] };
+    }
+    else if ('c' in color) {
+        return { Type: 2, Values: [1, color.c / 255, color.m / 255, color.y / 255, color.k / 255] };
+    }
+    else if ('k' in color) {
+        return { Type: 0, Values: [1, color.k / 255] };
     }
     else {
-        return [0, 0, 0, 0];
+        throw new Error('Invalid color type in text layer');
     }
 }
 function arraysEqual(a, b) {
@@ -189,7 +200,7 @@ function encodeObject(obj, keys, fonts) {
             result[Key] = findOrAddFont(fonts, obj[key]);
         }
         else if (key === 'fillColor' || key === 'strokeColor') {
-            result[Key] = { Type: 1, Values: encodeColor(obj[key]) };
+            result[Key] = encodeColor(obj[key]);
         }
         else {
             result[Key] = obj[key];
@@ -524,8 +535,8 @@ export function encodeEngineData(data) {
                 ShowGrid: !!gridInfo.show,
                 GridSize: (_j = gridInfo.size) !== null && _j !== void 0 ? _j : 18,
                 GridLeading: (_k = gridInfo.leading) !== null && _k !== void 0 ? _k : 22,
-                GridColor: { Type: 1, Values: encodeColor(gridInfo.color) },
-                GridLeadingFillColor: { Type: 1, Values: encodeColor(gridInfo.color) },
+                GridColor: encodeColor(gridInfo.color),
+                GridLeadingFillColor: encodeColor(gridInfo.color),
                 AlignLineHeightToGridFlags: !!gridInfo.alignLineHeightToGridFlags,
             },
             AntiAlias: antialias.indexOf((_l = data.antiAlias) !== null && _l !== void 0 ? _l : 'sharp'),

package/dist-es/text.js.map

@@ -1 +1 @@
-{"version":3,"file":"text.js","sourceRoot":"../src/","sources":["text.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"text.js","sourceRoot":"../src/","sources":["text.ts"],"names":[],"mappings":";;;;;;;;;;;AAuKA,IAAM,WAAW,GAAS;IACzB,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,CAAC;IACP,SAAS,EAAE,CAAC;CACZ,CAAC;AAEF,IAAM,qBAAqB,GAAmB;IAC7C,aAAa,EAAE,MAAM;IACrB,eAAe,EAAE,CAAC;IAClB,WAAW,EAAE,CAAC;IACd,SAAS,EAAE,CAAC;IACZ,WAAW,EAAE,CAAC;IACd,UAAU,EAAE,CAAC;IACb,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,CAAC;IACrB,SAAS,EAAE,CAAC;IACZ,UAAU,EAAE,CAAC;IACb,kBAAkB,EAAE,CAAC;IACrB,IAAI,EAAE,EAAE;IACR,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC;IAC3B,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACxB,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACvB,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,CAAC;IACd,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,KAAK;IACjB,YAAY,EAAE,CAAC;IACf,iBAAiB,EAAE,KAAK;CACxB,CAAC;AAEF,IAAM,YAAY,GAAc;IAC/B,IAAI,EAAE,WAAW;IACjB,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,KAAK;IACf,UAAU,EAAE,KAAK;IACjB,WAAW,EAAE,IAAI;IACjB,OAAO,EAAE,CAAC;IACV,eAAe,EAAE,CAAC;IAClB,aAAa,EAAE,CAAC;IAChB,QAAQ,EAAE,CAAC;IACX,WAAW,EAAE,IAAI;IACjB,OAAO,EAAE,CAAC;IACV,aAAa,EAAE,CAAC;IAChB,QAAQ,EAAE,CAAC;IACX,YAAY,EAAE,CAAC;IACf,SAAS,EAAE,KAAK;IAChB,aAAa,EAAE,KAAK;IACpB,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,KAAK;IACjB,iBAAiB,EAAE,CAAC;IACpB,KAAK,EAAE,CAAC;IACR,iBAAiB,EAAE,CAAC;IACpB,QAAQ,EAAE,CAAC;IACX,OAAO,EAAE,KAAK;IACd,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;IAC/B,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;IACjC,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,CAAC;IACb,YAAY,EAAE,CAAC;IACf,kBAAkB,EAAE,CAAC;IACrB,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,CAAC;IACV,YAAY,EAAE,CAAC;CACf,CAAC;AAEF,IAAM,eAAe,GAAiB;IACrC,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,EAAE;IACR,OAAO,EAAE,EAAE;IACX,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE;IAC7B,gBAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE;IACxC,0BAA0B,EAAE,KAAK;CACjC,CAAC;AAEF,IAAM,kBAAkB,GAA6B;IACpD,eAAe,EAAE,iBAAiB,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY;IAC3F,eAAe,EAAE,oBAAoB,EAAE,WAAW,EAAE,YAAY,EAAE,oBAAoB;IACtF,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa;IACpF,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,mBAAmB;CAC5D,CAAC;AAEF,IAAM,SAAS,GAAwB;IACtC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,iBAAiB;IACzF,eAAe,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc;IAClG,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,OAAO;IACrF,mBAAmB,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU;IAClF,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc;IAC7F,SAAS,EAAE,cAAc;CACzB,CAAC;AAEF,IAAM,SAAS,GAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC9E,IAAM,aAAa,GAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAEnE,SAAS,UAAU,CAAC,KAAa;IAChC,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,WAAW,CAAC,KAAiB;IACrC,IAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;IACvB,QAAQ,KAAK,CAAC,IAAI,EAAE;QACnB,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,qBAAqB;QACvD,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1B,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM;YACxD,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,OAAO;QACxE,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,gBAAgB;QAC/F,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KAC7D;AACF,CAAC;AAED,SAAS,WAAW,CAAC,KAAwB;IAC5C,IAAI,CAAC,KAAK,EAAE;QACX,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;KACzC;SAAM,IAAI,GAAG,IAAI,KAAK,EAAE;QACxB,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;KAC5G;SAAM,IAAI,GAAG,IAAI,KAAK,EAAE;QACxB,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;KAC5F;SAAM,IAAI,GAAG,IAAI,KAAK,EAAE;QACxB,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;KAC/C;SAAM;QACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACpD;AACF,CAAC;AAED,SAAS,WAAW,CAAC,CAAQ,EAAE,CAAQ;IACtC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;QAAE,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IACnE,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CAAC,CAAM,EAAE,CAAM;IACnC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3B,KAAkB,UAAc,EAAd,KAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAd,cAAc,EAAd,IAAc;QAA3B,IAAM,GAAG,SAAA;QAAoB,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;KAAA;IACtE,KAAkB,UAAc,EAAd,KAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAd,cAAc,EAAd,IAAc;QAA3B,IAAM,GAAG,SAAA;QAAoB,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;KAAA;IACtE,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,aAAa,CAAC,KAAa,EAAE,IAAU;IAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC;KAC1C;IAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,YAAY,CAAC,GAAQ,EAAE,IAAc,EAAE,KAAa;IAC5D,IAAM,MAAM,GAAQ,EAAE,CAAC;IAEvB,KAAkB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI,EAAE;QAAnB,IAAM,GAAG,aAAA;QACb,IAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAE5B,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS;YAAE,SAAS;QAErC,IAAI,GAAG,KAAK,eAAe,EAAE;YAC5B,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACtC;aAAM,IAAI,GAAG,KAAK,MAAM,EAAE;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAC9B;aAAM,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,aAAa,EAAE;YACxD,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACpC;aAAM;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;SACvB;KACD;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,GAAQ,EAAE,IAAc,EAAE,KAAa;;IAC5D,IAAM,MAAM,GAAQ,EAAE,CAAC;IAEvB,KAAkB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI,EAAE;QAAnB,IAAM,GAAG,aAAA;QACb,IAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAE5B,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS;YAAE,SAAS;QAErC,IAAI,GAAG,KAAK,eAAe,EAAE;YAC5B,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,MAAA,GAAG,CAAC,GAAG,CAAC,mCAAI,MAAM,CAAC,CAAC;SACxD;aAAM,IAAI,GAAG,KAAK,MAAM,EAAE;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAC7C;aAAM,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,aAAa,EAAE;YACxD,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACpC;aAAM;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;SACvB;KACD;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAwB,EAAE,KAAa;IACpE,OAAO,YAAY,CAAC,GAAG,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,WAAW,CAAC,GAAmB,EAAE,KAAa;IACtD,OAAO,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAmB,EAAE,KAAa;IAC/D,OAAO,YAAY,CAAC,GAAG,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,WAAW,CAAC,GAAc,EAAE,KAAa;IACjD,OAAO,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,iBAAiB,CAAI,IAAO,EAAE,IAAqB,EAAE,IAAiB;IAC9E,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO;4BAEd,GAAG;QACb,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEjC,IAAI,KAAK,KAAK,SAAS,EAAE;YACxB,IAAI,SAAS,GAAG,KAAK,CAAC;YAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACzB,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAA,CAAC,IAAI,OAAA,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAQ,EAAE,KAAK,CAAC,EAAvC,CAAuC,CAAC,CAAC;aACrE;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBACrC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAA,CAAC,IAAI,OAAA,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAQ,EAAE,KAAK,CAAC,EAAxC,CAAwC,CAAC,CAAC;aACtE;iBAAM;gBACN,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,EAAtB,CAAsB,CAAC,CAAC;aACpD;YAED,IAAI,SAAS,EAAE;gBACd,IAAI,CAAC,GAAG,CAAC,GAAG,KAAY,CAAC;aACzB;SACD;QAED,IAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QAE7B,IAAI,UAAU,KAAK,SAAS,EAAE;YAC7B,KAAgB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI,EAAE;gBAAjB,IAAM,CAAC,aAAA;gBACX,IAAI,IAAI,GAAG,KAAK,CAAC;gBAEjB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACzB,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAQ,EAAE,KAAK,CAAC,CAAC;iBAC/C;qBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBACrC,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAQ,EAAE,KAAK,CAAC,CAAC;iBAChD;qBAAM;oBACN,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;iBAC9B;gBAED,IAAI,IAAI;oBAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aAC9B;SACD;;IAnCF,KAAkB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI;QAAjB,IAAM,GAAG,aAAA;gBAAH,GAAG;KAoCb;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,UAAA,CAAC,IAAI,OAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAxC,CAAwC,CAAC,EAAE;QAC9D,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;KAChB;AACF,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAsB;;IACtD,mFAAmF;IACnF,IAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IACzC,IAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAE7C,IAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAO,UAAA,CAAC,IAAI,OAAA,CAAC;QAClD,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,IAAI,EAAE,CAAC,CAAC,QAAQ;QAChB,SAAS,EAAE,CAAC,CAAC,SAAS;KACtB,CAAC,EALgD,CAKhD,CAAC,CAAC;IAEJ,IAAI,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACvD,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAE1B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACxB,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvC,iBAAiB,EAAE,CAAC;KACpB;IAED,IAAM,MAAM,GAAkB;QAC7B,IAAI,MAAA;QACJ,SAAS,EAAE,MAAA,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,mCAAI,QAAQ;QACtD,wBAAwB,EAAE,CAAC,CAAC,UAAU,CAAC,wBAAwB;QAC/D,eAAe,EAAE,YAAY,CAAC,eAAe;QAC7C,mBAAmB,EAAE,YAAY,CAAC,mBAAmB;QACrD,aAAa,EAAE,YAAY,CAAC,aAAa;QACzC,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;QACjD,YAAY,EAAE,YAAY,CAAC,YAAY;KACvC,CAAC;IAEF,QAAQ;IAER,IAAM,SAAS,GAAG,MAAA,MAAA,MAAA,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,MAAM,0CAAE,QAAQ,0CAAG,CAAC,CAAC,0CAAE,MAAM,0CAAE,SAAS,CAAC;IAEhF,IAAI,SAAS,EAAE;QACd,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;QAC/D,IAAI,SAAS,CAAC,SAAS;YAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;QAChE,IAAI,SAAS,CAAC,SAAS;YAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;KAChE;IAED,kBAAkB;IAElB,wEAAwE;IACxE,4DAA4D;IAC5D,qFAAqF;IACrF,IAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC;IAExD,MAAM,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC,oDAAoD;IAChF,MAAM,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtD,IAAM,KAAG,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACrC,IAAM,QAAM,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAM,KAAK,GAAG,oBAAoB,CAAC,KAAG,CAAC,cAAc,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACzE,wBAAwB;QACxB,gCAAgC;QAChC,4BAA4B;QAC5B,KAAK;QACL,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,UAAA,EAAE,KAAK,OAAA,CAAA,iBAAiB,EAAE,CAAC,CAAC;KACnE;IAED,KAAK,IAAI,OAAO,GAAG,iBAAiB,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE;QACjG,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACnF,MAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;SAChC;KACD;IAED,iBAAiB,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;IAExF,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC,kBAAkB,CAAC;IAExE,QAAQ;IAER,gEAAgE;IAChE,oDAAoD;IACpD,4EAA4E;IAC5E,IAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC;IAEhD,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,sCAAsC;IACzD,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;IAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,IAAM,QAAM,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACjF,IAAI,CAAC,KAAK,CAAC,IAAI;YAAE,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,UAAA,EAAE,KAAK,OAAA,EAAE,CAAC,CAAC;KACzC;IAED,KAAK,IAAI,OAAO,GAAG,iBAAiB,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE;QACxF,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACjE,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;SACvB;KACD;IAED,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAE7D,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC,SAAS,CAAC;IAEtD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAmB;;IACnD,IAAM,IAAI,GAAG,UAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAI,CAAC;IAE9D,IAAM,KAAK,GAAW;QACrB,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;KAC5D,CAAC;IAEF,IAAM,OAAO,GAAG,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,IAAI,MAAI,MAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,KAAK,CAAC,IAAI,EAAZ,CAAY,CAAC,0CAAE,KAAK,CAAC,IAAI,CAAA,IAAI,WAAW,CAAC;IACvG,IAAM,iBAAiB,GAAmB,EAAE,CAAC;IAC7C,IAAM,uBAAuB,GAAa,EAAE,CAAC;IAC7C,IAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC;IAE9C,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,EAAE;QAC1C,IAAI,YAAU,GAAG,IAAI,CAAC,MAAM,CAAC;QAE7B,KAAkB,UAAa,EAAb,+BAAa,EAAb,2BAAa,EAAb,IAAa,EAAE;YAA5B,IAAM,KAAG,sBAAA;YACb,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,KAAG,CAAC,MAAM,EAAE,YAAU,CAAC,CAAC;YACjD,YAAU,IAAI,SAAS,CAAC;YAExB,IAAI,CAAC,SAAS;gBAAE,SAAS,CAAC,qBAAqB;YAE/C,+CAA+C;YAC/C,IAAI,YAAU,KAAK,CAAC,IAAI,KAAG,KAAK,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;gBACxE,SAAS,EAAE,CAAC;gBACZ,YAAU,EAAE,CAAC;aACb;YAED,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxC,iBAAiB,CAAC,IAAI,CAAC;gBACtB,cAAc,EAAE;oBACf,iBAAiB,EAAE,CAAC;oBACpB,UAAU,EAAE,oBAAoB,gCAAM,qBAAqB,GAAK,IAAI,CAAC,cAAc,GAAK,KAAG,CAAC,KAAK,GAAI,KAAK,CAAC;iBAC3G;gBACD,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;aAC5C,CAAC,CAAC;SACH;QAED,IAAI,YAAU,EAAE;YACf,uBAAuB,CAAC,IAAI,CAAC,YAAU,CAAC,CAAC;YACzC,iBAAiB,CAAC,IAAI,CAAC;gBACtB,cAAc,EAAE;oBACf,iBAAiB,EAAE,CAAC;oBACpB,UAAU,EAAE,oBAAoB,uBAAM,qBAAqB,GAAK,IAAI,CAAC,cAAc,GAAI,KAAK,CAAC;iBAC7F;gBACD,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;aAC5C,CAAC,CAAC;SACH;KACD;SAAM;QACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK;gBACrC,uBAAuB,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;gBAC3C,iBAAiB,CAAC,IAAI,CAAC;oBACtB,cAAc,EAAE;wBACf,iBAAiB,EAAE,CAAC;wBACpB,UAAU,EAAE,oBAAoB,uBAAM,qBAAqB,GAAK,IAAI,CAAC,cAAc,GAAI,KAAK,CAAC;qBAC7F;oBACD,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;iBAC5C,CAAC,CAAC;gBACH,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;aACb;SACD;KACD;IAED,IAAM,cAAc,GAAG,WAAW,uBAAM,YAAY,KAAE,IAAI,EAAE,OAAO,KAAI,KAAK,CAAC,CAAC;IAC9E,IAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,CAAC;IACvF,IAAM,aAAa,GAAe,EAAE,CAAC;IACrC,IAAM,mBAAmB,GAAa,EAAE,CAAC;IAEzC,IAAI,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IAE7B,KAAkB,UAAS,EAAT,uBAAS,EAAT,uBAAS,EAAT,IAAS,EAAE;QAAxB,IAAM,KAAG,kBAAA;QACb,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,KAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACjD,UAAU,IAAI,SAAS,CAAC;QAExB,IAAI,CAAC,SAAS;YAAE,SAAS,CAAC,qBAAqB;QAE/C,+CAA+C;QAC/C,IAAI,UAAU,KAAK,CAAC,IAAI,KAAG,KAAK,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;YAChE,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,CAAC;SACb;QAED,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,aAAa,CAAC,IAAI,CAAC;YAClB,UAAU,EAAE;gBACX,cAAc,EAAE,WAAW,qBAC1B,OAAO,EAAE,CAAC,EACV,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAC5B,IAAI,CAAC,KAAK,GACV,KAAG,CAAC,KAAK,GACV,KAAK,CAAC;aACT;SACD,CAAC,CAAC;KACH;IAED,8DAA8D;IAC9D,IAAI,UAAU,IAAI,SAAS,CAAC,MAAM,EAAE;QACnC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrC,aAAa,CAAC,IAAI,CAAC;YAClB,UAAU,EAAE;gBACX,cAAc,EAAE,WAAW,YAC1B,OAAO,EAAE,CAAC,EACV,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAC5B,IAAI,CAAC,KAAK,GACX,KAAK,CAAC;aACT;SACD,CAAC,CAAC;KACH;IAED,IAAM,QAAQ,yBAAQ,eAAe,GAAK,IAAI,CAAC,QAAQ,CAAE,CAAC;IAC1D,IAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,IAAM,UAAU,GAAG,IAAI,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,IAAM,SAAS,GAAG,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,IAAM,SAAS,GAAkB;QAChC,SAAS,WAAA;KACT,CAAC;IAEF,IAAI,SAAS,KAAK,CAAC,EAAE;QACpB,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KAC/C;SAAM;QACN,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KACrD;IAED,yCAAyC;IACzC,SAAS,CAAC,IAAI,GAAG;QAChB,SAAS,WAAA;QACT,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACvB,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACvB,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;KACvB,CAAC;IAEF,IAAM,gBAAgB,GAAG;QACxB,UAAU,EAAE;YACX;gBACC,IAAI,EAAE,sBAAsB;gBAC5B,OAAO,EAAE,mEAAmE;gBAC5E,KAAK,EAAE,uBAAuB;gBAC9B,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,MAAM;aACf;YACD;gBACC,IAAI,EAAE,sBAAsB;gBAC5B,OAAO,EAAE,2BAA2B;gBACpC,KAAK,EAAE,aAAa;gBACpB,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,MAAM;aACf;SACD;QACD,WAAW,EAAE;YACZ,EAAE,YAAY,EAAE,wBAAwB,EAAE;YAC1C,EAAE,YAAY,EAAE,wBAAwB,EAAE;YAC1C,EAAE,YAAY,EAAE,wBAAwB,EAAE;YAC1C,EAAE,YAAY,EAAE,wBAAwB,EAAE;SAC1C;QACD,mBAAmB,EAAE,CAAC;QACtB,uBAAuB,EAAE,CAAC;QAC1B,iBAAiB,EAAE;YAClB;gBACC,IAAI,EAAE,YAAY;gBAClB,iBAAiB,EAAE,CAAC;gBACpB,UAAU,EAAE,oBAAoB,uBAAM,qBAAqB,GAAK,IAAI,CAAC,cAAc,GAAI,KAAK,CAAC;aAC7F;SACD;QACD,aAAa,EAAE;YACd;gBACC,IAAI,EAAE,YAAY;gBAClB,cAAc,EAAE,cAAc;aAC9B;SACD;QACD,OAAO,EAAE,KAAK,CAAC,GAAG,CAAU,UAAA,CAAC,IAAI,OAAA,CAAC;YACjC,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC;YACrB,QAAQ,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;YACrB,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC;SAC3B,CAAC,EAL+B,CAK/B,CAAC;QACH,eAAe,EAAE,MAAA,IAAI,CAAC,eAAe,mCAAI,KAAK;QAC9C,mBAAmB,EAAE,MAAA,IAAI,CAAC,mBAAmB,mCAAI,KAAK;QACtD,aAAa,EAAE,MAAA,IAAI,CAAC,aAAa,mCAAI,KAAK;QAC1C,iBAAiB,EAAE,MAAA,IAAI,CAAC,iBAAiB,mCAAI,KAAK;QAClD,YAAY,EAAE,MAAA,IAAI,CAAC,YAAY,mCAAI,GAAG;KACtC,CAAC;IAEF,IAAM,UAAU,GAAe;QAC9B,UAAU,EAAE;YACX,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;YACtB,YAAY,EAAE;gBACb,cAAc,EAAE;oBACf,cAAc,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;oBACxD,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;iBAC5C;gBACD,QAAQ,EAAE,iBAAiB;gBAC3B,cAAc,EAAE,uBAAuB;gBACvC,UAAU,EAAE,CAAC;aACb;YACD,QAAQ,EAAE;gBACT,cAAc,EAAE,EAAE,UAAU,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE;gBACtD,QAAQ,EAAE,aAAa;gBACvB,cAAc,EAAE,mBAAmB;gBACnC,UAAU,EAAE,CAAC;aACb;YACD,QAAQ,EAAE;gBACT,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI;gBACzB,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI;gBACzB,QAAQ,EAAE,MAAA,QAAQ,CAAC,IAAI,mCAAI,EAAE;gBAC7B,WAAW,EAAE,MAAA,QAAQ,CAAC,OAAO,mCAAI,EAAE;gBACnC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC;gBACtC,oBAAoB,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC;gBACjD,0BAA0B,EAAE,CAAC,CAAC,QAAQ,CAAC,0BAA0B;aACjE;YACD,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,MAAA,IAAI,CAAC,SAAS,mCAAI,OAAO,CAAC;YACvD,wBAAwB,EAAE,MAAA,IAAI,CAAC,wBAAwB,mCAAI,IAAI;YAC/D,QAAQ,EAAE;gBACT,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE;oBACP,gBAAgB,kBAAA;oBAChB,QAAQ,EAAE;wBACT;4BACC,SAAS,WAAA;4BACT,UAAU,YAAA;4BACV,KAAK,EAAE,EAAE,gBAAgB,kBAAA,EAAE,QAAQ,EAAE,EAAE,EAAE;4BACzC,MAAM,EAAE,EAAE,SAAS,WAAA,EAAE;yBACrB;qBACD;iBACD;aACD;SACD;QACD,YAAY,eAAO,gBAAgB,CAAE;QACrC,iBAAiB,eAAO,gBAAgB,CAAE;KAC1C,CAAC;IAEF,yFAAyF;IACzF,OAAO,UAAU,CAAC;AACnB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-psd",
-  "version": "15.3.0",
+  "version": "16.0.0",
   "description": "Library for reading and writing PSD files",
   "main": "dist/index.js",
   "module": "dist-es/index.js",

package/src/additionalInfo.ts

@@ -8,7 +8,8 @@ import {
 	SelectiveColorAdjustment, ColorLookupAdjustment, LevelsAdjustmentChannel, LevelsAdjustment,
 	CurvesAdjustment, CurvesAdjustmentChannel, HueSaturationAdjustment, HueSaturationAdjustmentChannel,
 	PresetInfo, Color, ColorBalanceValues, WriteOptions, LinkedFile, PlacedLayerType, Warp, KeyDescriptorItem,
-	BooleanOperation, LayerEffectsInfo, Annotation, LayerVectorMask, AnimationFrame, Timeline, PlacedLayerFilter, UnitsValue,
+	BooleanOperation, LayerEffectsInfo, Annotation, LayerVectorMask, AnimationFrame, Timeline, PlacedLayerFilter,
+	UnitsValue, PlacedLayerPuppetFilter,
 } from './psd';
 import {
 	PsdReader, readSignature, readUnicodeString, skipBytes, readUint32, readUint8, readFloat64, readUint16,
@@ -1157,6 +1158,55 @@ interface HrznVrtcDescriptor {
 	Vrtc: DescriptorUnitsValue;
 }
 
+type FltrDescriptor = {
+	'null': string[]; // [Ordn.Trgt]
+	rigidType: boolean;
+	puppetShapeList?: {
+		rigidType: boolean;
+		VrsM: number;
+		VrsN: number;
+		originalVertexArray: Uint8Array;
+		deformedVertexArray: Uint8Array;
+		indexArray: Uint8Array;
+		pinOffsets: number[];
+		posFinalPins: number[];
+		pinVertexIndices: number[];
+		PinP: number[];
+		PnRt: number[];
+		PnOv: boolean[];
+		PnDp: number[];
+		meshQuality: number;
+		meshExpansion: number;
+		meshRigidity: number;
+		imageResolution: number;
+		meshBoundaryPath: {
+			pathComponents: {
+				shapeOperation: string; // shapeOperation.xor
+				SbpL: {
+					Clsp: boolean;
+					'Pts ': {
+						Anch: HrznVrtcDescriptor;
+						'Fwd ': HrznVrtcDescriptor;
+						'Bwd ': HrznVrtcDescriptor;
+						Smoo: boolean;
+					}[];
+				}[];
+			}[];
+		};
+		selectedPin: number[];
+	}[];
+	PuX0: number;
+	PuX1: number;
+	PuX2: number;
+	PuX3: number;
+	PuY0: number;
+	PuY1: number;
+	PuY2: number;
+	PuY3: number;
+} | {
+	LqMe: Uint8Array;
+};
+
 interface SoLdDescriptorFilter {
 	enab: boolean,
 	validAtPosition: boolean,
@@ -1173,52 +1223,7 @@ interface SoLdDescriptorFilter {
 		hasoptions: boolean;
 		FrgC: DescriptorColor;
 		BckC: DescriptorColor;
-		Fltr: {
-			'null': string[]; // [Ordn.Trgt]
-			rigidType: boolean;
-			puppetShapeList: {
-				rigidType: boolean;
-				VrsM: number;
-				VrsN: number;
-				originalVertexArray: Uint8Array;
-				deformedVertexArray: Uint8Array;
-				indexArray: Uint8Array;
-				pinOffsets: number[];
-				posFinalPins: number[];
-				pinVertexIndices: number[];
-				PinP: number[];
-				PnRt: number[];
-				PnOv: boolean[];
-				PnDp: number[];
-				meshQuality: number;
-				meshExpansion: number;
-				meshRigidity: number;
-				imageResolution: number;
-				meshBoundaryPath: {
-					pathComponents: {
-						shapeOperation: string; // shapeOperation.xor
-						SbpL: {
-							Clsp: boolean;
-							'Pts ': {
-								Anch: HrznVrtcDescriptor;
-								'Fwd ': HrznVrtcDescriptor;
-								'Bwd ': HrznVrtcDescriptor;
-								Smoo: boolean;
-							}[];
-						}[];
-					}[];
-				};
-				selectedPin: number[];
-			}[];
-			PuX0: number;
-			PuX1: number;
-			PuX2: number;
-			PuX3: number;
-			PuY0: number;
-			PuY1: number;
-			PuY2: number;
-			PuY3: number;
-		};
+		Fltr: FltrDescriptor;
 		filterID: number;
 	}[];
 }
@@ -1253,7 +1258,7 @@ function pointsToArray(points: { x: number; y: number }[]) {
 	return array;
 }
 
-function uin8ToPoints(array: Uint8Array) {
+function uint8ToPoints(array: Uint8Array) {
 	return arrayToPoints(uint8ToFloat32(array));
 }
 
@@ -1271,6 +1276,57 @@ function pointToHrznVrtc(point: { x: UnitsValue; y: UnitsValue; }): HrznVrtcDesc
 	};
 }
 
+function parseFilterFXFilter(Fltr: FltrDescriptor): PlacedLayerPuppetFilter | {} {
+	if ('puppetShapeList' in Fltr) {
+		return {
+			rigidType: Fltr.rigidType,
+			bounds: [
+				{ x: Fltr.PuX0, y: Fltr.PuY0, },
+				{ x: Fltr.PuX1, y: Fltr.PuY1, },
+				{ x: Fltr.PuX2, y: Fltr.PuY2, },
+				{ x: Fltr.PuX3, y: Fltr.PuY3, },
+			],
+			puppetShapeList: Fltr.puppetShapeList!.map(p => ({
+				rigidType: p.rigidType,
+				// TODO: VrsM
+				// TODO: VrsN
+				originalVertexArray: uint8ToPoints(p.originalVertexArray),
+				deformedVertexArray: uint8ToPoints(p.deformedVertexArray),
+				indexArray: Array.from(uint8ToUint32(p.indexArray)),
+				pinOffsets: arrayToPoints(p.pinOffsets),
+				posFinalPins: arrayToPoints(p.posFinalPins),
+				pinVertexIndices: p.pinVertexIndices,
+				selectedPin: p.selectedPin,
+				pinPosition: arrayToPoints(p.PinP),
+				pinRotation: p.PnRt,
+				pinOverlay: p.PnOv,
+				pinDepth: p.PnDp,
+				meshQuality: p.meshQuality,
+				meshExpansion: p.meshExpansion,
+				meshRigidity: p.meshRigidity,
+				imageResolution: p.imageResolution,
+				meshBoundaryPath: {
+					pathComponents: p.meshBoundaryPath.pathComponents.map(c => ({
+						shapeOperation: c.shapeOperation.split('.')[1],
+						paths: c.SbpL.map(t => ({
+							closed: t.Clsp,
+							points: t['Pts '].map(pt => ({
+								anchor: hrznVrtcToPoint(pt.Anch),
+								forward: hrznVrtcToPoint(pt['Fwd ']),
+								backward: hrznVrtcToPoint(pt['Bwd ']),
+								smooth: pt.Smoo,
+							})),
+						})),
+					})),
+				},
+			})),
+		};
+	} else {
+		return {
+		};
+	}
+}
+
 function parseFilterFX(desc: SoLdDescriptorFilter): PlacedLayerFilter {
 	return {
 		enabled: desc.enab,
@@ -1287,53 +1343,66 @@ function parseFilterFX(desc: SoLdDescriptorFilter): PlacedLayerFilter {
 			hasOptions: f.hasoptions,
 			foregroundColor: parseColor(f.FrgC),
 			backgroundColor: parseColor(f.BckC),
-			filter: {
-				rigidType: f.Fltr.rigidType,
-				bounds: [
-					{ x: f.Fltr.PuX0, y: f.Fltr.PuY0, },
-					{ x: f.Fltr.PuX1, y: f.Fltr.PuY1, },
-					{ x: f.Fltr.PuX2, y: f.Fltr.PuY2, },
-					{ x: f.Fltr.PuX3, y: f.Fltr.PuY3, },
-				],
-				puppetShapeList: f.Fltr.puppetShapeList.map(p => ({
-					rigidType: p.rigidType,
-					// TODO: VrsM
-					// TODO: VrsN
-					originalVertexArray: uin8ToPoints(p.originalVertexArray),
-					deformedVertexArray: uin8ToPoints(p.deformedVertexArray),
-					indexArray: Array.from(uint8ToUint32(p.indexArray)),
-					pinOffsets: arrayToPoints(p.pinOffsets),
-					posFinalPins: arrayToPoints(p.posFinalPins),
-					pinVertexIndices: p.pinVertexIndices,
-					selectedPin: p.selectedPin,
-					pinPosition: arrayToPoints(p.PinP),
-					pinRotation: p.PnRt,
-					pinOverlay: p.PnOv,
-					pinDepth: p.PnDp,
-					meshQuality: p.meshQuality,
-					meshExpansion: p.meshExpansion,
-					meshRigidity: p.meshRigidity,
-					imageResolution: p.imageResolution,
-					meshBoundaryPath: {
-						pathComponents: p.meshBoundaryPath.pathComponents.map(c => ({
-							shapeOperation: c.shapeOperation.split('.')[1],
-							paths: c.SbpL.map(t => ({
-								closed: t.Clsp,
-								points: t['Pts '].map(pt => ({
-									anchor: hrznVrtcToPoint(pt.Anch),
-									forward: hrznVrtcToPoint(pt['Fwd ']),
-									backward: hrznVrtcToPoint(pt['Bwd ']),
-									smooth: pt.Smoo,
-								})),
-							})),
-						})),
-					},
-				})),
-			},
+			filter: parseFilterFXFilter(f.Fltr),
 		})),
 	};
 }
 
+function serializeFltr(filter: PlacedLayerPuppetFilter | {}): FltrDescriptor {
+	if ('puppetShapeList' in filter) {
+		return {
+			'null': ['Ordn.Trgt'], // ???
+			rigidType: filter.rigidType,
+			puppetShapeList: filter.puppetShapeList.map(p => ({
+				rigidType: p.rigidType,
+				VrsM: 1, // TODO: ...
+				VrsN: 0, // TODO: ...
+				originalVertexArray: toUint8(new Float32Array(pointsToArray(p.originalVertexArray))),
+				deformedVertexArray: toUint8(new Float32Array(pointsToArray(p.deformedVertexArray))),
+				indexArray: toUint8(new Uint32Array(p.indexArray)),
+				pinOffsets: pointsToArray(p.pinOffsets),
+				posFinalPins: pointsToArray(p.posFinalPins),
+				selectedPin: p.selectedPin,
+				pinVertexIndices: p.pinVertexIndices,
+				PinP: pointsToArray(p.pinPosition),
+				PnRt: p.pinRotation,
+				PnOv: p.pinOverlay,
+				PnDp: p.pinDepth,
+				meshQuality: p.meshQuality,
+				meshExpansion: p.meshExpansion,
+				meshRigidity: p.meshRigidity,
+				imageResolution: p.imageResolution,
+				meshBoundaryPath: {
+					pathComponents: (p.meshBoundaryPath.pathComponents || []).map(c => ({
+						shapeOperation: `shapeOperation.${c.shapeOperation}`,
+						SbpL: (c.paths || []).map(path => ({
+							Clsp: path.closed,
+							'Pts ': (path.points || []).map(pt => ({
+								Anch: pointToHrznVrtc(pt.anchor),
+								'Fwd ': pointToHrznVrtc(pt.forward),
+								'Bwd ': pointToHrznVrtc(pt.backward),
+								Smoo: pt.smooth,
+							})),
+						})),
+					})),
+				},
+			})),
+			PuX0: filter.bounds[0].x,
+			PuX1: filter.bounds[1].x,
+			PuX2: filter.bounds[2].x,
+			PuX3: filter.bounds[3].x,
+			PuY0: filter.bounds[0].y,
+			PuY1: filter.bounds[1].y,
+			PuY2: filter.bounds[2].y,
+			PuY3: filter.bounds[3].y,
+		};
+	} else {
+		return {
+			LqMe: new Uint8Array(),
+		};
+	}
+}
+
 function serializeFilterFX(filter: PlacedLayerFilter): SoLdDescriptorFilter {
 	return {
 		enab: filter.enabled,
@@ -1341,7 +1410,7 @@ function serializeFilterFX(filter: PlacedLayerFilter): SoLdDescriptorFilter {
 		filterMaskEnable: filter.maskEnabled,
 		filterMaskLinked: filter.maskLinked,
 		filterMaskExtendWithWhite: filter.maskExtendWithWhite,
-		filterFXList: filter.list.map(f => ({
+		filterFXList: (filter.list || []).map(f => ({
 			'Nm  ': f.name,
 			blendOptions: {
 				Opct: unitsPercent(f.opacity),
@@ -1351,52 +1420,7 @@ function serializeFilterFX(filter: PlacedLayerFilter): SoLdDescriptorFilter {
 			hasoptions: f.hasOptions,
 			FrgC: serializeColor(f.foregroundColor),
 			BckC: serializeColor(f.backgroundColor),
-			Fltr: {
-				'null': ['Ordn.Trgt'], // ???
-				rigidType: f.filter.rigidType,
-				puppetShapeList: f.filter.puppetShapeList.map(p => ({
-					rigidType: p.rigidType,
-					VrsM: 1, // TODO: ...
-					VrsN: 0, // TODO: ...
-					originalVertexArray: toUint8(new Float32Array(pointsToArray(p.originalVertexArray))),
-					deformedVertexArray: toUint8(new Float32Array(pointsToArray(p.deformedVertexArray))),
-					indexArray: toUint8(new Uint32Array(p.indexArray)),
-					pinOffsets: pointsToArray(p.pinOffsets),
-					posFinalPins: pointsToArray(p.posFinalPins),
-					selectedPin: p.selectedPin,
-					pinVertexIndices: p.pinVertexIndices,
-					PinP: pointsToArray(p.pinPosition),
-					PnRt: p.pinRotation,
-					PnOv: p.pinOverlay,
-					PnDp: p.pinDepth,
-					meshQuality: p.meshQuality,
-					meshExpansion: p.meshExpansion,
-					meshRigidity: p.meshRigidity,
-					imageResolution: p.imageResolution,
-					meshBoundaryPath: {
-						pathComponents: p.meshBoundaryPath.pathComponents.map(c => ({
-							shapeOperation: `shapeOperation.${c.shapeOperation}`,
-							SbpL: c.paths.map(path => ({
-								Clsp: path.closed,
-								'Pts ': path.points.map(pt => ({
-									Anch: pointToHrznVrtc(pt.anchor),
-									'Fwd ': pointToHrznVrtc(pt.forward),
-									'Bwd ': pointToHrznVrtc(pt.backward),
-									Smoo: pt.smooth,
-								})),
-							})),
-						})),
-					},
-				})),
-				PuX0: f.filter.bounds[0].x,
-				PuX1: f.filter.bounds[1].x,
-				PuX2: f.filter.bounds[2].x,
-				PuX3: f.filter.bounds[3].x,
-				PuY0: f.filter.bounds[0].y,
-				PuY1: f.filter.bounds[1].y,
-				PuY2: f.filter.bounds[2].y,
-				PuY3: f.filter.bounds[3].y,
-			},
+			Fltr: serializeFltr(f.filter),
 			filterID: f.id,
 		})),
 	};

package/src/psd.ts

@@ -674,6 +674,45 @@ export interface LinkedFile {
 	assetLockedState?: number;
 }
 
+export interface PlacedLayerPuppetFilter {
+	rigidType: boolean;
+	bounds: { x: number; y: number; }[];
+	puppetShapeList: {
+		rigidType: boolean;
+		// VrsM: number;
+		// VrsN: number;
+		originalVertexArray: { x: number; y: number; }[];
+		deformedVertexArray: { x: number; y: number; }[];
+		indexArray: number[];
+		pinOffsets: { x: number; y: number; }[];
+		posFinalPins: { x: number; y: number; }[];
+		pinVertexIndices: number[];
+		selectedPin: number[];
+		pinPosition: { x: number; y: number; }[];
+		pinRotation: number[]; // in degrees
+		pinOverlay: boolean[];
+		pinDepth: number[];
+		meshQuality: number;
+		meshExpansion: number;
+		meshRigidity: number;
+		imageResolution: number;
+		meshBoundaryPath: {
+			pathComponents: {
+				shapeOperation: string;
+				paths: {
+					closed: boolean;
+					points: {
+						anchor: { x: UnitsValue; y: UnitsValue; };
+						forward: { x: UnitsValue; y: UnitsValue; };
+						backward: { x: UnitsValue; y: UnitsValue; };
+						smooth: boolean;
+					}[];
+				}[];
+			}[];
+		};
+	}[];
+}
+
 export interface PlacedLayerFilter {
 	enabled: boolean;
 	validAtPosition: boolean;
@@ -689,44 +728,7 @@ export interface PlacedLayerFilter {
 		hasOptions: boolean;
 		foregroundColor: Color;
 		backgroundColor: Color;
-		filter: {
-			rigidType: boolean;
-			bounds: { x: number; y: number; }[];
-			puppetShapeList: {
-				rigidType: boolean;
-				// VrsM: number;
-				// VrsN: number;
-				originalVertexArray: { x: number; y: number; }[];
-				deformedVertexArray: { x: number; y: number; }[];
-				indexArray: number[];
-				pinOffsets: { x: number; y: number; }[];
-				posFinalPins: { x: number; y: number; }[];
-				pinVertexIndices: number[];
-				selectedPin: number[];
-				pinPosition: { x: number; y: number; }[];
-				pinRotation: number[]; // in degrees
-				pinOverlay: boolean[];
-				pinDepth: number[];
-				meshQuality: number;
-				meshExpansion: number;
-				meshRigidity: number;
-				imageResolution: number;
-				meshBoundaryPath: {
-					pathComponents: {
-						shapeOperation: string;
-						paths: {
-							closed: boolean;
-							points: {
-								anchor: { x: UnitsValue; y: UnitsValue; };
-								forward: { x: UnitsValue; y: UnitsValue; };
-								backward: { x: UnitsValue; y: UnitsValue; };
-								smooth: boolean;
-							}[];
-						}[];
-					}[];
-				};
-			}[];
-		};
+		filter: PlacedLayerPuppetFilter | {};
 	}[];
 }
 

package/src/text.ts

@@ -263,24 +263,32 @@ const antialias: AntiAlias[] = ['none', 'crisp', 'strong', 'smooth', 'sharp'];
 const justification: Justification[] = ['left', 'right', 'center'];
 
 function upperFirst(value: string) {
-	return value.substr(0, 1).toUpperCase() + value.substr(1);
+	return value.substring(0, 1).toUpperCase() + value.substring(1);
 }
 
-function decodeColor(color: { Type: number; Values: number[]; }): Color {
+function decodeColor(color: TypeValues): Color {
 	const c = color.Values;
-
-	if (color.Type === 0) { // grayscale
-		return { r: c[1] * 255, g: c[1] * 255, b: c[1] * 255 }; // , c[0] * 255];
-	} else { // rgb
-		return { r: c[1] * 255, g: c[2] * 255, b: c[3] * 255, a: c[0] }; // , c[0] * 255];
+	switch (color.Type) {
+		case 0: return { k: c[1] * 255 }; // grayscale (alpha?)
+		case 1: return c[0] === 1 ?
+			{ r: c[1] * 255, g: c[2] * 255, b: c[3] * 255 } : // rgb
+			{ r: c[1] * 255, g: c[2] * 255, b: c[3] * 255, a: c[0] * 255 }; // rgba
+		case 2: return { c: c[1] * 255, m: c[2] * 255, y: c[3] * 255, k: c[4] * 255 }; // cmyk (alpha?)
+		default: throw new Error('Unknown color type in text layer');
 	}
 }
 
-function encodeColor(color: Color | undefined) {
-	if (color && 'r' in color) {
-		return ['a' in color ? color.a : 1, color.r / 255, color.g / 255, color.b / 255];
+function encodeColor(color: Color | undefined): TypeValues {
+	if (!color) {
+		return { Type: 1, Values: [0, 0, 0, 0] };
+	} else if ('r' in color) {
+		return { Type: 1, Values: ['a' in color ? color.a / 255 : 1, color.r / 255, color.g / 255, color.b / 255] };
+	} else if ('c' in color) {
+		return { Type: 2, Values: [1, color.c / 255, color.m / 255, color.y / 255, color.k / 255] };
+	} else if ('k' in color) {
+		return { Type: 0, Values: [1, color.k / 255] };
 	} else {
-		return [0, 0, 0, 0];
+		throw new Error('Invalid color type in text layer');
 	}
 }
 
@@ -342,7 +350,7 @@ function encodeObject(obj: any, keys: string[], fonts: Font[]) {
 		} else if (key === 'font') {
 			result[Key] = findOrAddFont(fonts, obj[key]);
 		} else if (key === 'fillColor' || key === 'strokeColor') {
-			result[Key] = { Type: 1, Values: encodeColor(obj[key]) } as TypeValues;
+			result[Key] = encodeColor(obj[key]);
 		} else {
 			result[Key] = obj[key];
 		}
@@ -722,8 +730,8 @@ export function encodeEngineData(data: LayerTextData) {
 				ShowGrid: !!gridInfo.show,
 				GridSize: gridInfo.size ?? 18,
 				GridLeading: gridInfo.leading ?? 22,
-				GridColor: { Type: 1, Values: encodeColor(gridInfo.color) },
-				GridLeadingFillColor: { Type: 1, Values: encodeColor(gridInfo.color) },
+				GridColor: encodeColor(gridInfo.color),
+				GridLeadingFillColor: encodeColor(gridInfo.color),
 				AlignLineHeightToGridFlags: !!gridInfo.alignLineHeightToGridFlags,
 			},
 			AntiAlias: antialias.indexOf(data.antiAlias ?? 'sharp'),