fixed internal links

packages/download-notion/src/pathUtils.ts

@@ -1,6 +1,9 @@
 import path from "path"
 
 export function addPathPrefix(basePath: string, prefix: string): string {
+  if (prefix === "") {
+    return basePath
+  }
   const normalizedPrefix = path.normalize(prefix)
   const normalizedPath = path.normalize(basePath)
 
@@ -12,6 +15,10 @@ export function addPathPrefix(basePath: string, prefix: string): string {
 }
 
 export function removePathPrefix(fullPath: string, prefix: string): string {
+  if (prefix === "") {
+    return fullPath
+  }
+
   const normalizedFullPath = path.normalize(fullPath)
   const normalizedPrefix = path.normalize(prefix)
 
@@ -33,3 +40,10 @@ export function removePathPrefix(fullPath: string, prefix: string): string {
 
   return result
 }
+
+export function removePathExtension(convertedLink: string) {
+  // Returns a normalized path with the extension removed
+  const parsedPath = path.parse(convertedLink)
+  convertedLink = path.join(parsedPath.dir, parsedPath.name)
+  return convertedLink
+}

packages/download-notion/src/plugins/internalLinks.ts

@@ -2,6 +2,7 @@ import path from "path"
 
 import { NotionPage } from "../NotionPage"
 import { error, warning } from "../log"
+import { removePathExtension } from "../pathUtils"
 import { IDocuNotionContext, IPlugin } from "./pluginTypes"
 
 // converts a url to a local link, if it is a link to a page in the Notion site
@@ -88,14 +89,13 @@ function convertLinkHref(
   targetPage: NotionPage,
   url: string
 ): string {
-  // TODO: Instead of type directory this should be type `markdown`
   let convertedLink = context.filesManager.get(
-    "base",
+    "markdown",
     "page",
     targetPage.id
   )?.path
   if (!context.options.pageLinkHasExtension) {
-    convertedLink = path.basename(convertedLink, path.extname(convertedLink))
+    convertedLink = removePathExtension(convertedLink)
   }
 
   /*****************************
@@ -111,6 +111,7 @@ function convertLinkHref(
   //verbose(`Converting Link ${url} --> ${convertedLink}`);
   return convertedLink
 }
+
 // Parse the link ID to get the base (before the #) and the fragment (# and after).
 export function parseLinkId(fullLinkId: string): {
   baseLinkId: string // before the #

packages/download-notion/src/transform.ts

@@ -3,6 +3,7 @@ import chalk from "chalk"
 import { NotionPage } from "./NotionPage"
 import { IDocuNotionConfig } from "./config/configuration"
 import { error, info, logDebug, logDebugFn, verbose, warning } from "./log"
+import { getImageUrl } from "./notion_objects_utils"
 import {
   IDocuNotionContext,
   IRegexMarkdownModification,
@@ -258,13 +259,8 @@ function getFrontMatter(page: NotionPage): string {
 
   const standardProperties = {
     title: `${page.title.replaceAll(":", "-")}`,
-    // TODO: Consider clearing the props above which are non standard
     id: page.metadata.id,
-    // TODO: Cover images have to be handled, downloaded and stored. Decide if only store files, or also external.
-    cover:
-      page.metadata.cover?.external?.url ||
-      page.metadata.cover?.file?.url ||
-      "",
+    cover: page.metadata.cover ? getImageUrl(page.metadata.cover) : "",
     created_time: page.metadata.created_time,
     last_edited_time: page.metadata.last_edited_time,
   }

packages/download-notion/test/pathUtils.test.ts

@@ -1,7 +1,11 @@
 import path from "path"
 import { describe, expect, test } from "vitest"
 
-import { addPathPrefix, removePathPrefix } from "../src/pathUtils"
+import {
+  addPathPrefix,
+  removePathExtension,
+  removePathPrefix,
+} from "../src/pathUtils"
 
 describe("addPathPrefix", () => {
   test("adds prefix to relative path", () => {
@@ -10,6 +14,10 @@ describe("addPathPrefix", () => {
     )
   })
 
+  test("no prefix maintains the original path", () => {
+    expect(addPathPrefix("/foo/bar", "")).toBe(path.normalize("/foo/bar"))
+  })
+
   test("modifies absolute path", () => {
     expect(addPathPrefix("/foo/bar", "/prefix")).toBe(
       path.normalize("/prefix/foo/bar")
@@ -52,3 +60,25 @@ describe("removePathPrefix", () => {
     )
   })
 })
+
+describe("removePathExtension", () => {
+  test("removes extension from file path", () => {
+    expect(removePathExtension("/foo/bar.txt")).toBe("/foo/bar")
+  })
+
+  test("handles path without extension", () => {
+    expect(removePathExtension("/foo/bar")).toBe("/foo/bar")
+  })
+
+  test("handles path with multiple dots", () => {
+    expect(removePathExtension("/foo/bar.test.js")).toBe("/foo/bar.test")
+  })
+
+  test("handles relative paths", () => {
+    expect(removePathExtension("./foo/bar.md")).toBe("foo/bar")
+  })
+
+  test("handles paths with only filename", () => {
+    expect(removePathExtension("file.txt")).toBe("file")
+  })
+})