Add programOptions helper

Author: 343dev

cli.js

@@ -7,6 +7,7 @@ import { fileURLToPath } from 'node:url';
 import { program } from 'commander';
 
 import optimizt from './index.js';
+import { setProgramOptions } from './lib/program-options.js';
 
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 const packageJson = JSON.parse(await fs.readFile(path.join(dirname, 'package.json')));
@@ -29,9 +30,20 @@ program
 if (program.args.length === 0) {
 	program.help();
 } else {
+	const { avif, webp, force, lossless, verbose, config, output } = program.opts();
+
+	setProgramOptions({
+		shouldConvertToAvif: Boolean(avif),
+		shouldConvertToWebp: Boolean(webp),
+		isForced: Boolean(force),
+		isLossless: Boolean(lossless),
+		isVerbose: Boolean(verbose),
+	});
+
 	optimizt({
-		paths: program.args,
-		...program.opts(),
+		inputPaths: program.args,
+		outputDirectoryPath: output,
+		configFilePath: config,
 	});
 }
 

index.js

@@ -5,28 +5,28 @@ import { pathToFileURL } from 'node:url';
 import { SUPPORTED_FILE_TYPES } from './lib/constants.js';
 import convert from './lib/convert.js';
 import { findConfig } from './lib/find-config.js';
-import { enableVerbose, log, logErrorAndExit } from './lib/log.js';
+import { log, logErrorAndExit } from './lib/log.js';
 import optimize from './lib/optimize.js';
 import { prepareInputFilePaths } from './lib/prepare-input-file-paths.js';
 import { prepareOutputDirectoryPath } from './lib/prepare-output-directory-path.js';
+import { programOptions } from './lib/program-options.js';
 
 const MODE_NAME = {
 	CONVERT: 'convert',
 	OPTIMIZE: 'optimize',
 };
 
 export default async function optimizt({
-	paths: inputPaths,
-	output: outputDirectoryPath,
-	config: configFilePath,
-
-	avif: shouldConvertToAvif,
-	webp: shouldConvertToWebp,
-
-	force: isForced,
-	lossless: isLossless,
-	verbose: isVerbose,
+	inputPaths,
+	outputDirectoryPath,
+	configFilePath,
 }) {
+	const {
+		isLossless,
+		shouldConvertToAvif,
+		shouldConvertToWebp,
+	} = programOptions;
+
 	const shouldConvert = shouldConvertToAvif || shouldConvertToWebp;
 
 	const currentMode = shouldConvert
@@ -44,10 +44,6 @@ export default async function optimizt({
 	const preparedInputFilePaths = await prepareInputFilePaths(inputPaths, SUPPORTED_FILE_TYPES[currentMode.toUpperCase()]);
 	const preparedOutputDirectoryPath = await prepareOutputDirectoryPath(outputDirectoryPath);
 
-	if (isVerbose) {
-		enableVerbose();
-	}
-
 	if (isLossless) {
 		log('Lossless optimization may take a long time');
 	}
@@ -59,14 +55,7 @@ export default async function optimizt({
 	await processFunction({
 		inputFilePaths: preparedInputFilePaths,
 		outputDirectoryPath: preparedOutputDirectoryPath,
-		isLossless,
 		config,
-
-		...shouldConvert && {
-			shouldConvertToAvif,
-			shouldConvertToWebp,
-			isForced,
-		},
 	});
 }
 

lib/convert.js

@@ -23,17 +23,21 @@ import {
 import { optionsToArguments } from './options-to-arguments.js';
 import { parseImageMetadata } from './parse-image-metadata.js';
 import prepareWriteFilePath from './prepare-write-file-path.js';
+import { programOptions } from './program-options.js';
 import showTotal from './show-total.js';
 
 export default async function convert({
 	inputFilePaths,
 	outputDirectoryPath,
-	isLossless,
 	config,
-	shouldConvertToAvif,
-	shouldConvertToWebp,
-	isForced,
 }) {
+	const {
+		isForced,
+		isLossless,
+		shouldConvertToAvif,
+		shouldConvertToWebp,
+	} = programOptions;
+
 	const inputFilePathsCount = inputFilePaths.length;
 
 	if (!inputFilePathsCount) {

lib/log.js

@@ -1,6 +1,7 @@
 import { EOL } from 'node:os';
 
 import { colorize } from './colorize.js';
+import { programOptions } from './program-options.js';
 
 export const LOG_TYPES = {
 	INFO: 'info',
@@ -26,12 +27,6 @@ const symbols = {
 const isUnicodeSupported = process.platform !== 'win32' || process.env.TERM === 'xterm-256color';
 const symbolIndex = isUnicodeSupported ? 1 : 0;
 
-let isVerbose = false;
-
-export function enableVerbose() {
-	isVerbose = true;
-}
-
 function formatLogMessage(title, { type = LOG_TYPES.INFO, description } = {}) {
 	if (!title) {
 		throw new Error('Title is required');
@@ -73,7 +68,7 @@ export function logProgress(title, { type, description, progressBarContainer } =
 }
 
 export function logProgressVerbose(title, { type, description, progressBarContainer } = {}) {
-	if (isVerbose) {
+	if (programOptions.isVerbose) {
 		logProgress(title, { type, description, progressBarContainer });
 	}
 }

lib/optimize.js

@@ -23,14 +23,16 @@ import {
 import { optionsToArguments } from './options-to-arguments.js';
 import { parseImageMetadata } from './parse-image-metadata.js';
 import prepareWriteFilePath from './prepare-write-file-path.js';
+import { programOptions } from './program-options.js';
 import showTotal from './show-total.js';
 
 export default async function optimize({
 	inputFilePaths,
 	outputDirectoryPath,
-	isLossless,
 	config,
 }) {
+	const { isLossless } = programOptions;
+
 	const inputFilePathsCount = inputFilePaths.length;
 
 	if (inputFilePathsCount <= 0) {

lib/program-options.js

@@ -0,0 +1,12 @@
+export const programOptions = {
+	shouldConvertToAvif: false,
+	shouldConvertToWebp: false,
+	isForced: false,
+	isLossless: false,
+	isVerbose: false,
+};
+
+export function setProgramOptions(options) {
+	Object.assign(programOptions, options);
+	Object.freeze(programOptions);
+}