create-confluence-sync 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-confluence-sync",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Bidirectional Confluence Server documentation sync via Git. Edit XHTML locally, commit, auto-sync with Confluence.",
   "type": "module",
   "bin": {

package/src/git.js

@@ -12,13 +12,13 @@ function exec(projectRoot, command) {
 }
 
 function getChangedFiles(projectRoot) {
-  const output = exec(projectRoot, 'git diff --name-only HEAD~1 HEAD');
+  const output = exec(projectRoot, 'git -c core.quotePath=false diff --name-only HEAD~1 HEAD');
   if (!output) return [];
   return output.split('\n').filter(f => f.endsWith('.xhtml'));
 }
 
 function getDeletedFiles(projectRoot) {
-  const output = exec(projectRoot, 'git diff --name-only --diff-filter=D HEAD~1 HEAD');
+  const output = exec(projectRoot, 'git -c core.quotePath=false diff --name-only --diff-filter=D HEAD~1 HEAD');
   if (!output) return [];
   return output.split('\n').filter(f => f.endsWith('.xhtml'));
 }

package/src/hook.js

@@ -30,10 +30,8 @@ function loadConfig(projectRoot) {
 }
 
 async function main() {
-  // Guard: prevent recursion
-  if (process.env.CONFLUENCE_SYNC_RUNNING === '1') {
-    return;
-  }
+  // Guard is handled by the shell hook script (post-commit).
+  // Set env for child processes (e.g. commitAll) to prevent recursion.
   process.env.CONFLUENCE_SYNC_RUNNING = '1';
 
   // Normalize projectRoot (Windows backslashes)

package/src/sync.js

@@ -165,9 +165,28 @@ export async function push(apiClient, tree, projectRoot, spaceKey, changedFiles)
   let created = 0;
   let updated = 0;
 
-  for (const filePath of changedFiles) {
-    const normalized = filePath.replace(/\\/g, '/');
-    const absolutePath = path.resolve(projectRoot, normalized);
+  for (let filePath of changedFiles) {
+    let normalized = filePath.replace(/\\/g, '/');
+    let absolutePath = path.resolve(projectRoot, normalized);
+
+    // Normalize: if file is not inside a same-named folder, wrap it
+    const fileName = path.basename(normalized);
+    const folderName = path.basename(path.dirname(normalized));
+    const expectedFolder = fileName.replace(/\.xhtml$/, '');
+
+    if (folderName !== expectedFolder) {
+      const newDir = path.join(path.dirname(absolutePath), expectedFolder);
+      const newAbsolute = path.join(newDir, fileName);
+      const newNormalized = path.relative(projectRoot, newAbsolute).replace(/\\/g, '/');
+
+      await fs.mkdir(newDir, { recursive: true });
+      await fs.rename(absolutePath, newAbsolute);
+      console.log(`Normalized: ${normalized} → ${newNormalized}`);
+
+      normalized = newNormalized;
+      absolutePath = newAbsolute;
+    }
+
     const body = await fs.readFile(absolutePath, 'utf-8');
     const existing = getPageByPath(tree, normalized);