@iconify/tools 2.2.5 → 3.0.0-beta.1

package/lib/svg/parse.mjs

@@ -1,7 +1,7 @@
-async function parseSVG(svg, callback) {
-  async function checkNode(element, parents) {
+function parse(svg, callback, done) {
+  function checkNode(element, parents, done2) {
     if (element.type !== "tag") {
-      return;
+      return done2();
     }
     const $element = cheerio(element);
     const tagName = element.tagName;
@@ -14,25 +14,62 @@ async function parseSVG(svg, callback) {
       testChildren: true,
       removeNode: false
     };
-    const result = callback(item);
-    if (result instanceof Promise) {
-      await result;
-    }
-    const newParents = parents.slice(0);
-    newParents.unshift(item);
-    if (tagName !== "style" && item.testChildren && !item.removeNode) {
-      const children = $element.children().toArray();
-      for (let i = 0; i < children.length; i++) {
-        await checkNode(children[i], newParents);
+    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);
       }
-    }
-    if (item.removeNode) {
-      $element.remove();
-    }
+      const next = () => {
+        const queueItem = queue.shift();
+        if (!queueItem) {
+          if (item.removeNode) {
+            $element.remove();
+          }
+          return done2();
+        }
+        checkNode(queueItem, newParents, next);
+      };
+      next();
+    });
   }
   const cheerio = svg.$svg;
   const $root = svg.$svg(":root");
-  await checkNode($root.get(0), []);
+  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");
+      }
+    }
+  );
+  isSync = false;
 }
 
-export { parseSVG };
+export { parseSVG, parseSVGSync };

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.5",
+  "version": "3.0.0-beta.1",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",
@@ -16,35 +16,33 @@
   "types": "./lib/index.d.ts",
   "dependencies": {
     "@iconify/types": "^2.0.0",
-    "@iconify/utils": "^2.1.0",
+    "@iconify/utils": "^2.1.5",
     "@types/cheerio": "^0.22.31",
-    "@types/node-fetch": "^2.6.2",
-    "@types/tar": "^6.1.3",
+    "@types/tar": "^6.1.4",
     "cheerio": "^1.0.0-rc.12",
     "extract-zip": "^2.0.1",
-    "local-pkg": "^0.4.2",
-    "node-fetch": "^2.6.8",
-    "pathe": "^1.0.0",
+    "local-pkg": "^0.4.3",
+    "pathe": "^1.1.0",
     "svgo": "^3.0.2",
     "tar": "^6.1.13"
   },
   "devDependencies": {
-    "@types/jest": "^29.2.5",
-    "@types/node": "^18.11.18",
-    "@typescript-eslint/eslint-plugin": "^5.48.1",
-    "@typescript-eslint/parser": "^5.48.1",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^18.15.11",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.32.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.38.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-jasmine": "^4.1.3",
     "eslint-plugin-prettier": "^4.2.1",
-    "jasmine": "^4.5.0",
-    "jest": "^29.3.1",
-    "prettier": "^2.8.3",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.5",
-    "typescript": "^4.9.4",
-    "unbuild": "^1.1.1"
+    "jasmine": "^4.6.0",
+    "jest": "^29.5.0",
+    "prettier": "^2.8.7",
+    "rimraf": "^5.0.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^5.0.4",
+    "unbuild": "^1.2.1"
   },
   "exports": {
     "./*": "./*",
@@ -423,6 +421,11 @@
       "import": "./lib/optimise/global-style.mjs",
       "types": "./lib/optimise/global-style.d.ts"
     },
+    "./lib/optimise/origin": {
+      "require": "./lib/optimise/origin.cjs",
+      "import": "./lib/optimise/origin.mjs",
+      "types": "./lib/optimise/origin.d.ts"
+    },
     "./lib/optimise/scale": {
       "require": "./lib/optimise/scale.cjs",
       "import": "./lib/optimise/scale.mjs",