@iconify/tools 2.0.9 → 2.0.13

package/lib/svg/parse-style.d.ts

@@ -1,4 +1,5 @@
 import type { SVG } from '.';
+import type { CSSRuleToken, CSSToken } from '../css/parser/types';
 import { ParseSVGCallbackItem } from './parse';
 /**
  * Item in callback
@@ -13,6 +14,11 @@ interface ParseSVGStyleCallbackItemInline extends ParseSVGStyleCallbackItemCommo
 }
 interface ParseSVGStyleCallbackItemGlobal extends ParseSVGStyleCallbackItemCommon {
     type: 'global';
+    token: CSSRuleToken;
+    selectors: string[];
+    selectorTokens: CSSToken[];
+    prevTokens: (CSSToken | null)[];
+    nextTokens: CSSToken[];
 }
 export declare type ParseSVGStyleCallbackItem = ParseSVGStyleCallbackItemInline | ParseSVGStyleCallbackItemGlobal;
 /**
@@ -23,12 +29,6 @@ export declare type ParseSVGStyleCallbackResult = string | undefined;
  * Callback function
  */
 export declare type ParseSVGStyleCallback = (item: ParseSVGStyleCallbackItem) => ParseSVGStyleCallbackResult | Promise<ParseSVGStyleCallbackResult>;
-/**
- * Options
- */
-interface ParseSVGStyleOptions {
-    skipMasks?: boolean;
-}
 /**
  * Parse styles in SVG
  *
@@ -36,5 +36,5 @@ interface ParseSVGStyleOptions {
  * Callback should return new value (string) or undefined to remove rule.
  * Callback can be asynchronous.
  */
-export declare function parseSVGStyle(svg: SVG, callback: ParseSVGStyleCallback, options?: ParseSVGStyleOptions): Promise<void>;
+export declare function parseSVGStyle(svg: SVG, callback: ParseSVGStyleCallback): Promise<void>;
 export {};

package/lib/svg/parse-style.js

@@ -5,7 +5,6 @@ const parse_1 = require("../css/parse");
 const export_1 = require("../css/parser/export");
 const tokens_1 = require("../css/parser/tokens");
 const tree_1 = require("../css/parser/tree");
-const tags_1 = require("./data/tags");
 const parse_2 = require("./parse");
 /**
  * Parse styles in SVG
@@ -14,7 +13,7 @@ const parse_2 = require("./parse");
  * Callback should return new value (string) or undefined to remove rule.
  * Callback can be asynchronous.
  */
