confluence-md-sync 0.9.1 → 0.10.1

package/dist/export/to-markdown.js

@@ -140,6 +140,14 @@ class Converter {
                 if (meaningful.length === 1 && meaningful[0].kind === 'el' && meaningful[0].name === 'ac:structured-macro') {
                     return this.macroToMd(meaningful[0]);
                 }
+                if (meaningful.length > 1 && meaningful.every(n => n.kind === 'el' && n.name === 'ac:structured-macro')) {
+                    const native = meaningful.map(n => this.tryNativeMd(n, getAttr(n, 'ac:name') ?? ''));
+                    if (native.every(s => s?.startsWith('{{') && !s.includes('\n'))) {
+                        this.stats.native += native.length;
+                        this.stats.normalized++; // A paragraph around block macros is redundant in Confluence.
+                        return native.join(' ');
+                    }
+                }
                 return this.paragraphMd(el.children);
             }
             if (el.name === 'hr')
@@ -336,6 +344,7 @@ class Converter {
         info: 'INFO', note: 'NOTE', warning: 'WARNING', tip: 'TIP',
     };
     static NATIVE_PLACEHOLDER_NAME = {
+        search: 'search',
         toc: 'toc', children: 'children', jira: 'jira', status: 'status',
         anchor: 'anchor', detailssummary: 'properties-report',
         'portfolio-for-jira-plan': 'portfolio-for-jira-plan',
@@ -432,8 +441,7 @@ class Converter {
             const attrs = [];
             let head = '';
             for (const p of params) {
-                if (!oneline(p.value) || p.value.includes('|'))
-                    return null;
+                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;
                     continue;
@@ -449,7 +457,7 @@ class Converter {
                 const attrName = name === 'jira' && p.name === 'jqlQuery' ? 'jql' : p.name;
                 if (!/^[A-Za-z-]+$/.test(attrName))
                     return null;
-                attrs.push(`${attrName}=${p.value}`);
+                attrs.push(`${attrName}=${value}`);
             }
             const inner = [head, ...attrs].filter((s, i) => s !== '' || i > 0).join('|');
             candidate = inner === '' ? `{{${ph}}}` : `{{${ph}:${inner}}}`;
@@ -468,7 +476,9 @@ class Converter {
         for (const child of elements(el.children)) {
             if (child.name === 'ac:parameter') {
                 const pname = getAttr(child, 'ac:name') ?? '';
-                params.push({ name: pname, value: decodeEntities(textContent(child.children)) });
+                const space = getAttr(el, 'ac:name') === 'search' && pname === 'spacekey'
+                    ? elements(child.children).find(n => n.name === 'ri:space') : undefined;
+                params.push({ name: pname, value: space ? getAttr(space, 'ri:space-key') ?? '' : decodeEntities(textContent(child.children)) });
             }
             else if (child.name === 'ac:rich-text-body')
                 richBody = child;

package/dist/macros/index.d.ts

@@ -7,6 +7,7 @@ export { tableFilterPlugin, TABLE_FILTER_DEFAULTS } from './plugins/table-filter
 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';
+export { searchPlugin } from './plugins/search.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';
@@ -50,4 +51,5 @@ export declare const macros: {
     csvTable: typeof csvTable;
     portfolioForJiraPlan: typeof portfolioForJiraPlan;
     drawio: (name: string, opts?: Record<string, string | undefined>) => import("../index.js").Markdown;
+    search: (query: string, options?: Record<string, string | undefined>) => import("../index.js").Markdown;
 };

package/dist/macros/index.js

@@ -7,6 +7,7 @@ export { tableFilterPlugin, TABLE_FILTER_DEFAULTS } from './plugins/table-filter
 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';
+export { searchPlugin } from './plugins/search.js';
 import { MacroRegistry } from './registry.js';
 import { coreMacrosPlugin } from './plugins/core.js';
 import { tableFilterPlugin } from './plugins/table-filter.js';
@@ -17,6 +18,7 @@ import { tableExcerpt, tableExcerptInclude, tableFilter, tableJoiner } from './p
 import { csvTable } from './plugins/csv-table.js';
 import { portfolioForJiraPlan } from './plugins/portfolio-for-jira-plan.js';
 import { drawio, drawioPlugin } from './plugins/drawio.js';
+import { search, searchPlugin } from './plugins/search.js';
 /** Creates a registry pre-loaded with all built-in plugins. */
 export function createDefaultRegistry() {
     return new MacroRegistry()
@@ -24,7 +26,8 @@ export function createDefaultRegistry() {
         .use(tableFilterPlugin)
         .use(csvTablePlugin)
         .use(portfolioForJiraPlanPlugin)
-        .use(drawioPlugin);
+        .use(drawioPlugin)
+        .use(searchPlugin);
 }
 /**
  * Глобальный реестр по умолчанию (core + table-filter). Используется,
@@ -64,4 +67,5 @@ export const macros = {
     csvTable,
     portfolioForJiraPlan,
     drawio,
+    search,
 };

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

@@ -0,0 +1,4 @@
+import type { MacroPlugin } from '../types.js';
+/** Search Results uses a space reference, not a text parameter, in storage. */
+export declare const searchPlugin: MacroPlugin;
+export declare const search: (query: string, options?: Record<string, string | undefined>) => import("../../index.js").Markdown;

package/dist/macros/plugins/search.js

@@ -0,0 +1,12 @@
+import { macro } from '../builder.js';
+import { escapeXmlAttr, structuredMacro } from '../xml.js';
+/** Search Results uses a space reference, not a text parameter, in storage. */
+export const searchPlugin = {
+    name: 'search',
+    macros: [{ name: 'search', render: ctx => structuredMacro('search', ctx.macroId, {
+                params: [...ctx.params].sort((a, b) => a.name.localeCompare(b.name)).map(p => p.name === 'spacekey' && p.value
+                    ? { ...p, value: `<ri:space ri:space-key="${escapeXmlAttr(p.value)}" />`, raw: true }
+                    : p),
+            }) }],
+};
+export const search = (query, options = {}) => macro('search').param('query', query).withParams(options).toMarkdown();

package/dist/markdown/native.js

@@ -45,6 +45,7 @@ export const NATIVE_DIRECTIVES = {
 };
 /** Строчные плейсхолдеры: имя → имя макроса. */
 export const NATIVE_PLACEHOLDERS = {
+    search: 'search',
     drawio: 'drawio',
     toc: 'toc',
     children: 'children',
@@ -57,6 +58,7 @@ export const NATIVE_PLACEHOLDERS = {
 /** Полный перечень макросов с нативной md-разметкой (для документации/UI). */
 export function nativeMacroList() {
     return [
+        { macro: 'search', syntax: '{{search:query=…|spacekey=…|type=page|maxLimit=10}}' },
         { macro: 'drawio', syntax: '{{drawio:diagram.drawio|format=macro}} | {{drawio:diagram.drawio|format=image}}' },
         { macro: 'info', syntax: '> [!INFO] Заголовок?' },
         { macro: 'note', syntax: '> [!NOTE] Заголовок?' },
@@ -77,7 +79,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 = /\{\{(drawio|toc|children|jira|status|anchor|properties-report|portfolio-for-jira-plan)(?::((?:[^{}]|\{[^{])*?))?\}\}/g;
+const PLACEHOLDER_INLINE_RE = /\{\{(search|drawio|toc|children|jira|status|anchor|properties-report|portfolio-for-jira-plan)(?::((?:"(?:\\.|[^"\\])*"|[^{}"]|\{[^{])*?))?\}\}/g;
 const FENCE_RE = /^\s*(`{3,}|~{3,})/;
 /** Компактная пара маркеров без тела — для строчного контекста. */
 function inlineMarker(macroName, params) {
@@ -94,16 +96,26 @@ function blockMarker(macroName, params, body) {
 }
 /** `a|b=c|d=e` → первый сегмент + пары; поведение как у parsePlaceholder. */
 function splitAttrs(raw) {
-    const parts = raw.split('|');
+    const parts = raw.match(/(?:"(?:\\.|[^"\\])*"|[^|"])+/g) ?? [];
+    const value = (text) => {
+        const trimmed = text.trim();
+        if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
+            try {
+                return JSON.parse(trimmed);
+            }
+            catch { /* Unquoted legacy values remain literal. */ }
+        }
+        return trimmed;
+    };
     const attrs = [];
     for (const part of parts.slice(1)) {
         const eq = part.indexOf('=');
         if (eq === -1)
             attrs.push({ name: part.trim(), value: '' });
         else
-            attrs.push({ name: part.slice(0, eq).trim(), value: part.slice(eq + 1).trim() });
+            attrs.push({ name: part.slice(0, eq).trim(), value: value(part.slice(eq + 1)) });
     }
-    return { head: parts[0].trim(), attrs };
+    return { head: parts[0]?.trim() ?? '', attrs };
 }
 /** Параметры плейсхолдера → параметры макроса Confluence. */
 function placeholderParams(kind, raw) {
@@ -116,9 +128,21 @@ function placeholderParams(kind, raw) {
     const headIsPair = head.includes('=');
     if (headIsPair) {
         const eq = head.indexOf('=');
-        attrs.unshift({ name: head.slice(0, eq).trim(), value: head.slice(eq + 1).trim() });
+        const v = head.slice(eq + 1).trim();
+        let decoded = v;
+        if (v.startsWith('"') && v.endsWith('"')) {
+            try {
+                decoded = JSON.parse(v);
+            }
+            catch { /* Legacy unquoted values remain literal. */ }
+        }
+        attrs.unshift({ name: head.slice(0, eq).trim(), value: decoded });
     }
     switch (kind) {
+        case 'search':
+            if (!headIsPair && head !== '')
+                params.push({ name: 'query', value: head });
+            break;
         case 'jira':
             if (!headIsPair && head !== '')
                 params.push({ name: 'key', value: head });
@@ -154,12 +178,20 @@ function directiveParams(name, rest) {
     if (!rest)
         return params;
     const free = [];
-    const re = /([A-Za-z-]+)=("([^"]*)"|\S+)|(\S+)/g;
+    const re = /([A-Za-z_][\w-]*)=("(?:\\.|[^"\\])*"|\S+)|(\S+)/g;
     for (const m of rest.matchAll(re)) {
-        if (m[1])
-            params.push({ name: m[1], value: m[3] ?? m[2] });
+        if (m[1]) {
+            let value = m[2];
+            if (value.startsWith('"') && value.endsWith('"')) {
+                try {
+                    value = JSON.parse(value);
+                }
+                catch { /* Preserve malformed legacy values as text. */ }
+            }
+            params.push({ name: m[1], value });
+        }
         else
-            free.push(m[4]);
+            free.push(m[3]);
     }
     if (free.length && name === 'expand')
         params.unshift({ name: 'title', value: free.join(' ') });

package/package.json

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