confluence-md-sync 0.8.9 → 0.9.1

package/dist/client/client.d.ts

@@ -20,6 +20,7 @@ export interface ConfluenceAttachment {
     };
     extensions?: {
         fileSize?: number;
+        mediaType?: string;
     };
     /**
      * `_links.download` — относительный путь скачивания, который Confluence

package/dist/client/client.js

@@ -1,6 +1,11 @@
 import { readFileSync } from 'node:fs';
 import { basename } from 'node:path';
 import { authHeader } from './config.js';
+function attachmentMime(name, bytes) {
+    if (/^\s*(?:<\?xml[^>]*>\s*)?<(mxfile|mxGraphModel)\b/.test(bytes.subarray(0, 4096).toString('utf8')))
+        return 'application/vnd.jgraph.mxfile';
+    return /\.png$/i.test(name) ? 'image/png' : 'application/octet-stream';
+}
 export class ConfluenceApiError extends Error {
     status;
     statusText;
@@ -230,7 +235,7 @@ export class ConfluenceClient {
         const filename = basename(filePath);
         const buf = readFileSync(filePath);
         const form = new FormData();
-        form.append('file', new Blob([buf]), filename);
+        form.append('file', new Blob([buf], { type: attachmentMime(filename, buf) }), filename);
         form.append('minorEdit', 'true');
         if (comment)
             form.append('comment', comment);
@@ -261,7 +266,7 @@ export class ConfluenceClient {
         const filename = basename(filePath);
         const buf = readFileSync(filePath);
         const form = new FormData();
-        form.append('file', new Blob([buf]), filename);
+        form.append('file', new Blob([buf], { type: attachmentMime(filename, buf) }), filename);
         form.append('minorEdit', 'true');
         if (comment)
             form.append('comment', comment);

package/dist/export/export-page.js

@@ -6,10 +6,12 @@ import { mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { ConfluenceClient } from '../client/client.js';
 import { storageToMarkdown } from './to-markdown.js';
+import { drawioReferences, drawioAttachmentNames } from '../markdown/drawio.js';
 export async function exportPage(pageId, opts, cfg) {
     const client = new ConfluenceClient(cfg);
     const page = await client.getPageStorage(pageId);
     const converted = storageToMarkdown(page.storage, {
+        drawioNames: drawioAttachmentNames(await client.listAttachments(pageId)),
         registry: opts.registry,
         mode: opts.mode,
         attachments: opts.attachments,
@@ -23,13 +25,17 @@ export async function exportPage(pageId, opts, cfg) {
         const dir = join(dirname(markdownPath), 'attachments');
         mkdirSync(dir, { recursive: true });
         for (const name of converted.attachmentRefs) {
-            const [att] = await client.listAttachments(pageId, name);
+            const diagram = drawioReferences(converted.markdown).find(d => d.name === name || d.preview === name);
+            const sourcePage = diagram?.pageId || pageId;
+            const [att] = await client.listAttachments(sourcePage, name);
             if (att === undefined) {
                 console.warn(`[export] attachment '${name}' referenced by the page but not found`);
                 continue;
             }
-            const link = att._links?.download ?? `/download/attachments/${pageId}/${encodeURIComponent(name)}`;
-            const data = await client.downloadAttachment(link);
+            const link = new URL(att._links?.download ?? `/download/attachments/${sourcePage}/${encodeURIComponent(name)}`, cfg.baseUrl);
+            if (diagram?.name === name && diagram.revision)
+                link.searchParams.set('version', diagram.revision);
+            const data = await client.downloadAttachment(link.href);
             const path = join(dir, name);
             writeFileSync(path, data);
             downloaded.set(name, path);

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

@@ -21,6 +21,8 @@
  */
 import { type MacroRegistry } from '../macros/registry.js';
 export interface StorageToMarkdownOptions {
+    /** Known XML attachments; needed for image-mode diagrams without a .drawio suffix. */
+    drawioNames?: string[];
     /** Реестр для проверки маркеров макросов (default: встроенный). */
     registry?: MacroRegistry;
     /**

package/dist/export/to-markdown.js

@@ -39,6 +39,7 @@ export function storageToMarkdown(storage, opts = {}) {
         localFiles: local,
         tablesAsRecords: records,
         localPrefix: opts.localPrefix ?? 'attachments/',
+        drawioNames: opts.drawioNames ?? [],
     });
     const markdown = conv.blocksToMd(parseStorage(storage));
     const attachmentRefs = new Set([...conv.images, ...conv.files]);
@@ -78,6 +79,7 @@ const UNWRAP_BLOCK = new Set([
 const SAFE_URL_RE = /^[A-Za-z0-9\-._~:/?#@!$&'*+,;=%]+$/;
 class Converter {
     registry;
+    drawioNames;
     images = new Set();
     files = new Set();
     stats = { markers: 0, fenced: 0, rawHtml: 0, lossy: 0, native: 0, normalized: 0 };
@@ -87,6 +89,7 @@ class Converter {
     localPrefix;
     constructor(registry, opts) {
         this.registry = registry;
+        this.drawioNames = new Set(opts.drawioNames);
         this.readable = opts.readable;
         this.localFiles = opts.localFiles;
         this.tablesAsRecords = opts.tablesAsRecords;
@@ -147,10 +150,38 @@ class Converter {
                 // tables:'records' — любую таблицу разворачиваем в записи.
                 if (this.tablesAsRecords)
                     return this.recordsTable(el);
-                // Простую таблицу — в чистый GFM (оба режима). Сложную tableToMd
-                // отклоняет: faithful → сырой HTML, readable → readableFallback
-                // (lossy++ и разворот в GFM через readableTable).
-                return this.tableToMd(el);
+                try {
+                    return this.tableToMd(el);
+                }
+                catch (e) {
+                    if (!(e instanceof Unrepresentable))
+                        throw e;
+                    // Строгая GFM-конвертация отклонила таблицу: то ли из-за косметики
+                    // (Confluence лепит class="wrapped" style="width:…%" на КАЖДУЮ
+                    // таблицу, а первую строку часто оформляет жирным <td> вместо <th>),
+                    // то ли из-за реальных объединений (colspan/rowspan). В faithful без
+                    // этой ветки ЛЮБАЯ такая таблица падала в дословный <table> HTML —
+                    // нормализуем в GFM тем же путём, что readable (buildTableGrid не
+                    // смотрит на атрибуты/семантику заголовка): оформление и объединения
+                    // теряются при повторной публикации, но данные — md-таблица, не теги.
+                    if (!this.readable) {
+                        const saved = this.readable;
+                        this.readable = true;
+                        try {
+                            const norm = this.readableTable(el);
+                            this.stats.normalized++;
+                            return norm;
+                        }
+                        catch (e2) {
+                            if (!(e2 instanceof Unrepresentable))
+                                throw e2;
+                        }
+                        finally {
+                            this.readable = saved;
+                        }
+                    }
+                    throw e;
+                }
             }
             if (el.name === 'ac:structured-macro')
                 return this.macroToMd(el);
@@ -319,6 +350,22 @@ class Converter {
         const pmap = new Map(params.map((p) => [p.name, p.value]));
         const oneline = (v) => v !== undefined && !/[\n|{}]/.test(v) && !v.includes('}}');
         let candidate = null;
+        if ((name === 'drawio' || name === 'inc-drawio') && richBody === null) {
+            const filename = pmap.get('diagramName');
+            if (!filename || !oneline(filename) || /[/\\]/.test(filename))
+                return null;
+            if (params.some(p => !oneline(p.value) || /[|{}\n=]/.test(p.name)))
+                return null;
+            const attrs = params.filter(p => p.name !== 'diagramName').map(p => `|${p.name}=${p.value}`).join('');
+            candidate = `{{drawio:${filename}${attrs}}}`;
+            if (name === 'inc-drawio')
+                this.stats.normalized++;
+            else if (!this.readable && !this.verifyMacroMarker(el, candidate))
+                return null;
+            this.files.add(filename);
+            this.images.add(`${filename}.png`);
+            return candidate;
+        }
         const tag = Converter.NATIVE_ADMONITION_TAG[name];
         if (tag && richBody !== null) {
             // Панель: параметры — только title.
@@ -1188,6 +1235,18 @@ class Converter {
         if (kids.length !== 1)
             throw new Unrepresentable();
         const ref = kids[0];
+        const filename = getAttr(ref, 'ri:filename') ?? '';
+        const stem = filename.replace(/\.png$/i, '');
+        const drawioName = getAttr(el, 'ac:alt')?.match(/^drawio:(.+)$/)?.[1]
+            ?? (stem !== filename && (this.drawioNames.has(stem) || /\.drawio$/i.test(stem)) ? stem : undefined);
+        if (drawioName && ref.name === 'ri:attachment' && !/[{}|\n/\\]/.test(drawioName)) {
+            const preview = getAttr(ref, 'ri:filename');
+            if (preview && !/[{}|\n/\\]/.test(preview)) {
+                this.files.add(drawioName);
+                this.images.add(preview);
+                return `{{drawio:${drawioName}|format=image${preview !== `${drawioName}.png` ? `|preview=${preview}` : ''}}}`;
+            }
+        }
         // attachments:'local' — картинка как HTML <img> (сохраняет размеры).
         // ri:attachment → локальный путь; ri:url → внешний URL как есть.
         if (this.localFiles && (ref.name === 'ri:attachment' || ref.name === 'ri:url')) {
@@ -1236,7 +1295,6 @@ class Converter {
         if (!ref.attrs.every(([k]) => k === 'ri:filename' || k === 'ri:version-at-save')) {
             throw new Unrepresentable();
         }
-        const filename = getAttr(ref, 'ri:filename') ?? '';
         const attrs = [];
         for (const [k] of el.attrs) {
             if (!k.startsWith('ac:'))

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export { authHeader, loadConfigFromEnv, type ConfluenceAuthType, type Confluence
 export { Markdown } from './markdown/markdown.js';
 export { renderToStorage, extractPlaceholders, parsePlaceholder, renameImagePlaceholders, MissingAttachmentUrlError, PLACEHOLDER_RE, type AttachmentUrls, type ExtractedPlaceholders, type PlaceholderRef, type RenderStorageOptions, } from './markdown/render.js';
 export { validateMarkdown, MarkdownValidationError, type ValidateOptions } from './markdown/validate.js';
+export { drawioReferences, drawioAttachmentNames, type DrawioReference } from './markdown/drawio.js';
 export { nativeToMarkers, nativeMacroList, NATIVE_ADMONITIONS, NATIVE_DIRECTIVES, NATIVE_PLACEHOLDERS, } from './markdown/native.js';
 export * from './macros/index.js';
 export { convertBpmn, convertBpmnFolder, isBpmnFile, bpmnOutputName, BPMN_FILE_RE, type BpmnConversion, type BpmnImageFormat, type ConvertBpmnFolderOptions, } from './bpmn/convert.js';

package/dist/index.js

@@ -5,6 +5,7 @@ export { authHeader, loadConfigFromEnv, } from './client/config.js';
 export { Markdown } from './markdown/markdown.js';
 export { renderToStorage, extractPlaceholders, parsePlaceholder, renameImagePlaceholders, MissingAttachmentUrlError, PLACEHOLDER_RE, } from './markdown/render.js';
 export { validateMarkdown, MarkdownValidationError } from './markdown/validate.js';
+export { drawioReferences, drawioAttachmentNames } from './markdown/drawio.js';
 export { nativeToMarkers, nativeMacroList, NATIVE_ADMONITIONS, NATIVE_DIRECTIVES, NATIVE_PLACEHOLDERS, } from './markdown/native.js';
 // Macros (pluggable)
 export * from './macros/index.js';

package/dist/macros/index.d.ts

@@ -6,6 +6,7 @@ export { coreMacrosPlugin, extractPlainText } from './plugins/core.js';
 export { tableFilterPlugin, TABLE_FILTER_DEFAULTS } from './plugins/table-filter.js';
 export { csvTablePlugin, CSV_TABLE_DEFAULTS } from './plugins/csv-table.js';
 export { portfolioForJiraPlanPlugin } from './plugins/portfolio-for-jira-plan.js';
+export { drawioPlugin } from './plugins/drawio.js';
 import { MacroRegistry } from './registry.js';
 import { anchor, children, codeBlock, excerpt, excerptInclude, expand, includePage, jiraIssue, panel, status, toc } from './plugins/core.js';
 import { tableExcerpt, tableExcerptInclude, tableFilter, tableJoiner } from './plugins/table-filter.js';
@@ -48,4 +49,5 @@ export declare const macros: {
     tableJoiner: typeof tableJoiner;
     csvTable: typeof csvTable;
     portfolioForJiraPlan: typeof portfolioForJiraPlan;
+    drawio: (name: string, opts?: Record<string, string | undefined>) => import("../index.js").Markdown;
 };

package/dist/macros/index.js

@@ -6,6 +6,7 @@ export { coreMacrosPlugin, extractPlainText } from './plugins/core.js';
 export { tableFilterPlugin, TABLE_FILTER_DEFAULTS } from './plugins/table-filter.js';
 export { csvTablePlugin, CSV_TABLE_DEFAULTS } from './plugins/csv-table.js';
 export { portfolioForJiraPlanPlugin } from './plugins/portfolio-for-jira-plan.js';
+export { drawioPlugin } from './plugins/drawio.js';
 import { MacroRegistry } from './registry.js';
 import { coreMacrosPlugin } from './plugins/core.js';
 import { tableFilterPlugin } from './plugins/table-filter.js';
@@ -15,13 +16,15 @@ import { anchor, children, codeBlock, excerpt, excerptInclude, expand, includePa
 import { tableExcerpt, tableExcerptInclude, tableFilter, tableJoiner } from './plugins/table-filter.js';
 import { csvTable } from './plugins/csv-table.js';
 import { portfolioForJiraPlan } from './plugins/portfolio-for-jira-plan.js';
+import { drawio, drawioPlugin } from './plugins/drawio.js';
 /** Creates a registry pre-loaded with all built-in plugins. */
 export function createDefaultRegistry() {
     return new MacroRegistry()
         .use(coreMacrosPlugin)
         .use(tableFilterPlugin)
         .use(csvTablePlugin)
-        .use(portfolioForJiraPlanPlugin);
+        .use(portfolioForJiraPlanPlugin)
+        .use(drawioPlugin);
 }
 /**
  * Глобальный реестр по умолчанию (core + table-filter). Используется,
@@ -60,4 +63,5 @@ export const macros = {
     tableJoiner,
     csvTable,
     portfolioForJiraPlan,
+    drawio,
 };

package/dist/macros/plugins/drawio.d.ts

@@ -0,0 +1,6 @@
+import { type MacroPlugin } from '../types.js';
+/** XML keeps its attachment name, including extensionless Confluence diagrams. */
+export declare const drawioPlugin: MacroPlugin;
+export declare const drawio: (name: string, opts?: Record<string, string | undefined>) => import("../../index.js").Markdown;
+/** Published attachments belong to the target page and use its latest version. */
+export declare function unpinDrawioStorage(storage: string): string;

package/dist/macros/plugins/drawio.js

@@ -0,0 +1,24 @@
+import { macro } from '../builder.js';
+import { paramMap } from '../types.js';
+import { escapeXmlAttr, structuredMacro } from '../xml.js';
+/** XML keeps its attachment name, including extensionless Confluence diagrams. */
+export const drawioPlugin = {
+    name: 'drawio',
+    macros: [{ name: 'drawio', render(ctx) {
+                const params = paramMap(ctx.params);
+                const name = params.diagramName;
+                if (!name)
+                    throw new Error('drawio: diagramName is required');
+                if (params.format === 'image') {
+                    return `<ac:image><ri:attachment ri:filename="${escapeXmlAttr(params.preview || `${name}.png`)}" /></ac:image>`;
+                }
+                if (params.format && params.format !== 'macro')
+                    throw new Error('drawio: format must be macro or image');
+                return structuredMacro('drawio', ctx.macroId, { params: ctx.params.filter(p => p.name !== 'format' && p.name !== 'preview').sort((a, b) => a.name.localeCompare(b.name)) });
+            } }],
+};
+export const drawio = (name, opts = {}) => macro('drawio').param('diagramName', name).withParams(opts).toMarkdown();
+/** Published attachments belong to the target page and use its latest version. */
+export function unpinDrawioStorage(storage) {
+    return storage.replace(/<ac:structured-macro\b[^>]*ac:name="drawio"[^>]*>[\s\S]*?<\/ac:structured-macro>/g, block => block.replace(/<ac:parameter ac:name="(?:revision|pageId)">[\s\S]*?<\/ac:parameter>/g, ''));
+}

package/dist/markdown/drawio.d.ts

@@ -0,0 +1,15 @@
+export interface DrawioReference {
+    name: string;
+    preview: string;
+    format: 'macro' | 'image';
+    revision?: string;
+    pageId?: string;
+}
+export declare function drawioAttachmentNames(attachments: {
+    title: string;
+    extensions?: {
+        mediaType?: string;
+    };
+}[]): string[];
+/** Skip code examples; ordinary and table-cell references remain attachments. */
+export declare function drawioReferences(markdown: string): DrawioReference[];

package/dist/markdown/drawio.js

@@ -0,0 +1,28 @@
+import MarkdownIt from 'markdown-it';
+import { parsePlaceholder } from './render.js';
+export function drawioAttachmentNames(attachments) {
+    return attachments.filter(a => a.extensions?.mediaType === 'application/vnd.jgraph.mxfile' || /\.drawio$/i.test(a.title)).map(a => a.title);
+}
+/** Skip code examples; ordinary and table-cell references remain attachments. */
+export function drawioReferences(markdown) {
+    const refs = [];
+    const tokens = new MarkdownIt().parse(markdown, {});
+    for (const token of tokens)
+        for (const child of token.children ?? []) {
+            if (child.type !== 'text')
+                continue;
+            for (const match of child.content.matchAll(/\{\{drawio:([^}]+)\}\}/g)) {
+                const { name, attrs } = parsePlaceholder(match[1]);
+                const opts = Object.fromEntries(attrs);
+                if (!name || /[/\\]/.test(name) || name === '.' || name === '..')
+                    throw new Error('drawio: invalid attachment filename');
+                if (opts.format && !['macro', 'image'].includes(opts.format))
+                    throw new Error('drawio: format must be macro or image');
+                const preview = opts.preview || `${name}.png`;
+                if (/[/\\]/.test(preview) || preview === '.' || preview === '..')
+                    throw new Error('drawio: invalid preview filename');
+                refs.push({ name, preview, format: opts.format === 'image' ? 'image' : 'macro', revision: opts.revision, pageId: opts.pageId });
+            }
+        }
+    return refs;
+}

