@iconify/tools 2.0.2 → 2.0.6

package/lib/download/github/index.js

@@ -19,7 +19,7 @@ async function findMatchingDirs(rootDir, hash) {
             lastChunk !== hash.slice(0, lastChunk.length)) {
             continue;
         }
-        const stat = await fs_1.promises.lstat(rootDir + '/' + file);
+        const stat = await fs_1.promises.stat(rootDir + '/' + file);
         if (stat.isDirectory()) {
             matches.push(file);
         }
@@ -41,7 +41,7 @@ async function downloadGitHubRepo(options) {
     // Check if archive exists
     let exists = false;
     try {
-        const stat = await fs_1.promises.lstat(archiveTarget);
+        const stat = await fs_1.promises.stat(archiveTarget);
         exists = stat.isFile();
     }
     catch (err) {
@@ -71,8 +71,10 @@ async function downloadGitHubRepo(options) {
         const stat = await fs_1.promises.lstat(filename);
         const isDir = stat.isDirectory();
         if (
-        // Remove if directory matches hash to avoid errors extracting zip
-        (isDir && filename.slice(0 - hashSearch.length) === hashSearch) ||
+        // Remove symbolic links
+        stat.isSymbolicLink() ||
+            // Remove if directory matches hash to avoid errors extracting zip
+            (isDir && filename.slice(0 - hashSearch.length) === hashSearch) ||
             // Remove if directory and cleanupOldDirectories is not disabled
             (isDir && options.cleanupOldDirectories !== false) ||
             // Remove if file and cleanupOldFiles is enabled

package/lib/download/github/index.mjs

@@ -15,7 +15,7 @@ async function findMatchingDirs(rootDir, hash) {
     if (lastChunk.length < 4 || lastChunk !== hash.slice(0, lastChunk.length)) {
       continue;
     }
-    const stat = await fs.lstat(rootDir + "/" + file);
+    const stat = await fs.stat(rootDir + "/" + file);
     if (stat.isDirectory()) {
       matches.push(file);
     }
@@ -32,7 +32,7 @@ async function downloadGitHubRepo(options) {
   const archiveTarget = rootDir + "/" + hash + ".zip";
   let exists = false;
   try {
-    const stat = await fs.lstat(archiveTarget);
+    const stat = await fs.stat(archiveTarget);
     exists = stat.isFile();
   } catch (err) {
   }
@@ -56,7 +56,7 @@ async function downloadGitHubRepo(options) {
     const filename = rootDir + "/" + files[i];
     const stat = await fs.lstat(filename);
     const isDir = stat.isDirectory();
-    if (isDir && filename.slice(0 - hashSearch.length) === hashSearch || isDir && options.cleanupOldDirectories !== false || !isDir && options.cleanupOldFiles) {
+    if (stat.isSymbolicLink() || isDir && filename.slice(0 - hashSearch.length) === hashSearch || isDir && options.cleanupOldDirectories !== false || !isDir && options.cleanupOldFiles) {
       try {
         await fs.rm(filename, {
           force: true,

package/lib/download/npm/index.js

@@ -36,7 +36,7 @@ async function downloadNPMPackage(options) {
     // Check if archive exists
     let archiveExists = false;
     try {
-        const stat = await fs_1.promises.lstat(archiveTarget);
+        const stat = await fs_1.promises.stat(archiveTarget);
         archiveExists = stat.isFile();
     }
     catch (err) {

package/lib/download/npm/index.mjs

@@ -29,7 +29,7 @@ async function downloadNPMPackage(options) {
   await prepareDirectoryForExport(options);
   let archiveExists = false;
   try {
-    const stat = await fs.lstat(archiveTarget);
+    const stat = await fs.stat(archiveTarget);
     archiveExists = stat.isFile();
   } catch (err) {
   }

package/lib/icon-set/index.js

@@ -8,7 +8,7 @@ const minify_1 = require("@iconify/utils/lib/icon-set/minify");
 const convert_info_1 = require("@iconify/utils/lib/icon-set/convert-info");
 const props_1 = require("./props");
 const svg_1 = require("../svg");
-// eslint-disable-next-line @typescript-eslint/no-unused-vars-experimental, @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function assertNever(v) {
     //
 }

package/lib/icon-set/merge.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeIconSets = void 0;
 const _1 = require(".");
 const match_1 = require("./match");
-// eslint-disable-next-line @typescript-eslint/no-unused-vars-experimental, @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function assertNever(v) {
     //
 }

package/lib/misc/scan.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import type { Stats } from 'fs';
 /**
  * Callback
  *
@@ -13,8 +15,8 @@
  */
 declare type ScanDirectoryCallbackFalseResult = boolean | null | undefined;
 declare type ScanDirectoryCallbackStringResult = ScanDirectoryCallbackFalseResult | string;
-declare type ScanDirectoryCallbackAsString = (ext: string, file: string, subdir: string, path: string) => ScanDirectoryCallbackStringResult | Promise<ScanDirectoryCallbackStringResult>;
-declare type ScanDirectoryCallbackAsCustom<T> = (ext: string, file: string, subdir: string, path: string) => T | ScanDirectoryCallbackFalseResult | Promise<T | ScanDirectoryCallbackFalseResult>;
+declare type ScanDirectoryCallbackAsString = (ext: string, file: string, subdir: string, path: string, stat: Stats) => ScanDirectoryCallbackStringResult | Promise<ScanDirectoryCallbackStringResult>;
+declare type ScanDirectoryCallbackAsCustom<T> = (ext: string, file: string, subdir: string, path: string, stat: Stats) => T | ScanDirectoryCallbackFalseResult | Promise<T | ScanDirectoryCallbackFalseResult>;
 export declare type ScanDirectoryCallback = ScanDirectoryCallbackAsCustom<unknown> | ScanDirectoryCallbackAsString;
 /**
  * Find all files in directory

package/lib/misc/scan.js

@@ -15,7 +15,7 @@ async function scanDirectory(path, callback, subdirs = true) {
                 // Exclude hidden items
                 continue;
             }
-            const stat = await fs_1.promises.lstat(path + subdir + filename);
+            const stat = await fs_1.promises.stat(path + subdir + filename);
             if (stat.isDirectory()) {
                 if (subdirs) {
                     await scan(subdir + filename + '/');
@@ -31,7 +31,7 @@ async function scanDirectory(path, callback, subdirs = true) {
             // Callback
             let callbackResult;
             if (callback) {
-                callbackResult = callback(ext, file, subdir, path);
+                callbackResult = callback(ext, file, subdir, path, stat);
                 if (callbackResult instanceof Promise) {
                     callbackResult = await callbackResult;
                 }

package/lib/misc/scan.mjs

@@ -12,7 +12,7 @@ async function scanDirectory(path, callback, subdirs = true) {
       if (filename.slice(0, 1) === ".") {
         continue;
       }
-      const stat = await fs.lstat(path + subdir + filename);
+      const stat = await fs.stat(path + subdir + filename);
       if (stat.isDirectory()) {
         if (subdirs) {
           await scan(subdir + filename + "/");
@@ -27,7 +27,7 @@ async function scanDirectory(path, callback, subdirs = true) {
       const file = parts.join(".");
       let callbackResult;
       if (callback) {
-        callbackResult = callback(ext, file, subdir, path);
+        callbackResult = callback(ext, file, subdir, path, stat);
         if (callbackResult instanceof Promise) {
           callbackResult = await callbackResult;
         }

package/lib/optimise/svgo.js

@@ -52,6 +52,8 @@ exports.shapeModifiyingSVGOPlugins = [
  * Run SVGO on icon
  */
 async function runSVGO(svg, options = {}) {
+    // Code
+    const code = svg.toString();
     // Options
     const multipass = options.multipass !== false;
     // Plugins list
@@ -60,14 +62,21 @@ async function runSVGO(svg, options = {}) {
         plugins = options.plugins;
     }
     else {
-        plugins = exports.defaultSVGOPlugins.concat(options.keepShapes ? [] : exports.shapeModifiyingSVGOPlugins, options.cleanupIDs !== false
+        // Check for animations: convertShapeToPath and removeHiddenElems plugins currently might ruin animations
+        let keepShapes = options.keepShapes;
+        if (keepShapes === void 0 &&
+            (code.indexOf('<animate') !== -1 || code.indexOf('<set') !== -1)) {
+            // Do not check animations: just assume they might break
+            keepShapes = true;
+        }
+        plugins = exports.defaultSVGOPlugins.concat(keepShapes ? [] : exports.shapeModifiyingSVGOPlugins, options.cleanupIDs !== false
             ? [
                 {
                     name: 'cleanupIDs',
                     params: {
                         prefix: typeof options.cleanupIDs === 'string'
                             ? options.cleanupIDs
-                            : 'svg-',
+                            : 'svgID',
                     },
                 },
             ]
@@ -79,7 +88,7 @@ async function runSVGO(svg, options = {}) {
         multipass,
     };
     // Load data (changing type because SVGO types do not include error ?????)
-    const result = (0, svgo_1.optimize)(svg.toString(), pluginOptions);
+    const result = (0, svgo_1.optimize)(code, pluginOptions);
     if (typeof result.error === 'string') {
         throw new Error(result.error);
     }

package/lib/optimise/svgo.mjs

@@ -44,16 +44,21 @@ var shapeModifiyingSVGOPlugins = [
   "reusePaths"
 ];
 async function runSVGO(svg, options = {}) {
+  const code = svg.toString();
   const multipass = options.multipass !== false;
   let plugins;
   if (options.plugins) {
     plugins = options.plugins;
   } else {
-    plugins = defaultSVGOPlugins.concat(options.keepShapes ? [] : shapeModifiyingSVGOPlugins, options.cleanupIDs !== false ? [
+    let keepShapes = options.keepShapes;
+    if (keepShapes === void 0 && (code.indexOf("<animate") !== -1 || code.indexOf("<set") !== -1)) {
+      keepShapes = true;
+    }
+    plugins = defaultSVGOPlugins.concat(keepShapes ? [] : shapeModifiyingSVGOPlugins, options.cleanupIDs !== false ? [
       {
         name: "cleanupIDs",
         params: {
-          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svg-"
+          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
         }
       }
     ] : []);
@@ -62,7 +67,7 @@ async function runSVGO(svg, options = {}) {
     plugins,
     multipass
   };
-  const result = optimize(svg.toString(), pluginOptions);
+  const result = optimize(code, pluginOptions);
   if (typeof result.error === "string") {
     throw new Error(result.error);
   }

package/lib/svg/cleanup/bad-tags.js

@@ -17,8 +17,6 @@ requiredParentTags.set(tags_1.filterTag, tags_1.filterChildTags);
 requiredParentTags.set(tags_1.defsTag, tags_1.tagsInsideDefs);
 // <stop> must be inside gradient
 requiredParentTags.set(tags_1.gradientTags, tags_1.gradientChildTags);
-// Animations must be inside shapes or filters
-requiredParentTags.set(tags_1.tagsBeforeAnimation, tags_1.animateTags);
 // <mpath> must be inside <animateMotion>
 requiredParentTags.set(new Set(['animateMotion']), tags_1.animateMotionChildTags);
 /**

package/lib/svg/cleanup/bad-tags.mjs

@@ -3,7 +3,6 @@ import { parseSVG } from "../parse.mjs";
 import {
   allValidTags,
   animateMotionChildTags,
-  animateTags,
   badTags,
   defsTag,
   feComponentTransferChildTag,
@@ -14,7 +13,6 @@ import {
   filterTag,
   gradientChildTags,
   gradientTags,
-  tagsBeforeAnimation,
   tagsInsideDefs,
   unsupportedTags
 } from "../data/tags.mjs";
@@ -25,7 +23,6 @@ requiredParentTags.set(feLightningTags, feLightningChildTags);
 requiredParentTags.set(filterTag, filterChildTags);
 requiredParentTags.set(defsTag, tagsInsideDefs);
 requiredParentTags.set(gradientTags, gradientChildTags);
-requiredParentTags.set(tagsBeforeAnimation, animateTags);
 requiredParentTags.set(new Set(["animateMotion"]), animateMotionChildTags);
 async function checkBadTags(svg) {
   await parseSVG(svg, (item) => {

package/lib/svg/data/tags.d.ts

@@ -79,10 +79,6 @@ export declare const feMergeChildTags: Set<string>;
  * Tags that can be used only inside <defs>
  */
 export declare const tagsInsideDefs: Set<string>;
-/**
- * Parent tags for animations
- */
-export declare const tagsBeforeAnimation: Set<string>;
 /**
  * All supported tags
  */

package/lib/svg/data/tags.js

@@ -4,7 +4,7 @@
  * Icons cannot have anything that requires external resources, anything that renders inconsistently.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allValidTags = exports.tagsBeforeAnimation = exports.tagsInsideDefs = exports.feMergeChildTags = exports.feLightningChildTags = exports.feComponentTransferChildTag = exports.filterChildTags = exports.feLightningTags = exports.filterTag = exports.patternTag = exports.gradientChildTags = exports.gradientTags = exports.animateMotionChildTags = exports.animateTags = exports.markerTag = exports.groupTag = exports.useTag = exports.shapeTags = exports.maskAndSymbolTags = exports.defsTag = exports.styleTag = exports.unsupportedTags = exports.badTags = void 0;
+exports.allValidTags = exports.tagsInsideDefs = exports.feMergeChildTags = exports.feLightningChildTags = exports.feComponentTransferChildTag = exports.filterChildTags = exports.feLightningTags = exports.filterTag = exports.patternTag = exports.gradientChildTags = exports.gradientTags = exports.animateMotionChildTags = exports.animateTags = exports.markerTag = exports.groupTag = exports.useTag = exports.shapeTags = exports.maskAndSymbolTags = exports.defsTag = exports.styleTag = exports.unsupportedTags = exports.badTags = void 0;
 /**
  * Bad tags
  *
@@ -153,14 +153,6 @@ exports.tagsInsideDefs = new Set([
     ...exports.patternTag,
     ...exports.markerTag,
 ]);
-/**
- * Parent tags for animations
- */
-exports.tagsBeforeAnimation = new Set([
-    ...exports.shapeTags,
-    ...exports.filterChildTags,
-    ...exports.feComponentTransferChildTag,
-]);
 /**
  * All supported tags
  */

package/lib/svg/data/tags.mjs

@@ -85,11 +85,6 @@ var tagsInsideDefs = new Set([
   ...patternTag,
   ...markerTag
 ]);
-var tagsBeforeAnimation = new Set([
-  ...shapeTags,
-  ...filterChildTags,
-  ...feComponentTransferChildTag
-]);
 var allValidTags = new Set([
   ...styleTag,
   ...defsTag,
@@ -129,7 +124,6 @@ export {
   patternTag,
   shapeTags,
   styleTag,
-  tagsBeforeAnimation,
   tagsInsideDefs,
   unsupportedTags,
   useTag

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@iconify/tools",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.0.2",
+	"version": "2.0.6",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -22,16 +22,16 @@
 		"test": "npm run test:jest && npm run test:jasmine"
 	},
 	"dependencies": {
-		"@iconify/utils": "^1.0.20",
+		"@iconify/utils": "^1.0.21",
 		"@types/cheerio": "^0.22.30",
 		"@types/node-fetch": "^2.5.12",
 		"@types/svgo": "^2.6.0",
 		"@types/tar": "^6.1.0",
 		"cheerio": "^1.0.0-rc.10",
 		"extract-zip": "^2.0.1",
-		"node-fetch": "^2.6.6",
+		"node-fetch": "^2.6.7",
 		"pathe": "^0.2.0",
-		"svgo": "^2.7.0",
+		"svgo": "^2.8.0",
 		"tar": "^6.1.11"
 	},
 	"exports": {