ppt2json 0.3.3 → 0.3.5

package/dist/index.mjs

@@ -4,257 +4,8 @@ import { parseDocument } from "json2pptx-schema";
 // parser/parse.ts
 import JSZip from "jszip";
 
-// ../../../node_modules/.pnpm/txml@5.2.1/node_modules/txml/dist/txml.mjs
-function parse(S, options) {
-  "txml";
-  options = options || {};
-  var pos = options.pos || 0;
-  var keepComments = !!options.keepComments;
-  var keepWhitespace = !!options.keepWhitespace;
-  var openBracket = "<";
-  var openBracketCC = "<".charCodeAt(0);
-  var closeBracket = ">";
-  var closeBracketCC = ">".charCodeAt(0);
-  var minusCC = "-".charCodeAt(0);
-  var slashCC = "/".charCodeAt(0);
-  var exclamationCC = "!".charCodeAt(0);
-  var singleQuoteCC = "'".charCodeAt(0);
-  var doubleQuoteCC = '"'.charCodeAt(0);
-  var openCornerBracketCC = "[".charCodeAt(0);
-  var closeCornerBracketCC = "]".charCodeAt(0);
-  function parseChildren(tagName) {
-    var children = [];
-    while (S[pos]) {
-      if (S.charCodeAt(pos) == openBracketCC) {
-        if (S.charCodeAt(pos + 1) === slashCC) {
-          var closeStart = pos + 2;
-          pos = S.indexOf(closeBracket, pos);
-          var closeTag = S.substring(closeStart, pos);
-          if (closeTag.indexOf(tagName) == -1) {
-            var parsedText = S.substring(0, pos).split("\n");
-            throw new Error(
-              "Unexpected close tag\nLine: " + (parsedText.length - 1) + "\nColumn: " + (parsedText[parsedText.length - 1].length + 1) + "\nChar: " + S[pos]
-            );
-          }
-          if (pos + 1) pos += 1;
-          return children;
-        } else if (S.charCodeAt(pos + 1) === exclamationCC) {
-          if (S.charCodeAt(pos + 2) == minusCC) {
-            const startCommentPos = pos;
-            while (pos !== -1 && !(S.charCodeAt(pos) === closeBracketCC && S.charCodeAt(pos - 1) == minusCC && S.charCodeAt(pos - 2) == minusCC && pos != -1)) {
-              pos = S.indexOf(closeBracket, pos + 1);
-            }
-            if (pos === -1) {
-              pos = S.length;
-            }
-            if (keepComments) {
-              children.push(S.substring(startCommentPos, pos + 1));
-            }
-          } else if (S.charCodeAt(pos + 2) === openCornerBracketCC && S.charCodeAt(pos + 8) === openCornerBracketCC && S.substr(pos + 3, 5).toLowerCase() === "cdata") {
-            var cdataEndIndex = S.indexOf("]]>", pos);
-            if (cdataEndIndex == -1) {
-              children.push(S.substr(pos + 9));
-              pos = S.length;
-            } else {
-              children.push(S.substring(pos + 9, cdataEndIndex));
-              pos = cdataEndIndex + 3;
-            }
-            continue;
-          } else {
-            const startDoctype = pos + 1;
-            pos += 2;
-            var encapsuled = false;
-            while ((S.charCodeAt(pos) !== closeBracketCC || encapsuled === true) && S[pos]) {
-              if (S.charCodeAt(pos) === openCornerBracketCC) {
-                encapsuled = true;
-              } else if (encapsuled === true && S.charCodeAt(pos) === closeCornerBracketCC) {
-                encapsuled = false;
-              }
-              pos++;
-            }
-            children.push(S.substring(startDoctype, pos));
-          }
-          pos++;
-          continue;
-        }
-        var node = parseNode();
-        children.push(node);
-        if (node.tagName[0] === "?") {
-          children.push(...node.children);
-          node.children = [];
-        }
-      } else {
-        var text = parseText();
-        if (keepWhitespace) {
-          if (text.length > 0) {
-            children.push(text);
-          }
-        } else {
-          var trimmed = text.trim();
-          if (trimmed.length > 0) {
-            children.push(trimmed);
-          }
-        }
-        pos++;
-      }
-    }
-    return children;
-  }
-  function parseText() {
-    var start = pos;
-    pos = S.indexOf(openBracket, pos) - 1;
-    if (pos === -2)
-      pos = S.length;
-    return S.slice(start, pos + 1);
-  }
-  var nameSpacer = "\r\n	>/= ";
-  function parseName() {
-    var start = pos;
-    while (nameSpacer.indexOf(S[pos]) === -1 && S[pos]) {
-      pos++;
-    }
-    return S.slice(start, pos);
-  }
-  var NoChildNodes = options.noChildNodes || ["img", "br", "input", "meta", "link", "hr"];
-  function parseNode() {
-    pos++;
-    const tagName = parseName();
-    const attributes = {};
-    let children = [];
-    while (S.charCodeAt(pos) !== closeBracketCC && S[pos]) {
-      var c = S.charCodeAt(pos);
-      if (c > 64 && c < 91 || c > 96 && c < 123) {
-        var name = parseName();
-        var code = S.charCodeAt(pos);
-        while (code && code !== singleQuoteCC && code !== doubleQuoteCC && !(code > 64 && code < 91 || code > 96 && code < 123) && code !== closeBracketCC) {
-          pos++;
-          code = S.charCodeAt(pos);
-        }
-        if (code === singleQuoteCC || code === doubleQuoteCC) {
-          var value = parseString();
-          if (pos === -1) {
-            return {
-              tagName,
-              attributes,
-              children
-            };
-          }
-        } else {
-          value = null;
-          pos--;
-        }
-        attributes[name] = value;
-      }
-      pos++;
-    }
-    if (S.charCodeAt(pos - 1) !== slashCC) {
-      if (tagName == "script") {
-        var start = pos + 1;
-        pos = S.indexOf("</script>", pos);
-        children = [S.slice(start, pos)];
-        pos += 9;
-      } else if (tagName == "style") {
-        var start = pos + 1;
-        pos = S.indexOf("</style>", pos);
-        children = [S.slice(start, pos)];
-        pos += 8;
-      } else if (NoChildNodes.indexOf(tagName) === -1) {
-        pos++;
-        children = parseChildren(tagName);
-      } else {
-        pos++;
-      }
-    } else {
-      pos++;
-    }
-    return {
-      tagName,
-      attributes,
-      children
-    };
-  }
-  function parseString() {
-    var startChar = S[pos];
-    var startpos = pos + 1;
-    pos = S.indexOf(startChar, startpos);
-    return S.slice(startpos, pos);
-  }
-  function findElements() {
-    var r = new RegExp("\\s" + options.attrName + `\\s*=['"]` + options.attrValue + `['"]`).exec(S);
-    if (r) {
-      return r.index;
-    } else {
-      return -1;
-    }
-  }
-  var out = null;
-  if (options.attrValue !== void 0) {
-    options.attrName = options.attrName || "id";
-    var out = [];
-    while ((pos = findElements()) !== -1) {
-      pos = S.lastIndexOf("<", pos);
-      if (pos !== -1) {
-        out.push(parseNode());
-      }
-      S = S.substr(pos);
-      pos = 0;
-    }
-  } else if (options.parseNode) {
-    out = parseNode();
-  } else {
-    out = parseChildren("");
-  }
-  if (options.filter) {
-    out = filter(out, options.filter);
-  }
-  if (options.simplify) {
-    return simplify(Array.isArray(out) ? out : [out]);
-  }
-  if (options.setPos) {
-    out.pos = pos;
-  }
-  return out;
-}
-function simplify(children) {
-  var out = {};
-  if (!children.length) {
-    return "";
-  }
-  if (children.length === 1 && typeof children[0] == "string") {
-    return children[0];
-  }
-  children.forEach(function(child) {
-    if (typeof child !== "object") {
-      return;
-    }
-    if (!out[child.tagName])
-      out[child.tagName] = [];
-    var kids = simplify(child.children);
-    out[child.tagName].push(kids);
-    if (Object.keys(child.attributes).length && typeof kids !== "string") {
-      kids._attributes = child.attributes;
-    }
-  });
-  for (var i in out) {
-    if (out[i].length == 1) {
-      out[i] = out[i][0];
-    }
-  }
-  return out;
-}
-function filter(children, f, dept = 0, path = "") {
-  var out = [];
-  children.forEach(function(child, i) {
-    if (typeof child === "object" && f(child, i, dept, path)) out.push(child);
-    if (child.children) {
-      var kids = filter(child.children, f, dept + 1, (path ? path + "." : "") + i + "." + child.tagName);
-      out = out.concat(kids);
-    }
-  });
-  return out;
-}
-
 // parser/readXmlFile.ts
