imdone-core 1.40.0 → 1.40.1

package/lib/card.js

@@ -6,6 +6,7 @@ const _isFunction = require('lodash.isfunction')
 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 +116,7 @@ module.exports = function newCard(task, _project, dontParse) {
 
     get defaultData() {
       return {
+        timestamp: moment().format(),
         ..._pick(
           this,
           ...['beforeText',
@@ -186,10 +188,10 @@ module.exports = function newCard(task, _project, dontParse) {
         ? { ...pluginManager.getCardProperties(defaultData) }
         : {}
       const data = {
-        ...defaultData,
         ...pluginData,
         ...props,
-        ...computed
+        ...computed,
+        ...defaultData
       }
 
       this.data = { ...data }

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,7 +166,7 @@ File.parseDueDate = function (config, text) {
     if (dueString) return dueMatch
     try {
       const due = chrono.parseDate(dueMatch, new Date(), {forwardDate: true})
-      dueString = due.toISOString()
+      dueString = moment(due).format()
       return `${p1.toLowerCase()}${config.getMetaSep()}${dueString}`
     } catch (e) {
       // console.log(`Unable to parse due date for ${text}`)
@@ -832,7 +833,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.1",
   "description": "imdone-core",
   "main": "index.js",
   "bin": {