imdone-core 1.34.3 → 1.36.0

package/README.md

@@ -70,12 +70,11 @@ Take a look at the source of this README.md.  You'll probably find a few tasks i
 ### Task syntax
 - Code style tasks will only be detected if the list name matches a string in the `code.include_lists` attribute in `.imdone/config.yml` and the file extension exists in lib/languages.js.
 - List names in code style tasks must match this regular expression ([A-Z]+[A-Z-_]+?).
+- Only code style tasks can be used in code files and must be in a line or block comment
+  - Code style tasks are only detected in comments for files with extensions listed in [imdone-core/languages.js](https://github.com/imdone/imdone-core/blob/master/lib/languages.js) or the **languages** attribute in the `.imdone/config.yml`
 - In Hash and markdown style tasks **list name** can be any combination of upper and lower case letters, underscores and dashes
 - In Hash and markdown style tasks the **list name** must be followed by a `:` and a number which determines sort order in the list
   - Sort numbers can be reused, in which case tasks with the same sort number will be sorted alphabetically by text.
-- In code, tasks can be any style but must be in a line or block comment
-  - Code style tasks are only detected in comments for files with extensions listed in [imdone-core/languages.js](https://github.com/imdone/imdone-core/blob/master/lib/languages.js) or the **languages** attribute in the `.imdone/config.yml`
-- For code and hash style tasks, the task text is terminated by the end of line
 - Task text can have [todo.txt formatting](https://github.com/todotxt/todo.txt) excluding the completion and priority markers.
 - Task text can have markdown formatting
 

package/lib/adapters/markdown.js

@@ -21,6 +21,7 @@ md.use(checkbox)
     }
   }
 ))
+.validateLink = () => true
 
 module.exports = {
   renderMarkdown (markdown) {

package/lib/card.js

@@ -31,7 +31,7 @@ module.exports = function newCard(task, _project, dontParse) {
     }
 
     get maxLines() {
-      return _get(this.settings, 'cards.maxLines')
+      return project.config.maxLines
     }
 
     get interpretedContent() {
@@ -250,10 +250,11 @@ module.exports = function newCard(task, _project, dontParse) {
 
     getCardMarkdown() {
       // - eliminate <!--[ ]--> wrappers
-      const taskMD = this.interpretedContent
+      let taskMD = this.interpretedContent
         .replace(/%%[\s\S]*?%%/g, '')
         .replace(/<\!--\s*?-->/gs, '')
         .trim()
+      taskMD = this.replaceImagePaths(taskMD)
       // - Split on eol and append lines until visible line count equals lines
       const displayContent = []
       const rawContent = []
@@ -274,6 +275,20 @@ module.exports = function newCard(task, _project, dontParse) {
       return { totalLines, markdown, rawMarkdown }
     }
 
+    replaceImagePaths(content) {
+      return content.replace(
+        /(!\[.*?\]\()(.*?)(\))/g,
+        (match, p1, imagePath, p3) => {
+          imagePath = _path.join(
+            _path.dirname(this.fullPath),
+            imagePath
+          )
+          const imageURL = `file://${imagePath}`
+          return p1 + imageURL + p3
+        }
+      )
+    }
+
     getHtml(content) {
       const html = renderMarkdown(content)
       const mdArray = eol.split(content)

package/lib/config.js

@@ -67,8 +67,8 @@ class Config {
   }
 
   getDoneList() {
-    const lists = _cloneDeep(this.lists).reverse()
-    const defaultValue = lists && lists.length ? lists[0].name : 'DONE'
+    const lists = _cloneDeep(this.lists).reverse().filter((list) => !list.filter)
+    const defaultValue = lists && lists.length ? lists[0].name : undefined
     return _get(this, 'settings.cards.doneList', defaultValue)
   }
 
@@ -172,6 +172,10 @@ class Config {
     return _get(this, 'settings.cards.orderMeta', false)
   }
 
+  get maxLines() {
+    return _get(this, 'settings.cards.maxLines', 1)
+  }
+
   get blankLinesToEndTask() {
     let blankLinesToEndTask = Math.round(
       _get(this, 'settings.cards.blankLinesToEndTask', 1)

package/lib/file.js

@@ -513,8 +513,6 @@ File.prototype.extractTasksInCodeFile = function (config) {
   while ((result = commentRegex.exec(self.getContent())) !== null) {
     var comment = result[0]
     var commentStart = result.index
-    self.extractHashStyleTasks(config, commentStart, comment)
-    self.extractLinkStyleTasks(config, commentStart, comment)
     self.extractCodeStyleTasks(config, commentStart, comment)
   }
 }

package/lib/mixins/repo-fs-store.js

@@ -216,7 +216,7 @@ function mixin(repo, fs = require('fs')) {
       include_lists = _union(include_lists, currentConfig.code.include_lists)
 
     if (currentConfig && currentConfig.settings)
-      loadedConfig.settings = {...loadedConfig.settings, ...currentConfig.settings}
+      loadedConfig.settings = {...currentConfig.settings, ...loadedConfig.settings}
 
     if (loadedConfig && loadedConfig.code)
       include_lists = _union(include_lists, loadedConfig.code.include_lists)

package/lib/mixins/repo-watched-fs-store.js

@@ -46,7 +46,7 @@ function mixin(repo, fs = require('fs')) {
     if (initializing) {
       return cb ? cb('already initializing') : null
     }
-    log('Initializing repo:', repo.path)
+    console.info('Initializing repo:', repo.path)
     initializing = true
     if (repo.watcher) repo.watcher.close()
     _refresh.call(repo, function (err, files) {
@@ -73,7 +73,7 @@ function mixin(repo, fs = require('fs')) {
     console.info('Loading config.  Observed a change to:', file)
     const label = `Refresh repo: ${repo.path}`
     console.time(label)
-    _refresh.call(repo, (err, files) => {
+    repo.refresh((err, files) => {
       if (err) console.error('Error refreshing repo', err)
       console.timeEnd(label)
       repo.emitConfigUpdate(file, repo.config)

package/lib/project.js

@@ -265,11 +265,11 @@ module.exports = class WorkerProject extends Project {
     if (!task.allMeta[key]) task.allMeta[key] = []
     task.allMeta[key].push(value)
     if (!/^['"]/.test(value) && /\s/.test(value)) value = `"${value}"`
-    const metaData = `${key}${this.repo.config.getMetaSep()}${value}`
+    const metaData = `${key}${this.config.getMetaSep()}${value}`
     const content = task.addToLastCommentInContent(
       task.content,
       metaData,
-      this.repo.config.isMetaNewLine()
+      this.config.isMetaNewLine()
     )
     return await this.updateCardContent(task, content)
   }

package/lib/repository.js

@@ -419,7 +419,7 @@ Repository.prototype.shouldInclude = function (relPath) {
   }
   if (this.ignore) {
     try {
-      include = include && !this.ignore.ignores(relPath)
+      include = include && (relPath === '' || !this.ignore.ignores(relPath))
     } catch (e) {
       console.error(
         `Failed to check ignore status for dir: [${relPath}] in: [${this.path}]. It will be included.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.34.3",
+  "version": "1.36.0",
   "description": "imdone-core",
   "main": "index.js",
   "bin": {