@iconify/tools 2.0.6 → 2.0.10

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/git/branch.d.ts

@@ -0,0 +1,5 @@
+import type { ExportTargetOptions } from '../../export/helpers/prepare';
+/**
+ * Get current branch from cloned git repo
+ */
+export declare function getGitRepoBranch(options: ExportTargetOptions, checkout?: string): Promise<string>;

package/lib/download/git/branch.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGitRepoBranch = void 0;
+const exec_1 = require("../../misc/exec");
+/**
+ * Get current branch from cloned git repo
+ */
+async function getGitRepoBranch(options, checkout) {
+    const result = await (0, exec_1.execAsync)('git branch --show-current', {
+        cwd: options.target,
+    });
+    const branch = result.stdout.trim();
+    if (typeof checkout === 'string' && branch !== checkout) {
+        // Checkout correct branch
+        await (0, exec_1.execAsync)(`git checkout ${checkout}`, {
+            cwd: options.target,
+        });
+        return await getGitRepoBranch(options);
+    }
+    return branch;
+}
+exports.getGitRepoBranch = getGitRepoBranch;

package/lib/download/git/branch.mjs

@@ -0,0 +1,18 @@
+// src/download/git/branch.ts
+import { execAsync } from "../../misc/exec.mjs";
+async function getGitRepoBranch(options, checkout) {
+  const result = await execAsync("git branch --show-current", {
+    cwd: options.target
+  });
+  const branch = result.stdout.trim();
+  if (typeof checkout === "string" && branch !== checkout) {
+    await execAsync(`git checkout ${checkout}`, {
+      cwd: options.target
+    });
+    return await getGitRepoBranch(options);
+  }
+  return branch;
+}
+export {
+  getGitRepoBranch
+};

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

@@ -1,7 +1,8 @@
 import { ExportTargetOptions } from '../../export/helpers/prepare';
 import type { DocumentNotModified } from '../types/modified';
+import type { DownloadSourceMixin } from '../types/sources';
 interface IfModifiedSinceOption {
-    ifModifiedSince: string | true;
+    ifModifiedSince: string | true | DownloadGitRepoResult;
 }
 /**
  * Options for downloadGitRepo()
@@ -14,8 +15,8 @@ export interface DownloadGitRepoOptions extends ExportTargetOptions, Partial<IfM
 /**
  * Result
  */
