imdone-core 1.43.7 → 1.44.1

package/lib/file.js

@@ -160,18 +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
+  return File.parseDate(config, text, 'due')
+}
+
+File.parseRemindDate = function (config, text) {
+  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 due = chrono.parseDate(dueMatch, new Date(), {forwardDate: true})
-      if (!due) return dueMatch
-      dueString = getIsoDateWithOffset(due)
-      return `${p1.toLowerCase()}${config.getMetaSep()}${dueString}`
+      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 due date for ${text}`)
-      return dueMatch
+      console.log(`Unable to parse ${dateType} date for ${text}`)
+      return match
     }
   })
 }
@@ -263,6 +275,8 @@ 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/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')
@@ -291,7 +291,7 @@ Task.MetaRegExp = new RegExp(
 )
 Task.getMetaRegExp = function (config) {
   return new RegExp(
-    `(^|\\s)([a-zA-Z-_]+?)${config.getMetaSep()}(?!\\*+)(?!\\/\\/)([${
+    `(^|\\s)([a-zA-Z-_]+?)${config.getMetaSep()}(?![*_]+)(?!\\/\\/)([${
       Task.AnyLanguageGroup
     }${Task.EmojiGroup}]+)`,
     'gu'
@@ -299,7 +299,7 @@ Task.getMetaRegExp = function (config) {
 }
 Task.getMetaRegExpQuotes = function (config) {
   return new RegExp(
-    `(^|\\s)([a-zA-Z-_]+?)${config.getMetaSep()}(?!\\*+)"((?${config.getMetaSep()}""|[^"]|[${
+    `(^|\\s)([a-zA-Z-_]+?)${config.getMetaSep()}(?![*_]+)"((?${config.getMetaSep()}""|[^"]|[${
       Task.AnyLanguageGroup
     }${Task.EmojiGroup}])*)"`,
     'gu'

package/package.json

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