@iconify/tools 4.0.0-dev.1 → 4.0.1

package/lib/svg/parse.cjs

@@ -1,11 +1,13 @@
 'use strict';
 
-function parse(svg, callback, done) {
-  function checkNode(element, parents, done2) {
+function parseSVG(svg, callback) {
+  const cheerio = svg.$svg;
+  const $root = svg.$svg(":root");
+  function checkNode(element, parents) {
     if (element.type !== "tag") {
-      return done2();
+      return;
     }
-    const $element = cheerio2(element);
+    const $element = cheerio(element);
     const tagName = element.tagName;
     const item = {
       tagName,
@@ -16,63 +18,29 @@ function parse(svg, callback, done) {
       testChildren: true,
       removeNode: false
     };
-    callback(item, () => {
-      const newParents = parents.slice(0);
-      newParents.unshift(item);
-      let queue = [];
-      if (tagName !== "style" && item.testChildren && !item.removeNode) {
-        const children = $element.children().toArray();
-        queue = children.slice(0);
-      }
-      const next = () => {
-        const queueItem = queue.shift();
-        if (!queueItem) {
-          if (item.removeNode) {
-            $element.remove();
-          }
-          return done2();
-        }
-        checkNode(queueItem, newParents, next);
-      };
-      next();
-    });
-  }
-  const cheerio2 = svg.$svg;
-  const $root = svg.$svg(":root");
-  checkNode($root.get(0), [], done);
-}
-function parseSVG(svg, callback) {
-  return new Promise((fulfill, reject) => {
-    parse(
-      svg,
-      (item, next) => {
-        const result = callback(item);
-        if (result instanceof Promise) {
-          result.then(next).catch(reject);
-        } else {
-          next();
-        }
-      },
-      fulfill
-    );
-  });
-}
-function parseSVGSync(svg, callback) {
-  let isSync = true;
-  parse(
-    svg,
-    (item, next) => {
-      callback(item);
-      next();
-    },
-    () => {
-      if (!isSync) {
-        throw new Error("parseSVGSync callback was async");
+    const callbackResult = callback(item);
+    if (callbackResult instanceof Promise) {
+      throw new Error("parseSVG does not support async callbacks");
+    }
+    const newParents = parents.slice(0);
+    newParents.unshift(item);
+    let queue = [];
+    if (tagName !== "style" && item.testChildren && !item.removeNode) {
+      const children = $element.children().toArray();
+      queue = children.slice(0);
+    }
+    while (queue.length) {
+      const queueItem = queue.shift();
+      if (!queueItem || item.removeNode) {
+        break;
       }
+      checkNode(queueItem, newParents);
+    }
+    if (item.removeNode) {
+      $element.remove();
     }
-  );
-  isSync = false;
+  }
+  checkNode($root.get(0), []);
 }
 
 exports.parseSVG = parseSVG;
-exports.parseSVGSync = parseSVGSync;

package/lib/svg/parse.d.cts

@@ -0,0 +1,30 @@
+import { CheerioElement, WrappedCheerioElement } from '../misc/cheerio.cjs';
+import { SVG } from './index.cjs';
+import 'cheerio';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations/defaults';
+
+/**
+ * Item in callback
+ */
+interface ParseSVGCallbackItem {
+    tagName: string;
+    element: CheerioElement;
+    $element: WrappedCheerioElement;
+    svg: SVG;
+    parents: ParseSVGCallbackItem[];
+    testChildren: boolean;
+    removeNode: boolean;
+}
+/**
+ * Callback function
+ */
+type ParseSVGCallback = (item: ParseSVGCallbackItem) => void;
+/**
+ * Parse SVG
+ *
+ * This function finds all elements in SVG and calls callback for each element.
+ */
+declare function parseSVG(svg: SVG, callback: ParseSVGCallback): void;
+
+export { type ParseSVGCallback, type ParseSVGCallbackItem, parseSVG };

package/lib/svg/parse.d.mts

@@ -0,0 +1,30 @@
+import { CheerioElement, WrappedCheerioElement } from '../misc/cheerio.mjs';
+import { SVG } from './index.mjs';
+import 'cheerio';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations/defaults';
+
+/**
+ * Item in callback
+ */
+interface ParseSVGCallbackItem {
+    tagName: string;
+    element: CheerioElement;
+    $element: WrappedCheerioElement;
+    svg: SVG;
+    parents: ParseSVGCallbackItem[];
+    testChildren: boolean;
+    removeNode: boolean;
+}
+/**
+ * Callback function
+ */
+type ParseSVGCallback = (item: ParseSVGCallbackItem) => void;
+/**
+ * Parse SVG
+ *
+ * This function finds all elements in SVG and calls callback for each element.
+ */
+declare function parseSVG(svg: SVG, callback: ParseSVGCallback): void;
+
+export { type ParseSVGCallback, type ParseSVGCallbackItem, parseSVG };

package/lib/svg/parse.d.ts

@@ -19,19 +19,12 @@ interface ParseSVGCallbackItem {
 /**
  * Callback function
  */
-type Callback<T> = (item: ParseSVGCallbackItem) => T;
-type ParseSVGCallback = Callback<void | Promise<void>>;
-type ParseSVGCallbackSync = Callback<void>;
+type ParseSVGCallback = (item: ParseSVGCallbackItem) => void;
 /**
  * Parse SVG
  *
  * This function finds all elements in SVG and calls callback for each element.
- * Callback can be asynchronous.
  */
-declare function parseSVG(svg: SVG, callback: ParseSVGCallback): Promise<void>;
-/**
- * Sync version
- */
-declare function parseSVGSync(svg: SVG, callback: ParseSVGCallbackSync): void;
+declare function parseSVG(svg: SVG, callback: ParseSVGCallback): void;
 
-export { ParseSVGCallback, ParseSVGCallbackItem, ParseSVGCallbackSync, parseSVG, parseSVGSync };
+export { type ParseSVGCallback, type ParseSVGCallbackItem, parseSVG };

package/lib/svg/parse.mjs

@@ -1,9 +1,11 @@
-function parse(svg, callback, done) {
-  function checkNode(element, parents, done2) {
+function parseSVG(svg, callback) {
+  const cheerio = svg.$svg;
+  const $root = svg.$svg(":root");
+  function checkNode(element, parents) {
     if (element.type !== "tag") {
-      return done2();
+      return;
     }
-    const $element = cheerio2(element);
+    const $element = cheerio(element);
     const tagName = element.tagName;
     const item = {
       tagName,
@@ -14,62 +16,29 @@ function parse(svg, callback, done) {
       testChildren: true,
       removeNode: false
     };
-    callback(item, () => {
-      const newParents = parents.slice(0);
-      newParents.unshift(item);
-      let queue = [];
-      if (tagName !== "style" && item.testChildren && !item.removeNode) {
-        const children = $element.children().toArray();
-        queue = children.slice(0);
-      }
-      const next = () => {
-        const queueItem = queue.shift();
-        if (!queueItem) {
-          if (item.removeNode) {
-            $element.remove();
-          }
-          return done2();
-        }
-        checkNode(queueItem, newParents, next);
-      };
-      next();
-    });
-  }
-  const cheerio2 = svg.$svg;
-  const $root = svg.$svg(":root");
-  checkNode($root.get(0), [], done);
-}
-function parseSVG(svg, callback) {
-  return new Promise((fulfill, reject) => {
-    parse(
-      svg,
-      (item, next) => {
-        const result = callback(item);
-        if (result instanceof Promise) {
-          result.then(next).catch(reject);
-        } else {
-          next();
-        }
-      },
-      fulfill
-    );
-  });
-}
-function parseSVGSync(svg, callback) {
-  let isSync = true;
-  parse(
-    svg,
-    (item, next) => {
-      callback(item);
-      next();
-    },
-    () => {
-      if (!isSync) {
-        throw new Error("parseSVGSync callback was async");
+    const callbackResult = callback(item);
+    if (callbackResult instanceof Promise) {
+      throw new Error("parseSVG does not support async callbacks");
+    }
+    const newParents = parents.slice(0);
+    newParents.unshift(item);
+    let queue = [];
+    if (tagName !== "style" && item.testChildren && !item.removeNode) {
+      const children = $element.children().toArray();
+      queue = children.slice(0);
+    }
+    while (queue.length) {
+      const queueItem = queue.shift();
+      if (!queueItem || item.removeNode) {
+        break;
       }
+      checkNode(queueItem, newParents);
+    }
+    if (item.removeNode) {
+      $element.remove();
     }
-  );
-  isSync = false;
+  }
+  checkNode($root.get(0), []);
 }
 
-export { parseSVG, parseSVGSync };
+export { parseSVG };

package/package.json

@@ -3,10 +3,7 @@
   "type": "module",
   "description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
   "author": "Vjacheslav Trushkin",
-  "version": "4.0.0-dev.1",
-  "publishConfig": {
-    "tag": "next"
-  },
+  "version": "4.0.1",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",
@@ -19,32 +16,31 @@
   "types": "./lib/index.d.ts",
   "dependencies": {
     "@iconify/types": "^2.0.0",
-    "@iconify/utils": "^2.1.12",
-    "@types/tar": "^6.1.10",
+    "@iconify/utils": "^2.1.22",
+    "@types/tar": "^6.1.11",
+    "axios": "^1.6.7",
     "cheerio": "1.0.0-rc.12",
     "extract-zip": "^2.0.1",
-    "local-pkg": "^0.4.3",
-    "pathe": "^1.1.1",
-    "svgo": "^3.0.4",
+    "local-pkg": "^0.5.0",
+    "pathe": "^1.1.2",
+    "svgo": "^3.2.0",
     "tar": "^6.2.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.10",
-    "@types/node": "^18.18.13",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.11.17",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^8.10.0",
-    "eslint-plugin-jasmine": "^4.1.3",
-    "eslint-plugin-prettier": "^4.2.1",
-    "jasmine": "^5.1.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.2",
-    "unbuild": "^1.2.1"
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.3.3",
+    "unbuild": "^2.0.0"
   },
   "exports": {
     "./*": "./*",
@@ -118,6 +114,11 @@
       "require": "./lib/download/api/cache.cjs",
       "import": "./lib/download/api/cache.mjs"
     },
+    "./lib/download/api/config": {
+      "types": "./lib/download/api/config.d.ts",
+      "require": "./lib/download/api/config.cjs",
+      "import": "./lib/download/api/config.mjs"
+    },
     "./lib/download/api/download": {
       "types": "./lib/download/api/download.d.ts",
       "require": "./lib/download/api/download.cjs",
@@ -133,6 +134,11 @@
       "require": "./lib/download/api/index.cjs",
       "import": "./lib/download/api/index.mjs"
     },
+    "./lib/download/api/queue": {
+      "types": "./lib/download/api/queue.d.ts",
+      "require": "./lib/download/api/queue.cjs",
+      "import": "./lib/download/api/queue.mjs"
+    },
     "./lib/download/api/types": {
       "types": "./lib/download/api/types.d.ts",
       "require": "./lib/download/api/types.cjs",
@@ -448,6 +454,11 @@
       "require": "./lib/optimise/svgo.cjs",
       "import": "./lib/optimise/svgo.mjs"
     },
+    "./lib/optimise/unwrap": {
+      "types": "./lib/optimise/unwrap.d.ts",
+      "require": "./lib/optimise/unwrap.cjs",
+      "import": "./lib/optimise/unwrap.mjs"
+    },
     "./lib/svg/analyse": {
       "types": "./lib/svg/analyse.d.ts",
       "require": "./lib/svg/analyse.cjs",
@@ -541,8 +552,7 @@
     "build": "unbuild",
     "test:jest-cjs": "jest --clearCache --config=jest.config.cjs && jest --runInBand --config=jest.config.cjs",
     "test:jest-esm": "cross-env NODE_OPTIONS=--experimental-vm-modules TEST_REMOTE=false jest --clearCache --config=jest.config.mjs && cross-env NODE_OPTIONS=--experimental-vm-modules npx jest --runInBand --config=jest.config.mjs",
-    "test:jasmine": "cross-env NODE_OPTIONS='--experimental-vm-modules --experimental-json-modules' npx jasmine",
-    "test": "npm run test:jest-cjs && npm run test:jest-esm && npm run test:jasmine",
+    "test": "npm run test:jest-cjs && npm run test:jest-esm",
     "test:ci": "cross-env TEST_REMOTE=false npm run test"
   }
 }