confluence-md-sync 0.11.0 → 0.11.2

package/dist/export/export-page.d.ts

@@ -5,7 +5,9 @@
 import type { ConfluenceConfig } from '../client/config.js';
 import type { MacroRegistry } from '../macros/registry.js';
 import { type StorageToMarkdownResult } from './to-markdown.js';
+import type { StorageLinkResolver } from './links.js';
 export interface ExportPageOptions {
+    linkResolver?: StorageLinkResolver;
     /**
      * Точный путь до итогового md-файла. Альтернатива `outDir`. Аттачи (если
      * включены) кладутся в `attachments/` рядом с этим файлом.

package/dist/export/export-page.js

@@ -16,6 +16,7 @@ export async function exportPage(pageId, opts, cfg) {
         mode: opts.mode,
         attachments: opts.attachments,
         tables: opts.tables,
+        linkResolver: opts.linkResolver,
     });
     const markdownPath = opts.outFile ?? join(opts.outDir ?? `./${pageId}`, 'page.md');
     mkdirSync(dirname(markdownPath), { recursive: true });

package/dist/export/links.d.ts

@@ -0,0 +1,12 @@
+export interface StorageLink {
+    href?: string;
+    pageId?: string;
+    title?: string;
+    space?: string;
+    anchor?: string;
+}
+export type StorageLinkResolver = (link: StorageLink) => string | null | undefined;
+/** Collect targets before a batch determines their final file paths. */
+export declare function storageLinks(storage: string): StorageLink[];
+/** Rewrite links only after the caller has prepared every destination. */
+export declare function rewriteStorageLinks(storage: string, resolver: StorageLinkResolver): string;

package/dist/export/links.js

@@ -0,0 +1,42 @@
+import { escapeXmlAttr } from '../macros/xml.js';
+import { elements, getAttr, parseStorage, serializeStorage, textContent } from './xhtml.js';
+function visit(nodes, fn) {
+    for (const el of nodes) {
+        if (el.kind !== 'el' || ['code', 'pre', 'ac:parameter', 'ac:plain-text-body'].includes(el.name))
+            continue;
+        if (el.name === 'a' && getAttr(el, 'href'))
+            fn(el, { href: getAttr(el, 'href') });
+        else if (el.name === 'ac:link') {
+            const page = elements(el.children).find(c => c.name === 'ri:page');
+            if (page)
+                fn(el, { pageId: getAttr(page, 'ri:content-id'), title: getAttr(page, 'ri:content-title'), space: getAttr(page, 'ri:space-key'), anchor: getAttr(el, 'ac:anchor') });
+        }
+        visit(el.children, fn);
+    }
+}
+/** Collect targets before a batch determines their final file paths. */
+export function storageLinks(storage) {
+    const result = [];
+    visit(parseStorage(storage), (_el, link) => result.push(link));
+    return result;
+}
+/** Rewrite links only after the caller has prepared every destination. */
+export function rewriteStorageLinks(storage, resolver) {
+    const nodes = parseStorage(storage);
+    let changed = false;
+    visit(nodes, (el, link) => {
+        const href = resolver(link);
+        if (!href || href === link.href)
+            return;
+        if (el.name === 'ac:link') {
+            const body = elements(el.children).find(c => c.name === 'ac:link-body' || c.name === 'ac:plain-text-link-body');
+            el.children = body?.name === 'ac:link-body' ? body.children : [{ kind: 'text', raw: escapeXmlAttr(body ? textContent(body.children) : link.title ?? href) }];
+            el.name = 'a';
+            el.attrs = [];
+            el.selfClosing = false;
+        }
+        el.attrs = [...el.attrs.filter(([key]) => key !== 'href'), ['href', escapeXmlAttr(href)]];
+        changed = true;
+    });
+    return changed ? serializeStorage(nodes) : storage;
+}

package/dist/export/to-markdown.d.ts

@@ -20,7 +20,10 @@
  *  выдаётся никогда.
  */
 import { type MacroRegistry } from '../macros/registry.js';
+import { type StorageLinkResolver } from './links.js';
 export interface StorageToMarkdownOptions {
+    /** Map known page references to repository URLs after allocating all batch paths. */
+    linkResolver?: StorageLinkResolver;
     /** Known XML attachments; needed for image-mode diagrams without a .drawio suffix. */
     drawioNames?: string[];
     /** Реестр для проверки маркеров макросов (default: встроенный). */

package/dist/export/to-markdown.js

@@ -26,9 +26,11 @@ import { defaultMacroRegistry } from '../macros/index.js';
 import { renderToStorage } from '../markdown/render.js';
 import { compareStorage } from './canonical.js';
 import { NOTICE_MACRO_ID } from '../publish/notice.js';
+import { rewriteStorageLinks } from './links.js';
 import { decodeEntities, elements, getAttr, hasNamespacedElements, parseStorage, serializeStorage, textContent, } from './xhtml.js';
 /** Конвертирует storage-фрагмент страницы в Markdown. */
 export function storageToMarkdown(storage, opts = {}) {
+    const rewritten = opts.linkResolver ? rewriteStorageLinks(storage, opts.linkResolver) : storage;
     const local = opts.attachments === 'local';
     const records = opts.tables === 'records';
     // 'local' и 'records' — заведомо не round-trip, поэтому включают readable-
@@ -41,7 +43,9 @@ export function storageToMarkdown(storage, opts = {}) {
         localPrefix: opts.localPrefix ?? 'attachments/',
         drawioNames: opts.drawioNames ?? [],
     });
-    const markdown = conv.blocksToMd(parseStorage(storage));
+    const markdown = conv.blocksToMd(parseStorage(rewritten));
+    if (rewritten !== storage)
+        conv.stats.normalized++;
     const attachmentRefs = new Set([...conv.images, ...conv.files]);
     for (const m of storage.matchAll(/ri:filename="([^"]*)"/g))
         attachmentRefs.add(m[1]);

package/dist/index.d.ts

@@ -15,6 +15,7 @@ export { publishPage, computeContentHash, DEFAULT_HASH_PROPERTY_KEY, type Publis
 export { buildManagedNotice, applyManagedNotice, DEFAULT_MANAGED_NOTICE_TEXT, DEFAULT_MANAGED_NOTICE_LINK_TEXT, type ManagedNoticeOptions, } from './publish/notice.js';
 export { isHttpUrl, remoteFilename, isSameConfluenceOrigin, remoteRequestHeaders, downloadToFile, } from './publish/remote.js';
 export { runPublish, type Here, type Build, type PublishPlan, type RunPublishOptions, } from './publish/runner.js';
+export { storageLinks, rewriteStorageLinks, type StorageLink, type StorageLinkResolver } from './export/links.js';
 export { parseStorage, serializeStorage, decodeEntities, StorageParseError, type XNode, type XElement, } from './export/xhtml.js';
 export { canonicalize, compareStorage, type CNode, type CompareResult, type StorageDiff, } from './export/canonical.js';
 export { storageToMarkdown, type StorageToMarkdownOptions, type StorageToMarkdownResult, } from './export/to-markdown.js';

package/dist/index.js

@@ -23,6 +23,7 @@ export { buildManagedNotice, applyManagedNotice, DEFAULT_MANAGED_NOTICE_TEXT, DE
 export { isHttpUrl, remoteFilename, isSameConfluenceOrigin, remoteRequestHeaders, downloadToFile, } from './publish/remote.js';
 export { runPublish, } from './publish/runner.js';
 // Export (storage → markdown) & round-trip
+export { storageLinks, rewriteStorageLinks } from './export/links.js';
 export { parseStorage, serializeStorage, decodeEntities, StorageParseError, } from './export/xhtml.js';
 export { canonicalize, compareStorage, } from './export/canonical.js';
 export { storageToMarkdown, } from './export/to-markdown.js';

package/dist/markdown/render.d.ts

@@ -54,6 +54,14 @@ export interface RenderStorageOptions {
     linkResolver?: (href: string) => {
         title: string;
         space?: string;
+    } | {
+        url: 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 {

package/dist/markdown/render.js

@@ -120,22 +120,44 @@ 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 (/^(?:#|(?:mailto|tel|javascript|data):)/i.test(decoded))
+                return full;
+            const target = opts.linkResolver?.(decoded);
+            if (target && 'url' in target)
+                return `<a href="${escapeXmlAttr(target.url)}">${inner}</a>`;
+            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>`;
+            }
+            if (/^(?:[a-z][a-z0-9+.-]*:|\/\/)/i.test(decoded))
+                return full;
+            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.2",
   "description": "Publish Markdown to Confluence (Data Center & Cloud): idempotent page sync, attachment dedup, tables and a pluggable macro system",
   "keywords": [
     "confluence",