@kitschpatrol/aphex 0.1.2 → 0.1.4

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { ExifTool } from "exiftool-vendored";
 import { ILogBasic, ILogLayer } from "lognow";
 import { OmitDeep, PartialDeep, Simplify } from "type-fest";
-
 //#region src/aphex-swift/cli-bridge.d.ts
 /**
  * Start an interactive session with aphex-swift. Commands will be sent to this
@@ -9,11 +8,11 @@ import { OmitDeep, PartialDeep, Simplify } from "type-fest";
  *
  * @throws {Error} If the session is already active or fails to start
  */
-declare function interactiveSessionStart(): Promise<void>;
+export declare function interactiveSessionStart(): Promise<void>;
 /**
  * Stop the interactive session if one is active.
  */
-declare function interactiveSessionStop(): Promise<void>;
+export declare function interactiveSessionStop(): Promise<void>;
 /**
  * TypeScript type definition for ResourceInfo from the Swift implementation
  */
@@ -64,7 +63,7 @@ declare function aphexPhotoInfo(identifiers: string | string[], caseSensitive?:
 declare function aphexAlbumInfo(identifiers: string | string[], caseSensitive?: boolean): Promise<AlbumInfo[]>;
 //#endregion
 //#region src/utilities/image/mime.d.ts
-declare const IMAGE_MIME_TYPES: readonly ["arw", "avif", "bmp", "cr2", "cr3", "crw", "tga", "dng", "gif", "heic", "heif", "jpeg", "nef", "pef", "png", "psd", "svg+xml", "tiff", "webp"];
+export declare const IMAGE_MIME_TYPES: readonly ["arw", "avif", "bmp", "cr2", "cr3", "crw", "tga", "dng", "gif", "heic", "heif", "jpeg", "nef", "pef", "png", "psd", "svg+xml", "tiff", "webp"];
 type ImageMimeType = (typeof IMAGE_MIME_TYPES)[number];
 //#endregion
 //#region src/pipeline/engines/applescript-gui.d.ts
@@ -76,9 +75,13 @@ type ImageMimeType = (typeof IMAGE_MIME_TYPES)[number];
  * options in the GUI.
  */
 type ExportViaAppleScriptGuiOptions = {
-  /** "Color Profile" Drop Down */colorProfile: 'AdobeRGB' | 'Display P3' | 'Most Compatible' | 'Original' | 'sRGB'; /** "File Name" Drop Down */
-  fileName: 'Album Name With Number' | 'Sequential' | 'Use File Name' | 'Use Title'; /** "Include Location Information" Checkbox */
-  includeLocation: boolean; /** "Include Title, Keywords, and Caption" Checkbox */
+  /** "Color Profile" Drop Down */
+  colorProfile: 'AdobeRGB' | 'Display P3' | 'Most Compatible' | 'Original' | 'sRGB';
+  /** "File Name" Drop Down */
+  fileName: 'Album Name With Number' | 'Sequential' | 'Use File Name' | 'Use Title';
+  /** "Include Location Information" Checkbox */
+  includeLocation: boolean;
+  /** "Include Title, Keywords, and Caption" Checkbox */
   includeMetadata: boolean;
   /**
    * "JPEG Quality" Drop Down
@@ -97,15 +100,18 @@ type ExportViaAppleScriptGuiOptions = {
    *
    * Only applies if `photoSize` is `Custom`
    */
-  maxSizeValue: number; /** "Photo Kind" Drop Down */
-  photoKind: 'HEIC' | 'JPEG' | 'PNG' | 'TIFF'; /** "Size" Drop Down */
+  maxSizeValue: number;
+  /** "Photo Kind" Drop Down */
+  photoKind: 'HEIC' | 'JPEG' | 'PNG' | 'TIFF';
+  /** "Size" Drop Down */
   photoSize: 'Custom' | 'Full Size' | 'Large' | 'Medium' | 'Small';
   /**
    * "Sequential Prefix" Text Field
    *
    * Only applies if `fileName` is `Sequential`
    */
-  sequentialPrefix: string; /** "Subfolder Format" Drop Down */
+  sequentialPrefix: string;
+  /** "Subfolder Format" Drop Down */
   subfolderFormat: 'Moment Name' | 'None';
   /**
    * "16 Bit" Checkbox
@@ -142,7 +148,6 @@ type ExportApplePhotoResult = {
   photoInfo: PhotoInfo;
 };
 type FileNameOptions = 'fileName' | 'title' | 'uuid';
-/** Also normalizes */
 //#endregion
 //#region src/utilities/image/tags.d.ts
 declare const VALID_LABELS: readonly ["animation", "diagram", "illustration", "image", "photo", "render", "screenshot", "video"];
@@ -156,9 +161,12 @@ type AphexMetadata = {
   photoInfo: PhotoInfo;
 };
 type ImageTags = {
-  aphexMetadata?: AphexMetadata | undefined; /** Human Name */
-  creator?: string | undefined; /** Organization */
-  credit?: string | undefined; /** Description, used as alt text in HTML content */
+  aphexMetadata?: AphexMetadata | undefined;
+  /** Human Name */
+  creator?: string | undefined;
+  /** Organization */
+  credit?: string | undefined;
+  /** Description, used as alt text in HTML content */
   description?: string | undefined;
   /**
    * Image Type, e.g. 'animation', 'diagram', 'illustration', 'screenshot',
@@ -278,16 +286,24 @@ type ImageInfo = {
 //#endregion
 //#region src/pipeline/image-process.d.ts
 type ProcessImageOptions = CompressImageOptions & {
-  /** Fallback color profile applied when source profile is not in preserve list */defaultColorProfile: ColorProfile; /** Calculate SSIM/PSNR/DSSIM metrics comparing original vs processed images */
-  logSimilarity: boolean; /** Lossless format used specifically for images with alpha channels */
-  losslessFormatAlpha: LosslessFormat; /** Lossy format used specifically for images with alpha channels */
-  lossyFormatAlpha: LossyFormat; /** Maximum pixel dimensions before triggering resize (width OR height) */
+  /** Fallback color profile applied when source profile is not in preserve list */
+  defaultColorProfile: ColorProfile;
+  /** Calculate SSIM/PSNR/DSSIM metrics comparing original vs processed images */
+  logSimilarity: boolean;
+  /** Lossless format used specifically for images with alpha channels */
+  losslessFormatAlpha: LosslessFormat;
+  /** Lossy format used specifically for images with alpha channels */
+  lossyFormatAlpha: LossyFormat;
+  /** Maximum pixel dimensions before triggering resize (width OR height) */
   maxDimensionsPixels: {
     width: number;
     height: number;
-  }; /** Near-lossless format used specifically for images with alpha channels */
-  nearLosslessFormatAlpha: NearLosslessFormat; /** Image formats that bypass conversion and compression entirely */
-  passthroughFormats: ImageMimeType[]; /** Color profiles that are kept unchanged instead of being normalized */
+  };
+  /** Near-lossless format used specifically for images with alpha channels */
+  nearLosslessFormatAlpha: NearLosslessFormat;
+  /** Image formats that bypass conversion and compression entirely */
+  passthroughFormats: ImageMimeType[];
+  /** Color profiles that are kept unchanged instead of being normalized */
   preserveColorProfiles: ColorProfile[];
 };
 type ProcessImageResult = {
@@ -311,7 +327,7 @@ type ProcessImageResult = {
  *
  * Run in parallel through a worker for album processing
  */
-declare function processImage(sourceImagePath: string, destinationDirectory: string, options: ProcessImageOptions): Promise<ProcessImageResult>;
+export declare function processImage(sourceImagePath: string, destinationDirectory: string, options: ProcessImageOptions): Promise<ProcessImageResult>;
 //#endregion
 //#region src/pipeline/image-sync.d.ts
 type DiffStrategy = 'exif-tags' | 'export-options' | 'file-name' | 'force-update' | 'metadata-options' | 'photo-info' | 'process-options';
@@ -338,7 +354,7 @@ type SyncResult = {
  * This should be called when you're done using exiftool to prevent hanging
  * processes. It's safe to call multiple times.
  */
-declare function endExiftool(): Promise<void>;
+export declare function endExiftool(): Promise<void>;
 //#endregion
 //#region src/utilities/log.d.ts
 /**
@@ -348,22 +364,22 @@ declare function endExiftool(): Promise<void>;
  * @param logger - Accepts either a LogLayer instance or a Console- or
  *   Stream-like log target
  */
-declare function setLogger(logger?: ILogBasic | ILogLayer<unknown>): void;
+export declare function setLogger(logger?: ILogBasic | ILogLayer<unknown>): void;
 //#endregion
 //#region src/index.d.ts
 /**
  * Helper for deep merging ExportOptions object against library defaults.
  * Exported for unplugin-aphex.
  */
-declare function mergeDefaultExportOptions(options: PartialDeep<ExportOptions> | undefined): ExportOptions;
-type ExportOptions = {
+export declare function mergeDefaultExportOptions(options: PartialDeep<ExportOptions> | undefined): ExportOptions;
+export type ExportOptions = {
   exportOptions: ExportApplePhotoOptions;
   metadataOptions: 'disabled' | ManageMetadataOptions;
   processOptions: 'disabled' | ProcessImageOptions;
   syncOptions: 'disabled' | SyncOptions;
 };
-declare const defaultSyncOptions: SyncOptions;
-declare const defaultExportOptions: ExportOptions;
+export declare const defaultSyncOptions: SyncOptions;
+export declare const defaultExportOptions: ExportOptions;
 /** Some fields omitted for relevance... */
 type ExportResults = {
   exportResult: Simplify<Omit<ExportApplePhotoResult, 'exportOptions' | 'path' | 'photoInfo'>> | undefined;
@@ -371,7 +387,7 @@ type ExportResults = {
   processResult: Simplify<OmitDeep<ProcessImageResult, 'input.path' | 'output.path' | 'path'>> | undefined;
   syncResult: Simplify<Omit<SyncResult['plan'][number], 'photoInfo'>> | undefined;
 };
-type ExportResult = {
+export type ExportResult = {
   options: ExportOptions;
   path: string;
   photoInfo: PhotoInfo;
@@ -380,10 +396,10 @@ type ExportResult = {
 /**
  * Export a single photo
  */
-declare function exportPhoto(identifier: PhotoInfo | string, destinationDirectory: string, options?: PartialDeep<ExportOptions>): Promise<ExportResult>;
+export declare function exportPhoto(identifier: PhotoInfo | string, destinationDirectory: string, options?: PartialDeep<ExportOptions>): Promise<ExportResult>;
 /**
  * Export photos
  */
-declare function exportPhotos(identifiers: Array<AlbumInfo | PhotoInfo | string>, destinationDirectory: string, options?: PartialDeep<ExportOptions>): Promise<ExportResult[]>;
+export declare function exportPhotos(identifiers: Array<AlbumInfo | PhotoInfo | string>, destinationDirectory: string, options?: PartialDeep<ExportOptions>): Promise<ExportResult[]>;
 //#endregion
-export { ExportOptions, ExportResult, IMAGE_MIME_TYPES, type ImageMimeType, defaultExportOptions, defaultSyncOptions, endExiftool, exportPhoto, exportPhotos, aphexAlbumInfo as getAlbumInfo, aphexPhotoInfo as getPhotoInfo, interactiveSessionStart, interactiveSessionStop, mergeDefaultExportOptions, processImage, setLogger };
+export { type ImageMimeType, aphexAlbumInfo as getAlbumInfo, aphexPhotoInfo as getPhotoInfo };

package/dist/index.js

@@ -1,5 +1,5 @@
 import fse from "fs-extra";
-import path, { dirname } from "node:path";
+import path from "node:path";
 import is, { assert, isNonEmptyStringAndNotWhitespace } from "@sindresorhus/is";
 import { execa } from "execa";
 import { spawn } from "node:child_process";
@@ -58,11 +58,10 @@ function getExiftool() {
 * processes. It's safe to call multiple times.
 */
 async function endExiftool() {
-	if (exiftoolInstance.pids.length > 0) {
-		log.debug(`Ending exiftool processes: ${exiftoolInstance.pids.join(", ")}`);
-		await exiftoolInstance.end();
-		log.debug("Exiftool processes ended");
-	}
+	if (exiftoolInstance.pids.length === 0) return;
+	log.debug(`Ending exiftool processes: ${exiftoolInstance.pids.join(", ")}`);
+	await exiftoolInstance.end();
+	log.debug("Exiftool processes ended");
 }
 /**
 * Install process exit handlers for automatic cleanup
@@ -73,24 +72,27 @@ async function endExiftool() {
 function scheduleProcessCleanup() {
 	if (processExitHandlerInstalled) return;
 	processExitHandlerInstalled = true;
-	process.on("beforeExit", async () => {
-		if (!cleanupScheduled) {
-			cleanupScheduled = true;
-			await endExiftool();
-		}
+	process.on("beforeExit", () => {
+		if (cleanupScheduled) return;
+		cleanupScheduled = true;
+		endExiftool();
 	});
 	process.on("exit", () => {
 		if (exiftoolInstance.pids.length > 0) log.debug(`Exiftool processes still running at exit: ${exiftoolInstance.pids.join(", ")}`);
 	});
-	process.on("SIGINT", async () => {
-		log.debug("Received SIGINT, cleaning up exiftool...");
-		await endExiftool();
-		process.exit(130);
+	process.on("SIGINT", () => {
+		(async () => {
+			log.debug("Received SIGINT, cleaning up exiftool...");
+			await endExiftool();
+			process.exit(130);
+		})();
 	});
-	process.on("SIGTERM", async () => {
-		log.debug("Received SIGTERM, cleaning up exiftool...");
-		await endExiftool();
-		process.exit(143);
+	process.on("SIGTERM", () => {
+		(async () => {
+			log.debug("Received SIGTERM, cleaning up exiftool...");
+			await endExiftool();
+			process.exit(143);
+		})();
 	});
 }
 //#endregion
@@ -155,7 +157,7 @@ async function getTempDirectory(...labels) {
 }
 //#endregion
 //#region src/utilities/general.ts
-const UUID_REGEX = /^[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}$/i;
+const UUID_REGEX = /^[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}$/iv;
 /**
 * Sips makes a mess of the temp folder and does not respect TMPDIR, so we need
 * to clean up after it ourselves
@@ -170,10 +172,9 @@ async function sipsTempCleanup() {
 			"--mime",
 			filePath
 		]);
-		if (stdout.startsWith("image/")) {
-			await fse.rm(filePath, { force: true });
-			cleanCount += 1;
-		}
+		if (!stdout.startsWith("image/")) continue;
+		await fse.rm(filePath, { force: true });
+		cleanCount += 1;
 	}
 	return cleanCount;
 }
@@ -200,7 +201,7 @@ function assertSingleElement(array) {
 * 	getDirname(import.meta)
 */
 function getDirname(meta) {
-	return dirname(fileURLToPath(process.env.PISCINA_WORKER_META_URL ?? meta.url));
+	return path.dirname(fileURLToPath(process.env.PISCINA_WORKER_META_URL ?? meta.url));
 }
 /**
 * Asset directory path of package or distribution folder (Copied by tsdown)
@@ -226,7 +227,7 @@ function getPackageBinPath(meta) {
 }
 //#endregion
 //#region src/aphex-swift/cli-bridge.ts
-const SHELL_SPECIAL_CHARS_REGEX = /[\s'"\\]/;
+const SHELL_SPECIAL_CHARS_REGEX = /[\s'"\\]/v;
 let interactiveProcess;
 let currentRequest;
 /**
@@ -237,8 +238,9 @@ let currentRequest;
 */
 async function interactiveSessionStart() {
 	if (interactiveProcess !== void 0) throw new Error("Interactive session is already active");
+	const binPath = getPackageBinPath(import.meta);
 	interactiveProcess = spawn("./aphex-swift", ["interactive"], {
-		cwd: getPackageBinPath(import.meta),
+		cwd: binPath,
 		stdio: [
 			"pipe",
 			"pipe",
@@ -258,13 +260,12 @@ async function interactiveSessionStart() {
 		} catch {}
 	});
 	interactiveProcess.stderr?.on("data", (data) => {
-		if (currentRequest !== void 0) {
-			const error = new Error(data.toString().trim());
-			const request = currentRequest;
-			currentRequest = void 0;
-			request.reject(error);
-			processNextCommand();
-		}
+		if (currentRequest === void 0) return;
+		const error = new Error(data.toString().trim());
+		const request = currentRequest;
+		currentRequest = void 0;
+		request.reject(error);
+		processNextCommand();
 	});
 	interactiveProcess.on("close", (code) => {
 		const error = /* @__PURE__ */ new Error(`Interactive session exited with code ${code}`);
@@ -310,7 +311,7 @@ function isInteractiveSessionActive() {
 }
 let commandQueue = [];
 function processNextCommand() {
-	if (currentRequest !== void 0 || commandQueue.length === 0 || interactiveProcess === void 0) return;
+	if (currentRequest !== void 0 || interactiveProcess === void 0 || commandQueue.length === 0) return;
 	const next = commandQueue.shift();
 	currentRequest = {
 		buffer: "",
@@ -338,10 +339,7 @@ async function executeInteractiveCommand(command) {
 * Arguments with spaces or special characters are quoted.
 */
 function escapeCommand(args) {
-	return args.map((arg) => {
-		if (SHELL_SPECIAL_CHARS_REGEX.test(arg)) return `'${arg.replaceAll("'", String.raw`'\''`)}'`;
-		return arg;
-	}).join(" ");
+	return args.map((arg) => SHELL_SPECIAL_CHARS_REGEX.test(arg) ? `'${arg.replaceAll("'", String.raw`'\''`)}'` : arg).join(" ");
 }
 /**
 * Runtime type guard for ResourceInfo
@@ -472,7 +470,12 @@ async function aphexExport(identifiers, destination, caseSensitive = false, orig
 	}
 }
 function dateReviver$1(key, value) {
-	if ((key === "dateCreated" || key === "dateModified" || key === "dateStart" || key === "dateEnd") && typeof value === "string") return value ? new Date(value) : void 0;
+	if (typeof value === "string" && [
+		"dateCreated",
+		"dateEnd",
+		"dateModified",
+		"dateStart"
+	].includes(key)) return value.length > 0 ? new Date(value) : void 0;
 	return value;
 }
 //#endregion
@@ -500,15 +503,16 @@ async function resolveIdentifiers(identifiers) {
 async function resolvePhotoIdentifier(identifier) {
 	if (isPhotoInfo(identifier)) return identifier;
 	const aphexPhotoInfoResult = await aphexPhotoInfo(identifier);
-	if (aphexPhotoInfoResult.length === 0) throw new Error(`No photo asset found for identifier "${identifier}"`);
+	const [photoInfo] = aphexPhotoInfoResult;
+	if (photoInfo === void 0) throw new Error(`No photo asset found for identifier "${identifier}"`);
 	if (aphexPhotoInfoResult.length > 1) throw new Error(`Multiple photo assets found for identifier "${identifier} — is it an album?"`);
-	return aphexPhotoInfoResult[0];
+	return photoInfo;
 }
 //#endregion
 //#region src/utilities/defaults.ts
 const mergeDefaultsInternal = createDefu((object, key, value) => {
 	if (Array.isArray(object[key]) && Array.isArray(value)) {
-		const merged = [...new Set([...object[key], ...value])];
+		const merged = [.../* @__PURE__ */ new Set([...object[key], ...value])];
 		Object.assign(object, { [key]: merged });
 		return true;
 	}
@@ -574,7 +578,7 @@ function lookupImageMimeType(imagePath, validate = false) {
 }
 //#endregion
 //#region src/utilities/image/color.ts
-const SIPS_PROFILE_REGEX = /profile: (.+)/;
+const SIPS_PROFILE_REGEX = /profile: (.+)/v;
 /**
 * Get the color profile of an image
 * https://github.com/saucecontrol/Compact-ICC-Profiles?tab=readme-ov-file
@@ -777,7 +781,12 @@ async function getTags(imagePath) {
 	};
 }
 function dateReviver(key, value) {
-	if ((key === "dateCreated" || key === "dateModified" || key === "dateStart" || key === "dateEnd") && typeof value === "string") return value ? new Date(value) : void 0;
+	if (typeof value === "string" && [
+		"dateCreated",
+		"dateEnd",
+		"dateModified",
+		"dateStart"
+	].includes(key)) return value.length > 0 ? new Date(value) : void 0;
 	return value;
 }
 function isAphexMetadata(value) {
@@ -806,12 +815,12 @@ async function setTags(imagePath, imageTags) {
 	const { aphexMetadata, creator, credit, description, label, preservedFileName } = imageTags;
 	const userComment = aphexMetadata ? JSON.stringify(aphexMetadata) : void 0;
 	const tags = {
-		..."creator" in imageTags ? { "XMP:Creator": creator ?? "" } : {},
-		..."description" in imageTags ? { "XMP:Description": description ?? "" } : {},
-		..."credit" in imageTags ? { "XMP:Credit": credit ?? "" } : {},
-		..."label" in imageTags ? { "XMP:Label": label ?? "" } : {},
-		..."preservedFileName" in imageTags ? { "XMP:PreservedFileName": preservedFileName ?? "" } : {},
-		..."aphexMetadata" in imageTags ? { "XMP:UserComment": userComment ?? "" } : {}
+		..."creator" in imageTags && { "XMP:Creator": creator ?? "" },
+		..."description" in imageTags && { "XMP:Description": description ?? "" },
+		..."credit" in imageTags && { "XMP:Credit": credit ?? "" },
+		..."label" in imageTags && { "XMP:Label": label ?? "" },
+		..."preservedFileName" in imageTags && { "XMP:PreservedFileName": preservedFileName ?? "" },
+		..."aphexMetadata" in imageTags && { "XMP:UserComment": userComment ?? "" }
 	};
 	await getExiftool().write(imagePath, tags, { writeArgs: ["-overwrite_original_in_place"] });
 }
@@ -831,8 +840,8 @@ async function cloneTags(sourceImagePath, destinationImagePath, includeKeys, for
 	];
 	let tagsToAssign = {};
 	for (const key of keys) {
-		const sourceValue = key in sourceTags ? sourceTags[key] : void 0;
-		if (sourceValue !== (key in destinationTags ? destinationTags[key] : void 0) || force) tagsToAssign = {
+		const sourceValue = sourceTags[key];
+		if (sourceValue !== destinationTags[key] || force) tagsToAssign = {
 			...tagsToAssign,
 			[key]: sourceValue
 		};
@@ -896,7 +905,7 @@ async function hasAlpha(imagePath) {
 		]);
 		return Number(stdout) < 1;
 	} catch (error) {
-		throw new Error(`Error checking file: ${String(error)}`);
+		throw new Error(`Error checking file: ${String(error)}`, { cause: error });
 	}
 }
 //#endregion
@@ -937,7 +946,7 @@ async function exportViaAppleScript(photoUuid, forceOriginal = false) {
 		return path.join(tempDirectory, exportedFileName);
 	} catch (error) {
 		const errorMessage = error instanceof Error ? error.message : String(error);
-		throw new Error(`Failed to export photo via AppleScript: ${errorMessage}`);
+		throw new Error(`Failed to export photo via AppleScript: ${errorMessage}`, { cause: error });
 	}
 }
 //#endregion
@@ -964,8 +973,9 @@ const defaultExportViaAppleScriptGuiOptions = {
 async function exportViaAppleScriptGui(uuid, options) {
 	const tempDirectory = await getTempDirectory("engine", "applescript-gui");
 	const { colorProfile, fileName, includeLocation, includeMetadata, jpegQuality, maxSizeType, maxSizeValue, photoKind, photoSize, sequentialPrefix, subfolderFormat, tiffBitDepth } = mergeDefaults(options, defaultExportViaAppleScriptGuiOptions);
+	const appleScriptPath = path.join(getPackageAssetsPath(import.meta), "applescript-gui.applescript");
 	const { failed, stderr } = await execa("osascript", [
-		path.join(getPackageAssetsPath(import.meta), "applescript-gui.applescript"),
+		appleScriptPath,
 		uuid,
 		tempDirectory,
 		photoKind,
@@ -994,7 +1004,9 @@ async function exportViaAppleScriptGui(uuid, options) {
 * a temporary directory Clean up and move the file as needed afterwards
 */
 async function exportViaFileSystem(photoUuid, forceOriginal = false) {
-	const [{ edited, original }] = isPhotoInfo(photoUuid) ? [photoUuid] : await aphexPhotoInfo(photoUuid);
+	const [photoInfo] = isPhotoInfo(photoUuid) ? [photoUuid] : await aphexPhotoInfo(photoUuid);
+	if (photoInfo === void 0) throw new Error(`No photo info found for UUID "${isPhotoInfo(photoUuid) ? photoUuid.uuid : photoUuid}"`);
+	const { edited, original } = photoInfo;
 	const tempDirectory = await getTempDirectory("engine", "file-system");
 	if (forceOriginal || edited === void 0) {
 		const destinationPath = path.join(tempDirectory, original.fileName);
@@ -1012,6 +1024,7 @@ async function exportViaFileSystem(photoUuid, forceOriginal = false) {
 */
 async function exportViaSwiftPhotoKit(photoUuid) {
 	const [result] = await aphexExport(photoUuid, await getTempDirectory("engine", "swift-photokit"));
+	if (result === void 0) throw new Error(`Export via PhotoKit returned no files for photo "${photoUuid}"`);
 	return result;
 }
 //#endregion
@@ -1073,25 +1086,9 @@ async function exportApplePhotos(identifiers, destinationDirectory, options) {
 		const exportedPhoto = {
 			exportEngine: engine,
 			exportOptions: resolvedOptions,
-			path: "",
+			path: await exportPhotoWithEngine(photoInfo, engine, resolvedOptions),
 			photoInfo
 		};
-		switch (engine) {
-			case "applescript":
-				exportedPhoto.path = await exportViaAppleScript(photoInfo.uuid);
-				break;
-			case "file-system":
-				exportedPhoto.path = await exportViaFileSystem(photoInfo);
-				break;
-			case "photos-gui": {
-				const [exportedPath] = await exportViaAppleScriptGui(photoInfo.uuid, resolvedOptions.appleScriptGuiOptions);
-				exportedPhoto.path = exportedPath;
-				break;
-			}
-			case "swift-photokit":
-				exportedPhoto.path = await exportViaSwiftPhotoKit(photoInfo.uuid);
-				break;
-		}
 		const resolvedDestinationDirectory = await ensureDirectoryExists(destinationDirectory);
 		const normalizedDestinationPath = getImagePathWithFileName(photoInfo, path.join(resolvedDestinationDirectory, path.basename(exportedPhoto.path)), resolvedOptions.fileNameSluggify, resolvedOptions.fileNameAppendUuidFragment, resolvedOptions.fileNameNormalizeExtensions, resolvedOptions.fileNamePrecedence);
 		await fse.rename(exportedPhoto.path, normalizedDestinationPath);
@@ -1105,6 +1102,18 @@ async function exportApplePhotos(identifiers, destinationDirectory, options) {
 	}
 	return exportedPhotos;
 }
+async function exportPhotoWithEngine(photoInfo, engine, options) {
+	switch (engine) {
+		case "applescript": return exportViaAppleScript(photoInfo.uuid);
+		case "file-system": return exportViaFileSystem(photoInfo);
+		case "photos-gui": {
+			const [exportedPath] = await exportViaAppleScriptGui(photoInfo.uuid, options.appleScriptGuiOptions);
+			if (exportedPath === void 0) throw new Error(`Photos GUI export returned no files for photo "${photoInfo.uuid}"`);
+			return exportedPath;
+		}
+		case "swift-photokit": return exportViaSwiftPhotoKit(photoInfo.uuid);
+	}
+}
 /** Also normalizes */
 function getImagePathWithFileName(photoInfo, filePath, sluggify = true, fileNameAppendUuidFragment = false, normalizeExtensions = true, namingStrategyPrecedence = [
 	"title",
@@ -1114,27 +1123,28 @@ function getImagePathWithFileName(photoInfo, filePath, sluggify = true, fileName
 	const normalizedPath = normalizeExtensions ? normalizeExtension(filePath) : filePath;
 	const basePath = path.dirname(normalizedPath);
 	const extension = path.extname(normalizedPath);
-	for (const option of namingStrategyPrecedence) switch (option) {
+	for (const option of namingStrategyPrecedence) {
+		const fileName = getFileNameForStrategy(option, photoInfo, sluggify, fileNameAppendUuidFragment);
+		if (fileName !== void 0) return path.join(basePath, `${fileName}${extension}`);
+	}
+	throw new Error("No valid filename option found, can't name image");
+}
+function getFileNameForStrategy(option, photoInfo, sluggify, fileNameAppendUuidFragment) {
+	switch (option) {
 		case "fileName": {
 			const nameWithoutExtension = path.basename(photoInfo.original.fileName, path.extname(photoInfo.original.fileName));
 			const uuidFragment = fileNameAppendUuidFragment ? `-${photoInfo.uuid.slice(-8)}` : "";
-			const processedName = sluggify ? slug(`${nameWithoutExtension}${uuidFragment}`) : `${nameWithoutExtension}${uuidFragment}`;
-			return path.join(basePath, `${processedName}${extension}`);
+			return sluggify ? slug(`${nameWithoutExtension}${uuidFragment}`) : `${nameWithoutExtension}${uuidFragment}`;
 		}
 		case "title":
 			if (isNonEmptyStringAndNotWhitespace(photoInfo.title)) {
 				const title = sluggify ? slug(photoInfo.title) : photoInfo.title;
 				const uuidFragment = fileNameAppendUuidFragment ? `-${photoInfo.uuid.slice(-8)}` : "";
-				const processedTitle = sluggify ? slug(`${title}${uuidFragment}`) : `${title}${uuidFragment}`;
-				return path.join(basePath, `${processedTitle}${extension}`);
+				return sluggify ? slug(`${title}${uuidFragment}`) : `${title}${uuidFragment}`;
 			}
-			break;
-		case "uuid": {
-			const processedUuid = sluggify ? slug(photoInfo.uuid) : photoInfo.uuid;
-			return path.join(basePath, `${processedUuid}${extension}`);
-		}
+			return;
+		case "uuid": return sluggify ? slug(photoInfo.uuid) : photoInfo.uuid;
 	}
-	throw new Error("No valid filename option found, can't name image");
 }
 async function getEngineForPhoto(photoInfo, options) {
 	const { engineEdited, engineEditedAlpha, engineOriginal, engineOriginalAlpha } = mergeDefaults(options, defaultExportApplePhotoOptions);
@@ -1178,7 +1188,11 @@ const defaultManageMetadataOptions = {
 async function manageMetadataBatch(identifiers, targetFilePaths, options, exportOptions) {
 	const photoInfos = await resolveIdentifiers(identifiers);
 	if (photoInfos.length !== targetFilePaths.length) throw new Error("Photo infos and target files length mismatch");
-	return Promise.all(photoInfos.map(async (photoInfo, index) => manageMetadata(photoInfo, targetFilePaths[index], options, exportOptions)));
+	return Promise.all(photoInfos.map(async (photoInfo, index) => {
+		const targetFilePath = targetFilePaths[index];
+		if (targetFilePath === void 0) throw new Error(`Missing target file path for photo "${photoInfo.uuid}"`);
+		return manageMetadata(photoInfo, targetFilePath, options, exportOptions);
+	}));
 }
 /**
 * Manage metadata...
@@ -1272,22 +1286,14 @@ async function convertToJpeg(sourceImagePath, destinationDirectory, quality, for
 			case "mozjpeg": {
 				const tgaTempDirectory = await fse.mkdtemp(path.join(os.tmpdir(), `com.kitschpatrol.aphex.${getSlugFilename(sourceImagePath)}.${engine}.`));
 				const tgaImagePath = await convertToTga(sourceImagePath, tgaTempDirectory);
-				await (jpegQuality === "lossless" ? execa("cjpeg", [
-					"--lossless",
+				await execa("cjpeg", [
+					...jpegQuality === "lossless" ? ["--lossless"] : ["-quality", jpegQuality.toString()],
 					"-optimize",
 					"-progressive",
 					"-outfile",
 					destinationImagePath,
 					tgaImagePath
-				]) : execa("cjpeg", [
-					"-quality",
-					jpegQuality.toString(),
-					"-optimize",
-					"-progressive",
-					"-outfile",
-					destinationImagePath,
-					tgaImagePath
-				]));
+				]);
 				await fse.rm(tgaTempDirectory, { recursive: true });
 				break;
 			}
@@ -1304,7 +1310,6 @@ async function convertToJpeg(sourceImagePath, destinationDirectory, quality, for
 					"--out",
 					destinationImagePath
 				]);
-				break;
 		}
 	}
 	return destinationImagePath;
@@ -1351,7 +1356,7 @@ async function convertToPng(sourceImagePath, destinationDirectory, force = false
 			"--setProperty",
 			"format",
 			"png",
-			...restoreColorProfile && restoreColorProfile !== "None" ? [
+			...restoreColorProfile !== void 0 && restoreColorProfile !== "None" ? [
 				"--setProperty",
 				"profile",
 				getPathToColorProfile(restoreColorProfile)
@@ -1407,7 +1412,7 @@ async function convertToAvif(sourceImagePath, destinationDirectory, quality, for
 		await execa("avifenc", [
 			...qualityArgs,
 			"--icc",
-			profile === "None" ? getPathToColorProfile("sRGB IEC61966-2.1") : getPathToColorProfile(profile),
+			getPathToColorProfile(profile === "None" ? "sRGB IEC61966-2.1" : profile),
 			"--speed",
 			"default",
 			sourceImagePath,
@@ -1444,9 +1449,7 @@ async function compressImage(sourceImagePath, destinationDirectory, options) {
 			workingImagePath = lookupImageMimeType(sourceImagePath) === "png" ? sourceImagePath : await convertToPng(sourceImagePath, tempDirectory);
 			workingImagePath = await optimizePng(workingImagePath, tempDirectory);
 			break;
-		case "webp":
-			workingImagePath = await convertToWebp(sourceImagePath, tempDirectory, "lossless");
-			break;
+		case "webp": workingImagePath = await convertToWebp(sourceImagePath, tempDirectory, "lossless");
 	}
 	if (await getSizeBytes(workingImagePath) <= maxFileSizeBytes) {
 		const destinationImagePath = path.join(destinationDirectory, path.basename(workingImagePath));
@@ -1465,9 +1468,7 @@ async function compressImage(sourceImagePath, destinationDirectory, options) {
 		case "none":
 			workingImagePath = sourceImagePath;
 			break;
-		case "webp":
-			workingImagePath = await convertToWebp(sourceImagePath, tempDirectory, "near-lossless");
-			break;
+		case "webp": workingImagePath = await convertToWebp(sourceImagePath, tempDirectory, "near-lossless");
 	}
 	if (await getSizeBytes(workingImagePath) <= maxFileSizeBytes) {
 		const destinationImagePath = path.join(destinationDirectory, path.basename(workingImagePath));
@@ -1492,9 +1493,7 @@ async function compressImage(sourceImagePath, destinationDirectory, options) {
 		case "none":
 			workingImagePath = sourceImagePath;
 			break;
-		case "webp":
-			workingImagePath = await convertToWebp(sourceImagePath, tempDirectory, lossyQuality, true);
-			break;
+		case "webp": workingImagePath = await convertToWebp(sourceImagePath, tempDirectory, lossyQuality, true);
 	}
 	const destinationImagePath = path.join(destinationDirectory, path.basename(workingImagePath));
 	await fse.copyFile(workingImagePath, destinationImagePath);
@@ -1509,8 +1508,8 @@ async function compressImage(sourceImagePath, destinationDirectory, options) {
 }
 //#endregion
 //#region src/utilities/image/compare.ts
-const SSIM_REGEX = /All:\s*([\d.]+)/;
-const PSNR_REGEX = /average:\s*([\d.]+)/;
+const SSIM_REGEX = /All:\s*([\d.]+)/v;
+const PSNR_REGEX = /average:\s*([\d.]+)/v;
 /**
 * Get two identically sized PNGs from two images. Uses the smaller image size
 * as the target size. Remember to clean up temp
@@ -1572,9 +1571,9 @@ async function calculateDSSIMInternal(image1, image2) {
 		return -1;
 	}
 	const { stdout } = await execa("dssim", [image1, image2]);
-	const [dssimIndex] = stdout.split("	");
+	const [dssimIndex] = stdout.split("	", 1);
 	if (dssimIndex === void 0) throw new Error("DSSIM index not found in dssim output.");
-	return Number.parseFloat(dssimIndex);
+	return Number(dssimIndex);
 }
 async function calculateSSIMInternal(image1, image2) {
 	lookupImageMimeType(image1, ["png"]);
@@ -1594,8 +1593,8 @@ async function calculateSSIMInternal(image1, image2) {
 		"null",
 		"-"
 	]);
-	const match = SSIM_REGEX.exec(result.stderr);
-	return match?.[1] ? Number.parseFloat(match[1]) : 0;
+	const ssimValue = SSIM_REGEX.exec(result.stderr)?.[1];
+	return ssimValue === void 0 ? 0 : Number(ssimValue);
 }
 /**
 * Calculates the PSNR between two images using ffmpeg.
@@ -1618,8 +1617,8 @@ async function calculatePSNRInternal(image1, image2) {
 		"null",
 		"-"
 	]);
-	const match = PSNR_REGEX.exec(result.stderr);
-	return match?.[1] ? Number.parseFloat(match[1]) : 0;
+	const psnrValue = PSNR_REGEX.exec(result.stderr)?.[1];
+	return psnrValue === void 0 ? 0 : Number(psnrValue);
 }
 //#endregion
 //#region src/pipeline/image-process.ts
@@ -1649,8 +1648,9 @@ async function processPhotos(imagePaths, destinationDirectory, options) {
 	const resolvedOptions = mergeDefaults(options, defaultProcessImageOptions);
 	const tempProcessOutputDirectory = await getTempDirectory("process", "images");
 	let processImageResults;
+	const [singleImagePath] = imagePaths;
 	try {
-		if (imagePaths.length === 1) processImageResults = [await processImage(imagePaths[0], tempProcessOutputDirectory, resolvedOptions)];
+		if (singleImagePath !== void 0 && imagePaths.length === 1) processImageResults = [await processImage(singleImagePath, tempProcessOutputDirectory, resolvedOptions)];
 		else {
 			const threads = Math.floor(os.availableParallelism() * .5);
 			log.debug(`Using ${threads} threads for processing`);
@@ -1664,10 +1664,10 @@ async function processPhotos(imagePaths, destinationDirectory, options) {
 				minThreads: threads
 			});
 			try {
-				processImageResults = await Promise.all(imagePaths.map(async (path) => piscina.run({
+				processImageResults = await Promise.all(imagePaths.map(async (imagePath) => piscina.run({
 					destinationDirectory: tempProcessOutputDirectory,
 					options: resolvedOptions,
-					sourceImagePath: path,
+					sourceImagePath: imagePath,
 					verbose: log.isLevelEnabled("debug")
 				})));
 			} finally {
@@ -1809,7 +1809,7 @@ async function getSyncPlanForImages(identifiers, destinationDirectory, options,
 		}
 		const sourcePhotoFileBaseName = stripExtension(getImagePathWithFileName(sourcePhotoInfo, "", resolvedExportOptions.exportOptions.fileNameSluggify, resolvedExportOptions.exportOptions.fileNameAppendUuidFragment, resolvedExportOptions.exportOptions.fileNameNormalizeExtensions, resolvedExportOptions.exportOptions.fileNamePrecedence));
 		const differenceFound = await isDifferent(resolvedOptions.diffStrategies, sourcePhotoInfo, sourcePhotoFileBaseName, matchingDestinationFile.filePath, matchingDestinationFile.tags, resolvedExportOptions, resolvedOptions.forceUpdate);
-		if (differenceFound) {
+		if (differenceFound !== false) {
 			if (resolvedOptions.deleteTarget) syncResult.toDelete.push(matchingDestinationFile.filePath);
 			syncResult.plan.push({
 				diffedVia: differenceFound,
@@ -1826,7 +1826,7 @@ async function getSyncPlanForImages(identifiers, destinationDirectory, options,
 			status: "unchanged"
 		});
 	}
-	if (resolvedOptions.deleteOthers) syncResult.toDelete = [...syncResult.toDelete, ...destinationFiles.filter((file) => !syncResult.plan.some((plan) => plan.matchFilePath === file.filePath)).map((file) => file.filePath)];
+	if (resolvedOptions.deleteOthers) syncResult.toDelete = [...syncResult.toDelete, ...destinationFiles.filter((file) => syncResult.plan.every((plan) => plan.matchFilePath !== file.filePath)).map((file) => file.filePath)];
 	syncResult.toDelete = [...new Set(syncResult.toDelete)];
 	return syncResult;
 }
@@ -1836,31 +1836,24 @@ async function getSyncPlanForImages(identifiers, destinationDirectory, options,
 * @returns Undefined if the, or the reason for the difference if found
 */
 async function isDifferent(diffStrategies, sourcePhotoInfo, sourcePhotoFileBaseName, matchPhotoFilePath, matchPhotoTags, exportOptions, forceUpdate) {
-	let sourceTags;
 	if (forceUpdate) return "force-update";
-	for (const diffStrategy of diffStrategies) switch (diffStrategy) {
-		case "exif-tags":
-			sourceTags ??= await getTags(sourcePhotoInfo.original.filePath);
-			if (matchPhotoTags === void 0 || sourceTags.credit !== matchPhotoTags.credit || sourceTags.creator !== matchPhotoTags.creator || sourceTags.description !== matchPhotoTags.description || sourceTags.preservedFileName !== matchPhotoTags.preservedFileName || sourceTags.label !== matchPhotoTags.label) return diffStrategy;
-			break;
-		case "export-options":
-			if (matchPhotoTags === void 0 || !deepEqual(exportOptions.exportOptions, matchPhotoTags.aphexMetadata?.exportOptions.exportOptions)) return diffStrategy;
-			break;
-		case "file-name":
-			if (stripExtension(path.basename(matchPhotoFilePath)) !== sourcePhotoFileBaseName) return diffStrategy;
-			break;
-		case "force-update": return diffStrategy;
-		case "metadata-options":
-			sourceTags ??= await getTags(sourcePhotoInfo.original.filePath);
-			if (matchPhotoTags === void 0 || !deepEqual(exportOptions.metadataOptions, matchPhotoTags.aphexMetadata?.exportOptions.metadataOptions)) return diffStrategy;
-			break;
-		case "photo-info":
-			if (matchPhotoTags === void 0 || !deepEqual(sourcePhotoInfo, matchPhotoTags.aphexMetadata?.photoInfo)) return diffStrategy;
-			break;
-		case "process-options":
-			if (matchPhotoTags === void 0 || !deepEqual(exportOptions.processOptions, matchPhotoTags.aphexMetadata?.exportOptions.processOptions)) return diffStrategy;
-			break;
+	let sourceTags;
+	async function strategyFindsDifference(diffStrategy) {
+		switch (diffStrategy) {
+			case "exif-tags":
+				sourceTags ??= await getTags(sourcePhotoInfo.original.filePath);
+				return matchPhotoTags === void 0 || sourceTags.credit !== matchPhotoTags.credit || sourceTags.creator !== matchPhotoTags.creator || sourceTags.description !== matchPhotoTags.description || sourceTags.preservedFileName !== matchPhotoTags.preservedFileName || sourceTags.label !== matchPhotoTags.label;
+			case "export-options": return matchPhotoTags === void 0 || !deepEqual(exportOptions.exportOptions, matchPhotoTags.aphexMetadata?.exportOptions.exportOptions);
+			case "file-name": return stripExtension(path.basename(matchPhotoFilePath)) !== sourcePhotoFileBaseName;
+			case "force-update": return true;
+			case "metadata-options":
+				sourceTags ??= await getTags(sourcePhotoInfo.original.filePath);
+				return matchPhotoTags === void 0 || !deepEqual(exportOptions.metadataOptions, matchPhotoTags.aphexMetadata?.exportOptions.metadataOptions);
+			case "photo-info": return matchPhotoTags === void 0 || !deepEqual(sourcePhotoInfo, matchPhotoTags.aphexMetadata?.photoInfo);
+			case "process-options": return matchPhotoTags === void 0 || !deepEqual(exportOptions.processOptions, matchPhotoTags.aphexMetadata?.exportOptions.processOptions);
+		}
 	}
+	for (const diffStrategy of diffStrategies) if (await strategyFindsDifference(diffStrategy)) return diffStrategy;
 	return false;
 }
 //#endregion
@@ -1953,9 +1946,8 @@ async function exportPhotos(identifiers, destinationDirectory, options) {
 			exportResult.results.exportResult = cleanExportResults(matchingExportResult);
 		} else log.warn(`No export result found for photo "${exportResult.photoInfo.title ?? exportResult.photoInfo.uuid}"`);
 	}
-	let processResults;
 	if (processOptions !== "disabled") {
-		processResults = await processPhotos(exportResults.filter((exportResult) => exportResult.results.syncResult?.status !== "unchanged").map((exportResult) => exportResult.path), destinationDirectory, processOptions);
+		const processResults = await processPhotos(exportResults.filter((exportResult) => exportResult.results.syncResult?.status !== "unchanged").map((exportResult) => exportResult.path), destinationDirectory, processOptions);
 		await fse.rm(exportDirectory, {
 			force: true,
 			recursive: true
@@ -1969,10 +1961,9 @@ async function exportPhotos(identifiers, destinationDirectory, options) {
 			} else log.warn(`No process result found for photo "${exportResult.photoInfo.title ?? exportResult.photoInfo.uuid}"`);
 		}
 	}
-	let metadataResults;
 	if (metadataOptions !== "disabled") {
 		const targetPhotos = exportResults.filter((exportResult) => exportResult.results.syncResult?.status !== "unchanged");
-		metadataResults = await manageMetadataBatch(targetPhotos.map((exportResult) => exportResult.photoInfo), targetPhotos.map((exportResult) => exportResult.path), metadataOptions, resolvedOptions);
+		const metadataResults = await manageMetadataBatch(targetPhotos.map((exportResult) => exportResult.photoInfo), targetPhotos.map((exportResult) => exportResult.path), metadataOptions, resolvedOptions);
 		for (const exportResult of exportResults) {
 			const matchingMetadataResult = metadataResults.find((photoExportResult) => photoExportResult.photoInfo.uuid === exportResult.photoInfo.uuid);
 			if (matchingMetadataResult) exportResult.results.metadataResult = cleanMetadataResults(matchingMetadataResult);

package/dist/workers/process-image-worker.js

@@ -27,9 +27,8 @@
 export default async function worker({ destinationDirectory, options, sourceImagePath, verbose }) {
 	// Weird workaround after issues with ESM imports in worker threads and more recent versions of Node / TSX / Piscina / etc?
 	// ts-node didn't work
-	const { processImage } = await import('importx').then(async (x) =>
-		x.import('../index', import.meta.url),
-	)
+	const importx = await import('importx')
+	const { processImage } = await importx.import('../index', import.meta.url)
 
 	if (verbose) {
 		console.log(`Processing image on worker thread:\n${sourceImagePath}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitschpatrol/aphex",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Apple Photos Export. TypeScript library and CLI tool to export and process images and albums from your macOS Photos.app library.",
   "keywords": [
     "apple",
@@ -41,39 +41,41 @@
   "dependencies": {
     "@sindresorhus/is": "^8.1.0",
     "defu": "^6.1.7",
-    "execa": "^9.6.1",
-    "exiftool-vendored": "^35.20.0",
-    "fast-equals": "^6.0.0",
-    "fs-extra": "^11.3.5",
+    "execa": "^10.0.1",
+    "exiftool-vendored": "^38.1.0",
+    "fast-equals": "^6.0.4",
+    "fs-extra": "^11.4.0",
     "github-slugger": "^2.0.0",
-    "image-size": "^2.0.2",
+    "image-size": "^2.0.4",
     "importx": "^0.5.2",
-    "lognow": "^0.6.2",
+    "lognow": "^0.8.4",
     "mrmime": "^2.0.1",
-    "piscina": "^5.1.4",
-    "type-fest": "^5.6.0"
+    "piscina": "^5.3.2",
+    "type-fest": "^5.10.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/core": "^0.18.2",
-    "@clack/prompts": "^1.4.0",
-    "@kitschpatrol/shared-config": "^7.6.0",
+    "@arethetypeswrong/core": "^0.18.5",
+    "@clack/prompts": "^1.8.1",
+    "@kitschpatrol/shared-config": "^8.10.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "~22.18.13",
-    "@vitest/coverage-v8": "^4.1.6",
-    "bumpp": "^11.1.0",
-    "globby": "^16.2.0",
+    "@types/node": "~24.13.4",
+    "@vitest/coverage-v8": "^5.0.1",
+    "brewpub": "^0.3.0",
+    "bumpp": "^12.3.0",
+    "globby": "^16.2.4",
     "markdown-table": "^3.0.4",
-    "mdat-plugin-cli-help": "^3.0.0",
-    "open": "^11.0.0",
-    "pretty-bytes": "^7.1.0",
-    "pretty-ms": "^9.3.0",
-    "publint": "^0.3.21",
-    "tsdown": "^0.22.0",
-    "tsx": "^4.22.0",
-    "vitest": "^4.1.6"
+    "mdat-plugin-cli-help": "^3.2.0",
+    "open": "^11.0.4",
+    "pretty-bytes": "^7.1.3",
+    "pretty-ms": "^9.3.1",
+    "publint": "^0.3.24",
+    "tsdown": "^0.23.0",
+    "tsx": "^4.23.15",
+    "typescript": "~6.0.3",
+    "vitest": "^5.0.1"
   },
   "engines": {
-    "node": ">=22.18.0"
+    "node": ">=24.16.0"
   },
   "os": [
     "darwin"
@@ -85,14 +87,14 @@
     "access": "public"
   },
   "scripts": {
-    "build": "pnpm --sequential /^build:/",
+    "build": "pnpm run --sequential /^build:/",
     "build:1-lib": "tsdown",
     "build:2-native": "cd native/aphex-swift && ./build.sh",
     "build:3-publint": "publint",
-    "clean": "git rm -f pnpm-lock.yaml && git clean -fdX -e !.claude/",
+    "clean-deep": "git rm -f pnpm-lock.yaml && git clean -fdX -e !.claude/",
     "fix": "ksc fix && mdat ./native/aphex-swift/readme.md",
     "lint": "ksc lint",
-    "release": "bumpp --commit 'Release: %s' && pnpm build && NPM_AUTH_TOKEN=$(op read 'op://Personal/npm/token') pnpm publish",
+    "release": "bumpp --commit 'Release: %s' && pnpm build && pnpm publish --otp $(op item get npm --otp) && brewpub --tap kitschpatrol/tap",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage"
   }

package/readme.md

@@ -8,8 +8,8 @@
 
 <!-- badges -->
 
-[![NPM Package @kitschpatrol/aphex](https://img.shields.io/npm/v/@kitschpatrol/aphex.svg)](https://npmjs.com/package/@kitschpatrol/aphex)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/license/mit/)
+[![NPM Package @kitschpatrol/aphex](https://img.shields.io/npm/v/@kitschpatrol/aphex.svg)](https://www.npmjs.com/package/@kitschpatrol/aphex)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/license/mit)
 
 <!-- /badges -->
 
@@ -35,9 +35,9 @@ Aphex is a TypeScript library for exporting images and albums from your local ma
 
 It makes it simple to export high-quality versions of specific photos or albums from your Photos.app library via a path-like syntax. It can also (optionally) perform image resizing, compression, metadata migration, metadata validation, and color space normalization.
 
-I created this library for integration in static website content management asset pipelines, and to attempt to work around some issues related to [exporting high-quality versions of edited images](https://github.com/RhetTbull/osxphotos/discussions/1522) from the Photos.app library. (See the [unplugin-aphex](https://github.com/kitschpatrol/unplugin-aphex) project for an additional layer of integration with various build tools, and the [vscode-aphex](https://github.com/kitschpatrol/vscode-aphex) plugin for hover previews of Aphex links in VS Code.)
+I created this library for integration in static website content management asset pipelines, and to attempt to work around some issues related to [exporting high-quality versions of edited images](https://github.com/RhetTbull/osxphotos/discussions/1522) from the Photos.app library. (See the [unplugin-aphex](https://github.com/kitschpatrol/unplugin-aphex) project for an additional layer of integration with various build tools, and the [vscode-aphex-preview](https://github.com/kitschpatrol/vscode-aphex-preview) plugin for hover previews of Aphex links in VS Code.)
 
-This repository also embeds the `aphex-swift` CLI project, which provides a minimal and performant wrapper around parts of Apple's PhotoKit framework. It's not intended for direct use, instead it provides just enough functionality to support the parts of the methods provided by the `aphex` TypeScript library that can only be implemented natively.
+This repository also embeds the `aphex-swift` CLI project, which provides a minimal and performant wrapper around parts of Apple's PhotoKit framework. It's not really intended for direct use beyond querying the Photos library and simple exports. It provides just enough functionality to support the parts of the methods provided by the `aphex` TypeScript library that can only be implemented natively.
 
 <!-- /* spell-checker:disable */  -->
 
@@ -68,8 +68,23 @@ If you skip image processing (`processOptions: 'disabled'`) you can omit the Hom
 
 ### Installation
 
+The easiest way to install the CLI tool is via Homebrew:
+
+```sh
+brew install kitschpatrol/tap/aphex
+```
+
+If you're working in a Node project or prefer to install through npm, you will need some additional dependencies for the image processing functionality exposed through the library API.
+
+These are easiest to install via Homebrew:
+
 ```sh
 brew install libavif mozjpeg imagemagick webp dssim ffmpeg guetzli oxipng
+```
+
+Then, in your node project:
+
+```sh
 npm install @kitschpatrol/aphex
 ```
 
@@ -77,7 +92,7 @@ npm install @kitschpatrol/aphex
 
 In most cases, the application invoking aphex should request permission to access your Photos.app library on first use.
 
-In certain situations, like executing commands in a VS Code terminal, can [fail to prompt for permission](https://errorism.dev/issues/microsoft-vscode-vscode-terminal-doesnt-allowrequest-permissions-to-access-media-devices). You can work around this through some _highly inadvisable_ direct manipulation of the [permissions database](https://www.rainforestqa.com/blog/macos-tcc-db-deep-dive):
+In certain situations, like executing commands in a VS Code terminal, can [fail to prompt for permission](https://errorism.dev/issues/microsoft-vscode-vscode-terminal-doesnt-allowrequest-permissions-to-access-media-devices). You can work around this through some _highly inadvisable_ direct manipulation of the [permissions database](https://web.archive.org/web/https://www.rainforestqa.com/blog/macos-tcc-db-deep-dive):
 
 For example, to grant photo library permission to VS Code:
 
@@ -192,7 +207,7 @@ setLogger(console)
 
 ##### Exporting a photo by filename
 
-Let's assume you have an album named "Trip" in your Photos.app library containing a photo with the filename "IMG_1922.jpeg":
+Let's assume you have an album named "Trip" in your Photos.app library containing a photo with the filename "IMG\_1922.jpeg":
 
 ```ts
 const result = await exportPhoto('Trip/IMG_1922.jpeg', '~/Desktop')