confluence-md-sync 0.11.0 → 0.11.1

package/dist/markdown/render.d.ts

@@ -55,6 +55,12 @@ export interface RenderStorageOptions {
         title: string;
         space?: string;
     } | null;
+    /** Local Markdown assets: attachment on this page, or a canonical repository URL. */
+    resourceResolver?: (href: string) => {
+        attachment: string;
+    } | {
+        url: string;
+    } | null;
 }
 export declare class MissingAttachmentUrlError extends Error {
     constructor(message: string);

package/dist/markdown/render.js

@@ -120,22 +120,40 @@ export function renderToStorage(markdown, urls, opts = {}) {
     // манифеста). Только markdown-ссылки (`<a href>` из markdown-it); плейсхолдеры
     // {{file:}}/{{img:}} рендерятся ниже и сюда ещё не попали. Внешние URL/якоря
     // резолвер отсекает (возвращает null) — они остаются как есть.
-    if (opts.linkResolver) {
-        const resolve = opts.linkResolver;
-        html = html.replace(/<a href="([^"]*)">([\s\S]*?)<\/a>/g, (full, href, inner) => {
+    if (opts.resourceResolver) {
+        html = html.replace(/<img\b[^>]*\bsrc="([^"]*)"[^>]*\/?>/g, (full, href) => {
             const decoded = unescapeHtml(href);
             if (/^(?:[a-z][a-z0-9+.-]*:|#|\/\/)/i.test(decoded))
-                return full; // http(s):, mailto:, #anchor
-            const target = resolve(decoded);
+                return full;
+            const target = opts.resourceResolver(decoded);
             if (!target)
                 return full;
-            const text = unescapeHtml(inner.replace(/<[^>]+>/g, '')).trim();
-            const attrs = [];
-            if (target.space)
-                attrs.push(['space', target.space]);
-            if (text)
-                attrs.push(['text', text]);
-            return renderPageLink(target.title, attrs);
+            if ('url' in target)
+                return full.replace(`src="${href}"`, `src="${escapeXmlAttr(target.url)}"`);
+            const alt = /\balt="([^"]*)"/.exec(full)?.[1];
+            return `<ac:image${alt ? ` ac:alt="${escapeXmlAttr(unescapeHtml(alt))}"` : ''}><ri:attachment ri:filename="${escapeXmlAttr(target.attachment)}" /></ac:image>`;
+        });
+    }
+    if (opts.linkResolver || opts.resourceResolver) {
+        html = html.replace(/<a href="([^"]*)"(?:\s+title="[^"]*")?>([\s\S]*?)<\/a>/g, (full, href, inner) => {
+            const decoded = unescapeHtml(href);
+            if (/^(?:[a-z][a-z0-9+.-]*:|#|\/\/)/i.test(decoded))
+                return full; // http(s):, mailto:, #anchor
+            const target = opts.linkResolver?.(decoded);
+            const body = /<[^>]+>/.test(inner)
+                ? `<ac:link-body>${inner}</ac:link-body>`
+                : plainTextLinkBody(unescapeHtml(inner));
+            if (target) {
+                const space = target.space ? ` ri:space-key="${escapeXmlAttr(target.space)}"` : '';
+                const anchor = decoded.includes('#') ? ` ac:anchor="${escapeXmlAttr(decoded.slice(decoded.indexOf('#') + 1))}"` : '';
+                return `<ac:link${anchor}><ri:page ri:content-title="${escapeXmlAttr(target.title)}"${space} />${body}</ac:link>`;
+            }
+            const resource = opts.resourceResolver?.(decoded);
+            if (!resource)
+                return full;
+            if ('url' in resource)
+                return `<a href="${escapeXmlAttr(resource.url)}">${inner}</a>`;
+            return `<ac:link><ri:attachment ri:filename="${escapeXmlAttr(resource.attachment)}" />${body}</ac:link>`;
         });
     }
     return html.replace(PLACEHOLDER_RE, (_full, kind, rawBody) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence-md-sync",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Publish Markdown to Confluence (Data Center & Cloud): idempotent page sync, attachment dedup, tables and a pluggable macro system",
   "keywords": [
     "confluence",