@iconify/tools 2.0.10 → 2.0.11

package/lib/icon-set/index.js

@@ -71,7 +71,6 @@ class IconSet {
                         parent,
                         props,
                         chars,
-                        categories: new Set(),
                     };
                     entries[name] = entry;
                 }
@@ -111,7 +110,6 @@ class IconSet {
                     const icon = entries[iconName];
                     switch (icon === null || icon === void 0 ? void 0 : icon.type) {
                         case 'icon':
-                        case 'variation':
                             icon.categories.add(item);
                     }
                 });
@@ -461,8 +459,8 @@ class IconSet {
             return null;
         }
         // Find icons
-        const icons = this._filter((_key, item, icon) => {
-            if (item.type === 'alias' || item.props.hidden || (icon === null || icon === void 0 ? void 0 : icon.hidden)) {
+        const icons = this._filter((_key, item) => {
+            if (item.type !== 'icon' || item.props.hidden) {
                 return false;
             }
             return item.categories.has(categoryItem);
@@ -620,26 +618,11 @@ class IconSet {
      * Add/update alias with props
      */
     setVariation(name, parent, props) {
-        // Copy categories
-        let categories;
-        while (!categories) {
-            const parentItem = this.entries[parent];
-            if (!parentItem) {
-                return false;
-            }
-            if (parentItem.type === 'alias') {
-                parent = parentItem.parent;
-            }
-            else {
-                categories = new Set(parentItem.categories);
-            }
-        }
         return this.setItem(name, {
             type: 'variation',
             parent,
             props,
             chars: new Set(),
-            categories,
         });
     }
     /**
@@ -665,7 +648,7 @@ class IconSet {
                     body,
                     props,
                     chars: item.chars,
-                    categories: item.categories,
+                    categories: item.type === 'icon' ? item.categories : new Set(),
                 });
             }
         }
@@ -700,7 +683,6 @@ class IconSet {
         }
         switch (item.type) {
             case 'icon':
-            case 'variation':
                 if (item.categories.has(categoryItem) !== add) {
                     categoryItem.count += add ? 1 : -1;
                     item.categories[add ? 'add' : 'delete'](categoryItem);

package/lib/icon-set/index.mjs

@@ -46,8 +46,7 @@ var IconSet = class {
             type: "variation",
             parent,
             props,
-            chars,
-            categories: new Set()
+            chars
           };
           entries[name] = entry;
         } else {
@@ -82,7 +81,6 @@ var IconSet = class {
           const icon = entries[iconName];
           switch (icon == null ? void 0 : icon.type) {
             case "icon":
-            case "variation":
               icon.categories.add(item);
           }
         });
@@ -363,8 +361,8 @@ var IconSet = class {
     if (!categoryItem) {
       return null;
     }
-    const icons = this._filter((_key, item, icon) => {
-      if (item.type === "alias" || item.props.hidden || (icon == null ? void 0 : icon.hidden)) {
+    const icons = this._filter((_key, item) => {
+      if (item.type !== "icon" || item.props.hidden) {
         return false;
       }
       return item.categories.has(categoryItem);
@@ -488,24 +486,11 @@ var IconSet = class {
     });
   }
   setVariation(name, parent, props) {
-    let categories;
-    while (!categories) {
-      const parentItem = this.entries[parent];
-      if (!parentItem) {
-        return false;
-      }
-      if (parentItem.type === "alias") {
-        parent = parentItem.parent;
-      } else {
-        categories = new Set(parentItem.categories);
-      }
-    }
     return this.setItem(name, {
       type: "variation",
       parent,
       props,
-      chars: new Set(),
-      categories
+      chars: new Set()
     });
   }
   fromSVG(name, svg) {
@@ -526,7 +511,7 @@ var IconSet = class {
           body,
           props,
           chars: item.chars,
-          categories: item.categories
+          categories: item.type === "icon" ? item.categories : new Set()
         });
       }
     }
@@ -554,7 +539,6 @@ var IconSet = class {
     }
     switch (item.type) {
       case "icon":
-      case "variation":
         if (item.categories.has(categoryItem) !== add) {
           categoryItem.count += add ? 1 : -1;
           item.categories[add ? "add" : "delete"](categoryItem);

package/lib/icon-set/merge.js

@@ -66,7 +66,6 @@ function mergeIconSets(oldIcons, newIcons) {
                             ...props,
                             hidden: true,
                         },
-                        categories: new Set(),
                     });
                 }
                 else {

package/lib/icon-set/merge.mjs

@@ -49,8 +49,7 @@ function mergeIconSets(oldIcons, newIcons) {
             props: {
               ...props,
               hidden: true
-            },
-            categories: new Set()
+            }
           });
         } else {
           mergedIcons.setItem(name, {

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

@@ -25,6 +25,8 @@ export interface IconWithChars {
 }
 export interface IconWithPropsData extends IconWithChars {
     props: CommonIconProps;
+}
+export interface IconWithCategories {
     categories: Set<IconCategory>;
 }
 export interface IconParentData {
@@ -33,7 +35,7 @@ export interface IconParentData {
 /**
  * Icon types
  */
-export interface IconSetIcon extends IconWithPropsData {
+export interface IconSetIcon extends IconWithPropsData, IconWithCategories {
     type: 'icon';
     body: string;
 }

package/lib/optimise/flags.js

@@ -64,6 +64,15 @@ function cleanPath(path) {
             });
             currentArgs = [];
             canParseCommandOrComma = true;
+            // Change command for lines after moving
+            switch (currentCommand) {
+                case 'M':
+                    currentCommand = 'L';
+                    break;
+                case 'm':
+                    currentCommand = 'l';
+                    break;
+            }
         }
     };
     const parseNumber = () => {

package/lib/optimise/flags.mjs

@@ -44,6 +44,14 @@ function cleanPath(path) {
       });
       currentArgs = [];
       canParseCommandOrComma = true;
+      switch (currentCommand) {
+        case "M":
+          currentCommand = "L";
+          break;
+        case "m":
+          currentCommand = "l";
+          break;
+      }
     }
   };
   const parseNumber = () => {

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.10",
+	"version": "2.0.11",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -22,7 +22,7 @@
 		"test": "npm run test:jest && npm run test:jasmine"
 	},
 	"dependencies": {
-		"@iconify/utils": "^1.0.22",
+		"@iconify/utils": "^1.0.23",
 		"@types/cheerio": "^0.22.30",
 		"@types/node-fetch": "^2.5.12",
 		"@types/svgo": "^2.6.0",