@rbbtsn0w/wechat-markdown 1.7.1 โ†’ 2.0.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.
package/README.md CHANGED
@@ -59,6 +59,8 @@
59
59
 
60
60
  ## ๐Ÿ“ฆ Installation
61
61
 
62
+ **Requires Node.js 22.14.0 or newer.** The package remains CommonJS and supports TypeScript consumers. Use `nvm use` when developing this repository.
63
+
62
64
  Install via npm / pnpm / yarn:
63
65
 
64
66
  ```bash
@@ -193,12 +195,23 @@ const result = await renderMarkdownToWechat(markdown, {
193
195
  });
194
196
  ```
195
197
 
196
- The string a service returns is **substituted into `src` verbatim** โ€” a local
198
+ The string a service returns is **stored as an escaped image `src` attribute value** โ€” a local
197
199
  path, a `data:` URI, and an already-uploaded CDN URL are all valid. Omit
198
200
  `services` to use the built-in MathJax and Kroki renderers.
199
201
 
200
202
  For plain (non-generated) images, use the `resolveImage` hook instead.
201
203
 
204
+ ## Input and Result Contracts
205
+
206
+ - `siteUrl`, when supplied, must be an absolute HTTP(S) URL without credentials. Invalid values throw `TypeError` before rendering begins. Root-relative links resolve against the URL origin; protocol-relative links are not concatenated to the base path.
207
+ - A malformed article link loses its `href` if URL resolution fails; the article text still renders.
208
+ - `resolveImage(src, alt)` receives decoded attribute values once per image, in document order. Only that image's `src` changes. Empty values or rejected callbacks retain the original source; failures add `IMAGE_RESOLVE_FAILED`.
209
+ - `result.images` and `stats.images` describe original image occurrences before resolution, including generated formula and diagram images.
210
+ - `metadata` is `Record<string, unknown>`. Front-matter must be a mapping, and `title`, `description`, and `digest` must be non-empty strings. Invalid fields produce warnings and fall back to valid fields or article text.
211
+ - Formula and Mermaid rendering respects Markdown token boundaries. Code examples, escaped dollar signs, and raw HTML are preserved. Mermaid supports backtick and tilde code fences. Failed formulas remain literal text; failed diagrams become code blocks.
212
+
213
+ See [the major-version migration guide](docs/migration-v2.md) for compatibility changes.
214
+
202
215
  ## ๐Ÿšข Release Workflow
203
216
 
204
217
  Releases from `main` publish to npm using trusted publishing and GitHub Packages using `GITHUB_TOKEN`. A package that has never been published to npm must be bootstrapped manually because it has no npm settings page yet:
@@ -221,6 +234,8 @@ The workflow uses GitHub Actions OIDC and requires no npm publish token. Future
221
234
 
222
235
  ## ๐Ÿงช Testing & Verification
223
236
 
237
+ Default tests use checked-in original fixtures and never discover neighboring repositories or hidden worktrees. To opt into an additional external corpus, set `WECHAT_MARKDOWN_POSTS_DIR` to its article directory. Missing or empty selected directories fail verification.
238
+
224
239
  ```bash
225
240
  # Run unit tests
226
241
  npm test
@@ -228,7 +243,7 @@ npm test
228
243
  # Run tests in watch mode
229
244
  npm run test:watch
230
245
 
231
- # Static type check
246
+ # Static type check (source and tests)
232
247
  npm run typecheck
233
248
 
234
249
  # Code style lint
@@ -236,6 +251,13 @@ npm run lint
236
251
 
237
252
  # Check production dependencies security
238
253
  npm run audit:prod
254
+
255
+ # Check formatting and packed consumer behavior
256
+ npm run format:check
257
+ npm run build
258
+ pack_dir=$(mktemp -d)
259
+ npm pack --ignore-scripts --pack-destination "$pack_dir"
260
+ npm run verify:package -- "$pack_dir"/*.tgz
239
261
  ```
240
262
 
241
263
  ## ๐Ÿ› ๏ธ Build
