confluence-md-sync 0.12.0 → 0.13.0

package/dist/export/to-markdown.js

@@ -357,6 +357,7 @@ class Converter {
         toc: 'toc', children: 'children', jira: 'jira', status: 'status',
         anchor: 'anchor', detailssummary: 'properties-report',
         'portfolio-for-jira-plan': 'portfolio-for-jira-plan',
+        'table-excerpt-include': 'table-excerpt-include',
     };
     tryNativeMd(el, name) {
         const parts = this.macroParts(el);
@@ -368,6 +369,23 @@ 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 (['table-filter', 'table-excerpt', 'table-joiner'].includes(name) && richBody !== null) {
+            if (elements(el.children).filter(p => p.name === 'ac:parameter').some(p => elements(p.children).length))
+                return null;
+            if (params.some(p => !/^[\w-]+$/.test(p.name)))
+                return null;
+            const bodyMd = this.bodyMd(richBody);
+            if (bodyMd === null)
+                return null;
+            candidate = `::: ${name}${params.map(p => ` ${p.name}=${JSON.stringify(p.value)}`).join('')}\n${bodyMd}\n:::`;
+            if (this.verifyMacroMarker(el, candidate))
+                return candidate;
+            if (this.verifyTableMacro(el, candidate)) {
+                this.stats.normalized++;
+                return candidate;
+            }
+            return null;
+        }
         if ((name === 'drawio' || name === 'inc-drawio') && richBody === null) {
             const filename = pmap.get('diagramName');
             if (!filename || !oneline(filename) || /[/\\]/.test(filename))
@@ -449,7 +467,11 @@ class Converter {
             const ph = Converter.NATIVE_PLACEHOLDER_NAME[name];
             const attrs = [];
             let head = '';
-            for (const p of params) {
+            const nativeParams = name === 'table-excerpt-include'
+                ? MACRO_EXTRACTORS[name]({ el, paramEls: elements(el.children).filter(p => p.name === 'ac:parameter'), richBody, plainBody })?.params : params;
+            if (!nativeParams)
+                return null;
+            for (const p of nativeParams) {
                 const value = /[|{}\n\r]/.test(p.value) || /^"/.test(p.value) ? JSON.stringify(p.value) : p.value;
                 if (name === 'jira' && p.name === 'key' && head === '') {
                     head = p.value;
@@ -464,7 +486,7 @@ class Converter {
                     continue;
                 }
                 const attrName = name === 'jira' && p.name === 'jqlQuery' ? 'jql' : p.name;
-                if (!/^[A-Za-z-]+$/.test(attrName))
+                if (!/^[A-Za-z_][\w-]*$/.test(attrName))
                     return null;
                 attrs.push(`${attrName}=${value}`);
             }
@@ -733,6 +755,36 @@ class Converter {
             return false;
         }
     }
+    /** Accept editable GFM tables only when the surrounding macros/parameters and normalized cells match. */
+    verifyTableMacro(el, markdown) {
+        const saved = this.readable, stats = { ...this.stats };
+        try {
+            this.readable = true;
+            const render = (md) => processMacros(renderToStorage(md, { images: new Map(), files: new Map() }, { imageStyle: 'attachment', fileStyle: 'attachment', linkify: false }), this.registry).toString();
+            const normalize = (nodes) => nodes.flatMap(node => {
+                if (node.kind !== 'el')
+                    return [node];
+                if (node.name === 'table') {
+                    // Nested block macros require their own faithful conversion; never flatten their semantics.
+                    const hasMacro = (ns) => ns.some(n => n.kind === 'el' && (n.name === 'ac:structured-macro' || hasMacro(n.children)));
+                    if (hasMacro(node.children))
+                        throw new Unrepresentable();
+                    return parseStorage(render(this.readableTable(node)));
+                }
+                return [{ ...node, children: normalize(node.children) }];
+            });
+            return compareStorage(serializeStorage(normalize([el])), serializeStorage(normalize(parseStorage(render(markdown))))).equal;
+        }
+        catch (error) {
+            if (!(error instanceof Unrepresentable))
+                throw error;
+            return false;
+        }
+        finally {
+            this.readable = saved;
+            Object.assign(this.stats, stats);
+        }
+    }
     containsMacroNamed(nodes, name) {
         for (const n of nodes) {
             if (n.kind !== 'el')
@@ -1424,6 +1476,12 @@ class Converter {
             throw new Unrepresentable();
         }
         const textAttr = text !== undefined ? `|text=${text}` : '';
+        if (ref.name === 'ri:user') {
+            const identity = ref.attrs.find(([key]) => ['ri:userkey', 'ri:username', 'ri:account-id'].includes(key));
+            if (!identity || ref.attrs.length !== 1)
+                throw new Unrepresentable();
+            return placeholder('user', decodeEntities(identity[1]), [['type', identity[0].slice(3)], ...(text === undefined ? [] : [['text', text]])]);
+        }
         if (ref.name === 'ri:page') {
             if (!ref.attrs.every(([k]) => ['ri:content-title', 'ri:space-key', 'ri:version-at-save'].includes(k))) {
                 throw new Unrepresentable();

package/dist/macros/plugins/table-filter.js

@@ -63,13 +63,7 @@ export const tableFilterPlugin = {
             // Параметры: name — название выборки; hide — скрывать ли содержимое.
             name: 'table-excerpt',
             render: (ctx) => {
-                const map = paramMap(ctx.params);
-                const params = [];
-                if (map.hide === 'true')
-                    params.push({ name: 'hide', value: 'true' });
-                if (map.name)
-                    params.push({ name: 'name', value: map.name });
-                return structuredMacro('table-excerpt', ctx.macroId, { params, richBody: ctx.body });
+                return structuredMacro('table-excerpt', ctx.macroId, { params: ctx.params, richBody: ctx.body });
             },
         },
         {

package/dist/markdown/native.js

@@ -43,6 +43,9 @@ export const NATIVE_DIRECTIVES = {
     properties: 'details',
     expand: 'expand',
     panel: 'panel',
+    'table-filter': 'table-filter',
+    'table-excerpt': 'table-excerpt',
+    'table-joiner': 'table-joiner',
 };
 /** Строчные плейсхолдеры: имя → имя макроса. */
 export const NATIVE_PLACEHOLDERS = {
@@ -56,6 +59,7 @@ export const NATIVE_PLACEHOLDERS = {
     anchor: 'anchor',
     'properties-report': 'detailssummary',
     'portfolio-for-jira-plan': 'portfolio-for-jira-plan',
+    'table-excerpt-include': 'table-excerpt-include',
 };
 /** Полный перечень макросов с нативной md-разметкой (для документации/UI). */
 export function nativeMacroList() {
@@ -70,6 +74,8 @@ export function nativeMacroList() {
         { macro: 'details', syntax: '::: properties [id=…] [hidden=true] … :::' },
         { macro: 'expand', syntax: '::: expand Заголовок … :::' },
         { macro: 'panel', syntax: '::: panel title=… … :::' },
+        ...['table-filter', 'table-excerpt', 'table-joiner'].map(macro => ({ macro, syntax: `::: ${macro} name="…" … :::` })),
+        { macro: 'table-excerpt-include', syntax: '{{table-excerpt-include:name=…|page=…|space=…}}' },
         { macro: 'toc', syntax: '{{toc}} | {{toc:maxLevel=3}}' },
         { macro: 'children', syntax: '{{children}} | {{children:depth=2}}' },
         { macro: 'jira', syntax: '{{jira:KEY-1}} | {{jira:jql=…|maximumIssues=20}}' },

package/dist/markdown/render.js

@@ -84,7 +84,7 @@ export function renderToStorage(markdown, urls, opts = {}) {
     while (markdown.includes(prefix))
         prefix += 'X';
     markdown = replaceInlineSyntax(markdown, ref => {
-        if (!['img', 'file', 'page', 'note'].includes(ref.id) && !(ref.id in NATIVE_PLACEHOLDERS))
+        if (!['img', 'file', 'page', 'user', 'note'].includes(ref.id) && !(ref.id in NATIVE_PLACEHOLDERS))
             return;
         const line = markdown.slice(markdown.lastIndexOf('\n', ref.from - 1) + 1, ref.from);
         const cell = line.trimStart().startsWith('|');
@@ -96,6 +96,13 @@ export function renderToStorage(markdown, urls, opts = {}) {
     let html = renderer.render(markdown);
     const renderPlaceholder = (kind, body) => {
         const { name, attrs } = parsePlaceholder(body);
+        if (kind === 'user') {
+            const map = Object.fromEntries(attrs), type = map.type || 'userkey';
+            if (!['userkey', 'username', 'account-id'].includes(type))
+                throw new Error('Unknown Confluence user identity type');
+            const body = map.text === undefined ? '' : `<ac:plain-text-link-body><![CDATA[${map.text.replace(/]]>/g, ']]]]><![CDATA[>')}]]></ac:plain-text-link-body>`;
+            return `<ac:link><ri:user ri:${type}="${escapeXmlAttr(name)}" />${body}</ac:link>`;
+        }
         if (kind === 'page') {
             return renderPageLink(name, attrs);
         }
@@ -127,7 +134,7 @@ export function renderToStorage(markdown, urls, opts = {}) {
             const body = renderToStorage(note.text.replace(/\r?\n/g, '\n\n'), urls, opts);
             return renderInlineNote(body.trim(), note.attrs);
         }
-        return ['img', 'file', 'page'].includes(ref.id) ? renderPlaceholder(ref.id, ref.body) : nativeToMarkers(ref.raw);
+        return ['img', 'file', 'page', 'user'].includes(ref.id) ? renderPlaceholder(ref.id, ref.body) : nativeToMarkers(ref.raw);
     });
     html = html.replace(/<p>((?:\s*<!-- MACRO:start:[^>]* -->\s*<!-- MACRO:end:[^>]* -->\s*)+)<\/p>/g, '$1');
     // ```confluence-storage — транспорт для дословного XHTML (ac:/ri:-теги

package/package.json

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