imdone-core 1.53.12 → 1.53.14

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

@@ -36,9 +36,9 @@ module.exports = class ReadStreamCodeParser extends ReadStreamTaskParser {
     Object.keys(comments).forEach((comment) => {
       const { begin, end, content } = comments[comment];
       const line = begin;
-      const lastLine = end; // DOING lastLine should not be - 1
+      const lastLine = end; // TODO lastLine should not be - 1
                             // <!--
-                            // order:0
+                            // order:-140
                             // -->
       const lines = content.split('\n');
   

package/lib/adapters/parsers/task/CardContentParser.js

@@ -74,13 +74,38 @@ function isCheckBoxTask (config, line, beforeText) {
 }
 
 function hasTaskInText(config, text, isCodeFile) {
-  return (
-    (isCodeFile && hasCodeStyleTask(config, text)) ||
-    ((new XRegExp(getHashStyleRegex(config.tokenPrefix)).test(text) ||
-      new XRegExp(getHashStyleRegex(config.tokenPrefix, true)).test(text) ||
-      new XRegExp(LINK_STYLE_REGEX).test(text)) &&
-      config.lists.find((list) => text.includes(`${config.tokenPrefix}${list.name}`)))
-  )
+  const hashStyleRegex = new XRegExp(getHashStyleRegex(config.tokenPrefix));
+  const linkStyleRegex = new XRegExp(LINK_STYLE_REGEX);
+
+  const inlineCodeRe = /`[^`]*`/g;
+
+  // Function to check if a match is within inline code
+  function isWithinInlineCode(index) {
+    let match;
+    while ((match = inlineCodeRe.exec(text)) !== null) {
+      const isInCode = index >= match.index && index < match.index + match[0].length
+      if (isInCode) return true;
+    }
+    return false;
+  }
+
+  // Check for code style tasks
+  if (isCodeFile && hasCodeStyleTask(config, text)) {
+    return true;
+  }
+
+  // Check for hash style tasks
+  let result;
+  if ((result = hashStyleRegex.exec(text)) !== null && !isWithinInlineCode(result.index)) {
+    return config.lists.find((list) => text.includes(`${config.tokenPrefix}${list.name}`));
+  }
+
+  // Check for link style tasks
+  if ((result = linkStyleRegex.exec(text)) !== null && !isWithinInlineCode(result.index)) {
+    return config.lists.find((list) => text.includes(`${config.tokenPrefix}${list.name}`));
+  }
+
+  return false;
 }
 
 function isBeforeTextMarkdownList(beforeText) {
@@ -105,9 +130,21 @@ function isLineOutsideMarkdownList(line, beforeText) {
 }
 
 function hasCodeStyleTask(config, text) {
-  let result = new RegExp(CODE_STYLE_PATTERN).exec(text)
-  if (!result) return false
-  return config.includeList(result[1])
+  const codeStylePatternRe = new RegExp(CODE_STYLE_PATTERN);
+  let result = codeStylePatternRe.exec(text);
+
+  if (!result) return false;
+
+  // Check if the match is within inline code
+  const inlineCodeRe = /`[^`]*`/g;
+  let match;
+  while ((match = inlineCodeRe.exec(text)) !== null) {
+    if (result.index >= match.index && result.index < match.index + match[0].length) {
+      return false;
+    }
+  }
+
+  return config.includeList(result[1]);
 }
 
 function getCardTagsTaskContent ({
@@ -226,7 +263,6 @@ function getTextFileTaskContent ({
   const taskContentLines = []
 
   let inCodeBlock = false
-  let inCodeSpan = false
 
   for (let i = 1; i < lines.length; i++) {
     let line = lines[i]
@@ -236,16 +272,8 @@ function getTextFileTaskContent ({
       inCodeBlock = !inCodeBlock
     }
 
-    // Check for markdown code spans
-    if (isMarkDownFile && line.includes('`')) {
-      const codeSpanMatches = line.match(/`+/g)
-      if (codeSpanMatches && codeSpanMatches.length % 2 !== 0) {
-        inCodeSpan = !inCodeSpan
-      }
-    }
-
     // Only break if the task is not in a markdown code block or code span
-    if (!inCodeBlock && !inCodeSpan && hasTaskInText(config, line)) break
+    if (!inCodeBlock && hasTaskInText(config, line)) break
     if (isCheckBoxTask(config, line, beforeText)) break
     if (isTaskInList && isLineOutsideMarkdownList(line, beforeText)) break
     if (isCustomCardTerminator(config, line)) break

package/lib/file.js

@@ -375,8 +375,10 @@ File.prototype.extractCodeStyleTasks = function (config, pos, content) {
 File.prototype.extractHashStyleTasks = function (config, pos, content) {
   var hashStyleRegex = getHashStyleRegex(config.tokenPrefix)
   var lang = this.getLang()
+  const codePositions = this.getMarkdownCodePositions(content);
   var result
   while ((result = hashStyleRegex.exec(content)) !== null) {
+    if (this.isResultInMarkdownCode(codePositions, result.index)) continue;
     var [rawTask, list, orderGroup, order, text] = result
     if (!config.listExists(list)) continue
 
@@ -406,13 +408,15 @@ File.prototype.extractHashStyleTasks = function (config, pos, content) {
     this.addTask(task)
     this.emit('task.found', task)
   }
-}
+};
 
 File.prototype.extractLinkStyleTasks = function (config, pos, content) {
   var self = this
   var linkStyleRegex = new XRegExp(LINK_STYLE_REGEX)
+  const codePositions = this.getMarkdownCodePositions(content);
   var result
   while ((result = linkStyleRegex.exec(content)) !== null) {
+    if (this.isResultInMarkdownCode(codePositions, result.index)) continue;
     let [match, before, rawTask, text, list, colon, order] = result
     const beforeLength = before ? before.length : 0
     const posInContent = result.index + pos + beforeLength
@@ -446,6 +450,7 @@ File.prototype.extractCheckboxTasks = function (config, pos, content) {
   if (!this.isMarkDownFile()) return
   if (!config.isAddCheckBoxTasks()) return
 
+  const codePositions = this.getMarkdownCodePositions(content);
   const type = Task.Types[config.getNewCardSyntax()]
   const checkStyleRegex = new RegExp(CHECK_STYLE_PATTERN)
   let result
@@ -459,6 +464,7 @@ File.prototype.extractCheckboxTasks = function (config, pos, content) {
     )
   }
   while ((result = checkStyleRegex.exec(content)) !== null) {
+    if (this.isResultInMarkdownCode(codePositions, result.index)) continue;
     let [match, before, checked, text] = result
     const list =
       checked.trim() === 'x' ? config.getDoneList() : config.getDefaultList()
@@ -961,10 +967,9 @@ File.prototype.extractTaskWithDescription = function ({
     this.project
   )
 
-  task.updateOrderMeta(config)
-
-  task.orderModified = task.order + "" !== order + "" && !bothAreUndefNull(task.order, order)
   task.init()
+  if (!config.keepEmptyPriority) task.updateOrderMeta(config, task.format(task.descriptionString))
+  task.orderModified = task.order + "" !== order + "" && !bothAreUndefNull(task.order, order)
 
   return task
 }
@@ -1349,4 +1354,28 @@ File.prototype.isWithinCodeSpanOrBlock = function(pos, content) {
   return Task.isResultInMarkdownCode(positions, pos)
 }
 
+File.prototype.getMarkdownCodePositions = function (text) {
+  const positions = [];
+  const codeBlockRe = /```[\s\S]*?```/g;
+  const inlineCodeRe = /`[^`]*`/g;
+
+  let match;
+
+  // Find code blocks
+  while ((match = codeBlockRe.exec(text)) !== null) {
+    positions.push({ start: match.index, end: match.index + match[0].length });
+  }
+
+  // Find inline code spans
+  while ((match = inlineCodeRe.exec(text)) !== null) {
+    positions.push({ start: match.index, end: match.index + match[0].length });
+  }
+
+  return positions;
+};
+
+File.prototype.isResultInMarkdownCode = function (positions, index) {
+  return positions.some(pos => index >= pos.start && index < pos.end);
+};
+
 module.exports = File

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

@@ -3,6 +3,12 @@ const {getIsoDateWithOffset} = require('../adapters/date-time')
 const path = require('path')
 const simpleTemplate = '\n<!--\ncreated:${timestamp}\n-->\n'
 
+function flattenObject(object) {
+  return Object.keys(object).reduce((acc, key) => {
+    return { ...acc, [`template_${key}`]: object[key] };
+  }, {});
+}
+
 module.exports = class DefaultBoardPropertiesPlugin extends Plugin {
   constructor(project) {
     super(project)
@@ -14,15 +20,18 @@ module.exports = class DefaultBoardPropertiesPlugin extends Plugin {
   }
 
   getBoardProperties() {
-    const self = this;
-
+    const templates = flattenObject(this.templates);
+    const clearFilterURL = this.getFilterURL('');
+    const getFilterURL = (filter) => this.getFilterURL(filter);
+    const getFilterLink = (filter) => `[Filter By: ${filter}](${this.getFilterURL(filter)})`;
+  
     return {
       date: `${getIsoDateWithOffset(new Date()).substring(0, 10)}`,
       timestamp: getIsoDateWithOffset(new Date()),
-      clearFilterURL: self.getFilterURL(''),
-      templates: this.templates,
-      getFilterURL: (filter) => self.getFilterURL(filter),
-      getFilterLink: (filter) => `[Filter By: ${filter}](${self.getFilterURL(filter)})`
+      clearFilterURL,
+      getFilterURL,
+      getFilterLink,
+      ...templates
     }
   }
 

package/lib/task.js

@@ -83,6 +83,10 @@ class Task {
   get order() {
     return this.innerOrder
   }
+
+  get descriptionString() {
+    return this.description.join(lineEnd)
+  }
   
   updateLastLine() {
     this.lastLine = this.getLastLine()
@@ -135,10 +139,8 @@ class Task {
   }
 
   getTextAndDescription() {
-    const description = _clone(this.description)
-    const taskContent = `${this.markdownBeforeText}${this.text}${lineEnd}${description.join(
-      lineEnd
-    )}`.replace(/<!--\s*\[\s*([\s\S]*?)\s*\]\s*-->/gm, '$1')
+    const taskContent = `${this.markdownBeforeText}${this.text}${lineEnd}${this.descriptionString}`
+    .replace(/<!--\s*\[\s*([\s\S]*?)\s*\]\s*-->/gm, '$1')
     return this.getText(
       {
         stripMeta: true,
@@ -150,11 +152,9 @@ class Task {
   }
 
   getRawTextAndDescription() {
-    const description = _clone(this.description)
     const text = this.text
-    if (description.length < 1) return text
-    const descriptionMD = description.join(lineEnd)
-    return `${text}${lineEnd}${descriptionMD}${lineEnd}`
+    if (this.description.length < 1) return text
+    return `${text}${lineEnd}${this.descriptionString}${lineEnd}`
   }
 
   getProgress() {
@@ -174,7 +174,7 @@ class Task {
   }
 
   updateContent() {
-    this.content = this.text + lineEnd + this.description.join(lineEnd)
+    this.content = this.text + lineEnd + this.descriptionString
   }
 
   updateFromContent(content) {
@@ -434,7 +434,7 @@ Task.getMetaOrderRegex = function (config) {
   )
 }
 
-Task.prototype.updateOrderMeta = function (config, descContent = this.description.join(lineEnd)) {
+Task.prototype.updateOrderMeta = function (config, descContent = this.descriptionString) {
   if (config.orderMeta) {
     if (!isNumber(this.order)) return this.order = ''
     const addNewLine = config.isMetaNewLine()

package/package.json

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