@iconify/tools 2.2.1 → 2.2.3

package/lib/export/json-package.cjs

@@ -96,7 +96,9 @@ async function exportJSONPackage(iconSet, options) {
     if (data !== void 0) {
       await misc_writeJson.writeJSONFile(`${dir}/${jsonFilename}`, data);
       cjsImports.push(`const ${attr} = require('${relativeFile}');`);
-      mjsImports.push(`import ${attr} from '${relativeFile}';`);
+      mjsImports.push(
+        `import ${attr} from '${relativeFile}' assert { type: 'json' };`
+      );
       packageJSONIconSet[attr] = attr + ".json";
       packageJSONExports[relativeFile] = relativeFile;
     } else {

package/lib/export/json-package.mjs

@@ -94,7 +94,9 @@ async function exportJSONPackage(iconSet, options) {
     if (data !== void 0) {
       await writeJSONFile(`${dir}/${jsonFilename}`, data);
       cjsImports.push(`const ${attr} = require('${relativeFile}');`);
-      mjsImports.push(`import ${attr} from '${relativeFile}';`);
+      mjsImports.push(
+        `import ${attr} from '${relativeFile}' assert { type: 'json' };`
+      );
       packageJSONIconSet[attr] = attr + ".json";
       packageJSONExports[relativeFile] = relativeFile;
     } else {

package/lib/import/figma/nodes.cjs

@@ -55,7 +55,8 @@ function getFigmaIconNodes(document, options) {
     switch (parentNodeType) {
       case "CANVAS":
       case "FRAME":
-      case "GROUP": {
+      case "GROUP":
+      case "SECTION": {
         const parentItem = {
           ...node,
           type: parentNodeType

package/lib/import/figma/nodes.mjs

@@ -53,7 +53,8 @@ function getFigmaIconNodes(document, options) {
     switch (parentNodeType) {
       case "CANVAS":
       case "FRAME":
-      case "GROUP": {
+      case "GROUP":
+      case "SECTION": {
         const parentItem = {
           ...node,
           type: parentNodeType

package/lib/import/figma/types/nodes.d.ts

@@ -7,7 +7,7 @@ import '../../../icon-set/types.js';
 import '../../../svg/index.js';
 import '@iconify/utils/lib/icon-set/tree';
 
-type FigmaImportParentNodeType = 'CANVAS' | 'FRAME' | 'GROUP';
+type FigmaImportParentNodeType = 'CANVAS' | 'FRAME' | 'GROUP' | 'SECTION';
 type FigmaImportIconNodeType = IconFigmaNode['type'];
 /**
  * Node information passed to callback

package/lib/optimise/global-style.cjs

@@ -39,6 +39,7 @@ async function cleanupGlobalStyle(svg) {
       });
     });
   });
+  const removeClasses = /* @__PURE__ */ new Set();
   try {
     await svg_parseStyle.parseSVGStyle(svg, async (styleItem) => {
       const returnValue = styleItem.value;
@@ -123,28 +124,26 @@ async function cleanupGlobalStyle(svg) {
         );
         containsTempAttr = true;
       });
-      const classMatches = matches.filter((item) => item.type === "class").map((item) => item.value);
-      if (classMatches.length && styleItem.nextTokens[0]?.type === "close") {
-        await svg_parse.parseSVG(svg, (svgItem) => {
-          const $element = svgItem.$element;
-          if (!isMatch("", $element)) {
-            return;
-          }
-          const classList = getClassList($element.attr("class"));
-          if (!classList) {
-            return;
-          }
-          const filtered = classList.filter(
-            (item) => classMatches.indexOf(item) === -1
-          );
-          if (!filtered.length) {
-            $element.removeAttr("class");
-          } else {
-            $element.attr("class", filtered.join(" "));
-          }
-        });
+      matches.forEach((match) => {
+        if (match.type === "class") {
+          removeClasses.add(match.value);
+        }
+      });
+    });
+    await svg_parse.parseSVG(svg, (svgItem) => {
+      const $element = svgItem.$element;
+      const classList = getClassList($element.attr("class"));
+      if (!classList) {
+        return;
+      }
+      const filtered = classList.filter(
+        (item) => !removeClasses.has(item)
+      );
+      if (!filtered.length) {
+        $element.removeAttr("class");
+      } else {
+        $element.attr("class", filtered.join(" "));
       }
-      return;
     });
     if (containsTempAttr) {
       await svg_parse.parseSVG(svg, (item) => {

package/lib/optimise/global-style.mjs

@@ -37,6 +37,7 @@ async function cleanupGlobalStyle(svg) {
       });
     });
   });
+  const removeClasses = /* @__PURE__ */ new Set();
   try {
     await parseSVGStyle(svg, async (styleItem) => {
       const returnValue = styleItem.value;
@@ -121,28 +122,26 @@ async function cleanupGlobalStyle(svg) {
         );
         containsTempAttr = true;
       });
-      const classMatches = matches.filter((item) => item.type === "class").map((item) => item.value);
-      if (classMatches.length && styleItem.nextTokens[0]?.type === "close") {
-        await parseSVG(svg, (svgItem) => {
-          const $element = svgItem.$element;
-          if (!isMatch("", $element)) {
-            return;
-          }
-          const classList = getClassList($element.attr("class"));
-          if (!classList) {
-            return;
-          }
-          const filtered = classList.filter(
-            (item) => classMatches.indexOf(item) === -1
-          );
-          if (!filtered.length) {
-            $element.removeAttr("class");
-          } else {
-            $element.attr("class", filtered.join(" "));
-          }
-        });
+      matches.forEach((match) => {
+        if (match.type === "class") {
+          removeClasses.add(match.value);
+        }
+      });
+    });
+    await parseSVG(svg, (svgItem) => {
+      const $element = svgItem.$element;
+      const classList = getClassList($element.attr("class"));
+      if (!classList) {
+        return;
+      }
+      const filtered = classList.filter(
+        (item) => !removeClasses.has(item)
+      );
+      if (!filtered.length) {
+        $element.removeAttr("class");
+      } else {
+        $element.attr("class", filtered.join(" "));
       }
-      return;
     });
     if (containsTempAttr) {
       await parseSVG(svg, (item) => {

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.1",
+  "version": "2.2.3",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",
@@ -16,7 +16,7 @@
   "types": "./lib/index.d.ts",
   "dependencies": {
     "@iconify/types": "^2.0.0",
-    "@iconify/utils": "^2.0.12",
+    "@iconify/utils": "^2.1.0",
     "@types/cheerio": "^0.22.31",
     "@types/node-fetch": "^2.6.2",
     "@types/tar": "^6.1.3",