+import { parse as parseXml } from "txml/txml";
 var cust_attr_order = 0;
 function simplifyLostLess(children, parentAttributes = {}) {
   const out = {};
@@ -291,976 +42,14 @@ function simplifyLostLess(children, parentAttributes = {}) {
 async function readXmlFile(zip, filename) {
   try {
     const data = await zip.file(filename).async("string");
-    return simplifyLostLess(parse(data));
+    return simplifyLostLess(parseXml(data));
   } catch {
     return null;
   }
 }
 
-// ../../../node_modules/.pnpm/tinycolor2@1.6.0/node_modules/tinycolor2/esm/tinycolor.js
-function _typeof(obj) {
-  "@babel/helpers - typeof";
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
-    return typeof obj2;
-  } : function(obj2) {
-    return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
-  }, _typeof(obj);
-}
-var trimLeft = /^\s+/;
-var trimRight = /\s+$/;
-function tinycolor(color, opts) {
-  color = color ? color : "";
-  opts = opts || {};
-  if (color instanceof tinycolor) {
-    return color;
-  }
-  if (!(this instanceof tinycolor)) {
-    return new tinycolor(color, opts);
-  }
-  var rgb = inputToRGB(color);
-  this._originalInput = color, this._r = rgb.r, this._g = rgb.g, this._b = rgb.b, this._a = rgb.a, this._roundA = Math.round(100 * this._a) / 100, this._format = opts.format || rgb.format;
-  this._gradientType = opts.gradientType;
-  if (this._r < 1) this._r = Math.round(this._r);
-  if (this._g < 1) this._g = Math.round(this._g);
-  if (this._b < 1) this._b = Math.round(this._b);
-  this._ok = rgb.ok;
-}
-tinycolor.prototype = {
-  isDark: function isDark() {
-    return this.getBrightness() < 128;
-  },
-  isLight: function isLight() {
-    return !this.isDark();
-  },
-  isValid: function isValid() {
-    return this._ok;
-  },
-  getOriginalInput: function getOriginalInput() {
-    return this._originalInput;
-  },
-  getFormat: function getFormat() {
-    return this._format;
-  },
-  getAlpha: function getAlpha() {
-    return this._a;
-  },
-  getBrightness: function getBrightness() {
-    var rgb = this.toRgb();
-    return (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1e3;
-  },
-  getLuminance: function getLuminance() {
-    var rgb = this.toRgb();
-    var RsRGB, GsRGB, BsRGB, R, G, B;
-    RsRGB = rgb.r / 255;
-    GsRGB = rgb.g / 255;
-    BsRGB = rgb.b / 255;
-    if (RsRGB <= 0.03928) R = RsRGB / 12.92;
-    else R = Math.pow((RsRGB + 0.055) / 1.055, 2.4);
-    if (GsRGB <= 0.03928) G = GsRGB / 12.92;
-    else G = Math.pow((GsRGB + 0.055) / 1.055, 2.4);
-    if (BsRGB <= 0.03928) B = BsRGB / 12.92;
-    else B = Math.pow((BsRGB + 0.055) / 1.055, 2.4);
-    return 0.2126 * R + 0.7152 * G + 0.0722 * B;
-  },
-  setAlpha: function setAlpha(value) {
-    this._a = boundAlpha(value);
-    this._roundA = Math.round(100 * this._a) / 100;
-    return this;
-  },
-  toHsv: function toHsv() {
-    var hsv = rgbToHsv(this._r, this._g, this._b);
-    return {
-      h: hsv.h * 360,
-      s: hsv.s,
-      v: hsv.v,
-      a: this._a
-    };
-  },
-  toHsvString: function toHsvString() {
-    var hsv = rgbToHsv(this._r, this._g, this._b);
-    var h = Math.round(hsv.h * 360), s = Math.round(hsv.s * 100), v = Math.round(hsv.v * 100);
-    return this._a == 1 ? "hsv(" + h + ", " + s + "%, " + v + "%)" : "hsva(" + h + ", " + s + "%, " + v + "%, " + this._roundA + ")";
-  },
-  toHsl: function toHsl() {
-    var hsl = rgbToHsl(this._r, this._g, this._b);
-    return {
-      h: hsl.h * 360,
-      s: hsl.s,
-      l: hsl.l,
-      a: this._a
-    };
-  },
-  toHslString: function toHslString() {
-    var hsl = rgbToHsl(this._r, this._g, this._b);
-    var h = Math.round(hsl.h * 360), s = Math.round(hsl.s * 100), l = Math.round(hsl.l * 100);
-    return this._a == 1 ? "hsl(" + h + ", " + s + "%, " + l + "%)" : "hsla(" + h + ", " + s + "%, " + l + "%, " + this._roundA + ")";
-  },
-  toHex: function toHex(allow3Char) {
-    return rgbToHex(this._r, this._g, this._b, allow3Char);
-  },
-  toHexString: function toHexString(allow3Char) {
-    return "#" + this.toHex(allow3Char);
-  },
-  toHex8: function toHex8(allow4Char) {
-    return rgbaToHex(this._r, this._g, this._b, this._a, allow4Char);
-  },
-  toHex8String: function toHex8String(allow4Char) {
-    return "#" + this.toHex8(allow4Char);
-  },
-  toRgb: function toRgb() {
-    return {
-      r: Math.round(this._r),
-      g: Math.round(this._g),
-      b: Math.round(this._b),
-      a: this._a
-    };
-  },
-  toRgbString: function toRgbString() {
-    return this._a == 1 ? "rgb(" + Math.round(this._r) + ", " + Math.round(this._g) + ", " + Math.round(this._b) + ")" : "rgba(" + Math.round(this._r) + ", " + Math.round(this._g) + ", " + Math.round(this._b) + ", " + this._roundA + ")";
-  },
-  toPercentageRgb: function toPercentageRgb() {
-    return {
-      r: Math.round(bound01(this._r, 255) * 100) + "%",
-      g: Math.round(bound01(this._g, 255) * 100) + "%",
-      b: Math.round(bound01(this._b, 255) * 100) + "%",
-      a: this._a
-    };
-  },
-  toPercentageRgbString: function toPercentageRgbString() {
-    return this._a == 1 ? "rgb(" + Math.round(bound01(this._r, 255) * 100) + "%, " + Math.round(bound01(this._g, 255) * 100) + "%, " + Math.round(bound01(this._b, 255) * 100) + "%)" : "rgba(" + Math.round(bound01(this._r, 255) * 100) + "%, " + Math.round(bound01(this._g, 255) * 100) + "%, " + Math.round(bound01(this._b, 255) * 100) + "%, " + this._roundA + ")";
-  },
-  toName: function toName() {
-    if (this._a === 0) {
-      return "transparent";
-    }
-    if (this._a < 1) {
-      return false;
-    }
-    return hexNames[rgbToHex(this._r, this._g, this._b, true)] || false;
-  },
-  toFilter: function toFilter(secondColor) {
-    var hex8String = "#" + rgbaToArgbHex(this._r, this._g, this._b, this._a);
-    var secondHex8String = hex8String;
-    var gradientType = this._gradientType ? "GradientType = 1, " : "";
-    if (secondColor) {
-      var s = tinycolor(secondColor);
-      secondHex8String = "#" + rgbaToArgbHex(s._r, s._g, s._b, s._a);
-    }
-    return "progid:DXImageTransform.Microsoft.gradient(" + gradientType + "startColorstr=" + hex8String + ",endColorstr=" + secondHex8String + ")";
-  },
-  toString: function toString(format) {
-    var formatSet = !!format;
-    format = format || this._format;
-    var formattedString = false;
-    var hasAlpha = this._a < 1 && this._a >= 0;
-    var needsAlphaFormat = !formatSet && hasAlpha && (format === "hex" || format === "hex6" || format === "hex3" || format === "hex4" || format === "hex8" || format === "name");
-    if (needsAlphaFormat) {
-      if (format === "name" && this._a === 0) {
-        return this.toName();
-      }
-      return this.toRgbString();
-    }
-    if (format === "rgb") {
-      formattedString = this.toRgbString();
-    }
-    if (format === "prgb") {
-      formattedString = this.toPercentageRgbString();
-    }
-    if (format === "hex" || format === "hex6") {
-      formattedString = this.toHexString();
-    }
-    if (format === "hex3") {
-      formattedString = this.toHexString(true);
-    }
-    if (format === "hex4") {
-      formattedString = this.toHex8String(true);
-    }
-    if (format === "hex8") {
-      formattedString = this.toHex8String();
-    }
-    if (format === "name") {
-      formattedString = this.toName();
-    }
-    if (format === "hsl") {
-      formattedString = this.toHslString();
-    }
-    if (format === "hsv") {
-      formattedString = this.toHsvString();
-    }
-    return formattedString || this.toHexString();
-  },
-  clone: function clone() {
-    return tinycolor(this.toString());
-  },
-  _applyModification: function _applyModification(fn, args) {
-    var color = fn.apply(null, [this].concat([].slice.call(args)));
-    this._r = color._r;
-    this._g = color._g;
-    this._b = color._b;
-    this.setAlpha(color._a);
-    return this;
-  },
-  lighten: function lighten() {
-    return this._applyModification(_lighten, arguments);
-  },
-  brighten: function brighten() {
-    return this._applyModification(_brighten, arguments);
-  },
-  darken: function darken() {
-    return this._applyModification(_darken, arguments);
-  },
-  desaturate: function desaturate() {
-    return this._applyModification(_desaturate, arguments);
-  },
-  saturate: function saturate() {
-    return this._applyModification(_saturate, arguments);
-  },
-  greyscale: function greyscale() {
-    return this._applyModification(_greyscale, arguments);
-  },
-  spin: function spin() {
-    return this._applyModification(_spin, arguments);
-  },
-  _applyCombination: function _applyCombination(fn, args) {
-    return fn.apply(null, [this].concat([].slice.call(args)));
-  },
-  analogous: function analogous() {
-    return this._applyCombination(_analogous, arguments);
-  },
-  complement: function complement() {
-    return this._applyCombination(_complement, arguments);
-  },
-  monochromatic: function monochromatic() {
-    return this._applyCombination(_monochromatic, arguments);
-  },
-  splitcomplement: function splitcomplement() {
-    return this._applyCombination(_splitcomplement, arguments);
-  },
-  // Disabled until https://github.com/bgrins/TinyColor/issues/254
-  // polyad: function (number) {
-  //   return this._applyCombination(polyad, [number]);
-  // },
-  triad: function triad() {
-    return this._applyCombination(polyad, [3]);
-  },
-  tetrad: function tetrad() {
-    return this._applyCombination(polyad, [4]);
-  }
-};
-tinycolor.fromRatio = function(color, opts) {
-  if (_typeof(color) == "object") {
-    var newColor = {};
-    for (var i in color) {
-      if (color.hasOwnProperty(i)) {
-        if (i === "a") {
-          newColor[i] = color[i];
-        } else {
-          newColor[i] = convertToPercentage(color[i]);
-        }
-      }
-    }
-    color = newColor;
-  }
-  return tinycolor(color, opts);
-};
-function inputToRGB(color) {
-  var rgb = {
-    r: 0,
-    g: 0,
-    b: 0
-  };
-  var a = 1;
-  var s = null;
-  var v = null;
-  var l = null;
-  var ok = false;
-  var format = false;
-  if (typeof color == "string") {
-    color = stringInputToObject(color);
-  }
-  if (_typeof(color) == "object") {
-    if (isValidCSSUnit(color.r) && isValidCSSUnit(color.g) && isValidCSSUnit(color.b)) {
-      rgb = rgbToRgb(color.r, color.g, color.b);
-      ok = true;
-      format = String(color.r).substr(-1) === "%" ? "prgb" : "rgb";
-    } else if (isValidCSSUnit(color.h) && isValidCSSUnit(color.s) && isValidCSSUnit(color.v)) {
-      s = convertToPercentage(color.s);
-      v = convertToPercentage(color.v);
-      rgb = hsvToRgb(color.h, s, v);
-      ok = true;
-      format = "hsv";
-    } else if (isValidCSSUnit(color.h) && isValidCSSUnit(color.s) && isValidCSSUnit(color.l)) {
-      s = convertToPercentage(color.s);
-      l = convertToPercentage(color.l);
-      rgb = hslToRgb(color.h, s, l);
-      ok = true;
-      format = "hsl";
-    }
-    if (color.hasOwnProperty("a")) {
-      a = color.a;
-    }
-  }
-  a = boundAlpha(a);
-  return {
-    ok,
-    format: color.format || format,
-    r: Math.min(255, Math.max(rgb.r, 0)),
-    g: Math.min(255, Math.max(rgb.g, 0)),
-    b: Math.min(255, Math.max(rgb.b, 0)),
-    a
-  };
-}
-function rgbToRgb(r, g, b) {
-  return {
-    r: bound01(r, 255) * 255,
-    g: bound01(g, 255) * 255,
-    b: bound01(b, 255) * 255
-  };
-}
-function rgbToHsl(r, g, b) {
-  r = bound01(r, 255);
-  g = bound01(g, 255);
-  b = bound01(b, 255);
-  var max = Math.max(r, g, b), min = Math.min(r, g, b);
-  var h, s, l = (max + min) / 2;
-  if (max == min) {
-    h = s = 0;
-  } else {
-    var d = max - min;
-    s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-    switch (max) {
-      case r:
-        h = (g - b) / d + (g < b ? 6 : 0);
-        break;
-      case g:
-        h = (b - r) / d + 2;
-        break;
-      case b:
-        h = (r - g) / d + 4;
-        break;
-    }
-    h /= 6;
-  }
-  return {
-    h,
-    s,
-    l
-  };
-}
-function hslToRgb(h, s, l) {
-  var r, g, b;
-  h = bound01(h, 360);
-  s = bound01(s, 100);
-  l = bound01(l, 100);
-  function hue2rgb(p2, q2, t) {
-    if (t < 0) t += 1;
-    if (t > 1) t -= 1;
-    if (t < 1 / 6) return p2 + (q2 - p2) * 6 * t;
-    if (t < 1 / 2) return q2;
-    if (t < 2 / 3) return p2 + (q2 - p2) * (2 / 3 - t) * 6;
-    return p2;
-  }
-  if (s === 0) {
-    r = g = b = l;
-  } else {
-    var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-    var p = 2 * l - q;
-    r = hue2rgb(p, q, h + 1 / 3);
-    g = hue2rgb(p, q, h);
-    b = hue2rgb(p, q, h - 1 / 3);
-  }
-  return {
-    r: r * 255,
-    g: g * 255,
-    b: b * 255
-  };
-}
-function rgbToHsv(r, g, b) {
-  r = bound01(r, 255);
-  g = bound01(g, 255);
-  b = bound01(b, 255);
-  var max = Math.max(r, g, b), min = Math.min(r, g, b);
-  var h, s, v = max;
-  var d = max - min;
-  s = max === 0 ? 0 : d / max;
-  if (max == min) {
-    h = 0;
-  } else {
-    switch (max) {
-      case r:
-        h = (g - b) / d + (g < b ? 6 : 0);
-        break;
-      case g:
-        h = (b - r) / d + 2;
-        break;
-      case b:
-        h = (r - g) / d + 4;
-        break;
-    }
-    h /= 6;
-  }
-  return {
-    h,
-    s,
-    v
-  };
-}
-function hsvToRgb(h, s, v) {
-  h = bound01(h, 360) * 6;
-  s = bound01(s, 100);
-  v = bound01(v, 100);
-  var i = Math.floor(h), f = h - i, p = v * (1 - s), q = v * (1 - f * s), t = v * (1 - (1 - f) * s), mod = i % 6, r = [v, q, p, p, t, v][mod], g = [t, v, v, q, p, p][mod], b = [p, p, t, v, v, q][mod];
-  return {
-    r: r * 255,
-    g: g * 255,
-    b: b * 255
-  };
-}
-function rgbToHex(r, g, b, allow3Char) {
-  var hex = [pad2(Math.round(r).toString(16)), pad2(Math.round(g).toString(16)), pad2(Math.round(b).toString(16))];
-  if (allow3Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1)) {
-    return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0);
-  }
-  return hex.join("");
-}
-function rgbaToHex(r, g, b, a, allow4Char) {
-  var hex = [pad2(Math.round(r).toString(16)), pad2(Math.round(g).toString(16)), pad2(Math.round(b).toString(16)), pad2(convertDecimalToHex(a))];
-  if (allow4Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1) && hex[3].charAt(0) == hex[3].charAt(1)) {
-    return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0) + hex[3].charAt(0);
-  }
-  return hex.join("");
-}
-function rgbaToArgbHex(r, g, b, a) {
-  var hex = [pad2(convertDecimalToHex(a)), pad2(Math.round(r).toString(16)), pad2(Math.round(g).toString(16)), pad2(Math.round(b).toString(16))];
-  return hex.join("");
-}
-tinycolor.equals = function(color1, color2) {
-  if (!color1 || !color2) return false;
-  return tinycolor(color1).toRgbString() == tinycolor(color2).toRgbString();
-};
-tinycolor.random = function() {
-  return tinycolor.fromRatio({
-    r: Math.random(),
-    g: Math.random(),
-    b: Math.random()
-  });
-};
-function _desaturate(color, amount) {
-  amount = amount === 0 ? 0 : amount || 10;
-  var hsl = tinycolor(color).toHsl();
-  hsl.s -= amount / 100;
-  hsl.s = clamp01(hsl.s);
-  return tinycolor(hsl);
-}
-function _saturate(color, amount) {
-  amount = amount === 0 ? 0 : amount || 10;
-  var hsl = tinycolor(color).toHsl();
-  hsl.s += amount / 100;
-  hsl.s = clamp01(hsl.s);
-  return tinycolor(hsl);
-}
-function _greyscale(color) {
-  return tinycolor(color).desaturate(100);
-}
-function _lighten(color, amount) {
-  amount = amount === 0 ? 0 : amount || 10;
-  var hsl = tinycolor(color).toHsl();
-  hsl.l += amount / 100;
-  hsl.l = clamp01(hsl.l);
-  return tinycolor(hsl);
-}
-function _brighten(color, amount) {
-  amount = amount === 0 ? 0 : amount || 10;
-  var rgb = tinycolor(color).toRgb();
-  rgb.r = Math.max(0, Math.min(255, rgb.r - Math.round(255 * -(amount / 100))));
-  rgb.g = Math.max(0, Math.min(255, rgb.g - Math.round(255 * -(amount / 100))));
-  rgb.b = Math.max(0, Math.min(255, rgb.b - Math.round(255 * -(amount / 100))));
-  return tinycolor(rgb);
-}
-function _darken(color, amount) {
-  amount = amount === 0 ? 0 : amount || 10;
-  var hsl = tinycolor(color).toHsl();
-  hsl.l -= amount / 100;
-  hsl.l = clamp01(hsl.l);
-  return tinycolor(hsl);
-}
-function _spin(color, amount) {
-  var hsl = tinycolor(color).toHsl();
-  var hue = (hsl.h + amount) % 360;
-  hsl.h = hue < 0 ? 360 + hue : hue;
-  return tinycolor(hsl);
-}
-function _complement(color) {
-  var hsl = tinycolor(color).toHsl();
-  hsl.h = (hsl.h + 180) % 360;
-  return tinycolor(hsl);
-}
-function polyad(color, number) {
-  if (isNaN(number) || number <= 0) {
-    throw new Error("Argument to polyad must be a positive number");
-  }
-  var hsl = tinycolor(color).toHsl();
-  var result = [tinycolor(color)];
-  var step = 360 / number;
-  for (var i = 1; i < number; i++) {
-    result.push(tinycolor({
-      h: (hsl.h + i * step) % 360,
-      s: hsl.s,
-      l: hsl.l
-    }));
-  }
-  return result;
-}
-function _splitcomplement(color) {
-  var hsl = tinycolor(color).toHsl();
-  var h = hsl.h;
-  return [tinycolor(color), tinycolor({
-    h: (h + 72) % 360,
-    s: hsl.s,
-    l: hsl.l
-  }), tinycolor({
-    h: (h + 216) % 360,
-    s: hsl.s,
-    l: hsl.l
-  })];
-}
-function _analogous(color, results, slices) {
-  results = results || 6;
-  slices = slices || 30;
-  var hsl = tinycolor(color).toHsl();
-  var part = 360 / slices;
-  var ret = [tinycolor(color)];
-  for (hsl.h = (hsl.h - (part * results >> 1) + 720) % 360; --results; ) {
-    hsl.h = (hsl.h + part) % 360;
-    ret.push(tinycolor(hsl));
-  }
-  return ret;
-}
-function _monochromatic(color, results) {
-  results = results || 6;
-  var hsv = tinycolor(color).toHsv();
-  var h = hsv.h, s = hsv.s, v = hsv.v;
-  var ret = [];
-  var modification = 1 / results;
-  while (results--) {
-    ret.push(tinycolor({
-      h,
-      s,
-      v
-    }));
-    v = (v + modification) % 1;
-  }
-  return ret;
-}
-tinycolor.mix = function(color1, color2, amount) {
-  amount = amount === 0 ? 0 : amount || 50;
-  var rgb1 = tinycolor(color1).toRgb();
-  var rgb2 = tinycolor(color2).toRgb();
-  var p = amount / 100;
-  var rgba = {
-    r: (rgb2.r - rgb1.r) * p + rgb1.r,
-    g: (rgb2.g - rgb1.g) * p + rgb1.g,
-    b: (rgb2.b - rgb1.b) * p + rgb1.b,
-    a: (rgb2.a - rgb1.a) * p + rgb1.a
-  };
-  return tinycolor(rgba);
-};
-tinycolor.readability = function(color1, color2) {
-  var c1 = tinycolor(color1);
-  var c2 = tinycolor(color2);
-  return (Math.max(c1.getLuminance(), c2.getLuminance()) + 0.05) / (Math.min(c1.getLuminance(), c2.getLuminance()) + 0.05);
-};
-tinycolor.isReadable = function(color1, color2, wcag2) {
-  var readability = tinycolor.readability(color1, color2);
-  var wcag2Parms, out;
-  out = false;
-  wcag2Parms = validateWCAG2Parms(wcag2);
-  switch (wcag2Parms.level + wcag2Parms.size) {
-    case "AAsmall":
-    case "AAAlarge":
-      out = readability >= 4.5;
-      break;
-    case "AAlarge":
-      out = readability >= 3;
-      break;
-    case "AAAsmall":
-      out = readability >= 7;
-      break;
-  }
-  return out;
-};
-tinycolor.mostReadable = function(baseColor, colorList, args) {
-  var bestColor = null;
-  var bestScore = 0;
-  var readability;
-  var includeFallbackColors, level, size;
-  args = args || {};
-  includeFallbackColors = args.includeFallbackColors;
-  level = args.level;
-  size = args.size;
-  for (var i = 0; i < colorList.length; i++) {
-    readability = tinycolor.readability(baseColor, colorList[i]);
-    if (readability > bestScore) {
-      bestScore = readability;
-      bestColor = tinycolor(colorList[i]);
-    }
-  }
-  if (tinycolor.isReadable(baseColor, bestColor, {
-    level,
-    size
-  }) || !includeFallbackColors) {
-    return bestColor;
-  } else {
-    args.includeFallbackColors = false;
-    return tinycolor.mostReadable(baseColor, ["#fff", "#000"], args);
-  }
-};
-var names = tinycolor.names = {
-  aliceblue: "f0f8ff",
-  antiquewhite: "faebd7",
-  aqua: "0ff",
-  aquamarine: "7fffd4",
-  azure: "f0ffff",
-  beige: "f5f5dc",
-  bisque: "ffe4c4",
-  black: "000",
-  blanchedalmond: "ffebcd",
-  blue: "00f",
-  blueviolet: "8a2be2",
-  brown: "a52a2a",
-  burlywood: "deb887",
-  burntsienna: "ea7e5d",
-  cadetblue: "5f9ea0",
-  chartreuse: "7fff00",
-  chocolate: "d2691e",
-  coral: "ff7f50",
-  cornflowerblue: "6495ed",
-  cornsilk: "fff8dc",
-  crimson: "dc143c",
-  cyan: "0ff",
-  darkblue: "00008b",
-  darkcyan: "008b8b",
-  darkgoldenrod: "b8860b",
-  darkgray: "a9a9a9",
-  darkgreen: "006400",
-  darkgrey: "a9a9a9",
-  darkkhaki: "bdb76b",
-  darkmagenta: "8b008b",
-  darkolivegreen: "556b2f",
-  darkorange: "ff8c00",
-  darkorchid: "9932cc",
-  darkred: "8b0000",
-  darksalmon: "e9967a",
-  darkseagreen: "8fbc8f",
-  darkslateblue: "483d8b",
-  darkslategray: "2f4f4f",
-  darkslategrey: "2f4f4f",
-  darkturquoise: "00ced1",
-  darkviolet: "9400d3",
-  deeppink: "ff1493",
-  deepskyblue: "00bfff",
-  dimgray: "696969",
-  dimgrey: "696969",
-  dodgerblue: "1e90ff",
-  firebrick: "b22222",
-  floralwhite: "fffaf0",
-  forestgreen: "228b22",
-  fuchsia: "f0f",
-  gainsboro: "dcdcdc",
-  ghostwhite: "f8f8ff",
-  gold: "ffd700",
-  goldenrod: "daa520",
-  gray: "808080",
-  green: "008000",
-  greenyellow: "adff2f",
-  grey: "808080",
-  honeydew: "f0fff0",
-  hotpink: "ff69b4",
-  indianred: "cd5c5c",
-  indigo: "4b0082",
-  ivory: "fffff0",
-  khaki: "f0e68c",
-  lavender: "e6e6fa",
-  lavenderblush: "fff0f5",
-  lawngreen: "7cfc00",
-  lemonchiffon: "fffacd",
-  lightblue: "add8e6",
-  lightcoral: "f08080",
-  lightcyan: "e0ffff",
-  lightgoldenrodyellow: "fafad2",
-  lightgray: "d3d3d3",
-  lightgreen: "90ee90",
-  lightgrey: "d3d3d3",
-  lightpink: "ffb6c1",
-  lightsalmon: "ffa07a",
-  lightseagreen: "20b2aa",
-  lightskyblue: "87cefa",
-  lightslategray: "789",
-  lightslategrey: "789",
-  lightsteelblue: "b0c4de",
-  lightyellow: "ffffe0",
-  lime: "0f0",
-  limegreen: "32cd32",
-  linen: "faf0e6",
-  magenta: "f0f",
-  maroon: "800000",
-  mediumaquamarine: "66cdaa",
-  mediumblue: "0000cd",
-  mediumorchid: "ba55d3",
-  mediumpurple: "9370db",
-  mediumseagreen: "3cb371",
-  mediumslateblue: "7b68ee",
-  mediumspringgreen: "00fa9a",
-  mediumturquoise: "48d1cc",
-  mediumvioletred: "c71585",
-  midnightblue: "191970",
-  mintcream: "f5fffa",
-  mistyrose: "ffe4e1",
-  moccasin: "ffe4b5",
-  navajowhite: "ffdead",
-  navy: "000080",
-  oldlace: "fdf5e6",
-  olive: "808000",
-  olivedrab: "6b8e23",
-  orange: "ffa500",
-  orangered: "ff4500",
-  orchid: "da70d6",
-  palegoldenrod: "eee8aa",
-  palegreen: "98fb98",
-  paleturquoise: "afeeee",
-  palevioletred: "db7093",
-  papayawhip: "ffefd5",
-  peachpuff: "ffdab9",
-  peru: "cd853f",
-  pink: "ffc0cb",
-  plum: "dda0dd",
-  powderblue: "b0e0e6",
-  purple: "800080",
-  rebeccapurple: "663399",
-  red: "f00",
-  rosybrown: "bc8f8f",
-  royalblue: "4169e1",
-  saddlebrown: "8b4513",
-  salmon: "fa8072",
-  sandybrown: "f4a460",
-  seagreen: "2e8b57",
-  seashell: "fff5ee",
-  sienna: "a0522d",
-  silver: "c0c0c0",
-  skyblue: "87ceeb",
-  slateblue: "6a5acd",
-  slategray: "708090",
-  slategrey: "708090",
-  snow: "fffafa",
-  springgreen: "00ff7f",
-  steelblue: "4682b4",
-  tan: "d2b48c",
-  teal: "008080",
-  thistle: "d8bfd8",
-  tomato: "ff6347",
-  turquoise: "40e0d0",
-  violet: "ee82ee",
-  wheat: "f5deb3",
-  white: "fff",
-  whitesmoke: "f5f5f5",
-  yellow: "ff0",
-  yellowgreen: "9acd32"
-};
-var hexNames = tinycolor.hexNames = flip(names);
-function flip(o) {
-  var flipped = {};
-  for (var i in o) {
-    if (o.hasOwnProperty(i)) {
-      flipped[o[i]] = i;
-    }
-  }
-  return flipped;
-}
-function boundAlpha(a) {
-  a = parseFloat(a);
-  if (isNaN(a) || a < 0 || a > 1) {
-    a = 1;
-  }
-  return a;
-}
-function bound01(n, max) {
-  if (isOnePointZero(n)) n = "100%";
-  var processPercent = isPercentage(n);
-  n = Math.min(max, Math.max(0, parseFloat(n)));
-  if (processPercent) {
-    n = parseInt(n * max, 10) / 100;
-  }
-  if (Math.abs(n - max) < 1e-6) {
-    return 1;
-  }
-  return n % max / parseFloat(max);
-}
-function clamp01(val) {
-  return Math.min(1, Math.max(0, val));
-}
-function parseIntFromHex(val) {
-  return parseInt(val, 16);
-}
-function isOnePointZero(n) {
-  return typeof n == "string" && n.indexOf(".") != -1 && parseFloat(n) === 1;
-}
-function isPercentage(n) {
-  return typeof n === "string" && n.indexOf("%") != -1;
-}
-function pad2(c) {
-  return c.length == 1 ? "0" + c : "" + c;
-}
-function convertToPercentage(n) {
-  if (n <= 1) {
-    n = n * 100 + "%";
-  }
-  return n;
-}
-function convertDecimalToHex(d) {
-  return Math.round(parseFloat(d) * 255).toString(16);
-}
-function convertHexToDecimal(h) {
-  return parseIntFromHex(h) / 255;
-}
-var matchers = (function() {
-  var CSS_INTEGER = "[-\\+]?\\d+%?";
-  var CSS_NUMBER = "[-\\+]?\\d*\\.\\d+%?";
-  var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")";
-  var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
-  var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
-  return {
-    CSS_UNIT: new RegExp(CSS_UNIT),
-    rgb: new RegExp("rgb" + PERMISSIVE_MATCH3),
-    rgba: new RegExp("rgba" + PERMISSIVE_MATCH4),
-    hsl: new RegExp("hsl" + PERMISSIVE_MATCH3),
-    hsla: new RegExp("hsla" + PERMISSIVE_MATCH4),
-    hsv: new RegExp("hsv" + PERMISSIVE_MATCH3),
-    hsva: new RegExp("hsva" + PERMISSIVE_MATCH4),
-    hex3: /^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
-    hex6: /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/,
-    hex4: /^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
-    hex8: /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/
-  };
-})();
-function isValidCSSUnit(color) {
-  return !!matchers.CSS_UNIT.exec(color);
-}
-function stringInputToObject(color) {
-  color = color.replace(trimLeft, "").replace(trimRight, "").toLowerCase();
-  var named = false;
-  if (names[color]) {
-    color = names[color];
-    named = true;
-  } else if (color == "transparent") {
-    return {
-      r: 0,
-      g: 0,
-      b: 0,
-      a: 0,
-      format: "name"
-    };
-  }
-  var match;
-  if (match = matchers.rgb.exec(color)) {
-    return {
-      r: match[1],
-      g: match[2],
-      b: match[3]
-    };
-  }
-  if (match = matchers.rgba.exec(color)) {
-    return {
-      r: match[1],
-      g: match[2],
-      b: match[3],
-      a: match[4]
-    };
-  }
-  if (match = matchers.hsl.exec(color)) {
-    return {
-      h: match[1],
-      s: match[2],
-      l: match[3]
-    };
-  }
-  if (match = matchers.hsla.exec(color)) {
-    return {
-      h: match[1],
-      s: match[2],
-      l: match[3],
-      a: match[4]
-    };
-  }
-  if (match = matchers.hsv.exec(color)) {
-    return {
-      h: match[1],
-      s: match[2],
-      v: match[3]
-    };
-  }
-  if (match = matchers.hsva.exec(color)) {
-    return {
-      h: match[1],
-      s: match[2],
-      v: match[3],
-      a: match[4]
-    };
-  }
-  if (match = matchers.hex8.exec(color)) {
-    return {
-      r: parseIntFromHex(match[1]),
-      g: parseIntFromHex(match[2]),
-      b: parseIntFromHex(match[3]),
-      a: convertHexToDecimal(match[4]),
-      format: named ? "name" : "hex8"
-    };
-  }
-  if (match = matchers.hex6.exec(color)) {
-    return {
-      r: parseIntFromHex(match[1]),
-      g: parseIntFromHex(match[2]),
-      b: parseIntFromHex(match[3]),
-      format: named ? "name" : "hex"
-    };
-  }
-  if (match = matchers.hex4.exec(color)) {
-    return {
-      r: parseIntFromHex(match[1] + "" + match[1]),
-      g: parseIntFromHex(match[2] + "" + match[2]),
-      b: parseIntFromHex(match[3] + "" + match[3]),
-      a: convertHexToDecimal(match[4] + "" + match[4]),
-      format: named ? "name" : "hex8"
-    };
-  }
-  if (match = matchers.hex3.exec(color)) {
-    return {
-      r: parseIntFromHex(match[1] + "" + match[1]),
-      g: parseIntFromHex(match[2] + "" + match[2]),
-      b: parseIntFromHex(match[3] + "" + match[3]),
-      format: named ? "name" : "hex"
-    };
-  }
-  return false;
-}
-function validateWCAG2Parms(parms) {
-  var level, size;
-  parms = parms || {
-    level: "AA",
-    size: "small"
-  };
-  level = (parms.level || "AA").toUpperCase();
-  size = (parms.size || "small").toLowerCase();
-  if (level !== "AA" && level !== "AAA") {
-    level = "AA";
-  }
-  if (size !== "small" && size !== "large") {
-    size = "small";
-  }
-  return {
-    level,
-    size
-  };
-}
+// parser/border.ts
+import tinycolor from "tinycolor2";
 
 // parser/utils.ts
 function base64ArrayBuffer(arrayBuffer) {
@@ -1393,7 +182,7 @@ function isVideoLink(vdoFile) {
   const urlRegex = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
   return urlRegex.test(vdoFile);
 }
-function toHex2(n) {
+function toHex(n) {
   let hex = n.toString(16);
   while (hex.length < 2) {
     hex = "0" + hex;
@@ -1564,7 +353,11 @@ function getBorder(node, elType, warpObj = {}) {
   };
 }
 
+// parser/fill.ts
+import tinycolor3 from "tinycolor2";
+
 // parser/color.ts
+import tinycolor2 from "tinycolor2";
 function hueToRgb(t1, t2, hue) {
   if (hue < 0) hue += 6;
   if (hue >= 6) hue -= 6;
@@ -1573,7 +366,7 @@ function hueToRgb(t1, t2, hue) {
   else if (hue < 4) return (t2 - t1) * (4 - hue) + t1;
   return t1;
 }
-function hslToRgb2(hue, sat, light) {
+function hslToRgb(hue, sat, light) {
   let t2;
   hue = hue / 60;
   if (light <= 0.5) {
@@ -1588,18 +381,18 @@ function hslToRgb2(hue, sat, light) {
   return { r, g, b };
 }
 function applyShade(rgbStr, shadeValue, isAlpha) {
-  const color = tinycolor(rgbStr).toHsl();
+  const color = tinycolor2(rgbStr).toHsl();
   if (shadeValue >= 1) shadeValue = 1;
   const cacl_l = Math.min(color.l * shadeValue, 1);
   if (isAlpha) {
-    return tinycolor({
+    return tinycolor2({
       h: color.h,
       s: color.s,
       l: cacl_l,
       a: color.a
     }).toHex8();
   }
-  return tinycolor({
+  return tinycolor2({
     h: color.h,
     s: color.s,
     l: cacl_l,
@@ -1607,18 +400,18 @@ function applyShade(rgbStr, shadeValue, isAlpha) {
   }).toHex();
 }
 function applyTint(rgbStr, tintValue, isAlpha) {
-  const color = tinycolor(rgbStr).toHsl();
+  const color = tinycolor2(rgbStr).toHsl();
   if (tintValue >= 1) tintValue = 1;
   const cacl_l = color.l * tintValue + (1 - tintValue);
   if (isAlpha) {
-    return tinycolor({
+    return tinycolor2({
       h: color.h,
       s: color.s,
       l: cacl_l,
       a: color.a
     }).toHex8();
   }
-  return tinycolor({
+  return tinycolor2({
     h: color.h,
     s: color.s,
     l: cacl_l,
@@ -1626,18 +419,18 @@ function applyTint(rgbStr, tintValue, isAlpha) {
   }).toHex();
 }
 function applyLumOff(rgbStr, offset, isAlpha) {
-  const color = tinycolor(rgbStr).toHsl();
+  const color = tinycolor2(rgbStr).toHsl();
   const lum = offset + color.l;
   if (lum >= 1) {
     if (isAlpha) {
-      return tinycolor({
+      return tinycolor2({
         h: color.h,
         s: color.s,
         l: 1,
         a: color.a
       }).toHex8();
     }
-    return tinycolor({
+    return tinycolor2({
       h: color.h,
       s: color.s,
       l: 1,
@@ -1645,14 +438,14 @@ function applyLumOff(rgbStr, offset, isAlpha) {
     }).toHex();
   }
   if (isAlpha) {
-    return tinycolor({
+    return tinycolor2({
       h: color.h,
       s: color.s,
       l: lum,
       a: color.a
     }).toHex8();
   }
-  return tinycolor({
+  return tinycolor2({
     h: color.h,
     s: color.s,
     l: lum,
@@ -1660,18 +453,18 @@ function applyLumOff(rgbStr, offset, isAlpha) {
   }).toHex();
 }
 function applyLumMod(rgbStr, multiplier, isAlpha) {
-  const color = tinycolor(rgbStr).toHsl();
+  const color = tinycolor2(rgbStr).toHsl();
   let cacl_l = color.l * multiplier;
   if (cacl_l >= 1) cacl_l = 1;
   if (isAlpha) {
-    return tinycolor({
+    return tinycolor2({
       h: color.h,
       s: color.s,
       l: cacl_l,
       a: color.a
     }).toHex8();
   }
-  return tinycolor({
+  return tinycolor2({
     h: color.h,
     s: color.s,
     l: cacl_l,
@@ -1679,18 +472,18 @@ function applyLumMod(rgbStr, multiplier, isAlpha) {
   }).toHex();
 }
 function applyHueMod(rgbStr, multiplier, isAlpha) {
-  const color = tinycolor(rgbStr).toHsl();
+  const color = tinycolor2(rgbStr).toHsl();
   let cacl_h = color.h * multiplier;
   if (cacl_h >= 360) cacl_h = cacl_h - 360;
   if (isAlpha) {
-    return tinycolor({
+    return tinycolor2({
       h: cacl_h,
       s: color.s,
       l: color.l,
       a: color.a
     }).toHex8();
   }
-  return tinycolor({
+  return tinycolor2({
     h: cacl_h,
     s: color.s,
     l: color.l,
@@ -1698,18 +491,18 @@ function applyHueMod(rgbStr, multiplier, isAlpha) {
   }).toHex();
 }
 function applySatMod(rgbStr, multiplier, isAlpha) {
-  const color = tinycolor(rgbStr).toHsl();
+  const color = tinycolor2(rgbStr).toHsl();
   let cacl_s = color.s * multiplier;
   if (cacl_s >= 1) cacl_s = 1;
   if (isAlpha) {
-    return tinycolor({
+    return tinycolor2({
       h: color.h,
       s: cacl_s,
       l: color.l,
       a: color.a
     }).toHex8();
   }
-  return tinycolor({
+  return tinycolor2({
     h: color.h,
     s: cacl_s,
     l: color.l,
@@ -1769,18 +562,20 @@ async function getPicFill(type, node, warpObj) {
 }
 function getPicFillOpacity(node) {
   const aBlipNode = node["a:blip"];
-  const aphaModFixNode = getTextByPathList(aBlipNode, ["a:alphaModFix", "attrs"]);
-  let opacity = 1;
-  if (aphaModFixNode && aphaModFixNode["amt"] && aphaModFixNode["amt"] !== "") {
-    opacity = parseInt(aphaModFixNode["amt"]) / 1e5;
-  }
-  return opacity;
+  return getBlipOpacityRatio(aBlipNode) ?? 1;
 }
 function getPicFilters(node) {
   if (!node) return null;
   const aBlipNode = node["a:blip"];
   if (!aBlipNode) return null;
   const filters = {};
+  const opacity = getBlipOpacityRatio(aBlipNode);
+  if (opacity !== void 0) {
+    filters.opacity = formatFilterPercent(opacity);
+  }
+  if (aBlipNode["a:grayscl"]) {
+    filters.grayscale = "100%";
+  }
   const extLstNode = aBlipNode["a:extLst"];
   if (extLstNode && extLstNode["a:ext"]) {
     const extNodes = Array.isArray(extLstNode["a:ext"]) ? extLstNode["a:ext"] : [extLstNode["a:ext"]];
@@ -1794,7 +589,12 @@ function getPicFilters(node) {
         if (effect["a14:saturation"]) {
           const satAttr = getTextByPathList(effect, ["a14:saturation", "attrs", "sat"]);
           if (satAttr) {
-            filters.saturation = parseInt(String(satAttr)) / 1e5;
+            const saturation = parseInt(String(satAttr)) / 1e5;
+            if (saturation <= 0) {
+              filters.grayscale = "100%";
+            } else {
+              filters.saturation = saturation;
+            }
           }
         }
         if (effect["a14:brightnessContrast"]) {
@@ -1832,16 +632,34 @@ function getPicFilters(node) {
 async function getBgPicFill(bgPr, sorce, warpObj) {
   const picBase64 = await getPicFill(sorce, bgPr["a:blipFill"], warpObj);
   const aBlipNode = bgPr["a:blipFill"]["a:blip"];
-  const aphaModFixNode = getTextByPathList(aBlipNode, ["a:alphaModFix", "attrs"]);
-  let opacity = 1;
-  if (aphaModFixNode && aphaModFixNode["amt"] && aphaModFixNode["amt"] !== "") {
-    opacity = parseInt(aphaModFixNode["amt"]) / 1e5;
-  }
+  const opacity = getBlipOpacityRatio(aBlipNode) ?? 1;
   return {
     picBase64,
     opacity
   };
 }
+function getBlipOpacityRatio(aBlipNode) {
+  if (!aBlipNode) return void 0;
+  const alphaNodes = Array.isArray(aBlipNode["a:alphaModFix"]) ? aBlipNode["a:alphaModFix"] : aBlipNode["a:alphaModFix"] ? [aBlipNode["a:alphaModFix"]] : [];
+  if (!alphaNodes.length) return void 0;
+  let opacity = 1;
+  let hasOpacity = false;
+  for (const alphaNode of alphaNodes) {
+    const amt = alphaNode?.attrs?.amt;
+    if (amt === void 0 || amt === "") continue;
+    const parsed = parseInt(String(amt), 10);
+    if (!Number.isFinite(parsed)) continue;
+    opacity *= parsed / 1e5;
+    hasOpacity = true;
+  }
+  return hasOpacity ? opacity : void 0;
+}
+function formatFilterPercent(value) {
+  const percent = Math.max(0, Math.min(100, value * 100));
+  const rounded = Math.round(percent * 1e3) / 1e3;
+  const normalized = Number.isInteger(rounded) ? rounded.toFixed(0) : String(rounded);
+  return `${normalized}%`;
+}
 function getGradientFill(node, warpObj) {
   const gsLst = node["a:gsLst"]["a:gs"];
   const colors = [];
@@ -2320,7 +1138,7 @@ function getSolidFill(solidFill, clrMap, phClr, warpObj) {
     const red = defBultColorVals["r"].indexOf("%") !== -1 ? defBultColorVals["r"].split("%").shift() : defBultColorVals["r"];
     const green = defBultColorVals["g"].indexOf("%") !== -1 ? defBultColorVals["g"].split("%").shift() : defBultColorVals["g"];
     const blue = defBultColorVals["b"].indexOf("%") !== -1 ? defBultColorVals["b"].split("%").shift() : defBultColorVals["b"];
-    color = toHex2(255 * (Number(red) / 100)) + toHex2(255 * (Number(green) / 100)) + toHex2(255 * (Number(blue) / 100));
+    color = toHex(255 * (Number(red) / 100)) + toHex(255 * (Number(green) / 100)) + toHex(255 * (Number(blue) / 100));
   } else if (solidFill["a:prstClr"]) {
     clrNode = solidFill["a:prstClr"];
     const prstClr = getTextByPathList(clrNode, ["attrs", "val"]);
@@ -2331,8 +1149,8 @@ function getSolidFill(solidFill, clrMap, phClr, warpObj) {
     const hue = Number(defBultColorVals["hue"]) / 1e5;
     const sat = Number(defBultColorVals["sat"].indexOf("%") !== -1 ? defBultColorVals["sat"].split("%").shift() : defBultColorVals["sat"]) / 100;
     const lum = Number(defBultColorVals["lum"].indexOf("%") !== -1 ? defBultColorVals["lum"].split("%").shift() : defBultColorVals["lum"]) / 100;
-    const hsl2rgb = hslToRgb2(hue, sat, lum);
-    color = toHex2(hsl2rgb.r) + toHex2(hsl2rgb.g) + toHex2(hsl2rgb.b);
+    const hsl2rgb = hslToRgb(hue, sat, lum);
+    color = toHex(hsl2rgb.r) + toHex(hsl2rgb.g) + toHex(hsl2rgb.b);
   } else if (solidFill["a:sysClr"]) {
     clrNode = solidFill["a:sysClr"];
     const sysClr = getTextByPathList(clrNode, ["attrs", "lastClr"]);
@@ -2341,7 +1159,7 @@ function getSolidFill(solidFill, clrMap, phClr, warpObj) {
   let isAlpha = false;
   const alpha = parseInt(getTextByPathList(clrNode, ["a:alpha", "attrs", "val"])) / 1e5;
   if (!isNaN(alpha)) {
-    const al_color = tinycolor(color);
+    const al_color = tinycolor3(color);
     al_color.setAlpha(alpha);
     color = al_color.toHex8();
     isAlpha = true;
@@ -3139,66 +1957,87 @@ function identifyShape(shapeData) {
   return matchShape(analysis);
 }
 function extractPathCommands(path) {
-  const commands = [];
-  const moveToList = normalizeToArray(path["a:moveTo"]);
-  moveToList.forEach((moveTo) => {
-    const pt = Array.isArray(moveTo?.["a:pt"]) ? moveTo["a:pt"][0] : moveTo?.["a:pt"];
-    if (pt) {
-      commands.push({
-        type: "moveTo",
-        points: [{ x: parseInt(pt.attrs?.x) || 0, y: parseInt(pt.attrs?.y) || 0 }]
-      });
-    }
-  });
-  const lineToList = normalizeToArray(path["a:lnTo"]);
-  lineToList.forEach((lnTo) => {
-    const pt = lnTo["a:pt"];
-    if (pt) {
-      commands.push({
-        type: "lineTo",
-        points: [{ x: parseInt(pt.attrs?.x) || 0, y: parseInt(pt.attrs?.y) || 0 }]
-      });
-    }
-  });
-  const cubicList = normalizeToArray(path["a:cubicBezTo"]);
-  cubicList.forEach((cubic) => {
-    const pts = normalizeToArray(cubic["a:pt"]);
-    const points = pts.map((pt) => ({
-      x: parseInt(pt.attrs?.x) || 0,
-      y: parseInt(pt.attrs?.y) || 0
-    }));
-    if (points.length === 3) {
-      commands.push({ type: "cubicBezTo", points });
+  const orderedNodes = collectOrderedCommandNodes(path);
+  return orderedNodes.flatMap(({ type, node }) => {
+    switch (type) {
+      case "moveTo": {
+        const pt = Array.isArray(node?.["a:pt"]) ? node["a:pt"][0] : node?.["a:pt"];
+        if (!pt) return [];
+        return [{
+          type: "moveTo",
+          points: [{ x: parseInt(pt.attrs?.x) || 0, y: parseInt(pt.attrs?.y) || 0 }]
+        }];
+      }
+      case "lineTo": {
+        const pt = node?.["a:pt"];
+        if (!pt) return [];
+        return [{
+          type: "lineTo",
+          points: [{ x: parseInt(pt.attrs?.x) || 0, y: parseInt(pt.attrs?.y) || 0 }]
+        }];
+      }
+      case "cubicBezTo": {
+        const pts = normalizeToArray(node?.["a:pt"]);
+        const points = pts.map((pt) => ({
+          x: parseInt(pt.attrs?.x) || 0,
+          y: parseInt(pt.attrs?.y) || 0
+        }));
+        return points.length === 3 ? [{ type: "cubicBezTo", points }] : [];
+      }
+      case "arcTo":
+        return [{
+          type: "arcTo",
+          wR: parseInt(node?.attrs?.wR) || 0,
+          hR: parseInt(node?.attrs?.hR) || 0,
+          stAng: parseInt(node?.attrs?.stAng) || 0,
+          swAng: parseInt(node?.attrs?.swAng) || 0
+        }];
+      case "quadBezTo": {
+        const pts = normalizeToArray(node?.["a:pt"]);
+        const points = pts.map((pt) => ({
+          x: parseInt(pt.attrs?.x) || 0,
+          y: parseInt(pt.attrs?.y) || 0
+        }));
+        return points.length ? [{ type: "quadBezTo", points }] : [];
+      }
+      case "close":
+        return [{ type: "close" }];
+      default:
+        return [];
     }
   });
-  const arcList = normalizeToArray(path["a:arcTo"]);
-  arcList.forEach((arc) => {
-    commands.push({
-      type: "arcTo",
-      wR: parseInt(arc.attrs?.wR) || 0,
-      hR: parseInt(arc.attrs?.hR) || 0,
-      stAng: parseInt(arc.attrs?.stAng) || 0,
-      swAng: parseInt(arc.attrs?.swAng) || 0
-    });
-  });
-  const quadList = normalizeToArray(path["a:quadBezTo"]);
-  quadList.forEach((quad) => {
-    const pts = normalizeToArray(quad["a:pt"]);
-    const points = pts.map((pt) => ({
-      x: parseInt(pt.attrs?.x) || 0,
-      y: parseInt(pt.attrs?.y) || 0
-    }));
-    commands.push({ type: "quadBezTo", points });
-  });
-  if (path["a:close"]) {
-    commands.push({ type: "close" });
-  }
-  return commands;
 }
 function normalizeToArray(value) {
   if (!value) return [];
   return Array.isArray(value) ? value : [value];
 }
+function collectOrderedCommandNodes(path) {
+  const commandNodes = [
+    ...toOrderedCommandEntries(path["a:moveTo"], "moveTo"),
+    ...toOrderedCommandEntries(path["a:lnTo"], "lineTo"),
+    ...toOrderedCommandEntries(path["a:cubicBezTo"], "cubicBezTo"),
+    ...toOrderedCommandEntries(path["a:arcTo"], "arcTo"),
+    ...toOrderedCommandEntries(path["a:quadBezTo"], "quadBezTo"),
+    ...toOrderedCommandEntries(path["a:close"], "close")
+  ];
+  return commandNodes.sort((left, right) => {
+    if (left.order !== right.order) return left.order - right.order;
+    return left.index - right.index;
+  });
+}
+function toOrderedCommandEntries(value, type) {
+  return normalizeToArray(value).map((node, index) => ({
+    type,
+    node,
+    index,
+    order: getNodeOrder(node)
+  }));
+}
+function getNodeOrder(node) {
+  const raw = node?.attrs?.order;
+  const order = typeof raw === "number" ? raw : parseInt(String(raw ?? ""), 10);
+  return Number.isFinite(order) ? order : Number.MAX_SAFE_INTEGER;
+}
 function buildCustomShapeSegment(pathNode, w, h) {
   if (!pathNode || typeof pathNode !== "object") return "";
   const maxX = parseInt(pathNode.attrs?.w) || 0;
@@ -8153,7 +6992,7 @@ function getSmartArtTextData(dataContent) {
 }
 
 // parser/parse.ts
-async function parse2(file) {
+async function parse(file) {
   const slides = [];
   const zip = await JSZip.loadAsync(file);
   const filesInfo = await getContentTypes(zip);
@@ -8172,9 +7011,28 @@ async function parse2(file) {
     }
   };
 }
+function getNodeByLocalName(node, localName) {
+  if (!node || typeof node !== "object") return void 0;
+  if (node[localName] !== void 0) return node[localName];
+  for (const key of Object.keys(node)) {
+    if (key === localName || key.endsWith(":" + localName)) {
+      return node[key];
+    }
+  }
+  return void 0;
+}
+function toNodeArray(node) {
+  if (node === void 0 || node === null) return [];
+  return Array.isArray(node) ? node : [node];
+}
+function getRelationshipArray(content) {
+  const relationshipsNode = getNodeByLocalName(content, "Relationships");
+  return toNodeArray(getNodeByLocalName(relationshipsNode, "Relationship"));
+}
 async function getContentTypes(zip) {
   const ContentTypesJson = await readXmlFile(zip, "[Content_Types].xml");
-  const subObj = ContentTypesJson["Types"]["Override"];
+  const typesNode = getNodeByLocalName(ContentTypesJson, "Types");
+  const subObj = toNodeArray(getNodeByLocalName(typesNode, "Override"));
   let slidesLocArray = [];
   let slideLayoutsLocArray = [];
   for (const item of subObj) {
@@ -8212,17 +7070,13 @@ async function getSlideInfo(zip) {
 }
 async function getTheme(zip) {
   const preResContent = await readXmlFile(zip, "ppt/_rels/presentation.xml.rels");
-  const relationshipArray = preResContent["Relationships"]["Relationship"];
+  const relationshipArray = getRelationshipArray(preResContent);
   let themeURI;
-  if (relationshipArray.constructor === Array) {
-    for (const relationshipItem of relationshipArray) {
-      if (relationshipItem["attrs"]["Type"] === "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme") {
-        themeURI = relationshipItem["attrs"]["Target"];
-        break;
-      }
+  for (const relationshipItem of relationshipArray) {
+    if (relationshipItem["attrs"]["Type"] === "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme") {
+      themeURI = relationshipItem["attrs"]["Target"];
+      break;
     }
-  } else if (relationshipArray["attrs"]["Type"] === "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme") {
-    themeURI = relationshipArray["attrs"]["Target"];
   }
   const themeContent = await readXmlFile(zip, "ppt/" + themeURI);
   const themeColors = [];
@@ -8239,8 +7093,7 @@ async function getTheme(zip) {
 async function processSingleSlide(zip, sldFileName, themeContent, defaultTextStyle) {
   const resName = sldFileName.replace("slides/slide", "slides/_rels/slide") + ".rels";
   const resContent = await readXmlFile(zip, resName);
-  let relationshipArray = resContent["Relationships"]["Relationship"];
-  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
+  let relationshipArray = getRelationshipArray(resContent);
   let noteFilename = "";
   let layoutFilename = "";
   let masterFilename = "";
@@ -8305,8 +7158,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
   const slideLayoutTables = await indexNodes(slideLayoutContent);
   const slideLayoutResFilename = layoutFilename.replace("slideLayouts/slideLayout", "slideLayouts/_rels/slideLayout") + ".rels";
   const slideLayoutResContent = await readXmlFile(zip, slideLayoutResFilename);
-  relationshipArray = slideLayoutResContent["Relationships"]["Relationship"];
-  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
+  relationshipArray = getRelationshipArray(slideLayoutResContent);
   for (const relationshipArrayItem of relationshipArray) {
     const relType = relationshipArrayItem["attrs"]["Type"].replace("http://schemas.openxmlformats.org/officeDocument/2006/relationships/", "");
     let relTarget = relationshipArrayItem["attrs"]["Target"];
@@ -8328,8 +7180,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
   const slideMasterTables = indexNodes(slideMasterContent);
   const slideMasterResFilename = masterFilename.replace("slideMasters/slideMaster", "slideMasters/_rels/slideMaster") + ".rels";
   const slideMasterResContent = await readXmlFile(zip, slideMasterResFilename);
-  relationshipArray = slideMasterResContent["Relationships"]["Relationship"];
-  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
+  relationshipArray = getRelationshipArray(slideMasterResContent);
   for (const relationshipArrayItem of relationshipArray) {
     const relType = relationshipArrayItem["attrs"]["Type"].replace("http://schemas.openxmlformats.org/officeDocument/2006/relationships/", "");
     let relTarget = relationshipArrayItem["attrs"]["Target"];
@@ -8351,9 +7202,8 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     const themeResFileName = themeFilename.replace(themeName, "_rels/" + themeName) + ".rels";
     const themeResContent = await readXmlFile(zip, themeResFileName);
     if (themeResContent) {
-      relationshipArray = themeResContent["Relationships"]["Relationship"];
+      relationshipArray = getRelationshipArray(themeResContent);
       if (relationshipArray) {
-        if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
         for (const relationshipArrayItem of relationshipArray) {
           themeResObj[relationshipArrayItem["attrs"]["Id"]] = {
             "type": relationshipArrayItem["attrs"]["Type"].replace("http://schemas.openxmlformats.org/officeDocument/2006/relationships/", ""),
@@ -8381,8 +7231,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     }
     const digramResContent = await readXmlFile(zip, diagramResFileName);
     if (digramResContent) {
-      relationshipArray = digramResContent["Relationships"]["Relationship"];
-      if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray];
+      relationshipArray = getRelationshipArray(digramResContent);
       for (const relationshipArrayItem of relationshipArray) {
         diagramResObj[relationshipArrayItem["attrs"]["Id"]] = {
           "type": relationshipArrayItem["attrs"]["Type"].replace("http://schemas.openxmlformats.org/officeDocument/2006/relationships/", ""),
@@ -9558,7 +8407,6 @@ function normalizeElement(element) {
     element.text.content = normalizeTextContent(element.text.content);
   }
   if (element.type === "image") {
-    delete element.filters;
     delete element.imageType;
     delete element.outline;
   }
@@ -9617,6 +8465,7 @@ function mapBaseElement(raw, exportedMeta) {
     rotate: raw.rotate,
     fill,
     opacity: raw.opacity,
+    filters: raw.filters,
     outline: outline ?? void 0,
     shadow: shadow ?? void 0,
     flipH: raw.isFlipH,
@@ -9753,7 +8602,7 @@ function normalizeDeck(value) {
   return document;
 }
 async function buildDeckFromPptx(buffer) {
-  const pptxJson = await parse2(buffer);
+  const pptxJson = await parse(buffer);
   const width = toPx(pptxJson.size?.width);
   const height = toPx(pptxJson.size?.height);
   const themeColors = mapThemeColors(pptxJson);