@getguru/import-engine 0.1.4 → 0.1.5

package/docx-import-cli.js

@@ -101996,8 +101996,8 @@ function capFolderDepth(path3) {
 function buildFolderTree(docs2) {
   let nextFolderId = 0;
   const makeFolderId = () => `folder${nextFolderId++}`;
-  function getOrCreateChild(childrenMap, segment, parentPathSegments) {
-    let child = childrenMap.get(segment);
+  function getOrCreateChild(childrenMap, segment, parentPathSegments, lookupKey = segment) {
+    let child = childrenMap.get(lookupKey);
     if (!child) {
       child = {
         id: makeFolderId(),
@@ -102006,19 +102006,20 @@ function buildFolderTree(docs2) {
         cardIds: [],
         pathSegments: [...parentPathSegments, segment]
       };
-      childrenMap.set(segment, child);
+      childrenMap.set(lookupKey, child);
     }
     return child;
   }
   const roots = /* @__PURE__ */ new Map();
   const collectionLevelCardIds = [];
-  function attachCardToPath(docId, rawPath) {
+  function attachCardToPath(docId, rawPath, scope) {
     const path3 = capFolderDepth(rawPath);
     let childrenMap = roots;
     let node;
     let pathSegments = [];
     for (const segment of path3) {
-      node = getOrCreateChild(childrenMap, segment, pathSegments);
+      const lookupKey = childrenMap === roots && scope != null ? `${scope}\0${segment}` : segment;
+      node = getOrCreateChild(childrenMap, segment, pathSegments, lookupKey);
       childrenMap = node.children;
       pathSegments = node.pathSegments;
     }
@@ -102051,7 +102052,11 @@ function buildFolderTree(docs2) {
       collectionLevelCardIds.push(doc.id);
       continue;
     }
-    attachCardToPath(doc.id, path3);
+    attachCardToPath(
+      doc.id,
+      path3,
+      Array.isArray(doc.guruFolder) ? doc.guruFolderScope : void 0
+    );
   }
   return { roots: Array.from(roots.values()), collectionLevelCardIds };
 }
@@ -110996,6 +111001,9 @@ function processConfluenceDoc(div, doc) {
   tryStep(doc, "resolving the page's folder", div, () => {
     const breadcrumbs = Array.from(div.querySelectorAll("#breadcrumbs a"));
     doc.guruFolder = breadcrumbs.slice(2).map((breadcrumb) => breadcrumb.textContent.trim());
+    if (doc.folder) {
+      doc.guruFolderScope = doc.folder;
+    }
   });
   removeAll(div, "#main-header, #content > .page-metadata, #footer, input");
   tryStep(doc, "converting panels to guru callouts", div, () => {
@@ -111214,7 +111222,7 @@ function buildConfluencePageIndex(allDocs, zip) {
     if (pageId && !byId.has(pageId)) {
       byId.set(pageId, doc);
     }
-    const space = normalizeConfluenceKey((doc.folder || "").split("/")[0]);
+    const space = normalizeConfluenceKey((doc.folder || "").split("/").pop());
     const title = normalizeConfluenceKey(doc.title);
     if (space && title) {
       if (!byTitle.has(space)) {
@@ -114433,7 +114441,7 @@ var import_jszip5 = __toESM(require_lib3());
 var import_url_join6 = __toESM(require_url_join());
 
 // packages/import-engine/package.json
-var version = "0.1.4";
+var version = "0.1.5";
 
 // src/docx-import/detectors.js
 function isGoogleSitesDoc(div) {
@@ -114457,7 +114465,7 @@ var showError;
 var updateLoader;
 var showReport;
 var docLinkIndex = /* @__PURE__ */ new Map();
-var toolVersion = true ? `${version}+${"b8fcb63"}` : version;
+var toolVersion = true ? `${version}+${"8c32bd5"}` : version;
 var pendingUpload = null;
 function confirmPendingUpload() {
   const upload = pendingUpload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getguru/import-engine",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Command-line engine that turns Notion, Confluence, Google, Word, PDF, Markdown and spreadsheet exports into Guru import zips.",
   "bin": {
     "guru-import-engine": "docx-import-cli.js"