@wonseok-han/confluence-sync 2.0.1 → 2.0.2

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.1"><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.1</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.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>
 <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/diff-links.js

@@ -0,0 +1,37 @@
+/** Reuse Pull link/anchor conversion in a disposable tree; user files stay read-only. */
+import { mkdirSync, mkdtempSync, readFileSync, writeFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join, resolve, dirname, relative } from 'node:path';
+import { collectMarkdown, buildVault, vaultResolver } from '../documents/catalog.js';
+import { buildFrontmatter, splitFrontmatter, resolveWikilinks } from '../documents/obsidian.js';
+import { anchorPass, relinkPass, readDocInfo } from './pull.js';
+import { normalizeWikiPaths } from './local-state.js';
+import { buildIgnorer } from './ignore.js';
+import { inNestedWorkspace } from './workspace.js';
+export function diffLinks(base, path, title, before, after, wiki, mapping) {
+    const ignore = buildIgnorer(base, []), files = collectMarkdown(base).map(file => relative(base, file).split('\\').join('/')).filter(file => !ignore.ignores(file) && !inNestedWorkspace(base, file));
+    const stage = mkdtempSync(join(tmpdir(), 'csync-diff-'));
+    try {
+        const file = resolve(stage, path), paths = new Map(), refs = new Map();
+        mkdirSync(dirname(file), { recursive: true });
+        writeFileSync(file, buildFrontmatter({ title }) + before);
+        for (const rel of files) {
+            const entry = mapping[rel];
+            if (!entry || entry.type === 'folder')
+                continue;
+            const target = resolve(stage, rel);
+            paths.set(entry.pageId, target);
+            if (rel !== path)
+                refs.set(target, readDocInfo(resolve(base, rel)));
+        }
+        const pass = anchorPass([file], paths, refs);
+        relinkPass([file], paths, wiki, pass.info);
+        const body = splitFrontmatter(readFileSync(file, 'utf8')).body.replace(/^\r?\n/, '');
+        const vault = buildVault(files, [], base), lookup = vaultResolver(path, vault);
+        const canonical = (text) => resolveWikilinks(normalizeWikiPaths(base, path, text, files), lookup);
+        return { before: canonical(body), after: canonical(after) };
+    }
+    finally {
+        rmSync(stage, { recursive: true, force: true });
+    }
+}

package/dist/sync/diff.js

