@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
|
@@ -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 unflattenCommand(imageCmd) {
|
|
@@ -48,51 +48,78 @@ export function unflattenCommand(imageCmd) {
|
|
|
48
48
|
});
|
|
49
49
|
});
|
|
50
50
|
cmd.action(async (input, options) => {
|
|
51
|
-
const spinner = ora('
|
|
51
|
+
const spinner = ora('Validating inputs...').start();
|
|
52
52
|
try {
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
const { inputFiles, outputDir, errors } = validatePaths(input, options.output, {
|
|
54
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
55
|
+
recursive: true,
|
|
56
|
+
});
|
|
57
|
+
if (errors.length > 0) {
|
|
58
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
59
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
55
60
|
process.exit(1);
|
|
56
61
|
}
|
|
57
|
-
|
|
58
|
-
|
|
62
|
+
if (inputFiles.length === 0) {
|
|
63
|
+
spinner.fail(chalk.red('No valid image files found'));
|
|
64
|
+
process.exit(1);
|
|
65
|
+
}
|
|
66
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
67
|
+
suffix: '-unflat',
|
|
68
|
+
newExtension: '.png', // Unflatten typically outputs PNG
|
|
69
|
+
preserveStructure: inputFiles.length > 1,
|
|
70
|
+
});
|
|
71
|
+
spinner.succeed(chalk.green(`Found ${inputFiles.length} image(s) to process`));
|
|
59
72
|
if (options.verbose) {
|
|
60
|
-
|
|
61
|
-
console.log(chalk.dim(`
|
|
62
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
63
|
-
spinner.start('Processing...');
|
|
73
|
+
console.log(chalk.blue('\nConfiguration:'));
|
|
74
|
+
console.log(chalk.dim(` Quality: ${options.quality || 90}`));
|
|
64
75
|
}
|
|
65
76
|
if (options.dryRun) {
|
|
66
|
-
|
|
67
|
-
console.log(chalk.green(
|
|
68
|
-
|
|
69
|
-
|
|
77
|
+
console.log(chalk.yellow('\nDry run mode - no changes will be made\n'));
|
|
78
|
+
console.log(chalk.green(`Would process ${inputFiles.length} image(s):`));
|
|
79
|
+
inputFiles.forEach((inputFile, index) => {
|
|
80
|
+
const outputPath = outputPaths.get(inputFile);
|
|
81
|
+
console.log(chalk.dim(` ${index + 1}. ${path.basename(inputFile)} → ${path.basename(outputPath)}`));
|
|
82
|
+
});
|
|
70
83
|
return;
|
|
71
84
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
85
|
+
let successCount = 0;
|
|
86
|
+
let failCount = 0;
|
|
87
|
+
for (const [index, inputFile] of inputFiles.entries()) {
|
|
88
|
+
const outputPath = outputPaths.get(inputFile);
|
|
89
|
+
const fileName = path.basename(inputFile);
|
|
90
|
+
spinner.start(`Processing ${index + 1}/${inputFiles.length}: ${fileName}...`);
|
|
91
|
+
try {
|
|
92
|
+
const pipeline = createSharpInstance(inputFile).unflatten();
|
|
93
|
+
// Unflatten typically outputs PNG to preserve alpha
|
|
94
|
+
const outputExt = path.extname(outputPath).toLowerCase();
|
|
95
|
+
if (outputExt === '.png') {
|
|
96
|
+
pipeline.png({ quality: options.quality || 90 });
|
|
97
|
+
}
|
|
98
|
+
else if (outputExt === '.webp') {
|
|
99
|
+
pipeline.webp({ quality: options.quality || 90 });
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
pipeline.png({ quality: options.quality || 90 });
|
|
103
|
+
}
|
|
104
|
+
await pipeline.toFile(outputPath);
|
|
105
|
+
spinner.succeed(chalk.green(`✓ ${fileName} processed`));
|
|
106
|
+
successCount++;
|
|
107
|
+
}
|
|
108
|
+
catch (error) {
|
|
109
|
+
spinner.fail(chalk.red(`✗ Failed: ${fileName}`));
|
|
110
|
+
if (options.verbose && error instanceof Error) {
|
|
111
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
112
|
+
}
|
|
113
|
+
failCount++;
|
|
114
|
+
}
|
|
81
115
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
116
|
+
console.log(chalk.bold('\nSummary:'));
|
|
117
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
118
|
+
if (failCount > 0) {
|
|
119
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
85
120
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
const outputStats = fs.statSync(outputPath);
|
|
89
|
-
const sizeDiff = ((outputStats.size - inputStats.size) / inputStats.size * 100).toFixed(2);
|
|
90
|
-
spinner.succeed(chalk.green('✓ Image unflattened successfully!'));
|
|
91
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
92
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
93
|
-
console.log(chalk.dim(` Size: ${metadata.width}x${metadata.height}`));
|
|
94
|
-
console.log(chalk.dim(` File size: ${(outputStats.size / 1024).toFixed(2)} KB (${sizeDiff}%)`));
|
|
95
|
-
console.log(chalk.cyan('ℹ Alpha channel added (all pixels fully opaque)'));
|
|
121
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
122
|
+
console.log(chalk.cyan(' ℹ Alpha channel added (all pixels fully opaque)'));
|
|
96
123
|
}
|
|
97
124
|
catch (error) {
|
|
98
125
|
spinner.fail(chalk.red('Failed to unflatten image'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unflatten.js","sourceRoot":"","sources":["../../src/commands/unflatten.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":"unflatten.js","sourceRoot":"","sources":["../../src/commands/unflatten.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vignette.d.ts","sourceRoot":"","sources":["../../src/commands/vignette.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBzC,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"vignette.d.ts","sourceRoot":"","sources":["../../src/commands/vignette.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBzC,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAqKvD"}
|
|
@@ -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 vignetteCommand(imageCmd) {
|
|
@@ -63,66 +63,85 @@ export function vignetteCommand(imageCmd) {
|
|
|
63
63
|
});
|
|
64
64
|
process.exit(0);
|
|
65
65
|
}
|
|
66
|
-
const spinner = ora('
|
|
66
|
+
const spinner = ora('Validating inputs...').start();
|
|
67
67
|
try {
|
|
68
|
-
|
|
69
|
-
|
|
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'));
|
|
70
79
|
process.exit(1);
|
|
71
80
|
}
|
|
81
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
82
|
+
suffix: '-vignette',
|
|
83
|
+
preserveStructure: inputFiles.length > 1,
|
|
84
|
+
});
|
|
85
|
+
spinner.succeed(chalk.green(`Found ${inputFiles.length} image(s) to process`));
|
|
72
86
|
const strength = Math.max(0, Math.min(100, options.strength || 50)) / 100;
|
|
73
|
-
const inputPath = path.parse(input);
|
|
74
|
-
const outputPath = options.output || path.join(inputPath.dir, `${inputPath.name}-vignette${inputPath.ext}`);
|
|
75
87
|
if (options.verbose) {
|
|
76
|
-
|
|
77
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
78
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
88
|
+
console.log(chalk.blue('\nConfiguration:'));
|
|
79
89
|
console.log(chalk.dim(` Strength: ${(strength * 100).toFixed(0)}%`));
|
|
80
|
-
spinner.start('Processing...');
|
|
81
90
|
}
|
|
82
91
|
if (options.dryRun) {
|
|
83
|
-
|
|
84
|
-
console.log(chalk.green(
|
|
85
|
-
|
|
86
|
-
|
|
92
|
+
console.log(chalk.yellow('\nDry run mode - no changes will be made\n'));
|
|
93
|
+
console.log(chalk.green(`Would process ${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
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
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 metadata = await createSharpInstance(inputFile).metadata();
|
|
108
|
+
const width = metadata.width;
|
|
109
|
+
const height = metadata.height;
|
|
110
|
+
// Create vignette overlay using SVG
|
|
111
|
+
const vignetteOverlay = Buffer.from(`
|
|
112
|
+
<svg width="${width}" height="${height}">
|
|
113
|
+
<defs>
|
|
114
|
+
<radialGradient id="vignette" cx="50%" cy="50%" r="70%">
|
|
115
|
+
<stop offset="40%" style="stop-color:white;stop-opacity:0" />
|
|
116
|
+
<stop offset="100%" style="stop-color:black;stop-opacity:${strength}" />
|
|
117
|
+
</radialGradient>
|
|
118
|
+
</defs>
|
|
119
|
+
<rect width="${width}" height="${height}" fill="url(#vignette)" />
|
|
120
|
+
</svg>
|
|
121
|
+
`);
|
|
122
|
+
await createSharpInstance(inputFile)
|
|
123
|
+
.composite([{
|
|
124
|
+
input: vignetteOverlay,
|
|
125
|
+
blend: 'multiply'
|
|
126
|
+
}])
|
|
127
|
+
.toFile(outputPath);
|
|
128
|
+
spinner.succeed(chalk.green(`✓ ${fileName} processed`));
|
|
129
|
+
successCount++;
|
|
130
|
+
}
|
|
131
|
+
catch (error) {
|
|
132
|
+
spinner.fail(chalk.red(`✗ Failed: ${fileName}`));
|
|
133
|
+
if (options.verbose && error instanceof Error) {
|
|
134
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
135
|
+
}
|
|
136
|
+
failCount++;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
console.log(chalk.bold('\nSummary:'));
|
|
140
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
141
|
+
if (failCount > 0) {
|
|
142
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
100
143
|
}
|
|
101
|
-
|
|
102
|
-
const vignetteOverlay = Buffer.from(`
|
|
103
|
-
<svg width="${width}" height="${height}">
|
|
104
|
-
<defs>
|
|
105
|
-
<radialGradient id="vignette" cx="50%" cy="50%" r="70%">
|
|
106
|
-
<stop offset="40%" style="stop-color:white;stop-opacity:0" />
|
|
107
|
-
<stop offset="100%" style="stop-color:black;stop-opacity:${strength}" />
|
|
108
|
-
</radialGradient>
|
|
109
|
-
</defs>
|
|
110
|
-
<rect width="${width}" height="${height}" fill="url(#vignette)" />
|
|
111
|
-
</svg>
|
|
112
|
-
`);
|
|
113
|
-
await createSharpInstance(input)
|
|
114
|
-
.composite([{
|
|
115
|
-
input: vignetteOverlay,
|
|
116
|
-
blend: 'multiply'
|
|
117
|
-
}])
|
|
118
|
-
.toFile(outputPath);
|
|
119
|
-
const outputStats = fs.statSync(outputPath);
|
|
120
|
-
spinner.succeed(chalk.green('✓ Vignette added successfully!'));
|
|
121
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
122
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
123
|
-
console.log(chalk.dim(` Size: ${width}x${height}`));
|
|
124
|
-
console.log(chalk.dim(` Strength: ${(strength * 100).toFixed(0)}%`));
|
|
125
|
-
console.log(chalk.dim(` File size: ${(outputStats.size / 1024).toFixed(2)}KB`));
|
|
144
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
126
145
|
}
|
|
127
146
|
catch (error) {
|
|
128
147
|
spinner.fail(chalk.red('Failed to add vignette'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vignette.js","sourceRoot":"","sources":["../../src/commands/vignette.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":"vignette.js","sourceRoot":"","sources":["../../src/commands/vignette.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watermark.d.ts","sourceRoot":"","sources":["../../src/commands/watermark.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"watermark.d.ts","sourceRoot":"","sources":["../../src/commands/watermark.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBzC,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAuMxD"}
|
|
@@ -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, sharp } from '../utils/sharp.js';
|
|
6
7
|
import { createStandardHelp } from '../utils/helpFormatter.js';
|
|
7
8
|
export function watermarkCommand(imageCmd) {
|
|
@@ -70,21 +71,36 @@ export function watermarkCommand(imageCmd) {
|
|
|
70
71
|
}
|
|
71
72
|
const spinner = ora('Processing image...').start();
|
|
72
73
|
try {
|
|
73
|
-
|
|
74
|
-
spinner.fail(chalk.red(`Input file not found: ${input}`));
|
|
75
|
-
process.exit(1);
|
|
76
|
-
}
|
|
74
|
+
// Validate watermark file exists (single file, not multi)
|
|
77
75
|
if (!fs.existsSync(watermark)) {
|
|
78
76
|
spinner.fail(chalk.red(`Watermark file not found: ${watermark}`));
|
|
79
77
|
process.exit(1);
|
|
80
78
|
}
|
|
81
|
-
|
|
82
|
-
const
|
|
79
|
+
// Validate input paths (can be multiple)
|
|
80
|
+
const { inputFiles, outputDir, errors } = validatePaths(input, options.output, {
|
|
81
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
82
|
+
recursive: true,
|
|
83
|
+
});
|
|
84
|
+
if (errors.length > 0) {
|
|
85
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
86
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
87
|
+
process.exit(1);
|
|
88
|
+
}
|
|
89
|
+
if (inputFiles.length === 0) {
|
|
90
|
+
spinner.fail(chalk.red('No valid image files found'));
|
|
91
|
+
process.exit(1);
|
|
92
|
+
}
|
|
93
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
94
|
+
suffix: '-watermarked',
|
|
95
|
+
preserveStructure: inputFiles.length > 1,
|
|
96
|
+
});
|
|
97
|
+
let successCount = 0;
|
|
98
|
+
let failCount = 0;
|
|
83
99
|
if (options.verbose) {
|
|
84
100
|
spinner.info(chalk.blue('Configuration:'));
|
|
85
|
-
console.log(chalk.dim(`
|
|
101
|
+
console.log(chalk.dim(` Found ${inputFiles.length} file(s)`));
|
|
86
102
|
console.log(chalk.dim(` Watermark: ${watermark}`));
|
|
87
|
-
console.log(chalk.dim(` Output: ${
|
|
103
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
88
104
|
console.log(chalk.dim(` Position: ${options.position || 'bottom-right'}`));
|
|
89
105
|
console.log(chalk.dim(` Opacity: ${options.opacity || 0.5}`));
|
|
90
106
|
console.log(chalk.dim(` Scale: ${options.scale || 0.2}`));
|
|
@@ -92,29 +108,16 @@ export function watermarkCommand(imageCmd) {
|
|
|
92
108
|
}
|
|
93
109
|
if (options.dryRun) {
|
|
94
110
|
spinner.info(chalk.yellow('Dry run mode - no changes will be made'));
|
|
95
|
-
console.log(chalk.green(
|
|
96
|
-
console.log(chalk.dim(`
|
|
111
|
+
console.log(chalk.green(`✓ Would add watermark to ${inputFiles.length} file(s):`));
|
|
112
|
+
inputFiles.forEach(f => console.log(chalk.dim(` - ${f}`)));
|
|
97
113
|
console.log(chalk.dim(` Watermark: ${watermark}`));
|
|
98
|
-
console.log(chalk.dim(` To: ${outputPath}`));
|
|
99
114
|
return;
|
|
100
115
|
}
|
|
101
|
-
|
|
102
|
-
const watermarkMeta = await createSharpInstance(watermark).metadata();
|
|
103
|
-
// Calculate watermark size based on scale
|
|
116
|
+
// Preload watermark
|
|
104
117
|
const scale = options.scale || 0.2;
|
|
105
|
-
const targetWidth = Math.round((metadata.width || 0) * scale);
|
|
106
|
-
if (options.verbose) {
|
|
107
|
-
console.log(chalk.dim(` Watermark original: ${watermarkMeta.width}x${watermarkMeta.height}`));
|
|
108
|
-
console.log(chalk.dim(` Watermark scaled: ${targetWidth}px wide`));
|
|
109
|
-
console.log(chalk.dim(` Scale factor: ${(scale * 100).toFixed(1)}%`));
|
|
110
|
-
}
|
|
111
|
-
const watermarkResized = await createSharpInstance(watermark)
|
|
112
|
-
.resize(targetWidth)
|
|
113
|
-
.toBuffer();
|
|
114
|
-
const watermarkResizedMeta = await sharp(watermarkResized).metadata();
|
|
115
|
-
// Calculate position
|
|
116
|
-
let gravity = 'southeast';
|
|
117
118
|
const position = options.position || 'bottom-right';
|
|
119
|
+
// Calculate gravity once
|
|
120
|
+
let gravity = 'southeast';
|
|
118
121
|
if (position === 'center')
|
|
119
122
|
gravity = 'center';
|
|
120
123
|
else if (position === 'top-left')
|
|
@@ -125,40 +128,61 @@ export function watermarkCommand(imageCmd) {
|
|
|
125
128
|
gravity = 'southwest';
|
|
126
129
|
else if (position === 'bottom-right')
|
|
127
130
|
gravity = 'southeast';
|
|
128
|
-
//
|
|
129
|
-
const
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
131
|
+
// Process all files
|
|
132
|
+
for (const inputFile of inputFiles) {
|
|
133
|
+
try {
|
|
134
|
+
const fileName = path.basename(inputFile);
|
|
135
|
+
const outputPath = outputPaths.get(inputFile);
|
|
136
|
+
const metadata = await createSharpInstance(inputFile).metadata();
|
|
137
|
+
// Calculate watermark size based on scale
|
|
138
|
+
const targetWidth = Math.round((metadata.width || 0) * scale);
|
|
139
|
+
const watermarkResized = await createSharpInstance(watermark)
|
|
140
|
+
.resize(targetWidth)
|
|
141
|
+
.toBuffer();
|
|
142
|
+
// Apply watermark with opacity
|
|
143
|
+
const watermarkWithOpacity = await sharp(watermarkResized)
|
|
144
|
+
.composite([{
|
|
145
|
+
input: Buffer.from([255, 255, 255, Math.round((options.opacity || 0.5) * 255)]),
|
|
146
|
+
raw: { width: 1, height: 1, channels: 4 },
|
|
147
|
+
tile: true,
|
|
148
|
+
blend: 'dest-in'
|
|
149
|
+
}])
|
|
150
|
+
.toBuffer();
|
|
151
|
+
const pipeline = createSharpInstance(inputFile).composite([{
|
|
152
|
+
input: watermarkWithOpacity,
|
|
153
|
+
gravity,
|
|
154
|
+
}]);
|
|
155
|
+
const outputExt = path.extname(outputPath).toLowerCase();
|
|
156
|
+
if (outputExt === '.jpg' || outputExt === '.jpeg') {
|
|
157
|
+
pipeline.jpeg({ quality: options.quality || 90 });
|
|
158
|
+
}
|
|
159
|
+
else if (outputExt === '.png') {
|
|
160
|
+
pipeline.png({ quality: options.quality || 90 });
|
|
161
|
+
}
|
|
162
|
+
else if (outputExt === '.webp') {
|
|
163
|
+
pipeline.webp({ quality: options.quality || 90 });
|
|
164
|
+
}
|
|
165
|
+
await pipeline.toFile(outputPath);
|
|
166
|
+
spinner.succeed(chalk.green(`✓ ${fileName} watermarked`));
|
|
167
|
+
successCount++;
|
|
168
|
+
}
|
|
169
|
+
catch (error) {
|
|
170
|
+
spinner.fail(chalk.red(`✗ Failed: ${path.basename(inputFile)}`));
|
|
171
|
+
if (options.verbose && error instanceof Error) {
|
|
172
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
173
|
+
}
|
|
174
|
+
failCount++;
|
|
175
|
+
}
|
|
147
176
|
}
|
|
148
|
-
|
|
149
|
-
|
|
177
|
+
console.log(chalk.bold('\nSummary:'));
|
|
178
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
179
|
+
if (failCount > 0) {
|
|
180
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
150
181
|
}
|
|
151
|
-
|
|
152
|
-
spinner.succeed(chalk.green('✓ Watermark added successfully!'));
|
|
153
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
154
|
-
console.log(chalk.dim(` Watermark: ${watermark}`));
|
|
155
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
156
|
-
console.log(chalk.dim(` Position: ${position}`));
|
|
157
|
-
console.log(chalk.dim(` Watermark size: ${watermarkResizedMeta.width}x${watermarkResizedMeta.height}`));
|
|
158
|
-
console.log(chalk.dim(` Opacity: ${(options.opacity || 0.5) * 100}%`));
|
|
182
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
159
183
|
}
|
|
160
184
|
catch (error) {
|
|
161
|
-
spinner.fail(chalk.red('
|
|
185
|
+
spinner.fail(chalk.red('Processing failed'));
|
|
162
186
|
if (options.verbose) {
|
|
163
187
|
console.error(chalk.red('Error details:'), error);
|
|
164
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watermark.js","sourceRoot":"","sources":["../../src/commands/watermark.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":"watermark.js","sourceRoot":"","sources":["../../src/commands/watermark.ts"],"names":[],"mappings":"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"}
|