@iconify/tools 2.1.0-beta.5 → 2.1.0-beta.6

package/lib/import/directory.cjs

@@ -27,11 +27,12 @@ require('../css/parser/tokens.cjs');
 require('../css/parser/error.cjs');
 require('../css/parser/strings.cjs');
 require('../css/parser/text.cjs');
-require('../svg/cleanup/root-svg.cjs');
-require('../svg/cleanup/svgo-style.cjs');
+require('../svg/cleanup/root-style.cjs');
 require('../svg/parse-style.cjs');
 require('../css/parser/export.cjs');
 require('../css/parser/tree.cjs');
+require('../svg/cleanup/root-svg.cjs');
+require('../svg/cleanup/svgo-style.cjs');
 require('../optimise/svgo.cjs');
 require('svgo');
 

package/lib/import/directory.mjs

@@ -23,11 +23,12 @@ import '../css/parser/tokens.mjs';
 import '../css/parser/error.mjs';
 import '../css/parser/strings.mjs';
 import '../css/parser/text.mjs';
-import '../svg/cleanup/root-svg.mjs';
-import '../svg/cleanup/svgo-style.mjs';
+import '../svg/cleanup/root-style.mjs';
 import '../svg/parse-style.mjs';
 import '../css/parser/export.mjs';
 import '../css/parser/tree.mjs';
+import '../svg/cleanup/root-svg.mjs';
+import '../svg/cleanup/svgo-style.mjs';
 import '../optimise/svgo.mjs';
 import 'svgo';
 

package/lib/import/figma/index.cjs

@@ -26,11 +26,12 @@ require('../../css/parser/tokens.cjs');
 require('../../css/parser/error.cjs');
 require('../../css/parser/strings.cjs');
 require('../../css/parser/text.cjs');
-require('../../svg/cleanup/root-svg.cjs');
-require('../../svg/cleanup/svgo-style.cjs');
+require('../../svg/cleanup/root-style.cjs');
 require('../../svg/parse-style.cjs');
 require('../../css/parser/export.cjs');
 require('../../css/parser/tree.cjs');
+require('../../svg/cleanup/root-svg.cjs');
+require('../../svg/cleanup/svgo-style.cjs');
 require('../../optimise/svgo.cjs');
 require('svgo');
 require('../../download/api/index.cjs');

package/lib/import/figma/index.mjs

@@ -22,11 +22,12 @@ import '../../css/parser/tokens.mjs';
 import '../../css/parser/error.mjs';
 import '../../css/parser/strings.mjs';
 import '../../css/parser/text.mjs';
-import '../../svg/cleanup/root-svg.mjs';
-import '../../svg/cleanup/svgo-style.mjs';
+import '../../svg/cleanup/root-style.mjs';
 import '../../svg/parse-style.mjs';
 import '../../css/parser/export.mjs';
 import '../../css/parser/tree.mjs';
+import '../../svg/cleanup/root-svg.mjs';
+import '../../svg/cleanup/svgo-style.mjs';
 import '../../optimise/svgo.mjs';
 import 'svgo';
 import '../../download/api/index.mjs';

package/lib/index.cjs

@@ -9,6 +9,7 @@ const svg_analyse = require('./svg/analyse.cjs');
 const svg_cleanup = require('./svg/cleanup.cjs');
 const svg_cleanup_attribs = require('./svg/cleanup/attribs.cjs');
 const svg_cleanup_badTags = require('./svg/cleanup/bad-tags.cjs');
+const svg_cleanup_rootStyle = require('./svg/cleanup/root-style.cjs');
 const svg_cleanup_inlineStyle = require('./svg/cleanup/inline-style.cjs');
 const svg_cleanup_rootSvg = require('./svg/cleanup/root-svg.cjs');
 const svg_cleanup_svgoStyle = require('./svg/cleanup/svgo-style.cjs');
@@ -95,6 +96,7 @@ exports.analyseSVGStructure = svg_analyse.analyseSVGStructure;
 exports.cleanupSVG = svg_cleanup.cleanupSVG;
 exports.removeBadAttributes = svg_cleanup_attribs.removeBadAttributes;
 exports.checkBadTags = svg_cleanup_badTags.checkBadTags;
