imdone-core 1.40.1 → 1.41.0

package/lib/adapters/date-time.js

@@ -0,0 +1,11 @@
+const moment = require('moment');
+module.exports = {
+  getIsoDateWithOffset: function ({date, config}) {
+    const momentDate = moment(date);
+    if (momentDate.isDST() && config && config.noDST) {
+      const offset = momentDate.utcOffset();
+      momentDate.utcOffset(offset - 60);
+    }
+    return momentDate.format();
+  }
+}

package/lib/adapters/markdown.js

@@ -14,7 +14,7 @@ md.use(checkbox)
 .use(imageSize)
 .use(wikilinks(
   { 
-    linkPattern: /\[\[([\w\s\d-/]+)(\|([\w\s\d-/]+))?\]\]/,
+    linkPattern: /\[\[([\w\u00C0-\u017F\s\d-/]+)(\|([\w\u00C0-\u017F\s\d-/]+))?\]\]/,
     uriSuffix: '.md',
     postProcessPageName (pagename) {
       return pagename.trim()

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

@@ -1,5 +1,4 @@
 const eol = require('eol')
-const Task = require('../../../task')
 const XRegExp = require('xregexp')
 
 const FILE_TYPES = {
@@ -23,6 +22,18 @@ const LINK_STYLE_REGEX = new XRegExp(
   'gm'
 )
 
+const CHECK_REGEX = /^(\s*- )\[([x ])\]/
+function getCheckedData(content) {
+  const taskRegex = new RegExp(CHECK_REGEX)
+  const result = taskRegex.exec(content)
+  return result
+    ? {
+        pad: result[1].length,
+        checked: result[2].trim() !== '',
+      }
+    : null
+}
+
 function getContentLines(content) {
   let foundContent = false
   return eol.split(content).filter((line) => {
@@ -35,10 +46,10 @@ function getContentLines(content) {
 function isCheckBoxTask (config, line, beforeText) {
   if (!config.isAddCheckBoxTasks()) return
 
-  const beforeTextCheckData = Task.getCheckedData(beforeText)
+  const beforeTextCheckData = getCheckedData(beforeText)
   if (!beforeTextCheckData) return
 
-  const lineCheckData = Task.getCheckedData(line)
+  const lineCheckData = getCheckedData(line)
   if (!lineCheckData) return
 
   return lineCheckData.pad <= beforeTextCheckData.pad
@@ -54,7 +65,28 @@ function hasTaskInText(config, text, isCodeFile) {
   )
 }
 
-function hasCodeStyleTask (config, text) {
+function isBeforeTextMarkdownList(beforeText) {
+  return /^\s*(\*|-|- \[[x| ]\]|\d+\.|[a-zA-Z]\.)\s$/.test(beforeText)
+}
+
+function isMarkdownListItem(line) {
+  return /^\s*(\*|-|- \[[x| ]\]|\d+\.|[a-zA-Z]\.)\s/.test(line)
+}
+
+function padDescription(description = [], beforeText = '') {
+  if (!isBeforeTextMarkdownList(beforeText)) return description
+  return description.map((line) => {
+    return line.padStart(line.length + beforeText.length)
+  })
+}
+
+function isLineOutsideMarkdownList(line, beforeText) {
+  return isBeforeTextMarkdownList(beforeText) &&
+    isMarkdownListItem(line) &&
+    line.search(/\S/) <= beforeText.search(/\S/)
+}
+
+function hasCodeStyleTask(config, text) {
   let result = new RegExp(CODE_STYLE_PATTERN).exec(text)
   if (!result) return false
   return config.includeList(result[1])
@@ -165,31 +197,23 @@ function getTextFileTaskContent ({
   if (hasCardStartTag) return
 
   const isMarkDownFile = fileType === FILE_TYPES.MARKDOWN
+  const isTaskInList = isMarkDownFile && isBeforeTextMarkdownList(beforeText)
   let openBlockCommentTokens = 0
   let closeBlockCommentTokens = 0
   let lastLineBlank = false
   let endsWithDoubleBlank = false
   let trailingBlankLines = 0
   const rawTaskContentLines = []
+  const taskContentLines = []
 
   for (let i = 1; i < lines.length; i++) {
     let line = lines[i]
-    // Check for end of task
-    // Another task ends a task
-    if (hasTaskInText(config, line, isCodeFile)) break
+    let taskContentLine = `${line}`
+    if (hasTaskInText(config, line)) break
     if (isCheckBoxTask(config, line, beforeText)) break
-
-    // TODO Break this out into a function with an accurate name
-    // Check if task is a list item in markdown and end it if content is not part of a nested list
-    // #urgent
-    // <!-- order:-65 -->
-    if (
-      isMarkDownFile &&
-      beforeText &&
-      /^\s*(\*|-|\d+\.|[a-zA-Z]\.)\s$/.test(beforeText) &&
-      line.search(/\S/) <= beforeText.search(/\S/)
-    ) break
-
+    if (isTaskInList && isLineOutsideMarkdownList(line, beforeText)) break
+    
+    taskContentLines.push(taskContentLine)
     rawTaskContentLines.push(line)
 
     // Check for matching block comments in markdown files
@@ -217,17 +241,17 @@ function getTextFileTaskContent ({
     rawTaskContentLines.length &&
     rawTaskContentLines[rawTaskContentLines.length - 1].trim() === '-->' &&
     openBlockCommentTokens !== closeBlockCommentTokens
-  )
+  ) {
     rawTaskContentLines.pop()
-
-  const taskContentLines = trailingBlankLines 
-    ? rawTaskContentLines.slice(0, -trailingBlankLines)
-    : rawTaskContentLines;
+    taskContentLines.pop()
+  }
 
   return {
     rawTaskContentLines,
-    taskContentLines,
-    trailingBlankLines
+    taskContentLines: trailingBlankLines 
+      ? taskContentLines.slice(0, -trailingBlankLines)
+      : taskContentLines,
+    trailingBlankLines,
   }
 }
 
@@ -247,8 +271,10 @@ function getTaskContent ({
 module.exports = {
   FILE_TYPES,
   getTaskContent,
-  START_TAG,
-  END_TAG,
+  isBeforeTextMarkdownList,
+  padDescription,
+  getCheckedData,
+  CHECK_REGEX,
   LIST_NAME_PATTERN,
   HASH_STYLE_REGEX,
   HASH_STYLE_META_ORDER_REGEX,

package/lib/card.js

@@ -3,11 +3,12 @@ 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 { getIsoDateWithOffset } = require('./adapters/date-time')
 
 const { removeMD, renderMarkdown } = require('./adapters/markdown')
 
@@ -116,7 +117,7 @@ module.exports = function newCard(task, _project, dontParse) {
 
     get defaultData() {
       return {
-        timestamp: moment().format(),
+        timestamp: getIsoDateWithOffset({config: project.config}),
         ..._pick(
           this,
           ...['beforeText',
@@ -194,6 +195,16 @@ module.exports = function newCard(task, _project, dontParse) {
         ...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 }
@@ -244,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/config.js

@@ -56,12 +56,6 @@ class Config {
     return this.lists.findIndex((list) => list.name === name) > -1
   }
 
-  getDateString(date = new Date()) {
-    return _get(this, 'settings.cards.useLocalDate')
-      ? moment(date).utcOffset(0, true).format()
-      : date.toISOString()
-  }
-
   getDefaultList() {
     return _get(this, 'settings.cards.defaultList', this.lists[0].name)
   }
@@ -100,6 +94,10 @@ class Config {
     return _get(this, 'settings.cards.addCompletedMeta', false)
   }
 
+  get noDST() {
+    return _get(this, 'settings.noDST', false)
+  }
+
   get markdownOnly() {
     return this.settings.markdownOnly
   }

package/lib/default-settings.js

@@ -7,6 +7,7 @@ journalPath: imdone-tasks #override
 appendNewCardsTo: imdone-tasks.md
 newCardSyntax: HASHTAG #override
 replaceSpacesWith: '-' #override
+noDST: false
 plugins:
   devMode: false
 cards:

package/lib/file.js

@@ -20,7 +20,7 @@ var _clone = require('lodash.clone'),
   newCard = require('./card'),
   fastSort = require('fast-sort/dist/sort'),
   XRegExp = require('xregexp'),
-  moment = require('moment'),
+  { getIsoDateWithOffset } = require('./adapters/date-time'),
  {
   FILE_TYPES, 
   getTaskContent,
@@ -149,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 = moment().format()
+  const now = getIsoDateWithOffset({ config })
   content = task.addToLastCommentInContent(
     content,
     `completed${config.getMetaSep()}${now}`,
@@ -166,10 +166,11 @@ File.parseDueDate = function (config, text) {
     if (dueString) return dueMatch
     try {
       const due = chrono.parseDate(dueMatch, new Date(), {forwardDate: true})
-      dueString = moment(due).format()
+      if (!due) return dueMatch
+      dueString = getIsoDateWithOffset({date: due, config})
       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
     }
   })
@@ -835,7 +836,7 @@ File.prototype.modifyDescription = function (task, config) {
       description.length > 0 &&
       (hasBlankLines(description) || isWrappedWithCardTag || trailingBlankLines)
     ) {
-      task.isWrappedWithCardTag = isWrappedWithCardTag // DOING Find out where this is used and stop using it
+      task.isWrappedWithCardTag = isWrappedWithCardTag // FIXME Find out where this is used and stop using it
                                                        // <!-- order:-30 -->
       const blankLinesToAdd = isWrappedWithCardTag ? 2 : trailingBlankLines
       description = `${description}${lineEnd.repeat(blankLinesToAdd)}`

package/lib/project.js

@@ -102,10 +102,14 @@ module.exports = class WorkerProject extends Project {
       files: this.files,
       totals,
       tags: this.getTags(),
+      allMeta: this.repo.allMeta,
+      allContexts: [...this.repo.allContexts],
+      allTags: [...this.repo.allTags],
       filter: this.filter,
       defaultFilter: this.defaultFilter,
       actions: this.boardActions,
       plugins: this.pluginManager.getPlugins(),
+      queryProps: this.getQueryProps(cards),
     }
   }
 
@@ -177,8 +181,42 @@ module.exports = class WorkerProject extends Project {
   getLists(opts) {
     const {tasks = this.getDefaultFilteredCards(), populateFiltered = false} = opts || {}
     return Repository.getTasksByList(this.repo, tasks, true, populateFiltered)
+  } 
+  
+  getTaskQueryProps(task) {
+    const queryProps = []
+    if (task) {
+      // add all properties of the task to the queryProps array
+      Object.keys(task).forEach((key) => {
+        if (key === 'data') return
+        if (queryProps.includes(key)) return
+        
+        queryProps.push(key)
+        
+        if (_isObject(task[key])) {
+          Object.keys(task[key]).forEach((subKey) => {
+            if (!queryProps.includes(`${key}.${subKey}`))
+              queryProps.push(`${key}.${subKey}`)
+          })
+        }
+      })
+    }
+    return queryProps
+  }
+
+  getQueryProps(cards) {
+    if (!cards) return []
+    const queryProps = this.getTaskQueryProps(cards[0])
+    return [
+      ...new Set(queryProps),
+      ...[...this.repo.metaKeys].map(key => `allMeta.${key}`),
+      ...[...this.repo.metaKeys].map(key => `meta.${key}`),
+      ...this.repo.allTags,
+      ...this.repo.allContexts,
+    ]
   }
 
+
   getTags(cards = this.getDefaultFilteredCards()) {
     const tags = []
     cards.forEach((card) => {
@@ -208,7 +246,8 @@ module.exports = class WorkerProject extends Project {
   }
 
   getCards(filter, tasks = this.getDefaultFilteredCards()) {
-    return filter ? Repository.query(tasks, filter) : tasks
+    tasks = filter ? Repository.query(tasks, filter) : tasks
+    return tasks
   }
 
   get files() {
@@ -404,27 +443,38 @@ module.exports = class WorkerProject extends Project {
     const filePath = cardData.path
     if (addTemplate) content += cardData.template
 
-    if (tags && tags.length > 0) {
-      let tagContent = ''
-      tags.forEach(tag => {
-        const tagWithPrefix = `${this.config.getTagPrefix()}${tag}`
-        if (content.includes(tagWithPrefix)) return
-        tagContent = `${tagContent} ${tagWithPrefix}`
-      })
-      content = Task.addToLastCommentInContent(content, tagContent.trim(), this.config.isMetaNewLine())
-    }
-    if (contexts && contexts.length > 0) {
-      let contextContent = ''
-      contexts.forEach(context => {
-        const contextWithPrefix = `@${context}`
-        if (content.includes(contextWithPrefix)) return
-        contextContent = `${contextContent} @${context}`
+    content = this.addOrderMetaToContent(content, list)
+    content = this.addTagsToContent(tags, content)
+    content = this.addContextsToContent(contexts, content)
+    content = this.addMetaToContent(meta, content)
+
+    return new Promise((resolve, reject) => {
+      this.repo.addTaskToFile(filePath, list, content, (err, file) => {
+        if (err) return reject(err)
+        resolve(file)
       })
-      content = Task.addToLastCommentInContent(content, contextContent.trim(), this.config.isMetaNewLine())
+    })
+  }
+
+  addOrderMetaToContent(content, _list) {
+    const list = this.lists.find(l => l.name === _list)
+    let order
+    if (this.config.isAddNewCardsToTop()) {
+      order = list.tasks.length
+        ? list.tasks[0].order - 1
+        : 0
+    } else {
+      order = list.tasks.length
+        ? list.tasks[list.tasks.length - 1].order + 1
+        : 0
     }
+    return Task.addToLastCommentInContent(content, `order${this.config.getMetaSep()}${order}`, this.config.isMetaNewLine())
+  }
+
+  addMetaToContent(meta, content) {
     if (meta && meta.length > 0) {
       let metaContent = ''
-      meta.forEach(({key, value}) => {
+      meta.forEach(({ key, value }) => {
         if (!/^['"]/.test(value) && /\s/.test(value)) value = `"${value}"`
         const metaData = `${key}${this.repo.config.getMetaSep()}${value}`
         if (content.includes(metaData)) return
@@ -442,12 +492,33 @@ module.exports = class WorkerProject extends Project {
       })
       content = Task.addToLastCommentInContent(content, metaContent.trim(), this.config.isMetaNewLine())
     }
-    return new Promise((resolve, reject) => {
-      this.repo.addTaskToFile(filePath, list, content, (err, file) => {
-        if (err) return reject(err)
-        resolve(file)
+    return content
+  }
+
+  addContextsToContent(contexts, content) {
+    if (contexts && contexts.length > 0) {
+      let contextContent = ''
+      contexts.forEach(context => {
+        const contextWithPrefix = `@${context}`
+        if (content.includes(contextWithPrefix)) return
+        contextContent = `${contextContent} @${context}`
       })
-    })
+      content = Task.addToLastCommentInContent(content, contextContent.trim(), this.config.isMetaNewLine())
+    }
+    return content
+  }
+
+  addTagsToContent(tags, content) {
+    if (tags && tags.length > 0) {
+      let tagContent = ''
+      tags.forEach(tag => {
+        const tagWithPrefix = `${this.config.getTagPrefix()}${tag}`
+        if (content.includes(tagWithPrefix)) return
+        tagContent = `${tagContent} ${tagWithPrefix}`
+      })
+      content = Task.addToLastCommentInContent(content, tagContent.trim(), this.config.isMetaNewLine())
+    }
+    return content
   }
 
   async deleteTask(task) {

package/lib/repository.js

@@ -15,6 +15,7 @@ var _get = require('lodash.get'),
   _groupBy = require('lodash.groupby'),
   _where = require('lodash.where'),
   _template = require('lodash.template'),
+  _union = require('lodash.union'),
   events = require('events'),
   languages = require('./languages'),
   util = require('util'),
@@ -65,6 +66,10 @@ function Repository(_path, config) {
   this.path = _path
   this.files = []
   this.languages = languages
+  this.allMeta = {}
+  this.metaKeys = new Set()
+  this.allTags = new Set()
+  this.allContexts = new Set()
 }
 
 util.inherits(Repository, events.EventEmitter)
@@ -165,6 +170,10 @@ Repository.prototype.createListeners = function () {
       self.emit('list.found', list)
       self.saveConfig()
     }
+    Object.keys(task.allMeta).forEach(key => self.metaKeys.add(key))
+    task.allTags.forEach(tag => self.allTags.add(tag))
+    task.allContext.forEach(context => self.allContexts.add(context))
+    self.allMeta = self.addAllMeta(task.allMeta)
     self.emit(event, task)
   }
 
@@ -177,6 +186,18 @@ Repository.prototype.createListeners = function () {
   }
 }
 
+Repository.prototype.addAllMeta = function (meta) {
+  const allMeta = Object.assign({}, this.allMeta)
+  Object.keys(meta).forEach((key) => {
+    if (!allMeta[key]) {
+      allMeta[key] = meta[key]
+      return
+    }
+    allMeta[key] = _union(allMeta[key], meta[key])
+  })
+  return allMeta
+}
+
 /**
  * Description
  * @method addList
@@ -645,6 +666,11 @@ Repository.prototype.readFiles = function (files, cb) {
 
   var self = this
 
+  this.allMeta = {}
+  this.metaKeys = new Set()
+  this.allTags = new Set()
+  this.allContexts = new Set()
+
   var exec = function (files) {
     var completed = 0
     if (files.length < 1) return cb(null, [])

package/lib/task.js

@@ -12,7 +12,13 @@ var _clone = require('lodash.clone'),
   lineEnd = String(eol.auto),
   fastSort = require('fast-sort/dist/sort.js'),
   { escapeRegExp } = require('./tools'),
-  cheerio = require('cheerio')
+  cheerio = require('cheerio');
+
+const { 
+  CHECK_REGEX,
+  getCheckedData,
+  isBeforeTextMarkdownList
+} = require('./adapters/parsers/task/CardContentParser.js')
 
 /**
  * Description
@@ -180,7 +186,7 @@ class Task {
     // replace all occurrences of two empty lines in a row with a single empty line
     content = content.replace(/\n\s*\n\s*\n/g, '\n\n')
     let lines = eol.split(content)
-    this.text = lines.shift().trim()
+    this.text = lines.shift().trimStart()
     if (lines && lines.length > 1 && lines[lines.length - 1].trim() === '') lines.pop()
     this.description = lines
     this.parse()
@@ -197,24 +203,12 @@ class Task {
   }
 }
 
-Task.CHECK_REGEX = /^(\s*- )\[([x ])\]/
-Task.getCheckedData = function (content) {
-  const taskRegex = new RegExp(Task.CHECK_REGEX)
-  const result = taskRegex.exec(content)
-  return result
-    ? {
-        pad: result[1].length,
-        checked: result[2].trim() !== '',
-      }
-    : null
-}
-
 Task.hasCheckPrefix = function (content) {
-  return new RegExp(Task.CHECK_REGEX).test(content)
+  return new RegExp(CHECK_REGEX).test(content)
 }
 
 Task.padDescription = function (description = [], beforeText = '') {
-  const checkedData = Task.getCheckedData(beforeText)
+  const checkedData = getCheckedData(beforeText)
   if (checkedData) {
     return description.map((line) => {
       const paddedLine = line.padStart(line.length + checkedData.pad)
@@ -225,7 +219,7 @@ Task.padDescription = function (description = [], beforeText = '') {
 }
 
 Task.trimDescription = function (rawTaskContentLines, beforeText) {
-  const checkedData = Task.getCheckedData(beforeText)
+  const checkedData = getCheckedData(beforeText)
   if (checkedData) {
     rawTaskContentLines = rawTaskContentLines.map((line) => {
       const lineLength = line.length
@@ -237,7 +231,7 @@ Task.trimDescription = function (rawTaskContentLines, beforeText) {
 }
 
 Task.prototype.getCheckedData = function () {
-  return Task.getCheckedData(this.beforeText)
+  return getCheckedData(this.beforeText)
 }
 
 Task.Types = {
@@ -417,6 +411,12 @@ Task.prototype.addToLastCommentInContent = Task.addToLastCommentInContent = func
     return `${before}${prefix}${toAdd}${prefix}${after}`
   }
   if (!content.endsWith(lf) && content !== '') content = content + lineEnd
+  if (isBeforeTextMarkdownList(this.beforeText)) {
+    const spaces = this.beforeText.search(/\S|$/)
+    content = content.padEnd(content.length + spaces)
+    prefix = prefix.padEnd(prefix.length + spaces)
+  }
+
   return `${content}<!--${prefix}${toAdd}${prefix}-->`
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.40.1",
+  "version": "1.41.0",
   "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",