@mediaproc/image 1.1.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/affine.d.ts.map +1 -1
- package/dist/commands/affine.js +65 -37
- package/dist/commands/affine.js.map +1 -1
- package/dist/commands/auto-enhance.d.ts.map +1 -1
- package/dist/commands/auto-enhance.js +74 -49
- package/dist/commands/auto-enhance.js.map +1 -1
- package/dist/commands/auto-orient.d.ts.map +1 -1
- package/dist/commands/auto-orient.js +60 -35
- package/dist/commands/auto-orient.js.map +1 -1
- package/dist/commands/batch.d.ts.map +1 -1
- package/dist/commands/batch.js +17 -34
- package/dist/commands/batch.js.map +1 -1
- package/dist/commands/blur.d.ts.map +1 -1
- package/dist/commands/blur.js +64 -36
- package/dist/commands/blur.js.map +1 -1
- package/dist/commands/boolean.d.ts.map +1 -1
- package/dist/commands/boolean.js +61 -32
- package/dist/commands/boolean.js.map +1 -1
- package/dist/commands/border.d.ts.map +1 -1
- package/dist/commands/border.js +60 -34
- package/dist/commands/border.js.map +1 -1
- package/dist/commands/clahe.d.ts.map +1 -1
- package/dist/commands/clahe.js +58 -31
- package/dist/commands/clahe.js.map +1 -1
- package/dist/commands/composite.d.ts.map +1 -1
- package/dist/commands/composite.js +52 -26
- package/dist/commands/composite.js.map +1 -1
- package/dist/commands/convert.d.ts.map +1 -1
- package/dist/commands/convert.js +94 -47
- package/dist/commands/convert.js.map +1 -1
- package/dist/commands/convolve.d.ts.map +1 -1
- package/dist/commands/convolve.js +63 -37
- package/dist/commands/convolve.js.map +1 -1
- package/dist/commands/crop.d.ts.map +1 -1
- package/dist/commands/crop.js +73 -48
- package/dist/commands/crop.js.map +1 -1
- package/dist/commands/dilate.d.ts.map +1 -1
- package/dist/commands/dilate.js +60 -31
- package/dist/commands/dilate.js.map +1 -1
- package/dist/commands/dominant-color.d.ts.map +1 -1
- package/dist/commands/dominant-color.js +154 -89
- package/dist/commands/dominant-color.js.map +1 -1
- package/dist/commands/erode.d.ts.map +1 -1
- package/dist/commands/erode.js +61 -32
- package/dist/commands/erode.js.map +1 -1
- package/dist/commands/extend.d.ts.map +1 -1
- package/dist/commands/extend.js +66 -41
- package/dist/commands/extend.js.map +1 -1
- package/dist/commands/extract.d.ts.map +1 -1
- package/dist/commands/extract.js +75 -45
- package/dist/commands/extract.js.map +1 -1
- package/dist/commands/flatten.d.ts.map +1 -1
- package/dist/commands/flatten.js +64 -38
- package/dist/commands/flatten.js.map +1 -1
- package/dist/commands/flip.d.ts.map +1 -1
- package/dist/commands/flip.js +78 -43
- package/dist/commands/flip.js.map +1 -1
- package/dist/commands/flop.d.ts.map +1 -1
- package/dist/commands/flop.js +67 -32
- package/dist/commands/flop.js.map +1 -1
- package/dist/commands/gamma.d.ts.map +1 -1
- package/dist/commands/gamma.js +66 -33
- package/dist/commands/gamma.js.map +1 -1
- package/dist/commands/grayscale.d.ts.map +1 -1
- package/dist/commands/grayscale.js +67 -34
- package/dist/commands/grayscale.js.map +1 -1
- package/dist/commands/grid.d.ts.map +1 -1
- package/dist/commands/grid.js +19 -14
- package/dist/commands/grid.js.map +1 -1
- package/dist/commands/linear.d.ts.map +1 -1
- package/dist/commands/linear.js +60 -32
- package/dist/commands/linear.js.map +1 -1
- package/dist/commands/median.d.ts.map +1 -1
- package/dist/commands/median.js +66 -33
- package/dist/commands/median.js.map +1 -1
- package/dist/commands/metadata-cmd.d.ts.map +1 -1
- package/dist/commands/metadata-cmd.js +229 -93
- package/dist/commands/metadata-cmd.js.map +1 -1
- package/dist/commands/mirror.d.ts.map +1 -1
- package/dist/commands/mirror.js +127 -105
- package/dist/commands/mirror.js.map +1 -1
- package/dist/commands/modulate.d.ts.map +1 -1
- package/dist/commands/modulate.js +64 -41
- package/dist/commands/modulate.js.map +1 -1
- package/dist/commands/negate.d.ts.map +1 -1
- package/dist/commands/negate.js +66 -31
- package/dist/commands/negate.js.map +1 -1
- package/dist/commands/normalize.d.ts.map +1 -1
- package/dist/commands/normalize.js +60 -31
- package/dist/commands/normalize.js.map +1 -1
- package/dist/commands/optimize.d.ts.map +1 -1
- package/dist/commands/optimize.js +68 -45
- package/dist/commands/optimize.js.map +1 -1
- package/dist/commands/palette.d.ts.map +1 -1
- package/dist/commands/palette.js +115 -56
- package/dist/commands/palette.js.map +1 -1
- package/dist/commands/pixelate.d.ts.map +1 -1
- package/dist/commands/pixelate.js +63 -35
- package/dist/commands/pixelate.js.map +1 -1
- package/dist/commands/recomb.d.ts.map +1 -1
- package/dist/commands/recomb.js +87 -57
- package/dist/commands/recomb.js.map +1 -1
- package/dist/commands/resize.d.ts.map +1 -1
- package/dist/commands/resize.js +99 -69
- package/dist/commands/resize.js.map +1 -1
- package/dist/commands/rotate.d.ts.map +1 -1
- package/dist/commands/rotate.js +69 -36
- package/dist/commands/rotate.js.map +1 -1
- package/dist/commands/sepia.d.ts.map +1 -1
- package/dist/commands/sepia.js +67 -34
- package/dist/commands/sepia.js.map +1 -1
- package/dist/commands/sharpen.d.ts.map +1 -1
- package/dist/commands/sharpen.js +71 -38
- package/dist/commands/sharpen.js.map +1 -1
- package/dist/commands/smart-crop.d.ts.map +1 -1
- package/dist/commands/smart-crop.js +50 -27
- package/dist/commands/smart-crop.js.map +1 -1
- package/dist/commands/split.d.ts.map +1 -1
- package/dist/commands/split.js +79 -47
- package/dist/commands/split.js.map +1 -1
- package/dist/commands/stack.d.ts.map +1 -1
- package/dist/commands/stack.js +19 -3
- package/dist/commands/stack.js.map +1 -1
- package/dist/commands/stats.d.ts.map +1 -1
- package/dist/commands/stats.js +159 -97
- package/dist/commands/stats.js.map +1 -1
- package/dist/commands/threshold.d.ts.map +1 -1
- package/dist/commands/threshold.js +65 -39
- package/dist/commands/threshold.js.map +1 -1
- package/dist/commands/thumbnail.d.ts.map +1 -1
- package/dist/commands/thumbnail.js +70 -36
- package/dist/commands/thumbnail.js.map +1 -1
- package/dist/commands/tint.d.ts.map +1 -1
- package/dist/commands/tint.js +66 -32
- package/dist/commands/tint.js.map +1 -1
- package/dist/commands/trim.d.ts.map +1 -1
- package/dist/commands/trim.js +60 -34
- package/dist/commands/trim.js.map +1 -1
- package/dist/commands/unflatten.d.ts.map +1 -1
- package/dist/commands/unflatten.js +63 -36
- package/dist/commands/unflatten.js.map +1 -1
- package/dist/commands/vignette.d.ts.map +1 -1
- package/dist/commands/vignette.js +69 -50
- package/dist/commands/vignette.js.map +1 -1
- package/dist/commands/watermark.d.ts.map +1 -1
- package/dist/commands/watermark.js +81 -57
- package/dist/commands/watermark.js.map +1 -1
- package/dist/utils/pathValidator.d.ts +74 -0
- package/dist/utils/pathValidator.d.ts.map +1 -0
- package/dist/utils/pathValidator.js +208 -0
- package/dist/utils/pathValidator.js.map +1 -0
- package/package.json +12 -5
package/dist/commands/batch.js
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import ora from 'ora';
|
|
3
3
|
import path from 'path';
|
|
4
|
-
import fs from 'fs';
|
|
4
|
+
import * as fs from 'fs';
|
|
5
|
+
import { validatePaths, MediaExtensions } from '../utils/pathValidator.js';
|
|
5
6
|
import { createSharpInstance } from '../utils/sharp.js';
|
|
6
7
|
import { createStandardHelp } from '../utils/helpFormatter.js';
|
|
7
8
|
export function batchCommand(imageCmd) {
|
|
8
9
|
imageCmd
|
|
9
10
|
.command('batch <directory>')
|
|
10
11
|
.description('Process multiple images in batch with any operation')
|
|
11
|
-
.requiredOption('
|
|
12
|
+
.requiredOption('--operation <operation>', 'Operation: resize, convert, optimize, grayscale, etc.')
|
|
12
13
|
.option('-o, --output <directory>', 'Output directory (default: ./output)')
|
|
13
14
|
.option('-p, --pattern <glob>', 'File pattern (default: *.{jpg,jpeg,png,webp,gif})')
|
|
14
15
|
.option('-r, --recursive', 'Process subdirectories recursively')
|
|
@@ -25,9 +26,9 @@ export function batchCommand(imageCmd) {
|
|
|
25
26
|
commandName: 'batch',
|
|
26
27
|
emoji: '📦',
|
|
27
28
|
description: 'Process multiple images at once with any operation. Perfect for bulk processing, batch conversions, and automated workflows.',
|
|
28
|
-
usage: ['batch <directory> --operation resize --width 800', 'batch <directory>
|
|
29
|
+
usage: ['batch <directory> --operation resize --width 800', 'batch <directory> --operation convert --format webp', 'batch <directory> --operation optimize -q 85'],
|
|
29
30
|
options: [
|
|
30
|
-
{ flag: '
|
|
31
|
+
{ flag: '--operation <operation>', description: 'Operation: resize, convert, optimize, grayscale, blur, etc. (required)' },
|
|
31
32
|
{ flag: '-o, --output <directory>', description: 'Output directory (default: ./output)' },
|
|
32
33
|
{ flag: '-p, --pattern <glob>', description: 'File pattern (default: *.{jpg,jpeg,png,webp,gif})' },
|
|
33
34
|
{ flag: '-r, --recursive', description: 'Process subdirectories recursively' },
|
|
@@ -81,41 +82,23 @@ export function batchCommand(imageCmd) {
|
|
|
81
82
|
}
|
|
82
83
|
const spinner = ora('Scanning directory...').start();
|
|
83
84
|
try {
|
|
84
|
-
|
|
85
|
-
|
|
85
|
+
// Validate input directory
|
|
86
|
+
const { inputFiles, errors } = validatePaths(directory, undefined, {
|
|
87
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
88
|
+
recursive: options.recursive || false,
|
|
89
|
+
});
|
|
90
|
+
if (errors.length > 0) {
|
|
91
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
92
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
86
93
|
process.exit(1);
|
|
87
94
|
}
|
|
88
|
-
if (
|
|
89
|
-
spinner.fail(chalk.red(
|
|
95
|
+
if (inputFiles.length === 0) {
|
|
96
|
+
spinner.fail(chalk.red('No valid image files found in directory'));
|
|
90
97
|
process.exit(1);
|
|
91
98
|
}
|
|
99
|
+
// Use validated files from path validator
|
|
100
|
+
const imageFiles = inputFiles;
|
|
92
101
|
const outputDir = options.output || path.join(directory, 'output');
|
|
93
|
-
const pattern = options.pattern || '*.{jpg,jpeg,png,webp,gif,avif,tiff}';
|
|
94
|
-
if (options.verbose) {
|
|
95
|
-
console.log(chalk.dim(` File pattern: ${pattern}`));
|
|
96
|
-
}
|
|
97
|
-
// Find all image files
|
|
98
|
-
const imageFiles = [];
|
|
99
|
-
function scanDirectory(dir) {
|
|
100
|
-
const entries = fs.readdirSync(dir, { withFileTypes: true });
|
|
101
|
-
for (const entry of entries) {
|
|
102
|
-
const fullPath = path.join(dir, entry.name);
|
|
103
|
-
if (entry.isDirectory() && options.recursive) {
|
|
104
|
-
scanDirectory(fullPath);
|
|
105
|
-
}
|
|
106
|
-
else if (entry.isFile()) {
|
|
107
|
-
const ext = path.extname(entry.name).toLowerCase();
|
|
108
|
-
if (['.jpg', '.jpeg', '.png', '.webp', '.gif', '.avif', '.tiff'].includes(ext)) {
|
|
109
|
-
imageFiles.push(fullPath);
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
scanDirectory(directory);
|
|
115
|
-
if (imageFiles.length === 0) {
|
|
116
|
-
spinner.fail(chalk.yellow('No image files found'));
|
|
117
|
-
process.exit(0);
|
|
118
|
-
}
|
|
119
102
|
spinner.text = `Found ${imageFiles.length} images`;
|
|
120
103
|
if (options.verbose) {
|
|
121
104
|
spinner.info(chalk.blue(`Configuration:`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../src/commands/batch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../src/commands/batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blur.d.ts","sourceRoot":"","sources":["../../src/commands/blur.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASzC,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"blur.d.ts","sourceRoot":"","sources":["../../src/commands/blur.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASzC,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CA4JnD"}
|
package/dist/commands/blur.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import ora from 'ora';
|
|
3
3
|
import path from 'path';
|
|
4
|
-
import
|
|
4
|
+
import { validatePaths, resolveOutputPaths, MediaExtensions } from '../utils/pathValidator.js';
|
|
5
5
|
import { createSharpInstance } from '../utils/sharp.js';
|
|
6
6
|
import { createStandardHelp } from '../utils/helpFormatter.js';
|
|
7
7
|
export function blurCommand(imageCmd) {
|
|
@@ -59,56 +59,84 @@ export function blurCommand(imageCmd) {
|
|
|
59
59
|
});
|
|
60
60
|
process.exit(0);
|
|
61
61
|
}
|
|
62
|
-
const spinner = ora('
|
|
62
|
+
const spinner = ora('Validating inputs...').start();
|
|
63
63
|
try {
|
|
64
|
-
if (!fs.existsSync(input)) {
|
|
65
|
-
spinner.fail(chalk.red(`Input file not found: ${input}`));
|
|
66
|
-
process.exit(1);
|
|
67
|
-
}
|
|
68
64
|
if (options.sigma && (options.sigma < 0.3 || options.sigma > 1000)) {
|
|
69
65
|
spinner.fail(chalk.red('Sigma must be between 0.3 and 1000'));
|
|
70
66
|
process.exit(1);
|
|
71
67
|
}
|
|
72
|
-
const
|
|
73
|
-
|
|
68
|
+
const { inputFiles, outputDir, errors } = validatePaths(input, options.output, {
|
|
69
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
70
|
+
recursive: true,
|
|
71
|
+
});
|
|
72
|
+
if (errors.length > 0) {
|
|
73
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
74
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
75
|
+
process.exit(1);
|
|
76
|
+
}
|
|
77
|
+
if (inputFiles.length === 0) {
|
|
78
|
+
spinner.fail(chalk.red('No valid image files found'));
|
|
79
|
+
process.exit(1);
|
|
80
|
+
}
|
|
81
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
82
|
+
suffix: '-blurred',
|
|
83
|
+
preserveStructure: inputFiles.length > 1,
|
|
84
|
+
});
|
|
85
|
+
spinner.succeed(chalk.green(`Found ${inputFiles.length} image(s) to process`));
|
|
74
86
|
if (options.verbose) {
|
|
75
|
-
|
|
76
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
77
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
87
|
+
console.log(chalk.blue('\nConfiguration:'));
|
|
78
88
|
console.log(chalk.dim(` Sigma: ${options.sigma || 10}`));
|
|
79
|
-
|
|
89
|
+
console.log(chalk.dim(` Quality: ${options.quality || 90}`));
|
|
80
90
|
}
|
|
81
91
|
if (options.dryRun) {
|
|
82
|
-
|
|
83
|
-
console.log(chalk.green(
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
92
|
+
console.log(chalk.yellow('\nDry run mode - no changes will be made\n'));
|
|
93
|
+
console.log(chalk.green(`Would blur ${inputFiles.length} image(s):`));
|
|
94
|
+
inputFiles.forEach((inputFile, index) => {
|
|
95
|
+
const outputPath = outputPaths.get(inputFile);
|
|
96
|
+
console.log(chalk.dim(` ${index + 1}. ${path.basename(inputFile)} → ${path.basename(outputPath)}`));
|
|
97
|
+
});
|
|
87
98
|
return;
|
|
88
99
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
100
|
+
let successCount = 0;
|
|
101
|
+
let failCount = 0;
|
|
102
|
+
for (const [index, inputFile] of inputFiles.entries()) {
|
|
103
|
+
const outputPath = outputPaths.get(inputFile);
|
|
104
|
+
const fileName = path.basename(inputFile);
|
|
105
|
+
spinner.start(`Processing ${index + 1}/${inputFiles.length}: ${fileName}...`);
|
|
106
|
+
try {
|
|
107
|
+
const pipeline = createSharpInstance(inputFile).blur(options.sigma || 10);
|
|
108
|
+
const outputExt = path.extname(outputPath).toLowerCase();
|
|
109
|
+
if (outputExt === '.jpg' || outputExt === '.jpeg') {
|
|
110
|
+
pipeline.jpeg({ quality: options.quality || 90 });
|
|
111
|
+
}
|
|
112
|
+
else if (outputExt === '.png') {
|
|
113
|
+
pipeline.png({ quality: options.quality || 90 });
|
|
114
|
+
}
|
|
115
|
+
else if (outputExt === '.webp') {
|
|
116
|
+
pipeline.webp({ quality: options.quality || 90 });
|
|
117
|
+
}
|
|
118
|
+
await pipeline.toFile(outputPath);
|
|
119
|
+
spinner.succeed(chalk.green(`✓ ${fileName} blurred`));
|
|
120
|
+
successCount++;
|
|
121
|
+
}
|
|
122
|
+
catch (error) {
|
|
123
|
+
spinner.fail(chalk.red(`✗ Failed to blur ${fileName}`));
|
|
124
|
+
if (options.verbose && error instanceof Error) {
|
|
125
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
126
|
+
}
|
|
127
|
+
failCount++;
|
|
128
|
+
}
|
|
97
129
|
}
|
|
98
|
-
|
|
99
|
-
|
|
130
|
+
console.log(chalk.bold('\nSummary:'));
|
|
131
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
132
|
+
if (failCount > 0) {
|
|
133
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
100
134
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
spinner.succeed(chalk.green('✓ Blur applied successfully!'));
|
|
104
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
105
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
106
|
-
console.log(chalk.dim(` Size: ${metadata.width}x${metadata.height}`));
|
|
107
|
-
console.log(chalk.dim(` Sigma: ${options.sigma || 10}`));
|
|
108
|
-
console.log(chalk.dim(` File size: ${(outputStats.size / 1024).toFixed(2)}KB`));
|
|
135
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
136
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
109
137
|
}
|
|
110
138
|
catch (error) {
|
|
111
|
-
spinner.fail(chalk.red('Failed to blur
|
|
139
|
+
spinner.fail(chalk.red('Failed to blur images'));
|
|
112
140
|
if (options.verbose) {
|
|
113
141
|
console.error(chalk.red('Error details:'), error);
|
|
114
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blur.js","sourceRoot":"","sources":["../../src/commands/blur.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"blur.js","sourceRoot":"","sources":["../../src/commands/blur.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE/F,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,UAAU,WAAW,CAAC,QAAiB;IAC3C,QAAQ;SACL,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,4BAA4B,CAAC;SACzC,MAAM,CAAC,qBAAqB,EAAE,uCAAuC,EAAE,UAAU,EAAE,EAAE,CAAC;SACtF,MAAM,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;SACjD,MAAM,CAAC,yBAAyB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,EAAE,CAAC;SAClE,MAAM,CAAC,WAAW,EAAE,2CAA2C,CAAC;SAChE,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC;SACzC,MAAM,CAAC,QAAQ,EAAE,+BAA+B,CAAC;SACjD,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,OAAsB,EAAE,EAAE;QACtD,yBAAyB;QACzB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,kBAAkB,CAAC;gBACjB,WAAW,EAAE,MAAM;gBACnB,KAAK,EAAE,KAAK;gBACZ,WAAW,EAAE,2HAA2H;gBACxI,KAAK,EAAE;oBACL,cAAc;oBACd,yBAAyB;oBACzB,qCAAqC;iBACtC;gBACD,OAAO,EAAE;oBACP,EAAE,IAAI,EAAE,qBAAqB,EAAE,WAAW,EAAE,uCAAuC,EAAE;oBACrF,EAAE,IAAI,EAAE,qBAAqB,EAAE,WAAW,EAAE,mDAAmD,EAAE;oBACjG,EAAE,IAAI,EAAE,yBAAyB,EAAE,WAAW,EAAE,oCAAoC,EAAE;oBACtF,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,mCAAmC,EAAE;oBACvE,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,sBAAsB,EAAE;iBAC/D;gBACD,QAAQ,EAAE;oBACR,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,gCAAgC,EAAE;oBAC5E,EAAE,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,kBAAkB,EAAE;oBACnE,EAAE,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,kBAAkB,EAAE;oBAClE,EAAE,OAAO,EAAE,qCAAqC,EAAE,WAAW,EAAE,yBAAyB,EAAE;oBAC1F,EAAE,OAAO,EAAE,iCAAiC,EAAE,WAAW,EAAE,wBAAwB,EAAE;iBACtF;gBACD,kBAAkB,EAAE;oBAClB;wBACE,KAAK,EAAE,qBAAqB;wBAC5B,KAAK,EAAE;4BACL,iCAAiC;4BACjC,6CAA6C;4BAC7C,6CAA6C;4BAC7C,yCAAyC;yBAC1C;qBACF;iBACF;gBACD,IAAI,EAAE;oBACJ,4CAA4C;oBAC5C,0CAA0C;oBAC1C,8CAA8C;iBAC/C;aACF,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,CAAC,sBAAsB,CAAC,CAAC,KAAK,EAAE,CAAC;QAEpD,IAAI,CAAC;YACH,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,IAAI,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC;gBACnE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC,CAAC;gBAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE;gBAC7E,iBAAiB,EAAE,eAAe,CAAC,KAAK;gBACxC,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBAC9C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC;gBACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,MAAM,WAAW,GAAG,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE;gBAC5D,MAAM,EAAE,UAAU;gBAClB,iBAAiB,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC;aACzC,CAAC,CAAC;YAEH,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,UAAU,CAAC,MAAM,sBAAsB,CAAC,CAAC,CAAC;YAE/E,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC1D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAChE,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAC,CAAC;gBACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,UAAU,CAAC,MAAM,YAAY,CAAC,CAAC,CAAC;gBACtE,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;oBACtC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAW,CAAC,EAAE,CAAC,CAAC,CAAC;gBACxG,CAAC,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;gBACtD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAE1C,OAAO,CAAC,KAAK,CAAC,cAAc,KAAK,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,KAAK,CAAC,CAAC;gBAE9E,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;oBAE1E,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;oBACzD,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;wBAClD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;oBACpD,CAAC;yBAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;wBAChC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;oBACnD,CAAC;yBAAM,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;wBACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;oBACpD,CAAC;oBAED,MAAM,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBAElC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,QAAQ,UAAU,CAAC,CAAC,CAAC;oBACtD,YAAY,EAAE,CAAC;gBACjB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC,CAAC;oBACxD,IAAI,OAAO,CAAC,OAAO,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;wBAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;oBACxD,CAAC;oBACD,SAAS,EAAE,CAAC;gBACd,CAAC;YACH,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC,CAAC;YACzD,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,SAAS,EAAE,CAAC,CAAC,CAAC;YACrD,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC,CAAC;YAE3D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC,CAAC;QAE7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;YACjD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC,CAAC;YACrD,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boolean.d.ts","sourceRoot":"","sources":["../../src/commands/boolean.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"boolean.d.ts","sourceRoot":"","sources":["../../src/commands/boolean.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAezC,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CA4LtD"}
|
package/dist/commands/boolean.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import ora from 'ora';
|
|
3
3
|
import path from 'path';
|
|
4
|
-
import fs from 'fs';
|
|
4
|
+
import * as fs from 'fs';
|
|
5
|
+
import { validatePaths, resolveOutputPaths, MediaExtensions } from '../utils/pathValidator.js';
|
|
5
6
|
import { createSharpInstance } from '../utils/sharp.js';
|
|
6
7
|
import { createStandardHelp } from '../utils/helpFormatter.js';
|
|
7
8
|
export function booleanCommand(imageCmd) {
|
|
@@ -87,10 +88,7 @@ export function booleanCommand(imageCmd) {
|
|
|
87
88
|
cmd.action(async (input, options) => {
|
|
88
89
|
const spinner = ora('Processing image...').start();
|
|
89
90
|
try {
|
|
90
|
-
|
|
91
|
-
spinner.fail(chalk.red(`Input file not found: ${input}`));
|
|
92
|
-
process.exit(1);
|
|
93
|
-
}
|
|
91
|
+
// Validate operand file exists (single file)
|
|
94
92
|
if (!options.operand || !fs.existsSync(options.operand)) {
|
|
95
93
|
spinner.fail(chalk.red(`Operand image not found: ${options.operand}`));
|
|
96
94
|
process.exit(1);
|
|
@@ -101,49 +99,80 @@ export function booleanCommand(imageCmd) {
|
|
|
101
99
|
spinner.fail(chalk.red(`Invalid operation. Use: ${validOperations.join(', ')}`));
|
|
102
100
|
process.exit(1);
|
|
103
101
|
}
|
|
104
|
-
|
|
105
|
-
const
|
|
102
|
+
// Validate input paths (can be multiple)
|
|
103
|
+
const { inputFiles, outputDir, errors } = validatePaths(input, options.output, {
|
|
104
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
105
|
+
recursive: true,
|
|
106
|
+
});
|
|
107
|
+
if (errors.length > 0) {
|
|
108
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
109
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
110
|
+
process.exit(1);
|
|
111
|
+
}
|
|
112
|
+
if (inputFiles.length === 0) {
|
|
113
|
+
spinner.fail(chalk.red('No valid image files found'));
|
|
114
|
+
process.exit(1);
|
|
115
|
+
}
|
|
116
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
117
|
+
suffix: '-boolean',
|
|
118
|
+
preserveStructure: inputFiles.length > 1,
|
|
119
|
+
});
|
|
120
|
+
let successCount = 0;
|
|
121
|
+
let failCount = 0;
|
|
106
122
|
if (options.verbose) {
|
|
107
123
|
spinner.info(chalk.blue('Configuration:'));
|
|
108
|
-
console.log(chalk.dim(`
|
|
124
|
+
console.log(chalk.dim(` Found ${inputFiles.length} file(s)`));
|
|
109
125
|
console.log(chalk.dim(` Operand: ${options.operand}`));
|
|
110
126
|
console.log(chalk.dim(` Operation: ${operation.toUpperCase()}`));
|
|
111
|
-
console.log(chalk.dim(` Output: ${
|
|
127
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
112
128
|
spinner.start('Processing...');
|
|
113
129
|
}
|
|
114
130
|
if (options.dryRun) {
|
|
115
131
|
spinner.info(chalk.yellow('Dry run mode - no changes will be made'));
|
|
116
|
-
console.log(chalk.green(
|
|
117
|
-
console.log(chalk.dim(`
|
|
132
|
+
console.log(chalk.green(`✓ Would perform ${operation.toUpperCase()} operation on ${inputFiles.length} file(s):`));
|
|
133
|
+
inputFiles.forEach(f => console.log(chalk.dim(` - ${f}`)));
|
|
118
134
|
console.log(chalk.dim(` Operand: ${options.operand}`));
|
|
119
|
-
console.log(chalk.dim(` Operation: ${operation.toUpperCase()}`));
|
|
120
135
|
return;
|
|
121
136
|
}
|
|
122
|
-
|
|
137
|
+
// Preload operand buffer
|
|
123
138
|
const operandBuffer = await createSharpInstance(options.operand).toBuffer();
|
|
124
|
-
|
|
125
|
-
const
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
139
|
+
// Process all files
|
|
140
|
+
for (const inputFile of inputFiles) {
|
|
141
|
+
try {
|
|
142
|
+
const fileName = path.basename(inputFile);
|
|
143
|
+
const outputPath = outputPaths.get(inputFile);
|
|
144
|
+
const pipeline = createSharpInstance(inputFile).boolean(operandBuffer, operation);
|
|
145
|
+
const outputExt = path.extname(outputPath).toLowerCase();
|
|
146
|
+
if (outputExt === '.jpg' || outputExt === '.jpeg') {
|
|
147
|
+
pipeline.jpeg({ quality: options.quality || 90 });
|
|
148
|
+
}
|
|
149
|
+
else if (outputExt === '.png') {
|
|
150
|
+
pipeline.png({ quality: options.quality || 90 });
|
|
151
|
+
}
|
|
152
|
+
else if (outputExt === '.webp') {
|
|
153
|
+
pipeline.webp({ quality: options.quality || 90 });
|
|
154
|
+
}
|
|
155
|
+
await pipeline.toFile(outputPath);
|
|
156
|
+
spinner.succeed(chalk.green(`✓ ${fileName} boolean operation applied`));
|
|
157
|
+
successCount++;
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
spinner.fail(chalk.red(`✗ Failed: ${path.basename(inputFile)}`));
|
|
161
|
+
if (options.verbose && error instanceof Error) {
|
|
162
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
163
|
+
}
|
|
164
|
+
failCount++;
|
|
165
|
+
}
|
|
131
166
|
}
|
|
132
|
-
|
|
133
|
-
|
|
167
|
+
console.log(chalk.bold('\nSummary:'));
|
|
168
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
169
|
+
if (failCount > 0) {
|
|
170
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
134
171
|
}
|
|
135
|
-
|
|
136
|
-
const outputStats = fs.statSync(outputPath);
|
|
137
|
-
spinner.succeed(chalk.green('✓ Boolean operation applied successfully!'));
|
|
138
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
139
|
-
console.log(chalk.dim(` Operand: ${options.operand}`));
|
|
140
|
-
console.log(chalk.dim(` Operation: ${operation.toUpperCase()}`));
|
|
141
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
142
|
-
console.log(chalk.dim(` Size: ${metadata.width}x${metadata.height}`));
|
|
143
|
-
console.log(chalk.dim(` File size: ${(outputStats.size / 1024).toFixed(2)} KB`));
|
|
172
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
144
173
|
}
|
|
145
174
|
catch (error) {
|
|
146
|
-
spinner.fail(chalk.red('
|
|
175
|
+
spinner.fail(chalk.red('Processing failed'));
|
|
147
176
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
148
177
|
console.error(chalk.red(errorMessage));
|
|
149
178
|
process.exit(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boolean.js","sourceRoot":"","sources":["../../src/commands/boolean.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"boolean.js","sourceRoot":"","sources":["../../src/commands/boolean.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"border.d.ts","sourceRoot":"","sources":["../../src/commands/border.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAazC,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"border.d.ts","sourceRoot":"","sources":["../../src/commands/border.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAazC,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAwJrD"}
|
package/dist/commands/border.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import ora from 'ora';
|
|
3
3
|
import path from 'path';
|
|
4
|
-
import
|
|
4
|
+
import { validatePaths, resolveOutputPaths, MediaExtensions } from '../utils/pathValidator.js';
|
|
5
5
|
import { createSharpInstance } from '../utils/sharp.js';
|
|
6
6
|
import { createStandardHelp } from '../utils/helpFormatter.js';
|
|
7
7
|
export function borderCommand(imageCmd) {
|
|
@@ -65,47 +65,73 @@ export function borderCommand(imageCmd) {
|
|
|
65
65
|
});
|
|
66
66
|
process.exit(0);
|
|
67
67
|
}
|
|
68
|
-
const spinner = ora('
|
|
68
|
+
const spinner = ora('Validating inputs...').start();
|
|
69
69
|
try {
|
|
70
|
-
|
|
71
|
-
|
|
70
|
+
const { inputFiles, outputDir, errors } = validatePaths(input, options.output, {
|
|
71
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
72
|
+
recursive: true,
|
|
73
|
+
});
|
|
74
|
+
if (errors.length > 0) {
|
|
75
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
76
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
77
|
+
process.exit(1);
|
|
78
|
+
}
|
|
79
|
+
if (inputFiles.length === 0) {
|
|
80
|
+
spinner.fail(chalk.red('No valid image files found'));
|
|
72
81
|
process.exit(1);
|
|
73
82
|
}
|
|
74
|
-
const
|
|
75
|
-
|
|
83
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
84
|
+
suffix: '-border',
|
|
85
|
+
preserveStructure: inputFiles.length > 1,
|
|
86
|
+
});
|
|
87
|
+
spinner.succeed(chalk.green(`Found ${inputFiles.length} image(s) to process`));
|
|
76
88
|
if (options.verbose) {
|
|
77
|
-
|
|
78
|
-
console.log(chalk.dim(`
|
|
79
|
-
console.log(chalk.dim(`
|
|
80
|
-
console.log(chalk.dim(` Border width: ${options.width}px`));
|
|
81
|
-
console.log(chalk.dim(` Border color: ${options.color}`));
|
|
82
|
-
spinner.start('Processing...');
|
|
89
|
+
console.log(chalk.blue('\nConfiguration:'));
|
|
90
|
+
console.log(chalk.dim(` Border width: ${options.width || 10}px`));
|
|
91
|
+
console.log(chalk.dim(` Border color: ${options.color || '#000000'}`));
|
|
83
92
|
}
|
|
84
93
|
if (options.dryRun) {
|
|
85
|
-
|
|
86
|
-
console.log(chalk.green(
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
94
|
+
console.log(chalk.yellow('\nDry run mode - no changes will be made\n'));
|
|
95
|
+
console.log(chalk.green(`Would process ${inputFiles.length} image(s):`));
|
|
96
|
+
inputFiles.forEach((inputFile, index) => {
|
|
97
|
+
const outputPath = outputPaths.get(inputFile);
|
|
98
|
+
console.log(chalk.dim(` ${index + 1}. ${path.basename(inputFile)} → ${path.basename(outputPath)}`));
|
|
99
|
+
});
|
|
90
100
|
return;
|
|
91
101
|
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
102
|
+
let successCount = 0;
|
|
103
|
+
let failCount = 0;
|
|
104
|
+
for (const [index, inputFile] of inputFiles.entries()) {
|
|
105
|
+
const outputPath = outputPaths.get(inputFile);
|
|
106
|
+
const fileName = path.basename(inputFile);
|
|
107
|
+
spinner.start(`Processing ${index + 1}/${inputFiles.length}: ${fileName}...`);
|
|
108
|
+
try {
|
|
109
|
+
await createSharpInstance(inputFile)
|
|
110
|
+
.extend({
|
|
111
|
+
top: options.width || 10,
|
|
112
|
+
bottom: options.width || 10,
|
|
113
|
+
left: options.width || 10,
|
|
114
|
+
right: options.width || 10,
|
|
115
|
+
background: options.color || '#000000'
|
|
116
|
+
})
|
|
117
|
+
.toFile(outputPath);
|
|
118
|
+
spinner.succeed(chalk.green(`✓ ${fileName} processed`));
|
|
119
|
+
successCount++;
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
spinner.fail(chalk.red(`✗ Failed: ${fileName}`));
|
|
123
|
+
if (options.verbose && error instanceof Error) {
|
|
124
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
125
|
+
}
|
|
126
|
+
failCount++;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
console.log(chalk.bold('\nSummary:'));
|
|
130
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
131
|
+
if (failCount > 0) {
|
|
132
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
133
|
+
}
|
|
134
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
109
135
|
}
|
|
110
136
|
catch (error) {
|
|
111
137
|
spinner.fail(chalk.red('Failed to add border'));
|