imdone-core 1.50.2 → 1.50.4

package/lib/adapters/markdown.js

@@ -1,32 +1,80 @@
 const checkbox = require('markdown-it-checkbox')
 const imageSize = require('markdown-it-imsize')
-const emoji = require('markdown-it-emoji') // used in taskEditor
+const emoji = require('markdown-it-emoji')
 const mark = require('markdown-it-mark')
-const removeMD = require('remove-markdown') // used in epic-plugins
+const removeMD = require('remove-markdown')
 const wikilinks = require('@kwvanderlinde/markdown-it-wikilinks')
+const path = require('path');
 
 const MarkdownIt = require('markdown-it')
-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()
+let _platform = process.platform
+
+function getRenderer(projectPath) {
+  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))
+  .validateLink = () => true
+
+  return md
+}
+
+function replaceImagePaths(projectPath) {
+
+  return function(md) {
+    const defaultRender = md.renderer.rules.image || function(tokens, idx, options, env, self) {
+      return self.renderToken(tokens, idx, options);
+    };
+
+    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];
+        if (!src.startsWith('http')) {
+          const filePath = projectPath ? path.join(projectPath, src) : path.resolve(src);
+          const fileUrl = pathToFileURL(filePath);
+          token.attrs[srcIndex][1] = fileUrl;
+        }
+      }
+
+      return defaultRender(tokens, idx, options, env, self);
+    };
+  }
+}
+
+function pathToFileURL(absolutePath) {
+  if (_platform === 'win32') {
+    absolutePath = '/' + absolutePath.replace(/\\/g, '/');
   }
-))
-.validateLink = () => true
+  return `file://${absolutePath}`;
+}
+
+function renderCancelledTasks(markdown) {
+  return markdown.replace(/- \[-\] (.+)/gm, '- :no_entry_sign: ~~$1~~');
+}
 
 module.exports = {
-  renderMarkdown (markdown) {
-    markdown = markdown.replace(/- \[-\] (.+)/gm, '- :no_entry_sign: ~~$1~~');
-    return md.render(markdown)
+  _setPlatform(platform) {
+    _platform = platform
+  },
+  renderMarkdown (markdown, projectPath) {
+    const md = getRenderer()
+    markdown = renderCancelledTasks(markdown)
+    return getRenderer(projectPath).render(markdown)
   },
   removeMD  
-}
+}

package/lib/adapters/parsers/file/LocalFileParserFactory.js

@@ -5,7 +5,8 @@ const languages = require('../../../languages')
 const ReadStreamCodeParser = require('./ReadStreamCodeParser')
 
 
