@iconify/tools 2.1.0 → 2.1.2

package/lib/download/api/cache.mjs

@@ -14,15 +14,16 @@ function apiCacheKey(query) {
 }
 async function storeAPICache(options, key, data) {
   const expires = Date.now() + options.ttl * 1e3;
-  const filename = options.dir + "/" + key + "." + expires + ".json";
+  const filename = options.dir + "/" + key + "." + expires.toString() + ".json";
   if (!storedFiles[options.dir]) {
     await getStoredFiles(options.dir);
   }
-  await promises.writeFile(filename, JSON.stringify({
+  const content = {
     version: cacheVersion,
     expires,
     data
-  }, null, 4), "utf8");
+  };
+  await promises.writeFile(filename, JSON.stringify(content, null, 4), "utf8");
   storedFiles[options.dir][key] = {
     filename,
     expires
@@ -38,7 +39,9 @@ async function getAPICache(dir, key) {
   }
   const time = Date.now();
   try {
-    const content = JSON.parse(await promises.readFile(item.filename, "utf8"));
+    const content = JSON.parse(
+      await promises.readFile(item.filename, "utf8")
+    );
     return content.version === cacheVersion && content.expires > time ? content.data : null;
   } catch (err) {
     return null;
@@ -57,23 +60,27 @@ async function getStoredFiles(dir, clear = false) {
     });
   } catch (err) {
   }
-  await scanDirectory(dir, async (ext, file, subdir, path) => {
-    if (ext !== ".json") {
-      return false;
-    }
-    const filename = path + subdir + file + ext;
-    const parts = file.split(".");
-    const expires = parseInt(parts.pop());
-    if (clear || expires < time || parts.length !== 1) {
-      await promises.unlink(filename);
-      return false;
-    }
-    const cacheKey = parts[0];
-    storage[cacheKey] = {
-      filename,
-      expires
-    };
-  }, false);
+  await scanDirectory(
+    dir,
+    async (ext, file, subdir, path) => {
+      if (ext !== ".json") {
+        return false;
+      }
+      const filename = path + subdir + file + ext;
+      const parts = file.split(".");
+      const expires = parseInt(parts.pop());
+      if (clear || expires < time || parts.length !== 1) {
+        await promises.unlink(filename);
+        return false;
+      }
+      const cacheKey = parts[0];
+      storage[cacheKey] = {
+        filename,
+        expires
+      };
+    },
+    false
+  );
 }
 
 export { apiCacheKey, clearAPICache, getAPICache, storeAPICache };

