imdone-core 1.44.0 → 1.44.2

package/lib/file.js

@@ -160,35 +160,30 @@ File.addCompleted = function ({ task, content, config }) {
 }
 
 File.parseDueDate = function (config, text) {
-  if (text.includes(`due${config.getMetaSep()}`)) return text
-  let dueString
-  return text.replace(/(\sdue)\s.*?\./gi, (dueMatch, p1) => {
-    if (dueString) return dueMatch
-    try {
-      const due = chrono.parseDate(dueMatch, new Date(), {forwardDate: true})
-      if (!due) return dueMatch
-      dueString = getIsoDateWithOffset(due)
-      return `${p1.toLowerCase()}${config.getMetaSep()}${dueString}`
-    } catch (e) {
-      console.log(`Unable to parse due date for ${text}`)
-      return dueMatch
-    }
-  })
+  return File.parseDate(config, text, 'due')
 }
 
 File.parseRemindDate = function (config, text) {
-  if (text.includes(`remind${config.getMetaSep()}`)) return text
-  let remindString
-  return text.replace(/(\sremind)\s.*?\./gi, (remindMatch, p1) => {
-    if (remindString) return remindMatch
+  return File.parseDate(config, text, 'remind')
+}
+
+File.parseDeferDate = function (config, text) {
+  return File.parseDate(config, text, 'defer')
+}
+
+File.parseDate = function (config, text, dateType) {
+  if (text.includes(`${dateType}${config.getMetaSep()}`)) return text
+  let dateString
+  return text.replace(new RegExp(`(\\s${dateType})\\s.*?\\.`,'gi'), (match, p1) => {
+    if (dateString) return match
     try {
-      const remind = chrono.parseDate(remindMatch, new Date(), {forwardDate: true})
-      if (!remind) return remindMatch
-      remindString = getIsoDateWithOffset(remind)
-      return `${p1.toLowerCase()}${config.getMetaSep()}${remindString}`
+      const date = chrono.parseDate(match, new Date(), {forwardDate: true})
+      if (!date) return match
+      dateString = getIsoDateWithOffset(date)
+      return `${p1.toLowerCase()}${config.getMetaSep()}${dateString}`
     } catch (e) {
-      console.log(`Unable to parse remind date for ${text}`)
-      return remindMatch
+      console.log(`Unable to parse ${dateType} date for ${text}`)
+      return match
     }
   })
 }
@@ -281,6 +276,7 @@ File.prototype.transformTask = function ({config, modify, task}) {
   content = trackListChanges.content
   content = File.parseDueDate(config, content)
   content = File.parseRemindDate(config, content)
+  content = File.parseDeferDate(config, content)
   content = File.addCompleted({ task, content, config })
   if (
     content.trim() !== task.content.trim() 

package/lib/plugins/epic-plugin.js

@@ -1,4 +1,5 @@
-const removeMD = require('remove-markdown')
+// const removeMD = require('remove-markdown')
+const { renderMarkdown } = require('../adapters/markdown')
 const Plugin = require('imdone-api')
 
 function getIsEpicMeta(task) {
@@ -104,7 +105,7 @@ module.exports = class EpicPlugin extends Plugin {
         return
       }
 
-      const epicText = removeMD(epic.text)
+      const epicText = epic.text // removeMD(epic.text)
       const epicFilter = encodeURIComponent(
         `(allMeta.epic="${epicId}" or allMeta.is-epic="${epicId}")`
       )
@@ -114,13 +115,6 @@ module.exports = class EpicPlugin extends Plugin {
       const epicUrl = `imdone://${epicFilePath}?line=${epic.line}&filter=${epicFilter}`
       const epicLink = `**Epic:** [${epicText}](${epicUrl})\n\n`
 
-      const taskList =
-        epicLists.length === 0
-          ? '*None*\n'
-          : '\n<div class="imdone-epic-items">\n\n' +
-            this.getTaskListMD(lists, epicFilter, epicUrl, epicId) +
-            '\n\n</div>\n'
-
       // Add epic link to epic tasks
       epicLists.forEach((list) => {
         this.getEpicItems(epicId, list).forEach((task) => {
@@ -129,6 +123,13 @@ module.exports = class EpicPlugin extends Plugin {
         })
       })
 
+      const taskList =
+        epicLists.length === 0
+          ? '*None*\n'
+          : '\n<div class="imdone-epic-items">\n\n' +
+            this.getTaskListMD(lists, epicFilter, epicUrl, epicId) +
+            '\n\n</div>\n'
+
       if (epic.allMeta.epic && epic.allMeta.epic.includes(epicId)) {
         const index = epic.allMeta.epic.findIndex((value) => value === epicId)
         epic.allMeta.epic.splice(index, 1)
@@ -145,6 +146,7 @@ module.exports = class EpicPlugin extends Plugin {
 
     lists
       .filter((list) => this.getEpicItems(epicId, list.name))
+      .reverse()
       .forEach((list) => {
         const tasks = this.getEpicItems(epicId, list.name)
         const listUrl = epicUrl + encodeURIComponent(` and list=${list.name}`)
@@ -153,7 +155,7 @@ module.exports = class EpicPlugin extends Plugin {
         content += '<ul style="list-style: none;">'
         content += tasks
           .map((task) => {
-            const taskText = removeMD(task.text)
+            const taskText = renderMarkdown(task.text).replaceAll(/<p>|<\/p>/ig, '') // removeMD(task.text)
             const checked =
               task.list === this.project.doneList ? ' checked="true"' : ''
             const taskFilePath = encodeURI(

package/lib/task.js

@@ -26,7 +26,7 @@ const {
  * @param {} obj
  * @return
  */
-const DATE_META_KEYS = ['due', 'created', 'remind', 'completed']
+const DATE_META_KEYS = ['due', 'defer', 'created', 'remind', 'completed']
 class Task {
   constructor(config, obj, dontParse) {
     if (!_isObject(obj)) throw new Error('obj must be an Object')

package/package.json

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