@iconify/tools 2.0.7 → 2.0.11

package/lib/colors/parse.d.ts

@@ -1,5 +1,6 @@
 import type { Color } from '@iconify/utils/lib/colors/types';
 import type { SVG } from '../svg';
+import { ParseSVGCallbackItem } from '../svg/parse';
 import { ColorAttributes } from './attribs';
 /**
  * Result
@@ -23,9 +24,17 @@ declare type ParseColorsCallback = (attr: ColorAttributes, colorString: string,
 /**
  * Options
  */
+export declare type ParseColorOptionsDefaultColorCallback = (prop: string, item: ExtendedParseSVGCallbackItem) => Color;
 export interface ParseColorsOptions {
     callback?: ParseColorsCallback;
-    defaultColor?: Color | string;
+    defaultColor?: Color | string | ParseColorOptionsDefaultColorCallback;
+}
+/**
+ * Extend properties for item
+ */
+declare type ItemColors = Partial<Record<ColorAttributes, Color | string>>;
+export interface ExtendedParseSVGCallbackItem extends ParseSVGCallbackItem {
+    colors?: ItemColors;
 }
 /**
  * Find colors in icon

package/lib/colors/parse.js

@@ -95,6 +95,10 @@ async function parseColors(svg, options = {}) {
         // Resolve color
         const parsedColor = (0, colors_1.stringToColor)(value);
         const defaultValue = parsedColor || value;
+        // Ignore url()
+        if ((parsedColor === null || parsedColor === void 0 ? void 0 : parsedColor.type) === 'function' && parsedColor.func === 'url') {
+            return value;
+        }
         // Check if callback exists
         if (!options.callback) {
             addColorToItem(prop, defaultValue, item);
@@ -246,10 +250,13 @@ async function parseColors(svg, options = {}) {
                     if (color === attribs_1.defaultBlackColor) {
                         // Default black color: change it
                         if (defaultColor) {
+                            const defaultColorValue = typeof defaultColor === 'function'
+                                ? defaultColor(prop, item)
+                                : defaultColor;
                             // Add color to results and change attribute
-                            findColor(defaultColor, true);
-                            $element.attr(prop, (0, colors_1.colorToString)(defaultColor));
-                            itemColors[prop] = defaultColor;
+                            findColor(defaultColorValue, true);
+                            $element.attr(prop, (0, colors_1.colorToString)(defaultColorValue));
+                            itemColors[prop] = defaultColorValue;
                         }
                         else {
                             result.hasUnsetColor = true;

package/lib/colors/parse.mjs

@@ -77,6 +77,9 @@ async function parseColors(svg, options = {}) {
     }
     const parsedColor = stringToColor(value);
     const defaultValue = parsedColor || value;
+    if ((parsedColor == null ? void 0 : parsedColor.type) === "function" && parsedColor.func === "url") {
+      return value;
+    }
     if (!options.callback) {
       addColorToItem(prop, defaultValue, item);
       return value;
@@ -198,9 +201,10 @@ async function parseColors(svg, options = {}) {
           const color = getElementColor(prop, item);
           if (color === defaultBlackColor) {
             if (defaultColor) {
-              findColor(defaultColor, true);
-              $element.attr(prop, colorToString(defaultColor));
-              itemColors[prop] = defaultColor;
+              const defaultColorValue = typeof defaultColor === "function" ? defaultColor(prop, item) : defaultColor;
+              findColor(defaultColorValue, true);
+              $element.attr(prop, colorToString(defaultColorValue));
+              itemColors[prop] = defaultColorValue;
             } else {
               result.hasUnsetColor = true;
             }

package/lib/colors/validate.js

@@ -35,9 +35,12 @@ async function validateColors(svg, expectMonotone, options) {
                     throw new Error('Unexpected color: ' + (0, colors_1.colorToString)(color));
                 }
                 return;
-            // Do not allow other colors
             default:
-                throw new Error('Unexpected color: ' + (0, colors_1.colorToString)(color));
+                // Allow url()
+                if (color.type !== 'function' || color.func !== 'url') {
+                    // Do not allow other colors
+                    throw new Error('Unexpected color: ' + (0, colors_1.colorToString)(color));
+                }
         }
     });
     return palette;

package/lib/colors/validate.mjs

@@ -23,7 +23,9 @@ async function validateColors(svg, expectMonotone, options) {
         }
         return;
       default:
-        throw new Error("Unexpected color: " + colorToString(color));
+        if (color.type !== "function" || color.func !== "url") {
+          throw new Error("Unexpected color: " + colorToString(color));
+        }
     }
   });
   return palette;

package/lib/download/github/index.d.ts

@@ -6,7 +6,7 @@ interface IfModifiedSinceOption {
     ifModifiedSince: string | DownloadGitHubRepoResult;
 }
 /**
- * Options for downloadGitRepo()
+ * Options for downloadGitHubRepo()
  */
 export interface DownloadGitHubRepoOptions extends ExportTargetOptions, GitHubAPIOptions, Partial<IfModifiedSinceOption> {
     cleanupOldFiles?: boolean;

package/lib/download/gitlab/hash.d.ts

@@ -0,0 +1,5 @@
+import { GitLabAPIOptions } from './types';
+/**
+ * Get latest hash from GitHub using API
+ */
+export declare function getGitLabRepoHash(options: GitLabAPIOptions): Promise<string>;

package/lib/download/gitlab/hash.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGitLabRepoHash = void 0;
+const api_1 = require("../api");
+const types_1 = require("./types");
+/**
+ * Get latest hash from GitHub using API
+ */
+async function getGitLabRepoHash(options) {
+    const uri = `${options.uri || types_1.defaultGitLabBaseURI}/${options.project}/repository/branches/${options.branch}/`;
+    const data = await (0, api_1.sendAPIQuery)({
+        uri,
+        headers: {
+            Authorization: 'token ' + options.token,
+        },
+    });
+    if (typeof data !== 'string') {
+        throw new Error(`Error downloading data from GitLab API: ${data}`);
+    }
+    const content = JSON.parse(data);
+    const item = (content instanceof Array ? content : [content]).find((item) => item.name === options.branch && typeof item.commit.id === 'string');
+    if (!item) {
+        throw new Error('Error parsing GitLab API response');
+    }
+    return item.commit.id;
+}
+exports.getGitLabRepoHash = getGitLabRepoHash;

package/lib/download/gitlab/hash.mjs

@@ -0,0 +1,24 @@
+// src/download/gitlab/hash.ts
+import { sendAPIQuery } from "../api/index.mjs";
+import { defaultGitLabBaseURI } from "./types.mjs";
+async function getGitLabRepoHash(options) {
+  const uri = `${options.uri || defaultGitLabBaseURI}/${options.project}/repository/branches/${options.branch}/`;
+  const data = await sendAPIQuery({
+    uri,
+    headers: {
+      Authorization: "token " + options.token
+    }
+  });
+  if (typeof data !== "string") {
+    throw new Error(`Error downloading data from GitLab API: ${data}`);
+  }
+  const content = JSON.parse(data);
+  const item = (content instanceof Array ? content : [content]).find((item2) => item2.name === options.branch && typeof item2.commit.id === "string");
+  if (!item) {
+    throw new Error("Error parsing GitLab API response");
+  }
+  return item.commit.id;
+}
+export {
+  getGitLabRepoHash
+};

package/lib/download/gitlab/index.d.ts

@@ -0,0 +1,29 @@
+import { ExportTargetOptions } from '../../export/helpers/prepare';
+import type { DocumentNotModified } from '../types/modified';
+import { GitLabAPIOptions } from './types';
+import type { DownloadSourceMixin } from '../types/sources';
+interface IfModifiedSinceOption {
+    ifModifiedSince: string | DownloadGitLabRepoResult;
+}
+/**
+ * Options for downloadGitLabRepo()
+ */
+export interface DownloadGitLabRepoOptions extends ExportTargetOptions, GitLabAPIOptions, Partial<IfModifiedSinceOption> {
+    cleanupOldFiles?: boolean;
+    cleanupOldDirectories?: boolean;
+    log?: boolean;
+}
+/**
+ * Result
+ */
+export interface DownloadGitLabRepoResult extends DownloadSourceMixin<'gitlab'> {
+    rootDir: string;
+    contentsDir: string;
+    hash: string;
+}
+/**
+ * Download GitLab repo using API
+ */
+export declare function downloadGitLabRepo<T extends IfModifiedSinceOption & DownloadGitLabRepoOptions>(options: T): Promise<DownloadGitLabRepoResult | DocumentNotModified>;
+export declare function downloadGitLabRepo(options: DownloadGitLabRepoOptions): Promise<DownloadGitLabRepoResult>;
+export {};

package/lib/download/gitlab/index.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadGitLabRepo = void 0;
+const fs_1 = require("fs");
+const prepare_1 = require("../../export/helpers/prepare");
+const hash_1 = require("./hash");
+const types_1 = require("./types");
+const download_1 = require("../api/download");
+const unzip_1 = require("../helpers/unzip");
+/**
+ * Find matching directories
+ */
+async function findMatchingDirs(rootDir, hash) {
+    const matches = [];
+    const files = await fs_1.promises.readdir(rootDir);
+    for (let i = 0; i < files.length; i++) {
+        const file = files[i];
+        const lastChunk = file.split('-').pop();
+        if (lastChunk.length < 4 ||
+            lastChunk !== hash.slice(0, lastChunk.length)) {
+            continue;
+        }
+        const stat = await fs_1.promises.stat(rootDir + '/' + file);
+        if (stat.isDirectory()) {
+            matches.push(file);
+        }
+    }
+    return matches;
+}
+async function downloadGitLabRepo(options) {
+    // Check for last commit
+    const hash = await (0, hash_1.getGitLabRepoHash)(options);
+    const ifModifiedSince = options.ifModifiedSince;
+    if (ifModifiedSince) {
+        const expectedHash = typeof ifModifiedSince === 'string'
+            ? ifModifiedSince
+            : ifModifiedSince.downloadType === 'gitlab'
+                ? ifModifiedSince.hash
+                : null;
+        if (hash === expectedHash) {
+            return 'not_modified';
+        }
+    }
+    // Replace hash in target
+    options.target = options.target.replace('{hash}', hash);
+    // Prepare target directory
+    const rootDir = (options.target = await (0, prepare_1.prepareDirectoryForExport)(options));
+    // Archive name
+    const archiveTarget = rootDir + '/' + hash + '.zip';
+    // Check if archive exists
+    let exists = false;
+    try {
+        const stat = await fs_1.promises.stat(archiveTarget);
+        exists = stat.isFile();
+    }
+    catch (err) {
+        //
+    }
+    // Download file
+    if (!exists) {
+        const uri = `${options.uri || types_1.defaultGitLabBaseURI}/${options.project}/repository/archive.zip?sha=${hash}`;
+        await (0, download_1.downloadFile)({
+            uri,
+            headers: {
+                Authorization: 'token ' + options.token,
+            },
+        }, archiveTarget);
+    }
+    // Clean up old directories
+    const files = await fs_1.promises.readdir(rootDir);
+    const hashSearch = '-' + hash;
+    for (let i = 0; i < files.length; i++) {
+        const file = files[i];
+        if (file === hash + '.zip') {
+            continue;
+        }
+        const filename = rootDir + '/' + files[i];
+        const stat = await fs_1.promises.lstat(filename);
+        const isDir = stat.isDirectory();
+        if (
+        // Remove symbolic links
+        stat.isSymbolicLink() ||
+            // Remove if directory matches hash to avoid errors extracting zip
+            (isDir && filename.slice(0 - hashSearch.length) === hashSearch) ||
+            // Remove if directory and cleanupOldDirectories is not disabled
+            (isDir && options.cleanupOldDirectories !== false) ||
+            // Remove if file and cleanupOldFiles is enabled
+            (!isDir && options.cleanupOldFiles)) {
+            try {
+                await fs_1.promises.rm(filename, {
+                    force: true,
+                    recursive: true,
+                });
+            }
+            catch (err) {
+                //
+            }
+        }
+    }
+    // Unpack it
+    await (0, unzip_1.unzip)(archiveTarget, rootDir);
+    // Get actual dir
+    const matchingDirs = await findMatchingDirs(rootDir, hash);
+    if (matchingDirs.length !== 1) {
+        throw new Error(`Error unpacking ${hash}.zip`);
+    }
+    const contentsDir = rootDir + '/' + matchingDirs[0];
+    return {
+        downloadType: 'gitlab',
+        rootDir,
+        contentsDir,
+        hash,
+    };
+}
+exports.downloadGitLabRepo = downloadGitLabRepo;

package/lib/download/gitlab/index.mjs

@@ -0,0 +1,88 @@
+// src/download/gitlab/index.ts
+import { promises as fs } from "fs";
+import {
+  prepareDirectoryForExport
+} from "../../export/helpers/prepare.mjs";
+import { getGitLabRepoHash } from "./hash.mjs";
+import { defaultGitLabBaseURI } from "./types.mjs";
+import { downloadFile } from "../api/download.mjs";
+import { unzip } from "../helpers/unzip.mjs";
+async function findMatchingDirs(rootDir, hash) {
+  const matches = [];
+  const files = await fs.readdir(rootDir);
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    const lastChunk = file.split("-").pop();
+    if (lastChunk.length < 4 || lastChunk !== hash.slice(0, lastChunk.length)) {
+      continue;
+    }
+    const stat = await fs.stat(rootDir + "/" + file);
+    if (stat.isDirectory()) {
+      matches.push(file);
+    }
+  }
+  return matches;
+}
+async function downloadGitLabRepo(options) {
+  const hash = await getGitLabRepoHash(options);
+  const ifModifiedSince = options.ifModifiedSince;
+  if (ifModifiedSince) {
+    const expectedHash = typeof ifModifiedSince === "string" ? ifModifiedSince : ifModifiedSince.downloadType === "gitlab" ? ifModifiedSince.hash : null;
+    if (hash === expectedHash) {
+      return "not_modified";
+    }
+  }
+  options.target = options.target.replace("{hash}", hash);
+  const rootDir = options.target = await prepareDirectoryForExport(options);
+  const archiveTarget = rootDir + "/" + hash + ".zip";
+  let exists = false;
+  try {
+    const stat = await fs.stat(archiveTarget);
+    exists = stat.isFile();
+  } catch (err) {
+  }
+  if (!exists) {
+    const uri = `${options.uri || defaultGitLabBaseURI}/${options.project}/repository/archive.zip?sha=${hash}`;
+    await downloadFile({
+      uri,
+      headers: {
+        Authorization: "token " + options.token
+      }
+    }, archiveTarget);
+  }
+  const files = await fs.readdir(rootDir);
+  const hashSearch = "-" + hash;
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    if (file === hash + ".zip") {
+      continue;
+    }
+    const filename = rootDir + "/" + files[i];
+    const stat = await fs.lstat(filename);
+    const isDir = stat.isDirectory();
+    if (stat.isSymbolicLink() || isDir && filename.slice(0 - hashSearch.length) === hashSearch || isDir && options.cleanupOldDirectories !== false || !isDir && options.cleanupOldFiles) {
+      try {
+        await fs.rm(filename, {
+          force: true,
+          recursive: true
+        });
+      } catch (err) {
+      }
+    }
+  }
+  await unzip(archiveTarget, rootDir);
+  const matchingDirs = await findMatchingDirs(rootDir, hash);
+  if (matchingDirs.length !== 1) {
+    throw new Error(`Error unpacking ${hash}.zip`);
+  }
+  const contentsDir = rootDir + "/" + matchingDirs[0];
+  return {
+    downloadType: "gitlab",
+    rootDir,
+    contentsDir,
+    hash
+  };
+}
+export {
+  downloadGitLabRepo
+};