package/dist/markdown/native.js

@@ -45,6 +45,7 @@ export const NATIVE_DIRECTIVES = {
 };
 /** Строчные плейсхолдеры: имя → имя макроса. */
 export const NATIVE_PLACEHOLDERS = {
+    drawio: 'drawio',
     toc: 'toc',
     children: 'children',
     jira: 'jira',
@@ -56,6 +57,7 @@ export const NATIVE_PLACEHOLDERS = {
 /** Полный перечень макросов с нативной md-разметкой (для документации/UI). */
 export function nativeMacroList() {
     return [
+        { macro: 'drawio', syntax: '{{drawio:diagram.drawio|format=macro}} | {{drawio:diagram.drawio|format=image}}' },
         { macro: 'info', syntax: '> [!INFO] Заголовок?' },
         { macro: 'note', syntax: '> [!NOTE] Заголовок?' },
         { macro: 'warning', syntax: '> [!WARNING] Заголовок?' },
@@ -75,7 +77,7 @@ export function nativeMacroList() {
 const ADMONITION_FIRST_RE = /^>\s*\[!([A-Za-z]+)\]\s*(.*)$/;
 const DIRECTIVE_OPEN_RE = /^:::\s+([a-z-]+)(?:\s+(.*?))?\s*$/;
 const DIRECTIVE_CLOSE_RE = /^:::\s*$/;
-const PLACEHOLDER_INLINE_RE = /\{\{(toc|children|jira|status|anchor|properties-report|portfolio-for-jira-plan)(?::((?:[^{}]|\{[^{])*?))?\}\}/g;
+const PLACEHOLDER_INLINE_RE = /\{\{(drawio|toc|children|jira|status|anchor|properties-report|portfolio-for-jira-plan)(?::((?:[^{}]|\{[^{])*?))?\}\}/g;
 const FENCE_RE = /^\s*(`{3,}|~{3,})/;
 /** Компактная пара маркеров без тела — для строчного контекста. */
 function inlineMarker(macroName, params) {
@@ -108,6 +110,8 @@ function placeholderParams(kind, raw) {
     if (raw === undefined || raw.trim() === '')
         return [];
     const { head, attrs } = splitAttrs(raw);
+    if (kind === 'drawio')
+        return [{ name: 'diagramName', value: head }, ...attrs];
     const params = [];
     const headIsPair = head.includes('=');
     if (headIsPair) {
@@ -206,6 +210,7 @@ export function nativeToMarkers(src) {
             let j = i + 1;
             let innerFence = null;
             let closed = false;
+            let depth = 1;
             for (; j < lines.length; j++) {
                 const bl = lines[j];
                 const bfm = FENCE_RE.exec(bl);
@@ -215,9 +220,14 @@ export function nativeToMarkers(src) {
                     else if (bfm[1][0] === innerFence)
                         innerFence = null;
                 }
-                else if (innerFence === null && DIRECTIVE_CLOSE_RE.test(bl)) {
-                    closed = true;
-                    break;
+                else if (innerFence === null) {
+                    const nested = DIRECTIVE_OPEN_RE.exec(bl);
+                    if (nested && NATIVE_DIRECTIVES[nested[1]])
+                        depth++;
+                    else if (DIRECTIVE_CLOSE_RE.test(bl) && --depth === 0) {
+                        closed = true;
+                        break;
+                    }
                 }
                 body.push(bl);
             }

package/dist/markdown/validate.js

@@ -1,5 +1,6 @@
 import { basename } from 'node:path';
 import { extractPlaceholders } from './render.js';
+import { drawioReferences } from './drawio.js';
 export class MarkdownValidationError extends Error {
     constructor(message) {
         super(message);
@@ -8,6 +9,10 @@ export class MarkdownValidationError extends Error {
 }
 export function validateMarkdown(opts) {
     const { images, files } = extractPlaceholders(opts.markdown);
+    for (const diagram of drawioReferences(opts.markdown)) {
+        files.push(diagram.name);
+        images.push(diagram.preview);
+    }
     const tables = extractTablePlaceholders(opts.markdown);
     const providedImages = new Set(opts.imagePaths.map((p) => basename(p)));
     const providedFiles = new Set(opts.filePaths.map((p) => basename(p)));

package/dist/publish/publish.js

@@ -12,6 +12,7 @@ import { applyManagedNotice } from './notice.js';
 import { processMacros } from '../macros/registry.js';
 import { defaultMacroRegistry } from '../macros/index.js';
 import { Markdown } from '../markdown/markdown.js';
+import { unpinDrawioStorage } from '../macros/plugins/drawio.js';
 // Content property с SHA-256 от рендеренного storage. Хранится отдельно
 // от body через /rest/api/content/{id}/property/{key}, поэтому:
 //  - не попадает в HTML страницы (пользователь не видит);
@@ -200,6 +201,7 @@ export async function publishPage(opts, cfg) {
     let storage = renderToStorage(markdown, urls, opts.render ?? {});
     // 2.5. Преобразование маркеров макросов в XHTML.
     storage = processMacros(storage, registry).toString();
+    storage = unpinDrawioStorage(storage);
     // 2.6. Баннер «страница управляется извне». Вставляется здесь, в storage —
     //   не в markdown — поэтому источник/round-trip его не содержат. Баннер
     //   детерминирован (фиксированный macro-id), значит попадает в content-hash

package/package.json

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