@wonseok-han/confluence-sync 2.0.2 → 2.0.3

package/dist/site/index.html

@@ -1,6 +1,6 @@
 <!doctype html>
-<html lang="ko"><head><meta charset="utf-8"><meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'sha256-gC1xP5ikAuS9OEjIyx77wCJoX4h4jhP+0cQnKC4FHD4='; connect-src 'self' http://127.0.0.1:* http://localhost:* https://*.blob.vercel-storage.com; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self'; frame-src 'self'; worker-src 'self'; object-src 'none'; base-uri 'none'; form-action 'none'"><meta name="referrer" content="no-referrer"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="csync-token" content=""><meta name="csync-runtime" content="standalone"><meta name="csync-version" content="2.0.2"><title>문서 워크스페이스 · confluence-sync</title><link rel="icon" type="image/svg+xml" href="/assets/favicon.svg?v=paperlink"><link rel="stylesheet" href="/assets/app.css"></head><body>
-<header class="app-header"><a class="brand" href="/" aria-label="confluence-sync 홈"><img class="brand-symbol" src="/assets/favicon.svg?v=paperlink" alt="" aria-hidden="true" width="30" height="30">confluence<span class="brand-light">sync</span></a><span class="app-version" aria-label="현재 버전">v2.0.2</span><span class="local-status"><i></i><span id="local-connection-status">브라우저 폴더 선택 필요</span></span><button id="local-disconnect" class="quiet" type="button" hidden>연결 해제</button></header>
+<html lang="ko"><head><meta charset="utf-8"><meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'sha256-gC1xP5ikAuS9OEjIyx77wCJoX4h4jhP+0cQnKC4FHD4='; connect-src 'self' http://127.0.0.1:* http://localhost:* https://*.blob.vercel-storage.com; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self'; frame-src 'self'; worker-src 'self'; object-src 'none'; base-uri 'none'; form-action 'none'"><meta name="referrer" content="no-referrer"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="csync-token" content=""><meta name="csync-runtime" content="standalone"><meta name="csync-version" content="2.0.3"><title>문서 워크스페이스 · confluence-sync</title><link rel="icon" type="image/svg+xml" href="/assets/favicon.svg?v=paperlink"><link rel="stylesheet" href="/assets/app.css"></head><body>
+<header class="app-header"><a class="brand" href="/" aria-label="confluence-sync 홈"><img class="brand-symbol" src="/assets/favicon.svg?v=paperlink" alt="" aria-hidden="true" width="30" height="30">confluence<span class="brand-light">sync</span></a><span class="app-version" aria-label="현재 버전">v2.0.3</span><span class="local-status"><i></i><span id="local-connection-status">브라우저 폴더 선택 필요</span></span><button id="local-disconnect" class="quiet" type="button" hidden>연결 해제</button></header>
 <main id="workspace-interface" class="app-main">
   <div class="page-heading"><div><div class="eyebrow">DOCUMENT WORKSPACE</div><h1>문서 워크스페이스<span class="title-dot">.</span></h1></div><div class="page-heading-actions"><p>문서를 변환하고, Confluence에서 가져오거나 업로드하세요.</p><button id="open-help" aria-haspopup="dialog" aria-controls="help-dialog">사용 도움말</button></div></div>
   <div class="mode-tabs" role="tablist" aria-label="문서 작업"><button id="tab-convert" role="tab" aria-selected="true" aria-controls="convert-view">문서 변환</button><button id="tab-sync" role="tab" aria-selected="false" aria-controls="sync-view" tabindex="-1">Confluence</button></div>

package/dist/sync/prepare.js

@@ -2,7 +2,7 @@
 import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join, relative, resolve } from 'node:path';
 import { tmpdir } from 'node:os';
-import { buildVault, collectAssets } from '../documents/catalog.js';
+import { readDoc } from '../documents/catalog.js';
 import { prepareMarkdown } from '../conversion/markdown.js';
 import { within } from './workspace.js';
 import { buildTreeRenderer } from './render.js';