+exports.cleanupRootStyle = svg_cleanup_rootStyle.cleanupRootStyle;
 exports.cleanupInlineStyle = svg_cleanup_inlineStyle.cleanupInlineStyle;
 exports.cleanupSVGRoot = svg_cleanup_rootSvg.cleanupSVGRoot;
 exports.convertStyleToAttrs = svg_cleanup_svgoStyle.convertStyleToAttrs;

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export { analyseSVGStructure } from './svg/analyse.js';
 export { cleanupSVG } from './svg/cleanup.js';
 export { removeBadAttributes } from './svg/cleanup/attribs.js';
 export { checkBadTags } from './svg/cleanup/bad-tags.js';
+export { cleanupRootStyle } from './svg/cleanup/root-style.js';
 export { cleanupInlineStyle } from './svg/cleanup/inline-style.js';
 export { cleanupSVGRoot } from './svg/cleanup/root-svg.js';
 export { convertStyleToAttrs } from './svg/cleanup/svgo-style.js';

package/lib/index.mjs

@@ -5,6 +5,7 @@ export { analyseSVGStructure } from './svg/analyse.mjs';
 export { cleanupSVG } from './svg/cleanup.mjs';
 export { removeBadAttributes } from './svg/cleanup/attribs.mjs';
 export { checkBadTags } from './svg/cleanup/bad-tags.mjs';
+export { cleanupRootStyle } from './svg/cleanup/root-style.mjs';
 export { cleanupInlineStyle } from './svg/cleanup/inline-style.mjs';
 export { cleanupSVGRoot } from './svg/cleanup/root-svg.mjs';
 export { convertStyleToAttrs } from './svg/cleanup/svgo-style.mjs';

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

@@ -0,0 +1,24 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const svg_parseStyle = require('../parse-style.cjs');
+require('../../css/parse.cjs');
+require('../../css/parser/tokens.cjs');
+require('../../css/parser/error.cjs');
+require('../../css/parser/strings.cjs');
+require('../../css/parser/text.cjs');
+require('../../css/parser/export.cjs');
+require('../../css/parser/tree.cjs');
+require('../parse.cjs');
+
+function cleanupRootStyle(svg) {
+  return svg_parseStyle.parseSVGStyle(svg, (item) => {
+    if (item.type === "global" && item.selectorTokens.find((token) => token.type === "at-rule")) {
+      return;
+    }
+    return item.value;
+  });
+}
+
+exports.cleanupRootStyle = cleanupRootStyle;

package/lib/svg/cleanup/root-style.d.ts

@@ -0,0 +1,16 @@
+import { SVG } from '../index.js';
+import { parseSVGStyle } from '../parse-style.js';
+import '../../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
+import '../../css/parser/types.js';
+import '../parse.js';
+import '../../misc/cheerio.js';
+
+/**
+ * Clean up root style
+ *
+ * This function removes all at-rule tokens, such as `@font-face`, `@media`
+ */
+declare function cleanupRootStyle(svg: SVG): ReturnType<typeof parseSVGStyle>;
+
+export { cleanupRootStyle };

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

@@ -0,0 +1,20 @@
+import { parseSVGStyle } from '../parse-style.mjs';
+import '../../css/parse.mjs';
+import '../../css/parser/tokens.mjs';
+import '../../css/parser/error.mjs';
+import '../../css/parser/strings.mjs';
+import '../../css/parser/text.mjs';
+import '../../css/parser/export.mjs';
+import '../../css/parser/tree.mjs';
+import '../parse.mjs';
+
+function cleanupRootStyle(svg) {
+  return parseSVGStyle(svg, (item) => {
+    if (item.type === "global" && item.selectorTokens.find((token) => token.type === "at-rule")) {
+      return;
+    }
+    return item.value;
+  });
+}
+
+export { cleanupRootStyle };

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const svg_data_attributes = require('../data/attributes.cjs');
 const svg_data_tags = require('../data/tags.cjs');
 