-export interface DownloadGitRepoResult {
-    target: string;
+export interface DownloadGitRepoResult extends DownloadSourceMixin<'git'> {
+    contentsDir: string;
     hash: string;
 }
 /**

package/lib/download/git/index.js

@@ -4,12 +4,14 @@ exports.downloadGitRepo = void 0;
 const fs_1 = require("fs");
 const prepare_1 = require("../../export/helpers/prepare");
 const exec_1 = require("../../misc/exec");
+const branch_1 = require("./branch");
 const hash_1 = require("./hash");
 async function downloadGitRepo(options) {
     const { remote, branch } = options;
     // Check for last commit
     const hasHashInTarget = options.target.indexOf('{hash}') !== -1;
-    if (options.ifModifiedSince || hasHashInTarget) {
+    const ifModifiedSince = options.ifModifiedSince;
+    if (ifModifiedSince || hasHashInTarget) {
         // Get actual hash
         const result = await (0, exec_1.execAsync)(`git ls-remote ${remote} --branch ${branch}`);
         const parts = result.stdout.split(/\s/);
@@ -17,19 +19,26 @@ async function downloadGitRepo(options) {
         if (hasHashInTarget) {
             options.target = options.target.replace('{hash}', latestHash);
         }
-        if (options.ifModifiedSince) {
-            try {
+        try {
+            // Make sure correct branch is checked out. This will throw error if branch is not available
+            await (0, branch_1.getGitRepoBranch)(options, branch);
+            if (ifModifiedSince) {
                 // Get expected hash
-                const expectedHash = options.ifModifiedSince === true
+                const expectedHash = ifModifiedSince === true
                     ? await (0, hash_1.getGitRepoHash)(options)
-                    : options.ifModifiedSince;
+                    : typeof ifModifiedSince === 'string'
+                        ? ifModifiedSince
+                        : ifModifiedSince.downloadType === 'git'
+                            ? ifModifiedSince.hash
+                            : null;
                 if (latestHash === expectedHash) {
                     return 'not_modified';
                 }
             }
-            catch (err) {
-                //
-            }
+        }
+        catch (err) {
+            // Cleanup on error
+            options.cleanup = true;
         }
     }
     // Prepare target directory
@@ -42,10 +51,12 @@ async function downloadGitRepo(options) {
         }
         await (0, exec_1.execAsync)(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
     }
-    // Get latest hash
+    // Get latest hash and make sure correct branch is available
     const hash = await (0, hash_1.getGitRepoHash)(options);
+    await (0, branch_1.getGitRepoBranch)(options, branch);
     return {
-        target,
+        downloadType: 'git',
+        contentsDir: target,
         hash,
     };
 }

package/lib/download/git/index.mjs

@@ -4,25 +4,29 @@ import {
   prepareDirectoryForExport
 } from "../../export/helpers/prepare.mjs";
 import { execAsync } from "../../misc/exec.mjs";
+import { getGitRepoBranch } from "./branch.mjs";
 import { getGitRepoHash } from "./hash.mjs";
 async function downloadGitRepo(options) {
   const { remote, branch } = options;
   const hasHashInTarget = options.target.indexOf("{hash}") !== -1;
-  if (options.ifModifiedSince || hasHashInTarget) {
+  const ifModifiedSince = options.ifModifiedSince;
+  if (ifModifiedSince || hasHashInTarget) {
     const result = await execAsync(`git ls-remote ${remote} --branch ${branch}`);
     const parts = result.stdout.split(/\s/);
     const latestHash = parts.shift();
     if (hasHashInTarget) {
       options.target = options.target.replace("{hash}", latestHash);
     }
-    if (options.ifModifiedSince) {
-      try {
-        const expectedHash = options.ifModifiedSince === true ? await getGitRepoHash(options) : options.ifModifiedSince;
+    try {
+      await getGitRepoBranch(options, branch);
+      if (ifModifiedSince) {
+        const expectedHash = ifModifiedSince === true ? await getGitRepoHash(options) : typeof ifModifiedSince === "string" ? ifModifiedSince : ifModifiedSince.downloadType === "git" ? ifModifiedSince.hash : null;
         if (latestHash === expectedHash) {
           return "not_modified";
         }
-      } catch (err) {
       }
+    } catch (err) {
+      options.cleanup = true;
     }
   }
   const target = options.target = await prepareDirectoryForExport(options);
@@ -34,8 +38,10 @@ async function downloadGitRepo(options) {
     await execAsync(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
   }
   const hash = await getGitRepoHash(options);
+  await getGitRepoBranch(options, branch);
   return {
-    target,
+    downloadType: "git",
+    contentsDir: target,
     hash
   };
 }

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

@@ -1,11 +1,12 @@
 import { ExportTargetOptions } from '../../export/helpers/prepare';
 import type { DocumentNotModified } from '../types/modified';
 import type { GitHubAPIOptions } from './types';
+import type { DownloadSourceMixin } from '../types/sources';
 interface IfModifiedSinceOption {
-    ifModifiedSince: string;
+    ifModifiedSince: string | DownloadGitHubRepoResult;
 }
 /**
- * Options for downloadGitRepo()
+ * Options for downloadGitHubRepo()
  */
 export interface DownloadGitHubRepoOptions extends ExportTargetOptions, GitHubAPIOptions, Partial<IfModifiedSinceOption> {
     cleanupOldFiles?: boolean;
@@ -15,9 +16,9 @@ export interface DownloadGitHubRepoOptions extends ExportTargetOptions, GitHubAP
 /**
  * Result
  */
-export interface DownloadGitHubRepoResult {
+export interface DownloadGitHubRepoResult extends DownloadSourceMixin<'github'> {
     rootDir: string;
-    actualDir: string;
+    contentsDir: string;
     hash: string;
 }
 /**

package/lib/download/github/index.js

@@ -29,8 +29,16 @@ async function findMatchingDirs(rootDir, hash) {
 async function downloadGitHubRepo(options) {
     // Check for last commit
     const hash = await (0, hash_1.getGitHubRepoHash)(options);
-    if (options.ifModifiedSince && hash === options.ifModifiedSince) {
-        return 'not_modified';
+    const ifModifiedSince = options.ifModifiedSince;
+    if (ifModifiedSince) {
+        const expectedHash = typeof ifModifiedSince === 'string'
+            ? ifModifiedSince
+            : ifModifiedSince.downloadType === 'github'
+                ? ifModifiedSince.hash
+                : null;
+        if (hash === expectedHash) {
+            return 'not_modified';
+        }
     }
     // Replace hash in target
     options.target = options.target.replace('{hash}', hash);
@@ -97,10 +105,11 @@ async function downloadGitHubRepo(options) {
     if (matchingDirs.length !== 1) {
         throw new Error(`Error unpacking ${hash}.zip`);
     }
-    const actualDir = rootDir + '/' + matchingDirs[0];
+    const contentsDir = rootDir + '/' + matchingDirs[0];
     return {
+        downloadType: 'github',
         rootDir,
-        actualDir,
+        contentsDir,
         hash,
     };
 }

package/lib/download/github/index.mjs

@@ -24,8 +24,12 @@ async function findMatchingDirs(rootDir, hash) {
 }
 async function downloadGitHubRepo(options) {
   const hash = await getGitHubRepoHash(options);
-  if (options.ifModifiedSince && hash === options.ifModifiedSince) {
-    return "not_modified";
+  const ifModifiedSince = options.ifModifiedSince;
+  if (ifModifiedSince) {
+    const expectedHash = typeof ifModifiedSince === "string" ? ifModifiedSince : ifModifiedSince.downloadType === "github" ? ifModifiedSince.hash : null;
+    if (hash === expectedHash) {
+      return "not_modified";
+    }
   }
   options.target = options.target.replace("{hash}", hash);
   const rootDir = options.target = await prepareDirectoryForExport(options);
@@ -71,10 +75,11 @@ async function downloadGitHubRepo(options) {
   if (matchingDirs.length !== 1) {
     throw new Error(`Error unpacking ${hash}.zip`);
   }
-  const actualDir = rootDir + "/" + matchingDirs[0];
+  const contentsDir = rootDir + "/" + matchingDirs[0];
   return {
+    downloadType: "github",
     rootDir,
-    actualDir,
+    contentsDir,
     hash
   };
 }

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

@@ -0,0 +1,43 @@
+import { DownloadGitHubRepoOptions, DownloadGitHubRepoResult } from './github';
+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';
+/**
+ * Options and result combinations
+ */
+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;
+}
+/**
+ * Combinations based on type
+ */
+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

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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) {
+    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(options);
+            throw new Error(`Invalid download type: ${options.downloadType}`);
+    }
+}
+exports.downloadPackage = downloadPackage;

