@awsless/cli 0.1.15 → 0.1.17

package/dist/handlers/icon.js

@@ -14050,7 +14050,7 @@ var require_svgstore = __commonJS((exports, module) => {
 import { getObject, putObject } from "@awsless/s3";
 import { getRouteEnv, internalInvoke } from "awsless";
 
-// ../../node_modules/.pnpm/svgo@4.0.1/node_modules/svgo/dist/svgo.browser.js
+// ../../node_modules/.pnpm/svgo@4.0.2/node_modules/svgo/dist/svgo.browser.js
 var visitSkip = Symbol();
 var visit = (node, visitor, parentNode) => {
   const callbacks = visitor[node.type];
@@ -28717,13 +28717,14 @@ var hasScripts = (node2) => {
   if (node2.name === "script" && node2.children.length !== 0)
     return true;
   if (node2.name === "a") {
-    const hasJsLinks = Object.entries(node2.attributes).some(([attrKey, attrValue]) => (attrKey === "href" || attrKey.endsWith(":href")) && attrValue != null && attrValue.trimStart().startsWith("javascript:"));
+    const hasJsLinks = Object.entries(node2.attributes).some(([attrKey, attrValue]) => (attrKey === "href" || attrKey.endsWith(":href")) && attrValue != null && attrValue.trimStart().toLowerCase().startsWith("javascript:"));
     if (hasJsLinks)
       return true;
   }
   return hasScriptsEventAttrs.some((attr) => node2.attributes[attr] != null);
 };
 var includesUrlReference = (body) => new RegExp(regReferencesUrl).test(body);
+var includesCssVarReference = (body) => /var\s*\(\s*--/.test(body);
 var findReferences = (attribute, value2) => {
   const results = [];
   if (referencesProps.has(attribute)) {
@@ -28991,7 +28992,7 @@ var fn$D = (_root, params) => {
             val = convertRgbToHex(numbers);
           }
         }
-        convertCase && !includesUrlReference(val) && val !== "currentColor" && (convertCase === "lower" ? val = val.toLowerCase() : convertCase === "upper" && (val = val.toUpperCase()));
+        !convertCase || includesUrlReference(val) || includesCssVarReference(val) || val === "currentColor" || (convertCase === "lower" ? val = val.toLowerCase() : convertCase === "upper" && (val = val.toUpperCase()));
         if (shorthex) {
           const match = regHEX.exec(val);
           match != null && (val = "#" + match[0][1] + match[0][3] + match[0][5]);
@@ -29294,8 +29295,7 @@ var parsePathData = (string) => {
     let number2 = null;
     if (command === "A" || command === "a") {
       const position = args.length;
-      position !== 0 && position !== 1 || c !== "+" && c !== "-" && ([newCursor, number2] = readNumber(string, i));
-      position !== 2 && position !== 5 && position !== 6 || ([newCursor, number2] = readNumber(string, i));
+      position !== 0 && position !== 1 && position !== 2 && position !== 5 && position !== 6 || ([newCursor, number2] = readNumber(string, i));
       if (position === 3 || position === 4) {
         c === "0" && (number2 = 0);
         c === "1" && (number2 = 1);
@@ -29309,6 +29309,10 @@ var parsePathData = (string) => {
     hadComma = false;
     i = newCursor;
     if (args.length === argsCount) {
+      if (command === "A" || command === "a") {
+        args[0] = Math.abs(args[0]);
+        args[1] = Math.abs(args[1]);
+      }
       pathData.push({ command, args });
       command === "M" && (command = "L");
       command === "m" && (command = "l");
@@ -30634,13 +30638,17 @@ var fn$r = (root, params) => {
       const hasMarkerMid = computedStyle["marker-mid"] != null;
       const maybeHasStroke = computedStyle.stroke && (computedStyle.stroke.type === "dynamic" || computedStyle.stroke.value !== "none");
       const maybeHasLinecap = computedStyle["stroke-linecap"] && (computedStyle["stroke-linecap"].type === "dynamic" || computedStyle["stroke-linecap"].value !== "butt");
-      const maybeHasStrokeAndLinecap = maybeHasStroke && maybeHasLinecap;
       const isSafeToUseZ = !maybeHasStroke || computedStyle["stroke-linecap"]?.type === "static" && computedStyle["stroke-linecap"].value === "round" && computedStyle["stroke-linejoin"]?.type === "static" && computedStyle["stroke-linejoin"].value === "round";
+      const isSafeToRemove = (isFirstDraw, safeIfNotFirstDraw) => {
+        if (!maybeHasStroke)
+          return true;
+        return isFirstDraw ? !maybeHasLinecap : safeIfNotFirstDraw;
+      };
       let data = path2js(node2);
       if (data.length) {
         const includesVertices = data.some((item) => item.command !== "m" && item.command !== "M");
         convertToRelative(data);
-        data = filters(data, newParams, { isSafeToUseZ, maybeHasStrokeAndLinecap, hasMarkerMid });
+        data = filters(data, newParams, { isSafeToUseZ, isSafeToRemove, hasMarkerMid });
         utilizeAbsolute && (data = convertToMixed(data, newParams));
         const hasMarker = node2.attributes["marker-start"] != null || node2.attributes["marker-end"] != null;
         const isMarkersOnlyPath = hasMarker && includesVertices && data.every((item) => item.command === "m" || item.command === "M");
@@ -30756,7 +30764,7 @@ var convertToRelative = (pathData) => {
   }
   return pathData;
 };
-function filters(path, params, { isSafeToUseZ, maybeHasStrokeAndLinecap, hasMarkerMid }) {
+function filters(path, params, { isSafeToUseZ, isSafeToRemove, hasMarkerMid }) {
   const stringify = data2Path.bind(null, params);
   const relSubpoint = [0, 0];
   const pathBase = [0, 0];
@@ -30892,11 +30900,12 @@ function filters(path, params, { isSafeToUseZ, maybeHasStrokeAndLinecap, hasMark
           next && next.command == "s" && makeLonghand(next, data);
           command = "l";
           data = data.slice(-2);
-        } else if (command === "q" && isCurveStraightLine(data)) {
-          next && next.command == "t" && makeLonghand(next, data);
-          command = "l";
-          data = data.slice(-2);
-        } else if (command === "t" && prev.command !== "q" && prev.command !== "t") {
+        } else if (command === "q" && isCurveStraightLine(data) || command === "t" && prev.command !== "q" && prev.command !== "t") {
+          command == "q" && next && next.command == "t" && makeLonghand(next, data);
+          if (command == "t" && next && next.command == "t") {
+            next.command = "q";
+            next.args.unshift(2 * item.coords[0] - item.base[0] - item.coords[0], 2 * item.coords[1] - item.base[1] - item.coords[1]);
+          }
           command = "l";
           data = data.slice(-2);
         } else if (command === "a" && (data[0] === 0 || data[1] === 0 || sagitta !== undefined && sagitta < error)) {
@@ -30966,7 +30975,7 @@ function filters(path, params, { isSafeToUseZ, maybeHasStrokeAndLinecap, hasMark
           }
         }
       }
-      if (params.removeUseless && !maybeHasStrokeAndLinecap) {
+      if (params.removeUseless && isSafeToRemove(prev.command == "m" || prev.command == "M", true)) {
         if ((command === "l" || command === "h" || command === "v" || command === "q" || command === "t" || command === "c" || command === "s") && data.every(function(i) {
           return i === 0;
         })) {
@@ -30990,7 +30999,7 @@ function filters(path, params, { isSafeToUseZ, maybeHasStrokeAndLinecap, hasMark
       if (prev.command === "Z" || prev.command === "z")
         return false;
     }
-    if ((command === "Z" || command === "z") && params.removeUseless && isSafeToUseZ && Math.abs(item.base[0] - item.coords[0]) < error / 10 && Math.abs(item.base[1] - item.coords[1]) < error / 10)
+    if ((command === "Z" || command === "z") && params.removeUseless && isSafeToRemove(prev.command == "m" || prev.command == "M", isSafeToUseZ) && Math.abs(item.base[0] - item.coords[0]) < error / 10 && Math.abs(item.base[1] - item.coords[1]) < error / 10)
       return false;
     prevQControlPoint = command === "q" ? [data[0] + item.base[0], data[1] + item.base[1]] : command === "t" ? qControlPoint ? reflectPoint(qControlPoint, item.base) : item.coords : undefined;
     prev = item;
@@ -31275,7 +31284,7 @@ var fn$n = (root, params) => {
   return { element: { enter: (node2) => {
     if (node2.children.length <= 1)
       return;
-    const elementsToRemove = [];
+    const elementsToRemove = new Set;
     let prevChild = node2.children[0];
     let prevPathData = null;
     const updatePreviousPath = (child, pathData) => {
@@ -31317,7 +31326,7 @@ var fn$n = (root, params) => {
       prevPathData = prevPathData ?? path2js(prevChild);
       if (force || !intersects(prevPathData, currentPathData)) {
         prevPathData.push(...currentPathData);
-        elementsToRemove.push(child);
+        elementsToRemove.add(child);
         continue;
       }
       hasPrevPath && updatePreviousPath(prevChild, prevPathData);
@@ -31325,7 +31334,7 @@ var fn$n = (root, params) => {
       prevPathData = null;
     }
     prevPathData && prevChild.type === "element" && updatePreviousPath(prevChild, prevPathData);
-    node2.children = node2.children.filter((child) => !elementsToRemove.includes(child));
+    node2.children = node2.children.filter((child) => !elementsToRemove.has(child));
   } } };
 };
 var mergePaths = Object.freeze({ __proto__: null, description: description$n, fn: fn$n, name: name$n });
@@ -31798,7 +31807,14 @@ var fn$d = (_root, params, info) => {
 var prefixIds = Object.freeze({ __proto__: null, description: description$d, fn: fn$d, name: name$d });
 var name$c = "removeAttributesBySelector";
 var description$c = "removes attributes of elements that match a css selector";
+var ENOATTRS$1 = `Warning: The plugin "removeAttributesBySelector" is missing parameters.
+It should have a list of "selectors", or one "selector" and one "attributes".
+Without either, the plugin is a noop.`;
 var fn$c = (root, params) => {
+  if (!Array.isArray(params.selectors) && (!params.selector || !params.attributes)) {
+    console.warn(ENOATTRS$1);
+    return null;
+  }
   const selectors = Array.isArray(params.selectors) ? params.selectors : [params];
   for (const { selector: selector2, attributes: attributes2 } of selectors) {
     const nodes = querySelectorAll(root, selector2);
@@ -31937,25 +31953,54 @@ var removeRasterImages = Object.freeze({ __proto__: null, description: descripti
 var name$6 = "removeScripts";
 var description$6 = "removes scripts";
 var eventAttrs = [...attrsGroups.animationEvent, ...attrsGroups.documentEvent, ...attrsGroups.documentElementEvent, ...attrsGroups.globalEvent, ...attrsGroups.graphicalEvent];
-var fn$6 = () => ({ element: { enter: (node2, parentNode) => {
-  if (node2.name === "script") {
-    detachNodeFromParent(node2, parentNode);
-    return;
+var SCRIPT_NAMESPACES = ["http://www.w3.org/2000/svg", "http://www.w3.org/1999/xhtml"];
+function isNamespaceAwareElem(elem, targetElem, prefixes, targetNamespaces) {
+  if (elem === targetElem)
+    return true;
+  if (elem.includes(":")) {
+    const [prefix, effectiveTag] = elem.split(":", 2);
+    if (targetElem === effectiveTag) {
+      const namespaces = prefixes.get(prefix);
+      const namespace = namespaces[namespaces.length - 1];
+      return targetNamespaces.includes(namespace);
+    }
   }
-  for (const attr of eventAttrs)
-    node2.attributes[attr] != null && delete node2.attributes[attr];
-}, exit: (node2, parentNode) => {
-  if (node2.name !== "a")
-    return;
-  for (const attr of Object.keys(node2.attributes))
-    if (attr === "href" || attr.endsWith(":href")) {
-      if (node2.attributes[attr] == null || !node2.attributes[attr].trimStart().startsWith("javascript:"))
+  return false;
+}
+var fn$6 = () => {
+  const prefixes = new Map;
+  return { element: { enter: (node2, parentNode) => {
+    for (const [k, v] of Object.entries(node2.attributes)) {
+      if (!k.startsWith("xmlns:"))
         continue;
-      const index = parentNode.children.indexOf(node2);
-      const usefulChildren = node2.children.filter((child) => child.type !== "text");
-      parentNode.children.splice(index, 1, ...usefulChildren);
+      const prefix = k.slice(6);
+      prefixes.has(prefix) ? prefixes.get(prefix).push(v) : prefixes.set(prefix, [v]);
     }
-} } });
+    if (isNamespaceAwareElem(node2.name, "script", prefixes, SCRIPT_NAMESPACES)) {
+      detachNodeFromParent(node2, parentNode);
+      return;
+    }
+    for (const attr of eventAttrs)
+      node2.attributes[attr] != null && delete node2.attributes[attr];
+  }, exit: (node2, parentNode) => {
+    for (const k of Object.keys(node2.attributes)) {
+      if (!k.startsWith("xmlns:"))
+        continue;
+      const prefix = k.slice(6);
+      prefixes.get(prefix).pop();
+    }
+    if (node2.name !== "a")
+      return;
+    for (const attr of Object.keys(node2.attributes))
+      if (attr === "href" || attr.endsWith(":href")) {
+        if (node2.attributes[attr] == null || !node2.attributes[attr].trimStart().toLowerCase().startsWith("javascript:"))
+          continue;
+        const index = parentNode.children.indexOf(node2);
+        const usefulChildren = node2.children.filter((child) => child.type !== "text");
+        parentNode.children.splice(index, 1, ...usefulChildren);
+      }
+  } } };
+};
 var removeScripts = Object.freeze({ __proto__: null, description: description$6, fn: fn$6, name: name$6 });
 var name$5 = "removeStyleElement";
 var description$5 = "removes <style> element";