@@ -12,38 +12,34 @@ export async function preparePushTree(base, rels, selected, options) {
     try {
         const chosen = new Set(selected);
         const sourceRenderer = buildTreeRenderer(base, rels);
-        const vault = buildVault(rels, collectAssets(base).map(file => relative(base, file).split('\\').join('/')), base);
-        for (const rel of rels) {
+        const vault = sourceRenderer.vault;
+        const preparedDocs = { ...sourceRenderer.docs };
+        for (const rel of rels.filter(rel => chosen.has(rel))) {
             const original = resolve(base, rel), destination = resolve(stage, rel);
-            let text = readFileSync(original, 'utf8');
-            if (chosen.has(rel)) {
-                // Preview renders actual temporary PNGs too, so attachment hashes match Push.
-                const converted = await prepareMarkdown(text, original, base, vault, stage, false, undefined, false);
-                text = converted.text;
-                for (const [asset, source] of converted.copies) {
-                    const target = resolve(stage, asset);
-                    mkdirSync(dirname(target), { recursive: true });
-                    copyFileSync(source, target);
-                }
+            // Preview renders actual temporary PNGs too, so attachment hashes match Push.
+            const converted = await prepareMarkdown(readFileSync(original, 'utf8'), original, base, vault, stage, false, undefined, false);
+            for (const [asset, source] of converted.copies) {
+                const target = resolve(stage, asset);
+                mkdirSync(dirname(target), { recursive: true });
+                copyFileSync(source, target);
             }
-            // Use the publication renderer as the final asset authority: conversion may
+            // Use the source renderer as the final asset authority: conversion may
             // miss balanced parentheses in Markdown paths or assets inside raw HTML.
-            if (chosen.has(rel)) {
-                const doc = sourceRenderer.docs[rel];
-                for (const asset of sourceRenderer.render(rel, doc.body, doc.title).attachments) {
-                    if (!within(base, asset.abs) || !existsSync(asset.abs))
-                        continue;
-                    const target = resolve(stage, relative(base, asset.abs));
-                    if (existsSync(target))
-                        continue;
-                    mkdirSync(dirname(target), { recursive: true });
-                    copyFileSync(asset.abs, target);
-                }
+            const doc = sourceRenderer.docs[rel];
+            for (const asset of sourceRenderer.render(rel, doc.body, doc.title).attachments) {
+                if (!within(base, asset.abs) || !existsSync(asset.abs))
+                    continue;
+                const target = resolve(stage, relative(base, asset.abs));
+                if (existsSync(target))
+                    continue;
+                mkdirSync(dirname(target), { recursive: true });
+                copyFileSync(asset.abs, target);
             }
             mkdirSync(dirname(destination), { recursive: true });
-            writeFileSync(destination, text);
+            writeFileSync(destination, converted.text);
+            preparedDocs[rel] = readDoc(stage, rel);
         }
-        return { ...buildTreeRenderer(stage, rels, { referenceRoots: [], ...options, referenceBase: base }), dispose };
+        return { ...buildTreeRenderer(stage, rels, { referenceRoots: [], ...options, referenceBase: base }, preparedDocs), original: sourceRenderer, dispose };
     }
     catch (error) {
         dispose();

package/dist/sync/reconcile.js

@@ -2,12 +2,12 @@
 import { existsSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { buildFolderIndex, parentKeyOf, readDoc } from '../documents/catalog.js';
-export function reconcilePages(base, mapping, allFiles, selected, scope) {
+export function reconcilePages(base, mapping, allFiles, selected, scope, sourceDocs) {
     const next = structuredClone(mapping);
     const byId = new Map(Object.entries(mapping).map(([key, entry]) => [entry.pageId, { key, entry }]));
     const oldFolders = buildFolderIndex(Object.keys(mapping).filter(key => key.endsWith('.md')));
     const folders = buildFolderIndex(allFiles);
-    const docs = new Map(allFiles.map(key => [key, readDoc(base, key)]));
+    const docs = new Map(allFiles.map(key => [key, sourceDocs?.[key] ?? readDoc(base, key)]));
     const seen = new Map();
     for (const [key, doc] of docs) {
         const id = doc.fm.pageId ?? mapping[key]?.pageId;

package/dist/sync/render.js

@@ -11,10 +11,10 @@ import { buildReferenceLookup } from './references.js';
 import { relative } from 'node:path';
 import { toStorage } from '../documents/markdown.js';
 import { buildDocIndex, buildVault, collectAssets, vaultResolver, resolveAnchorTargets, } from '../documents/catalog.js';
-export function buildTreeRenderer(baseDir, rels, options) {
-    const { titles, anchors, docs } = buildDocIndex(rels, baseDir);
+export function buildTreeRenderer(baseDir, rels, options, sourceDocs) {
+    const { titles, anchors, docs } = buildDocIndex(rels, baseDir, sourceDocs);
     // Obsidian [[wikilink]] 해석용 이름 인덱스
-    const vault = buildVault(rels, collectAssets(baseDir).map((f) => relative(baseDir, f)), options?.referenceBase ?? baseDir);
+    const vault = buildVault(rels, collectAssets(baseDir).map((f) => relative(baseDir, f).split('\\').join('/')), options?.referenceBase ?? baseDir);
     // 누가 어느 헤딩을 가리키는지 먼저 모은다 — 그 헤딩에만 Anchor 매크로를 심는다.
     const lookup = options ? buildReferenceLookup(options.referenceBase ?? baseDir, rels, options.referenceRoots, options.baseUrl) : null;
     const anchorTargets = resolveAnchorTargets(docs, vault, lookup?.localTarget);
@@ -44,5 +44,5 @@ export function buildTreeRenderer(baseDir, rels, options) {
         });
         return { ...result, linkWarnings: [...warnings], referenceLinks: [...references] };
     };
-    return { titles, docs, render };
+    return { titles, docs, render, vault };
 }

package/dist/sync/staging.js

@@ -1,7 +1,6 @@
 import { green, cyan } from '../shared/colors.js';
 import { reconcilePages } from './reconcile.js';
 import { matchesLocalState } from './local-state.js';
-import { buildTreeRenderer } from './render.js';
 /** Document-level upload selection. Source files are never copied into the index. */
 import { createHash, randomUUID } from 'node:crypto';
 import { existsSync, lstatSync, readFileSync, mkdirSync, writeFileSync, renameSync, unlinkSync, realpathSync } from 'node:fs';
@@ -101,8 +100,8 @@ export async function inspectStaging(base, options = {}, only) {
     const prepared = await preparePushTree(base, all, selected, { referenceRoots: options.referenceRoots ?? [], baseUrl: options.baseUrl });
     try {
         const originalMapping = loadMapping(mappingPath(base));
-        const mapping = reconcilePages(base, originalMapping, all, selected, requireScope(workspace));
-        const legacy = buildTreeRenderer(base, all);
+        const mapping = reconcilePages(base, originalMapping, all, selected, requireScope(workspace), prepared.original.docs);
+        const legacy = prepared.original;
         const rows = selected.map(path => {
             const doc = prepared.docs[path], rendered = prepared.render(path, doc.body, doc.title), hash = docHash(doc.title, rendered);
             if (sourceHash(base, path) !== sources[path])