@iconify/tools 4.0.0-beta.5 → 4.0.0-beta.8

package/lib/colors/detect.cjs

@@ -60,7 +60,7 @@ function detectIconSetPalette(iconSet) {
     },
     ["icon"]
   );
-  return palette === void 0 ? null : palette;
+  return palette ?? null;
 }
 
 exports.detectIconSetPalette = detectIconSetPalette;

package/lib/colors/detect.mjs

@@ -58,7 +58,7 @@ function detectIconSetPalette(iconSet) {
     },
     ["icon"]
   );
-  return palette === void 0 ? null : palette;
+  return palette ?? null;
 }
 
 export { detectIconSetPalette };

package/lib/colors/parse.cjs

@@ -128,7 +128,7 @@ function parseColors(svg, options = {}) {
   svg_parseStyle.parseSVGStyle(svg, (item) => {
     const prop = item.prop;
     const value = item.value;
-    if (propsToCheck.indexOf(prop) === -1) {
+    if (!propsToCheck.includes(prop)) {
       return value;
     }
     const attr = prop;
@@ -213,7 +213,7 @@ function parseColors(svg, options = {}) {
     }
     if (svg_data_tags.animateTags.has(tagName)) {
       const attr = attribs.attributeName;
-      if (propsToCheck.indexOf(attr) !== -1) {
+      if (propsToCheck.includes(attr)) {
         for (let i = 0; i < animatePropsToCheck.length; i++) {
           const elementProp = animatePropsToCheck[i];
           const fullValue = attribs[elementProp];

package/lib/colors/parse.mjs

@@ -126,7 +126,7 @@ function parseColors(svg, options = {}) {
   parseSVGStyle(svg, (item) => {
     const prop = item.prop;
     const value = item.value;
-    if (propsToCheck.indexOf(prop) === -1) {
+    if (!propsToCheck.includes(prop)) {
       return value;
     }
     const attr = prop;
@@ -211,7 +211,7 @@ function parseColors(svg, options = {}) {
     }
     if (animateTags.has(tagName)) {
       const attr = attribs.attributeName;
-      if (propsToCheck.indexOf(attr) !== -1) {
+      if (propsToCheck.includes(attr)) {
         for (let i = 0; i < animatePropsToCheck.length; i++) {
           const elementProp = animatePropsToCheck[i];
           const fullValue = attribs[elementProp];

package/lib/download/git/index.cjs

@@ -31,7 +31,7 @@ require('tar');
 
 async function downloadGitRepo(options) {
   const { remote, branch } = options;
-  const hasHashInTarget = options.target.indexOf("{hash}") !== -1;
+  const hasHashInTarget = options.target.includes("{hash}");
   const ifModifiedSince = options.ifModifiedSince;
   if (ifModifiedSince || hasHashInTarget) {
     const result = await misc_exec.execAsync(

package/lib/download/git/index.mjs

@@ -29,7 +29,7 @@ import 'tar';
 
 async function downloadGitRepo(options) {
   const { remote, branch } = options;
-  const hasHashInTarget = options.target.indexOf("{hash}") !== -1;
+  const hasHashInTarget = options.target.includes("{hash}");
   const ifModifiedSince = options.ifModifiedSince;
   if (ifModifiedSince || hasHashInTarget) {
     const result = await execAsync(

package/lib/icon-set/index.cjs

@@ -145,10 +145,9 @@ class IconSet {
    * List icons
    */
   list(types = ["icon", "variation"]) {
-    return Object.keys(this.entries).filter((name) => {
-      const type = this.entries[name].type;
-      return types.indexOf(type) !== -1;
-    });
+    return Object.keys(this.entries).filter(
+      (name) => types.includes(this.entries[name].type)
+    );
   }
   /**
    * forEach function to loop through all entries.

package/lib/icon-set/index.mjs

@@ -143,10 +143,9 @@ class IconSet {
    * List icons
    */
   list(types = ["icon", "variation"]) {
-    return Object.keys(this.entries).filter((name) => {
-      const type = this.entries[name].type;
-      return types.indexOf(type) !== -1;
-    });
+    return Object.keys(this.entries).filter(
+      (name) => types.includes(this.entries[name].type)
+    );
   }
   /**
    * forEach function to loop through all entries.

package/lib/import/figma/nodes.cjs

@@ -64,7 +64,7 @@ function getFigmaIconNodes(document, options) {
         const newParents = parents.concat([parentItem]);
         if (!parents.length && options.pages) {
           const allowedPages = options.pages;
-          if (allowedPages.indexOf(node.id) === -1 && allowedPages.indexOf(node.name.trim()) === -1) {
+          if (!allowedPages.includes(node.id) && !allowedPages.includes(node.name.trim())) {
             return;
           }
         } else {

package/lib/import/figma/nodes.mjs

@@ -62,7 +62,7 @@ function getFigmaIconNodes(document, options) {
         const newParents = parents.concat([parentItem]);
         if (!parents.length && options.pages) {
           const allowedPages = options.pages;
-          if (allowedPages.indexOf(node.id) === -1 && allowedPages.indexOf(node.name.trim()) === -1) {
+          if (!allowedPages.includes(node.id) && !allowedPages.includes(node.name.trim())) {
             return;
           }
         } else {

package/lib/misc/compare-dirs.cjs

@@ -35,7 +35,7 @@ async function compareDirectories(dir1, dir2, options) {
   );
   for (let i = 0; i < files1.length; i++) {
     const file = files1[i];
-    if (files2.indexOf(file) === -1) {
+    if (!files2.includes(file)) {
       return false;
     }
     const ext = file.split(".").pop().toLowerCase();
@@ -54,8 +54,8 @@ async function compareDirectories(dir1, dir2, options) {
       continue;
     }
     if (ignoreNewLine) {
-      content1 = content1.replace(/\s+\n/g, "\n").trimRight();
-      content2 = content2.replace(/\s+\n/g, "\n").trimRight();
+      content1 = content1.replace(/\s+\n/g, "\n").trimEnd();
+      content2 = content2.replace(/\s+\n/g, "\n").trimEnd();
     }
     if (ignoreVersions && file.split("/").pop() === "package.json") {
       const data1 = JSON.parse(content1);

package/lib/misc/compare-dirs.mjs

@@ -33,7 +33,7 @@ async function compareDirectories(dir1, dir2, options) {
   );
   for (let i = 0; i < files1.length; i++) {
     const file = files1[i];
-    if (files2.indexOf(file) === -1) {
+    if (!files2.includes(file)) {
       return false;
     }
     const ext = file.split(".").pop().toLowerCase();
@@ -52,8 +52,8 @@ async function compareDirectories(dir1, dir2, options) {
       continue;
     }
     if (ignoreNewLine) {
-      content1 = content1.replace(/\s+\n/g, "\n").trimRight();
-      content2 = content2.replace(/\s+\n/g, "\n").trimRight();
+      content1 = content1.replace(/\s+\n/g, "\n").trimEnd();
+      content2 = content2.replace(/\s+\n/g, "\n").trimEnd();
     }
     if (ignoreVersions && file.split("/").pop() === "package.json") {
       const data1 = JSON.parse(content1);

package/lib/optimise/flags.cjs

@@ -223,7 +223,7 @@ function cleanPath(path) {
             if (index < 1) {
               break;
             }
-            if (item.params[index - 1].indexOf(".") !== -1) {
+            if (item.params[index - 1].includes(".")) {
               break;
             }
           default:

package/lib/optimise/flags.mjs

@@ -221,7 +221,7 @@ function cleanPath(path) {
             if (index < 1) {
               break;
             }
-            if (item.params[index - 1].indexOf(".") !== -1) {
+            if (item.params[index - 1].includes(".")) {
               break;
             }
           default:

package/lib/optimise/global-style.cjs

@@ -93,7 +93,7 @@ function cleanupGlobalStyle(svg) {
               break;
             case "class": {
               const className = $element.attr("class");
-              if (className && getClassList(className).indexOf(value) !== -1) {
+              if (className && getClassList(className).includes(value)) {
                 return true;
               }
             }

package/lib/optimise/global-style.mjs

@@ -91,7 +91,7 @@ function cleanupGlobalStyle(svg) {
               break;
             case "class": {
               const className = $element.attr("class");
-              if (className && getClassList(className).indexOf(value) !== -1) {
+              if (className && getClassList(className).includes(value)) {
                 return true;
               }
             }

package/lib/optimise/svgo.cjs

@@ -30,7 +30,7 @@ function getSVGOPlugins(options) {
     ...options.animated ? [] : ["removeUselessStrokeAndFill"],
     // Plugins that modify shapes or are bugged when using animations
     ...options.animated || options.keepShapes ? [] : [
-      // 'removeHiddenElems', // bugged: not working before 3.0.4, breaks some icons since 3.0.4
+      "removeHiddenElems",
       "convertShapeToPath",
       "convertEllipseToCircle",
       {
@@ -60,7 +60,7 @@ function runSVGO(svg, options = {}) {
   if (options.plugins) {
     plugins = options.plugins;
   } else {
-    const animated = code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1;
+    const animated = code.includes("<animate") || code.includes("<set");
     plugins = getSVGOPlugins({
       ...options,
       animated

package/lib/optimise/svgo.mjs

@@ -28,7 +28,7 @@ function getSVGOPlugins(options) {
     ...options.animated ? [] : ["removeUselessStrokeAndFill"],
     // Plugins that modify shapes or are bugged when using animations
     ...options.animated || options.keepShapes ? [] : [
-      // 'removeHiddenElems', // bugged: not working before 3.0.4, breaks some icons since 3.0.4
+      "removeHiddenElems",
       "convertShapeToPath",
       "convertEllipseToCircle",
       {
@@ -58,7 +58,7 @@ function runSVGO(svg, options = {}) {
   if (options.plugins) {
     plugins = options.plugins;
   } else {
-    const animated = code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1;
+    const animated = code.includes("<animate") || code.includes("<set");
     plugins = getSVGOPlugins({
       ...options,
       animated

package/lib/svg/analyse.cjs

@@ -263,7 +263,7 @@ function analyseSVGStructure(svg, options = {}) {
     usedItems = usedItems.slice(0);
     usedItems.push(element._index);
     element._childElements?.forEach((childIndex) => {
-      if (usedItems.indexOf(childIndex) !== -1) {
+      if (usedItems.includes(childIndex)) {
         throw new Error("Recursion");
       }
       const childItem = {

package/lib/svg/analyse.mjs

@@ -261,7 +261,7 @@ function analyseSVGStructure(svg, options = {}) {
     usedItems = usedItems.slice(0);
     usedItems.push(element._index);
     element._childElements?.forEach((childIndex) => {
-      if (usedItems.indexOf(childIndex) !== -1) {
+      if (usedItems.includes(childIndex)) {
         throw new Error("Recursion");
       }
       const childItem = {

package/lib/svg/cleanup/svgo-style.cjs

@@ -26,7 +26,7 @@ function convertStyleToAttrs(svg) {
       // Attributes / properties now allowed
       svg_data_attributes.badAttributes.has(prop) || svg_data_attributes.badSoftwareAttributes.has(prop) || svg_data_attributes.badAttributePrefixes.has(prop.split("-").shift())
     ) {
-      return void 0;
+      return;
     }
     hasStyle = true;
     return item.value;

package/lib/svg/cleanup/svgo-style.mjs

@@ -24,7 +24,7 @@ function convertStyleToAttrs(svg) {
       // Attributes / properties now allowed
       badAttributes.has(prop) || badSoftwareAttributes.has(prop) || badAttributePrefixes.has(prop.split("-").shift())
     ) {
-      return void 0;
+      return;
     }
     hasStyle = true;
     return item.value;

package/lib/svg/index.cjs

@@ -31,7 +31,7 @@ class SVG {
     if (customisations) {
       const data = utils.iconToSVG(this.getIcon(), customisations);
       let svgAttributes = ' xmlns="http://www.w3.org/2000/svg"';
-      if (data.body.indexOf("xlink:") !== -1) {
+      if (data.body.includes("xlink:")) {
         svgAttributes += ' xmlns:xlink="http://www.w3.org/1999/xlink"';
       }
       for (const key in data.attributes) {

package/lib/svg/index.mjs

@@ -15,7 +15,7 @@ class SVG {
     if (customisations) {
       const data = iconToSVG(this.getIcon(), customisations);
       let svgAttributes = ' xmlns="http://www.w3.org/2000/svg"';
-      if (data.body.indexOf("xlink:") !== -1) {
+      if (data.body.includes("xlink:")) {
         svgAttributes += ' xmlns:xlink="http://www.w3.org/1999/xlink"';
       }
       for (const key in data.attributes) {

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
   "author": "Vjacheslav Trushkin",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.8",
   "publishConfig": {
     "tag": "next"
   },
@@ -26,7 +26,7 @@
     "extract-zip": "^2.0.1",
     "local-pkg": "^0.4.3",
     "pathe": "^1.1.1",
-    "svgo": "^3.0.4",
+    "svgo": "3.0.5",
     "tar": "^6.2.0"
   },
   "devDependencies": {