package/lib/download/gitlab/types.d.ts

@@ -0,0 +1,13 @@
+/**
+ * API options
+ */
+export interface GitLabAPIOptions {
+    uri?: string;
+    token: string;
+    project: string;
+    branch: string;
+}
+/**
+ * Default base URI for GitLab API
+ */
+export declare const defaultGitLabBaseURI = "https://gitlab.com/api/v4/projects";

package/lib/download/gitlab/types.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultGitLabBaseURI = void 0;
+/**
+ * Default base URI for GitLab API
+ */
+exports.defaultGitLabBaseURI = 'https://gitlab.com/api/v4/projects';

package/lib/download/gitlab/types.mjs

@@ -0,0 +1,5 @@
+// src/download/gitlab/types.ts
+var defaultGitLabBaseURI = "https://gitlab.com/api/v4/projects";
+export {
+  defaultGitLabBaseURI
+};

package/lib/download/index.d.ts

@@ -3,18 +3,41 @@ import { DownloadGitRepoOptions, DownloadGitRepoResult } from './git';
 import { DownloadNPMPackageOptions, DownloadNPMPackageResult } from './npm';
 import type { DocumentNotModified } from './types/modified';
 import type { DownloadSourceMixin, DownloadSourceType } from './types/sources';
+import { DownloadGitLabRepoOptions, DownloadGitLabRepoResult } from './gitlab';
 /**
- * Add downloadType to options
+ * Options and result combinations
  */
