@iconify/tools 5.0.11 → 5.0.12

package/lib/download/api/cache.js

@@ -1,6 +1,6 @@
 import { scanDirectory } from "../../misc/scan.js";
-import { promises } from "fs";
-import { createHash } from "crypto";
+import { promises } from "node:fs";
+import { createHash } from "node:crypto";
 
 const cacheVersion = 1;
 const storedFiles = Object.create(null);

package/lib/download/api/download.js

@@ -1,6 +1,6 @@
 import { axiosConfig, fetchCallbacks } from "./config.js";
 import { getFetch } from "./fetch.js";
-import { writeFile } from "fs/promises";
+import { writeFile } from "node:fs/promises";
 
 /**
 * Download file

package/lib/download/git/reset.js

@@ -1,5 +1,4 @@
 import { execAsync } from "../../misc/exec.js";
-import "../../index.js";
 
 /**
 * Reset Git repo contents

package/lib/download/github/index.js

@@ -2,7 +2,7 @@ import { prepareDirectoryForExport } from "../../export/helpers/prepare.js";
 import { getGitHubRepoHash } from "./hash.js";
 import { downloadFile } from "../api/download.js";
 import { unzip } from "../helpers/unzip.js";
-import { promises } from "fs";
+import { promises } from "node:fs";
 
 /**
 * Find matching directories

package/lib/download/gitlab/index.js

@@ -3,19 +3,19 @@ import { downloadFile } from "../api/download.js";
 import { unzip } from "../helpers/unzip.js";
 import { defaultGitLabBaseURI } from "./types.js";
 import { getGitLabRepoHash } from "./hash.js";
-import { promises } from "fs";
+import fs from "node:fs/promises";
 
 /**
 * Find matching directories
 */
 async function findMatchingDirs(rootDir, hash) {
 	const matches = [];
-	const files = await promises.readdir(rootDir);
+	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;
-		if ((await promises.stat(rootDir + "/" + file)).isDirectory()) matches.push(file);
+		if ((await fs.stat(rootDir + "/" + file)).isDirectory()) matches.push(file);
 	}
 	return matches;
 }
