@iconify/tools 3.0.0-beta.3 → 3.0.0-beta.4

package/lib/import/directory.cjs

@@ -53,7 +53,7 @@ function importDir(iconSet, options, getKeyword, files, readFile, done) {
         (content) => {
           try {
             const svg = new svg_index.SVG(content);
-            svg_cleanup.cleanupSVG(svg);
+            svg_cleanup.cleanupSVG(svg, options);
             iconSet.fromSVG(keyword, svg);
           } catch (err) {
             if (options.ignoreImportErrors !== false) {

package/lib/import/directory.d.ts

@@ -1,9 +1,11 @@
 import { IconSet } from '../icon-set/index.js';
+import { CleanupSVGOptions } from '../svg/cleanup.js';
 import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 import '../icon-set/types.js';
 import '../svg/index.js';
 import '@iconify/utils/lib/icon-set/tree';
+import '../svg/cleanup/bad-tags.js';
 
 /**
  * Entry for file
@@ -31,7 +33,7 @@ type ImportDirectoryKeywordSyncCallback = Callback<ImportDirectoryKeywordCallbac
 /**
  * Options
  */
-interface ImportDirectoryOptions<K> {
+interface ImportDirectoryOptions<K> extends CleanupSVGOptions {
     prefix?: string;
     includeSubDirs?: boolean;
     keyword?: K;

package/lib/import/directory.mjs

@@ -51,7 +51,7 @@ function importDir(iconSet, options, getKeyword, files, readFile, done) {
         (content) => {
           try {
             const svg = new SVG(content);
-            cleanupSVG(svg);
+            cleanupSVG(svg, options);
             iconSet.fromSVG(keyword, svg);
           } catch (err) {
             if (options.ignoreImportErrors !== false) {

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

@@ -13,7 +13,14 @@ 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);
-function checkBadTags(svg) {
+const defaultOptions = {
+  keepTitles: false
+};
+function checkBadTags(svg, options) {
+  const { keepTitles } = {
+    ...defaultOptions,
+    ...options
+  };
   svg_parse.parseSVGSync(svg, (item) => {
     const tagName = item.tagName;
     const $element = item.$element;
@@ -23,6 +30,14 @@ function checkBadTags(svg) {
       }
       return;
     }
+    if (keepTitles && tagName === "title") {
+      const content = $element.html();
+      if (content?.includes("<") || content?.includes(">")) {
+        $element.remove();
+        item.testChildren = false;
+      }
+      return;
+    }
     if (svg_data_tags.unsupportedTags.has(tagName)) {
       $element.remove();
       item.testChildren = false;

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

@@ -2,9 +2,15 @@ import { SVG } from '../index.js';
 import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 
+/**
+ * Options
+ */
+interface CheckBadTagsOptions {
+    keepTitles?: boolean;
+}
 /**
  * Test for bag tags
  */
-declare function checkBadTags(svg: SVG): void;
+declare function checkBadTags(svg: SVG, options?: CheckBadTagsOptions): void;
 
-export { checkBadTags };
+export { CheckBadTagsOptions, checkBadTags };

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

@@ -11,7 +11,14 @@ requiredParentTags.set(feLightningTags, feLightningChildTags);
 requiredParentTags.set(filterTag, filterChildTags);
 requiredParentTags.set(gradientTags, gradientChildTags);
 requiredParentTags.set(/* @__PURE__ */ new Set(["animateMotion"]), animateMotionChildTags);
-function checkBadTags(svg) {
+const defaultOptions = {
+  keepTitles: false
+};
+function checkBadTags(svg, options) {
+  const { keepTitles } = {
+    ...defaultOptions,
+    ...options
+  };
   parseSVGSync(svg, (item) => {
     const tagName = item.tagName;
     const $element = item.$element;
@@ -21,6 +28,14 @@ function checkBadTags(svg) {
       }
       return;
     }
+    if (keepTitles && tagName === "title") {
+      const content = $element.html();
+      if (content?.includes("<") || content?.includes(">")) {
+        $element.remove();
+        item.testChildren = false;
+      }
+      return;
+    }
     if (unsupportedTags.has(tagName)) {
       $element.remove();
       item.testChildren = false;

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

@@ -27,6 +27,7 @@ const knownIgnoredRules = /* @__PURE__ */ new Set([
   // Illustrator / Inkscape junk
   "solid*",
   "paint*",
+  "shape*",
   "color-interpolation-filters",
   "stop-opacity"
 ]);

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

@@ -25,6 +25,7 @@ const knownIgnoredRules = /* @__PURE__ */ new Set([
   // Illustrator / Inkscape junk
   "solid*",
   "paint*",
+  "shape*",
   "color-interpolation-filters",
   "stop-opacity"
 ]);

package/lib/svg/cleanup.cjs

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

package/lib/svg/cleanup.d.ts

@@ -1,10 +1,15 @@
 import { SVG } from './index.js';
+import { CheckBadTagsOptions } from './cleanup/bad-tags.js';
 import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 
+/**
+ * Options
+ */
+type CleanupSVGOptions = CheckBadTagsOptions;
 /**
  * Clean up SVG before parsing/optimising it
  */
-declare function cleanupSVG(svg: SVG): void;
+declare function cleanupSVG(svg: SVG, options?: CleanupSVGOptions): void;
 
-export { cleanupSVG };
+export { CleanupSVGOptions, cleanupSVG };

package/lib/svg/cleanup.mjs

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

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": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",
@@ -516,10 +516,10 @@
       "import": "./lib/svg/parse-style.mjs",
       "types": "./lib/svg/parse-style.d.ts"
     },
-    "./lib/tests/load": {
-      "require": "./lib/tests/load.cjs",
-      "import": "./lib/tests/load.mjs",
-      "types": "./lib/tests/load.d.ts"
+    "./lib/tests/helpers": {
+      "require": "./lib/tests/helpers.cjs",
+      "import": "./lib/tests/helpers.mjs",
+      "types": "./lib/tests/helpers.d.ts"
     }
   },
   "scripts": {
@@ -527,9 +527,10 @@
     "lint": "eslint src/**/*.ts",
     "prebuild": "npm run lint && npm run clean",
     "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 jest --clearCache --config=jest.config.mjs && cross-env NODE_OPTIONS=--experimental-vm-modules npx jest --runInBand --config=jest.config.mjs",
+    "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 && npm run test:jasmine",
+    "test:ci": "cross-env TEST_REMOTE=false npm run test"
   }
 }