-declare type ExtendedDownloadGitRepoOptions = DownloadGitRepoOptions & DownloadSourceMixin<'git'>;
-declare type ExtendedDownloadGitHubRepoOptions = DownloadGitHubRepoOptions & DownloadSourceMixin<'github'>;
-declare type ExtendedDownloadNPMPackageOptions = DownloadNPMPackageOptions & DownloadSourceMixin<'npm'>;
-export declare type DownloadOptions<T extends DownloadSourceType> = T extends 'git' ? ExtendedDownloadGitRepoOptions : T extends 'github' ? ExtendedDownloadGitHubRepoOptions : T extends 'npm' ? ExtendedDownloadNPMPackageOptions : never;
+interface DownloadGitRepo {
+    options: DownloadGitRepoOptions & DownloadSourceMixin<'git'>;
+    result: DownloadGitRepoResult;
+}
+interface DownloadGitHubRepo {
+    options: DownloadGitHubRepoOptions & DownloadSourceMixin<'github'>;
+    result: DownloadGitHubRepoResult;
+}
+interface DownloadGitLabRepo {
+    options: DownloadGitLabRepoOptions & DownloadSourceMixin<'gitlab'>;
+    result: DownloadGitLabRepoResult;
+}
+interface DownloadNPMPackage {
+    options: DownloadNPMPackageOptions & DownloadSourceMixin<'npm'>;
+    result: DownloadNPMPackageResult;
+}
 /**
- * Result type from downloadType
+ * Combinations based on type
  */
