imdone-core 1.52.1 → 1.53.1

package/lib/adapters/markdown.js

@@ -3,48 +3,75 @@ const imageSize = require('markdown-it-imsize')
 const emoji = require('markdown-it-emoji')
 const mark = require('markdown-it-mark')
 const removeMD = require('remove-markdown')
-const wikilinks = require('@kwvanderlinde/markdown-it-wikilinks')
 const path = require('path');
 
 const MarkdownIt = require('markdown-it')
 let _platform = process.platform
 
 function extractWikilinkTopics(markdown) {
-  const wikilinkRegex = /\[\[([\w\s/]+)(\|([\w\s/]+))?\]\]/g; // Match [[Topic]] or [[Topic|Display Text]]
+  const wikilinkRegex = /\[\[([a-zA-Z0-9\u00C0-\u017F/_\-. ]+)(?:\|([^\]]+))?\]\]/g;
   const topics = [];
   let match;
 
-  // Use RegExp.exec to iterate through all matches
   while ((match = wikilinkRegex.exec(markdown)) !== null) {
-    topics.push(match[1].trim()); // Extract the topic (first capture group) and trim whitespace
+    topics.push(match[1].trim()); // Always extract the topic (first capture group)
   }
 
   return topics;
 }
 
-function getRenderer(projectPath) {
+function getRenderer(filePath) {
   const md = new MarkdownIt({html: true, breaks: true})
 
   md.use(checkbox)
   .use(mark)
   .use(emoji)
   .use(imageSize)
-  .use(wikilinks(
-    { 
-      linkPattern: /\[\[([\w\u00C0-\u017F\s\d-/]+)(\|([\w\u00C0-\u017F\s\d-/]+))?\]\]/,
-      uriSuffix: '.md',
-      postProcessPageName (pagename) {
-        return pagename.trim()
-      }
-    }
-  ))
-  .use(replaceImagePaths(projectPath))
+  .use(obsidianTopicLinks(filePath))
+  .use(replaceImagePaths(filePath))
+  .use(replaceLinkPaths(filePath))
   .validateLink = () => true
 
   return md
 }
 
-function replaceImagePaths(projectPath) {
+function obsidianTopicLinks(filePath) {
+  return function(md) {
+    const obsidianLinkRegex = /^\[\[([a-zA-Z0-9\u00C0-\u017F/_\-. ]+)(?:\|([^\]]+))?\]\]/; // No 'g' flag
+
+    function obsidianLinkRenderer(state, silent) {
+      const pos = state.pos;
+      const match = state.src.slice(pos).match(obsidianLinkRegex); // Always start from `pos`
+
+      if (!match) return false;
+      if (silent) return true; // Don't process further in silent mode
+
+      const fullMatch = match[0];
+      let topic = match[1].trim();
+      const alias = match[2] ? match[2].trim() : topic;
+      if (!topic.endsWith('.md')) topic = `${topic}.md`;
+      const href = encodeURI(resolveFileUrl(topic, filePath));
+
+      // Create a new token
+      const token = state.push("obsidian_link", "", 0);
+      token.content = `<a href="${href}">${md.utils.escapeHtml(alias)}</a>`;
+
+      // Move parsing position forward
+      state.pos += fullMatch.length;
+      return true;
+    }
+
+    function render(tokens, idx) {
+      return tokens[idx].content;
+    }
+
+    md.inline.ruler.before("link", "obsidian_link", obsidianLinkRenderer);
+    md.renderer.rules.obsidian_link = render;
+  }
+}
+
+
+function replaceImagePaths(filePath) {
 
   return function(md) {
     const defaultRender = md.renderer.rules.image || function(tokens, idx, options, env, self) {
@@ -54,14 +81,31 @@ function replaceImagePaths(projectPath) {
     md.renderer.rules.image = function(tokens, idx, options, env, self) {
       const token = tokens[idx];
       const srcIndex = token.attrIndex('src');
+      if (srcIndex >= 0) {
+        const src = token.attrs[srcIndex][1];
+        const srcUrl = !isUrl(src) && resolveFileUrl(src, filePath)
+        if (srcUrl) token.attrs[srcIndex][1] = srcUrl;
+      }
 
+      return defaultRender(tokens, idx, options, env, self);
+    };
+  }
+}
+
+function replaceLinkPaths(filePath) {
+
+  return function(md) {
+    const defaultRender = md.renderer.rules.link_open || function(tokens, idx, options, env, self) {
+      return self.renderToken(tokens, idx, options);
+    };
+
+    md.renderer.rules.link_open = function(tokens, idx, options, env, self) {
+      const token = tokens[idx];
+      const srcIndex = token.attrIndex('href');
       if (srcIndex >= 0) {
         const src = token.attrs[srcIndex][1];
-        if (!src.startsWith('http')) {
-          const filePath = projectPath ? path.join(projectPath, src) : path.resolve(src);
-          const fileUrl = pathToFileURL(filePath);
-          token.attrs[srcIndex][1] = fileUrl;
-        }
+        const srcUrl = !isUrl(src) && resolveFileUrl(src, filePath)
+        if (srcUrl) token.attrs[srcIndex][1] = srcUrl;
       }
 
       return defaultRender(tokens, idx, options, env, self);
@@ -69,6 +113,29 @@ function replaceImagePaths(projectPath) {
   }
 }
 
+function isUrl(href) {
+  try {
+    new URL(href);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+function resolveFileUrl(src, filePath) {
+  const dirname = _platform === 'win32' ? path.win32.dirname : path.dirname;
+  const resolve = _platform === 'win32' ? path.win32.resolve : path.resolve;
+
+  if (src.startsWith('file://')) return src;
+  if (src === '/') src = './';
+  const srcDir = dirname(filePath);
+  const srcPath = resolve(srcDir, src) // filePath ? path.join(filePath, src) : path.resolve(src);
+  const srcUrl = pathToFileURL(srcPath);
+
+  return srcUrl;
+
+}
+
 function pathToFileURL(absolutePath) {
   if (_platform === 'win32') {
     absolutePath = '/' + absolutePath.replace(/\\/g, '/');
@@ -84,9 +151,9 @@ module.exports = {
   _setPlatform(platform) {
     _platform = platform
   },
-  renderMarkdown (markdown, projectPath) {
+  renderMarkdown (markdown, filePath) {
     markdown = renderCancelledTasks(markdown)
-    return getRenderer(projectPath).render(markdown)
+    return getRenderer(filePath).render(markdown)
   },
   extractWikilinkTopics,
   removeMD  

package/lib/card.js

@@ -283,28 +283,13 @@ module.exports = function newCard(task, _project, dontParse) {
       return { totalLines, markdown, rawMarkdown }
     }
 
-    // replaceImagePaths(content) {
-    //   return content.replace(
-    //     /(!\[.*?\]\()(.*?)(\))/g,
-    //     (match, p1, imagePath, p3) => {
-    //       if (/^http/.test(imagePath)) return match
-    //       imagePath = _path.join(
-    //         _path.dirname(this.fullPath),
-    //         imagePath
-    //       ).replace(/ /g, '%20')
-    //       const imageURL = `file://${imagePath}`
-    //       return p1 + imageURL + p3
-    //     }
-    //   )
-    // }
-
     getHtml(content) {
-      const html = project.renderMarkdown(content)
+      const html = project.renderMarkdown(content, this.fullPath)
       const mdArray = eol.split(content)
       let truncHtml = null
       if (mdArray.length > this.truncLines) {
         mdArray.length = this.truncLines
-        truncHtml = project.renderMarkdown(mdArray.join(eol.lf))
+        truncHtml = project.renderMarkdown(mdArray.join(eol.lf), this.fullPath)
       }
       return { html, truncHtml }
     }

package/lib/plugins/default-board-actions-plugin.js

@@ -36,7 +36,7 @@ module.exports = class DefaultBoardActionsPlugin extends Plugin {
         keys: ['mod+t'],
         icon: 'clone',
         action: (task) => {
-          const title = project.renderMarkdown(task.text).replaceAll(/<\/*p>/gi, '')
+          const title = project.renderMarkdown(task.text, task.fullPath).replaceAll(/<\/*p>/gi, '')
           return project.copyToClipboard(title, `"${title}" copied to clipboard`)
         },
       },

package/lib/plugins/epic-plugin.js

@@ -159,7 +159,7 @@ module.exports = class EpicPlugin extends Plugin {
         content += '<ul style="list-style: none;">'
         content += tasks
           .map((task) => {
-            const taskText = this.project.renderMarkdown(task.text).replaceAll(/<p>|<\/p>/ig, '') // removeMD(task.text)
+            const taskText = this.project.renderMarkdown(task.text, task.fullPath).replaceAll(/<p>|<\/p>/ig, '') // removeMD(task.text)
             const checked =
               task.list === this.project.doneList ? ' checked="true"' : ''
             const taskFilePath = encodeURI(

package/lib/project.js

@@ -800,8 +800,8 @@ module.exports = class WorkerProject extends Project {
     })
   }
 
-  renderMarkdown(content) {
-    return renderMarkdown(content, this.path)
+  renderMarkdown(content, filePath) {
+    return renderMarkdown(content, filePath || this.path)
   }
 
   extractWikilinkTopics(markdown) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.52.1",
+  "version": "1.53.1",
   "description": "imdone-core",
   "main": "index.js",
   "scripts": {
@@ -42,8 +42,6 @@
     }
   },
   "dependencies": {
-    "@inquirer/editor": "^1.2.12",
-    "@kwvanderlinde/markdown-it-wikilinks": "^1.0.2",
     "async": "~1.5.0",
     "chalk": "^4.1.2",
     "checksum": "^0.1.1",