@@ -3,6 +3,7 @@ import { bold, cyan, red, green, dim } from '../shared/colors.js';
 import { readFileSync, statSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { readBaseline } from './baseline.js';
+import { diffLinks } from './diff-links.js';
 import { loadMapping } from './mapping.js';
 import { mappingPath } from './metadata.js';
 import { loadWorkspace, requireScope, inScope, inNestedWorkspace, scopePath, assertWorkspaceConnection, resolveSyncBase } from './workspace.js';
@@ -35,8 +36,11 @@ export async function documentDiff(base, input, options = {}) {
         const localBody = splitFrontmatter(after).body;
         // buildFrontmatter adds one blank separator. Keep intentional body whitespace.
         const comparisonBody = localBody !== after ? localBody.replace(/^\r?\n/, '') : localBody;
-        return { path, before: htmlToMarkdown(node.html, { obsidian: /^ {0,3}(?:> ?)+\[![\w-]+\]|\[\^[^\]\s]+\]:|(?<!\\)\^\[/m.test(comparisonBody), pageId: entry.pageId, storage: node.storage, codeLangs: codeLanguagesFromStorage(node.storage) }), after: comparisonBody,
-            source: 'remote', canRemote: true, note: `현재 원격 v${node.version ?? '?'} → 로컬 본문 비교입니다. 원격 HTML의 근사 변환이며 frontmatter는 제외합니다. 과거 동기화 기준과의 비교는 아닙니다. 변경 목록에는 본문 외 제목·원격 위치 변경도 포함됩니다.` };
+        const obsidian = /^ {0,3}(?:> ?)+\[![\w-]+\]|\[\^[^\]\s]+\]:|(?<!\\)\^\[|\[\[/m.test(comparisonBody);
+        const remote = htmlToMarkdown(node.html, { obsidian, pageId: entry.pageId, storage: node.storage, codeLangs: codeLanguagesFromStorage(node.storage) });
+        const comparison = diffLinks(base, path, node.title, remote, comparisonBody, obsidian, mapping);
+        return { path, ...comparison,
+            source: 'remote', canRemote: true, note: `현재 원격 v${node.version ?? '?'} → 로컬 본문 비교입니다. 원격 HTML을 근사 변환하고 연결된 문서 링크를 로컬 경로로 맞췄으며 frontmatter는 제외합니다. 과거 동기화 기준과의 비교는 아닙니다. 변경 목록에는 본문 외 제목·원격 위치 변경도 포함됩니다.` };
     }
     if (entry?.sourceObject)
         return { path, before: readBaseline(base, entry.sourceObject), after, source: 'baseline', canRemote: true, note: '마지막 Pull·Push 성공 시 저장한 Markdown → 현재 로컬 문서입니다. 첨부 파일의 바이트 차이는 본문 diff에 표시하지 않습니다.' };

package/dist/sync/local-state.js

@@ -2,11 +2,47 @@
 import { createHash } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-export function localStateHash(base, rel, rendered) {
-    const hash = createHash('sha256').update(readFileSync(resolve(base, rel)));
+import { readBaseline } from './baseline.js';
+import { buildVault, vaultPath } from '../documents/catalog.js';
+import { WIKILINK_RE } from '../documents/anchors.js';
+import { mapProse, splitFrontmatter } from '../documents/obsidian.js';
+export function localStateHash(base, rel, rendered, source) {
+    const hash = createHash('sha256').update(source ?? readFileSync(resolve(base, rel)));
     for (const asset of [...rendered.attachments].sort((a, b) => a.filename.localeCompare(b.filename))) {
         hash.update('\0' + asset.filename + '\0');
         hash.update(createHash('sha256').update(readFileSync(asset.abs)).digest());
     }
     return hash.digest('hex');
 }
+/** Ignore only rewritten note paths; labels, fragments, code and assets remain exact. */
+export function matchesLocalState(base, rel, rendered, entry, files, actual = localStateHash(base, rel, rendered)) {
+    if (entry.localHash === actual)
+        return true;
+    if (!entry.localHash || !entry.sourceObject)
+        return false;
+    const before = readBaseline(base, entry.sourceObject), after = readFileSync(resolve(base, rel), 'utf8');
+    // Reusing the old source with current attachments must reproduce the stored hash.
+    if (localStateHash(base, rel, rendered, before) !== entry.localHash)
+        return false;
+    return normalizeWikiPaths(base, rel, before, files) === normalizeWikiPaths(base, rel, after, files);
+}
+export function normalizeWikiPaths(base, rel, text, files) {
+    const vault = buildVault(files, [], base);
+    const { body } = splitFrontmatter(text), prefix = text.slice(0, text.length - body.length);
+    return prefix + mapProse(body, part => part.replace(WIKILINK_RE, (whole, bang, target, hash, alias) => {
+        if (bang)
+            return whole;
+        const name = target.replace(/\\$/, '').trim(), path = vaultPath(vault, name, false, rel);
+        if (!path)
+            return whole;
+        // A short ambiguous name is safe only when the target is in this directory.
+        if (!name.includes('/')) {
+            const key = name.replace(/\.md$/i, '').normalize('NFC').toLowerCase();
+            const candidates = files.filter(file => file.split('/').at(-1).replace(/\.md$/i, '').normalize('NFC').toLowerCase() === key);
+            const nearby = (rel.includes('/') ? rel.slice(0, rel.lastIndexOf('/') + 1) : '') + name.replace(/\.md$/i, '') + '.md';
+            if (candidates.length > 1 && path.normalize('NFC').toLowerCase() !== nearby.normalize('NFC').toLowerCase())
+                return whole;
+        }
+        return `[[${path}${hash ?? ''}|${alias ?? name}]]`;
+    }));
+}

package/dist/sync/prepare.js

@@ -12,7 +12,7 @@ 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('/')));
+        const vault = buildVault(rels, collectAssets(base).map(file => relative(base, file).split('\\').join('/')), base);
         for (const rel of rels) {
             const original = resolve(base, rel), destination = resolve(stage, rel);
             let text = readFileSync(original, 'utf8');
@@ -43,7 +43,7 @@ export async function preparePushTree(base, rels, selected, options) {
             mkdirSync(dirname(destination), { recursive: true });
             writeFileSync(destination, text);
         }
-        return { ...buildTreeRenderer(stage, rels, options ? { ...options, referenceBase: base } : undefined), dispose };
+        return { ...buildTreeRenderer(stage, rels, { referenceRoots: [], ...options, referenceBase: base }), dispose };
     }
     catch (error) {
         dispose();

package/dist/sync/pull.js

@@ -2,7 +2,7 @@ import { progressStep } from '../shared/progress.js';
 import { folderMoves, relocated, folderStamp, checkFolderDestination, verifyRemoteFolderMoves } from './remote-folder-moves.js';
 import { connectWorkspace } from './scope.js';
 import { storeBaseline } from './baseline.js';
-import { localStateHash } from './local-state.js';
+import { localStateHash, matchesLocalState } from './local-state.js';
 import { buildTreeRenderer } from './render.js';
 /**
  * `confluence-sync pull <pageId|url> [--out <dir>] (하위 항목 포함)`
@@ -215,7 +215,7 @@ async function pullNode(ctx, id, destDir) {
         throw new PullError(`pull 실패 #${id}: ${e.message}`);
     }
 }
-function readDocInfo(file) {
+export function readDocInfo(file) {
     const { data, body } = splitFrontmatter(readFileSync(file, 'utf8'));
     const headings = collectHeadings(body);
     return {
@@ -620,7 +620,7 @@ export async function runPull(argv, options = {}) {
         for (const rel of scoped) {
             const doc = tree.docs[rel], rendered = tree.render(rel, doc.body, doc.title), entry = oldMapping[rel];
             const clean = entry?.localHash
-                ? entry.localHash === localStateHash(baseDir, rel, rendered)
+                ? matchesLocalState(baseDir, rel, rendered, entry, rels)
                 : !!entry?.hash && (entry.hash === docHash(doc.title, rendered)
                     || entry.hash === docHash(legacy.docs[rel].title, legacy.render(rel, legacy.docs[rel].body, legacy.docs[rel].title))
                     || entry.hash === docHash(doc.title, tree.render(rel, doc.body, doc.title, 'panels'))

package/dist/sync/push.js

@@ -1,7 +1,7 @@
 import { progressStep } from '../shared/progress.js';
 import { storeBaseline } from './baseline.js';
 import { buildTreeRenderer } from './render.js';
-import { localStateHash } from './local-state.js';
+import { localStateHash, matchesLocalState } from './local-state.js';
 import { loadIndex, stagedPaths, assertStaged, completeStaged } from './staging.js';
 /** Incremental Confluence push and local preview orchestration. */
 import { mappingPath } from './metadata.js';
@@ -144,7 +144,7 @@ export async function runPush(argv) {
         const legacy = buildTreeRenderer(BASE_DIR, allRel);
         const locallyClean = (rel) => {
             const entry = mapping[rel];
-            return entry?.localHash ? entry.localHash === localHashes[rel] : !!entry?.hash && (entry.hash === hashes[rel]
+            return entry?.localHash ? matchesLocalState(BASE_DIR, rel, render(rel, docs[rel].body, docs[rel].title), entry, allRel, localHashes[rel]) : !!entry?.hash && (entry.hash === hashes[rel]
                 || entry.hash === docHash(legacy.docs[rel].title, legacy.render(rel, legacy.docs[rel].body, legacy.docs[rel].title))
                 || entry.hash === docHash(docs[rel].title, render(rel, docs[rel].body, docs[rel].title, 'panels'))
                 || entry.hash === docHash(docs[rel].title, render(rel, docs[rel].body, docs[rel].title, true))

package/dist/sync/render.js

@@ -14,7 +14,7 @@ import { buildDocIndex, buildVault, collectAssets, vaultResolver, resolveAnchorT
 export function buildTreeRenderer(baseDir, rels, options) {
     const { titles, anchors, docs } = buildDocIndex(rels, baseDir);
     // Obsidian [[wikilink]] 해석용 이름 인덱스
-    const vault = buildVault(rels, collectAssets(baseDir).map((f) => relative(baseDir, f)));
+    const vault = buildVault(rels, collectAssets(baseDir).map((f) => relative(baseDir, f)), options?.referenceBase ?? baseDir);
     // 누가 어느 헤딩을 가리키는지 먼저 모은다 — 그 헤딩에만 Anchor 매크로를 심는다.
     const lookup = options ? buildReferenceLookup(options.referenceBase ?? baseDir, rels, options.referenceRoots, options.baseUrl) : null;
     const anchorTargets = resolveAnchorTargets(docs, vault, lookup?.localTarget);

package/dist/sync/staging.js

@@ -1,6 +1,6 @@
 import { green, cyan } from '../shared/colors.js';
 import { reconcilePages } from './reconcile.js';
-import { localStateHash } from './local-state.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';
@@ -110,7 +110,7 @@ export async function inspectStaging(base, options = {}, only) {
             const oldPath = doc.fm.pageId && Object.keys(originalMapping).find(key => originalMapping[key].pageId === doc.fm.pageId && !key.endsWith('/'));
             const prior = originalMapping[path] ?? (oldPath ? originalMapping[oldPath] : undefined);
             const reconciled = mapping[path];
-            const clean = prior?.localHash ? prior.localHash === localStateHash(base, path, rendered) : !!prior?.hash && (prior.hash === hash || prior.hash === docHash(legacy.docs[path].title, legacy.render(path, legacy.docs[path].body, legacy.docs[path].title))
+            const clean = prior?.localHash ? matchesLocalState(base, path, rendered, prior, all) : !!prior?.hash && (prior.hash === hash || prior.hash === docHash(legacy.docs[path].title, legacy.render(path, legacy.docs[path].body, legacy.docs[path].title))
                 || prior.hash === docHash(doc.title, prepared.render(path, doc.body, doc.title, 'panels'))
                 || prior.hash === docHash(doc.title, prepared.render(path, doc.body, doc.title, true))
                 || prior.hash === docHash(legacy.docs[path].title, legacy.render(path, legacy.docs[path].body, legacy.docs[path].title, 'panels'))