@iconify/tools 2.2.4 → 2.2.6

package/lib/index.cjs

@@ -33,6 +33,7 @@ const colors_validate = require('./colors/validate.cjs');
 const colors_detect = require('./colors/detect.cjs');
 const optimise_svgo = require('./optimise/svgo.cjs');
 const optimise_flags = require('./optimise/flags.cjs');
+const optimise_origin = require('./optimise/origin.cjs');
 const optimise_scale = require('./optimise/scale.cjs');
 const optimise_globalStyle = require('./optimise/global-style.cjs');
 const export_directory = require('./export/directory.cjs');
@@ -125,6 +126,7 @@ exports.validateColors = colors_validate.validateColors;
 exports.detectIconSetPalette = colors_detect.detectIconSetPalette;
 exports.runSVGO = optimise_svgo.runSVGO;
 exports.deOptimisePaths = optimise_flags.deOptimisePaths;
+exports.resetSVGOrigin = optimise_origin.resetSVGOrigin;
 exports.scaleSVG = optimise_scale.scaleSVG;
 exports.cleanupGlobalStyle = optimise_globalStyle.cleanupGlobalStyle;
 exports.exportToDirectory = export_directory.exportToDirectory;

package/lib/index.d.ts

@@ -31,6 +31,7 @@ export { validateColors } from './colors/validate.js';
 export { detectIconSetPalette } from './colors/detect.js';
 export { runSVGO } from './optimise/svgo.js';
 export { deOptimisePaths } from './optimise/flags.js';
+export { resetSVGOrigin } from './optimise/origin.js';
 export { scaleSVG } from './optimise/scale.js';
 export { cleanupGlobalStyle } from './optimise/global-style.js';
 export { exportToDirectory } from './export/directory.js';

package/lib/index.mjs

@@ -31,6 +31,7 @@ export { validateColors } from './colors/validate.mjs';
 export { detectIconSetPalette } from './colors/detect.mjs';
 export { runSVGO } from './optimise/svgo.mjs';
 export { deOptimisePaths } from './optimise/flags.mjs';
+export { resetSVGOrigin } from './optimise/origin.mjs';
 export { scaleSVG } from './optimise/scale.mjs';
 export { cleanupGlobalStyle } from './optimise/global-style.mjs';
 export { exportToDirectory } from './export/directory.mjs';

package/lib/optimise/origin.cjs

@@ -0,0 +1,23 @@
+'use strict';
+
+const optimise_svgo = require('./svgo.cjs');
+require('svgo');
+require('@iconify/utils/lib/svg/id');
+
+function resetSVGOrigin(svg) {
+  const viewBox = svg.viewBox;
+  if (viewBox.left !== 0 || viewBox.top !== 0) {
+    const content = `<svg width="${viewBox.width}" height="${viewBox.height}" viewBox="0 0 ${viewBox.width} ${viewBox.height}"><g transform="translate(${0 - viewBox.left} ${0 - viewBox.top})">${svg.getBody()}</g></svg>`;
+    svg.load(content);
+    optimise_svgo.runSVGO(svg, {
+      plugins: [
+        "collapseGroups",
+        "convertTransform",
+        "convertPathData",
+        "sortAttrs"
+      ]
+    });
+  }
+}
+
+exports.resetSVGOrigin = resetSVGOrigin;

package/lib/optimise/origin.d.ts

@@ -0,0 +1,10 @@
+import { SVG } from '../svg/index.js';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations/defaults';
+
+/**
+ * Reset origin to 0 0
+ */
+declare function resetSVGOrigin(svg: SVG): void;
+
+export { resetSVGOrigin };

package/lib/optimise/origin.mjs

@@ -0,0 +1,21 @@
+import { runSVGO } from './svgo.mjs';
+import 'svgo';
+import '@iconify/utils/lib/svg/id';
+
+function resetSVGOrigin(svg) {
+  const viewBox = svg.viewBox;
+  if (viewBox.left !== 0 || viewBox.top !== 0) {
+    const content = `<svg width="${viewBox.width}" height="${viewBox.height}" viewBox="0 0 ${viewBox.width} ${viewBox.height}"><g transform="translate(${0 - viewBox.left} ${0 - viewBox.top})">${svg.getBody()}</g></svg>`;
+    svg.load(content);
+    runSVGO(svg, {
+      plugins: [
+        "collapseGroups",
+        "convertTransform",
+        "convertPathData",
+        "sortAttrs"
+      ]
+    });
+  }
+}
+
+export { resetSVGOrigin };

package/lib/optimise/scale.cjs

@@ -1,29 +1,27 @@
 'use strict';
 