-export declare type DownloadResult<T extends DownloadSourceType> = T extends 'git' ? DownloadGitRepoResult : T extends 'github' ? DownloadGitHubRepoResult : T extends 'npm' ? DownloadNPMPackageResult : never;
-export declare function downloadPackage<T extends 'git'>(options: DownloadOptions<T>): Promise<DocumentNotModified | DownloadResult<T>>;
-export declare function downloadPackage<T extends 'github'>(options: DownloadOptions<T>): Promise<DocumentNotModified | DownloadResult<T>>;
-export declare function downloadPackage<T extends 'npm'>(options: DownloadOptions<T>): Promise<DocumentNotModified | DownloadResult<T>>;
+export declare type DownloadParamsMixin<T extends DownloadSourceType> = T extends 'git' ? DownloadGitRepo : T extends 'github' ? DownloadGitHubRepo : T extends 'gitlab' ? DownloadGitLabRepo : T extends 'npm' ? DownloadNPMPackage : never;
+/**
+ * Combinations
+ */
+export declare type DownloadParams = DownloadGitRepo | DownloadGitHubRepo | DownloadGitLabRepo | DownloadNPMPackage;
+/**
+ * Pick options or result from combinations
+ */
+declare type DownloadOptions<T extends DownloadSourceType> = DownloadParamsMixin<T>['options'];
+declare type DownloadResult<T extends DownloadSourceType> = Promise<DocumentNotModified | DownloadParamsMixin<T>['result']>;
+export declare function downloadPackage<T extends 'git'>(options: DownloadOptions<T>): DownloadResult<T>;
+export declare function downloadPackage<T extends 'github'>(options: DownloadOptions<T>): DownloadResult<T>;
+export declare function downloadPackage<T extends 'gitlab'>(options: DownloadOptions<T>): DownloadResult<T>;
+export declare function downloadPackage<T extends 'npm'>(options: DownloadOptions<T>): DownloadResult<T>;
 export {};

