@paroicms/server 1.81.0 → 1.82.0
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,9 +1,8 @@
|
|
|
1
|
-
import { ApiError,
|
|
1
|
+
import { ApiError, makeUrlOfMediaFile } from "@paroicms/public-server-lib";
|
|
2
2
|
import { processOriginalImage } from "@paroicms/server-image-cache-engine";
|
|
3
3
|
import { getHandleOfSiteFavicon } from "../../common/media-handles.helpers.js";
|
|
4
4
|
import { invalidateMultipleDocumentsInCache } from "../../common/text-cache.js";
|
|
5
|
-
import {
|
|
6
|
-
import { createBoFaviconFrom, registerImageVariant } from "./media.js";
|
|
5
|
+
import { createBoFaviconFrom } from "./media.js";
|
|
7
6
|
export async function addMediaToNode(siteContext, file, options) {
|
|
8
7
|
const { binaryFile, mediaType, weightB, originalName } = file;
|
|
9
8
|
const { nodeId, nodeType, handle, attachedData, replace } = options;
|
|
@@ -17,33 +16,25 @@ export async function addMediaToNode(siteContext, file, options) {
|
|
|
17
16
|
nodeId,
|
|
18
17
|
exceptHandle: replace ? handle : undefined,
|
|
19
18
|
});
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
qualityPolicy: siteContext.siteSchema.imageQualityPolicy,
|
|
29
|
-
});
|
|
30
|
-
}
|
|
19
|
+
const imageConverter = ({ binaryFile, mediaType }) => processOriginalImage({
|
|
20
|
+
binaryFile,
|
|
21
|
+
mediaType,
|
|
22
|
+
ApiError,
|
|
23
|
+
policy: mediaPolicy.image,
|
|
24
|
+
defaultPolicy: siteContext.siteSchema.mediaPolicies.default.image,
|
|
25
|
+
qualityPolicy: siteContext.siteSchema.imageQualityPolicy,
|
|
26
|
+
});
|
|
31
27
|
const media = await siteContext.mediaStorage.addMedia({
|
|
32
|
-
binaryFile:
|
|
33
|
-
mediaType:
|
|
34
|
-
weightB:
|
|
28
|
+
binaryFile: binaryFile,
|
|
29
|
+
mediaType: mediaType,
|
|
30
|
+
weightB: weightB,
|
|
35
31
|
handle,
|
|
36
32
|
originalName,
|
|
37
|
-
image: originalImage
|
|
38
|
-
? {
|
|
39
|
-
width: originalImage.width,
|
|
40
|
-
height: originalImage.height,
|
|
41
|
-
lossless: originalImage.lossless,
|
|
42
|
-
}
|
|
43
|
-
: undefined,
|
|
44
33
|
attachedData: attachedData,
|
|
45
34
|
replace,
|
|
46
35
|
nodeId,
|
|
36
|
+
}, {
|
|
37
|
+
imageConverter,
|
|
47
38
|
});
|
|
48
39
|
const result = {
|
|
49
40
|
uid: media.uid,
|
|
@@ -57,26 +48,11 @@ export async function addMediaToNode(siteContext, file, options) {
|
|
|
57
48
|
absoluteUrl: true,
|
|
58
49
|
}),
|
|
59
50
|
};
|
|
60
|
-
if (
|
|
51
|
+
if (media.kind !== "image")
|
|
61
52
|
return result;
|
|
62
53
|
if (handle === getHandleOfSiteFavicon()) {
|
|
63
54
|
await createBoFaviconFrom(siteContext, binaryFile);
|
|
64
55
|
}
|
|
65
|
-
await registerImageVariant(siteContext, {
|
|
66
|
-
imageRef: {
|
|
67
|
-
height: originalImage.height,
|
|
68
|
-
imageUid: media.uid,
|
|
69
|
-
mediaType: media.mediaType,
|
|
70
|
-
width: originalImage.width,
|
|
71
|
-
},
|
|
72
|
-
realSize: thumbRealSize,
|
|
73
|
-
autoCrop: true,
|
|
74
|
-
versionedUrl: true,
|
|
75
|
-
absoluteUrl: true,
|
|
76
|
-
dependsOnUsedKey: "bo",
|
|
77
|
-
slug: generateImageSlug(media.originalName),
|
|
78
|
-
originalName,
|
|
79
|
-
});
|
|
80
56
|
if (nodeType.kind === "site") {
|
|
81
57
|
await siteContext.textCache.invalidateAll();
|
|
82
58
|
}
|
|
@@ -85,8 +61,8 @@ export async function addMediaToNode(siteContext, file, options) {
|
|
|
85
61
|
}
|
|
86
62
|
return {
|
|
87
63
|
...result,
|
|
88
|
-
width:
|
|
89
|
-
height:
|
|
64
|
+
width: media.width,
|
|
65
|
+
height: media.height,
|
|
90
66
|
};
|
|
91
67
|
}
|
|
92
68
|
async function checkMediaPolicy(siteContext, { mediaPolicy, mediaType, weightB, nodeType, nodeId, exceptHandle, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-media-to-node.js","sourceRoot":"","sources":["../../../src/bo-backend/media/add-media-to-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"add-media-to-node.js","sourceRoot":"","sources":["../../../src/bo-backend/media/add-media-to-node.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,13 +35,11 @@ export async function createBoFaviconFrom(siteContext, binaryFile) {
|
|
|
35
35
|
weightB: result.weightB,
|
|
36
36
|
handle: getHandleOfSiteBoFavicon(),
|
|
37
37
|
originalName: "bo-favicon",
|
|
38
|
-
image:
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
: undefined,
|
|
38
|
+
image: {
|
|
39
|
+
width: result.width,
|
|
40
|
+
height: result.height,
|
|
41
|
+
lossless: result.lossless,
|
|
42
|
+
},
|
|
45
43
|
replace: true,
|
|
46
44
|
nodeId: siteContext.siteIds.siteNodeId,
|
|
47
45
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../src/bo-backend/media/media.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAEL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAUjD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAwD,EACxD,EACE,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,YAAY,GAUb;IAED,IAAI,QAAQ,CAAC,SAAS,KAAK,eAAe,EAAE,CAAC;QAC3C,OAAO,2BAA2B,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,GAC9D,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ;QACR,SAAS,EAAE,QAAQ;QACnB,QAAQ;QACR,gBAAgB;QAChB,IAAI;KACL,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,qBAAqB,CAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS;YACT,WAAW;YACX,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;YAC3D,IAAI;YACJ,WAAW;SACZ,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,WAAwB,EAAE,UAAkB;IACpF,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;QACtC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,wBAAwB,EAAE;QAClC,YAAY,EAAE,YAAY;QAC1B,KAAK,EAAE
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../src/bo-backend/media/media.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAEL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAUjD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAwD,EACxD,EACE,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,YAAY,GAUb;IAED,IAAI,QAAQ,CAAC,SAAS,KAAK,eAAe,EAAE,CAAC;QAC3C,OAAO,2BAA2B,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,GAC9D,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ;QACR,SAAS,EAAE,QAAQ;QACnB,QAAQ;QACR,gBAAgB;QAChB,IAAI;KACL,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,qBAAqB,CAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS;YACT,WAAW;YACX,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;YAC3D,IAAI;YACJ,WAAW;SACZ,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,WAAwB,EAAE,UAAkB;IACpF,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;QACtC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,wBAAwB,EAAE;QAClC,YAAY,EAAE,YAAY;QAC1B,KAAK,EAAE;YACL,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;SAC1B;QACD,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;KACvC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,WAAyC,EACzC,QAAkB,EAClB,YAAqB;IAErB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;IACrF,OAAO;QACL,GAAG,EAAE,kBAAkB,CAAC,WAAW,EAAE;YACnC,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,YAAY;SACb,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS,EAAE,eAAe;KAC3B,CAAC;AACJ,CAAC"}
|