@@ -253,4 +275,3 @@ ISC ยฉ [RbBtSn0w](https://github.com/RbBtSn0w)
253
275
  - [doocs/md](https://github.com/doocs/md) (MIT License) - Industry standard WeChat Markdown editor inspiring our syntax highlighting styles and WeChat Webview layout hardening rules.
254
276
  - [highlight.js](https://highlightjs.org/) (BSD 3-Clause) - Universal code syntax highlighter.
255
277
  - [juice](https://github.com/Automattic/juice) (MIT License) - CSS inliner for HTML emails and WeChat articles.
256
-
package/dist/engine.d.ts CHANGED
@@ -13,14 +13,6 @@ export declare class WechatMarkdownEngine {
13
13
  * Parse Front-matter and extract YAML metadata if present
14
14
  */
15
15
  private extractFrontmatter;
16
- /**
17
- * Process and render LaTeX formulas in Markdown to images
18
- */
19
- private processFormulas;
20
- /**
21
- * Process Mermaid code blocks to images with degradation support
22
- */
23
- private processMermaid;
24
16
  /**
25
17
  * Main render method: converts Markdown string into WeChat-ready HTML
26
18
  */
@@ -1 +1 @@
1
- {"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,YAAY,EAKb,MAAM,SAAS,CAAC;AA8BjB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,eAAe,CAAC,CAAuB;IAC/C,OAAO,CAAC,eAAe,CAAC,CAAuB;IAE/C;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B;;OAEG;YACW,eAAe;IA6D7B;;OAEG;YACW,cAAc;IAkC5B;;OAEG;IACG,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;CAqMxF;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,YAAY,CAAC,CAGvB"}
1
+ {"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,aAAa,EACb,YAAY,EAKb,MAAM,SAAS,CAAC;AAoDjB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,eAAe,CAAC,CAAuB;IAC/C,OAAO,CAAC,eAAe,CAAC,CAAuB;IAE/C;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgC1B;;OAEG;IACG,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;CAkVxF;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,YAAY,CAAC,CAGvB"}
package/dist/engine.js CHANGED
@@ -6,6 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.WechatMarkdownEngine = void 0;
7
7
  exports.renderMarkdownToWechat = renderMarkdownToWechat;
8
8
  const marked_1 = require("marked");
9
+ const cheerio_1 = require("cheerio");
10
+ const htmlparser2_1 = require("htmlparser2");
11
+ const errors_1 = require("./errors");
12
+ const urls_1 = require("./urls");
9
13
  const yaml_1 = __importDefault(require("yaml"));
10
14
  const footnotes_1 = require("./plugins/footnotes");
11
15
  const code_decorator_1 = require("./plugins/code-decorator");
@@ -30,6 +34,34 @@ function escapeHtmlAttribute(value) {
30
34
  .replace(/</g, '&lt;')
31
35
  .replace(/>/g, '&gt;');
32
36
  }
37
+ /** Locate delimiters without treating an escaped dollar as the end of TeX. */
38
+ function mathMatch(src, display) {
39
+ const delimiter = display ? '$$' : '$';
40
+ if (!src.startsWith(delimiter) || (!display && src.startsWith('$$')))
41
+ return;
42
+ let backslashes = 0;
43
+ for (let index = delimiter.length; index < src.length; index++) {
44
+ const char = src[index];
45
+ if (!display && char === '\n')
46
+ return;
47
+ const escaped = backslashes % 2 === 1;
48
+ backslashes = char === '\\' ? backslashes + 1 : 0;
49
+ if (escaped || !src.startsWith(delimiter, index))
50
+ continue;
51
+ if (!display && (src[index - 1] === '$' || src[index + 1] === '$'))
52
+ continue;
53
+ const end = index + delimiter.length;
54
+ if (display && !/^(?:[ \t]*\n|$)/.test(src.slice(end)))
55
+ continue;
56
+ const body = src.slice(delimiter.length, index);
57
+ const expression = body.trim();
58
+ if (!expression || (!display && /^\d+(\.\d+)?$/.test(expression)))
59
+ return;
60
+ if (!display && (/^\s/.test(body) || /\s$/.test(body) || /\d/.test(src[end] ?? '')))
61
+ continue;
62
+ return { raw: src.slice(0, end), expression };
63
+ }
64
+ }
33
65
  class WechatMarkdownEngine {
34
66
  formulaRenderer;
35
67
  mermaidRenderer;
@@ -53,101 +85,33 @@ class WechatMarkdownEngine {
53
85
  /**
54
86
  * Parse Front-matter and extract YAML metadata if present
55
87
  */
56
- extractFrontmatter(content) {
57
- const frontmatterRegex = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
58
- const match = content.match(frontmatterRegex);
59
- if (match) {
60
- try {
61
- const parsed = yaml_1.default.parse(match[1]) || {};
62
- return {
63
- metadata: parsed,
64
- markdown: match[2],
65
- };
66
- }
67
- catch {
68
- // Return original if parsing fails
69
- return { metadata: {}, markdown: content };
70
- }
71
- }
72
- return { metadata: {}, markdown: content };
73
- }
74
- /**
75
- * Process and render LaTeX formulas in Markdown to images
76
- */
77
- async processFormulas(markdown, diagnostics, renderer) {
78
- let count = 0;
79
- let processed = markdown;
80
- // 1. Block formulas: $$...$$
81
- const blockFormulaRegex = /\$\$([\s\S]+?)\$\$/g;
82
- const blockMatches = [...processed.matchAll(blockFormulaRegex)];
83
- for (const match of blockMatches) {
84
- const fullMatch = match[0];
85
- const expr = match[1].trim();
86
- try {
87
- const imagePath = await renderer.renderToImage(expr, true);
88
- count++;
89
- processed = processed.replace(fullMatch, `\n\n<p class="wm-figure"><img src="${escapeHtmlAttribute(imagePath)}" alt="formula" class="wm-formula-block" /></p>\n\n`);
90
- }
91
- catch (err) {
92
- diagnostics.push({
93
- code: 'FORMULA_RENDER_FAILED',
94
- severity: 'warning',
95
- message: `Failed to render block formula: ${err.message}`,
96
- });
97
- }
98
- }
99
- // 2. Inline formulas: $...$ (avoid escaping currency $10)
100
- const inlineFormulaRegex = /(?<!\$)\$(?!\$)([^\n$]+?)(?<!\$)\$(?!\$)/g;
101
- const inlineMatches = [...processed.matchAll(inlineFormulaRegex)];
102
- for (const match of inlineMatches) {
103
- const fullMatch = match[0];
104
- const expr = match[1].trim();
105
- // Skip simple price formats like $10 or $20.50
106
- if (/^\d+(\.\d+)?$/.test(expr)) {
107
- continue;
108
- }
109
- try {
110
- const imagePath = await renderer.renderToImage(expr, false);
111
- count++;
112
- processed = processed.replace(fullMatch, `<img src="${escapeHtmlAttribute(imagePath)}" alt="formula" class="wm-formula-inline" />`);
113
- }
114
- catch (err) {
88
+ extractFrontmatter(content, diagnostics) {
89
+ const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
90
+ if (!match)
91
+ return { metadata: {}, markdown: content };
92
+ try {
93
+ const parsed = yaml_1.default.parse(match[1]);
94
+ if (parsed === null ||
95
+ typeof parsed !== 'object' ||
96
+ Array.isArray(parsed) ||
97
+ ![Object.prototype, null].includes(Object.getPrototypeOf(parsed))) {
115
98
  diagnostics.push({
116
- code: 'FORMULA_RENDER_FAILED',
99
+ code: 'FRONTMATTER_INVALID',
117
100
  severity: 'warning',
118
- message: `Failed to render inline formula: ${err.message}`,
101
+ message: 'Frontmatter must be a plain mapping.',
119
102
  });
103
+ return { metadata: {}, markdown: match[2] };
120
104
  }
105
+ return { metadata: parsed, markdown: match[2] };
121
106
  }
122
- return { markdown: processed, count };
123
- }
124
- /**
125
- * Process Mermaid code blocks to images with degradation support
126
- */
127
- async processMermaid(markdown, diagnostics, renderer) {
128
- let count = 0;
129
- let processed = markdown;
130
- const mermaidRegex = /```mermaid\r?\n([\s\S]*?)```/g;
131
- const matches = [...processed.matchAll(mermaidRegex)];
132
- for (const match of matches) {
133
- const fullMatch = match[0];
134
- const code = match[1];
135
- try {
136
- const imagePath = await renderer.renderToImage(code);
137
- count++;
138
- processed = processed.replace(fullMatch, `\n\n<p class="wm-figure"><img src="${escapeHtmlAttribute(imagePath)}" alt="mermaid-diagram" class="wm-mermaid" /></p>\n\n`);
139
- }
140
- catch (err) {
141
- diagnostics.push({
142
- code: 'MERMAID_RENDER_FAILED',
143
- severity: 'warning',
144
- message: `Failed to render Mermaid diagram, falling back to code block: ${err.message}`,
145
- });
146
- // Degrade to standard code block
147
- processed = processed.replace(fullMatch, `\`\`\`text\n${code}\n\`\`\``);
148
- }
107
+ catch (error) {
108
+ diagnostics.push({
109
+ code: 'FRONTMATTER_INVALID',
110
+ severity: 'warning',
111
+ message: `Failed to parse frontmatter: ${(0, errors_1.errorMessage)(error)}`,
112
+ });
113
+ return { metadata: {}, markdown: content };
149
114
  }
150
- return { markdown: processed, count };
151
115
  }
152
116
  /**
153
117
  * Main render method: converts Markdown string into WeChat-ready HTML
@@ -156,22 +120,37 @@ class WechatMarkdownEngine {
156
120
  const diagnostics = [];
157
121
  const images = [];
158
122
  const { theme = 'tech', customCss, siteUrl, footnoteLinks = true, macCodeBlock = true, tableScroller = true, gfmAlerts = true, taskLists = true, imageFigures = true, highlightTheme = 'atom-one-dark', showLineNumber = false, renderMath = true, renderMermaid = true, resolveImage, services, } = options;
123
+ (0, urls_1.validateSiteUrl)(siteUrl);
159
124
  // Structural CSS for the markup each enabled capability emits. Layered
160
125
  // under the theme so a theme that styles nothing still renders correctly,
161
126
  // and a theme that styles everything keeps full control.
162
127
  const baseCss = [];
163
128
  // 1. Extract Frontmatter
164
- const { metadata, markdown } = this.extractFrontmatter(markdownInput);
129
+ const { metadata, markdown } = this.extractFrontmatter(markdownInput, diagnostics);
165
130
  let workingMarkdown = markdown;
166
131
  // 2. Extract and extract Title / Digest
167
- let title = metadata.title || '';
132
+ const fields = {};
133
+ for (const key of ['title', 'description', 'digest']) {
134
+ if (!(key in metadata))
135
+ continue;
136
+ const value = metadata[key];
137
+ if (typeof value === 'string' && value.trim())
138
+ fields[key] = value;
139
+ else
140
+ diagnostics.push({
141
+ code: 'FRONTMATTER_INVALID',
142
+ severity: 'warning',
143
+ message: `Frontmatter ${key} must be a nonempty string.`,
144
+ });
145
+ }
146
+ let title = fields.title || '';
168
147
  if (!title) {
169
148
  const titleMatch = workingMarkdown.match(/^#\s+(.+)$/m);
170
149
  if (titleMatch) {
171
150
  title = titleMatch[1].trim();
172
151
  }
173
152
  }
174
- let digest = metadata.description || metadata.digest || '';
153
+ let digest = fields.description || fields.digest || '';
175
154
  if (!digest) {
176
155
  // Find first non-empty paragraph
177
156
  const cleanPara = workingMarkdown
@@ -190,26 +169,16 @@ class WechatMarkdownEngine {
190
169
  workingMarkdown = footnoteResult.markdown;
191
170
  footnotes = footnoteResult.footnotes;
192
171
  }
193
- // 4. Process LaTeX Math
194
172
  let formulaCount = 0;
195
- if (renderMath) {
196
- baseCss.push(styles_1.formulaBaseCss);
197
- const formulaResult = await this.processFormulas(workingMarkdown, diagnostics, this.getFormulaRenderer(services?.formulaRenderer));
198
- workingMarkdown = formulaResult.markdown;
199
- formulaCount = formulaResult.count;
200
- }
201
- // 5. Process Mermaid Diagrams
202
173
  let mermaidCount = 0;
203
- if (renderMermaid) {
174
+ if (renderMath)
175
+ baseCss.push(styles_1.formulaBaseCss);
176
+ if (renderMermaid)
204
177
  baseCss.push(styles_1.mermaidBaseCss);
205
- const mermaidResult = await this.processMermaid(workingMarkdown, diagnostics, this.getMermaidRenderer(services?.mermaidRenderer));
206
- workingMarkdown = mermaidResult.markdown;
207
- mermaidCount = mermaidResult.count;
208
- }
209
178
  // Base code highlighting CSS
210
179
  baseCss.push((0, highlighter_1.getHighlightCss)(highlightTheme));
211
180
  // 6. Parse Markdown to HTML via marked with syntax highlighting
212
- const markedRenderer = new marked_1.marked.Renderer();
181
+ const markedRenderer = new marked_1.Renderer();
213
182
  markedRenderer.code = (code, infostring) => {
214
183
  const lang = (infostring || '').match(/^\S*/)?.[0] || '';
215
184
  const { highlighted, language } = (0, highlighter_1.highlightCode)(code, lang, showLineNumber);
@@ -219,11 +188,162 @@ class WechatMarkdownEngine {
219
188
  : ' class="hljs"';
220
189
  return `<pre><code${langClass}>${highlighted}</code></pre>\n`;
221
190
  };
222
- let rawHtml = await marked_1.marked.parse(workingMarkdown, {
223
- gfm: true,
224
- breaks: false,
225
- renderer: markedRenderer,
191
+ const parser = new marked_1.Marked({ gfm: true, breaks: false, renderer: markedRenderer });
192
+ let inlineMath = false;
193
+ let htmlDepth = 0;
194
+ if (renderMath) {
195
+ parser.use({
196
+ extensions: [
197
+ {
198
+ name: 'mathBlock',
199
+ level: 'block',
200
+ start(src) {
201
+ return /^ {0,3}\$\$/m.exec(src)?.index;
202
+ },
203
+ tokenizer(src) {
204
+ const indentation = /^ {0,3}(?=\$\$)/.exec(src)?.[0] ?? '';
205
+ const match = mathMatch(src.slice(indentation.length), true);
206
+ if (match)
207
+ return {
208
+ type: 'mathBlock',
209
+ raw: indentation + match.raw,
210
+ expression: match.expression,
211
+ display: true,
212
+ };
213
+ },
214
+ renderer(token) {
215
+ return token.html ?? escapeHtmlAttribute(token.raw);
216
+ },
217
+ },
218
+ {
219
+ name: 'mathInline',
220
+ level: 'inline',
221
+ start(src) {
222
+ if (inlineMath && !htmlDepth)
223
+ return src.indexOf('$');
224
+ },
225
+ tokenizer(src) {
226
+ if (!inlineMath || htmlDepth)
227
+ return;
228
+ const match = mathMatch(src, false);
229
+ if (match) {
230
+ return {
231
+ type: 'mathInline',
232
+ raw: match.raw,
233
+ expression: match.expression,
234
+ display: false,
235
+ };
236
+ }
237
+ },
238
+ renderer(token) {
239
+ return token.html ?? escapeHtmlAttribute(token.raw);
240
+ },
241
+ },
242
+ ],
243
+ });
244
+ }
245
+ const tokens = parser.lexer(workingMarkdown);
246
+ if (renderMath) {
247
+ const htmlScope = new htmlparser2_1.Parser({
248
+ onopentag() {
249
+ htmlDepth++;
250
+ },
251
+ onclosetag() {
252
+ htmlDepth--;
253
+ },
254
+ });
255
+ parser.use({
256
+ tokenizer: {
257
+ tag(src) {
258
+ const token = marked_1.Tokenizer.prototype.tag.call(this, src);
259
+ if (token)
260
+ htmlScope.write(token.raw);
261
+ return token;
262
+ },
263
+ },
264
+ });
265
+ const inlineLexer = new parser.Lexer(parser.defaults);
266
+ inlineLexer.tokens.links = tokens.links;
267
+ inlineMath = true;
268
+ // Marked defers inline lexing until every block has been read. Re-lex inline
269
+ // content in document order so block and inline HTML share the same scope.
270
+ const tokenizeInlineContent = (blocks) => {
271
+ for (const token of blocks) {
272
+ switch (token.type) {
273
+ case 'html':
274
+ htmlScope.write(token.raw);
275
+ break;
276
+ case 'paragraph':
277
+ case 'heading':
278
+ case 'text':
279
+ Object.assign(token, { tokens: inlineLexer.inlineTokens(token.text) });
280
+ break;
281
+ case 'blockquote':
282
+ tokenizeInlineContent(token.tokens ?? []);
283
+ break;
284
+ case 'list':
285
+ for (const item of token.items)
286
+ tokenizeInlineContent(item.tokens);
287
+ break;
288
+ case 'table':
289
+ for (const cell of [...token.header, ...token.rows.flat()]) {
290
+ cell.tokens = inlineLexer.inlineTokens(cell.text);
291
+ }
292
+ break;
293
+ case 'mathBlock':
294
+ token.inHtml = htmlDepth > 0;
295
+ break;
296
+ }
297
+ }
298
+ };
299
+ tokenizeInlineContent(tokens);
300
+ htmlScope.end();
301
+ }
302
+ const mediaTokens = [];
303
+ parser.walkTokens(tokens, (token) => {
304
+ mediaTokens.push(token);
226
305
  });
306
+ for (const token of mediaTokens) {
307
+ if (token.type === 'mathBlock' || token.type === 'mathInline') {
308
+ const media = token;
309
+ if (media.inHtml)
310
+ continue;
311
+ try {
312
+ const image = await this.getFormulaRenderer(services?.formulaRenderer).renderToImage(media.expression, media.display);
313
+ formulaCount++;
314
+ const img = `<img src="${escapeHtmlAttribute(image)}" alt="formula" class="wm-formula-${media.display ? 'block' : 'inline'}" />`;
315
+ media.html = media.display ? `<p class="wm-figure">${img}</p>\n` : img;
316
+ }
317
+ catch (error) {
318
+ diagnostics.push({
319
+ code: 'FORMULA_RENDER_FAILED',
320
+ severity: 'warning',
321
+ message: `Failed to render ${media.display ? 'block' : 'inline'} formula: ${(0, errors_1.errorMessage)(error)}`,
322
+ });
323
+ }
324
+ }
325
+ else if (renderMermaid &&
326
+ token.type === 'code' &&
327
+ token.lang?.split(/\s+/)[0] === 'mermaid') {
328
+ try {
329
+ const image = await this.getMermaidRenderer(services?.mermaidRenderer).renderToImage(token.text);
330
+ mermaidCount++;
331
+ Object.assign(token, {
332
+ type: 'html',
333
+ text: `<p class="wm-figure"><img src="${escapeHtmlAttribute(image)}" alt="mermaid-diagram" class="wm-mermaid" /></p>\n`,
334
+ });
335
+ }
336
+ catch (error) {
337
+ diagnostics.push({
338
+ code: 'MERMAID_RENDER_FAILED',
339
+ severity: 'warning',
340
+ message: `Failed to render Mermaid diagram, falling back to code block: ${(0, errors_1.errorMessage)(error)}`,
341
+ });
342
+ token.lang = 'text';
343
+ }
344
+ }
345
+ }
346
+ let rawHtml = parser.parser(tokens);
227
347
  // 7. Process GFM Alerts
228
348
  if (gfmAlerts) {
229
349
  baseCss.push(alerts_1.alertsBaseCss);
@@ -253,33 +373,30 @@ class WechatMarkdownEngine {
253
373
  if (footnotes.length > 0) {
254
374
  rawHtml += '\n' + (0, footnotes_1.renderFootnotesHtml)(footnotes);
255
375
  }
256
- // 11. Async Image Resolver Hook & Collect Images
257
- const imgRegex = /<img\s+[^>]*src="([^"]+)"[^>]*>/g;
258
- let match;
259
- while ((match = imgRegex.exec(rawHtml)) !== null) {
260
- images.push(match[1]);
261
- }
262
- if (resolveImage) {
263
- const replacements = [];
264
- for (const src of images) {
265
- try {
266
- const resolved = await resolveImage(src);
267
- if (resolved && resolved !== src) {
268
- replacements.push([src, resolved]);
269
- }
270
- }
271
- catch (err) {
272
- diagnostics.push({
273
- code: 'IMAGE_RESOLVE_FAILED',
274
- severity: 'warning',
275
- message: `Failed to resolve image ${src}: ${err.message}`,
276
- });
277
- }
376
+ // Resolve actual image nodes individually; identical sources may have distinct captions.
377
+ const fragment = (0, cheerio_1.load)(rawHtml, {}, false);
378
+ for (const node of fragment('img').toArray()) {
379
+ const image = fragment(node);
380
+ const src = image.attr('src');
381
+ if (src === undefined)
382
+ continue;
383
+ images.push(src);
384
+ if (!resolveImage)
385
+ continue;
386
+ try {
387
+ const resolved = await resolveImage(src, image.attr('alt'));
388
+ if (resolved)
389
+ image.attr('src', resolved);
278
390
  }
279
- for (const [original, target] of replacements) {
280
- rawHtml = rawHtml.split(original).join(target);
391
+ catch (error) {
392
+ diagnostics.push({
393
+ code: 'IMAGE_RESOLVE_FAILED',
394
+ severity: 'warning',
395
+ message: `Failed to resolve image ${src}: ${(0, errors_1.errorMessage)(error)}`,
396
+ });
281
397
  }
282
398
  }
399
+ rawHtml = fragment.html();
283
400
  // 12. Inline CSS & WeChat DOM Patching
284
401
  const finalHtml = (0, inliner_1.inlineWechatCss)(rawHtml, {
285
402
  theme,
@@ -1 +1 @@
1
- {"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ /** JavaScript services may reject with values other than Error instances. */
2
+ export declare function errorMessage(error: unknown): string;
3
+ //# sourceMappingURL=errors.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEnD"}
package/dist/errors.js ADDED
@@ -0,0 +1,8 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.errorMessage = errorMessage;
4
+ /** JavaScript services may reject with values other than Error instances. */
5
+ function errorMessage(error) {
6
+ return error instanceof Error ? error.message : String(error);
7
+ }
8
+ //# sourceMappingURL=errors.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;AACA,oCAEC;AAHD,6EAA6E;AAC7E,SAAgB,YAAY,CAAC,KAAc;IACzC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAChE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"inliner.d.ts","sourceRoot":"","sources":["../../src/inliner/inliner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAiCjF"}
1
+ {"version":3,"file":"inliner.d.ts","sourceRoot":"","sources":["../../src/inliner/inliner.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAuCjF"}
@@ -5,18 +5,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.inlineWechatCss = inlineWechatCss;
7
7
  const juice_1 = __importDefault(require("juice"));
8
+ const cheerio_1 = require("cheerio");
9
+ const urls_1 = require("../urls");
8
10
  const dom_patcher_1 = require("./dom-patcher");
9
11
  const themes_1 = require("../themes");
10
12
  function inlineWechatCss(html, options = {}) {
11
- // 1. Sanitize
12
- let processedHtml = (0, dom_patcher_1.sanitizeWechatHtml)(html);
13
- // 2. Resolve relative URLs if siteUrl is specified
14
- if (options.siteUrl) {
15
- const base = options.siteUrl.replace(/\/$/, '');
16
- processedHtml = processedHtml.replace(/(<a\s+[^>]*href=")(\/[^"]*)(")/g, (match, p1, p2, p3) => {
17
- return `${p1}${base}${p2}${p3}`;
13
+ const base = (0, urls_1.validateSiteUrl)(options.siteUrl);
14
+ let resolvedHtml = html;
15
+ if (base) {
16
+ const fragment = (0, cheerio_1.load)(html, {}, false);
17
+ fragment('a[href]').each((_, node) => {
18
+ const anchor = fragment(node);
19
+ const href = anchor.attr('href');
20
+ if (href.startsWith('/') && !href.startsWith('//')) {
21
+ try {
22
+ anchor.attr('href', new URL(href, base).href);
23
+ }
24
+ catch {
25
+ // Invalid article links lose navigation but must not discard the article.
26
+ anchor.removeAttr('href');
27
+ }
28
+ }
18
29
  });
30
+ resolvedHtml = fragment.html();
19
31
  }
32
+ const processedHtml = (0, dom_patcher_1.sanitizeWechatHtml)(resolvedHtml);
20
33
  // 3. Wrap in container for CSS matching
21
34
  const wrappedHtml = `<div class="markdown-body">${processedHtml}</div>`;
22
35
  // 4. Layer capability base CSS under the theme (and customCss on top)
@@ -1 +1 @@
1
- {"version":3,"file":"inliner.js","sourceRoot":"","sources":["../../src/inliner/inliner.ts"],"names":[],"mappings":";;;;;AAiBA,0CAiCC;AAlDD,kDAA0B;AAC1B,+CAAkG;AAClG,sCAAqC;AAerC,SAAgB,eAAe,CAAC,IAAY,EAAE,UAAyB,EAAE;IACvE,cAAc;IACd,IAAI,aAAa,GAAG,IAAA,gCAAkB,EAAC,IAAI,CAAC,CAAC;IAE7C,mDAAmD;IACnD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChD,aAAa,GAAG,aAAa,CAAC,OAAO,CACnC,iCAAiC,EACjC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;YACpB,OAAO,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;QAClC,CAAC,CACF,CAAC;IACJ,CAAC;IAED,wCAAwC;IACxC,MAAM,WAAW,GAAG,8BAA8B,aAAa,QAAQ,CAAC;IAExE,sEAAsE;IACtE,MAAM,QAAQ,GAAG,IAAA,iBAAQ,EAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE9D,wBAAwB;IACxB,MAAM,OAAO,GAAG,eAAK,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE;QACpD,oBAAoB,EAAE,IAAI;QAC1B,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;IAEH,gDAAgD;IAChD,IAAI,SAAS,GAAG,IAAA,mCAAqB,EAAC,OAAO,CAAC,CAAC;IAC/C,SAAS,GAAG,IAAA,oCAAsB,EAAC,SAAS,CAAC,CAAC;IAE9C,OAAO,SAAS,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"inliner.js","sourceRoot":"","sources":["../../src/inliner/inliner.ts"],"names":[],"mappings":";;;;;AAmBA,0CAuCC;AA1DD,kDAA0B;AAC1B,qCAA+B;AAC/B,kCAA0C;AAC1C,+CAAkG;AAClG,sCAAqC;AAerC,SAAgB,eAAe,CAAC,IAAY,EAAE,UAAyB,EAAE;IACvE,MAAM,IAAI,GAAG,IAAA,sBAAe,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,YAAY,GAAG,IAAI,CAAC;IACxB,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,QAAQ,GAAG,IAAA,cAAI,EAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QACvC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;YACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC;YAClC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnD,IAAI,CAAC;oBACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;gBAChD,CAAC;gBAAC,MAAM,CAAC;oBACP,0EAA0E;oBAC1E,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACH,YAAY,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IACD,MAAM,aAAa,GAAG,IAAA,gCAAkB,EAAC,YAAY,CAAC,CAAC;IAEvD,wCAAwC;IACxC,MAAM,WAAW,GAAG,8BAA8B,aAAa,QAAQ,CAAC;IAExE,sEAAsE;IACtE,MAAM,QAAQ,GAAG,IAAA,iBAAQ,EAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE9D,wBAAwB;IACxB,MAAM,OAAO,GAAG,eAAK,CAAC,aAAa,CAAC,WAAW,EAAE,GAAG,EAAE;QACpD,oBAAoB,EAAE,IAAI;QAC1B,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;IAEH,gDAAgD;IAChD,IAAI,SAAS,GAAG,IAAA,mCAAqB,EAAC,OAAO,CAAC,CAAC;IAC/C,SAAS,GAAG,IAAA,oCAAsB,EAAC,SAAS,CAAC,CAAC;IAE9C,OAAO,SAAS,CAAC;AACnB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"mermaid.d.ts","sourceRoot":"","sources":["../../src/media/mermaid.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;gBAEf,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB;IAS9D,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAKpC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAInC;;OAEG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM/B,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CA2D1D"}
1
+ {"version":3,"file":"mermaid.d.ts","sourceRoot":"","sources":["../../src/media/mermaid.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;gBAEf,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB;IAS9D,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAKpC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAInC;;OAEG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM/B,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAyD1D"}
@@ -11,6 +11,7 @@ const crypto_1 = __importDefault(require("crypto"));
11
11
  const axios_1 = __importDefault(require("axios"));
12
12
  const pako_1 = __importDefault(require("pako"));
13
13
  const sharp_1 = __importDefault(require("sharp"));
14
+ const errors_1 = require("../errors");
14
15
  class MermaidRenderer {
15
16
  tempDir;
16
17
  timeoutMs;
@@ -55,7 +56,7 @@ class MermaidRenderer {
55
56
  `https://kroki.io/mermaid/png/${result}`,
56
57
  `https://kroki.io/mermaid/svg/${result}`,
57
58
  ];
58
- let lastError = null;
59
+ let lastError;
59
60
  for (const url of urls) {
60
61
  for (let attempt = 1; attempt <= this.maxRetries; attempt++) {
61
62
  try {
@@ -75,7 +76,7 @@ class MermaidRenderer {
75
76
  }
76
77
  catch (err) {
77
78
  lastError = err;
78
- const status = err?.response?.status;
79
+ const status = axios_1.default.isAxiosError(err) ? err.response?.status : undefined;
79
80
  // Fail fast on client errors (4xx) other than rate limiting (429)
80
81
  if (status && status >= 400 && status < 500 && status !== 429) {
81
82
  break;
@@ -87,7 +88,7 @@ class MermaidRenderer {
87
88
  }
88
89
  }
89
90
  }
90
- throw new Error(`Failed to render Mermaid diagram after retries: ${lastError?.message || 'Unknown error'}`);
91
+ throw new Error(`Failed to render Mermaid diagram after retries: ${(0, errors_1.errorMessage)(lastError)}`);
91
92
  }
92
93
  }
93
94
  exports.MermaidRenderer = MermaidRenderer;
@@ -1 +1 @@
1
- {"version":3,"file":"mermaid.js","sourceRoot":"","sources":["../../src/media/mermaid.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mermaid.js","sourceRoot":"","sources":["../../src/media/mermaid.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"footnotes.d.ts","sourceRoot":"","sources":["../../src/plugins/footnotes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,kjBAkC5B,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,GACf,sBAAsB,CAgDxB;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,CAiBrE"}
1
+ {"version":3,"file":"footnotes.d.ts","sourceRoot":"","sources":["../../src/plugins/footnotes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,kjBAkC5B,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,GACf,sBAAsB,CAqDxB;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,CAiBrE"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.footnotesBaseCss = void 0;
4
4
  exports.processMarkdownFootnotes = processMarkdownFootnotes;
5
5
  exports.renderFootnotesHtml = renderFootnotesHtml;
6
+ const urls_1 = require("../urls");
6
7
  /**
7
8
  * Structural styling for the markup this plugin emits. See the note on
8
9
  * codeDecoratorBaseCss about the no-!important rule.
@@ -46,6 +47,7 @@ exports.footnotesBaseCss = `
46
47
  }
47
48
  `;
48
49
  function processMarkdownFootnotes(markdown, siteUrl) {
50
+ const base = (0, urls_1.validateSiteUrl)(siteUrl);
49
51
  const footnotes = [];
50
52
  const urlMap = new Map();
51
53
  // Helper to normalize URL
@@ -57,7 +59,13 @@ function processMarkdownFootnotes(markdown, siteUrl) {
57
59
  if (/^https?:\/\/([a-zA-Z0-9-]+\.)*mp\.weixin\.qq\.com(\/|$)/i.test(url)) {
58
60
  return false;
59
61
  }
60
- if (siteUrl && url.startsWith(siteUrl)) {
62
+ try {
63
+ const parsed = new URL(url);
64
+ if (base && parsed.origin === base.origin)
65
+ return false;
66
+ }
67
+ catch {
68
+ // Malformed links belong to the Markdown fallback, not the footnote list.
61
69
  return false;
62
70
  }
63
71
  if (url.startsWith('/') && !url.startsWith('//')) {
@@ -1 +1 @@
1
- {"version":3,"file":"footnotes.js","sourceRoot":"","sources":["../../src/plugins/footnotes.ts"],"names":[],"mappings":";;;AAkDA,4DAmDC;AAED,kDAiBC;AAtHD;;;;;;GAMG;AACU,QAAA,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkC/B,CAAC;AAOF,SAAgB,wBAAwB,CACtC,QAAgB,EAChB,OAAgB;IAEhB,MAAM,SAAS,GAAmB,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEzC,0BAA0B;IAC1B,MAAM,aAAa,GAAG,CAAC,GAAW,EAAW,EAAE;QAC7C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACtF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,oEAAoE;QACpE,IAAI,0DAA0D,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACzE,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,OAAO,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,OAAO,KAAK,CAAC,CAAC,sBAAsB;QACtC,CAAC;QACD,OAAO,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,gEAAgE;IAChE,MAAM,SAAS,GAAG,4DAA4D,CAAC;IAE/E,MAAM,mBAAmB,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAC3E,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACvB,SAAS,CAAC,IAAI,CAAC;gBACb,KAAK;gBACL,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE;gBAClB,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE;aAChB,CAAC,CAAC;QACL,CAAC;QAED,OAAO,GAAG,IAAI,8BAA8B,KAAK,SAAS,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,mBAAmB;QAC7B,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAgB,mBAAmB,CAAC,SAAyB;IAC3D,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,SAAS,GAAG,SAAS;SACxB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,OAAO,qCAAqC,IAAI,CAAC,KAAK,cAAc,IAAI,CAAC,KAAK,gCAAgC,IAAI,CAAC,GAAG,aAAa,CAAC;IACtI,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO;;;IAGL,SAAS;;CAEZ,CAAC,IAAI,EAAE,CAAC;AACT,CAAC"}
1
+ {"version":3,"file":"footnotes.js","sourceRoot":"","sources":["../../src/plugins/footnotes.ts"],"names":[],"mappings":"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"}
@@ -65,7 +65,7 @@ export interface RenderResult {
65
65
  html: string;
66
66
  title: string;
67
67
  digest: string;
68
- metadata: Record<string, any>;
68
+ metadata: Record<string, unknown>;
69
69
  footnotes: FootnoteItem[];
70
70
  images: string[];
71
71
  diagnostics: DiagnosticItem[];
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC;AAErD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAEpF;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CAC/E;AAED,gFAAgF;AAChF,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CACvD;AAED,MAAM,WAAW,cAAc;IAC7B,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC;AAED,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,eAAe,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,CAAC;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,KAAK,EAAE,WAAW,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;CACb"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC;AAErD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAEpF;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CAC/E;AAED,gFAAgF;AAChF,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CACvD;AAED,MAAM,WAAW,cAAc;IAC7B,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC;AAED,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,eAAe,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,CAAC;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,KAAK,EAAE,WAAW,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;CACb"}
package/dist/urls.d.ts ADDED
@@ -0,0 +1,3 @@
1
+ /** Validate before resolving URLs so a base cannot introduce an unsafe scheme. */
2
+ export declare function validateSiteUrl(siteUrl?: string): URL | undefined;
3
+ //# sourceMappingURL=urls.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"urls.d.ts","sourceRoot":"","sources":["../src/urls.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAWjE"}
package/dist/urls.js ADDED
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.validateSiteUrl = validateSiteUrl;
4
+ /** Validate before resolving URLs so a base cannot introduce an unsafe scheme. */
5
+ function validateSiteUrl(siteUrl) {
6
+ if (siteUrl === undefined)
7
+ return undefined;
8
+ try {
9
+ const url = new URL(siteUrl);
10
+ if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password) {
11
+ throw new TypeError('Invalid siteUrl');
12
+ }
13
+ return url;
14
+ }
15
+ catch {
16
+ throw new TypeError('siteUrl must be an absolute HTTP(S) URL without credentials.');
17
+ }
18
+ }
19
+ //# sourceMappingURL=urls.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"urls.js","sourceRoot":"","sources":["../src/urls.ts"],"names":[],"mappings":";;AACA,0CAWC;AAZD,kFAAkF;AAClF,SAAgB,eAAe,CAAC,OAAgB;IAC9C,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC5C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YAChF,MAAM,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,SAAS,CAAC,8DAA8D,CAAC,CAAC;IACtF,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rbbtsn0w/wechat-markdown",
3
- "version": "1.7.1",
3
+ "version": "2.0.0",
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",
@@ -19,17 +19,19 @@
19
19
  "url": "git+https://github.com/RbBtSn0w/wechat-markdown.git"
20
20
  },
21
21
  "publishConfig": {
22
- "access": "public",
23
- "registry": "https://registry.npmjs.org/"
22
+ "access": "public"
24
23
  },
25
24
  "scripts": {
26
25
  "build": "tsc",
27
- "typecheck": "tsc --noEmit",
26
+ "typecheck": "tsc --noEmit && tsc -p tsconfig.test.json",
28
27
  "test": "vitest run",
29
28
  "test:watch": "vitest",
30
- "lint": "eslint 'src/**/*.{ts,js}'",
31
- "format": "prettier --write 'src/**/*.{ts,js}'",
32
- "audit:prod": "npm audit --omit=dev --audit-level=high"
29
+ "lint": "eslint 'src/**/*.ts' 'test/**/*.ts' 'scripts/**/*.{js,cjs,mjs}' --no-error-on-unmatched-pattern --max-warnings=0",
30
+ "format": "prettier --write .github/workflows/*.yml .releaserc.json package.json tsconfig*.json vitest.config.mts .eslintrc.js src/ test/ scripts/ docs/",
31
+ "audit:prod": "npm audit --omit=dev --audit-level=high",
32
+ "format:check": "prettier --check .github/workflows/*.yml .releaserc.json package.json tsconfig*.json vitest.config.mts .eslintrc.js src/ test/ scripts/ docs/",
33
+ "verify:package": "node scripts/verify-package.mjs",
34
+ "test:package": "node scripts/verify-package.mjs"
33
35
  },
34
36
  "keywords": [
35
37
  "markdown",
@@ -48,31 +50,36 @@
48
50
  "dependencies": {
49
51
  "axios": "^1.13.6",
50
52
  "highlight.js": "^11.12.0",
51
- "juice": "^10.0.1",
53
+ "juice": "^12.2.0",
52
54
  "marked": "^12.0.2",
53
55
  "mathjax-full": "^3.2.2",
54
- "pako": "^2.1.0",
55
- "sanitize-html": "^2.17.0",
56
+ "pako": "^3.0.2",
57
+ "sanitize-html": "^2.18.1",
56
58
  "sharp": "^0.35.5",
57
- "yaml": "^2.8.2"
59
+ "yaml": "^2.8.2",
60
+ "cheerio": "^1.2.0",
61
+ "htmlparser2": "^12.0.0"
58
62
  },
59
63
  "overrides": {
60
64
  "@xmldom/xmldom": "^0.9.12",
61
65
  "source-map-js": "^1.2.2",
62
66
  "ip-address": "^10.7.3",
63
- "undici": "^7.30.0"
67
+ "undici": "^7.30.1",
68
+ "npm": "12.2.2",
69
+ "@actions/http-client": {
70
+ "undici": "^6.29.1"
71
+ },
72
+ "node-gyp": {
73
+ "undici": "^6.29.1"
74
+ },
75
+ "@typescript-eslint/typescript-estree": {
76
+ "minimatch": "11.0.5"
77
+ }
64
78
  },
65
79
  "devDependencies": {
66
- "@semantic-release/changelog": "^6.0.3",
67
- "@semantic-release/exec": "^7.1.0",
68
- "@semantic-release/git": "^10.0.1",
69
80
  "@semantic-release/github": "^12.0.0",
70
- "@semantic-release/npm": "^13.1.5",
71
- "@types/marked": "^6.0.0",
72
- "@types/node": "^20.19.37",
73
- "@types/pako": "^2.0.4",
81
+ "@types/node": "^22.0.0",
74
82
  "@types/sanitize-html": "^2.16.0",
75
- "@types/yaml": "^1.9.7",
76
83
  "@typescript-eslint/eslint-plugin": "^7.18.0",
77
84
  "@typescript-eslint/parser": "^7.18.0",
78
85
  "eslint": "^8.57.1",
@@ -80,7 +87,17 @@
80
87
  "prettier": "^3.8.1",
81
88
  "semantic-release": "^25.0.0",
82
89
  "typescript": "^5.9.3",
83
- "vitest": "^4.1.11"
90
+ "vitest": "^4.1.11",
91
+ "@commitlint/lint": "21.2.4",
92
+ "@commitlint/config-conventional": "21.2.4",
93
+ "import-from-esm": "2.0.0",
94
+ "publint": "0.3.25",
95
+ "conventional-changelog-conventionalcommits": "9.3.0",
96
+ "@semantic-release/commit-analyzer": "^13.0.1",
97
+ "@semantic-release/release-notes-generator": "^14.1.1"
84
98
  },
85
- "type": "commonjs"
99
+ "type": "commonjs",
100
+ "engines": {
101
+ "node": ">=22.14.0"
102
+ }
86
103
  }