package/lib/download/index.js

@@ -4,23 +4,24 @@ exports.downloadPackage = void 0;
 const github_1 = require("./github");
 const git_1 = require("./git");
 const npm_1 = require("./npm");
+const gitlab_1 = require("./gitlab");
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function assertNever(v) {
     //
 }
 function downloadPackage(options) {
-    const type = options.downloadType;
-    switch (type) {
-        case 'git': {
+    switch (options.downloadType) {
+        case 'git':
             return (0, git_1.downloadGitRepo)(options);
-        }
         case 'github':
             return (0, github_1.downloadGitHubRepo)(options);
+        case 'gitlab':
+            return (0, gitlab_1.downloadGitLabRepo)(options);
         case 'npm':
             return (0, npm_1.downloadNPMPackage)(options);
         default:
-            assertNever(type);
-            throw new Error(`Invalid download type: ${type}`);
+            assertNever(options);
+            throw new Error(`Invalid download type: ${options.downloadType}`);
     }
 }
 exports.downloadPackage = downloadPackage;

package/lib/download/index.mjs

@@ -8,21 +8,24 @@ import {
 import {
   downloadNPMPackage
 } from "./npm/index.mjs";
+import {
+  downloadGitLabRepo
+} from "./gitlab/index.mjs";
 function assertNever(v) {
 }
 function downloadPackage(options) {
-  const type = options.downloadType;
-  switch (type) {
-    case "git": {
+  switch (options.downloadType) {
+    case "git":
       return downloadGitRepo(options);
-    }
     case "github":
       return downloadGitHubRepo(options);
+    case "gitlab":
+      return downloadGitLabRepo(options);
     case "npm":
       return downloadNPMPackage(options);
     default:
-      assertNever(type);
-      throw new Error(`Invalid download type: ${type}`);
+      assertNever(options);
+      throw new Error(`Invalid download type: ${options.downloadType}`);
   }
 }
 export {

package/lib/download/types/sources.d.ts

@@ -1,7 +1,7 @@
 /**
  * Download types
  */
-export declare type DownloadSourceType = 'git' | 'github' | 'npm';
+export declare type DownloadSourceType = 'git' | 'github' | 'gitlab' | 'npm';
 /**
  * Type in other objects
  */

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);
                     }
                 });
