imdone-core 1.40.0 → 1.40.2

package/lib/card.js

@@ -3,9 +3,11 @@ const _path = require('path')
 const template = require('lodash.template')
 const _pick = require('lodash.pick')
 const _isFunction = require('lodash.isfunction')
+const _isObject = require('lodash.isobject')
 const _isEmpty = require('lodash.isempty')
 const _get = require('lodash.get')
 const eol = require('eol')
+const moment = require('moment')
 const allEmoji = require('markdown-it-emoji/lib/data/full.json')
 
 const { removeMD, renderMarkdown } = require('./adapters/markdown')
@@ -115,6 +117,7 @@ module.exports = function newCard(task, _project, dontParse) {
 
     get defaultData() {
       return {
+        timestamp: moment().format(),
         ..._pick(
           this,
           ...['beforeText',
@@ -186,12 +189,22 @@ module.exports = function newCard(task, _project, dontParse) {
         ? { ...pluginManager.getCardProperties(defaultData) }
         : {}
       const data = {
-        ...defaultData,
         ...pluginData,
         ...props,
-        ...computed
+        ...computed,
+        ...defaultData
       }
 
+      const keys = Object.keys(data)
+      keys.forEach((key) => {
+        const value = data[key]
+        if (_isObject(value) && !Array.isArray(value)) {
+          
+          keys.push(...Object.keys(value).map((k) => `${key}.${k}`))
+        }
+      })
+      this.dataKeys = keys
+
       this.data = { ...data }
       this.desc = this.getDescriptionData()
       this.data = { ...data, ...this.desc }
@@ -242,9 +255,6 @@ module.exports = function newCard(task, _project, dontParse) {
           content = content.replace(opts.interpolate, `~~{{${e}}}~~`)
         }
       }
-      // Fix list endings
-      // const listEndingRegex = /(\n\s*([-+*]{1}|\d+.)\s.*[\n\r])([^1-9-+* \t])/gm
-      // description = description.replace(listEndingRegex, '$1\n$3')
 
       return content
     }

package/lib/file.js

@@ -20,6 +20,7 @@ var _clone = require('lodash.clone'),
   newCard = require('./card'),
   fastSort = require('fast-sort/dist/sort'),
   XRegExp = require('xregexp'),
+  moment = require('moment'),
  {
   FILE_TYPES, 
   getTaskContent,
@@ -148,7 +149,7 @@ File.addCompleted = function ({ task, content, config }) {
   if (task.list !== doneList) return content
   if (task.completed || task.meta.completed) return content
   if (content.includes(`completed${config.getMetaSep()}`)) return content
-  const now = new Date().toISOString()
+  const now = moment().format()
   content = task.addToLastCommentInContent(
     content,
     `completed${config.getMetaSep()}${now}`,
@@ -165,10 +166,11 @@ File.parseDueDate = function (config, text) {
     if (dueString) return dueMatch
     try {
       const due = chrono.parseDate(dueMatch, new Date(), {forwardDate: true})
-      dueString = due.toISOString()
+      if (!due) return dueMatch
+      dueString = moment(due).format()
       return `${p1.toLowerCase()}${config.getMetaSep()}${dueString}`
     } catch (e) {
-      // console.log(`Unable to parse due date for ${text}`)
+      console.log(`Unable to parse due date for ${text}`)
       return dueMatch
     }
   })
@@ -832,7 +834,7 @@ File.prototype.modifyDescription = function (task, config) {
     if (
       this.isMarkDownFile() &&
       description.length > 0 &&
-      (tools.hasBlankLines(description) || isWrappedWithCardTag || trailingBlankLines)
+      (hasBlankLines(description) || isWrappedWithCardTag || trailingBlankLines)
     ) {
       task.isWrappedWithCardTag = isWrappedWithCardTag // DOING Find out where this is used and stop using it
                                                        // <!-- order:-30 -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.40.0",
+  "version": "1.40.2",
   "description": "imdone-core",
   "main": "index.js",
   "bin": {
@@ -81,7 +81,7 @@
     "lodash.isundefined": "^3.0.1",
     "lodash.noop": "^3.0.1",
     "lodash.omit": "^4.5.0",
-    "lodash.pick": "^4.4.0",
+    "lodash.pick": "^3.1.0",
     "lodash.reject": "^4.6.0",
     "lodash.remove": "^4.7.0",
     "lodash.some": "^4.6.0",