modern-tar 0.7.3 → 0.7.5

package/dist/fs/index.js

@@ -1,4 +1,4 @@
-import { a as normalizeBody, c as LINK, l as SYMLINK, n as createTarPacker, o as DIRECTORY, r as transformHeader, s as FILE, t as createUnpacker } from "../unpacker-BpPBxY8N.js";
+import { a as normalizeBody, c as LINK, l as SYMLINK, n as createTarPacker, o as DIRECTORY, r as transformHeader, s as FILE, t as createUnpacker } from "../unpacker-Dcww6JeE.js";
 import * as fs from "node:fs/promises";
 import { cpus } from "node:os";
 import * as path from "node:path";
@@ -575,11 +575,13 @@ const createPathCache = (destDirPath, options) => {
 			}
 			const parentDir = path.dirname(outPath);
 			switch (type) {
-				case DIRECTORY:
+				case DIRECTORY: {
 					pathConflicts.set(normalizedName, DIRECTORY);
-					await prepareDirectory(outPath, dmode ?? mode);
+					const safeMode = mode ? mode & 511 : void 0;
+					await prepareDirectory(outPath, dmode ?? safeMode);
 					if (mtime) await fs.lutimes(outPath, mtime, mtime).catch(() => {});
 					return;
+				}
 				case FILE:
 					pathConflicts.set(normalizedName, FILE);
 					await prepareDirectory(parentDir);
@@ -678,8 +680,9 @@ function unpackTar(directoryPath, options = {}) {
 					}
 					const outPath = await opQueue.add(() => pathCache.preparePath(transformedHeader));
 					if (outPath) {
+						const safeMode = transformedHeader.mode ? transformedHeader.mode & 511 : void 0;
 						const fileStream = createFileSink(outPath, {
-							mode: options.fmode ?? transformedHeader.mode ?? void 0,
+							mode: options.fmode ?? safeMode,
 							mtime: transformedHeader.mtime ?? void 0
 						});
 						let needsDrain = false;

package/dist/{unpacker-BpPBxY8N.js → unpacker-Dcww6JeE.js}

@@ -108,7 +108,7 @@ function readNumeric(view, offset, size) {
 
 //#endregion
 //#region src/tar/body.ts
-const isBodyless = (header) => header.type === DIRECTORY || header.type === SYMLINK || header.type === LINK;
+const isBodyless = (header) => header.type === DIRECTORY || header.type === SYMLINK || header.type === LINK || header.type === "character-device" || header.type === "block-device" || header.type === "fifo";
 async function normalizeBody(body) {
 	if (body === null || body === void 0) return EMPTY;
 	if (body instanceof Uint8Array) return body;
@@ -120,18 +120,24 @@ async function normalizeBody(body) {
 
 //#endregion
 //#region src/tar/options.ts
+const stripPath = (p, n) => {
+	const parts = p.split("/").filter(Boolean);
+	return n >= parts.length ? "" : parts.slice(n).join("/");
+};
 function transformHeader(header, options) {
 	const { strip, filter, map } = options;
 	if (!strip && !filter && !map) return header;
 	const h = { ...header };
 	if (strip && strip > 0) {
-		const components = h.name.split("/").filter(Boolean);
-		if (strip >= components.length) return null;
-		const newName = components.slice(strip).join("/");
+		const newName = stripPath(h.name, strip);
+		if (!newName) return null;
 		h.name = h.type === DIRECTORY && !newName.endsWith("/") ? `${newName}/` : newName;
-		if (h.linkname?.startsWith("/")) {
-			const linkComponents = h.linkname.split("/").filter(Boolean);
-			h.linkname = strip >= linkComponents.length ? "/" : `/${linkComponents.slice(strip).join("/")}`;
+		if (h.linkname) {
+			const isAbsolute = h.linkname.startsWith("/");
+			if (isAbsolute || h.type === LINK) {
+				const stripped = stripPath(h.linkname, strip);
+				h.linkname = isAbsolute ? `/${stripped}` || "/" : stripped;
+			}
 		}
 	}
 	if (filter?.(h) === false) return null;
@@ -256,6 +262,7 @@ function parseUstarHeader(block, strict) {
 		linkname: readString(block, USTAR_LINKNAME_OFFSET, USTAR_LINKNAME_SIZE)
 	};
 	const magic = readString(block, USTAR_MAGIC_OFFSET, USTAR_MAGIC_SIZE);
+	if (isBodyless(header)) header.size = 0;
 	if (magic.trim() === "ustar") {
 		header.uname = readString(block, USTAR_UNAME_OFFSET, USTAR_UNAME_SIZE);
 		header.gname = readString(block, USTAR_GNAME_OFFSET, USTAR_GNAME_SIZE);
@@ -275,8 +282,8 @@ const PAX_MAPPING = {
 };
 function parsePax(buffer) {
 	const decoder$1 = new TextDecoder("utf-8");
-	const overrides = {};
-	const pax = {};
+	const overrides = Object.create(null);
+	const pax = Object.create(null);
 	let offset = 0;
 	while (offset < buffer.length) {
 		const spaceIndex = buffer.indexOf(32, offset);
@@ -287,9 +294,8 @@ function parsePax(buffer) {
 		const [key, value] = decoder$1.decode(buffer.subarray(spaceIndex + 1, recordEnd - 1)).split("=", 2);
 		if (key && value !== void 0) {
 			pax[key] = value;
-			const mapping = PAX_MAPPING[key];
-			if (mapping) {
-				const [targetKey, parser] = mapping;
+			if (Object.hasOwn(PAX_MAPPING, key)) {
+				const [targetKey, parser] = PAX_MAPPING[key];
 				const parsedValue = parser(value);
 				if (typeof parsedValue === "string" || !Number.isNaN(parsedValue)) overrides[targetKey] = parsedValue;
 			}
@@ -641,6 +647,7 @@ function createUnpacker(options = {}) {
 				if (internalHeader.prefix) header.name = `${internalHeader.prefix}/${header.name}`;
 				applyOverrides(header, paxGlobals);
 				applyOverrides(header, nextEntryOverrides);
+				if (header.name.endsWith("/") && header.type === FILE) header.type = DIRECTORY;
 				nextEntryOverrides = {};
 				currentEntry = {
 					header,

package/dist/web/index.js

@@ -1,4 +1,4 @@
-import { a as normalizeBody, i as isBodyless, n as createTarPacker$1, r as transformHeader, t as createUnpacker } from "../unpacker-BpPBxY8N.js";
+import { a as normalizeBody, i as isBodyless, n as createTarPacker$1, r as transformHeader, t as createUnpacker } from "../unpacker-Dcww6JeE.js";
 
 //#region src/web/compression.ts
 function createGzipEncoder() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "modern-tar",
-	"version": "0.7.3",
+	"version": "0.7.5",
 	"description": "Zero dependency streaming tar parser and writer for JavaScript.",
 	"author": "Ayuhito <hello@ayuhito.com>",
 	"license": "MIT",