@travetto/image 8.0.0-alpha.9 → 8.0.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/README.md +1 -1
- package/__index__.ts +1 -1
- package/package.json +13 -13
- package/src/util.ts +14 -13
package/README.md
CHANGED
|
@@ -28,7 +28,7 @@ import { ImageUtil } from '@travetto/image';
|
|
|
28
28
|
export class ResizeService {
|
|
29
29
|
async resizeImage(imgPath: string, width: number, height: number): Promise<string> {
|
|
30
30
|
const stream = await ImageUtil.convert(createReadStream(imgPath), { w: width, h: height });
|
|
31
|
-
const out = imgPath.replace(/[.][^.]+$/,
|
|
31
|
+
const out = imgPath.replace(/[.][^.]+$/, ext => `.resized${ext}`);
|
|
32
32
|
await pipeline(stream, createWriteStream(out));
|
|
33
33
|
return out;
|
|
34
34
|
}
|
package/__index__.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from './src/util.ts';
|
|
1
|
+
export * from './src/util.ts';
|
package/package.json
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@travetto/image",
|
|
3
|
-
"version": "8.0.
|
|
4
|
-
"type": "module",
|
|
3
|
+
"version": "8.0.1",
|
|
5
4
|
"description": "Image support, resizing, and optimization",
|
|
6
5
|
"keywords": [
|
|
7
6
|
"images",
|
|
@@ -11,31 +10,32 @@
|
|
|
11
10
|
"homepage": "https://travetto.io",
|
|
12
11
|
"license": "MIT",
|
|
13
12
|
"author": {
|
|
14
|
-
"
|
|
15
|
-
"
|
|
13
|
+
"name": "Travetto Framework",
|
|
14
|
+
"email": "travetto.framework@gmail.com"
|
|
15
|
+
},
|
|
16
|
+
"repository": {
|
|
17
|
+
"url": "git+https://github.com/travetto/travetto.git",
|
|
18
|
+
"directory": "module/image"
|
|
16
19
|
},
|
|
17
20
|
"files": [
|
|
18
21
|
"__index__.ts",
|
|
19
22
|
"src"
|
|
20
23
|
],
|
|
24
|
+
"type": "module",
|
|
21
25
|
"main": "__index__.ts",
|
|
22
|
-
"
|
|
23
|
-
"
|
|
24
|
-
"directory": "module/image"
|
|
26
|
+
"publishConfig": {
|
|
27
|
+
"access": "public"
|
|
25
28
|
},
|
|
26
29
|
"dependencies": {
|
|
27
|
-
"@travetto/runtime": "^8.0.
|
|
28
|
-
"sharp": "^0.
|
|
30
|
+
"@travetto/runtime": "^8.0.1",
|
|
31
|
+
"sharp": "^0.35.4"
|
|
29
32
|
},
|
|
30
33
|
"travetto": {
|
|
31
34
|
"displayName": "Image",
|
|
32
35
|
"build": {
|
|
33
|
-
"
|
|
36
|
+
"externalDependencies": [
|
|
34
37
|
"sharp"
|
|
35
38
|
]
|
|
36
39
|
}
|
|
37
|
-
},
|
|
38
|
-
"publishConfig": {
|
|
39
|
-
"access": "public"
|
|
40
40
|
}
|
|
41
41
|
}
|
package/src/util.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { Metadata, Sharp } from 'sharp';
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { type BinaryStream, type BinaryType, BinaryUtil, castTo } from '@travetto/runtime';
|
|
4
4
|
|
|
5
5
|
const VALID_EXTENSIONS = ['jpeg', 'jpg', 'png', 'avif', 'webp', 'gif', 'jxl'] as const;
|
|
6
6
|
|
|
7
|
-
type ImageFormat = typeof VALID_EXTENSIONS[number];
|
|
7
|
+
type ImageFormat = (typeof VALID_EXTENSIONS)[number];
|
|
8
8
|
type ImageMetadata = {
|
|
9
9
|
width: number;
|
|
10
10
|
height: number;
|
|
@@ -38,7 +38,6 @@ export interface ConvertOptions {
|
|
|
38
38
|
* Simple support for image manipulation.
|
|
39
39
|
*/
|
|
40
40
|
export class ImageUtil {
|
|
41
|
-
|
|
42
41
|
static isKnownExtension(ext: string): ext is ImageFormat {
|
|
43
42
|
return VALID_EXTENSIONS.includes(castTo(ext));
|
|
44
43
|
}
|
|
@@ -48,7 +47,7 @@ export class ImageUtil {
|
|
|
48
47
|
|
|
49
48
|
let builder = sharp();
|
|
50
49
|
if (options.w || options.h) {
|
|
51
|
-
const dims = [options.w, options.h].map(value => value ? Math.trunc(value) : undefined);
|
|
50
|
+
const dims = [options.w, options.h].map(value => (value ? Math.trunc(value) : undefined));
|
|
52
51
|
const fluid = dims.some(value => !value);
|
|
53
52
|
builder = builder.resize({
|
|
54
53
|
width: dims[0],
|
|
@@ -58,13 +57,12 @@ export class ImageUtil {
|
|
|
58
57
|
}
|
|
59
58
|
|
|
60
59
|
return builder
|
|
61
|
-
.avif({ force: format === 'avif', ...optimize ? { quality: 70 } : {} })
|
|
62
|
-
.webp({ force: format === 'webp', ...optimize ? { quality: 80 } : {} })
|
|
63
|
-
.png({ force: format === 'png', ...optimize ? { compressionLevel: 9, quality: 80, adaptiveFiltering: true } : {} })
|
|
64
|
-
.jpeg({ force: format === 'jpeg' || format === 'jpg', ...optimize ? { quality: 80, progressive: true } : {} })
|
|
65
|
-
.jxl({ force: format === 'jxl', ...optimize ? { lossless: false, quality: 80 } : {} })
|
|
66
|
-
.gif({ force: format === 'gif', ...optimize ? { effort: 10 } : {} });
|
|
67
|
-
|
|
60
|
+
.avif({ force: format === 'avif', ...(optimize ? { quality: 70 } : {}) })
|
|
61
|
+
.webp({ force: format === 'webp', ...(optimize ? { quality: 80 } : {}) })
|
|
62
|
+
.png({ force: format === 'png', ...(optimize ? { compressionLevel: 9, quality: 80, adaptiveFiltering: true } : {}) })
|
|
63
|
+
.jpeg({ force: format === 'jpeg' || format === 'jpg', ...(optimize ? { quality: 80, progressive: true } : {}) })
|
|
64
|
+
.jxl({ force: format === 'jxl', ...(optimize ? { lossless: false, quality: 80 } : {}) })
|
|
65
|
+
.gif({ force: format === 'gif', ...(optimize ? { effort: 10 } : {}) });
|
|
68
66
|
}
|
|
69
67
|
|
|
70
68
|
/**
|
|
@@ -82,12 +80,15 @@ export class ImageUtil {
|
|
|
82
80
|
static async getMetadata(image: BinaryType): Promise<ImageMetadata> {
|
|
83
81
|
const { default: sharp } = await import('sharp');
|
|
84
82
|
const out = await new Promise<Metadata>((resolve, reject) =>
|
|
85
|
-
BinaryUtil.pipeline(
|
|
83
|
+
BinaryUtil.pipeline(
|
|
84
|
+
image,
|
|
85
|
+
sharp().metadata((error, metadata) => (error ? reject(error) : resolve(metadata)))
|
|
86
|
+
)
|
|
86
87
|
);
|
|
87
88
|
return {
|
|
88
89
|
width: out.width!,
|
|
89
90
|
height: out.height!,
|
|
90
|
-
format: castTo(out.format?.replace('heif', 'avif')
|
|
91
|
+
format: castTo(out.format?.replace('heif', 'avif')),
|
|
91
92
|
aspect: out.width! / out.height!
|
|
92
93
|
};
|
|
93
94
|
}
|