-async function parseSVGStyle(svg, callback, options = {}) {
+async function parseSVGStyle(svg, callback) {
     return (0, parse_2.parseSVG)(svg, async (item) => {
         const tagName = item.tagName;
         const $element = item.$element;
@@ -32,18 +31,43 @@ async function parseSVGStyle(svg, callback, options = {}) {
             }
             // Parse all tokens
             let changed = false;
+            const selectorStart = [];
             const newTokens = [];
             for (let i = 0; i < tokens.length; i++) {
                 const token = tokens[i];
+                switch (token.type) {
+                    case 'selector':
+                    case 'at-rule':
+                        selectorStart.push(newTokens.length);
+                        break;
+                    case 'close':
+                        selectorStart.pop();
+                        break;
+                }
                 if (token.type !== 'rule') {
                     newTokens.push(token);
                     continue;
                 }
                 const value = token.value;
+                const selectorTokens = selectorStart
+                    .map((index) => newTokens[index])
+                    .filter((item) => item !== null);
                 let result = callback({
                     type: 'global',
                     prop: token.prop,
                     value,
+                    token,
+                    selectorTokens,
+                    selectors: selectorTokens.reduce((prev, current) => {
+                        switch (current.type) {
+                            case 'selector': {
+                                return prev.concat(current.selectors);
+                            }
+                        }
+                        return prev;
+                    }, []),
+                    prevTokens: newTokens,
+                    nextTokens: tokens.slice(i + 1),
                 });
                 if (result instanceof Promise) {
                     result = await result;
@@ -64,7 +88,7 @@ async function parseSVGStyle(svg, callback, options = {}) {
                 return;
             }
             // Update style
-            const tree = (0, tree_1.tokensTree)(newTokens);
+            const tree = (0, tree_1.tokensTree)(newTokens.filter((token) => token !== null));
             if (!tree.length) {
                 // Empty
                 $element.remove();
@@ -74,10 +98,6 @@ async function parseSVGStyle(svg, callback, options = {}) {
             item.$element.text(newContent);
             return;
         }
-        // Skip masks
-        if (options.skipMasks && tags_1.maskAndSymbolTags.has(tagName)) {
-            return;
-        }
         // Parse style
         const attribs = item.element.attribs;
         if (attribs.style === void 0) {

package/lib/svg/parse-style.mjs

@@ -3,9 +3,8 @@ import { parseInlineStyle } from "../css/parse.mjs";
 import { tokensToString } from "../css/parser/export.mjs";
 import { getTokens } from "../css/parser/tokens.mjs";
 import { tokensTree } from "../css/parser/tree.mjs";
-import { maskAndSymbolTags } from "./data/tags.mjs";
 import { parseSVG } from "./parse.mjs";
-async function parseSVGStyle(svg, callback, options = {}) {
+async function parseSVGStyle(svg, callback) {
   return parseSVG(svg, async (item) => {
     const tagName = item.tagName;
     const $element = item.$element;
@@ -20,18 +19,41 @@ async function parseSVGStyle(svg, callback, options = {}) {
         throw new Error("Error parsing style");
       }
       let changed2 = false;
+      const selectorStart = [];
       const newTokens = [];
       for (let i = 0; i < tokens.length; i++) {
         const token = tokens[i];
+        switch (token.type) {
+          case "selector":
+          case "at-rule":
+            selectorStart.push(newTokens.length);
+            break;
+          case "close":
+            selectorStart.pop();
+            break;
+        }
         if (token.type !== "rule") {
           newTokens.push(token);
           continue;
         }
         const value = token.value;
+        const selectorTokens = selectorStart.map((index) => newTokens[index]).filter((item2) => item2 !== null);
         let result = callback({
           type: "global",
           prop: token.prop,
-          value
+          value,
+          token,
+          selectorTokens,
+          selectors: selectorTokens.reduce((prev, current) => {
+            switch (current.type) {
+              case "selector": {
+                return prev.concat(current.selectors);
+              }
+            }
+            return prev;
+          }, []),
+          prevTokens: newTokens,
+          nextTokens: tokens.slice(i + 1)
         });
         if (result instanceof Promise) {
           result = await result;
@@ -49,7 +71,7 @@ async function parseSVGStyle(svg, callback, options = {}) {
       if (!changed2) {
         return;
       }
-      const tree = tokensTree(newTokens);
+      const tree = tokensTree(newTokens.filter((token) => token !== null));
       if (!tree.length) {
         $element.remove();
         return;
@@ -58,9 +80,6 @@ async function parseSVGStyle(svg, callback, options = {}) {
       item.$element.text(newContent);
       return;
     }
-    if (options.skipMasks && maskAndSymbolTags.has(tagName)) {
-      return;
-    }
     const attribs = item.element.attribs;
     if (attribs.style === void 0) {
       return;

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.9",
+	"version": "2.0.13",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -22,7 +22,7 @@
 		"test": "npm run test:jest && npm run test:jasmine"
 	},
 	"dependencies": {
-		"@iconify/utils": "^1.0.21",
+		"@iconify/utils": "^1.0.23",
 		"@types/cheerio": "^0.22.30",
 		"@types/node-fetch": "^2.5.12",
 		"@types/svgo": "^2.6.0",
@@ -120,6 +120,10 @@
 			"require": "./lib/download/git/index.js",
 			"import": "./lib/download/git/index.mjs"
 		},
+		"./lib/download/git/reset": {
+			"require": "./lib/download/git/reset.js",
+			"import": "./lib/download/git/reset.mjs"
+		},
 		"./lib/download/github/hash": {
 			"require": "./lib/download/github/hash.js",
 			"import": "./lib/download/github/hash.mjs"
@@ -312,6 +316,10 @@
 			"require": "./lib/optimise/flags.js",
 			"import": "./lib/optimise/flags.mjs"
 		},
+		"./lib/optimise/global-style": {
+			"require": "./lib/optimise/global-style.js",
+			"import": "./lib/optimise/global-style.mjs"
+		},
 		"./lib/optimise/scale": {
 			"require": "./lib/optimise/scale.js",
 			"import": "./lib/optimise/scale.mjs"
@@ -320,6 +328,18 @@
 			"require": "./lib/optimise/svgo.js",
 			"import": "./lib/optimise/svgo.mjs"
 		},
+		"./lib/svg/analyse": {
+			"require": "./lib/svg/analyse.js",
+			"import": "./lib/svg/analyse.mjs"
+		},
+		"./lib/svg/analyse/error": {
+			"require": "./lib/svg/analyse/error.js",
+			"import": "./lib/svg/analyse/error.mjs"
+		},
+		"./lib/svg/analyse/types": {
+			"require": "./lib/svg/analyse/types.js",
+			"import": "./lib/svg/analyse/types.mjs"
+		},
 		"./lib/svg/cleanup": {
 			"require": "./lib/svg/cleanup.js",
 			"import": "./lib/svg/cleanup.mjs"