@stamhoofd/models 2.48.1 → 2.49.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAK5E,qBAAa,KAAM,SAAQ,KAAK;IAC5B,MAAM,CAAC,KAAK,SAAY;IAKxB,EAAE,EAAG,MAAM,CAAC;IAGZ,MAAM,EAAE,IAAI,CAAC;IAGb,WAAW,EAAE,UAAU,EAAE,CAAM;IAG/B,SAAS,EAAE,IAAI,CAAc;WAEhB,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAK5E,qBAAa,KAAM,SAAQ,KAAK;IAC5B,MAAM,CAAC,KAAK,SAAY;IAKxB,EAAE,EAAG,MAAM,CAAC;IAGZ,MAAM,EAAE,IAAI,CAAC;IAGb,WAAW,EAAE,UAAU,EAAE,CAAM;IAG/B,SAAS,EAAE,IAAI,CAAc;WAEhB,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;CA8HhI"}
|
package/dist/src/models/Image.js
CHANGED
|
@@ -27,11 +27,14 @@ class Image extends simple_database_1.Model {
|
|
|
27
27
|
if (type == 'image/jpeg' || type == 'image/jpg') {
|
|
28
28
|
fileType = 'jpg';
|
|
29
29
|
}
|
|
30
|
+
if (type == 'image/webp') {
|
|
31
|
+
fileType = 'webp';
|
|
32
|
+
}
|
|
30
33
|
if (type === 'image/svg+xml' || type === 'image/svg') {
|
|
31
34
|
fileType = 'svg';
|
|
32
35
|
}
|
|
33
36
|
console.log('creating image', fileType, type, resolutions);
|
|
34
|
-
const supportsTransparency = fileType == 'png' || fileType == 'svg';
|
|
37
|
+
const supportsTransparency = fileType == 'png' || fileType == 'svg' || fileType == 'webp';
|
|
35
38
|
const promises = [];
|
|
36
39
|
if (resolutions.length) {
|
|
37
40
|
let sharpStream = (0, sharp_1.default)(fileContent, fileType === 'svg' ? { density: 600 } : {}).rotate();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,iEAA2D;AAC3D,6DAAwD;AACxD,sDAA4E;AAC5E,8DAA0B;AAC1B,0DAA0B;AAC1B,+BAAoC;AAEpC,MAAa,KAAM,SAAQ,uBAAK;IAC5B,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC;IAKxB,EAAE,CAAU;IAGZ,MAAM,CAAO;IAGb,WAAW,GAAiB,EAAE,CAAC;IAG/B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAE7B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAA4B,EAAE,IAAwB,EAAE,WAAgC;QACxG,IAAI,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;YAC9G,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,4BAA4B;gBACrC,UAAU,EAAE,GAAG;aAClB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,IAAI,IAAI,YAAY,IAAI,IAAI,IAAI,WAAW,EAAE,CAAC;YAC9C,QAAQ,GAAG,KAAK,CAAC;QACrB,CAAC;QACD,IAAI,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YACnD,QAAQ,GAAG,KAAK,CAAC;QACrB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAE3D,MAAM,oBAAoB,GAAG,QAAQ,IAAI,KAAK,IAAI,QAAQ,IAAI,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../src/models/Image.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stamhoofd/models",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.49.1",
|
|
4
4
|
"main": "./dist/src/index.js",
|
|
5
5
|
"types": "./dist/src/index.d.ts",
|
|
6
6
|
"license": "UNLICENCED",
|
|
@@ -29,5 +29,5 @@
|
|
|
29
29
|
"publishConfig": {
|
|
30
30
|
"access": "public"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "d99dc987933ceb59c4f5fcb0e4af869b4007826a"
|
|
33
33
|
}
|
package/src/models/Image.ts
CHANGED
|
@@ -36,13 +36,16 @@ export class Image extends Model {
|
|
|
36
36
|
if (type == 'image/jpeg' || type == 'image/jpg') {
|
|
37
37
|
fileType = 'jpg';
|
|
38
38
|
}
|
|
39
|
+
if (type == 'image/webp') {
|
|
40
|
+
fileType = 'webp';
|
|
41
|
+
}
|
|
39
42
|
if (type === 'image/svg+xml' || type === 'image/svg') {
|
|
40
43
|
fileType = 'svg';
|
|
41
44
|
}
|
|
42
45
|
|
|
43
46
|
console.log('creating image', fileType, type, resolutions);
|
|
44
47
|
|
|
45
|
-
const supportsTransparency = fileType == 'png' || fileType == 'svg';
|
|
48
|
+
const supportsTransparency = fileType == 'png' || fileType == 'svg' || fileType == 'webp';
|
|
46
49
|
const promises: Promise<{ data: Buffer;info: sharp.OutputInfo }>[] = [];
|
|
47
50
|
|
|
48
51
|
if (resolutions.length) {
|