package/lib/download/git/branch.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const misc_exec = require('../../misc/exec.cjs');
-require('path');
+require('pathe');
 require('child_process');
 
 async function getGitRepoBranch(options, checkout) {

package/lib/download/git/branch.mjs

@@ -1,5 +1,5 @@
 import { execAsync } from '../../misc/exec.mjs';
-import 'path';
+import 'pathe';
 import 'child_process';
 
 async function getGitRepoBranch(options, checkout) {

package/lib/download/git/hash.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const misc_exec = require('../../misc/exec.cjs');
-require('path');
+require('pathe');
 require('child_process');
 
 async function getGitRepoHash(options) {

package/lib/download/git/hash.mjs

@@ -1,5 +1,5 @@
 import { execAsync } from '../../misc/exec.mjs';
-import 'path';
+import 'pathe';
 import 'child_process';
 
 async function getGitRepoHash(options) {

package/lib/download/git/index.cjs

@@ -9,7 +9,6 @@ const download_git_hash = require('./hash.cjs');
 const download_git_reset = require('./reset.cjs');
 require('fs');
 require('pathe');
-require('path');
 require('child_process');
 require('cheerio');
 require('@iconify/utils');
@@ -24,6 +23,7 @@ require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('../../icon-set/props.cjs');
 require('@iconify/utils/lib/misc/objects');
+require('@iconify/utils/lib/colors');
 require('node-fetch');
 require('crypto');
 require('../api/download.cjs');
@@ -31,14 +31,15 @@ require('util');
 require('stream');
 require('extract-zip');
 require('tar');
-require('@iconify/utils/lib/colors');
 
 async function downloadGitRepo(options) {
   const { remote, branch } = options;
   const hasHashInTarget = options.target.indexOf("{hash}") !== -1;
   const ifModifiedSince = options.ifModifiedSince;
   if (ifModifiedSince || hasHashInTarget) {
-    const result = await misc_exec.execAsync(`git ls-remote ${remote} --branch ${branch}`);
+    const result = await misc_exec.execAsync(
+      `git ls-remote ${remote} --branch ${branch}`
+    );
     const parts = result.stdout.split(/\s/);
     const latestHash = parts.shift();
     if (hasHashInTarget) {
@@ -63,7 +64,9 @@ async function downloadGitRepo(options) {
   if (options.log) {
     console.log(`Cloning ${remote}#${branch} to ${target}`);
   }
-  await misc_exec.execAsync(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
+  await misc_exec.execAsync(
+    `git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`
+  );
   const hash = await download_git_hash.getGitRepoHash(options);
   await download_git_branch.getGitRepoBranch(options, branch);
   return {

package/lib/download/git/index.mjs

@@ -5,7 +5,6 @@ import { getGitRepoHash } from './hash.mjs';
 import { resetGitRepoContents } from './reset.mjs';
 import 'fs';
 import 'pathe';
-import 'path';
 import 'child_process';
 import 'cheerio';
 import '@iconify/utils';
@@ -20,6 +19,7 @@ import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import '../../icon-set/props.mjs';
 import '@iconify/utils/lib/misc/objects';
+import '@iconify/utils/lib/colors';
 import 'node-fetch';
 import 'crypto';
 import '../api/download.mjs';
@@ -27,14 +27,15 @@ import 'util';
 import 'stream';
 import 'extract-zip';
 import 'tar';
-import '@iconify/utils/lib/colors';
 
 async function downloadGitRepo(options) {
   const { remote, branch } = options;
   const hasHashInTarget = options.target.indexOf("{hash}") !== -1;
   const ifModifiedSince = options.ifModifiedSince;
   if (ifModifiedSince || hasHashInTarget) {
-    const result = await execAsync(`git ls-remote ${remote} --branch ${branch}`);
+    const result = await execAsync(
+      `git ls-remote ${remote} --branch ${branch}`
+    );
     const parts = result.stdout.split(/\s/);
     const latestHash = parts.shift();
     if (hasHashInTarget) {
@@ -59,7 +60,9 @@ async function downloadGitRepo(options) {
   if (options.log) {
     console.log(`Cloning ${remote}#${branch} to ${target}`);
   }
-  await execAsync(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
+  await execAsync(
+    `git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`
+  );
   const hash = await getGitRepoHash(options);
   await getGitRepoBranch(options, branch);
   return {

package/lib/download/git/reset.cjs

@@ -13,6 +13,7 @@ require('@iconify/utils/lib/svg/build');
 require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('../../icon-set/props.cjs');
+require('@iconify/utils/lib/colors');
 require('node-fetch');
 require('fs');
 require('crypto');
@@ -21,10 +22,8 @@ const misc_exec = require('../../misc/exec.cjs');
 require('../api/download.cjs');
 require('extract-zip');
 require('tar');
-require('@iconify/utils/lib/colors');
 require('../../svg/parse.cjs');
 require('@iconify/utils/lib/misc/objects');
-require('path');
 require('child_process');
 require('util');
 require('stream');

package/lib/download/git/reset.mjs

@@ -9,6 +9,7 @@ import '@iconify/utils/lib/svg/build';
 import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import '../../icon-set/props.mjs';
+import '@iconify/utils/lib/colors';
 import 'node-fetch';
 import 'fs';
 import 'crypto';
@@ -17,10 +18,8 @@ import { execAsync } from '../../misc/exec.mjs';
 import '../api/download.mjs';
 import 'extract-zip';
 import 'tar';
-import '@iconify/utils/lib/colors';
 import '../../svg/parse.mjs';
 import '@iconify/utils/lib/misc/objects';
-import 'path';
 import 'child_process';
 import 'util';
 import 'stream';

package/lib/download/github/index.cjs

@@ -53,13 +53,16 @@ async function downloadGitHubRepo(options) {
   }
   if (!exists) {
     const uri = `https://api.github.com/repos/${options.user}/${options.repo}/zipball/${hash}`;
-    await download_api_download.downloadFile({
-      uri,
-      headers: {
-        Accept: "application/vnd.github.v3+json",
-        Authorization: "token " + options.token
-      }
-    }, archiveTarget);
+    await download_api_download.downloadFile(
+      {
+        uri,
+        headers: {
+          Accept: "application/vnd.github.v3+json",
+          Authorization: "token " + options.token
+        }
+      },
+      archiveTarget
+    );
   }
   const files = await fs.promises.readdir(rootDir);
   const hashSearch = "-" + hash;

package/lib/download/github/index.mjs

@@ -49,13 +49,16 @@ async function downloadGitHubRepo(options) {
   }
   if (!exists) {
     const uri = `https://api.github.com/repos/${options.user}/${options.repo}/zipball/${hash}`;
-    await downloadFile({
-      uri,
-      headers: {
-        Accept: "application/vnd.github.v3+json",
-        Authorization: "token " + options.token
-      }
-    }, archiveTarget);
+    await downloadFile(
+      {
+        uri,
+        headers: {
+          Accept: "application/vnd.github.v3+json",
+          Authorization: "token " + options.token
+        }
+      },
+      archiveTarget
+    );
   }
   const files = await promises.readdir(rootDir);
   const hashSearch = "-" + hash;

package/lib/download/gitlab/hash.cjs

@@ -22,7 +22,9 @@ async function getGitLabRepoHash(options) {
     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");
+  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");
   }

package/lib/download/gitlab/hash.mjs

@@ -18,7 +18,9 @@ async function getGitLabRepoHash(options) {
     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");
+  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");
   }

package/lib/download/gitlab/index.cjs

@@ -54,12 +54,15 @@ async function downloadGitLabRepo(options) {
   }
   if (!exists) {
     const uri = `${options.uri || download_gitlab_types.defaultGitLabBaseURI}/${options.project}/repository/archive.zip?sha=${hash}`;
-    await download_api_download.downloadFile({
-      uri,
-      headers: {
-        Authorization: "token " + options.token
-      }
-    }, archiveTarget);
+    await download_api_download.downloadFile(
+      {
+        uri,
+        headers: {
+          Authorization: "token " + options.token
+        }
+      },
+      archiveTarget
+    );
   }
   const files = await fs.promises.readdir(rootDir);
   const hashSearch = "-" + hash;

package/lib/download/gitlab/index.mjs

@@ -50,12 +50,15 @@ async function downloadGitLabRepo(options) {
   }
   if (!exists) {
     const uri = `${options.uri || defaultGitLabBaseURI}/${options.project}/repository/archive.zip?sha=${hash}`;
-    await downloadFile({
-      uri,
-      headers: {
-        Authorization: "token " + options.token
-      }
-    }, archiveTarget);
+    await downloadFile(
+      {
+        uri,
+        headers: {
+          Authorization: "token " + options.token
+        }
+      },
+      archiveTarget
+    );
   }
   const files = await promises.readdir(rootDir);
   const hashSearch = "-" + hash;

package/lib/download/index.cjs

@@ -21,7 +21,6 @@ require('stream');
 require('./helpers/unzip.cjs');
 require('extract-zip');
 require('../misc/exec.cjs');
-require('path');
 require('child_process');
 require('./git/branch.cjs');
 require('./git/hash.cjs');
@@ -39,8 +38,8 @@ require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('../icon-set/props.cjs');
 require('@iconify/utils/lib/misc/objects');
-require('tar');
 require('@iconify/utils/lib/colors');
+require('tar');
 require('./helpers/untar.cjs');
 require('./npm/version.cjs');
 require('./gitlab/hash.cjs');
@@ -57,7 +56,9 @@ function downloadPackage(options) {
     case "npm":
       return download_npm_index.downloadNPMPackage(options);
     default:
-      throw new Error(`Invalid download type: ${options.downloadType}`);
+      throw new Error(
+        `Invalid download type: ${options.downloadType}`
+      );
   }
 }
 

package/lib/download/index.d.ts

@@ -30,16 +30,16 @@ interface DownloadNPMPackage {
 /**
  * Combinations based on type
  */
-declare type DownloadParamsMixin<T extends DownloadSourceType> = T extends 'git' ? DownloadGitRepo : T extends 'github' ? DownloadGitHubRepo : T extends 'gitlab' ? DownloadGitLabRepo : T extends 'npm' ? DownloadNPMPackage : never;
+type DownloadParamsMixin<T extends DownloadSourceType> = T extends 'git' ? DownloadGitRepo : T extends 'github' ? DownloadGitHubRepo : T extends 'gitlab' ? DownloadGitLabRepo : T extends 'npm' ? DownloadNPMPackage : never;
 /**
  * Combinations
  */
-declare type DownloadParams = DownloadGitRepo | DownloadGitHubRepo | DownloadGitLabRepo | DownloadNPMPackage;
+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']>;
+type DownloadOptions<T extends DownloadSourceType> = DownloadParamsMixin<T>['options'];
+type DownloadResult<T extends DownloadSourceType> = Promise<DocumentNotModified | DownloadParamsMixin<T>['result']>;
 declare function downloadPackage<T extends 'git'>(options: DownloadOptions<T>): DownloadResult<T>;
 declare function downloadPackage<T extends 'github'>(options: DownloadOptions<T>): DownloadResult<T>;
 declare function downloadPackage<T extends 'gitlab'>(options: DownloadOptions<T>): DownloadResult<T>;

package/lib/download/index.mjs

@@ -17,7 +17,6 @@ import 'stream';
 import './helpers/unzip.mjs';
 import 'extract-zip';
 import '../misc/exec.mjs';
-import 'path';
 import 'child_process';
 import './git/branch.mjs';
 import './git/hash.mjs';
@@ -35,8 +34,8 @@ import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import '../icon-set/props.mjs';
 import '@iconify/utils/lib/misc/objects';
-import 'tar';
 import '@iconify/utils/lib/colors';
+import 'tar';
 import './helpers/untar.mjs';
 import './npm/version.mjs';
 import './gitlab/hash.mjs';
@@ -53,7 +52,9 @@ function downloadPackage(options) {
     case "npm":
       return downloadNPMPackage(options);
     default:
-      throw new Error(`Invalid download type: ${options.downloadType}`);
+      throw new Error(
+        `Invalid download type: ${options.downloadType}`
+      );
   }
 }
 

package/lib/download/npm/index.cjs

@@ -13,7 +13,6 @@ require('util');
 require('stream');
 require('tar');
 require('../../misc/exec.cjs');
-require('path');
 require('child_process');
 
 async function downloadNPMPackage(options) {
@@ -43,7 +42,9 @@ async function downloadNPMPackage(options) {
   }
   const archiveURL = versionInfo.file;
   if (!archiveURL) {
-    throw new Error(`NPM registry did not provide link to package archive.`);
+    throw new Error(
+      `NPM registry did not provide link to package archive.`
+    );
   }
   const archiveTarget = rootDir + "/" + version + ".tgz";
   await export_helpers_prepare.prepareDirectoryForExport(options);
@@ -57,12 +58,15 @@ async function downloadNPMPackage(options) {
     if (options.log) {
       console.log(`Downloading ${archiveURL}`);
     }
-    await download_api_download.downloadFile({
-      uri: archiveURL,
-      headers: {
-        Accept: "application/tar+gzip"
-      }
-    }, archiveTarget);
+    await download_api_download.downloadFile(
+      {
+        uri: archiveURL,
+        headers: {
+          Accept: "application/tar+gzip"
+        }
+      },
+      archiveTarget
+    );
   }
   await export_helpers_prepare.prepareDirectoryForExport({
     target: contentsDir,

package/lib/download/npm/index.mjs

@@ -9,7 +9,6 @@ import 'util';
 import 'stream';
 import 'tar';
 import '../../misc/exec.mjs';
-import 'path';
 import 'child_process';
 
 async function downloadNPMPackage(options) {
@@ -39,7 +38,9 @@ async function downloadNPMPackage(options) {
   }
   const archiveURL = versionInfo.file;
   if (!archiveURL) {
-    throw new Error(`NPM registry did not provide link to package archive.`);
+    throw new Error(
+      `NPM registry did not provide link to package archive.`
+    );
   }
   const archiveTarget = rootDir + "/" + version + ".tgz";
   await prepareDirectoryForExport(options);
@@ -53,12 +54,15 @@ async function downloadNPMPackage(options) {
     if (options.log) {
       console.log(`Downloading ${archiveURL}`);
     }
-    await downloadFile({
-      uri: archiveURL,
-      headers: {
-        Accept: "application/tar+gzip"
-      }
-    }, archiveTarget);
+    await downloadFile(
+      {
+        uri: archiveURL,
+        headers: {
+          Accept: "application/tar+gzip"
+        }
+      },
+      archiveTarget
+    );
   }
   await prepareDirectoryForExport({
     target: contentsDir,

package/lib/download/npm/version.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const fs = require('fs');
 const misc_exec = require('../../misc/exec.cjs');
-require('path');
+require('pathe');
 require('child_process');
 
 async function getNPMVersion(options) {
@@ -17,7 +17,9 @@ async function getNPMVersion(options) {
   };
 }
 async function getPackageVersion(target) {
-  return JSON.parse(await fs.promises.readFile(target + "/package.json", "utf8")).version;
+  return JSON.parse(
+    await fs.promises.readFile(target + "/package.json", "utf8")
+  ).version;
 }
 
 exports.getNPMVersion = getNPMVersion;

package/lib/download/npm/version.mjs

@@ -1,6 +1,6 @@
 import { promises } from 'fs';
 import { execAsync } from '../../misc/exec.mjs';
-import 'path';
+import 'pathe';
 import 'child_process';
 
 async function getNPMVersion(options) {
@@ -13,7 +13,9 @@ async function getNPMVersion(options) {
   };
 }
 async function getPackageVersion(target) {
-  return JSON.parse(await promises.readFile(target + "/package.json", "utf8")).version;
+  return JSON.parse(
+    await promises.readFile(target + "/package.json", "utf8")
+  ).version;
 }
 
 export { getNPMVersion, getPackageVersion };

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

@@ -1,6 +1,6 @@
 /**
  * Document wasn't modified
  */
-declare type DocumentNotModified = 'not_modified';
+type DocumentNotModified = 'not_modified';
 
 export { DocumentNotModified };

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

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

package/lib/export/directory.d.ts

@@ -1,6 +1,6 @@
 import { IconSet } from '../icon-set/index.js';
 import { ExportTargetOptions } from './helpers/prepare.js';
-import '../types-6360d61e.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 import '../icon-set/types.js';
 import '../svg/index.js';

package/lib/export/helpers/types-version.cjs

@@ -6,7 +6,9 @@ require('local-pkg');
 require('fs');
 
 async function getTypesVersion() {
-  throw new Error(`getTypesVersion() is deprecated, use wildcard to make packages work with all versions`);
+  throw new Error(
+    `getTypesVersion() is deprecated, use wildcard to make packages work with all versions`
+  );
 }
 
 exports.getTypesVersion = getTypesVersion;

package/lib/export/helpers/types-version.mjs

@@ -2,7 +2,9 @@ import 'local-pkg';
 import 'fs';
 
 async function getTypesVersion() {
-  throw new Error(`getTypesVersion() is deprecated, use wildcard to make packages work with all versions`);
+  throw new Error(
+    `getTypesVersion() is deprecated, use wildcard to make packages work with all versions`
+  );
 }
 
 export { getTypesVersion };

package/lib/export/icon-package.d.ts

@@ -1,7 +1,7 @@
 import { IconSet } from '../icon-set/index.js';
 import { ExportTargetOptions } from './helpers/prepare.js';
 import { ExportOptionsWithCustomFiles } from './helpers/custom-files.js';
-import '../types-6360d61e.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 import '../icon-set/types.js';
 import '../svg/index.js';