@iconify/tools 5.0.0-beta.2 → 5.0.0-beta.4

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

@@ -2,6 +2,7 @@ import { ExportTargetOptions } from "../../export/helpers/prepare.js";
 import { DocumentNotModified } from "../types/modified.js";
 import { DownloadSourceMixin } from "../types/sources.js";
 import { GitHubAPIOptions } from "./types.js";
+import { UnzipFilterCallback } from "../helpers/unzip.js";
 interface IfModifiedSinceOption {
   ifModifiedSince: string | DownloadGitHubRepoResult;
 }
@@ -12,6 +13,7 @@ interface DownloadGitHubRepoOptions extends ExportTargetOptions, GitHubAPIOption
   cleanupOldFiles?: boolean;
   cleanupOldDirectories?: boolean;
   log?: boolean;
+  filter?: UnzipFilterCallback;
 }
 /**
  * Result

package/lib/download/github/index.js

@@ -30,7 +30,7 @@ async function downloadGitHubRepo(options) {
 	let exists = false;
 	try {
 		exists = (await promises.stat(archiveTarget)).isFile();
-	} catch (err) {}
+	} catch {}
 	if (!exists) await downloadFile({
 		uri: `https://api.github.com/repos/${options.user}/${options.repo}/zipball/${hash}`,
 		headers: {
@@ -50,9 +50,9 @@ async function downloadGitHubRepo(options) {
 				force: true,
 				recursive: true
 			});
-		} catch (err) {}
+		} catch {}
 	}
-	await unzip(archiveTarget, rootDir);
+	await unzip(archiveTarget, rootDir, options.filter);
 	const matchingDirs = await findMatchingDirs(rootDir, hash);
 	if (matchingDirs.length !== 1) throw new Error(`Error unpacking ${hash}.zip`);
 	return {

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

@@ -1,6 +1,7 @@
 import { ExportTargetOptions } from "../../export/helpers/prepare.js";
 import { DocumentNotModified } from "../types/modified.js";
 import { DownloadSourceMixin } from "../types/sources.js";
+import { UnzipFilterCallback } from "../helpers/unzip.js";
 import { GitLabAPIOptions } from "./types.js";
 interface IfModifiedSinceOption {
   ifModifiedSince: string | DownloadGitLabRepoResult;
@@ -12,6 +13,7 @@ interface DownloadGitLabRepoOptions extends ExportTargetOptions, GitLabAPIOption
   cleanupOldFiles?: boolean;
   cleanupOldDirectories?: boolean;
   log?: boolean;
+  filter?: UnzipFilterCallback;
 }
 /**
  * Result

package/lib/download/gitlab/index.js

@@ -31,7 +31,7 @@ async function downloadGitLabRepo(options) {
 	let exists = false;
 	try {
 		exists = (await promises.stat(archiveTarget)).isFile();
-	} catch (err) {}
+	} catch {}
 	if (!exists) await downloadFile({
 		uri: `${options.uri || defaultGitLabBaseURI}/${options.project}/repository/archive.zip?sha=${hash}`,
 		headers: { Authorization: "token " + options.token }
@@ -48,9 +48,9 @@ async function downloadGitLabRepo(options) {
 				force: true,
 				recursive: true
 			});
-		} catch (err) {}
+		} catch {}
 	}
-	await unzip(archiveTarget, rootDir);
+	await unzip(archiveTarget, rootDir, options.filter);
 	const matchingDirs = await findMatchingDirs(rootDir, hash);
 	if (matchingDirs.length !== 1) throw new Error(`Error unpacking ${hash}.zip`);
 	return {

package/lib/download/helpers/unzip.d.ts

@@ -1,5 +1,6 @@
+type UnzipFilterCallback = (file: string) => boolean;
 /**
  * Unzip archive
  */
-declare function unzip(source: string, path: string): Promise<void>;
-export { unzip };
+declare function unzip(source: string, path: string, filter?: UnzipFilterCallback): Promise<void>;
+export { UnzipFilterCallback, unzip };

package/lib/download/helpers/unzip.js

@@ -5,14 +5,15 @@ import { unzip as unzip$1 } from "fflate";
 /**
 * Unzip archive
 */
-async function unzip(source, path) {
+async function unzip(source, path, filter) {
 	const dir = normalize(path);
 	const data = await readFile(source);
 	async function writeFiles(data$1) {
 		const createdDirs = /* @__PURE__ */ new Set();
 		for (const name in data$1) {
 			const filePath = normalize(join(dir, name));
-			if (filePath.startsWith("/") || filePath.includes("..") || filePath.includes(":")) throw new Error("Invalid file path in zip: " + filePath);
+			if (filter && !filter(filePath)) continue;
+			if (filePath.startsWith("/") || filePath.includes("../") || filePath.includes(":")) throw new Error("Invalid file path in zip: " + filePath);
 			if (filePath.includes("/._")) continue;
 			const isDir = filePath.endsWith("/");
 			const fileDir = isDir ? filePath.slice(0, filePath.length - 1) : dirname(filePath);

package/lib/index.d.ts

@@ -14,11 +14,11 @@ import { getGitRepoHash } from "./download/git/hash.js";
 import { downloadGitRepo } from "./download/git/index.js";
 import { resetGitRepoContents } from "./download/git/reset.js";
 import { getGitHubRepoHash } from "./download/github/hash.js";
+import { unzip } from "./download/helpers/unzip.js";
 import { downloadGitHubRepo } from "./download/github/index.js";
 import { getGitLabRepoHash } from "./download/gitlab/hash.js";
 import { downloadGitLabRepo } from "./download/gitlab/index.js";
 import { untar } from "./download/helpers/untar.js";
-import { unzip } from "./download/helpers/unzip.js";
 import { downloadNPMPackage } from "./download/npm/index.js";
 import { downloadPackage } from "./download/index.js";
 import { getNPMVersion, getPackageVersion } from "./download/npm/version.js";

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.0-beta.2",
+  "version": "5.0.0-beta.4",
   "publishConfig": {
     "tag": "next"
   },