@iconify/tools 2.1.2 → 2.2.0-beta.2

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,8 +1,7 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svgo = require('svgo');
+const id = require('@iconify/utils/lib/svg/id');
 
 function getSVGOPlugins(options) {
   return [
@@ -45,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 = {}) {
@@ -77,7 +68,19 @@ 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
+      );
+    }
+  }
   svg.load(content);
 }
 

package/lib/optimise/svgo.d.ts

@@ -1,19 +1,19 @@
-import { Plugin } from 'svgo';
+import { PluginConfig } from 'svgo';
 import { SVG } from '../svg/index.js';
 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): Plugin[];
+declare function getSVGOPlugins(options: GetSVGOPluginOptions): PluginConfig[];
 /**
  * Options
  */
@@ -21,7 +21,7 @@ interface SVGOCommonOptions {
     multipass?: boolean;
 }
 interface SVGOOptionsWithPlugin extends SVGOCommonOptions {
-    plugins: Plugin[];
+    plugins: PluginConfig[];
 }
 interface SVGOptionsWithoutPlugin extends SVGOCommonOptions, CleanupIDsOption {
     plugins?: undefined;

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,19 @@ 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
+      );
+    }
+  }
   svg.load(content);
 }
 

package/lib/svg/analyse/error.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 function analyseTagError(element) {
   let result = "<" + element.tagName;
   if (element._id) {

package/lib/svg/analyse.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svg_parse = require('./parse.cjs');
 const svg_data_attributes = require('./data/attributes.cjs');
 const svg_data_tags = require('./data/tags.cjs');

package/lib/svg/cleanup/attribs.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svg_data_attributes = require('../data/attributes.cjs');
 const svg_data_tags = require('../data/tags.cjs');
 const svg_parse = require('../parse.cjs');

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

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svg_parse = require('../parse.cjs');
 const svg_data_tags = require('../data/tags.cjs');
 

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

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const css_parse = require('../../css/parse.cjs');
 const svg_data_attributes = require('../data/attributes.cjs');
 const svg_parse = require('../parse.cjs');

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

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svg_parseStyle = require('../parse-style.cjs');
 require('../../css/parse.cjs');
 require('../../css/parser/tokens.cjs');

package/lib/svg/cleanup/root-svg.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svg_data_attributes = require('../data/attributes.cjs');
 const svg_data_tags = require('../data/tags.cjs');
 

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

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svg_data_attributes = require('../data/attributes.cjs');
 const svg_parseStyle = require('../parse-style.cjs');
 const optimise_svgo = require('../../optimise/svgo.cjs');
@@ -15,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

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svg_cleanup_attribs = require('./cleanup/attribs.cjs');
 const svg_cleanup_badTags = require('./cleanup/bad-tags.cjs');
 const svg_cleanup_inlineStyle = require('./cleanup/inline-style.cjs');
@@ -21,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/lib/svg/data/attributes.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const svg_data_tags = require('./tags.cjs');
 
 const badAttributes = /* @__PURE__ */ new Set([

package/lib/svg/data/tags.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const badTags = /* @__PURE__ */ new Set([
   "foreignObject",
   "script",

package/lib/svg/index.cjs

@@ -1,14 +1,8 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const cheerio = require('cheerio');
 const utils = require('@iconify/utils');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
-
-const cheerio__default = /*#__PURE__*/_interopDefaultLegacy(cheerio);
-
 class SVG {
   constructor(content) {
     this.load(content);
@@ -90,7 +84,7 @@ class SVG {
     );
     remove('xml:space="preserve"', "", "");
     content = content.replace(/<g>\s*<\/g>/g, "");
-    this.$svg = cheerio__default.load(content.trim(), {
+    this.$svg = cheerio.load(content.trim(), {
       lowerCaseAttributeNames: false,
       xmlMode: true
     });

package/lib/svg/parse-style.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const css_parse = require('../css/parse.cjs');
 const css_parser_export = require('../css/parser/export.cjs');
 const css_parser_tokens = require('../css/parser/tokens.cjs');

package/lib/svg/parse.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 async function parseSVG(svg, callback) {
   async function checkNode(element, parents) {
     if (element.type !== "tag") {