+const optimise_origin = require('./origin.cjs');
 const optimise_svgo = require('./svgo.cjs');
 require('svgo');
 require('@iconify/utils/lib/svg/id');
 
 function scaleSVG(svg, scale) {
-  const viewBox = svg.viewBox;
-  const width = viewBox.width * scale;
-  const height = viewBox.height * scale;
-  let shiftTransform = "";
-  let shiftTransformEnd = "";
-  if (viewBox.left !== 0 || viewBox.top !== 0) {
-    shiftTransform = `<g transform="translate(${0 - viewBox.left} ${0 - viewBox.top})">`;
-    shiftTransformEnd = "</g>";
+  optimise_origin.resetSVGOrigin(svg);
+  if (scale !== 1) {
+    const viewBox = svg.viewBox;
+    const width = viewBox.width * scale;
+    const height = viewBox.height * scale;
+    const content = `<svg width="${width}" height="${height}" viewBox="0 0 ${width} ${height}"><g transform="scale(${scale})">${svg.getBody()}</g></svg>`;
+    svg.load(content);
+    optimise_svgo.runSVGO(svg, {
+      plugins: [
+        "collapseGroups",
+        "convertTransform",
+        "convertPathData",
+        "sortAttrs"
+      ]
+    });
   }
-  const content = `<svg width="${width}" height="${height}" viewBox="0 0 ${width} ${height}"><g transform="scale(${scale})">${shiftTransform}${svg.getBody()}${shiftTransformEnd}</g></svg>`;
-  svg.load(content);
-  optimise_svgo.runSVGO(svg, {
-    plugins: [
-      "collapseGroups",
-      "convertTransform",
-      "convertPathData",
-      "sortAttrs"
-    ]
-  });
 }
 
 exports.scaleSVG = scaleSVG;

package/lib/optimise/scale.mjs

@@ -1,27 +1,25 @@
+import { resetSVGOrigin } from './origin.mjs';
 import { runSVGO } from './svgo.mjs';
 import 'svgo';
 import '@iconify/utils/lib/svg/id';
 
 function scaleSVG(svg, scale) {
-  const viewBox = svg.viewBox;
-  const width = viewBox.width * scale;
-  const height = viewBox.height * scale;
-  let shiftTransform = "";
-  let shiftTransformEnd = "";
-  if (viewBox.left !== 0 || viewBox.top !== 0) {
-    shiftTransform = `<g transform="translate(${0 - viewBox.left} ${0 - viewBox.top})">`;
-    shiftTransformEnd = "</g>";
+  resetSVGOrigin(svg);
+  if (scale !== 1) {
+    const viewBox = svg.viewBox;
+    const width = viewBox.width * scale;
+    const height = viewBox.height * scale;
+    const content = `<svg width="${width}" height="${height}" viewBox="0 0 ${width} ${height}"><g transform="scale(${scale})">${svg.getBody()}</g></svg>`;
+    svg.load(content);
+    runSVGO(svg, {
+      plugins: [
+        "collapseGroups",
+        "convertTransform",
+        "convertPathData",
+        "sortAttrs"
+      ]
+    });
   }
-  const content = `<svg width="${width}" height="${height}" viewBox="0 0 ${width} ${height}"><g transform="scale(${scale})">${shiftTransform}${svg.getBody()}${shiftTransformEnd}</g></svg>`;
-  svg.load(content);
-  runSVGO(svg, {
-    plugins: [
-      "collapseGroups",
-      "convertTransform",
-      "convertPathData",
-      "sortAttrs"
-    ]
-  });
 }
 
 export { scaleSVG };

package/lib/optimise/svgo.cjs

@@ -65,6 +65,11 @@ function runSVGO(svg, options = {}) {
       ...options,
       animated
     });
+    if (code.includes("filter=") && code.includes("transform=")) {
+      plugins = plugins.filter(
+        (item) => item !== "moveElemsAttrsToGroup"
+      );
+    }
   }
   const pluginOptions = {
     plugins,

package/lib/optimise/svgo.mjs

@@ -63,6 +63,11 @@ function runSVGO(svg, options = {}) {
       ...options,
       animated
     });
+    if (code.includes("filter=") && code.includes("transform=")) {
+      plugins = plugins.filter(
+        (item) => item !== "moveElemsAttrsToGroup"
+      );
+    }
   }
   const pluginOptions = {
     plugins,

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.4",
+  "version": "2.2.6",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",
@@ -16,35 +16,35 @@
   "types": "./lib/index.d.ts",
   "dependencies": {
     "@iconify/types": "^2.0.0",
-    "@iconify/utils": "^2.1.0",
+    "@iconify/utils": "^2.1.4",
     "@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",
+    "node-fetch": "^2.6.9",
+    "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.4.0",
+    "@types/node": "^18.14.0",
+    "@typescript-eslint/eslint-plugin": "^5.52.0",
+    "@typescript-eslint/parser": "^5.52.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.32.0",
+    "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.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",
+    "jest": "^29.4.3",
+    "prettier": "^2.8.4",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.0.5",
-    "typescript": "^4.9.4",
-    "unbuild": "^1.1.1"
+    "typescript": "^4.9.5",
+    "unbuild": "^1.1.2"
   },
   "exports": {
     "./*": "./*",
@@ -423,6 +423,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",