@iconify/tools 2.0.0-dev.1 → 2.0.0-dev.2

package/lib/colors/parse.d.ts

@@ -31,7 +31,7 @@ export interface ParseColorsOptions {
  */
 export declare function parseColors(svg: SVG, options?: ParseColorsOptions): Promise<FindColorsResult>;
 /**
- * Check if color type is a keyword
+ * Check if color is empty, such as 'none' or 'transparent'
  */
-export declare function isKeywordColor(color: Color): boolean;
+export declare function isEmptyColor(color: Color): boolean;
 export {};

package/lib/colors/parse.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isKeywordColor = exports.parseColors = void 0;
+exports.isEmptyColor = exports.parseColors = void 0;
 const colors_1 = require("@iconify/utils/lib/colors");
 const parse_1 = require("../svg/parse");
 const tags_1 = require("../svg/data/tags");
@@ -252,23 +252,10 @@ async function parseColors(svg, options = {}) {
 }
 exports.parseColors = parseColors;
 /**
- * Check if color type is a keyword
+ * Check if color is empty, such as 'none' or 'transparent'
  */
-function isKeywordColor(color) {
-    switch (color.type) {
-        case 'rgb':
-        case 'hsl':
-        case 'lab':
-        case 'lch':
-            return false;
-        case 'none':
-        case 'transparent':
-        case 'current':
-            return true;
-        default: {
-            const t = color;
-            return t;
-        }
-    }
+function isEmptyColor(color) {
+    const type = color.type;
+    return type === 'none' || type === 'transparent';
 }
-exports.isKeywordColor = isKeywordColor;
+exports.isEmptyColor = isEmptyColor;

package/lib/colors/parse.mjs

@@ -202,24 +202,11 @@ async function parseColors(svg, options = {}) {
   });
   return result;
 }