@@ -342,6 +340,7 @@ class IconSet {
             .forEach((item) => {
             const names = this.listCategory(item);
             if (names) {
+                names.sort((a, b) => a.localeCompare(b));
                 categories[item.title] = names;
             }
         });
@@ -460,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);
@@ -619,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,
         });
     }
     /**
@@ -664,7 +648,7 @@ class IconSet {
                     body,
                     props,
                     chars: item.chars,
-                    categories: item.categories,
+                    categories: item.type === 'icon' ? item.categories : new Set(),
                 });
             }
         }
@@ -699,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);
           }
         });
@@ -271,6 +269,7 @@ var IconSet = class {
     Array.from(this.categories).sort((a, b) => a.title.localeCompare(b.title)).forEach((item) => {
       const names2 = this.listCategory(item);
       if (names2) {
+        names2.sort((a, b) => a.localeCompare(b));
         categories[item.title] = names2;
       }
     });
@@ -362,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);
@@ -487,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) {
@@ -525,7 +511,7 @@ var IconSet = class {
           body,
           props,
           chars: item.chars,
-          categories: item.categories
+          categories: item.type === "icon" ? item.categories : new Set()
         });
       }
     }
@@ -553,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/index.d.ts

@@ -16,6 +16,8 @@ export { getGitRepoHash } from './download/git/hash';
 export { getGitRepoBranch } from './download/git/branch';
 export { downloadGitHubRepo } from './download/github/index';
 export { getGitHubRepoHash } from './download/github/hash';
+export { downloadGitLabRepo } from './download/gitlab/index';
+export { getGitLabRepoHash } from './download/gitlab/hash';
 export { downloadNPMPackage } from './download/npm/index';
 export { getNPMVersion, getPackageVersion } from './download/npm/version';
 export { downloadPackage } from './download/index';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendAPIQuery = exports.bumpVersion = exports.cleanupIconKeyword = exports.execAsync = exports.untar = exports.unzip = exports.compareDirectories = exports.scanDirectory = exports.prepareDirectoryForExport = exports.writeJSONFile = exports.exportJSONPackage = exports.exportIconPackage = exports.exportToDirectory = exports.scaleSVG = exports.deOptimisePaths = exports.runSVGO = exports.validateColors = exports.isEmptyColor = exports.parseColors = exports.downloadPackage = exports.getPackageVersion = exports.getNPMVersion = exports.downloadNPMPackage = exports.getGitHubRepoHash = exports.downloadGitHubRepo = exports.getGitRepoBranch = exports.getGitRepoHash = exports.downloadGitRepo = exports.importDirectory = exports.importFromFigma = exports.mergeIconSets = exports.blankIconSet = exports.IconSet = exports.convertStyleToAttrs = exports.cleanupSVGRoot = exports.cleanupInlineStyle = exports.checkBadTags = exports.removeBadAttributes = exports.cleanupSVG = exports.parseSVGStyle = exports.parseSVG = exports.SVG = void 0;
+exports.sendAPIQuery = exports.bumpVersion = exports.cleanupIconKeyword = exports.execAsync = exports.untar = exports.unzip = exports.compareDirectories = exports.scanDirectory = exports.prepareDirectoryForExport = exports.writeJSONFile = exports.exportJSONPackage = exports.exportIconPackage = exports.exportToDirectory = exports.scaleSVG = exports.deOptimisePaths = exports.runSVGO = exports.validateColors = exports.isEmptyColor = exports.parseColors = exports.downloadPackage = exports.getPackageVersion = exports.getNPMVersion = exports.downloadNPMPackage = exports.getGitLabRepoHash = exports.downloadGitLabRepo = exports.getGitHubRepoHash = exports.downloadGitHubRepo = exports.getGitRepoBranch = exports.getGitRepoHash = exports.downloadGitRepo = exports.importDirectory = exports.importFromFigma = exports.mergeIconSets = exports.blankIconSet = exports.IconSet = exports.convertStyleToAttrs = exports.cleanupSVGRoot = exports.cleanupInlineStyle = exports.checkBadTags = exports.removeBadAttributes = exports.cleanupSVG = exports.parseSVGStyle = exports.parseSVG = exports.SVG = void 0;
 // SVG class and functions
 var index_1 = require("./svg/index");
 Object.defineProperty(exports, "SVG", { enumerable: true, get: function () { return index_1.SVG; } });
@@ -43,13 +43,17 @@ var index_5 = require("./download/github/index");
 Object.defineProperty(exports, "downloadGitHubRepo", { enumerable: true, get: function () { return index_5.downloadGitHubRepo; } });
 var hash_2 = require("./download/github/hash");
 Object.defineProperty(exports, "getGitHubRepoHash", { enumerable: true, get: function () { return hash_2.getGitHubRepoHash; } });
-var index_6 = require("./download/npm/index");
-Object.defineProperty(exports, "downloadNPMPackage", { enumerable: true, get: function () { return index_6.downloadNPMPackage; } });
+var index_6 = require("./download/gitlab/index");
+Object.defineProperty(exports, "downloadGitLabRepo", { enumerable: true, get: function () { return index_6.downloadGitLabRepo; } });
+var hash_3 = require("./download/gitlab/hash");
+Object.defineProperty(exports, "getGitLabRepoHash", { enumerable: true, get: function () { return hash_3.getGitLabRepoHash; } });
+var index_7 = require("./download/npm/index");
+Object.defineProperty(exports, "downloadNPMPackage", { enumerable: true, get: function () { return index_7.downloadNPMPackage; } });
 var version_1 = require("./download/npm/version");
 Object.defineProperty(exports, "getNPMVersion", { enumerable: true, get: function () { return version_1.getNPMVersion; } });
 Object.defineProperty(exports, "getPackageVersion", { enumerable: true, get: function () { return version_1.getPackageVersion; } });
-var index_7 = require("./download/index");
-Object.defineProperty(exports, "downloadPackage", { enumerable: true, get: function () { return index_7.downloadPackage; } });
+var index_8 = require("./download/index");
+Object.defineProperty(exports, "downloadPackage", { enumerable: true, get: function () { return index_8.downloadPackage; } });
 // Manipulation
 var parse_2 = require("./colors/parse");
 Object.defineProperty(exports, "parseColors", { enumerable: true, get: function () { return parse_2.parseColors; } });
@@ -89,5 +93,5 @@ var keyword_1 = require("./misc/keyword");
 Object.defineProperty(exports, "cleanupIconKeyword", { enumerable: true, get: function () { return keyword_1.cleanupIconKeyword; } });
 var bump_version_1 = require("./misc/bump-version");
 Object.defineProperty(exports, "bumpVersion", { enumerable: true, get: function () { return bump_version_1.bumpVersion; } });
-var index_8 = require("./download/api/index");
-Object.defineProperty(exports, "sendAPIQuery", { enumerable: true, get: function () { return index_8.sendAPIQuery; } });
+var index_9 = require("./download/api/index");
+Object.defineProperty(exports, "sendAPIQuery", { enumerable: true, get: function () { return index_9.sendAPIQuery; } });

package/lib/index.mjs

@@ -17,6 +17,8 @@ import { getGitRepoHash } from "./download/git/hash.mjs";
 import { getGitRepoBranch } from "./download/git/branch.mjs";
 import { downloadGitHubRepo } from "./download/github/index.mjs";
 import { getGitHubRepoHash } from "./download/github/hash.mjs";
+import { downloadGitLabRepo } from "./download/gitlab/index.mjs";
+import { getGitLabRepoHash } from "./download/gitlab/hash.mjs";
 import { downloadNPMPackage } from "./download/npm/index.mjs";
 import { getNPMVersion, getPackageVersion } from "./download/npm/version.mjs";
 import { downloadPackage } from "./download/index.mjs";
@@ -52,6 +54,7 @@ export {
   convertStyleToAttrs,
   deOptimisePaths,
   downloadGitHubRepo,
+  downloadGitLabRepo,
   downloadGitRepo,
   downloadNPMPackage,
   downloadPackage,
@@ -60,6 +63,7 @@ export {
   exportJSONPackage,
   exportToDirectory,
   getGitHubRepoHash,
+  getGitLabRepoHash,
   getGitRepoBranch,
   getGitRepoHash,
   getNPMVersion,

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/lib/optimise/svgo.js

@@ -45,7 +45,7 @@ exports.shapeModifiyingSVGOPlugins = [
             noSpaceAfterFlags: true,
         },
     },
-    'removeOffCanvasPaths',
+    // 'removeOffCanvasPaths', // bugged for some icons
     'reusePaths',
 ];
 /**

package/lib/optimise/svgo.mjs

@@ -40,7 +40,6 @@ var shapeModifiyingSVGOPlugins = [
       noSpaceAfterFlags: true
     }
   },
-  "removeOffCanvasPaths",
   "reusePaths"
 ];
 async function runSVGO(svg, options = {}) {

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

@@ -77,7 +77,7 @@ async function cleanupSVGRoot(svg) {
             $root.removeAttr(attr);
             return;
         }
-        console.log(`Removing unexpected attribute on SVG: ${attr}`);
+        console.warn(`Removing unexpected attribute on SVG: ${attr}`);
         $root.removeAttr(attr);
     });
     if (Object.keys(moveToChildren).length) {

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

@@ -60,7 +60,7 @@ async function cleanupSVGRoot(svg) {
       $root.removeAttr(attr);
       return;
     }
-    console.log(`Removing unexpected attribute on SVG: ${attr}`);
+    console.warn(`Removing unexpected attribute on SVG: ${attr}`);
     $root.removeAttr(attr);
   });
   if (Object.keys(moveToChildren).length) {

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.7",
+	"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.21",
+		"@iconify/utils": "^1.0.23",
 		"@types/cheerio": "^0.22.30",
 		"@types/node-fetch": "^2.5.12",
 		"@types/svgo": "^2.6.0",
@@ -136,6 +136,22 @@
 			"require": "./lib/download/github/types.js",
 			"import": "./lib/download/github/types.mjs"
 		},
+		"./lib/download/gitlab/hash": {
+			"require": "./lib/download/gitlab/hash.js",
+			"import": "./lib/download/gitlab/hash.mjs"
+		},
+		"./lib/download/gitlab": {
+			"require": "./lib/download/gitlab/index.js",
+			"import": "./lib/download/gitlab/index.mjs"
+		},
+		"./lib/download/gitlab/index": {
+			"require": "./lib/download/gitlab/index.js",
+			"import": "./lib/download/gitlab/index.mjs"
+		},
+		"./lib/download/gitlab/types": {
+			"require": "./lib/download/gitlab/types.js",
+			"import": "./lib/download/gitlab/types.mjs"
+		},
 		"./lib/download/helpers/untar": {
 			"require": "./lib/download/helpers/untar.js",
 			"import": "./lib/download/helpers/untar.mjs"