confluence-md-sync 0.8.3 → 0.8.5

package/README.md

@@ -370,6 +370,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

@@ -582,14 +582,24 @@ class Converter {
             const grid = trs.map((tr) => elements(tr.children)
                 .filter((c) => c.name === 'td' || c.name === 'th')
                 .map((c) => {
+                // Сначала честная конвертация (page-ссылки → {{page:…}}); стрип пустых
+                // ac:/ri:-вставок — только если она не удалась (иначе теряются ссылки
+                // без текста тела: у них подпись — заголовок страницы).
                 let flat;
                 try {
-                    flat = this.cellFlatten(this.stripEmptyNamespaced(c.children));
+                    flat = this.cellFlatten(c.children);
                 }
                 catch (e) {
                     if (!(e instanceof Unrepresentable))
                         throw e;
-                    flat = textContent(c.children);
+                    try {
+                        flat = this.cellFlatten(this.stripEmptyNamespaced(c.children));
+                    }
+                    catch (e2) {
+                        if (!(e2 instanceof Unrepresentable))
+                            throw e2;
+                        flat = textContent(c.children);
+                    }
                 }
                 return flat.replace(/\s+/g, ' ').trim();
             }));

package/dist/macros/index.d.ts

@@ -4,9 +4,11 @@ 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';
 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';
 /** Creates a registry pre-loaded with all built-in plugins. */
 export declare function createDefaultRegistry(): MacroRegistry;
 /**
@@ -42,4 +44,5 @@ export declare const macros: {
     tableFilter: typeof tableFilter;
     tableExcerptInclude: typeof tableExcerptInclude;
     tableJoiner: typeof tableJoiner;
+    csvTable: typeof csvTable;
 };

package/dist/macros/index.js

@@ -4,14 +4,17 @@ 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';
 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 { 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';
 /** 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);
 }
 /**
  * Глобальный реестр по умолчанию (core + table-filter). Используется,
@@ -48,4 +51,5 @@ export const macros = {
     tableFilter,
     tableExcerptInclude,
     tableJoiner,
+    csvTable,
 };

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/package.json

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