-function isKeywordColor(color) {
-  switch (color.type) {
-    case "rgb":
-    case "hsl":
-    case "lab":
-    case "lch":
-      return false;
-    case "none":
-    case "transparent":
-    case "current":
-      return true;
-    default: {
-      const t = color;
-      return t;
-    }
-  }
+function isEmptyColor(color) {
+  const type = color.type;
+  return type === "none" || type === "transparent";
 }
 export {
-  isKeywordColor,
+  isEmptyColor,
   parseColors
 };

package/lib/icon-set/index.d.ts

@@ -1,4 +1,5 @@
 import type { IconifyJSON, IconifyInfo } from '@iconify/types';
+import { IconifyIconCustomisations } from '@iconify/utils/lib/customisations';
 import type { CheckThemeResult, CommonIconProps, IconCategory, IconSetAsyncForEachCallback, IconSetIconEntry, IconSetIconType, ResolvedIconifyIcon } from './types';
 import { SVG } from '../svg';
 /**
@@ -49,7 +50,7 @@ export declare class IconSet {
     /**
      * Generate HTML
      */
-    toString(name: string): string | null;
+    toString(name: string, custommisations?: IconifyIconCustomisations): string | null;
     /**
      * Get SVG instance for icon
      */

package/lib/icon-set/index.js

@@ -251,15 +251,17 @@ class IconSet {
     /**
      * Generate HTML
      */
-    toString(name) {
+    toString(name, custommisations = {
+        width: 'auto',
+        height: 'auto',
+    }) {
         const item = this.resolve(name, true);
         if (!item) {
             return null;
         }
         const result = (0, build_1.iconToSVG)(item, {
             ...customisations_1.defaults,
-            width: 'auto',
-            height: 'auto',
+            ...custommisations,
         });
         const attributes = Object.keys(result.attributes)
             .map((key) => ` ${key}="${result.attributes[key]}"`)

package/lib/icon-set/index.mjs

@@ -1,7 +1,9 @@
 // src/icon-set/index.ts
 import { fullIcon } from "@iconify/utils/lib/icon";
 import { iconToSVG } from "@iconify/utils/lib/svg/build";
-import { defaults } from "@iconify/utils/lib/customisations";
+import {
+  defaults
+} from "@iconify/utils/lib/customisations";
 import { minifyIconSet } from "@iconify/utils/lib/icon-set/minify";
 import { convertIconSetInfo } from "@iconify/utils/lib/icon-set/convert-info";
 import { extraDefaultProps, filterProps } from "./props.mjs";
@@ -195,15 +197,17 @@ var IconSet = class {
     const result = getIcon(name, 0);
     return result && full ? fullIcon(result) : result;
   }
-  toString(name) {
+  toString(name, custommisations = {
+    width: "auto",
+    height: "auto"
+  }) {
     const item = this.resolve(name, true);
     if (!item) {
       return null;
     }
     const result = iconToSVG(item, {
       ...defaults,
-      width: "auto",
-      height: "auto"
+      ...custommisations
     });
     const attributes = Object.keys(result.attributes).map((key) => ` ${key}="${result.attributes[key]}"`).join("");
     return `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"${attributes}>${result.body}</svg>`;

package/lib/optimise/svgo.js

@@ -78,8 +78,11 @@ async function runSVGO(svg, options = {}) {
         plugins,
         multipass,
     };
-    // Load data
+    // Load data (changing type because SVGO types do not include error ?????)
     const result = (0, svgo_1.optimize)(svg.toString(), pluginOptions);
+    if (typeof result.error === 'string') {
+        throw new Error(result.error);
+    }
     svg.load(result.data);
 }
 exports.runSVGO = runSVGO;

package/lib/optimise/svgo.mjs

@@ -63,6 +63,9 @@ async function runSVGO(svg, options = {}) {
     multipass
   };
   const result = optimize(svg.toString(), pluginOptions);
+  if (typeof result.error === "string") {
+    throw new Error(result.error);
+  }
   svg.load(result.data);
 }
 export {

package/lib/svg/cleanup/attribs.js

@@ -7,26 +7,19 @@ const parse_1 = require("../parse");
  * Remove useless attributes
  */
 async function removeBadAttributes(svg) {
-    (0, parse_1.parseSVG)(svg, (item) => {
+    await (0, parse_1.parseSVG)(svg, (item) => {
         const attribs = item.element.attribs;
+        const $element = item.$element;
         // Common tags
         Object.keys(attribs).forEach((attr) => {
             // Bad attributes, events
-            if (attr.slice(0, 2) === 'on' || attributes_1.badAttributes.has(attr)) {
-                item.$element.removeAttr(attr);
+            if (attr.slice(0, 2) === 'on' ||
+                attributes_1.badAttributes.has(attr) ||
+                attributes_1.badSoftwareAttributes.has(attr) ||
+                attributes_1.badAttributePrefixes.has(attr.split('-').shift())) {
+                $element.removeAttr(attr);
                 return;
             }
-            // Partial attribute matches
-            const parts = attr.split('-');
-            const firstPart = parts.shift();
-            switch (firstPart) {
-                case '': // -whatever
-                case 'aria':
-                case 'data':
-                    // Remove unnecessary attributes
-                    item.$element.removeAttr(attr);
-                    return;
-            }
             // Check for namespace
             const nsParts = attr.split(':');
             if (nsParts.length > 1) {
@@ -36,13 +29,13 @@ async function removeBadAttributes(svg) {
                     case 'xlink': {
                         // Deprecated: use without namespace
                         if (attribs[newAttr] === void 0) {
-                            item.$element.attr(newAttr, attribs[attr]);
+                            $element.attr(newAttr, attribs[attr]);
                         }
                         break;
                     }
                 }
                 // Remove all namespace attributes
-                item.$element.removeAttr(attr);
+                $element.removeAttr(attr);
             }
         });
     });

package/lib/svg/cleanup/attribs.mjs

@@ -1,23 +1,19 @@
 // src/svg/cleanup/attribs.ts
-import { badAttributes } from "../data/attributes.mjs";
+import {
+  badAttributes,
+  badAttributePrefixes,
+  badSoftwareAttributes
+} from "../data/attributes.mjs";
 import { parseSVG } from "../parse.mjs";
 async function removeBadAttributes(svg) {
-  parseSVG(svg, (item) => {
+  await parseSVG(svg, (item) => {
     const attribs = item.element.attribs;
+    const $element = item.$element;
     Object.keys(attribs).forEach((attr) => {
-      if (attr.slice(0, 2) === "on" || badAttributes.has(attr)) {
-        item.$element.removeAttr(attr);
+      if (attr.slice(0, 2) === "on" || badAttributes.has(attr) || badSoftwareAttributes.has(attr) || badAttributePrefixes.has(attr.split("-").shift())) {
+        $element.removeAttr(attr);
         return;
       }
-      const parts = attr.split("-");
-      const firstPart = parts.shift();
-      switch (firstPart) {
-        case "":
-        case "aria":
-        case "data":
-          item.$element.removeAttr(attr);
-          return;
-      }
       const nsParts = attr.split(":");
       if (nsParts.length > 1) {
         const namespace = nsParts.shift();
@@ -25,12 +21,12 @@ async function removeBadAttributes(svg) {
         switch (namespace) {
           case "xlink": {
             if (attribs[newAttr] === void 0) {
-              item.$element.attr(newAttr, attribs[attr]);
+              $element.attr(newAttr, attribs[attr]);
             }
             break;
           }
         }
-        item.$element.removeAttr(attr);
+        $element.removeAttr(attr);
       }
     });
   });

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

@@ -46,7 +46,7 @@ async function cleanupInlineStyle(svg) {
                     }
                     // Bad software stuff
                     if (attributes_1.badSoftwareAttributes.has(prop) ||
-                        attributes_1.badSoftwareAttributePrefixes.has(prop.split('-').shift())) {
+                        attributes_1.badAttributePrefixes.has(prop.split('-').shift())) {
                         return;
                     }
                     // Vendor specific junk

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

@@ -2,7 +2,7 @@
 import { parseInlineStyle } from "../../css/parse.mjs";
 import {
   badAttributes,
-  badSoftwareAttributePrefixes,
+  badAttributePrefixes,
   badSoftwareAttributes,
   insideClipPathAttributes,
   tagSpecificAnimatedAttributes,
@@ -39,7 +39,7 @@ async function cleanupInlineStyle(svg) {
             }
             return;
           }
-          if (badSoftwareAttributes.has(prop) || badSoftwareAttributePrefixes.has(prop.split("-").shift())) {
+          if (badSoftwareAttributes.has(prop) || badAttributePrefixes.has(prop.split("-").shift())) {
             return;
           }
           if (prop.slice(0, 1) === "-") {

package/lib/svg/cleanup/root-svg.js

@@ -25,7 +25,7 @@ async function cleanupSVGRoot(svg) {
             attributes_1.badAttributes.has(attr) ||
             attributes_1.junkSVGAttributes.has(attr) ||
             attributes_1.badSoftwareAttributes.has(attr) ||
-            attributes_1.badSoftwareAttributePrefixes.has(attr.split('-').shift()) ||
+            attributes_1.badAttributePrefixes.has(attr.split('-').shift()) ||
             attr.split(':').length > 1) {
             $root.removeAttr(attr);
             return;

package/lib/svg/cleanup/root-svg.mjs

@@ -1,7 +1,7 @@
 // src/svg/cleanup/root-svg.ts
 import {
   badAttributes,
-  badSoftwareAttributePrefixes,
+  badAttributePrefixes,
   badSoftwareAttributes,
   commonAttributes,
   junkSVGAttributes,
@@ -23,7 +23,7 @@ async function cleanupSVGRoot(svg) {
   Object.keys(attribs).forEach((attr) => {
     var _a, _b;
     const value = attribs[attr];
-    if (commonAttributes.has(attr) || badAttributes.has(attr) || junkSVGAttributes.has(attr) || badSoftwareAttributes.has(attr) || badSoftwareAttributePrefixes.has(attr.split("-").shift()) || attr.split(":").length > 1) {
+    if (commonAttributes.has(attr) || badAttributes.has(attr) || junkSVGAttributes.has(attr) || badSoftwareAttributes.has(attr) || badAttributePrefixes.has(attr.split("-").shift()) || attr.split(":").length > 1) {
       $root.removeAttr(attr);
       return;
     }

package/lib/svg/cleanup/svgo-style.js

@@ -16,7 +16,7 @@ async function convertStyleToAttrs(svg) {
         // Attributes / properties now allowed
         attributes_1.badAttributes.has(prop) ||
             attributes_1.badSoftwareAttributes.has(prop) ||
-            attributes_1.badSoftwareAttributePrefixes.has(prop.split('-').shift())) {
+            attributes_1.badAttributePrefixes.has(prop.split('-').shift())) {
             return void 0;
         }
         hasStyle = true;

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

@@ -1,7 +1,7 @@
 // src/svg/cleanup/svgo-style.ts
 import {
   badAttributes,
-  badSoftwareAttributePrefixes,
+  badAttributePrefixes,
   badSoftwareAttributes
 } from "../data/attributes.mjs";
 import { parseSVGStyle } from "../parse-style.mjs";
@@ -10,7 +10,7 @@ async function convertStyleToAttrs(svg) {
   let hasStyle = false;
   await parseSVGStyle(svg, (item) => {
     const prop = item.prop;
-    if (badAttributes.has(prop) || badSoftwareAttributes.has(prop) || badSoftwareAttributePrefixes.has(prop.split("-").shift())) {
+    if (badAttributes.has(prop) || badSoftwareAttributes.has(prop) || badAttributePrefixes.has(prop.split("-").shift())) {
       return void 0;
     }
     hasStyle = true;

package/lib/svg/data/attributes.d.ts

@@ -15,7 +15,7 @@ export declare const junkSVGAttributes: Set<string>;
  * Attributes and styles often added by bad software to wrong tags, such as Adobe Illustrator and Inkscape
  */
 export declare const badSoftwareAttributes: Set<string>;
-export declare const badSoftwareAttributePrefixes: Set<string>;
+export declare const badAttributePrefixes: Set<string>;
 /**
  * Common attributes that can exist on any element
  */

package/lib/svg/data/attributes.js

@@ -4,7 +4,7 @@
  * Icons cannot have anything that requires external resources, anything that renders inconsistently.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tagSpecificNonPresentationalAttributes = exports.tagSpecificPresentationalAttributes = exports.tagSpecificAnimatedAttributes = exports.feFuncAttributes = exports.commonFeAttributes = exports.commonGradientAttributes = exports.otherAnimationAttributes = exports.animationValueAttributes = exports.animationTimingAttributes = exports.otherShapeAttributes = exports.markerAttributes = exports.presentationalAttributes = exports.otherPresentationalAttributes = exports.commonColorPresentationalAttributes = exports.visibilityPresentationalAttributes = exports.urlPresentationalAttributes = exports.strokePresentationalAttributes = exports.fillPresentationalAttributes = exports.insideClipPathAttributes = exports.stylingAttributes = exports.commonAttributes = exports.badSoftwareAttributePrefixes = exports.badSoftwareAttributes = exports.junkSVGAttributes = exports.badAttributes = void 0;
+exports.tagSpecificNonPresentationalAttributes = exports.tagSpecificPresentationalAttributes = exports.tagSpecificAnimatedAttributes = exports.feFuncAttributes = exports.commonFeAttributes = exports.commonGradientAttributes = exports.otherAnimationAttributes = exports.animationValueAttributes = exports.animationTimingAttributes = exports.otherShapeAttributes = exports.markerAttributes = exports.presentationalAttributes = exports.otherPresentationalAttributes = exports.commonColorPresentationalAttributes = exports.visibilityPresentationalAttributes = exports.urlPresentationalAttributes = exports.strokePresentationalAttributes = exports.fillPresentationalAttributes = exports.insideClipPathAttributes = exports.stylingAttributes = exports.commonAttributes = exports.badAttributePrefixes = exports.badSoftwareAttributes = exports.junkSVGAttributes = exports.badAttributes = void 0;
 const tags_1 = require("./tags");
 /***** Attributes that are not part of tag specific stuff *****/
 /**
@@ -48,10 +48,12 @@ exports.badSoftwareAttributes = new Set([
     'direction',
 ]);
 // Prefixes. First part of attribute before '-', where all possible attributes that start with prefix are invalid
-exports.badSoftwareAttributePrefixes = new Set([
+exports.badAttributePrefixes = new Set([
     'image',
     'mix',
     'block',
+    'data',
+    'aria',
     // Font stuff
     'text',
     'font',

package/lib/svg/data/attributes.mjs

@@ -30,10 +30,12 @@ var badSoftwareAttributes = new Set([
   "white-space",
   "direction"
 ]);
-var badSoftwareAttributePrefixes = new Set([
+var badAttributePrefixes = new Set([
   "image",
   "mix",
   "block",
+  "data",
+  "aria",
   "text",
   "font",
   "letter",
@@ -324,8 +326,8 @@ var tagSpecificNonPresentationalAttributes = {
 export {
   animationTimingAttributes,
   animationValueAttributes,
+  badAttributePrefixes,
   badAttributes,
-  badSoftwareAttributePrefixes,
   badSoftwareAttributes,
   commonAttributes,
   commonColorPresentationalAttributes,

package/lib/svg/index.js

@@ -54,9 +54,9 @@ class SVG {
     load(content) {
         // Remove junk
         function remove(str1, str2, append) {
-            let start = 0, end;
+            let start = 0;
             while ((start = content.indexOf(str1, start)) !== -1) {
-                end = content.indexOf(str2, start + str1.length);
+                const end = content.indexOf(str2, start + str1.length);
                 if (end === -1) {
                     return;
                 }

package/lib/svg/index.mjs

@@ -26,9 +26,9 @@ var SVG = class {
   }
   load(content) {
     function remove(str1, str2, append) {
-      let start = 0, end;
+      let start = 0;
       while ((start = content.indexOf(str1, start)) !== -1) {
-        end = content.indexOf(str2, start + str1.length);
+        const end = content.indexOf(str2, start + str1.length);
         if (end === -1) {
           return;
         }

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@iconify/tools",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.0.0-dev.1",
+	"version": "2.0.0-dev.2",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",