@rbbtsn0w/wechat-markdown 2.1.3 → 2.1.4
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.
|
@@ -19,9 +19,14 @@ export declare function getHighlightCss(themeName?: HighlightThemeName | string)
|
|
|
19
19
|
*/
|
|
20
20
|
export declare function splitHighlightedHtmlByLines(html: string): string[];
|
|
21
21
|
/**
|
|
22
|
-
*
|
|
23
|
-
*
|
|
24
|
-
*
|
|
22
|
+
* Turns spaces and tabs in code text nodes into where required to survive WeChat sanitization.
|
|
23
|
+
*
|
|
24
|
+
* highlight.js emits each token as its own `<span>`, so the space in
|
|
25
|
+
* `class Canvas` is a whitespace-only text node between tags (`</span> <span>`).
|
|
26
|
+
* WeChat's editor drops those nodes (`classCanvas`) even when the parent sets `white-space: pre`.
|
|
27
|
+
* Protect boundary whitespace outside string literals. String text can be split by nested
|
|
28
|
+
* interpolation spans; changing those fragments would change copied string values.
|
|
29
|
+
* Internal whitespace in plaintext is also preserved because its literal scope is unknown.
|
|
25
30
|
*/
|
|
26
31
|
export declare function formatCodeLine(lineHtml: string): string;
|
|
27
32
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"highlighter.d.ts","sourceRoot":"","sources":["../../src/plugins/highlighter.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG,cAAc,GAAG,SAAS,CAAC;AAE9E,eAAO,MAAM,cAAc,48BAY1B,CAAC;AAEF,eAAO,MAAM,cAAc,48BAY1B,CAAC;AAEF,eAAO,MAAM,UAAU,48BAYtB,CAAC;AAEF,eAAO,MAAM,gBAAgB,48BAAiB,CAAC;AAE/C,wBAAgB,eAAe,CAAC,SAAS,CAAC,EAAE,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAU/E;AAWD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAuClE;AAED
|
|
1
|
+
{"version":3,"file":"highlighter.d.ts","sourceRoot":"","sources":["../../src/plugins/highlighter.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG,cAAc,GAAG,SAAS,CAAC;AAE9E,eAAO,MAAM,cAAc,48BAY1B,CAAC;AAEF,eAAO,MAAM,cAAc,48BAY1B,CAAC;AAEF,eAAO,MAAM,UAAU,48BAYtB,CAAC;AAEF,eAAO,MAAM,gBAAgB,48BAAiB,CAAC;AAE/C,wBAAgB,eAAe,CAAC,SAAS,CAAC,EAAE,kBAAkB,GAAG,MAAM,GAAG,MAAM,CAU/E;AAWD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAuClE;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAwBvD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,GAAE,OAAe,GAAG,MAAM,CAmB9F;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,EAChB,cAAc,GAAE,OAAe,GAC9B;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAwC3C"}
|
|
@@ -122,20 +122,32 @@ function splitHighlightedHtmlByLines(html) {
|
|
|
122
122
|
return lines;
|
|
123
123
|
}
|
|
124
124
|
/**
|
|
125
|
-
*
|
|
126
|
-
*
|
|
127
|
-
*
|
|
125
|
+
* Turns spaces and tabs in code text nodes into where required to survive WeChat sanitization.
|
|
126
|
+
*
|
|
127
|
+
* highlight.js emits each token as its own `<span>`, so the space in
|
|
128
|
+
* `class Canvas` is a whitespace-only text node between tags (`</span> <span>`).
|
|
129
|
+
* WeChat's editor drops those nodes (`classCanvas`) even when the parent sets `white-space: pre`.
|
|
130
|
+
* Protect boundary whitespace outside string literals. String text can be split by nested
|
|
131
|
+
* interpolation spans; changing those fragments would change copied string values.
|
|
132
|
+
* Internal whitespace in plaintext is also preserved because its literal scope is unknown.
|
|
128
133
|
*/
|
|
129
134
|
function formatCodeLine(lineHtml) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
135
|
+
const literalSpans = [];
|
|
136
|
+
const formatted = lineHtml.replace(/(<[^>]+>)|([^<]+)/g, (_match, tag, text) => {
|
|
137
|
+
if (tag) {
|
|
138
|
+
if (/^<\/span\b/.test(tag))
|
|
139
|
+
literalSpans.pop();
|
|
140
|
+
else if (/^<span\b/.test(tag)) {
|
|
141
|
+
const parentIsLiteral = literalSpans.at(-1) ?? false;
|
|
142
|
+
const isSubstitution = /\bhljs-subst\b/.test(tag);
|
|
143
|
+
literalSpans.push(!isSubstitution && (parentIsLiteral || /\bhljs-(?:string|regexp)\b/.test(tag)));
|
|
144
|
+
}
|
|
134
145
|
return tag;
|
|
135
|
-
|
|
146
|
+
}
|
|
147
|
+
if (literalSpans.at(-1))
|
|
148
|
+
return text;
|
|
149
|
+
return text.replace(/^[ \t]+|[ \t]+$/g, (spaces) => ' '.repeat(spaces.replace(/\t/g, ' ').length));
|
|
136
150
|
});
|
|
137
|
-
// Match leading spaces, even if preceded by open tags like <span ...>
|
|
138
|
-
formatted = formatted.replace(/^((?:<[^>]+>)*)( +)/, (_, tags, spaces) => tags + ' '.repeat(spaces.length));
|
|
139
151
|
return formatted === '' ? ' ' : formatted;
|
|
140
152
|
}
|
|
141
153
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"highlighter.js","sourceRoot":"","sources":["../../src/plugins/highlighter.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;AAkDH,0CAUC;AAeD,kEAuCC;
|
|
1
|
+
{"version":3,"file":"highlighter.js","sourceRoot":"","sources":["../../src/plugins/highlighter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rbbtsn0w/wechat-markdown",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.4",
|
|
4
4
|
"description": "High-fidelity Markdown to WeChat Official Account HTML converter SDK & middleware",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"overrides": {
|
|
66
66
|
"@xmldom/xmldom": "^0.9.12",
|
|
67
67
|
"source-map-js": "^1.2.2",
|
|
68
|
-
"ip-address": "
|
|
68
|
+
"ip-address": "$ip-address",
|
|
69
69
|
"undici": "^7.30.1",
|
|
70
70
|
"npm": "12.2.2",
|
|
71
71
|
"@actions/http-client": {
|