@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 grayscaleCommand(imageCmd) {
|
|
@@ -36,51 +36,84 @@ export function grayscaleCommand(imageCmd) {
|
|
|
36
36
|
});
|
|
37
37
|
process.exit(0);
|
|
38
38
|
}
|
|
39
|
-
const spinner = ora('
|
|
39
|
+
const spinner = ora('Validating inputs...').start();
|
|
40
40
|
try {
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
const { inputFiles, outputDir, errors } = validatePaths(input, options.output, {
|
|
42
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
43
|
+
recursive: true,
|
|
44
|
+
});
|
|
45
|
+
if (errors.length > 0) {
|
|
46
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
47
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
48
|
+
process.exit(1);
|
|
49
|
+
}
|
|
50
|
+
if (inputFiles.length === 0) {
|
|
51
|
+
spinner.fail(chalk.red('No valid image files found'));
|
|
43
52
|
process.exit(1);
|
|
44
53
|
}
|
|
45
|
-
const
|
|
46
|
-
|
|
54
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
55
|
+
suffix: '-grayscale',
|
|
56
|
+
preserveStructure: inputFiles.length > 1,
|
|
57
|
+
});
|
|
58
|
+
spinner.succeed(chalk.green(`Found ${inputFiles.length} image(s) to process`));
|
|
47
59
|
if (options.verbose) {
|
|
48
|
-
|
|
49
|
-
console.log(chalk.dim(`
|
|
50
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
51
|
-
spinner.start('Processing...');
|
|
60
|
+
console.log(chalk.blue('\nConfiguration:'));
|
|
61
|
+
console.log(chalk.dim(` Quality: ${options.quality || 90}`));
|
|
52
62
|
}
|
|
53
63
|
if (options.dryRun) {
|
|
54
|
-
|
|
55
|
-
console.log(chalk.green(
|
|
56
|
-
|
|
57
|
-
|
|
64
|
+
console.log(chalk.yellow('\nDry run mode - no changes will be made\n'));
|
|
65
|
+
console.log(chalk.green(`Would process ${inputFiles.length} image(s):`));
|
|
66
|
+
inputFiles.forEach((inputFile, index) => {
|
|
67
|
+
const outputPath = outputPaths.get(inputFile);
|
|
68
|
+
console.log(chalk.dim(` ${index + 1}. ${path.basename(inputFile)} → ${path.basename(outputPath)}`));
|
|
69
|
+
});
|
|
58
70
|
return;
|
|
59
71
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
72
|
+
let successCount = 0;
|
|
73
|
+
let failCount = 0;
|
|
74
|
+
for (const [index, inputFile] of inputFiles.entries()) {
|
|
75
|
+
const outputPath = outputPaths.get(inputFile);
|
|
76
|
+
const fileName = path.basename(inputFile);
|
|
77
|
+
spinner.start(`Processing ${index + 1}/${inputFiles.length}: ${fileName}...`);
|
|
78
|
+
try {
|
|
79
|
+
const metadata = await createSharpInstance(inputFile).metadata();
|
|
80
|
+
const pipeline = createSharpInstance(inputFile).grayscale();
|
|
81
|
+
const outputExt = path.extname(outputPath).toLowerCase();
|
|
82
|
+
if (outputExt === '.jpg' || outputExt === '.jpeg') {
|
|
83
|
+
pipeline.jpeg({ quality: options.quality || 90 });
|
|
84
|
+
}
|
|
85
|
+
else if (outputExt === '.png') {
|
|
86
|
+
pipeline.png({ quality: options.quality || 90 });
|
|
87
|
+
}
|
|
88
|
+
else if (outputExt === '.webp') {
|
|
89
|
+
pipeline.webp({ quality: options.quality || 90 });
|
|
90
|
+
}
|
|
91
|
+
await pipeline.toFile(outputPath);
|
|
92
|
+
if (options.verbose) {
|
|
93
|
+
spinner.succeed(chalk.green(`✓ ${fileName} processed (${metadata.width}x${metadata.height})`));
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
spinner.succeed(chalk.green(`✓ ${fileName} processed`));
|
|
97
|
+
}
|
|
98
|
+
successCount++;
|
|
99
|
+
}
|
|
100
|
+
catch (error) {
|
|
101
|
+
spinner.fail(chalk.red(`✗ Failed: ${fileName}`));
|
|
102
|
+
if (options.verbose && error instanceof Error) {
|
|
103
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
104
|
+
}
|
|
105
|
+
failCount++;
|
|
106
|
+
}
|
|
68
107
|
}
|
|
69
|
-
|
|
70
|
-
|
|
108
|
+
console.log(chalk.bold('\nSummary:'));
|
|
109
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
110
|
+
if (failCount > 0) {
|
|
111
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
71
112
|
}
|
|
72
|
-
|
|
73
|
-
const inputStats = fs.statSync(input);
|
|
74
|
-
const outputStats = fs.statSync(outputPath);
|
|
75
|
-
const sizeDiff = ((outputStats.size - inputStats.size) / inputStats.size * 100).toFixed(2);
|
|
76
|
-
spinner.succeed(chalk.green('✓ Converted to grayscale successfully!'));
|
|
77
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
78
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
79
|
-
console.log(chalk.dim(` Size: ${metadata.width}x${metadata.height}`));
|
|
80
|
-
console.log(chalk.dim(` File size: ${(inputStats.size / 1024).toFixed(2)}KB → ${(outputStats.size / 1024).toFixed(2)}KB (${sizeDiff > '0' ? '+' : ''}${sizeDiff}%)`));
|
|
113
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
81
114
|
}
|
|
82
115
|
catch (error) {
|
|
83
|
-
spinner.fail(chalk.red('
|
|
116
|
+
spinner.fail(chalk.red('Processing failed'));
|
|
84
117
|
if (options.verbose) {
|
|
85
118
|
console.error(chalk.red('Error details:'), error);
|
|
86
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grayscale.js","sourceRoot":"","sources":["../../src/commands/grayscale.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":"grayscale.js","sourceRoot":"","sources":["../../src/commands/grayscale.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../src/commands/grid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../src/commands/grid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsBzC,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAgNnD"}
|
package/dist/commands/grid.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import ora from 'ora';
|
|
3
|
-
import fs from 'fs';
|
|
3
|
+
import * as fs from 'fs';
|
|
4
|
+
import { validatePaths, MediaExtensions } from '../utils/pathValidator.js';
|
|
4
5
|
import { createSharpInstance } from '../utils/sharp.js';
|
|
5
6
|
import { createStandardHelp } from '../utils/helpFormatter.js';
|
|
6
7
|
export function gridCommand(imageCmd) {
|
|
@@ -85,25 +86,30 @@ export function gridCommand(imageCmd) {
|
|
|
85
86
|
}
|
|
86
87
|
const spinner = ora('Creating grid...').start();
|
|
87
88
|
try {
|
|
88
|
-
// Validate
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
// Validate all input files (don't pass output since grid creates a single file)
|
|
90
|
+
const { inputFiles, errors } = validatePaths(images.join(','), undefined, {
|
|
91
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
92
|
+
recursive: false,
|
|
93
|
+
});
|
|
94
|
+
if (errors.length > 0) {
|
|
95
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
96
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
91
97
|
process.exit(1);
|
|
92
98
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
spinner.fail(chalk.red(`Image not found: ${img}`));
|
|
97
|
-
process.exit(1);
|
|
98
|
-
}
|
|
99
|
+
if (inputFiles.length === 0) {
|
|
100
|
+
spinner.fail(chalk.red('No valid images provided'));
|
|
101
|
+
process.exit(1);
|
|
99
102
|
}
|
|
100
|
-
const
|
|
103
|
+
const validImages = inputFiles;
|
|
104
|
+
const imageCount = validImages.length;
|
|
105
|
+
// Resolve output path - grid creates a single output file
|
|
106
|
+
const outputPath = options.output || 'grid.jpg';
|
|
101
107
|
// Calculate grid dimensions
|
|
102
108
|
let columns = options.columns;
|
|
103
109
|
let rows = options.rows;
|
|
104
110
|
if (!columns && !rows) {
|
|
105
111
|
// Auto-calculate square-ish grid
|
|
106
|
-
columns = Math.ceil(Math.sqrt(
|
|
112
|
+
columns = Math.ceil(Math.sqrt(validImages.length));
|
|
107
113
|
rows = Math.ceil(imageCount / columns);
|
|
108
114
|
}
|
|
109
115
|
else if (columns && !rows) {
|
|
@@ -118,7 +124,6 @@ export function gridCommand(imageCmd) {
|
|
|
118
124
|
const background = options.background || '#FFFFFF';
|
|
119
125
|
const gridWidth = columns * cellWidth + (columns - 1) * gap;
|
|
120
126
|
const gridHeight = rows * cellHeight + (rows - 1) * gap;
|
|
121
|
-
const outputPath = options.output || 'grid.jpg';
|
|
122
127
|
if (options.verbose) {
|
|
123
128
|
spinner.info(chalk.blue('Configuration:'));
|
|
124
129
|
console.log(chalk.dim(` Images: ${imageCount}`));
|
|
@@ -154,7 +159,7 @@ export function gridCommand(imageCmd) {
|
|
|
154
159
|
const x = col * (cellWidth + gap);
|
|
155
160
|
const y = row * (cellHeight + gap);
|
|
156
161
|
// Resize image to fit cell
|
|
157
|
-
const processedImage = await createSharpInstance(
|
|
162
|
+
const processedImage = await createSharpInstance(validImages[i])
|
|
158
163
|
.resize(cellWidth, cellHeight, {
|
|
159
164
|
fit: 'cover',
|
|
160
165
|
position: 'center'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.js","sourceRoot":"","sources":["../../src/commands/grid.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"grid.js","sourceRoot":"","sources":["../../src/commands/grid.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linear.d.ts","sourceRoot":"","sources":["../../src/commands/linear.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"linear.d.ts","sourceRoot":"","sources":["../../src/commands/linear.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAuKrD"}
|
package/dist/commands/linear.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 linearCommand(imageCmd) {
|
|
@@ -77,50 +77,78 @@ export function linearCommand(imageCmd) {
|
|
|
77
77
|
});
|
|
78
78
|
});
|
|
79
79
|
cmd.action(async (input, options) => {
|
|
80
|
-
const spinner = ora('
|
|
80
|
+
const spinner = ora('Validating inputs...').start();
|
|
81
81
|
try {
|
|
82
|
-
|
|
83
|
-
|
|
82
|
+
const { inputFiles, outputDir, errors } = validatePaths(input, options.output, {
|
|
83
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
84
|
+
recursive: true,
|
|
85
|
+
});
|
|
86
|
+
if (errors.length > 0) {
|
|
87
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
88
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
89
|
+
process.exit(1);
|
|
90
|
+
}
|
|
91
|
+
if (inputFiles.length === 0) {
|
|
92
|
+
spinner.fail(chalk.red('No valid image files found'));
|
|
84
93
|
process.exit(1);
|
|
85
94
|
}
|
|
95
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
96
|
+
suffix: '-linear',
|
|
97
|
+
preserveStructure: inputFiles.length > 1,
|
|
98
|
+
});
|
|
99
|
+
spinner.succeed(chalk.green(`Found ${inputFiles.length} image(s) to process`));
|
|
86
100
|
const a = options.a ?? 1;
|
|
87
101
|
const b = options.b ?? 0;
|
|
88
|
-
const inputPath = path.parse(input);
|
|
89
|
-
const outputPath = options.output || path.join(process.cwd(), `${inputPath.name}-linear${inputPath.ext}`);
|
|
90
102
|
if (options.verbose) {
|
|
91
|
-
|
|
92
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
93
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
103
|
+
console.log(chalk.blue('\nConfiguration:'));
|
|
94
104
|
console.log(chalk.dim(` Formula: (${a} * input) + ${b}`));
|
|
95
|
-
|
|
105
|
+
console.log(chalk.dim(` Quality: ${options.quality || 90}`));
|
|
96
106
|
}
|
|
97
107
|
if (options.dryRun) {
|
|
98
|
-
|
|
99
|
-
console.log(chalk.green(
|
|
100
|
-
|
|
101
|
-
|
|
108
|
+
console.log(chalk.yellow('\nDry run mode - no changes will be made\n'));
|
|
109
|
+
console.log(chalk.green(`Would process ${inputFiles.length} image(s):`));
|
|
110
|
+
inputFiles.forEach((inputFile, index) => {
|
|
111
|
+
const outputPath = outputPaths.get(inputFile);
|
|
112
|
+
console.log(chalk.dim(` ${index + 1}. ${path.basename(inputFile)} → ${path.basename(outputPath)}`));
|
|
113
|
+
});
|
|
102
114
|
return;
|
|
103
115
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
116
|
+
let successCount = 0;
|
|
117
|
+
let failCount = 0;
|
|
118
|
+
for (const [index, inputFile] of inputFiles.entries()) {
|
|
119
|
+
const outputPath = outputPaths.get(inputFile);
|
|
120
|
+
const fileName = path.basename(inputFile);
|
|
121
|
+
spinner.start(`Processing ${index + 1}/${inputFiles.length}: ${fileName}...`);
|
|
122
|
+
try {
|
|
123
|
+
const pipeline = createSharpInstance(inputFile).linear(a, b);
|
|
124
|
+
const outputExt = path.extname(outputPath).toLowerCase();
|
|
125
|
+
if (outputExt === '.jpg' || outputExt === '.jpeg') {
|
|
126
|
+
pipeline.jpeg({ quality: options.quality || 90 });
|
|
127
|
+
}
|
|
128
|
+
else if (outputExt === '.png') {
|
|
129
|
+
pipeline.png({ quality: options.quality || 90 });
|
|
130
|
+
}
|
|
131
|
+
else if (outputExt === '.webp') {
|
|
132
|
+
pipeline.webp({ quality: options.quality || 90 });
|
|
133
|
+
}
|
|
134
|
+
await pipeline.toFile(outputPath);
|
|
135
|
+
spinner.succeed(chalk.green(`✓ ${fileName} processed`));
|
|
136
|
+
successCount++;
|
|
137
|
+
}
|
|
138
|
+
catch (error) {
|
|
139
|
+
spinner.fail(chalk.red(`✗ Failed: ${fileName}`));
|
|
140
|
+
if (options.verbose && error instanceof Error) {
|
|
141
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
142
|
+
}
|
|
143
|
+
failCount++;
|
|
144
|
+
}
|
|
112
145
|
}
|
|
113
|
-
|
|
114
|
-
|
|
146
|
+
console.log(chalk.bold('\nSummary:'));
|
|
147
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
148
|
+
if (failCount > 0) {
|
|
149
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
115
150
|
}
|
|
116
|
-
|
|
117
|
-
const outputStats = fs.statSync(outputPath);
|
|
118
|
-
spinner.succeed(chalk.green('✓ Linear transformation applied successfully!'));
|
|
119
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
120
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
121
|
-
console.log(chalk.dim(` Formula: (${a} * input) + ${b}`));
|
|
122
|
-
console.log(chalk.dim(` Size: ${metadata.width}x${metadata.height}`));
|
|
123
|
-
console.log(chalk.dim(` File size: ${(outputStats.size / 1024).toFixed(2)} KB`));
|
|
151
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
124
152
|
}
|
|
125
153
|
catch (error) {
|
|
126
154
|
spinner.fail(chalk.red('Failed to apply linear transformation'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linear.js","sourceRoot":"","sources":["../../src/commands/linear.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":"linear.js","sourceRoot":"","sources":["../../src/commands/linear.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"median.d.ts","sourceRoot":"","sources":["../../src/commands/median.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"median.d.ts","sourceRoot":"","sources":["../../src/commands/median.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAwKrD"}
|
package/dist/commands/median.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 medianCommand(imageCmd) {
|
|
@@ -73,49 +73,82 @@ export function medianCommand(imageCmd) {
|
|
|
73
73
|
});
|
|
74
74
|
process.exit(0);
|
|
75
75
|
}
|
|
76
|
-
const spinner = ora('
|
|
76
|
+
const spinner = ora('Validating inputs...').start();
|
|
77
77
|
try {
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
const { inputFiles, outputDir, errors } = validatePaths(input, options.output, {
|
|
79
|
+
allowedExtensions: MediaExtensions.IMAGE,
|
|
80
|
+
recursive: true,
|
|
81
|
+
});
|
|
82
|
+
if (errors.length > 0) {
|
|
83
|
+
spinner.fail(chalk.red('Validation failed:'));
|
|
84
|
+
errors.forEach(err => console.log(chalk.red(` ✗ ${err}`)));
|
|
85
|
+
process.exit(1);
|
|
86
|
+
}
|
|
87
|
+
if (inputFiles.length === 0) {
|
|
88
|
+
spinner.fail(chalk.red('No valid image files found'));
|
|
80
89
|
process.exit(1);
|
|
81
90
|
}
|
|
82
|
-
const
|
|
83
|
-
|
|
91
|
+
const outputPaths = resolveOutputPaths(inputFiles, outputDir, {
|
|
92
|
+
suffix: '-median',
|
|
93
|
+
preserveStructure: inputFiles.length > 1,
|
|
94
|
+
});
|
|
95
|
+
spinner.succeed(chalk.green(`Found ${inputFiles.length} image(s) to process`));
|
|
84
96
|
if (options.verbose) {
|
|
85
|
-
|
|
86
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
87
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
97
|
+
console.log(chalk.blue('\nConfiguration:'));
|
|
88
98
|
console.log(chalk.dim(` Filter size: ${options.size || 3}`));
|
|
89
|
-
|
|
99
|
+
console.log(chalk.dim(` Quality: ${options.quality || 90}`));
|
|
90
100
|
}
|
|
91
101
|
if (options.dryRun) {
|
|
92
|
-
|
|
93
|
-
console.log(chalk.green(
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
102
|
+
console.log(chalk.yellow('\nDry run mode - no changes will be made\n'));
|
|
103
|
+
console.log(chalk.green(`Would process ${inputFiles.length} image(s):`));
|
|
104
|
+
inputFiles.forEach((inputFile, index) => {
|
|
105
|
+
const outputPath = outputPaths.get(inputFile);
|
|
106
|
+
console.log(chalk.dim(` ${index + 1}. ${path.basename(inputFile)} → ${path.basename(outputPath)}`));
|
|
107
|
+
});
|
|
97
108
|
return;
|
|
98
109
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
110
|
+
let successCount = 0;
|
|
111
|
+
let failCount = 0;
|
|
112
|
+
for (const [index, inputFile] of inputFiles.entries()) {
|
|
113
|
+
const outputPath = outputPaths.get(inputFile);
|
|
114
|
+
const fileName = path.basename(inputFile);
|
|
115
|
+
spinner.start(`Processing ${index + 1}/${inputFiles.length}: ${fileName}...`);
|
|
116
|
+
try {
|
|
117
|
+
const metadata = await createSharpInstance(inputFile).metadata();
|
|
118
|
+
const pipeline = createSharpInstance(inputFile).median(options.size || 3);
|
|
119
|
+
const outputExt = path.extname(outputPath).toLowerCase();
|
|
120
|
+
if (outputExt === '.jpg' || outputExt === '.jpeg') {
|
|
121
|
+
pipeline.jpeg({ quality: options.quality || 90 });
|
|
122
|
+
}
|
|
123
|
+
else if (outputExt === '.png') {
|
|
124
|
+
pipeline.png({ quality: options.quality || 90 });
|
|
125
|
+
}
|
|
126
|
+
else if (outputExt === '.webp') {
|
|
127
|
+
pipeline.webp({ quality: options.quality || 90 });
|
|
128
|
+
}
|
|
129
|
+
await pipeline.toFile(outputPath);
|
|
130
|
+
if (options.verbose) {
|
|
131
|
+
spinner.succeed(chalk.green(`✓ ${fileName} processed (${metadata.width}x${metadata.height})`));
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
spinner.succeed(chalk.green(`✓ ${fileName} processed`));
|
|
135
|
+
}
|
|
136
|
+
successCount++;
|
|
137
|
+
}
|
|
138
|
+
catch (error) {
|
|
139
|
+
spinner.fail(chalk.red(`✗ Failed: ${fileName}`));
|
|
140
|
+
if (options.verbose && error instanceof Error) {
|
|
141
|
+
console.log(chalk.red(` Error: ${error.message}`));
|
|
142
|
+
}
|
|
143
|
+
failCount++;
|
|
144
|
+
}
|
|
107
145
|
}
|
|
108
|
-
|
|
109
|
-
|
|
146
|
+
console.log(chalk.bold('\nSummary:'));
|
|
147
|
+
console.log(chalk.green(` ✓ Success: ${successCount}`));
|
|
148
|
+
if (failCount > 0) {
|
|
149
|
+
console.log(chalk.red(` ✗ Failed: ${failCount}`));
|
|
110
150
|
}
|
|
111
|
-
|
|
112
|
-
const outputStats = fs.statSync(outputPath);
|
|
113
|
-
spinner.succeed(chalk.green('✓ Median filter applied successfully!'));
|
|
114
|
-
console.log(chalk.dim(` Input: ${input}`));
|
|
115
|
-
console.log(chalk.dim(` Output: ${outputPath}`));
|
|
116
|
-
console.log(chalk.dim(` Size: ${metadata.width}x${metadata.height}`));
|
|
117
|
-
console.log(chalk.dim(` Filter size: ${options.size || 3}`));
|
|
118
|
-
console.log(chalk.dim(` File size: ${(outputStats.size / 1024).toFixed(2)}KB`));
|
|
151
|
+
console.log(chalk.dim(` Output directory: ${outputDir}`));
|
|
119
152
|
}
|
|
120
153
|
catch (error) {
|
|
121
154
|
spinner.fail(chalk.red('Failed to apply median filter'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"median.js","sourceRoot":"","sources":["../../src/commands/median.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":"median.js","sourceRoot":"","sources":["../../src/commands/median.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-cmd.d.ts","sourceRoot":"","sources":["../../src/commands/metadata-cmd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata-cmd.d.ts","sourceRoot":"","sources":["../../src/commands/metadata-cmd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBzC,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CA8WvD"}
|