package/lib/download/index.mjs

@@ -0,0 +1,33 @@
+// src/download/index.ts
+import {
+  downloadGitHubRepo
+} from "./github/index.mjs";
+import {
+  downloadGitRepo
+} from "./git/index.mjs";
+import {
+  downloadNPMPackage
+} from "./npm/index.mjs";
+import {
+  downloadGitLabRepo
+} from "./gitlab/index.mjs";
+function assertNever(v) {
+}
+function downloadPackage(options) {
+  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(options);
+      throw new Error(`Invalid download type: ${options.downloadType}`);
+  }
+}
+export {
+  downloadPackage
+};

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

@@ -1,7 +1,8 @@
 import { ExportTargetOptions } from '../../export/helpers/prepare';
 import type { DocumentNotModified } from '../types/modified';
+import type { DownloadSourceMixin } from '../types/sources';
 interface IfModifiedSinceOption {
-    ifModifiedSince: string | true;
+    ifModifiedSince: string | true | DownloadNPMPackageResult;
 }
 /**
  * Options for downloadNPMPackage()
@@ -14,9 +15,9 @@ export interface DownloadNPMPackageOptions extends ExportTargetOptions, Partial<
 /**
  * Result
  */
-export interface DownloadNPMPackageResult {
+export interface DownloadNPMPackageResult extends DownloadSourceMixin<'npm'> {
     rootDir: string;
-    actualDir: string;
+    contentsDir: string;
     version: string;
 }
 /**

package/lib/download/npm/index.js

@@ -8,22 +8,39 @@ const untar_1 = require("../helpers/untar");
 const version_1 = require("./version");
 async function downloadNPMPackage(options) {
     const rootDir = (options.target = (0, prepare_1.normalizeDir)(options.target));
-    const actualDir = rootDir + '/package';
+    const contentsDir = rootDir + '/package';
     // Get latest location
     const versionInfo = await (0, version_1.getNPMVersion)(options);
     const version = versionInfo.version;
     // Check downloaded copy
-    if (options.ifModifiedSince) {
+    const ifModifiedSince = options.ifModifiedSince;
+    if (ifModifiedSince) {
         try {
-            const expectedVersion = options.ifModifiedSince === true
-                ? await (0, version_1.getPackageVersion)(actualDir)
-                : options.ifModifiedSince;
+            let expectedVersion;
+            if (typeof ifModifiedSince === 'object') {
+                // Make sure result object matches
+                if (ifModifiedSince.downloadType === 'npm' &&
+                    ifModifiedSince.rootDir === rootDir &&
+                    ifModifiedSince.contentsDir === contentsDir) {
+                    expectedVersion = ifModifiedSince.version;
+                }
+                else {
+                    expectedVersion = null;
+                }
+            }
+            else {
+                expectedVersion =
+                    ifModifiedSince === true
+                        ? await (0, version_1.getPackageVersion)(contentsDir)
+                        : ifModifiedSince;
+            }
             if (version === expectedVersion) {
                 return 'not_modified';
             }
         }
         catch (err) {
-            //
+            // Clean up on error
+            options.cleanup = true;
         }
     }
     const archiveURL = versionInfo.file;
@@ -56,7 +73,7 @@ async function downloadNPMPackage(options) {
     }
     // Remove old unpacked file
     await (0, prepare_1.prepareDirectoryForExport)({
-        target: actualDir,
+        target: contentsDir,
         cleanup: true,
     });
     // Unpack file
@@ -65,8 +82,9 @@ async function downloadNPMPackage(options) {
     }
     await (0, untar_1.untar)(archiveTarget, rootDir);
     return {
+        downloadType: 'npm',
         rootDir,
-        actualDir,
+        contentsDir,
         version,
     };
 }

package/lib/download/npm/index.mjs

@@ -9,16 +9,27 @@ import { untar } from "../helpers/untar.mjs";
 import { getNPMVersion, getPackageVersion } from "./version.mjs";
 async function downloadNPMPackage(options) {
   const rootDir = options.target = normalizeDir(options.target);
-  const actualDir = rootDir + "/package";
+  const contentsDir = rootDir + "/package";
   const versionInfo = await getNPMVersion(options);
   const version = versionInfo.version;
-  if (options.ifModifiedSince) {
+  const ifModifiedSince = options.ifModifiedSince;
+  if (ifModifiedSince) {
     try {
-      const expectedVersion = options.ifModifiedSince === true ? await getPackageVersion(actualDir) : options.ifModifiedSince;
+      let expectedVersion;
+      if (typeof ifModifiedSince === "object") {
+        if (ifModifiedSince.downloadType === "npm" && ifModifiedSince.rootDir === rootDir && ifModifiedSince.contentsDir === contentsDir) {
+          expectedVersion = ifModifiedSince.version;
+        } else {
+          expectedVersion = null;
+        }
+      } else {
+        expectedVersion = ifModifiedSince === true ? await getPackageVersion(contentsDir) : ifModifiedSince;
+      }
       if (version === expectedVersion) {
         return "not_modified";
       }
     } catch (err) {
+      options.cleanup = true;
     }
   }
   const archiveURL = versionInfo.file;
@@ -45,7 +56,7 @@ async function downloadNPMPackage(options) {
     }, archiveTarget);
   }
   await prepareDirectoryForExport({
-    target: actualDir,
+    target: contentsDir,
     cleanup: true
   });
   if (options.log) {
@@ -53,8 +64,9 @@ async function downloadNPMPackage(options) {
   }
   await untar(archiveTarget, rootDir);
   return {
+    downloadType: "npm",
     rootDir,
-    actualDir,
+    contentsDir,
     version
   };
 }

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

@@ -0,0 +1,10 @@
+/**
+ * Download types
+ */
+export declare type DownloadSourceType = 'git' | 'github' | 'gitlab' | 'npm';
+/**
+ * Type in other objects
+ */
+export interface DownloadSourceMixin<T extends DownloadSourceType> {
+    downloadType: T;
+}

package/lib/download/types/sources.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/icon-set/index.js

@@ -342,6 +342,7 @@ class IconSet {
             .forEach((item) => {
             const names = this.listCategory(item);
             if (names) {
+                names.sort((a, b) => a.localeCompare(b));
                 categories[item.title] = names;
             }
         });

package/lib/icon-set/index.mjs

@@ -271,6 +271,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;
       }
     });