@@ -30,21 +30,21 @@ async function downloadGitLabRepo(options) {
 	const archiveTarget = rootDir + "/" + hash + ".zip";
 	let exists = false;
 	try {
-		exists = (await promises.stat(archiveTarget)).isFile();
+		exists = (await fs.stat(archiveTarget)).isFile();
 	} catch {}
 	if (!exists) await downloadFile({
 		uri: `${options.uri || defaultGitLabBaseURI}/${options.project}/repository/archive.zip?sha=${hash}`,
 		headers: { Authorization: "token " + options.token }
 	}, archiveTarget);
-	const files = await promises.readdir(rootDir);
+	const files = await fs.readdir(rootDir);
 	const hashSearch = "-" + hash;
 	for (let i = 0; i < files.length; i++) {
 		if (files[i] === hash + ".zip") continue;
 		const filename = rootDir + "/" + files[i];
-		const stat = await promises.lstat(filename);
+		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 promises.rm(filename, {
+			await fs.rm(filename, {
 				force: true,
 				recursive: true
 			});

package/lib/download/helpers/untar.js

@@ -1,5 +1,5 @@
-import { unpackTar } from "modern-tar/fs";
 import { createReadStream } from "node:fs";
+import { unpackTar } from "modern-tar/fs";
 import { createGunzip } from "node:zlib";
 import { pipeline } from "node:stream/promises";
 

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

@@ -1,15 +1,14 @@
 import { ExportTargetOptions } from "../../export/helpers/prepare.js";
 import { DocumentNotModified } from "../types/modified.js";
 import { DownloadSourceMixin } from "../types/sources.js";
+import { NPMPackageOptions } from "./types.js";
 interface IfModifiedSinceOption {
   ifModifiedSince: string | true | DownloadNPMPackageResult;
 }
 /**
  * Options for downloadNPMPackage()
  */
-interface DownloadNPMPackageOptions extends ExportTargetOptions, Partial<IfModifiedSinceOption> {
-  package: string;
-  tag?: string;
+interface DownloadNPMPackageOptions extends NPMPackageOptions, ExportTargetOptions, Partial<IfModifiedSinceOption> {
   log?: boolean;
 }
 /**

package/lib/download/npm/index.js

@@ -2,7 +2,7 @@ import { normalizeDir, prepareDirectoryForExport } from "../../export/helpers/pr
 import { downloadFile } from "../api/download.js";
 import { untar } from "../helpers/untar.js";
 import { getNPMVersion, getPackageVersion } from "./version.js";
-import { promises } from "fs";
+import fs from "node:fs/promises";
 
 async function downloadNPMPackage(options) {
 	const rootDir = options.target = normalizeDir(options.target);
@@ -25,7 +25,7 @@ async function downloadNPMPackage(options) {
 	await prepareDirectoryForExport(options);
 	let archiveExists = false;
 	try {
-		archiveExists = (await promises.stat(archiveTarget)).isFile();
+		archiveExists = (await fs.stat(archiveTarget)).isFile();
 	} catch {}
 	if (!archiveExists) {
 		if (options.log) console.log(`Downloading ${archiveURL}`);

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

@@ -4,5 +4,6 @@
 interface NPMPackageOptions {
   package: string;
   tag?: string;
+  fetch?: boolean;
 }
 export { NPMPackageOptions };

package/lib/download/npm/version.js

@@ -1,23 +1,29 @@
+import { getFetch } from "../api/fetch.js";
 import { execAsync } from "../../misc/exec.js";
-import { promises } from "fs";
+import fs from "node:fs/promises";
 
 /**
 * Get version of package from NPM registry
 */
 async function getNPMVersion(options) {
 	const tag = options.tag || "latest";
-	const result = await execAsync(`npm view ${options.package}@${tag} --json`, { maxBuffer: 1024 * 1024 * 8 });
-	const data = JSON.parse(result.stdout);
+	const packageName = options.package;
+	let data;
+	if (options.fetch) data = await getFetch()(`https://registry.npmjs.org/${packageName}/${tag}`).then((res) => res.json());
+	else {
+		const result = await execAsync(`npm view ${packageName}@${tag} --json`, { maxBuffer: 1024 * 1024 * 8 });
+		data = JSON.parse(result.stdout);
+	}
 	return {
 		version: data.version,
-		file: data.dist?.tarball
+		file: data.dist?.tarball ?? `https://registry.npmjs.org/${packageName}/-/${packageName.split("/").pop()}-${data.version}.tgz`
 	};
 }
 /**
 * Get version of package from filename
 */
 async function getPackageVersion(target) {
-	return JSON.parse(await promises.readFile(target + "/package.json", "utf8")).version;
+	return JSON.parse(await fs.readFile(target + "/package.json", "utf8")).version;
 }
 
 export { getNPMVersion, getPackageVersion };

package/lib/export/directory.js

@@ -1,5 +1,5 @@
 import { prepareDirectoryForExport } from "./helpers/prepare.js";
-import { promises } from "fs";
+import fs from "node:fs/promises";
 
 /**
 * Export icon set to directory
@@ -16,7 +16,7 @@ async function exportToDirectory(iconSet, options) {
 	const store = async (name, target) => {
 		const svg = iconSet.toString(name, customisations);
 		if (!svg) return;
-		await promises.writeFile(target, svg, "utf8");
+		await fs.writeFile(target, svg, "utf8");
 		storedFiles.add(target);
 		if (options.log) console.log(`Saved ${target} (${svg.length} bytes)`);
 	};

package/lib/export/helpers/custom-files.js

@@ -1,5 +1,5 @@
 import { writeJSONFile } from "../../misc/write-json.js";
-import { promises } from "fs";
+import fs from "node:fs/promises";
 
 /**
 * Write custom files
@@ -10,11 +10,11 @@ async function exportCustomFiles(dir, options, result) {
 		const content = customFiles[filename];
 		if (content === null) {
 			try {
-				await promises.unlink(dir + "/" + filename);
+				await fs.unlink(dir + "/" + filename);
 			} catch {}
 			continue;
 		}
-		if (typeof content === "string") await promises.writeFile(dir + "/" + filename, content, "utf8");
+		if (typeof content === "string") await fs.writeFile(dir + "/" + filename, content, "utf8");
 		else if (typeof content === "object") await writeJSONFile(dir + "/" + filename, content);
 		result?.add(filename);
 	}

package/lib/export/icon-package.js

@@ -2,7 +2,7 @@ import { prepareDirectoryForExport } from "./helpers/prepare.js";
 import { writeJSONFile } from "../misc/write-json.js";
 import { exportCustomFiles } from "./helpers/custom-files.js";
 import { getTypesVersion } from "./helpers/types-version.js";
-import { promises } from "fs";
+import fs from "node:fs/promises";
 
 /**
 * Content for .d.ts files
@@ -25,13 +25,13 @@ async function exportIconPackage(iconSet, options) {
 		const data = iconSet.resolve(name, false);
 		if (!data) return;
 		const typesFilename = name + ".d.ts";
-		await promises.writeFile(`${dir}/${typesFilename}`, typesContent, "utf8");
+		await fs.writeFile(`${dir}/${typesFilename}`, typesContent, "utf8");
 		files.add(typesFilename);
 		let content = `const data = ` + JSON.stringify(data, null, "	") + ";\n";
 		if (!esm) content += "exports.__esModule = true;\nexports.default = data;\n";
 		else content += "export default data;\n";
 		const contentFilename = name + ".js";
-		await promises.writeFile(`${dir}/${contentFilename}`, content, "utf8");
+		await fs.writeFile(`${dir}/${contentFilename}`, content, "utf8");
 		files.add(contentFilename);
 	});
 	await exportCustomFiles(dir, options, files);

package/lib/export/json-package.js

@@ -3,7 +3,7 @@ import { writeJSONFile } from "../misc/write-json.js";
 import { exportCustomFiles } from "./helpers/custom-files.js";
 import { getTypesVersion } from "./helpers/types-version.js";
 import { defaultIconDimensions } from "@iconify/utils/lib/icon/defaults";
-import { promises } from "fs";
+import fs from "node:fs/promises";
 
 const exportTypes = {
 	icons: "IconifyJSON",
@@ -105,10 +105,10 @@ async function exportJSONPackage(iconSet, options) {
 		files.add(jsonFilename);
 	}
 	const cjsContent = cjsImports.concat([""], cjsExports);
-	await promises.writeFile(dir + "/index.js", cjsContent.join("\n") + "\n", "utf8");
+	await fs.writeFile(dir + "/index.js", cjsContent.join("\n") + "\n", "utf8");
 	files.add("index.js");
 	const mjsContent = mjsImports.concat([""], mjsConsts, [`export { ${mjsExports.join(", ")} };`]);
-	await promises.writeFile(dir + "/index.mjs", mjsContent.join("\n") + "\n", "utf8");
+	await fs.writeFile(dir + "/index.mjs", mjsContent.join("\n") + "\n", "utf8");
 	files.add("index.mjs");
 	const usedTypes = Object.values(exportTypes);
 	const typesData = [
@@ -117,7 +117,7 @@ async function exportJSONPackage(iconSet, options) {
 		`export { ${usedTypes.join(", ")} };`,
 		""
 	].concat(dtsContent);
-	await promises.writeFile(dir + "/index.d.ts", typesData.join("\n") + "\n", "utf8");
+	await fs.writeFile(dir + "/index.d.ts", typesData.join("\n") + "\n", "utf8");
 	files.add("index.d.ts");
 	await exportCustomFiles(dir, options, files);
 	options.customisePackage?.(packageJSON);

package/lib/import/directory.js

@@ -3,7 +3,8 @@ import { cleanupSVG } from "../svg/cleanup.js";
 import { blankIconSet } from "../icon-set/index.js";
 import { scanDirectory, scanDirectorySync } from "../misc/scan.js";
 import { cleanupIconKeyword } from "../misc/keyword.js";
-import { promises, readFileSync } from "fs";
+import { readFileSync } from "node:fs";
+import { readFile } from "node:fs/promises";
 
 function importDir(iconSet, options, getKeyword, files, readFile, done) {
 	let i = 0;
@@ -63,7 +64,7 @@ function importDirectory(path, options = {}) {
 						else done(result);
 					} else done(params[1]);
 				}, files, (filename, done) => {
-					promises.readFile(filename, "utf8").then(done).catch(reject);
+					readFile(filename, "utf8").then(done).catch(reject);
 				}, fulfill);
 			} catch (err) {
 				reject(err);

package/lib/misc/compare-dirs.js

@@ -1,6 +1,6 @@
 import { scanDirectory } from "./scan.js";
 import { normalizeDir } from "../export/helpers/prepare.js";
-import { promises } from "fs";
+import { readFile } from "node:fs/promises";
 
 /**
 * Extensions that are treated as text
@@ -37,13 +37,13 @@ async function compareDirectories(dir1, dir2, options) {
 		if (!files2.includes(file)) return false;
 		const ext = file.split(".").pop().toLowerCase();
 		if (!textExtensions.has(ext)) {
-			const content1 = await promises.readFile(dir1 + "/" + file);
-			const content2 = await promises.readFile(dir2 + "/" + file);
+			const content1 = await readFile(dir1 + "/" + file);
+			const content2 = await readFile(dir2 + "/" + file);
 			if (Buffer.compare(content1, content2) !== 0) return false;
 			continue;
 		}
-		let content1 = await promises.readFile(dir1 + "/" + file, "utf8");
-		let content2 = await promises.readFile(dir2 + "/" + file, "utf8");
+		let content1 = await readFile(dir1 + "/" + file, "utf8");
+		let content2 = await readFile(dir2 + "/" + file, "utf8");
 		if (content1 === content2) continue;
 		if (ignoreNewLine) {
 			content1 = content1.replace(/\s+\n/g, "\n").trimEnd();

package/lib/misc/exec.d.ts

@@ -1,4 +1,4 @@
-import { ExecOptions } from "child_process";
+import { ExecOptions } from "node:child_process";
 interface ExecResult {
   stdout: string;
   stderr: string;

package/lib/misc/exec.js

@@ -1,5 +1,5 @@
 import { resolve } from "pathe";
-import { exec } from "child_process";
+import { exec } from "node:child_process";
 
 /**
 * Exec as Promise

package/lib/misc/scan.d.ts

@@ -1,4 +1,4 @@
-import { Stats } from "fs";
+import { Stats } from "node:fs";
 /**
  * Callback
  *

package/lib/misc/scan.js

@@ -1,4 +1,4 @@
-import { promises, readdirSync, statSync } from "fs";
+import { promises, readdirSync, statSync } from "node:fs";
 
 /**
 * Reusable functions

package/lib/misc/write-json.js

@@ -1,10 +1,10 @@
-import { promises } from "fs";
+import { writeFile } from "node:fs/promises";
 
 /**
 * Write JSON file
 */
 async function writeJSONFile(filename, data) {
-	return promises.writeFile(filename, JSON.stringify(data, null, "	") + "\n");
+	return writeFile(filename, JSON.stringify(data, null, "	") + "\n");
 }
 
 export { writeJSONFile };

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
   "author": "Vjacheslav Trushkin",
-  "version": "5.0.11",
+  "version": "5.0.12",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",
@@ -14,10 +14,10 @@
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@cyberalien/svg-utils": "^1.2.8",
+    "@cyberalien/svg-utils": "^1.2.15",
     "@iconify/types": "^2.0.0",
-    "@iconify/utils": "^3.1.0",
-    "fflate": "^0.8.2",
+    "@iconify/utils": "^3.1.3",
+    "fflate": "^0.8.3",
     "modern-tar": "^0.7.6",
     "pathe": "^2.0.3",
     "svgo": "^4.0.1"
@@ -26,19 +26,19 @@
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^9.39.4",
     "@types/jest": "^30.0.0",
-    "@types/node": "^24.12.0",
-    "@typescript-eslint/eslint-plugin": "^8.57.2",
-    "@typescript-eslint/parser": "^8.57.2",
+    "@types/node": "^24.12.4",
+    "@typescript-eslint/eslint-plugin": "^8.59.4",
+    "@typescript-eslint/parser": "^8.59.4",
     "cross-env": "^10.1.0",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "globals": "^16.5.0",
-    "prettier": "^3.8.1",
+    "prettier": "^3.8.3",
     "rimraf": "^6.1.3",
     "tsdown": "^0.20.3",
     "typescript": "^5.9.3",
-    "vitest": "^4.1.2"
+    "vitest": "^4.1.6"
   },
   "exports": {
     "./*": "./*",