@mediaproc/image 1.3.0 → 1.3.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/convert.js +1 -1
- package/dist/commands/convert.js.map +1 -1
- package/dist/commands/thumbnail.js +1 -1
- package/dist/commands/thumbnail.js.map +1 -1
- package/dist/commands/watermark.d.ts.map +1 -1
- package/dist/commands/watermark.js +119 -44
- package/dist/commands/watermark.js.map +1 -1
- package/package.json +1 -1
package/dist/commands/convert.js
CHANGED
|
@@ -9,7 +9,7 @@ export function convertCommand(imageCmd) {
|
|
|
9
9
|
imageCmd
|
|
10
10
|
.command('convert <input>')
|
|
11
11
|
.description('Convert image to different format')
|
|
12
|
-
.option('-f, --format <format>', 'Output format: jpg, png, webp, avif, tiff, gif
|
|
12
|
+
.option('-f, --format <format>', 'Output format: jpg, png, webp, avif, tiff, gif, webp')
|
|
13
13
|
.option('-o, --output <path>', 'Output file path')
|
|
14
14
|
.option('-q, --quality <quality>', 'Quality (1-100)', parseInt, 90)
|
|
15
15
|
.option('--compression <level>', 'PNG compression level (0-9)', parseInt, 9)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/commands/convert.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AAGtB,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,+DAA+D;AAC/D,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAAC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAMtK,MAAM,UAAU,cAAc,CAAC,QAAiB;IAC9C,QAAQ;SACL,OAAO,CAAC,iBAAiB,CAAC;SAC1B,WAAW,CAAC,mCAAmC,CAAC;SAChD,MAAM,CAAC,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/commands/convert.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export function thumbnailCommand(imageCmd) {
|
|
|
12
12
|
.option('-s, --size <size>', 'Thumbnail size in pixels (default: 150)', parseInt, 150)
|
|
13
13
|
.option('-o, --output <path>', 'Output file path')
|
|
14
14
|
.option('-q, --quality <quality>', 'Quality (1-100)', parseInt, 85)
|
|
15
|
-
.option('--fit <fit>', 'Fit mode: cover, contain, fill, inside, outside
|
|
15
|
+
.option('--fit <fit>', 'Fit mode: cover, contain, fill, inside, outside, cover')
|
|
16
16
|
.option('--dry-run', 'Show what would be done without executing')
|
|
17
17
|
.option('-v, --verbose', 'Verbose output')
|
|
18
18
|
.option('--help', 'Display help for thumbnail command')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thumbnail.js","sourceRoot":"","sources":["../../src/commands/thumbnail.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAAC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAEtK,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,IAAI,MAAM,WAAW,CAAC;AAO7B,MAAM,UAAU,gBAAgB,CAAC,QAAiB;IAChD,QAAQ;SACL,OAAO,CAAC,mBAAmB,CAAC;SAC5B,WAAW,CAAC,+BAA+B,CAAC;SAC5C,MAAM,CAAC,mBAAmB,EAAE,yCAAyC,EAAE,QAAQ,EAAE,GAAG,CAAC;SACrF,MAAM,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;SACjD,MAAM,CAAC,yBAAyB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,EAAE,CAAC;SAClE,MAAM,CAAC,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"thumbnail.js","sourceRoot":"","sources":["../../src/commands/thumbnail.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;AAKqE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,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;AAKqE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAgBtK,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAqRxD"}
|
|
@@ -9,11 +9,14 @@ import path from 'path';
|
|
|
9
9
|
export function watermarkCommand(imageCmd) {
|
|
10
10
|
imageCmd
|
|
11
11
|
.command('watermark <input> <watermark>')
|
|
12
|
-
.description('Add watermark to image')
|
|
12
|
+
.description('Add image or text watermark to image')
|
|
13
13
|
.option('-o, --output <path>', 'Output file path')
|
|
14
14
|
.option('--position <position>', 'Position: center, top-left, top-right, bottom-left, bottom-right', 'bottom-right')
|
|
15
15
|
.option('--opacity <opacity>', 'Watermark opacity (0-1, default: 0.5)', parseFloat, 0.5)
|
|
16
|
-
.option('--scale <scale>', '
|
|
16
|
+
.option('--scale <scale>', 'Scale: for images (0.1-1 of width, default: 0.2), for text (multiplier, default: 1.0)', parseFloat)
|
|
17
|
+
.option('--font-size <size>', 'Text base font size in pixels (default: auto-calculated)', parseInt)
|
|
18
|
+
.option('--font-color <color>', 'Text watermark color (hex or name, default: white)', 'white')
|
|
19
|
+
.option('--font-family <family>', 'Text watermark font family (default: Arial)', 'Arial')
|
|
17
20
|
.option('-q, --quality <quality>', 'Quality (1-100)', parseInt, 90)
|
|
18
21
|
.option('--dry-run', 'Show what would be done without executing')
|
|
19
22
|
.option('-v, --verbose', 'Verbose output')
|
|
@@ -23,24 +26,40 @@ export function watermarkCommand(imageCmd) {
|
|
|
23
26
|
createStandardHelp({
|
|
24
27
|
commandName: 'watermark',
|
|
25
28
|
emoji: '©️',
|
|
26
|
-
description: 'Add watermark to images for copyright protection, branding, or attribution.
|
|
27
|
-
usage: [
|
|
29
|
+
description: 'Add image or text watermark to images for copyright protection, branding, or attribution. Automatically detects if watermark is a file or text.',
|
|
30
|
+
usage: [
|
|
31
|
+
'watermark <input> <watermark>',
|
|
32
|
+
'watermark <input> logo.png --position center',
|
|
33
|
+
'watermark <input> "Powered by MediaProc" --font-size 64',
|
|
34
|
+
'watermark <input> "© 2026" --position bottom-right --opacity 0.7'
|
|
35
|
+
],
|
|
28
36
|
options: [
|
|
29
37
|
{ flag: '-o, --output <path>', description: 'Output file path (default: <input>-watermarked.<ext>)' },
|
|
30
38
|
{ flag: '--position <position>', description: 'Position: center, top-left, top-right, bottom-left, bottom-right (default: bottom-right)' },
|
|
31
39
|
{ flag: '--opacity <opacity>', description: 'Watermark opacity 0-1 (default: 0.5)' },
|
|
32
|
-
{ flag: '--scale <scale>', description: '
|
|
40
|
+
{ flag: '--scale <scale>', description: 'Scale factor - Image: 0.1-1 of image width (default: 0.2), Text: size multiplier (default: 1.0)' },
|
|
41
|
+
{ flag: '--font-size <size>', description: 'Text watermark base font size in pixels (auto-calculated if not specified)' },
|
|
42
|
+
{ flag: '--font-color <color>', description: 'Text watermark color (default: white)' },
|
|
43
|
+
{ flag: '--font-family <family>', description: 'Text watermark font family (default: Arial)' },
|
|
33
44
|
{ flag: '-q, --quality <quality>', description: 'Output quality 1-100 (default: 90)' },
|
|
34
45
|
{ flag: '--dry-run', description: 'Preview changes without executing' },
|
|
35
46
|
{ flag: '-v, --verbose', description: 'Show detailed output' }
|
|
36
47
|
],
|
|
37
48
|
examples: [
|
|
38
|
-
{ command: 'watermark photo.jpg logo.png', description: 'Add watermark
|
|
39
|
-
{ command: 'watermark image.jpg
|
|
40
|
-
{ command: 'watermark pic.jpg
|
|
41
|
-
{ command: 'watermark photo.jpg brand.png --scale 0.3 --position top-right', description: 'Larger watermark
|
|
49
|
+
{ command: 'watermark photo.jpg logo.png', description: 'Add image watermark from file' },
|
|
50
|
+
{ command: 'watermark image.jpg "© 2026 Company"', description: 'Add text watermark' },
|
|
51
|
+
{ command: 'watermark pic.jpg "Powered by MediaProc" --scale 1.5', description: 'Larger text watermark (1.5x)' },
|
|
52
|
+
{ command: 'watermark photo.jpg brand.png --scale 0.3 --position top-right', description: 'Larger image watermark (30% of width)' },
|
|
53
|
+
{ command: 'watermark *.jpg "DRAFT" --font-color red --scale 2', description: 'Batch large text watermark in red' }
|
|
42
54
|
],
|
|
43
55
|
additionalSections: [
|
|
56
|
+
{
|
|
57
|
+
title: 'Watermark Types',
|
|
58
|
+
items: [
|
|
59
|
+
'Image - Provide a file path (e.g., logo.png, watermark.svg)',
|
|
60
|
+
'Text - Provide any text string (e.g., "© 2026", "Powered by MediaProc")'
|
|
61
|
+
]
|
|
62
|
+
},
|
|
44
63
|
{
|
|
45
64
|
title: 'Positions',
|
|
46
65
|
items: [
|
|
@@ -50,32 +69,27 @@ export function watermarkCommand(imageCmd) {
|
|
|
50
69
|
'bottom-left - Lower left corner',
|
|
51
70
|
'bottom-right - Lower right corner (default)'
|
|
52
71
|
]
|
|
53
|
-
},
|
|
54
|
-
{
|
|
55
|
-
title: 'Opacity Guide',
|
|
56
|
-
items: [
|
|
57
|
-
'0.1-0.3 - Very subtle, barely visible',
|
|
58
|
-
'0.4-0.6 - Balanced visibility (recommended)',
|
|
59
|
-
'0.7-0.9 - Strong, clearly visible',
|
|
60
|
-
'1.0 - Fully opaque (no transparency)'
|
|
61
|
-
]
|
|
62
72
|
}
|
|
63
73
|
],
|
|
64
74
|
tips: [
|
|
65
75
|
'Use PNG watermarks with transparency for best results',
|
|
66
|
-
'
|
|
67
|
-
'
|
|
68
|
-
'
|
|
76
|
+
'Quotes are optional for simple text, required for text with spaces',
|
|
77
|
+
'Text watermarks are rendered with transparent backgrounds',
|
|
78
|
+
'Common font families: Arial, Times New Roman, Courier, Helvetica'
|
|
69
79
|
]
|
|
70
80
|
});
|
|
71
81
|
process.exit(0);
|
|
72
82
|
}
|
|
73
83
|
const spinner = ora('Processing image...').start();
|
|
74
84
|
try {
|
|
75
|
-
//
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
85
|
+
// Detect if watermark is a file or text
|
|
86
|
+
const isWatermarkFile = fs.existsSync(watermark);
|
|
87
|
+
const watermarkType = isWatermarkFile ? 'image' : 'text';
|
|
88
|
+
if (options.verbose) {
|
|
89
|
+
spinner.info(chalk.blue(`Watermark type: ${watermarkType}`));
|
|
90
|
+
if (!isWatermarkFile) {
|
|
91
|
+
spinner.info(chalk.dim(`Text: "${watermark}"`));
|
|
92
|
+
}
|
|
79
93
|
}
|
|
80
94
|
// Validate input paths (can be multiple)
|
|
81
95
|
const { inputFiles, outputPath, errors } = validatePaths(input, options.output, {
|
|
@@ -98,23 +112,33 @@ export function watermarkCommand(imageCmd) {
|
|
|
98
112
|
if (options.verbose) {
|
|
99
113
|
spinner.info(chalk.blue('Configuration:'));
|
|
100
114
|
console.log(chalk.dim(` Found ${inputFiles.length} file(s)`));
|
|
115
|
+
console.log(chalk.dim(` Watermark type: ${watermarkType}`));
|
|
101
116
|
console.log(chalk.dim(` Watermark: ${watermark}`));
|
|
102
117
|
console.log(chalk.dim(` Position: ${options.position || 'bottom-right'}`));
|
|
103
118
|
console.log(chalk.dim(` Opacity: ${options.opacity || 0.5}`));
|
|
104
|
-
|
|
119
|
+
if (watermarkType === 'image') {
|
|
120
|
+
console.log(chalk.dim(` Scale: ${options.scale || 0.2} (${((options.scale || 0.2) * 100).toFixed(0)}% of image width)`));
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
console.log(chalk.dim(` Scale: ${options.scale || 1.0}x (text size multiplier)`));
|
|
124
|
+
console.log(chalk.dim(` Base font size: ${options.fontSize ? options.fontSize + 'px' : 'auto'}`));
|
|
125
|
+
console.log(chalk.dim(` Font color: ${options.fontColor || 'white'}`));
|
|
126
|
+
console.log(chalk.dim(` Font family: ${options.fontFamily || 'Arial'}`));
|
|
127
|
+
}
|
|
105
128
|
spinner.start('Processing...');
|
|
106
129
|
}
|
|
107
130
|
if (options.dryRun) {
|
|
108
131
|
spinner.info(chalk.yellow('Dry run mode - no changes will be made'));
|
|
109
|
-
console.log(chalk.green(`✓ Would add watermark to ${inputFiles.length} file(s):`));
|
|
132
|
+
console.log(chalk.green(`✓ Would add ${watermarkType} watermark to ${inputFiles.length} file(s):`));
|
|
110
133
|
inputFiles.forEach(f => console.log(chalk.dim(` - ${f}`)));
|
|
111
134
|
console.log(chalk.dim(` Watermark: ${watermark}`));
|
|
135
|
+
if (watermarkType === 'text') {
|
|
136
|
+
console.log(chalk.dim(` Text watermark with font size: ${options.fontSize || 48}px`));
|
|
137
|
+
}
|
|
112
138
|
return;
|
|
113
139
|
}
|
|
114
|
-
// Preload watermark
|
|
115
|
-
const scale = options.scale || 0.2;
|
|
116
|
-
const position = options.position || 'bottom-right';
|
|
117
140
|
// Calculate gravity once
|
|
141
|
+
const position = options.position || 'bottom-right';
|
|
118
142
|
let gravity = 'southeast';
|
|
119
143
|
if (position === 'center')
|
|
120
144
|
gravity = 'center';
|
|
@@ -126,26 +150,77 @@ export function watermarkCommand(imageCmd) {
|
|
|
126
150
|
gravity = 'southwest';
|
|
127
151
|
else if (position === 'bottom-right')
|
|
128
152
|
gravity = 'southeast';
|
|
153
|
+
// Prepare watermark buffer based on type
|
|
154
|
+
let watermarkBuffer = null;
|
|
155
|
+
if (watermarkType === 'image') {
|
|
156
|
+
// For image watermarks, preload the watermark
|
|
157
|
+
// We'll scale it per image based on each image's dimensions
|
|
158
|
+
watermarkBuffer = await createSharpInstance(watermark).toBuffer();
|
|
159
|
+
}
|
|
160
|
+
// For text watermarks, we create them dynamically per image
|
|
129
161
|
// Process all files
|
|
130
162
|
for (const inputFile of inputFiles) {
|
|
131
163
|
try {
|
|
132
164
|
const fileName = getFileName(inputFile);
|
|
133
165
|
const outputPath = outputPaths.get(inputFile);
|
|
134
166
|
const metadata = await createSharpInstance(inputFile).metadata();
|
|
135
|
-
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
.
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
167
|
+
const imageWidth = metadata.width || 800;
|
|
168
|
+
const imageHeight = metadata.height || 600;
|
|
169
|
+
let watermarkWithOpacity;
|
|
170
|
+
if (watermarkType === 'image') {
|
|
171
|
+
// Calculate watermark size based on scale for image watermarks
|
|
172
|
+
const scale = options.scale !== undefined ? options.scale : 0.2;
|
|
173
|
+
const targetWidth = Math.round(imageWidth * scale);
|
|
174
|
+
const targetHeight = Math.round(imageHeight * scale);
|
|
175
|
+
const watermarkResized = await sharp(watermarkBuffer)
|
|
176
|
+
.resize(targetWidth, targetHeight)
|
|
177
|
+
.toBuffer();
|
|
178
|
+
// Apply opacity to image watermark
|
|
179
|
+
watermarkWithOpacity = await sharp(watermarkResized)
|
|
180
|
+
.composite([{
|
|
181
|
+
input: Buffer.from([255, 255, 255, Math.round((options.opacity || 0.5) * 255)]),
|
|
182
|
+
raw: { width: 1, height: 1, channels: 4 },
|
|
183
|
+
tile: true,
|
|
184
|
+
blend: 'dest-in'
|
|
185
|
+
}])
|
|
186
|
+
.toBuffer();
|
|
187
|
+
}
|
|
188
|
+
else {
|
|
189
|
+
// For text watermarks, calculate font size based on image dimensions
|
|
190
|
+
const scale = options.scale !== undefined ? options.scale : 1.0;
|
|
191
|
+
// Auto-calculate base font size if not specified (3% of image width)
|
|
192
|
+
const baseFontSize = options.fontSize || Math.round(imageWidth * 0.03);
|
|
193
|
+
const fontSize = Math.round(baseFontSize * scale);
|
|
194
|
+
const fontColor = options.fontColor || 'white';
|
|
195
|
+
const fontFamily = options.fontFamily || 'Arial';
|
|
196
|
+
// Estimate text dimensions
|
|
197
|
+
const textWidth = watermark.length * fontSize * 0.6;
|
|
198
|
+
const textHeight = fontSize * 1.5;
|
|
199
|
+
const padding = 20;
|
|
200
|
+
const svgText = `
|
|
201
|
+
<svg width="${Math.ceil(textWidth + padding * 2)}" height="${Math.ceil(textHeight + padding)}">
|
|
202
|
+
<text
|
|
203
|
+
x="${padding}"
|
|
204
|
+
y="${fontSize + padding / 2}"
|
|
205
|
+
font-family="${fontFamily}"
|
|
206
|
+
font-size="${fontSize}"
|
|
207
|
+
fill="${fontColor}"
|
|
208
|
+
font-weight="bold"
|
|
209
|
+
>${watermark}</text>
|
|
210
|
+
</svg>
|
|
211
|
+
`;
|
|
212
|
+
const textBuffer = Buffer.from(svgText);
|
|
213
|
+
// Apply opacity to text watermark
|
|
214
|
+
watermarkWithOpacity = await sharp(textBuffer)
|
|
215
|
+
.composite([{
|
|
216
|
+
input: Buffer.from([255, 255, 255, Math.round((options.opacity || 0.5) * 255)]),
|
|
217
|
+
raw: { width: 1, height: 1, channels: 4 },
|
|
218
|
+
tile: true,
|
|
219
|
+
blend: 'dest-in'
|
|
220
|
+
}])
|
|
221
|
+
.png()
|
|
222
|
+
.toBuffer();
|
|
223
|
+
}
|
|
149
224
|
const pipeline = createSharpInstance(inputFile).composite([{
|
|
150
225
|
input: watermarkWithOpacity,
|
|
151
226
|
gravity,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watermark.js","sourceRoot":"","sources":["../../src/commands/watermark.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"watermark.js","sourceRoot":"","sources":["../../src/commands/watermark.ts"],"names":[],"mappings":"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"}
|