package/lib/index.d.ts

@@ -13,10 +13,14 @@ export { importFromFigma } from './import/figma/index';
 export { importDirectory } from './import/directory';
 export { downloadGitRepo } from './download/git/index';
 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';
 export { parseColors, isEmptyColor } from './colors/parse';
 export { validateColors } from './colors/validate';
 export { runSVGO } from './optimise/svgo';

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.getPackageVersion = exports.getNPMVersion = exports.downloadNPMPackage = exports.getGitHubRepoHash = exports.downloadGitHubRepo = 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; } });
@@ -37,15 +37,23 @@ var index_4 = require("./download/git/index");
 Object.defineProperty(exports, "downloadGitRepo", { enumerable: true, get: function () { return index_4.downloadGitRepo; } });
 var hash_1 = require("./download/git/hash");
 Object.defineProperty(exports, "getGitRepoHash", { enumerable: true, get: function () { return hash_1.getGitRepoHash; } });
+var branch_1 = require("./download/git/branch");
+Object.defineProperty(exports, "getGitRepoBranch", { enumerable: true, get: function () { return branch_1.getGitRepoBranch; } });
 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_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; } });
@@ -85,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_7 = require("./download/api/index");
-Object.defineProperty(exports, "sendAPIQuery", { enumerable: true, get: function () { return index_7.sendAPIQuery; } });
+var index_9 = require("./download/api/index");
+Object.defineProperty(exports, "sendAPIQuery", { enumerable: true, get: function () { return index_9.sendAPIQuery; } });

