confluence-md-sync 0.8.4 → 0.8.6

package/README.md

@@ -336,6 +336,10 @@ that doesn't fit falls back to markers/fenced blocks automatically.
 | `status` | `{{status:Текст\|colour=Green\|subtle=true}}` |
 | `anchor` | `{{anchor:name}}` |
 | `detailssummary` (Page Properties Report) | `{{properties-report:cql=…\|firstcolumn=…}}` |
+| `portfolio-for-jira-plan` (Portfolio/Advanced Roadmaps plan) | `{{portfolio-for-jira-plan:url=…\|planHeight=900}}` |
+
+Adding a macro is a single folder: `src/macros/plugins/` (one file per macro) —
+see [`src/macros/plugins/README.md`](src/macros/plugins/README.md).
 
 Inside fenced code blocks the syntax is left untouched. The machine-readable
 list is exported as `nativeMacroList()`; the md→markers pass is
@@ -370,6 +374,12 @@ macros.tableExcerptInclude('name', 'Source Page');
 macros.tableExcerpt(md, 'name', /* hide */ true);
 macros.tableFilter(md, { totalrow: ',,Sum' });
 macros.tableJoiner(includesMd, "SELECT * FROM T1 LEFT JOIN T2 ON …");  // multiline SQL ok
+
+// CSV Table app — render a table from an attached CSV (page body stays tiny;
+// ideal for large datasets that would blow the Confluence storage-size limit
+// as an inline table). Wrap in tableFilter for in-header filtering/pagination.
+macros.csvTable('data.csv');
+macros.tableFilter(macros.csvTable('data.csv'), { totalrow: ',,,,,,,,Sum' });
 ```
 
 Or write markers by hand right in Markdown:

package/dist/export/to-markdown.js

@@ -307,6 +307,7 @@ class Converter {
     static NATIVE_PLACEHOLDER_NAME = {
         toc: 'toc', children: 'children', jira: 'jira', status: 'status',
         anchor: 'anchor', detailssummary: 'properties-report',
+        'portfolio-for-jira-plan': 'portfolio-for-jira-plan',
     };
     tryNativeMd(el, name) {
         const parts = this.macroParts(el);

package/dist/macros/index.d.ts

@@ -4,9 +4,13 @@ export { MacroRegistry, processMacros } from './registry.js';
 export { escapeXmlAttr, generateMacroId, structuredMacro, pageLinkValue, type StructuredMacroOptions, } from './xml.js';
 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';
 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';
+import { csvTable } from './plugins/csv-table.js';
+import { portfolioForJiraPlan } from './plugins/portfolio-for-jira-plan.js';
 /** Creates a registry pre-loaded with all built-in plugins. */
 export declare function createDefaultRegistry(): MacroRegistry;
 /**
@@ -42,4 +46,6 @@ export declare const macros: {
     tableFilter: typeof tableFilter;
     tableExcerptInclude: typeof tableExcerptInclude;
     tableJoiner: typeof tableJoiner;
+    csvTable: typeof csvTable;
+    portfolioForJiraPlan: typeof portfolioForJiraPlan;
 };

package/dist/macros/index.js

@@ -4,14 +4,24 @@ export { MacroRegistry, processMacros } from './registry.js';
 export { escapeXmlAttr, generateMacroId, structuredMacro, pageLinkValue, } from './xml.js';
 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';
 import { MacroRegistry } from './registry.js';
 import { coreMacrosPlugin } from './plugins/core.js';
 import { tableFilterPlugin } from './plugins/table-filter.js';
+import { csvTablePlugin } from './plugins/csv-table.js';
+import { portfolioForJiraPlanPlugin } from './plugins/portfolio-for-jira-plan.js';
 import { anchor, children, codeBlock, excerpt, excerptInclude, expand, includePage, info, jiraIssue, note, panel, status, tip, toc, warning, } from './plugins/core.js';
 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';
 /** Creates a registry pre-loaded with all built-in plugins. */
 export function createDefaultRegistry() {
-    return new MacroRegistry().use(coreMacrosPlugin).use(tableFilterPlugin);
+    return new MacroRegistry()
+        .use(coreMacrosPlugin)
+        .use(tableFilterPlugin)
+        .use(csvTablePlugin)
+        .use(portfolioForJiraPlanPlugin);
 }
 /**
  * Глобальный реестр по умолчанию (core + table-filter). Используется,
@@ -48,4 +58,6 @@ export const macros = {
     tableFilter,
     tableExcerptInclude,
     tableJoiner,
+    csvTable,
+    portfolioForJiraPlan,
 };

package/dist/macros/plugins/csv-table.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Plugin for the "CSV Table" Confluence macro (csv-table): renders a table
+ * from a CSV — most usefully from a page attachment (`source=attachment`),
+ * so the page body stays tiny while the data lives in the attached CSV.
+ * Large datasets that would blow the Confluence storage-size limit as an
+ * inline table are published as a CSV attachment and rendered by this macro
+ * (optionally wrapped in table-filter for in-header filtering/pagination).
+ */
+import { Markdown } from '../../markdown/markdown.js';
+import { type MacroPlugin } from '../types.js';
+export declare const CSV_TABLE_DEFAULTS: Record<string, string>;
+export declare const csvTablePlugin: MacroPlugin;
+/**
+ * Строит макрос "CSV Table" из вложения. По умолчанию `source=attachment`.
+ * Опции перекрывают дефолты (например `header`, `source`).
+ *
+ * @example
+ *   csvTable('worklogs_summary.csv')
+ *   macros.tableFilter(csvTable('worklogs_summary.csv'), { totalrow: ',,,,,,,,Sum' })
+ */
+export declare function csvTable(attachment: string, opts?: Record<string, string | undefined>): Markdown;

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

@@ -0,0 +1,53 @@
+/**
+ * Plugin for the "CSV Table" Confluence macro (csv-table): renders a table
+ * from a CSV — most usefully from a page attachment (`source=attachment`),
+ * so the page body stays tiny while the data lives in the attached CSV.
+ * Large datasets that would blow the Confluence storage-size limit as an
+ * inline table are published as a CSV attachment and rendered by this macro
+ * (optionally wrapped in table-filter for in-header filtering/pagination).
+ */
+import { macro } from '../builder.js';
+import { paramMap } from '../types.js';
+import { structuredMacro } from '../xml.js';
+// Дефолты csv-table, какие сохраняет редактор Confluence. Пустые-присутствие
+// (password/header/login) — чтобы редактор не «терял» контролы при следующем
+// открытии и сохранении страницы. source=attachment — данные из вложения.
+export const CSV_TABLE_DEFAULTS = {
+    isFirstTimeEnter: 'true',
+    password: '',
+    header: '',
+    source: 'attachment',
+    login: '',
+};
+// Порядок параметров как у редактора (стабильный вывод, дружелюбно к hash-diff).
+const CSV_TABLE_PARAM_ORDER = ['isFirstTimeEnter', 'password', 'attachment', 'header', 'source', 'login'];
+export const csvTablePlugin = {
+    name: 'csv-table',
+    macros: [
+        {
+            // Макрос «CSV Table». Рендерит таблицу из CSV. Обычный режим —
+            // source=attachment + attachment=<имя.csv>: CSV берётся из вложения
+            // страницы, тело страницы не пухнет от данных. Все переданные параметры
+            // накладываются поверх дефолтов; вывод — в каноничном порядке редактора.
+            name: 'csv-table',
+            render: (ctx) => {
+                const merged = { ...CSV_TABLE_DEFAULTS, ...paramMap(ctx.params) };
+                const keys = [...CSV_TABLE_PARAM_ORDER, ...Object.keys(merged).filter((k) => !CSV_TABLE_PARAM_ORDER.includes(k))];
+                const params = keys.filter((k) => merged[k] !== undefined).map((k) => ({ name: k, value: merged[k] }));
+                return structuredMacro('csv-table', ctx.macroId, { params });
+            },
+        },
+    ],
+};
+// ── Convenience builder ─────────────────────────────────────────────────
+/**
+ * Строит макрос "CSV Table" из вложения. По умолчанию `source=attachment`.
+ * Опции перекрывают дефолты (например `header`, `source`).
+ *
+ * @example
+ *   csvTable('worklogs_summary.csv')
+ *   macros.tableFilter(csvTable('worklogs_summary.csv'), { totalrow: ',,,,,,,,Sum' })
+ */
+export function csvTable(attachment, opts = {}) {
+    return macro('csv-table').param('attachment', attachment).withParams(opts).toMarkdown();
+}

package/dist/macros/plugins/portfolio-for-jira-plan.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Plugin for the "Portfolio for Jira — Plan" macro (portfolio-for-jira-plan):
+ * embeds an Advanced Roadmaps / Portfolio plan roadmap on a Confluence page.
+ * Bodyless macro; the plan is addressed by `url`, height by `planHeight`.
+ *
+ * Native md syntax (see native.ts + README): `{{portfolio-for-jira-plan:url=…|planHeight=900}}`.
+ */
+import { Markdown } from '../../markdown/markdown.js';
+import { type MacroPlugin } from '../types.js';
+export declare const portfolioForJiraPlanPlugin: MacroPlugin;
+/**
+ * Строит макрос «Portfolio for Jira — Plan».
+ *
+ * @example
+ *   portfolioForJiraPlan('https://jira/secure/PortfolioRoadmapConfluence.jspa?r=abc', { planHeight: '900' })
+ */
+export declare function portfolioForJiraPlan(url: string, opts?: Record<string, string | undefined>): Markdown;

package/dist/macros/plugins/portfolio-for-jira-plan.js

@@ -0,0 +1,40 @@
+/**
+ * Plugin for the "Portfolio for Jira — Plan" macro (portfolio-for-jira-plan):
+ * embeds an Advanced Roadmaps / Portfolio plan roadmap on a Confluence page.
+ * Bodyless macro; the plan is addressed by `url`, height by `planHeight`.
+ *
+ * Native md syntax (see native.ts + README): `{{portfolio-for-jira-plan:url=…|planHeight=900}}`.
+ */
+import { macro } from '../builder.js';
+import { paramMap } from '../types.js';
+import { structuredMacro } from '../xml.js';
+// Порядок параметров как у редактора Confluence (стабильный вывод под hash-diff).
+const PORTFOLIO_PARAM_ORDER = ['planHeight', 'url'];
+export const portfolioForJiraPlanPlugin = {
+    name: 'portfolio-for-jira-plan',
+    macros: [
+        {
+            // Макрос «Portfolio for Jira — Plan». Bodyless; параметры пробрасываются
+            // как есть, в каноничном порядке редактора. url — ссылка на план-роадмап,
+            // planHeight — высота встраивания в пикселях.
+            name: 'portfolio-for-jira-plan',
+            render: (ctx) => {
+                const m = paramMap(ctx.params);
+                const keys = [...PORTFOLIO_PARAM_ORDER.filter((k) => m[k] !== undefined),
+                    ...Object.keys(m).filter((k) => !PORTFOLIO_PARAM_ORDER.includes(k))];
+                const params = keys.map((k) => ({ name: k, value: m[k] }));
+                return structuredMacro('portfolio-for-jira-plan', ctx.macroId, { params });
+            },
+        },
+    ],
+};
+// ── Convenience builder ─────────────────────────────────────────────────
+/**
+ * Строит макрос «Portfolio for Jira — Plan».
+ *
+ * @example
+ *   portfolioForJiraPlan('https://jira/secure/PortfolioRoadmapConfluence.jspa?r=abc', { planHeight: '900' })
+ */
+export function portfolioForJiraPlan(url, opts = {}) {
+    return macro('portfolio-for-jira-plan').param('url', url).withParams(opts).toMarkdown();
+}

package/dist/markdown/native.js

@@ -51,6 +51,7 @@ export const NATIVE_PLACEHOLDERS = {
     status: 'status',
     anchor: 'anchor',
     'properties-report': 'detailssummary',
+    'portfolio-for-jira-plan': 'portfolio-for-jira-plan',
 };
 /** Полный перечень макросов с нативной md-разметкой (для документации/UI). */
 export function nativeMacroList() {
@@ -68,12 +69,13 @@ export function nativeMacroList() {
         { macro: 'status', syntax: '{{status:Текст|colour=Green|subtle=true}}' },
         { macro: 'anchor', syntax: '{{anchor:имя}}' },
         { macro: 'detailssummary', syntax: '{{properties-report:cql=…|firstcolumn=…}}' },
+        { macro: 'portfolio-for-jira-plan', syntax: '{{portfolio-for-jira-plan:url=…|planHeight=900}}' },
     ];
 }
 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)(?::((?:[^{}]|\{[^{])*?))?\}\}/g;
+const PLACEHOLDER_INLINE_RE = /\{\{(toc|children|jira|status|anchor|properties-report|portfolio-for-jira-plan)(?::((?:[^{}]|\{[^{])*?))?\}\}/g;
 const FENCE_RE = /^\s*(`{3,}|~{3,})/;
 /** Компактная пара маркеров без тела — для строчного контекста. */
 function inlineMarker(macroName, params) {

package/package.json

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