@iconify/tools 2.0.12 → 2.0.15

package/lib/download/git/index.cjs

@@ -0,0 +1,76 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const export_helpers_prepare = require('../../export/helpers/prepare.cjs');
+const misc_exec = require('../../misc/exec.cjs');
+const download_git_branch = require('./branch.cjs');
+const download_git_hash = require('./hash.cjs');
+const download_git_reset = require('./reset.cjs');
+require('fs');
+require('pathe');
+require('child_process');
+require('cheerio');
+require('@iconify/utils');
+require('@iconify/utils/lib/icon');
+require('../../svg/data/attributes.cjs');
+require('../../svg/data/tags.cjs');
+require('../../svg/cleanup/bad-tags.cjs');
+require('../../svg/parse.cjs');
+require('svgo');
+require('@iconify/utils/lib/svg/build');
+require('@iconify/utils/lib/customisations');
+require('@iconify/utils/lib/icon-set/minify');
+require('@iconify/utils/lib/icon-set/convert-info');
+require('../../icon-set/props.cjs');
+require('node-fetch');
+require('crypto');
+require('../api/download.cjs');
+require('util');
+require('stream');
+require('extract-zip');
+require('tar');
+require('@iconify/utils/lib/colors');
+require('local-pkg');
+
+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 parts = result.stdout.split(/\s/);
+    const latestHash = parts.shift();
+    if (hasHashInTarget) {
+      options.target = options.target.replace("{hash}", latestHash);
+    }
+    try {
+      await download_git_branch.getGitRepoBranch(options, branch);
+      if (ifModifiedSince) {
+        const expectedHash = ifModifiedSince === true ? await download_git_hash.getGitRepoHash(options) : typeof ifModifiedSince === "string" ? ifModifiedSince : ifModifiedSince.downloadType === "git" ? ifModifiedSince.hash : null;
+        if (latestHash === expectedHash) {
+          await download_git_reset.resetGitRepoContents(options.target);
+          return "not_modified";
+        }
+      }
+    } catch {
+    }
+  }
+  const target = options.target = await export_helpers_prepare.prepareDirectoryForExport({
+    ...options,
+    cleanup: true
+  });
+  if (options.log) {
+    console.log(`Cloning ${remote}#${branch} to ${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 {
+    downloadType: "git",
+    contentsDir: target,
+    hash
+  };
+}
+
+exports.downloadGitRepo = downloadGitRepo;

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

@@ -1,13 +1,14 @@
-import { ExportTargetOptions } from '../../export/helpers/prepare';
-import type { DocumentNotModified } from '../types/modified';
-import type { DownloadSourceMixin } from '../types/sources';
+import { ExportTargetOptions } from '../../export/helpers/prepare.js';
+import { DocumentNotModified } from '../types/modified.js';
+import { DownloadSourceMixin } from '../types/sources.js';
+
 interface IfModifiedSinceOption {
     ifModifiedSince: string | true | DownloadGitRepoResult;
 }
 /**
  * Options for downloadGitRepo()
  */
-export interface DownloadGitRepoOptions extends ExportTargetOptions, Partial<IfModifiedSinceOption> {
+interface DownloadGitRepoOptions extends ExportTargetOptions, Partial<IfModifiedSinceOption> {
     remote: string;
     branch: string;
     log?: boolean;
@@ -15,13 +16,14 @@ export interface DownloadGitRepoOptions extends ExportTargetOptions, Partial<IfM
 /**
  * Result
  */
-export interface DownloadGitRepoResult extends DownloadSourceMixin<'git'> {
+interface DownloadGitRepoResult extends DownloadSourceMixin<'git'> {
     contentsDir: string;
     hash: string;
 }
 /**
  * Download Git repo
  */
-export declare function downloadGitRepo<T extends IfModifiedSinceOption & DownloadGitRepoOptions>(options: T): Promise<DownloadGitRepoResult | DocumentNotModified>;
-export declare function downloadGitRepo(options: DownloadGitRepoOptions): Promise<DownloadGitRepoResult>;
-export {};
+declare function downloadGitRepo<T extends IfModifiedSinceOption & DownloadGitRepoOptions>(options: T): Promise<DownloadGitRepoResult | DocumentNotModified>;
+declare function downloadGitRepo(options: DownloadGitRepoOptions): Promise<DownloadGitRepoResult>;
+
+export { DownloadGitRepoOptions, DownloadGitRepoResult, downloadGitRepo };

package/lib/download/git/index.mjs

@@ -1,11 +1,34 @@
-// src/download/git/index.ts
-import { promises as fs } from "fs";
-import {
-  prepareDirectoryForExport
-} from "../../export/helpers/prepare.mjs";
-import { execAsync } from "../../misc/exec.mjs";
-import { getGitRepoBranch } from "./branch.mjs";
-import { getGitRepoHash } from "./hash.mjs";
+import { prepareDirectoryForExport } from '../../export/helpers/prepare.mjs';
+import { execAsync } from '../../misc/exec.mjs';
+import { getGitRepoBranch } from './branch.mjs';
+import { getGitRepoHash } from './hash.mjs';
+import { resetGitRepoContents } from './reset.mjs';
+import 'fs';
+import 'pathe';
+import 'child_process';
+import 'cheerio';
+import '@iconify/utils';
+import '@iconify/utils/lib/icon';
+import '../../svg/data/attributes.mjs';
+import '../../svg/data/tags.mjs';
+import '../../svg/cleanup/bad-tags.mjs';
+import '../../svg/parse.mjs';
+import 'svgo';
+import '@iconify/utils/lib/svg/build';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/minify';
+import '@iconify/utils/lib/icon-set/convert-info';
+import '../../icon-set/props.mjs';
+import 'node-fetch';
+import 'crypto';
+import '../api/download.mjs';
+import 'util';
+import 'stream';
+import 'extract-zip';
+import 'tar';
+import '@iconify/utils/lib/colors';
+import 'local-pkg';
+
 async function downloadGitRepo(options) {
   const { remote, branch } = options;
   const hasHashInTarget = options.target.indexOf("{hash}") !== -1;
@@ -22,21 +45,21 @@ async function downloadGitRepo(options) {
       if (ifModifiedSince) {
         const expectedHash = ifModifiedSince === true ? await getGitRepoHash(options) : typeof ifModifiedSince === "string" ? ifModifiedSince : ifModifiedSince.downloadType === "git" ? ifModifiedSince.hash : null;
         if (latestHash === expectedHash) {
+          await resetGitRepoContents(options.target);
           return "not_modified";
         }
       }
-    } catch (err) {
-      options.cleanup = true;
+    } catch {
     }
   }
-  const target = options.target = await prepareDirectoryForExport(options);
-  const files = options.cleanup ? [] : await fs.readdir(target);
-  if (!files.length) {
-    if (options.log) {
-      console.log(`Cloning ${remote}#${branch} to ${target}`);
-    }
-    await execAsync(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
+  const target = options.target = await prepareDirectoryForExport({
+    ...options,
+    cleanup: true
+  });
+  if (options.log) {
+    console.log(`Cloning ${remote}#${branch} to ${target}`);
   }
+  await execAsync(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
   const hash = await getGitRepoHash(options);
   await getGitRepoBranch(options, branch);
   return {
@@ -45,6 +68,5 @@ async function downloadGitRepo(options) {
     hash
   };
 }
-export {
-  downloadGitRepo
-};
+
+export { downloadGitRepo };

package/lib/download/git/reset.cjs

@@ -0,0 +1,41 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('cheerio');
+require('@iconify/utils');
+require('@iconify/utils/lib/icon');
+require('../../svg/data/attributes.cjs');
+require('../../svg/data/tags.cjs');
+require('../../svg/cleanup/bad-tags.cjs');
+require('svgo');
+require('@iconify/utils/lib/svg/build');
+require('@iconify/utils/lib/customisations');
+require('@iconify/utils/lib/icon-set/minify');
+require('@iconify/utils/lib/icon-set/convert-info');
+require('../../icon-set/props.cjs');
+require('node-fetch');
+require('fs');
+require('crypto');
+require('pathe');
+const misc_exec = require('../../misc/exec.cjs');
+require('../api/download.cjs');
+require('extract-zip');
+require('tar');
+require('@iconify/utils/lib/colors');
+require('local-pkg');
+require('../../svg/parse.cjs');
+require('child_process');
+require('util');
+require('stream');
+
+async function resetGitRepoContents(target) {
+  await misc_exec.execAsync("git add -A", {
+    cwd: target
+  });
+  await misc_exec.execAsync("git reset --hard --quiet", {
+    cwd: target
+  });
+}
+
+exports.resetGitRepoContents = resetGitRepoContents;

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

@@ -0,0 +1,6 @@
+/**
+ * Reset Git repo contents
+ */
+declare function resetGitRepoContents(target: string): Promise<void>;
+
+export { resetGitRepoContents };

package/lib/download/git/reset.mjs

@@ -0,0 +1,37 @@
+import 'cheerio';
+import '@iconify/utils';
+import '@iconify/utils/lib/icon';
+import '../../svg/data/attributes.mjs';
+import '../../svg/data/tags.mjs';
+import '../../svg/cleanup/bad-tags.mjs';
+import 'svgo';
+import '@iconify/utils/lib/svg/build';
+import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/icon-set/minify';
+import '@iconify/utils/lib/icon-set/convert-info';
+import '../../icon-set/props.mjs';
+import 'node-fetch';
+import 'fs';
+import 'crypto';
+import 'pathe';
+import { execAsync } from '../../misc/exec.mjs';
+import '../api/download.mjs';
+import 'extract-zip';
+import 'tar';
+import '@iconify/utils/lib/colors';
+import 'local-pkg';
+import '../../svg/parse.mjs';
+import 'child_process';
+import 'util';
+import 'stream';
+
+async function resetGitRepoContents(target) {
+  await execAsync("git add -A", {
+    cwd: target
+  });
+  await execAsync("git reset --hard --quiet", {
+    cwd: target
+  });
+}
+
+export { resetGitRepoContents };

package/lib/download/github/hash.cjs

@@ -0,0 +1,32 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const download_api_index = require('../api/index.cjs');
+require('node-fetch');
+require('../api/cache.cjs');
+require('fs');
+require('crypto');
+require('../../misc/scan.cjs');
+
+async function getGitHubRepoHash(options) {
+  const uri = `https://api.github.com/repos/${options.user}/${options.repo}/branches/${options.branch}`;
+  const data = await download_api_index.sendAPIQuery({
+    uri,
+    headers: {
+      Accept: "application/vnd.github.v3+json",
+      Authorization: "token " + options.token
+    }
+  });
+  if (typeof data !== "string") {
+    throw new Error(`Error downloading data from GitHub API: ${data}`);
+  }
+  const content = JSON.parse(data);
+  const hash = content?.commit?.sha;
+  if (typeof hash !== "string") {
+    throw new Error("Error parsing GitHub API response");
+  }
+  return hash;
+}
+
+exports.getGitHubRepoHash = getGitHubRepoHash;

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

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

package/lib/download/github/hash.mjs

@@ -1,7 +1,11 @@
-// src/download/github/hash.ts
-import { sendAPIQuery } from "../api/index.mjs";
+import { sendAPIQuery } from '../api/index.mjs';
+import 'node-fetch';
+import '../api/cache.mjs';
+import 'fs';
+import 'crypto';
+import '../../misc/scan.mjs';
+
 async function getGitHubRepoHash(options) {
-  var _a;
   const uri = `https://api.github.com/repos/${options.user}/${options.repo}/branches/${options.branch}`;
   const data = await sendAPIQuery({
     uri,
@@ -14,12 +18,11 @@ async function getGitHubRepoHash(options) {
     throw new Error(`Error downloading data from GitHub API: ${data}`);
   }
   const content = JSON.parse(data);
-  const hash = (_a = content == null ? void 0 : content.commit) == null ? void 0 : _a.sha;
+  const hash = content?.commit?.sha;
   if (typeof hash !== "string") {
     throw new Error("Error parsing GitHub API response");
   }
   return hash;
 }
-export {
-  getGitHubRepoHash
-};
+
+export { getGitHubRepoHash };

package/lib/download/github/index.cjs

@@ -0,0 +1,98 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const fs = require('fs');
+const export_helpers_prepare = require('../../export/helpers/prepare.cjs');
+const download_github_hash = require('./hash.cjs');
+const download_api_download = require('../api/download.cjs');
+const download_helpers_unzip = require('../helpers/unzip.cjs');
+require('pathe');
+require('../api/index.cjs');
+require('node-fetch');
+require('../api/cache.cjs');
+require('crypto');
+require('../../misc/scan.cjs');
+require('util');
+require('stream');
+require('extract-zip');
+
+async function findMatchingDirs(rootDir, hash) {
+  const matches = [];
+  const files = await fs.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.promises.stat(rootDir + "/" + file);
+    if (stat.isDirectory()) {
+      matches.push(file);
+    }
+  }
+  return matches;
+}
+async function downloadGitHubRepo(options) {
+  const hash = await download_github_hash.getGitHubRepoHash(options);
+  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 export_helpers_prepare.prepareDirectoryForExport(options);
+  const archiveTarget = rootDir + "/" + hash + ".zip";
+  let exists = false;
+  try {
+    const stat = await fs.promises.stat(archiveTarget);
+    exists = stat.isFile();
+  } catch (err) {
+  }
+  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);
+  }
+  const files = await fs.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.promises.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.promises.rm(filename, {
+          force: true,
+          recursive: true
+        });
+      } catch (err) {
+      }
+    }
+  }
+  await download_helpers_unzip.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: "github",
+    rootDir,
+    contentsDir,
+    hash
+  };
+}
+
+exports.downloadGitHubRepo = downloadGitHubRepo;

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

