feat(Wikilinks): Support smart links and pages in multiple spaces

src/MarkdownTransformer/index.ts

@@ -157,10 +157,6 @@ export class MarkdownTransformer implements Transformer<Markdown> {
 
 		tokenizer.use(wikilinksPlugin);
 
-		//if (schema.nodes.task) {
-		//	tokenizer.use(taskLists);
-		//}
-
 		(["nodes", "marks"] as (keyof SchemaMapping)[]).forEach((key) => {
 			for (const idx in pmSchemaToMdMapping[key]) {
 				if (schema[key][idx]) {

src/MarkdownTransformer/wikilinks.ts

@@ -48,9 +48,6 @@ export function wikilinks(state: StateInline): boolean {
 
 	let token = state.push("link_open", "a", 1);
 	token.attrs = [["href", href]];
-	if (alias) {
-		token.attrs.push(["title", alias]);
-	}
 	state.md.inline.tokenize(state);
 	token = state.push("link_close", "a", -1);
 

src/Publisher.ts

@@ -37,6 +37,7 @@ export interface AdfFile {
 	tags: string[];
 	pageId: string | undefined;
 	dontChangeParentPageId: boolean;
+	spaceKey?: string;
 }
 
 interface ConfluenceNode {
@@ -119,14 +120,14 @@ export class Publisher {
 		);
 		const confluencePagesToPublish = flattenTree(confluencePageTree);
 
-		const fileToPageIdMap: Record<string, string> = {};
+		const fileToPageIdMap: Record<string, AdfFile> = {};
 
 		confluencePagesToPublish.forEach((node) => {
 			if (!node.file.pageId) {
 				throw new Error("Missing Page ID");
 			}
 
-			fileToPageIdMap[node.file.fileName] = node.file.pageId;
+			fileToPageIdMap[node.file.fileName] = node.file;
 		});
 
 		confluencePagesToPublish.forEach((node) => {
@@ -146,14 +147,22 @@ export class Publisher {
 							);
 							const pagename = `${wikilinkUrl.pathname}.md`;
 
-							const linkPageId = fileToPageIdMap[pagename];
-							const confluenceUrl = `${this.settings.confluenceBaseUrl}/wiki/spaces/~557058aea5688c52b94d15aabe96def1abc413/pages/${linkPageId}${wikilinkUrl.hash}`;
-							console.log({
-								pagename,
-								fileToPageIdMap,
-								wikiurl: confluenceUrl,
-							});
-							node.marks[0].attrs.href = confluenceUrl;
+							const linkPage = fileToPageIdMap[pagename];
+							if (linkPage) {
+								const confluenceUrl = `${this.settings.confluenceBaseUrl}/wiki/spaces/${linkPage.spaceKey}/pages/${linkPage.pageId}${wikilinkUrl.hash}`;
+								node.marks[0].attrs.href = confluenceUrl;
+								if (node.text === wikilinkUrl.pathname) {
+									node.type = "inlineCard";
+									node.attrs = {
+										url: node.marks[0].attrs.href,
+									};
+									delete node.marks;
+									delete node.text;
+									return node;
+								}
+							} else {
+								node.marks.remove(node.marks[0]);
+							}
 							return node;
 						}
 					}
@@ -210,10 +219,12 @@ export class Publisher {
 				topPageId
 			);
 			node.file.pageId = pageDetails.id;
+			node.file.spaceKey = pageDetails.spaceKey;
 			version = pageDetails.version;
 			existingAdf = pageDetails.existingAdf;
 		} else {
 			node.file.pageId = parentPageId;
+			node.file.spaceKey = spaceKey;
 			version = 0;
 			existingAdf = "";
 		}
@@ -254,14 +265,24 @@ export class Publisher {
 			const contentById =
 				await this.confluenceClient.content.getContentById({
 					id: file.pageId,
-					expand: ["version", "body.atlas_doc_format", "ancestors"],
+					expand: [
+						"version",
+						"body.atlas_doc_format",
+						"ancestors",
+						"space",
+					],
 				});
 
+			if (!contentById.space?.key) {
+				throw new Error("Missing Space Key");
+			}
+
 			return {
 				id: contentById.id,
 				title: file.pageTitle,
 				version: contentById?.version?.number ?? 1,
 				existingAdf: contentById?.body?.atlas_doc_format?.value,
+				spaceKey: contentById.space.key,
 			};
 		}
 
@@ -299,6 +320,7 @@ export class Publisher {
 				title: file.pageTitle,
 				version: currentPage?.version?.number ?? 1,
 				existingAdf: currentPage?.body?.atlas_doc_format?.value,
+				spaceKey,
 			};
 		} else {
 			console.log("Creating page");
@@ -329,6 +351,7 @@ export class Publisher {
 				title: file.pageTitle,
 				version: pageDetails?.version?.number ?? 1,
 				existingAdf: pageDetails?.body?.atlas_doc_format?.value,
+				spaceKey,
 			};
 		}
 	}

src/mdToADF.ts

@@ -33,10 +33,7 @@ export default class MdToADF {
 					node.marks[0].type === "link" &&
 					node.marks[0].attrs
 				) {
-					if (
-						!node.marks[0].attrs.title &&
-						node.marks[0].attrs.href === node.text
-					) {
+					if (node.marks[0].attrs.href === node.text) {
 						node.type = "inlineCard";
 						node.attrs = { url: node.marks[0].attrs.href };
 						delete node.marks;