@paroicms/server 1.35.1 → 1.36.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.
|
@@ -8,14 +8,21 @@ const html_helpers_1 = require("../../../common/mail/html-helpers");
|
|
|
8
8
|
const context_1 = require("../../../context");
|
|
9
9
|
const url_helpers_1 = require("../../../helpers/url.helpers");
|
|
10
10
|
const make_image_available_1 = require("../../../public-payload/make-image-available");
|
|
11
|
+
const obfuscate_helper_1 = require("../../public-site/helpers/obfuscate.helper");
|
|
11
12
|
async function convertQuillDeltaToHtml(siteContext, renderingContext, delta, options) {
|
|
12
|
-
const
|
|
13
|
+
const ops = delta.ops;
|
|
14
|
+
preprocessDelta(ops);
|
|
15
|
+
const converter = new quill_delta_to_html_1.QuillDeltaToHtmlAsyncConverter(ops, {
|
|
16
|
+
multiLineParagraph: false,
|
|
17
|
+
});
|
|
13
18
|
converter.renderCustomWith((customOp) => {
|
|
14
19
|
const { type, value } = customOp.insert;
|
|
15
20
|
if (type === "html-snippet")
|
|
16
21
|
return value.html;
|
|
17
22
|
if (type === "img")
|
|
18
23
|
return imgBlotProcessing(siteContext, renderingContext, value, options);
|
|
24
|
+
if (type === "obfuscate")
|
|
25
|
+
return obfuscateBlotProcessing(value, customOp.attributes);
|
|
19
26
|
context_1.platformLog.warn(`Invalid blot '${type}'`);
|
|
20
27
|
return "";
|
|
21
28
|
});
|
|
@@ -37,6 +44,48 @@ function convertQuillDeltaToPlainText(delta) {
|
|
|
37
44
|
return (0, html_helpers_1.stripHtmlTags)(html, { blockSeparator: " – " });
|
|
38
45
|
}
|
|
39
46
|
exports.convertQuillDeltaToPlainText = convertQuillDeltaToPlainText;
|
|
47
|
+
function preprocessDelta(ops) {
|
|
48
|
+
for (const op of ops) {
|
|
49
|
+
if (!op.insert || !op.attributes?.obfuscate)
|
|
50
|
+
continue;
|
|
51
|
+
op.insert = {
|
|
52
|
+
obfuscate: op.insert,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function obfuscateBlotProcessing(value, inlineAttributes) {
|
|
57
|
+
const textVal = (0, data_formatters_lib_1.strValOrUndef)(value);
|
|
58
|
+
if (!textVal)
|
|
59
|
+
return "";
|
|
60
|
+
const asALink = formatObfuscateAsALink((0, data_formatters_lib_1.strVal)(inlineAttributes.obfuscate));
|
|
61
|
+
let obfuscatedVal;
|
|
62
|
+
if (asALink === "mailto" || asALink === "tel") {
|
|
63
|
+
obfuscatedVal = (0, obfuscate_helper_1.obfuscateAsHtmlLink)(textVal);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
obfuscatedVal = (0, obfuscate_helper_1.generateObfuscatedHtml)(textVal);
|
|
67
|
+
}
|
|
68
|
+
let result = obfuscatedVal;
|
|
69
|
+
if (inlineAttributes.strike) {
|
|
70
|
+
result = `<s>${result}</s>`;
|
|
71
|
+
}
|
|
72
|
+
if (inlineAttributes.italic) {
|
|
73
|
+
result = `<em>${result}</em>`;
|
|
74
|
+
}
|
|
75
|
+
if (inlineAttributes.bold) {
|
|
76
|
+
result = `<strong>${result}</strong>`;
|
|
77
|
+
}
|
|
78
|
+
return result;
|
|
79
|
+
}
|
|
80
|
+
function formatObfuscateAsALink(val) {
|
|
81
|
+
if (val === "raw")
|
|
82
|
+
return "raw";
|
|
83
|
+
if (val === "mailto")
|
|
84
|
+
return "mailto";
|
|
85
|
+
if (val === "tel")
|
|
86
|
+
return "tel";
|
|
87
|
+
throw new Error(`invalid link-type '${val}'`);
|
|
88
|
+
}
|
|
40
89
|
async function imgBlotProcessing(siteContext, renderingContext, value, options) {
|
|
41
90
|
const uid = (0, data_formatters_lib_1.strValOrUndef)(value.uid, { varName: "uid" });
|
|
42
91
|
const variant = (0, data_formatters_lib_1.strValOrUndef)(value.variant, { varName: "variant" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quill-delta.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/quill-delta.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"quill-delta.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/quill-delta.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.36.1",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@paroi/data-formatters-lib": "~0.3.0",
|
|
50
50
|
"@paroi/quill-delta-to-html": "~0.12.2",
|
|
51
51
|
"@paroicms/anywhere-lib": "1.13.1",
|
|
52
|
-
"@paroicms/bo": "1.28.
|
|
52
|
+
"@paroicms/bo": "1.28.2",
|
|
53
53
|
"@paroicms/plugin-lib": "0.3.1",
|
|
54
54
|
"@paroicms/server-database-media-storage": "1.6.2",
|
|
55
55
|
"@paroicms/server-image-cache-engine": "1.7.3",
|