@@ -1,14 +1,15 @@
-import { ExportTargetOptions } from '../../export/helpers/prepare';
-import type { DocumentNotModified } from '../types/modified';
-import type { GitHubAPIOptions } from './types';
-import type { DownloadSourceMixin } from '../types/sources';
+import { ExportTargetOptions } from '../../export/helpers/prepare.js';
+import { DocumentNotModified } from '../types/modified.js';
+import { GitHubAPIOptions } from './types.js';
+import { DownloadSourceMixin } from '../types/sources.js';
+
 interface IfModifiedSinceOption {
     ifModifiedSince: string | DownloadGitHubRepoResult;
 }
 /**
  * Options for downloadGitHubRepo()
  */
-export interface DownloadGitHubRepoOptions extends ExportTargetOptions, GitHubAPIOptions, Partial<IfModifiedSinceOption> {
+interface DownloadGitHubRepoOptions extends ExportTargetOptions, GitHubAPIOptions, Partial<IfModifiedSinceOption> {
     cleanupOldFiles?: boolean;
     cleanupOldDirectories?: boolean;
     log?: boolean;
@@ -16,7 +17,7 @@ export interface DownloadGitHubRepoOptions extends ExportTargetOptions, GitHubAP
 /**
  * Result
  */
-export interface DownloadGitHubRepoResult extends DownloadSourceMixin<'github'> {
+interface DownloadGitHubRepoResult extends DownloadSourceMixin<'github'> {
     rootDir: string;
     contentsDir: string;
     hash: string;
@@ -24,6 +25,7 @@ export interface DownloadGitHubRepoResult extends DownloadSourceMixin<'github'>
 /**
  * Download GitHub repo using API
  */
-export declare function downloadGitHubRepo<T extends IfModifiedSinceOption & DownloadGitHubRepoOptions>(options: T): Promise<DownloadGitHubRepoResult | DocumentNotModified>;
-export declare function downloadGitHubRepo(options: DownloadGitHubRepoOptions): Promise<DownloadGitHubRepoResult>;
-export {};
+declare function downloadGitHubRepo<T extends IfModifiedSinceOption & DownloadGitHubRepoOptions>(options: T): Promise<DownloadGitHubRepoResult | DocumentNotModified>;
+declare function downloadGitHubRepo(options: DownloadGitHubRepoOptions): Promise<DownloadGitHubRepoResult>;
+
+export { DownloadGitHubRepoOptions, DownloadGitHubRepoResult, downloadGitHubRepo };

package/lib/download/github/index.mjs

@@ -1,21 +1,28 @@
-// src/download/github/index.ts
-import { promises as fs } from "fs";
-import {
-  prepareDirectoryForExport
-} from "../../export/helpers/prepare.mjs";
-import { getGitHubRepoHash } from "./hash.mjs";
-import { downloadFile } from "../api/download.mjs";
-import { unzip } from "../helpers/unzip.mjs";
+import { promises } from 'fs';
+import { prepareDirectoryForExport } from '../../export/helpers/prepare.mjs';
+import { getGitHubRepoHash } from './hash.mjs';
+import { downloadFile } from '../api/download.mjs';
+import { unzip } from '../helpers/unzip.mjs';
+import 'pathe';
+import '../api/index.mjs';
+import 'node-fetch';
+import '../api/cache.mjs';
+import 'crypto';
+import '../../misc/scan.mjs';
+import 'util';
+import 'stream';
+import 'extract-zip';
+
 async function findMatchingDirs(rootDir, hash) {
   const matches = [];
-  const files = await fs.readdir(rootDir);
+  const files = await 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.stat(rootDir + "/" + file);
+    const stat = await promises.stat(rootDir + "/" + file);
     if (stat.isDirectory()) {
       matches.push(file);
     }
@@ -36,7 +43,7 @@ async function downloadGitHubRepo(options) {
   const archiveTarget = rootDir + "/" + hash + ".zip";
   let exists = false;
   try {
-    const stat = await fs.stat(archiveTarget);
+    const stat = await promises.stat(archiveTarget);
     exists = stat.isFile();
   } catch (err) {
   }
@@ -50,7 +57,7 @@ async function downloadGitHubRepo(options) {
       }
     }, archiveTarget);
   }
-  const files = await fs.readdir(rootDir);
+  const files = await promises.readdir(rootDir);
   const hashSearch = "-" + hash;
   for (let i = 0; i < files.length; i++) {
     const file = files[i];
@@ -58,11 +65,11 @@ async function downloadGitHubRepo(options) {
       continue;
     }
     const filename = rootDir + "/" + files[i];
-    const stat = await fs.lstat(filename);
+    const stat = await promises.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, {
+        await promises.rm(filename, {
           force: true,
           recursive: true
         });
@@ -83,6 +90,5 @@ async function downloadGitHubRepo(options) {
     hash
   };
 }
-export {
-  downloadGitHubRepo
-};
+
+export { downloadGitHubRepo };

package/lib/download/github/types.cjs

@@ -0,0 +1,2 @@
+'use strict';
+

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

@@ -1,9 +1,11 @@
 /**
  * API options
  */
-export interface GitHubAPIOptions {
+interface GitHubAPIOptions {
     token: string;
     user: string;
     repo: string;
     branch: string;
 }
+
+export { GitHubAPIOptions };

package/lib/download/github/types.mjs

@@ -0,0 +1 @@
+

package/lib/download/gitlab/hash.cjs

@@ -0,0 +1,32 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const download_api_index = require('../api/index.cjs');
+const download_gitlab_types = require('./types.cjs');
+require('node-fetch');
+require('../api/cache.cjs');
+require('fs');
+require('crypto');
+require('../../misc/scan.cjs');
+
+async function getGitLabRepoHash(options) {
+  const uri = `${options.uri || download_gitlab_types.defaultGitLabBaseURI}/${options.project}/repository/branches/${options.branch}/`;
+  const data = await download_api_index.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;
+}
+
+exports.getGitLabRepoHash = getGitLabRepoHash;

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

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