-async function cleanupSVGRoot(svg) {
+function cleanupSVGRoot(svg) {
   const cheerio = svg.$svg;
   const $root = svg.$svg(":root");
   const root = $root.get(0);
@@ -26,7 +26,7 @@ async function cleanupSVGRoot(svg) {
       case "height":
         if (value.slice(-2) === "px") {
           const num = value.replace("px", "");
-          if (parseFloat(num) + "" === num) {
+          if (parseFloat(num).toString() === num) {
             $root.attr(attr, num);
           }
         }

package/lib/svg/cleanup/root-svg.d.ts

@@ -5,6 +5,6 @@ import '@iconify/utils/lib/customisations/defaults';
 /**
  * Clean up SVG
  */
-declare function cleanupSVGRoot(svg: SVG): Promise<void>;
+declare function cleanupSVGRoot(svg: SVG): void;
 
 export { cleanupSVGRoot };

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

@@ -1,7 +1,7 @@
 import { commonAttributes, badAttributes, junkSVGAttributes, badSoftwareAttributes, badAttributePrefixes, tagSpecificNonPresentationalAttributes, tagSpecificPresentationalAttributes, stylingAttributes } from '../data/attributes.mjs';
 import { reusableElementsWithPalette, maskTags } from '../data/tags.mjs';
 
-async function cleanupSVGRoot(svg) {
+function cleanupSVGRoot(svg) {
   const cheerio = svg.$svg;
   const $root = svg.$svg(":root");
   const root = $root.get(0);
@@ -22,7 +22,7 @@ async function cleanupSVGRoot(svg) {
       case "height":
         if (value.slice(-2) === "px") {
           const num = value.replace("px", "");
-          if (parseFloat(num) + "" === num) {
+          if (parseFloat(num).toString() === num) {
             $root.attr(attr, num);
           }
         }

package/lib/svg/cleanup.cjs

@@ -5,6 +5,7 @@ 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');
+const svg_cleanup_rootStyle = require('./cleanup/root-style.cjs');
 const svg_cleanup_rootSvg = require('./cleanup/root-svg.cjs');
 const svg_cleanup_svgoStyle = require('./cleanup/svgo-style.cjs');
 require('./data/attributes.cjs');
@@ -24,9 +25,10 @@ require('svgo');
 async function cleanupSVG(svg) {
   await svg_cleanup_inlineStyle.cleanupInlineStyle(svg);
   await svg_cleanup_svgoStyle.convertStyleToAttrs(svg);
-  await svg_cleanup_rootSvg.cleanupSVGRoot(svg);
+  svg_cleanup_rootSvg.cleanupSVGRoot(svg);
   await svg_cleanup_badTags.checkBadTags(svg);
   await svg_cleanup_attribs.removeBadAttributes(svg);
+  await svg_cleanup_rootStyle.cleanupRootStyle(svg);
 }
 
 exports.cleanupSVG = cleanupSVG;

package/lib/svg/cleanup.mjs

@@ -1,6 +1,7 @@
 import { removeBadAttributes } from './cleanup/attribs.mjs';
 import { checkBadTags } from './cleanup/bad-tags.mjs';
 import { cleanupInlineStyle } from './cleanup/inline-style.mjs';
+import { cleanupRootStyle } from './cleanup/root-style.mjs';
 import { cleanupSVGRoot } from './cleanup/root-svg.mjs';
 import { convertStyleToAttrs } from './cleanup/svgo-style.mjs';
 import './data/attributes.mjs';
@@ -20,9 +21,10 @@ import 'svgo';
 async function cleanupSVG(svg) {
   await cleanupInlineStyle(svg);
   await convertStyleToAttrs(svg);
-  await cleanupSVGRoot(svg);
+  cleanupSVGRoot(svg);
   await checkBadTags(svg);
   await removeBadAttributes(svg);
+  await cleanupRootStyle(svg);
 }
 
 export { cleanupSVG };

package/lib/svg/parse-style.cjs

@@ -16,7 +16,7 @@ async function parseSVGStyle(svg, callback) {
     const tagName = item.tagName;
     const $element = item.$element;
     if (tagName === "style") {
-      const content = $element.html();
+      const content = $element.text();
       if (typeof content !== "string") {
         $element.remove();
         return;

package/lib/svg/parse-style.mjs

@@ -12,7 +12,7 @@ async function parseSVGStyle(svg, callback) {
     const tagName = item.tagName;
     const $element = item.$element;
     if (tagName === "style") {
-      const content = $element.html();
+      const content = $element.text();
       if (typeof content !== "string") {
         $element.remove();
         return;

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.1.0-beta.5",
+	"version": "2.1.0-beta.6",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -368,6 +368,10 @@
 			"require": "./lib/svg/cleanup/inline-style.cjs",
 			"import": "./lib/svg/cleanup/inline-style.mjs"
 		},
+		"./lib/svg/cleanup/root-style": {
+			"require": "./lib/svg/cleanup/root-style.cjs",
+			"import": "./lib/svg/cleanup/root-style.mjs"
+		},
 		"./lib/svg/cleanup/root-svg": {
 			"require": "./lib/svg/cleanup/root-svg.cjs",
 			"import": "./lib/svg/cleanup/root-svg.mjs"