@iconify/tools 2.2.6 → 3.0.0-beta.2

package/lib/misc/scan.mjs

@@ -1,15 +1,31 @@
-import { promises } from 'fs';
+import { promises, readdirSync, statSync } from 'fs';
 
-async function scanDirectory(path, callback, subdirs = true) {
-  const results = [];
+function cleanPath(path) {
   if (path.length && path.slice(-1) !== "/") {
-    path += "/";
+    return path + "/";
   }
+  return path;
+}
+function isHidden(filename) {
+  return filename.slice(0, 1) === ".";
+}
+function split(filename) {
+  const parts = filename.split(".");
+  const ext = parts.length > 1 ? "." + parts.pop() : "";
+  const file = parts.join(".");
+  return { ext, file };
+}
+function isIgnoredResult(result) {
+  return result === void 0 || result === false || result === null;
+}
+async function scanDirectory(path, callback, subdirs = true) {
+  const results = [];
+  path = cleanPath(path);
   async function scan(subdir) {
     const files = await promises.readdir(path + subdir);
     for (let i = 0; i < files.length; i++) {
       const filename = files[i];
-      if (filename.slice(0, 1) === ".") {
+      if (isHidden(filename)) {
         continue;
       }
       const stat = await promises.stat(path + subdir + filename);
@@ -22,16 +38,14 @@ async function scanDirectory(path, callback, subdirs = true) {
       if (!stat.isFile()) {
         continue;
       }
-      const parts = filename.split(".");
-      const ext = parts.length > 1 ? "." + parts.pop() : "";
-      const file = parts.join(".");
+      const { ext, file } = split(filename);
       let callbackResult;
       if (callback) {
         callbackResult = callback(ext, file, subdir, path, stat);
         if (callbackResult instanceof Promise) {
           callbackResult = await callbackResult;
         }
-        if (callbackResult === void 0 || callbackResult === false || callbackResult === null) {
+        if (isIgnoredResult(callbackResult)) {
           continue;
         }
       } else {
@@ -45,5 +59,43 @@ async function scanDirectory(path, callback, subdirs = true) {
   await scan("");
   return results;
 }
+function scanDirectorySync(path, callback, subdirs = true) {
+  const results = [];
+  path = cleanPath(path);
+  function scan(subdir) {
+    const files = readdirSync(path + subdir);
+    for (let i = 0; i < files.length; i++) {
+      const filename = files[i];
+      if (isHidden(filename)) {
+        continue;
+      }
+      const stat = statSync(path + subdir + filename);
+      if (stat.isDirectory()) {
+        if (subdirs) {
+          scan(subdir + filename + "/");
+        }
+        continue;
+      }
+      if (!stat.isFile()) {
+        continue;
+      }
+      const { ext, file } = split(filename);
+      let callbackResult;
+      if (callback) {
+        callbackResult = callback(ext, file, subdir, path, stat);
+        if (isIgnoredResult(callbackResult)) {
+          continue;
+        }
+      } else {
+        callbackResult = true;
+      }
+      results.push(
+        callbackResult === true ? subdir + filename : callbackResult
+      );
+    }
+  }
+  scan("");
+  return results;
+}
 
-export { scanDirectory };
+export { scanDirectory, scanDirectorySync };

package/lib/svg/analyse.cjs

@@ -5,7 +5,7 @@ const svg_data_attributes = require('./data/attributes.cjs');
 const svg_data_tags = require('./data/tags.cjs');
 const svg_analyse_error = require('./analyse/error.cjs');
 
-async function analyseSVGStructure(svg, options = {}) {
+function analyseSVGStructure(svg, options = {}) {
   const fixErrors = options.fixErrors;
   let root = svg.$svg(":root").get(0);
   if (root._parsed) {
@@ -83,7 +83,7 @@ async function analyseSVGStructure(svg, options = {}) {
     element._linksTo.push(link);
   }
   let index = 0;
-  await svg_parse.parseSVG(svg, (item) => {
+  svg_parse.parseSVGSync(svg, (item) => {
     const { tagName, parents } = item;
     if (svg_data_tags.styleTag.has(tagName)) {
       item.testChildren = false;

package/lib/svg/analyse.d.ts

@@ -8,6 +8,6 @@ import '@iconify/utils/lib/customisations/defaults';
  *
  * Before running this function run cleanup functions to change inline style to attributes and fix attributes
  */
-declare function analyseSVGStructure(svg: SVG, options?: AnalyseSVGStructureOptions): Promise<AnalyseSVGStructureResult>;
+declare function analyseSVGStructure(svg: SVG, options?: AnalyseSVGStructureOptions): AnalyseSVGStructureResult;
 
 export { analyseSVGStructure };

package/lib/svg/analyse.mjs

@@ -1,9 +1,9 @@
-import { parseSVG } from './parse.mjs';
+import { parseSVGSync } from './parse.mjs';
 import { tagSpecificNonPresentationalAttributes, urlPresentationalAttributes, commonColorPresentationalAttributes, markerAttributes } from './data/attributes.mjs';
-import { styleTag, maskTags, reusableElementsWithPalette, defsTag, useTag } from './data/tags.mjs';
+import { useTag, styleTag, maskTags, reusableElementsWithPalette, defsTag } from './data/tags.mjs';
 import { analyseTagError } from './analyse/error.mjs';
 
-async function analyseSVGStructure(svg, options = {}) {
+function analyseSVGStructure(svg, options = {}) {
   const fixErrors = options.fixErrors;
   let root = svg.$svg(":root").get(0);
   if (root._parsed) {
@@ -81,7 +81,7 @@ async function analyseSVGStructure(svg, options = {}) {
     element._linksTo.push(link);
   }
   let index = 0;
-  await parseSVG(svg, (item) => {
+  parseSVGSync(svg, (item) => {
     const { tagName, parents } = item;
     if (styleTag.has(tagName)) {
       item.testChildren = false;

package/lib/svg/cleanup/attribs.cjs

@@ -4,8 +4,8 @@ const svg_data_attributes = require('../data/attributes.cjs');
 const svg_data_tags = require('../data/tags.cjs');
 const svg_parse = require('../parse.cjs');
 
-async function removeBadAttributes(svg) {
-  await svg_parse.parseSVG(svg, (item) => {
+function removeBadAttributes(svg) {
+  svg_parse.parseSVGSync(svg, (item) => {
     const tagName = item.tagName;
     const attribs = item.element.attribs;
     const $element = item.$element;

package/lib/svg/cleanup/attribs.d.ts

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

package/lib/svg/cleanup/attribs.mjs

@@ -1,9 +1,9 @@
 import { badAttributes, badSoftwareAttributes, badAttributePrefixes, tagSpecificPresentationalAttributes } from '../data/attributes.mjs';
 import { defsTag } from '../data/tags.mjs';
-import { parseSVG } from '../parse.mjs';
+import { parseSVGSync } from '../parse.mjs';
 
-async function removeBadAttributes(svg) {
-  await parseSVG(svg, (item) => {
+function removeBadAttributes(svg) {
+  parseSVGSync(svg, (item) => {
     const tagName = item.tagName;
     const attribs = item.element.attribs;
     const $element = item.$element;

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

@@ -13,8 +13,8 @@ requiredParentTags.set(svg_data_tags.feLightningTags, svg_data_tags.feLightningC
 requiredParentTags.set(svg_data_tags.filterTag, svg_data_tags.filterChildTags);
 requiredParentTags.set(svg_data_tags.gradientTags, svg_data_tags.gradientChildTags);
 requiredParentTags.set(/* @__PURE__ */ new Set(["animateMotion"]), svg_data_tags.animateMotionChildTags);
-async function checkBadTags(svg) {
-  await svg_parse.parseSVG(svg, (item) => {
+function checkBadTags(svg) {
+  svg_parse.parseSVGSync(svg, (item) => {
     const tagName = item.tagName;
     const $element = item.$element;
     if (tagName === "svg") {

package/lib/svg/cleanup/bad-tags.d.ts

@@ -5,6 +5,6 @@ import '@iconify/utils/lib/customisations/defaults';
 /**
  * Test for bag tags
  */
-declare function checkBadTags(svg: SVG): Promise<void>;
+declare function checkBadTags(svg: SVG): void;
 
 export { checkBadTags };

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

@@ -1,4 +1,4 @@
-import { parseSVG } from '../parse.mjs';
+import { parseSVGSync } from '../parse.mjs';
 import { feComponentTransferChildTag, feMergeChildTags, feLightningTags, feLightningChildTags, filterTag, filterChildTags, gradientTags, gradientChildTags, animateMotionChildTags, unsupportedTags, badTags, allValidTags } from '../data/tags.mjs';
 
 const requiredParentTags = /* @__PURE__ */ new Map();
@@ -11,8 +11,8 @@ requiredParentTags.set(feLightningTags, feLightningChildTags);
 requiredParentTags.set(filterTag, filterChildTags);
 requiredParentTags.set(gradientTags, gradientChildTags);
 requiredParentTags.set(/* @__PURE__ */ new Set(["animateMotion"]), animateMotionChildTags);
-async function checkBadTags(svg) {
-  await parseSVG(svg, (item) => {
+function checkBadTags(svg) {
+  parseSVGSync(svg, (item) => {
     const tagName = item.tagName;
     const $element = item.$element;
     if (tagName === "svg") {

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

@@ -9,8 +9,8 @@ require('../../css/parser/strings.cjs');
 require('../../css/parser/text.cjs');
 require('../data/tags.cjs');
 
-async function cleanupInlineStyle(svg) {
-  await svg_parse.parseSVG(svg, (item) => {
+function cleanupInlineStyle(svg) {
+  svg_parse.parseSVGSync(svg, (item) => {
     const $element = item.$element;
     const attribs = item.element.attribs;
     const tagName = item.tagName;

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

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

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

@@ -1,14 +1,14 @@
 import { parseInlineStyle } from '../../css/parse.mjs';
 import { badAttributes, tagSpecificNonPresentationalAttributes, tagSpecificAnimatedAttributes, tagSpecificPresentationalAttributes, tagSpecificInlineStyles, insideClipPathAttributes, badSoftwareAttributes, badAttributePrefixes } from '../data/attributes.mjs';
-import { parseSVG } from '../parse.mjs';
+import { parseSVGSync } from '../parse.mjs';
 import '../../css/parser/tokens.mjs';
 import '../../css/parser/error.mjs';
 import '../../css/parser/strings.mjs';
 import '../../css/parser/text.mjs';
 import '../data/tags.mjs';
 
-async function cleanupInlineStyle(svg) {
-  await parseSVG(svg, (item) => {
+function cleanupInlineStyle(svg) {
+  parseSVGSync(svg, (item) => {
     const $element = item.$element;
     const attribs = item.element.attribs;
     const tagName = item.tagName;

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

@@ -11,16 +11,27 @@ require('../../css/parser/tree.cjs');
 require('../parse.cjs');
 
 function cleanupRootStyle(svg) {
-  return svg_parseStyle.parseSVGStyle(svg, (item) => {
-    if (
-      // If global style
-      item.type === "global" && // If selector tokens contain at-rule
-      item.selectorTokens.find((token) => token.type === "at-rule")
-    ) {
-      return;
+  const result = {};
+  svg_parseStyle.parseSVGStyleSync(svg, (item) => {
+    switch (item.type) {
+      case "inline":
+        return item.value;
+      case "global":
+        return item.value;
+      case "at-rule":
+        if (item.prop === "supports") {
+          return item.value;
+        }
+        (result.removedAtRules || (result.removedAtRules = /* @__PURE__ */ new Set())).add(item.prop);
+        return;
+      case "keyframes":
+        (result.animations || (result.animations = /* @__PURE__ */ new Set())).add(
+          item.value
+        );
+        return item.value;
     }
-    return item.value;
   });
+  return result;
 }
 
 exports.cleanupRootStyle = cleanupRootStyle;

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

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

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

@@ -1,4 +1,4 @@
-import { parseSVGStyle } from '../parse-style.mjs';
+import { parseSVGStyleSync } from '../parse-style.mjs';
 import '../../css/parse.mjs';
 import '../../css/parser/tokens.mjs';
 import '../../css/parser/error.mjs';
@@ -9,16 +9,27 @@ import '../../css/parser/tree.mjs';
 import '../parse.mjs';
 
 function cleanupRootStyle(svg) {
-  return parseSVGStyle(svg, (item) => {
-    if (
-      // If global style
-      item.type === "global" && // If selector tokens contain at-rule
-      item.selectorTokens.find((token) => token.type === "at-rule")
-    ) {
-      return;
+  const result = {};
+  parseSVGStyleSync(svg, (item) => {
+    switch (item.type) {
+      case "inline":
+        return item.value;
+      case "global":
+        return item.value;
+      case "at-rule":
+        if (item.prop === "supports") {
+          return item.value;
+        }
+        (result.removedAtRules || (result.removedAtRules = /* @__PURE__ */ new Set())).add(item.prop);
+        return;
+      case "keyframes":
+        (result.animations || (result.animations = /* @__PURE__ */ new Set())).add(
+          item.value
+        );
+        return item.value;
     }
-    return item.value;
   });
+  return result;
 }
 
 export { cleanupRootStyle };

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

@@ -15,9 +15,12 @@ require('../parse.cjs');
 require('svgo');
 require('@iconify/utils/lib/svg/id');
 
-async function convertStyleToAttrs(svg) {
+function convertStyleToAttrs(svg) {
   let hasStyle = false;
-  await svg_parseStyle.parseSVGStyle(svg, (item) => {
+  svg_parseStyle.parseSVGStyleSync(svg, (item) => {
+    if (item.type !== "inline" && item.type !== "global") {
+      return item.value;
+    }
     const prop = item.prop;
     if (
       // Attributes / properties now allowed

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

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

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

@@ -1,5 +1,5 @@
 import { badAttributes, badSoftwareAttributes, badAttributePrefixes } from '../data/attributes.mjs';
-import { parseSVGStyle } from '../parse-style.mjs';
+import { parseSVGStyleSync } from '../parse-style.mjs';
 import { runSVGO } from '../../optimise/svgo.mjs';
 import '../data/tags.mjs';
 import '../../css/parse.mjs';
@@ -13,9 +13,12 @@ import '../parse.mjs';
 import 'svgo';
 import '@iconify/utils/lib/svg/id';
 
-async function convertStyleToAttrs(svg) {
+function convertStyleToAttrs(svg) {
   let hasStyle = false;
-  await parseSVGStyle(svg, (item) => {
+  parseSVGStyleSync(svg, (item) => {
+    if (item.type !== "inline" && item.type !== "global") {
+      return item.value;
+    }
     const prop = item.prop;
     if (
       // Attributes / properties now allowed

package/lib/svg/cleanup.cjs

@@ -21,13 +21,13 @@ require('../optimise/svgo.cjs');
 require('svgo');
 require('@iconify/utils/lib/svg/id');
 
-async function cleanupSVG(svg) {
-  await svg_cleanup_inlineStyle.cleanupInlineStyle(svg);
-  await svg_cleanup_svgoStyle.convertStyleToAttrs(svg);
+function cleanupSVG(svg) {
+  svg_cleanup_inlineStyle.cleanupInlineStyle(svg);
+  svg_cleanup_svgoStyle.convertStyleToAttrs(svg);
   svg_cleanup_rootSvg.cleanupSVGRoot(svg);
-  await svg_cleanup_badTags.checkBadTags(svg);
-  await svg_cleanup_attribs.removeBadAttributes(svg);
-  await svg_cleanup_rootStyle.cleanupRootStyle(svg);
+  svg_cleanup_badTags.checkBadTags(svg);
+  svg_cleanup_attribs.removeBadAttributes(svg);
+  svg_cleanup_rootStyle.cleanupRootStyle(svg);
 }
 
 exports.cleanupSVG = cleanupSVG;

package/lib/svg/cleanup.d.ts

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

package/lib/svg/cleanup.mjs

@@ -19,13 +19,13 @@ import '../optimise/svgo.mjs';
 import 'svgo';
 import '@iconify/utils/lib/svg/id';
 
-async function cleanupSVG(svg) {
-  await cleanupInlineStyle(svg);
-  await convertStyleToAttrs(svg);
+function cleanupSVG(svg) {
+  cleanupInlineStyle(svg);
+  convertStyleToAttrs(svg);
   cleanupSVGRoot(svg);
-  await checkBadTags(svg);
-  await removeBadAttributes(svg);
-  await cleanupRootStyle(svg);
+  checkBadTags(svg);
+  removeBadAttributes(svg);
+  cleanupRootStyle(svg);
 }
 
 export { cleanupSVG };

package/lib/svg/index.cjs

@@ -3,6 +3,10 @@
 const cheerio = require('cheerio');
 const utils = require('@iconify/utils');
 
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const cheerio__default = /*#__PURE__*/_interopDefaultCompat(cheerio);
+
 class SVG {
   /**
    * Constructor
@@ -104,7 +108,7 @@ class SVG {
     );
     remove('xml:space="preserve"', "", "");
     content = content.replace(/<g>\s*<\/g>/g, "");
-    this.$svg = cheerio.load(content.trim(), {
+    this.$svg = cheerio__default.load(content.trim(), {
       lowerCaseAttributeNames: false,
       xmlMode: true
     });