imdone-core 1.49.1 → 1.50.0

package/lib/card.js

@@ -187,8 +187,12 @@ module.exports = function newCard(task, _project, dontParse) {
       this.dataKeys = keys
 
       this.data = { ...data }
+      this.updateDescriptionData()
+    }
+
+    updateDescriptionData() {
       this.desc = this.getDescriptionData()
-      this.data = { ...data, ...this.desc }
+      this.data = { ...this.data, ...this.desc }
     }
 
     getEncodedContent(content) {

package/lib/plugins/default-board-actions-plugin.js

@@ -0,0 +1,46 @@
+const Plugin = require('imdone-api')
+
+module.exports = class DefaultBoardActionsPlugin extends Plugin {
+  constructor(project) {
+    super(project)
+  }
+
+  getBoardActions() {
+    const project = this.project
+
+    return [
+      {
+        title: 'Duplicate card',
+        keys: ['shift+d'],
+        icon: 'clone',
+        action: (task) => {
+          const timestamp = project.isoDateWithOffset
+          project.newCard({
+            list: project.config.getDefaultList(),
+            path: task.relPath,
+            template: task.content.replace(/(\screated:).*(\s)/, `$1${timestamp}$2`),
+          })
+          project.toast({ message: `"${task.text}" duplicated` })
+        },
+      },
+      {
+        title: 'Copy card to clipboard',
+        keys: ['c'],
+        icon: 'clone',
+        action: (task) => {
+          return project.copyToClipboard(task.content, `"${task.text} markdown" copied to clipboard`)
+        },
+      },
+      {
+        title: 'Copy card title to clipboard',
+        keys: ['mod+t'],
+        icon: 'clone',
+        action: (task) => {
+          const title = project.renderMarkdown(task.text).replaceAll(/<\/*p>/gi, '')
+          return project.copyToClipboard(title, `"${title}" copied to clipboard`)
+        },
+      },
+    ]
+  }
+  
+}

package/lib/plugins/extension-plugin.js

@@ -36,10 +36,11 @@ module.exports = class ExtensionPlugin extends Plugin {
   }
 
   getBoardActions() {
-    return this.boardActionsFunction().map(({ title, action, keys }) => ({
+    return this.boardActionsFunction().map(({ title, action, keys, icon }) => ({
       name: title,
       action,
-      keys
+      keys,
+      icon
     }))
   }
 

package/lib/plugins/persist-tags-plugin.js

@@ -7,7 +7,7 @@ module.exports = class PersistTagsPlugin extends Plugin {
   }
 
   async onBoardUpdate() {
-    await save(this.project.allTags, this.project.path)
+    await save(this.project.allTags.sort(), this.project.path)
   }
   
 }

package/lib/plugins/plugin-manager.js

@@ -12,6 +12,7 @@ module.exports = class PluginManager extends Emitter {
     super()
     this.project = project
     this.defaultPlugins = [
+      './default-board-actions-plugin',
       './archive-plugin',
       './epic-plugin', 
       './extension-plugin',

package/lib/project.js

@@ -258,7 +258,7 @@ module.exports = class WorkerProject extends Project {
   }
 
   getDefaultFilteredCards() {
-    return Repository.query(this.repo.getTasks(), this.defaultFilter)
+    return this.filterCards(this.repo.getTasks(), this.defaultFilter)
   }
 
   getAllCards(filter) {
@@ -267,10 +267,17 @@ module.exports = class WorkerProject extends Project {
   }
 
   getCards(filter, tasks = this.getDefaultFilteredCards()) {
-    tasks = filter ? Repository.query(tasks, filter) : tasks
+    tasks = filter ? this.filterCards(tasks, filter) : tasks
     return tasks
   }
 
+  filterCards(tasks, filter) {
+    const {
+      result,
+    } = Repository.filterCards(tasks, filter)
+    return result
+  }
+
   get files() {
     return this.repo.getFilePaths()
   }

package/lib/repository.js

@@ -972,7 +972,7 @@ Repository.prototype.deleteTask = function (task, cb) {
   if (!file) return cb(null)
   const execute = function (file) {
     file.deleteTask(task, self.getConfig())
-    if (file.getContentForFile().trim() === '') {
+    if (file.getContentForFile().trim() === '' && file.isMarkDownFile()) {
       if (file.deleted) return
       console.log('Deleting empty file:', file.path)
       self.deleteFile(file.path, cb)
@@ -1573,20 +1573,15 @@ Repository.deserialize = function (repo, cb) {
 }
 
 Repository.regexQuery = function (tasks, queryString) {
-  return tasks.filter((task) => {
-    if (
-      task.rawTask.search(new RegExp(tools.escapeRegExp(queryString), 'i')) > -1
-    )
-      return true
-    for (let i in task.description) {
-      if (
-        task.description[i].search(
-          new RegExp(tools.escapeRegExp(queryString), 'i')
-        ) > -1
-      )
-        return true
+  return tasks.map((task) => {
+    const match = task.content.match(new RegExp(tools.escapeRegExp(queryString), 'i'))
+    task.match = match
+    if (match && queryString.trim() && task.interpretedContent) {
+      task.interpretedContent = task.interpretedContent.replace(new RegExp(`(${tools.escapeRegExp(queryString.trim())})`, 'gi'), '==$1==' )
+      task.updateDescriptionData()
     }
-  })
+    return task
+  }).filter(({match}) => match)
 }
 
 Repository.parseSortFromQueryString = function (queryString) {
@@ -1622,26 +1617,31 @@ Repository.sortByQuery = function (tasks, queryString = '') {
   fastSort(tasks).by(sort)
 }
 
-Repository.query = function (tasks, queryString = '') {
+Repository.filterCards = function (tasks, _queryString = '') {
   let query
-  let sort
-  queryString = replaceDateLanguage(queryString)
-  const resp = Repository.parseSortFromQueryString(queryString)
+  _queryString = replaceDateLanguage(_queryString)
+  let { sort, queryString } = Repository.parseSortFromQueryString(_queryString)
   try {
-    query = monquery(resp.queryString)
-    sort = resp.sort
+    query = monquery(queryString)
   } catch (e) {
-    log(`Unable to parse ${queryString} using monquery`)
+    log(`Unable to parse ${_queryString} using monquery`)
   }
   let result = []
   if (query) result = tasks.filter(sift.default(query))
   if (!query || result.length === 0) {
-    result = Repository.regexQuery(tasks, resp.queryString)
-    sort = resp.sort
+    result = Repository.regexQuery(tasks, queryString)
   }
   if (!sort || sort.length === 0) sort = DEFAULT_SORT
   fastSort(result).by(sort)
-  return result
+  return {
+    result,
+    query,
+    sort
+  }
+}
+
+Repository.query = function (tasks, queryString) {
+  return Repository.filterCards(tasks, queryString).result
 }
 
 Repository.replaceDatesInQuery = function (query) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.49.1",
+  "version": "1.50.0",
   "description": "imdone-core",
   "main": "index.js",
   "scripts": {
@@ -59,7 +59,7 @@
     "find-up": "^5.0.0",
     "gray-matter": "^4.0.2",
     "ignore": "^5.2.0",
-    "imdone-api": "^1.48.0",
+    "imdone-api": "^1.50.0",
     "isbinaryfile": "^3.0.2",
     "js-yaml": "^3.14.1",
     "json-fns": "^1.0.0",