@iconify/tools 2.0.14 → 2.0.17

package/lib/svg/analyse.cjs

@@ -0,0 +1,291 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const svg_parse = require('./parse.cjs');
+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 = {}) {
+  const fixErrors = options.fixErrors;
+  let root = svg.$svg(":root").get(0);
+  if (root._parsed) {
+    svg.load(svg.toString());
+    root = svg.$svg(":root").get(0);
+  }
+  root._parsed = true;
+  const cheerio = svg.$svg;
+  const elements = /* @__PURE__ */ new Map();
+  const ids = /* @__PURE__ */ Object.create(null);
+  let links = [];
+  function addID(element, id) {
+    if (ids[id]) {
+      throw new Error(`Duplicate id "${id}"`);
+    }
+    element._id = id;
+    ids[id] = element._index;
+    return true;
+  }
+  function gotElementWithID(element, id, isMask) {
+    addID(element, id);
+    if (!element._belongsTo) {
+      element._belongsTo = [];
+    }
+    element._belongsTo.push({
+      id,
+      isMask,
+      indexes: /* @__PURE__ */ new Set([element._index])
+    });
+    return;
+  }
+  function gotReusableElement(item, isMask) {
+    const element = item.element;
+    const attribs = element.attribs;
+    const index2 = element._index;
+    const id = attribs["id"];
+    if (typeof id !== "string") {
+      const message = `Definition element ${svg_analyse_error.analyseTagError(element)} does not have id`;
+      if (fixErrors) {
+        item.removeNode = true;
+        item.testChildren = false;
+        console.warn(message);
+        return false;
+      }
+      throw new Error(message);
+    }
+    if (ids[id] && fixErrors) {
+      console.warn(`Duplicate id "${id}"`);
+      item.removeNode = true;
+      item.testChildren = false;
+      return false;
+    }
+    element._reusableElement = {
+      id,
+      isMask,
+      index: index2
+    };
+    gotElementWithID(element, id, isMask);
+    return true;
+  }
+  function gotElementReference(item, id, usedAsMask) {
+    const element = item.element;
+    const usedByIndex = element._index;
+    const link = {
+      id,
+      usedByIndex,
+      usedAsMask
+    };
+    links.push(link);
+    if (!element._linksTo) {
+      element._linksTo = [];
+    }
+    element._linksTo.push(link);
+  }
+  let index = 0;
+  await svg_parse.parseSVG(svg, (item) => {
+    const { tagName, parents } = item;
+    if (svg_data_tags.styleTag.has(tagName)) {
+      item.testChildren = false;
+      return;
+    }
+    const element = item.element;
+    const attribs = element.attribs;
+    index++;
+    element._index = index;
+    elements.set(index, element);
+    if (!parents.length) {
+      element._usedAsMask = false;
+      element._usedAsPaint = true;
+      return;
+    }
+    element._usedAsMask = false;
+    element._usedAsPaint = false;
+    const parentItem = parents[0];
+    const parentElement = parentItem.element;
+    if (svg_data_tags.maskTags.has(tagName)) {
+      if (!gotReusableElement(item, true)) {
+        return;
+      }
+    } else if (svg_data_tags.reusableElementsWithPalette.has(tagName)) {
+      if (!gotReusableElement(item, false)) {
+        return;
+      }
+    } else if (svg_data_tags.defsTag.has(parentItem.tagName)) {
+      if (!gotReusableElement(item, false)) {
+        return;
+      }
+    } else if (!svg_data_tags.defsTag.has(tagName)) {
+      element._usedAsMask = parentElement._usedAsMask;
+      element._usedAsPaint = parentElement._usedAsPaint;
+      element._parentElement = parentElement._index;
+      if (!parentElement._childElements) {
+        parentElement._childElements = [];
+      }
+      parentElement._childElements.push(index);
+      const parentReusableElement = parentElement._reusableElement;
+      if (parentReusableElement) {
+        if (element._reusableElement) {
+          throw new Error(`Reusable element ${svg_analyse_error.analyseTagError(element)} is inside another reusable element id="${parentReusableElement.id}"`);
+        }
+        element._reusableElement = parentReusableElement;
+      }
+      const parentBelongsTo = parentElement._belongsTo;
+      if (parentBelongsTo) {
+        const list = element._belongsTo || (element._belongsTo = []);
+        parentBelongsTo.forEach((item2) => {
+          item2.indexes.add(index);
+          list.push(item2);
+        });
+      }
+      if (element._id === void 0) {
+        const id = attribs["id"];
+        if (typeof id === "string") {
+          if (ids[id] && fixErrors) {
+            console.warn(`Duplicate id "${id}"`);
+            cheerio(element).removeAttr("id");
+          } else {
+            gotElementWithID(element, id, false);
+          }
+        }
+      }
+    }
+    if (svg_data_attributes.tagSpecificNonPresentationalAttributes[tagName]?.has("href")) {
+      const href = attribs["href"] || attribs["xlink:href"];
+      if (typeof href === "string") {
+        if (href.slice(0, 1) !== "#") {
+          throw new Error(`Invalid link in ${svg_analyse_error.analyseTagError(element)}`);
+        }
+        const id = href.slice(1);
+        gotElementReference(item, id, false);
+      }
+    }
+    Object.keys(attribs).forEach((attr) => {
+      let value = attribs[attr];
+      if (value.slice(0, 5).toLowerCase() !== "url(#") {
+        return;
+      }
+      value = value.slice(5);
+      if (value.slice(-1) !== ")") {
+        return;
+      }
+      const id = value.slice(0, value.length - 1).trim();
+      if (svg_data_attributes.urlPresentationalAttributes.has(attr)) {
+        gotElementReference(item, id, attr !== "filter");
+        return;
+      }
+      if (svg_data_attributes.commonColorPresentationalAttributes.has(attr) || svg_data_attributes.markerAttributes.has(attr)) {
+        gotElementReference(item, id, false);
+        return;
+      }
+    });
+  });
+  links = links.filter((item) => {
+    const id = item.id;
+    if (ids[id]) {
+      return true;
+    }
+    function fix() {
+      const index2 = item.usedByIndex;
+      const element = elements.get(index2);
+      const tagName = element.tagName;
+      function remove() {
+        const $element = cheerio(element);
+        const parent = element.parent;
+        if (parent) {
+          if (parent._childElements) {
+            parent._childElements = parent._childElements.filter((num) => num !== index2);
+          }
+          parent._belongsTo?.forEach((list) => {
+            list.indexes.delete(index2);
+          });
+        }
+        $element.remove();
+      }
+      if (element._linksTo) {
+        element._linksTo = element._linksTo.filter((item2) => item2.id !== id);
+      }
+      if (!element.children.length) {
+        if (svg_data_tags.useTag.has(tagName)) {
+          remove();
+          return;
+        }
+      }
+      const matches = /* @__PURE__ */ new Set(["#" + id, "url(#" + id + ")"]);
+      const attribs = element.attribs;
+      for (const attr in attribs) {
+        if (matches.has(attribs[attr])) {
+          cheerio(element).removeAttr(attr);
+        }
+      }
+    }
+    const message = `Missing element with id="${id}"`;
+    if (fixErrors) {
+      fix();
+      console.warn(message);
+    } else {
+      throw new Error(message);
+    }
+    return false;
+  });
+  function hasChildItem(tree2, child, canThrow) {
+    const item = tree2.children.find((item2) => item2.index === child.index && item2.usedAsMask === child.usedAsMask);
+    if (item && canThrow) {
+      throw new Error("Recursion");
+    }
+    return !!item;
+  }
+  const tree = {
+    index: 1,
+    usedAsMask: false,
+    children: []
+  };
+  function parseTreeItem(tree2, usedItems, inMask) {
+    const element = elements.get(tree2.index);
+    if (tree2.usedAsMask || inMask) {
+      element._usedAsMask = true;
+      inMask = true;
+    } else {
+      element._usedAsPaint = true;
+    }
+    usedItems = usedItems.slice(0);
+    usedItems.push(element._index);
+    element._childElements?.forEach((childIndex) => {
+      if (usedItems.indexOf(childIndex) !== -1) {
+        throw new Error("Recursion");
+      }
+      const childItem = {
+        index: childIndex,
+        usedAsMask: false,
+        children: [],
+        parent: tree2
+      };
+      tree2.children.push(childItem);
+      parseTreeItem(childItem, usedItems, inMask);
+    });
+    element._linksTo?.forEach((link) => {
+      const linkIndex = ids[link.id];
+      const usedAsMask = link.usedAsMask;
+      const childItem = {
+        index: linkIndex,
+        usedAsMask,
+        children: [],
+        parent: tree2
+      };
+      if (hasChildItem(tree2, childItem, false)) {
+        return;
+      }
+      tree2.children.push(childItem);
+      parseTreeItem(childItem, usedItems, inMask || usedAsMask);
+    });
+  }
+  parseTreeItem(tree, [0], false);
+  return {
+    elements,
+    ids,
+    links,
+    tree
+  };
+}
+
+exports.analyseSVGStructure = analyseSVGStructure;