package/lib/index.mjs

@@ -14,10 +14,14 @@ import { importFromFigma } from "./import/figma/index.mjs";
 import { importDirectory } from "./import/directory.mjs";
 import { downloadGitRepo } from "./download/git/index.mjs";
 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";
 import { parseColors, isEmptyColor } from "./colors/parse.mjs";
 import { validateColors } from "./colors/validate.mjs";
 import { runSVGO } from "./optimise/svgo.mjs";
@@ -50,13 +54,17 @@ export {
   convertStyleToAttrs,
   deOptimisePaths,
   downloadGitHubRepo,
+  downloadGitLabRepo,
   downloadGitRepo,
   downloadNPMPackage,
+  downloadPackage,
   execAsync,
   exportIconPackage,
   exportJSONPackage,
   exportToDirectory,
   getGitHubRepoHash,
+  getGitLabRepoHash,
+  getGitRepoBranch,
   getGitRepoHash,
   getNPMVersion,
   getPackageVersion,

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.6",
+	"version": "2.0.10",
 	"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.22",
 		"@types/cheerio": "^0.22.30",
 		"@types/node-fetch": "^2.5.12",
 		"@types/svgo": "^2.6.0",
@@ -104,6 +104,10 @@
 			"require": "./lib/download/api/types.js",
 			"import": "./lib/download/api/types.mjs"
 		},
+		"./lib/download/git/branch": {
+			"require": "./lib/download/git/branch.js",
+			"import": "./lib/download/git/branch.mjs"
+		},
 		"./lib/download/git/hash": {
 			"require": "./lib/download/git/hash.js",
 			"import": "./lib/download/git/hash.mjs"
@@ -132,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"
@@ -140,6 +160,14 @@
 			"require": "./lib/download/helpers/unzip.js",
 			"import": "./lib/download/helpers/unzip.mjs"
 		},
+		"./lib/download": {
+			"require": "./lib/download/index.js",
+			"import": "./lib/download/index.mjs"
+		},
+		"./lib/download/index": {
+			"require": "./lib/download/index.js",
+			"import": "./lib/download/index.mjs"
+		},
 		"./lib/download/npm": {
 			"require": "./lib/download/npm/index.js",
 			"import": "./lib/download/npm/index.mjs"
@@ -160,6 +188,10 @@
 			"require": "./lib/download/types/modified.js",
 			"import": "./lib/download/types/modified.mjs"
 		},
+		"./lib/download/types/sources": {
+			"require": "./lib/download/types/sources.js",
+			"import": "./lib/download/types/sources.mjs"
+		},
 		"./lib/export/directory": {
 			"require": "./lib/export/directory.js",
 			"import": "./lib/export/directory.mjs"