@iconify/tools 2.2.0-beta.1 → 2.2.0-beta.3

package/lib/download/git/index.cjs

@@ -15,6 +15,7 @@ require('../../svg/data/tags.cjs');
 require('../../svg/cleanup/bad-tags.cjs');
 require('../../svg/parse.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
 require('@iconify/utils/lib/icon-set/minify');

package/lib/download/git/index.mjs

@@ -13,6 +13,7 @@ import '../../svg/data/tags.mjs';
 import '../../svg/cleanup/bad-tags.mjs';
 import '../../svg/parse.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
 import '@iconify/utils/lib/icon-set/minify';

package/lib/download/git/reset.cjs

@@ -6,6 +6,7 @@ require('../../svg/data/attributes.cjs');
 require('../../svg/data/tags.cjs');
 require('../../svg/cleanup/bad-tags.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
 require('@iconify/utils/lib/icon-set/minify');

package/lib/download/git/reset.mjs

@@ -4,6 +4,7 @@ import '../../svg/data/attributes.mjs';
 import '../../svg/data/tags.mjs';
 import '../../svg/cleanup/bad-tags.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
 import '@iconify/utils/lib/icon-set/minify';

package/lib/download/index.cjs

@@ -30,6 +30,7 @@ require('../svg/data/tags.cjs');
 require('../svg/cleanup/bad-tags.cjs');
 require('../svg/parse.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
 require('@iconify/utils/lib/icon-set/minify');

package/lib/download/index.mjs

@@ -28,6 +28,7 @@ import '../svg/data/tags.mjs';
 import '../svg/cleanup/bad-tags.mjs';
 import '../svg/parse.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
 import '@iconify/utils/lib/icon-set/minify';

package/lib/import/directory.cjs

@@ -33,6 +33,7 @@ require('../svg/cleanup/root-svg.cjs');
 require('../svg/cleanup/svgo-style.cjs');
 require('../optimise/svgo.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 
 async function importDirectory(path, options = {}) {
   const files = await misc_scan.scanDirectory(path, (ext, file, subdir, path2) => {

package/lib/import/directory.mjs

@@ -31,6 +31,7 @@ import '../svg/cleanup/root-svg.mjs';
 import '../svg/cleanup/svgo-style.mjs';
 import '../optimise/svgo.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 
 async function importDirectory(path, options = {}) {
   const files = await scanDirectory(path, (ext, file, subdir, path2) => {

package/lib/import/figma/index.cjs

@@ -32,6 +32,7 @@ require('../../svg/cleanup/root-svg.cjs');
 require('../../svg/cleanup/svgo-style.cjs');
 require('../../optimise/svgo.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 require('../../download/api/index.cjs');
 require('node-fetch');
 require('../../download/api/cache.cjs');

package/lib/import/figma/index.mjs

@@ -30,6 +30,7 @@ import '../../svg/cleanup/root-svg.mjs';
 import '../../svg/cleanup/svgo-style.mjs';
 import '../../optimise/svgo.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 import '../../download/api/index.mjs';
 import 'node-fetch';
 import '../../download/api/cache.mjs';

package/lib/index.cjs

@@ -61,6 +61,7 @@ require('./svg/data/attributes.cjs');
 require('./svg/data/tags.cjs');
 require('./svg/analyse/error.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
 require('@iconify/utils/lib/icon-set/minify');

package/lib/index.mjs

@@ -59,6 +59,7 @@ import './svg/data/attributes.mjs';
 import './svg/data/tags.mjs';
 import './svg/analyse/error.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
 import '@iconify/utils/lib/icon-set/minify';

package/lib/optimise/scale.cjs

@@ -2,6 +2,7 @@
 
 const optimise_svgo = require('./svgo.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 
 function scaleSVG(svg, scale) {
   const viewBox = svg.viewBox;

package/lib/optimise/scale.mjs

@@ -1,5 +1,6 @@
 import { runSVGO } from './svgo.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 
 function scaleSVG(svg, scale) {
   const viewBox = svg.viewBox;

package/lib/optimise/svgo.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 const svgo = require('svgo');
+const id = require('@iconify/utils/lib/svg/id');
 
 function getSVGOPlugins(options) {
   return [
@@ -43,15 +44,7 @@ function getSVGOPlugins(options) {
         }
       },
       "reusePaths"
-    ],
-    ...options.cleanupIDs !== false ? [
-      {
-        name: "cleanupIds",
-        params: {
-          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
-        }
-      }
-    ] : []
+    ]
   ];
 }
 function runSVGO(svg, options = {}) {
@@ -75,7 +68,27 @@ function runSVGO(svg, options = {}) {
   if (typeof result.error === "string") {
     throw new Error(result.error);
   }
-  const content = result.data.replace(/<defs\/>/g, "");
+  let content = result.data.replace(/<defs\/>/g, "");
+  if (!options.plugins) {
+    const prefix = options.cleanupIDs !== void 0 ? options.cleanupIDs : "svgID";
+    if (prefix !== false) {
+      let counter = 0;
+      content = id.replaceIDs(
+        content,
+        typeof prefix === "string" ? () => {
+          return prefix + (counter++).toString(36);
+        } : prefix
+      );
+    }
+  }
+  if (!options.plugins || options.plugins.find((item) => {
+    if (typeof item === "string") {
+      return item === "reusePaths";
+    }
+    return item.name === "reusePaths";
+  })) {
+    content = content.replace(' xmlns:xlink="http://www.w3.org/1999/xlink"', "").replaceAll("xlink:href=", "href=");
+  }
   svg.load(content);
 }
 

package/lib/optimise/svgo.d.ts

@@ -4,16 +4,16 @@ import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 
 interface CleanupIDsOption {
-    cleanupIDs?: string | false;
+    cleanupIDs?: string | ((id: string) => string) | false;
 }
-interface GetSVGOPluingOptions extends CleanupIDsOption {
+interface GetSVGOPluginOptions extends CleanupIDsOption {
     animated?: boolean;
     keepShapes?: boolean;
 }
 /**
  * Get list of plugins
  */
-declare function getSVGOPlugins(options: GetSVGOPluingOptions): PluginConfig[];
+declare function getSVGOPlugins(options: GetSVGOPluginOptions): PluginConfig[];
 /**
  * Options
  */

package/lib/optimise/svgo.mjs

@@ -1,4 +1,5 @@
 import { optimize } from 'svgo';
+import { replaceIDs } from '@iconify/utils/lib/svg/id';
 
 function getSVGOPlugins(options) {
   return [
@@ -41,15 +42,7 @@ function getSVGOPlugins(options) {
         }
       },
       "reusePaths"
-    ],
-    ...options.cleanupIDs !== false ? [
-      {
-        name: "cleanupIds",
-        params: {
-          prefix: typeof options.cleanupIDs === "string" ? options.cleanupIDs : "svgID"
-        }
-      }
-    ] : []
+    ]
   ];
 }
 function runSVGO(svg, options = {}) {
@@ -73,7 +66,27 @@ function runSVGO(svg, options = {}) {
   if (typeof result.error === "string") {
     throw new Error(result.error);
   }
-  const content = result.data.replace(/<defs\/>/g, "");
+  let content = result.data.replace(/<defs\/>/g, "");
+  if (!options.plugins) {
+    const prefix = options.cleanupIDs !== void 0 ? options.cleanupIDs : "svgID";
+    if (prefix !== false) {
+      let counter = 0;
+      content = replaceIDs(
+        content,
+        typeof prefix === "string" ? () => {
+          return prefix + (counter++).toString(36);
+        } : prefix
+      );
+    }
+  }
+  if (!options.plugins || options.plugins.find((item) => {
+    if (typeof item === "string") {
+      return item === "reusePaths";
+    }
+    return item.name === "reusePaths";
+  })) {
+    content = content.replace(' xmlns:xlink="http://www.w3.org/1999/xlink"', "").replaceAll("xlink:href=", "href=");
+  }
   svg.load(content);
 }
 

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

@@ -13,6 +13,7 @@ require('../../css/parser/export.cjs');
 require('../../css/parser/tree.cjs');
 require('../parse.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 
 async function convertStyleToAttrs(svg) {
   let hasStyle = false;

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

@@ -11,6 +11,7 @@ import '../../css/parser/export.mjs';
 import '../../css/parser/tree.mjs';
 import '../parse.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 
 async function convertStyleToAttrs(svg) {
   let hasStyle = false;

package/lib/svg/cleanup.cjs

@@ -19,6 +19,7 @@ require('../css/parser/export.cjs');
 require('../css/parser/tree.cjs');
 require('../optimise/svgo.cjs');
 require('svgo');
+require('@iconify/utils/lib/svg/id');
 
 async function cleanupSVG(svg) {
   await svg_cleanup_inlineStyle.cleanupInlineStyle(svg);

package/lib/svg/cleanup.mjs

@@ -17,6 +17,7 @@ import '../css/parser/export.mjs';
 import '../css/parser/tree.mjs';
 import '../optimise/svgo.mjs';
 import 'svgo';
+import '@iconify/utils/lib/svg/id';
 
 async function cleanupSVG(svg) {
   await cleanupInlineStyle(svg);

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": "2.2.0-beta.1",
+  "version": "2.2.0-beta.3",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",
@@ -15,7 +15,7 @@
   "module": "./lib/index.mjs",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@iconify/utils": "^2.0.5",
+    "@iconify/utils": "^2.0.9",
     "@types/cheerio": "^0.22.31",
     "@types/node-fetch": "^2.6.2",
     "@types/tar": "^6.1.3",