package/lib/svg/analyse.d.ts

@@ -1,8 +1,13 @@
-import type { SVG } from './index';
-import type { AnalyseSVGStructureResult, AnalyseSVGStructureOptions } from './analyse/types';
+import { SVG } from './index.js';
+import { AnalyseSVGStructureOptions, AnalyseSVGStructureResult } from './analyse/types.js';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations';
+
 /**
  * Find all IDs, links, which elements use palette, which items aren't used
  *
  * Before running this function run cleanup functions to change inline style to attributes and fix attributes
  */
-export declare function analyseSVGStructure(svg: SVG, options?: AnalyseSVGStructureOptions): Promise<AnalyseSVGStructureResult>;
+declare function analyseSVGStructure(svg: SVG, options?: AnalyseSVGStructureOptions): Promise<AnalyseSVGStructureResult>;
+
+export { analyseSVGStructure };

package/lib/svg/analyse.mjs

@@ -1,19 +1,8 @@
-// src/svg/analyse.ts
-import { parseSVG } from "./parse.mjs";
-import {
-  commonColorPresentationalAttributes,
-  markerAttributes,
-  tagSpecificNonPresentationalAttributes,
-  urlPresentationalAttributes
-} from "./data/attributes.mjs";
-import {
-  defsTag,
-  maskTags,
-  reusableElementsWithPalette,
-  styleTag,
-  useTag
-} from "./data/tags.mjs";
-import { analyseTagError } from "./analyse/error.mjs";
+import { parseSVG } from './parse.mjs';
+import { tagSpecificNonPresentationalAttributes, urlPresentationalAttributes, commonColorPresentationalAttributes, markerAttributes } from './data/attributes.mjs';
+import { styleTag, maskTags, reusableElementsWithPalette, defsTag, useTag } from './data/tags.mjs';
+import { analyseTagError } from './analyse/error.mjs';
+
 async function analyseSVGStructure(svg, options = {}) {
   const fixErrors = options.fixErrors;
   let root = svg.$svg(":root").get(0);
@@ -23,8 +12,8 @@ async function analyseSVGStructure(svg, options = {}) {
   }
   root._parsed = true;
   const cheerio = svg.$svg;
-  const elements = new Map();
-  const ids = Object.create(null);
+  const elements = /* @__PURE__ */ new Map();
+  const ids = /* @__PURE__ */ Object.create(null);
   let links = [];
   function addID(element, id) {
     if (ids[id]) {
@@ -42,7 +31,7 @@ async function analyseSVGStructure(svg, options = {}) {
     element._belongsTo.push({
       id,
       isMask,
-      indexes: new Set([element._index])
+      indexes: /* @__PURE__ */ new Set([element._index])
     });
     return;
   }
@@ -91,7 +80,6 @@ async function analyseSVGStructure(svg, options = {}) {
   }
   let index = 0;
   await parseSVG(svg, (item) => {
-    var _a;
     const { tagName, parents } = item;
     if (styleTag.has(tagName)) {
       item.testChildren = false;
@@ -158,7 +146,7 @@ async function analyseSVGStructure(svg, options = {}) {
         }
       }
     }
-    if ((_a = tagSpecificNonPresentationalAttributes[tagName]) == null ? void 0 : _a.has("href")) {
+    if (tagSpecificNonPresentationalAttributes[tagName]?.has("href")) {
       const href = attribs["href"] || attribs["xlink:href"];
       if (typeof href === "string") {
         if (href.slice(0, 1) !== "#") {
@@ -198,14 +186,13 @@ async function analyseSVGStructure(svg, options = {}) {
       const element = elements.get(index2);
       const tagName = element.tagName;
       function remove() {
-        var _a;
         const $element = cheerio(element);
         const parent = element.parent;
         if (parent) {
           if (parent._childElements) {
             parent._childElements = parent._childElements.filter((num) => num !== index2);
           }
-          (_a = parent._belongsTo) == null ? void 0 : _a.forEach((list) => {
+          parent._belongsTo?.forEach((list) => {
             list.indexes.delete(index2);
           });
         }
@@ -220,7 +207,7 @@ async function analyseSVGStructure(svg, options = {}) {
           return;
         }
       }
-      const matches = new Set(["#" + id, "url(#" + id + ")"]);
+      const matches = /* @__PURE__ */ new Set(["#" + id, "url(#" + id + ")"]);
       const attribs = element.attribs;
       for (const attr in attribs) {
         if (matches.has(attribs[attr])) {
@@ -250,7 +237,6 @@ async function analyseSVGStructure(svg, options = {}) {
     children: []
   };
   function parseTreeItem(tree2, usedItems, inMask) {
-    var _a, _b;
     const element = elements.get(tree2.index);
     if (tree2.usedAsMask || inMask) {
       element._usedAsMask = true;
@@ -260,7 +246,7 @@ async function analyseSVGStructure(svg, options = {}) {
     }
     usedItems = usedItems.slice(0);
     usedItems.push(element._index);
-    (_a = element._childElements) == null ? void 0 : _a.forEach((childIndex) => {
+    element._childElements?.forEach((childIndex) => {
       if (usedItems.indexOf(childIndex) !== -1) {
         throw new Error("Recursion");
       }
@@ -273,7 +259,7 @@ async function analyseSVGStructure(svg, options = {}) {
       tree2.children.push(childItem);
       parseTreeItem(childItem, usedItems, inMask);
     });
-    (_b = element._linksTo) == null ? void 0 : _b.forEach((link) => {
+    element._linksTo?.forEach((link) => {
       const linkIndex = ids[link.id];
       const usedAsMask = link.usedAsMask;
       const childItem = {
@@ -297,6 +283,5 @@ async function analyseSVGStructure(svg, options = {}) {
     tree
   };
 }
-export {
-  analyseSVGStructure
-};
+
+export { analyseSVGStructure };

package/lib/svg/cleanup/attribs.cjs

@@ -0,0 +1,41 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+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) => {
+    const tagName = item.tagName;
+    const attribs = item.element.attribs;
+    const $element = item.$element;
+    Object.keys(attribs).forEach((attr) => {
+      if (attr.slice(0, 2) === "on" || svg_data_attributes.badAttributes.has(attr) || svg_data_attributes.badSoftwareAttributes.has(attr) || svg_data_attributes.badAttributePrefixes.has(attr.split("-").shift())) {
+        $element.removeAttr(attr);
+        return;
+      }
+      if (svg_data_tags.defsTag.has(tagName) && !svg_data_attributes.tagSpecificPresentationalAttributes[tagName].has(attr)) {
+        $element.removeAttr(attr);
+        return;
+      }
+      const nsParts = attr.split(":");
+      if (nsParts.length > 1) {
+        const namespace = nsParts.shift();
+        const newAttr = nsParts.join(":");
+        switch (namespace) {
+          case "xlink": {
+            if (attribs[newAttr] === void 0) {
+              $element.attr(newAttr, attribs[attr]);
+            }
+            break;
+          }
+        }
+        $element.removeAttr(attr);
+      }
+    });
+  });
+}
+
+exports.removeBadAttributes = removeBadAttributes;

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

@@ -1,5 +1,10 @@
-import type { SVG } from '../../svg';
+import { SVG } from '../index.js';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations';
+
 /**
  * Remove useless attributes
  */
-export declare function removeBadAttributes(svg: SVG): Promise<void>;
+declare function removeBadAttributes(svg: SVG): Promise<void>;
+
+export { removeBadAttributes };

package/lib/svg/cleanup/attribs.mjs

@@ -1,12 +1,7 @@
-// src/svg/cleanup/attribs.ts
-import {
-  badAttributes,
-  badAttributePrefixes,
-  badSoftwareAttributes,
-  tagSpecificPresentationalAttributes
-} from "../data/attributes.mjs";
-import { defsTag } from "../data/tags.mjs";
-import { parseSVG } from "../parse.mjs";
+import { badAttributes, badSoftwareAttributes, badAttributePrefixes, tagSpecificPresentationalAttributes } from '../data/attributes.mjs';
+import { defsTag } from '../data/tags.mjs';
+import { parseSVG } from '../parse.mjs';
+
 async function removeBadAttributes(svg) {
   await parseSVG(svg, (item) => {
     const tagName = item.tagName;
@@ -38,6 +33,5 @@ async function removeBadAttributes(svg) {
     });
   });
 }
-export {
-  removeBadAttributes
-};
+
+export { removeBadAttributes };

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

@@ -0,0 +1,51 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const svg_parse = require('../parse.cjs');
+const svg_data_tags = require('../data/tags.cjs');
+
+const requiredParentTags = /* @__PURE__ */ new Map();
+requiredParentTags.set(/* @__PURE__ */ new Set(["feComponentTransfer"]), svg_data_tags.feComponentTransferChildTag);
+requiredParentTags.set(/* @__PURE__ */ new Set(["feMerge"]), svg_data_tags.feMergeChildTags);
+requiredParentTags.set(svg_data_tags.feLightningTags, svg_data_tags.feLightningChildTags);
+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) => {
+    const tagName = item.tagName;
+    const $element = item.$element;
+    if (tagName === "svg") {
+      if (item.parents.length) {
+        throw new Error(`Unexpected element: <${tagName}>`);
+      }
+      return;
+    }
+    if (svg_data_tags.unsupportedTags.has(tagName)) {
+      $element.remove();
+      item.testChildren = false;
+      return;
+    }
+    if (svg_data_tags.badTags.has(tagName) || !svg_data_tags.allValidTags.has(tagName)) {
+      const parts = tagName.split(":");
+      if (parts.length > 1) {
+        $element.remove();
+        item.testChildren = false;
+        return;
+      }
+      throw new Error(`Unexpected element: <${tagName}>`);
+    }
+    const parentTagName = item.parents[0]?.tagName;
+    for (const [parents, children] of requiredParentTags) {
+      if (children.has(tagName)) {
+        if (!parents.has(parentTagName)) {
+          throw new Error(`Element <${tagName}> has wrong parent element`);
+        }
+        return;
+      }
+    }
+  });
+}
+
+exports.checkBadTags = checkBadTags;

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

@@ -1,5 +1,10 @@
-import type { SVG } from '../../svg';
+import { SVG } from '../index.js';
+import '@iconify/types';
+import '@iconify/utils/lib/customisations';
+
 /**
  * Test for bag tags
  */
-export declare function checkBadTags(svg: SVG): Promise<void>;
+declare function checkBadTags(svg: SVG): Promise<void>;
+
+export { checkBadTags };

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

@@ -1,29 +1,15 @@
-// src/svg/cleanup/bad-tags.ts
-import { parseSVG } from "../parse.mjs";
-import {
-  allValidTags,
-  animateMotionChildTags,
-  badTags,
-  feComponentTransferChildTag,
-  feLightningChildTags,
-  feLightningTags,
-  feMergeChildTags,
-  filterChildTags,
-  filterTag,
-  gradientChildTags,
-  gradientTags,
-  unsupportedTags
-} from "../data/tags.mjs";
-var requiredParentTags = new Map();
-requiredParentTags.set(new Set(["feComponentTransfer"]), feComponentTransferChildTag);
-requiredParentTags.set(new Set(["feMerge"]), feMergeChildTags);
+import { parseSVG } 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();
+requiredParentTags.set(/* @__PURE__ */ new Set(["feComponentTransfer"]), feComponentTransferChildTag);
+requiredParentTags.set(/* @__PURE__ */ new Set(["feMerge"]), feMergeChildTags);
 requiredParentTags.set(feLightningTags, feLightningChildTags);
 requiredParentTags.set(filterTag, filterChildTags);
 requiredParentTags.set(gradientTags, gradientChildTags);
-requiredParentTags.set(new Set(["animateMotion"]), animateMotionChildTags);
+requiredParentTags.set(/* @__PURE__ */ new Set(["animateMotion"]), animateMotionChildTags);
 async function checkBadTags(svg) {
   await parseSVG(svg, (item) => {
-    var _a;
     const tagName = item.tagName;
     const $element = item.$element;
     if (tagName === "svg") {
@@ -46,7 +32,7 @@ async function checkBadTags(svg) {
       }
       throw new Error(`Unexpected element: <${tagName}>`);
     }
-    const parentTagName = (_a = item.parents[0]) == null ? void 0 : _a.tagName;
+    const parentTagName = item.parents[0]?.tagName;
     for (const [parents, children] of requiredParentTags) {
       if (children.has(tagName)) {
         if (!parents.has(parentTagName)) {
@@ -57,6 +43,5 @@ async function checkBadTags(svg) {
     }
   });
 }
-export {
-  checkBadTags
-};
+
+export { checkBadTags };