-function getLang(languages, filePath) {
+function getLang(config, filePath) {
+  const languages = getLanguages(config)
   var lang = languages[path.extname(filePath)]
   return lang || { name: 'text', symbol: '' }
 }
@@ -15,13 +16,12 @@ function getLanguages(config) {
   return { ...languages, ...configLanguages }
 }
 
-
+module.exports.getLang = getLang
 module.exports.getFileParser = async function getFileParser (filePath, config, readStream) {
   if (!readStream) {
     readStream = createReadStream(filePath)
   }
-  const languages = getLanguages(config)
-  const lang = getLang(languages, filePath)
+  const lang = getLang(config, filePath)
   if (lang.name === 'text') {
     return new ReadStreamMarkdownParser(readStream, config)
   } else {

package/lib/adapters/parsers/file/ReadStreamCodeParser.js

@@ -33,7 +33,7 @@ module.exports = class ReadStreamCodeParser extends ReadStreamTaskParser {
     Object.keys(comments).forEach((comment) => {
       const { begin, end, content } = comments[comment];
       const line = begin;
-      const lastLine = end - 1;
+      const lastLine = end; // DOING: lastLine should not be - 1
       const lines = content.split('\n');
   
       // Check if the comment contains "TODO"

package/lib/adapters/parsers/file/ReadStreamTaskParser.js

@@ -89,17 +89,12 @@ module.exports = class ReadStreamTaskParser {
 
   trimLinesToEndTask() {
     if (!this.task) return
-    if (
-      this.blankLines == blankLinesToEndTask
-    ) {
-      this.task.description.length = this.task.description.length - (this.blankLines - 1)
-    } else if (this.nextTask){
-      this.task.description.length = this.task.description.length - (this.blankLines + 1)
-    } else {
-      this.task.description.length = this.task.description.length - this.blankLines
-    }
 
-    this.task.lastLine = this.task.line + this.task.description.length - 1
+    // Remove the empty strings from the end of the task description
+    while (this.task.description[this.task.description.length - 1] === '') {
+      this.task.description.pop()
+    }
+    this.task.lastLine = this.task.line + this.task.description.length
   }
 
   close() {

package/lib/adapters/storage/config.js

@@ -38,7 +38,7 @@ async function getYamlConfig(filePath) {
     if (configLike.watcher) delete configLike.watcher
 
   } catch (e) {
-    /* noop */
+    console.error(`Error parsing config file: ${filePath}`)
   }
   return configLike
 }

package/lib/card.js

@@ -10,7 +10,7 @@ const eol = require('eol')
 const allEmoji = require('markdown-it-emoji/lib/data/full.json')
 const { getIsoDateWithOffset } = require('./adapters/date-time')
 
-const { removeMD, renderMarkdown } = require('./adapters/markdown')
+const { removeMD } = require('./adapters/markdown')
 
 const CONTENT_TOKEN = '__CONTENT__'
 const lf = String(eol.lf)
@@ -250,7 +250,7 @@ module.exports = function newCard(task, _project, dontParse) {
         .replace(/%%[\s\S]*?%%/g, '')
         .replace(/<\!--\s*?-->/gs, '')
         .trim()
-      taskMD = this.replaceImagePaths(taskMD)
+      // taskMD = this.replaceImagePaths(taskMD)
       // - Split on eol and append lines until visible line count equals lines
       const displayContent = []
       const rawContent = []
@@ -271,28 +271,28 @@ 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
-        }
-      )
-    }
+    // 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 = renderMarkdown(content)
+      const html = project.renderMarkdown(content)
       const mdArray = eol.split(content)
       let truncHtml = null
       if (mdArray.length > this.truncLines) {
         mdArray.length = this.truncLines
-        truncHtml = renderMarkdown(mdArray.join(eol.lf))
+        truncHtml = project.renderMarkdown(mdArray.join(eol.lf))
       }
       return { html, truncHtml }
     }

package/lib/config.js

@@ -6,16 +6,7 @@ const _get = require('lodash.get')
 const { 
   JOURNAL_TYPE, 
   DEFAULT_CONFIG,
-  CONFIG_FILE_YML,
-  CONFIG_DIR
 } = require('./constants')
-const _path = require('path')
-const findUp = require('find-up')
-const { loadYAML } = require('./adapters/yaml')
-const {
-  exists,
-  readFile,
-} = require('./adapters/file-gateway')
 
 /**
  * Description

package/lib/default-settings.js

@@ -1,6 +1,7 @@
 const { loadYAML } = require('./adapters/yaml')
 
 const defaultSettingsString = `openIn: default #override
+openCodeIn: default #override
 journalType: New File
 journalPath: imdone-tasks #override
 appendNewCardsTo: imdone-tasks.md

package/lib/plugins/epic-plugin.js

@@ -1,5 +1,3 @@
-// const removeMD = require('remove-markdown')
-const { renderMarkdown } = require('../adapters/markdown')
 const Plugin = require('imdone-api')
 
 function getIsEpicMeta(task) {
@@ -161,7 +159,7 @@ module.exports = class EpicPlugin extends Plugin {
         content += '<ul style="list-style: none;">'
         content += tasks
           .map((task) => {
-            const taskText = renderMarkdown(task.text).replaceAll(/<p>|<\/p>/ig, '') // removeMD(task.text)
+            const taskText = this.project.renderMarkdown(task.text).replaceAll(/<p>|<\/p>/ig, '') // removeMD(task.text)
             const checked =
               task.list === this.project.doneList ? ' checked="true"' : ''
             const taskFilePath = encodeURI(

package/lib/project.js

@@ -787,6 +787,6 @@ module.exports = class WorkerProject extends Project {
   }
 
   renderMarkdown(content) {
-    return renderMarkdown(content)
+    return renderMarkdown(content, this.path)
   }
 }

package/lib/repository.js

@@ -1573,16 +1573,46 @@ Repository.deserialize = function (repo, cb) {
 }
 
 Repository.regexQuery = function (tasks, queryString) {
-  return tasks.map((task) => {
-    const match = task.content.match(new RegExp(tools.escapeRegExp(queryString), 'i'))
-    task.match = match
-    if (match && queryString.trim() && task.interpretedContent) {
-      task.interpretedContent = task.interpretedContent.replace(new RegExp(`(${tools.escapeRegExp(queryString.trim())})`, 'gi'), '==$1==' )
-      task.updateDescriptionData()
-    }
-    return task
-  }).filter(({match}) => match)
-}
+  return tasks
+    .map((task) => {
+      const escapedQueryString = tools.escapeRegExp(queryString.trim());
+
+      // Regex to match occurrences not part of a URL and not already surrounded by `==`
+      const regex = new RegExp(
+        `(?<!https?:\\/\\/[^\\s]*?)\\b${escapedQueryString}\\b(?![^\\s]*\\/)(?<!==)(?!==)`,
+        'gi'
+      );
+
+      // Regex to detect Markdown links `[title](url)` where `queryString` is in title or URL
+      const markdownLinkRegex = new RegExp(
+        `\\[([^\\]]*${escapedQueryString}[^\\]]*)\\]\\(([^)]+${escapedQueryString}[^)]*)\\)`,
+        'gi'
+      );
+
+      let match = task.content.match(regex) || task.content.match(markdownLinkRegex);
+      task.match = match;
+
+      if (match && queryString.trim() && task.interpretedContent) {
+        // Replace standalone occurrences
+        task.interpretedContent = task.interpretedContent.replace(
+          regex,
+          '==$&=='
+        );
+
+        // Replace Markdown links where queryString is in title or URL
+        task.interpretedContent = task.interpretedContent.replace(
+          markdownLinkRegex,
+          (match) => `==${match}==`
+        );
+
+        task.updateDescriptionData();
+      }
+
+      return task;
+    })
+    .filter(({ match }) => match);
+};
+
 
 Repository.parseSortFromQueryString = function (queryString) {
   const sort = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.50.2",
+  "version": "1.50.4",
   "description": "imdone-core",
   "main": "index.js",
   "scripts": {