imdone-core 1.53.4 → 1.53.6

package/lib/adapters/markdown.js

@@ -29,7 +29,7 @@ function getRenderer(filePath) {
   .use(imageSize)
   .use(obsidianTopicLinks(filePath))
   .use(replaceImagePaths(filePath))
-  .use(replaceLinkPaths(filePath))
+  .use(replaceLinkPathsAndTitles(filePath))
   .validateLink = () => true
 
   return md
@@ -50,11 +50,12 @@ function obsidianTopicLinks(filePath) {
       let topic = match[1].trim();
       const alias = match[2] ? match[2].trim() : topic;
       if (!topic.endsWith('.md')) topic = `${topic}.md`;
-      const href = encodeURI(resolveFileUrl(topic, filePath));
+      const unencodedHref = resolveFileUrl(topic, filePath);
+      const href = encodeURI(unencodedHref);
 
       // Create a new token
       const token = state.push("obsidian_link", "", 0);
-      token.content = `<a href="${href}">${md.utils.escapeHtml(alias)}</a>`;
+      token.content = `<a href="${href}" title="${unencodedHref}">${md.utils.escapeHtml(alias)}</a>`;
 
       // Move parsing position forward
       state.pos += fullMatch.length;
@@ -92,7 +93,7 @@ function replaceImagePaths(filePath) {
   }
 }
 
-function replaceLinkPaths(filePath) {
+function replaceLinkPathsAndTitles(filePath) {
 
   return function(md) {
     const defaultRender = md.renderer.rules.link_open || function(tokens, idx, options, env, self) {
@@ -108,6 +109,12 @@ function replaceLinkPaths(filePath) {
         if (srcUrl) token.attrs[srcIndex][1] = srcUrl;
       }
 
+      // set the title to the href if it's not already set
+      const titleIndex = token.attrIndex('title');
+      if (titleIndex < 0) {
+        const title = token.attrs[srcIndex][1];
+        token.attrPush(['title', title]);
+      }
       return defaultRender(tokens, idx, options, env, self);
     };
   }

package/lib/card.js

@@ -117,6 +117,7 @@ module.exports = function newCard(task, _project, dontParse) {
           'source',
           'due',
           'created',
+          'started',
           'completed',
           'tags',
           'context',

package/lib/config.js

@@ -70,6 +70,12 @@ class Config {
     return _get(this, 'settings.cards.doneList', defaultValue)
   }
 
+  getDoingList() {
+    const lists = _cloneDeep(this.lists).reverse().filter((list) => !list.filter)
+    const defaultValue = lists && lists.length ? lists[1].name : undefined
+    return _get(this, 'settings.cards.doingList', defaultValue)
+  }
+
   isAddNewCardsToTop() {
     return _get(this, 'settings.cards.addNewCardsToTop', false)
   }

package/lib/default-settings.js

@@ -21,6 +21,7 @@ cards:
   metaNewLine: false #override
   addCompletedMeta: false #override
   addCheckBoxTasks: false #override
+  doingList: DOING #override if
   doneList: DONE #override if
   tokenPrefix: '#' #override
   taskPrefix: '##' #override

package/lib/file.js

@@ -78,10 +78,8 @@ function File(opts) {
   }
 }
 util.inherits(File, events.EventEmitter)
-const CODE_BLOCK_REGEX = (File.CODE_BLOCK_REGEX = /`{3}[\s\S]*?`{3}/gm)
-const INLINE_CODE_REGEX = (File.INLINE_CODE_REGEX = /`[\s\S]*?`/g)
-const CODE_STYLE_END = '((:)(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$'
 
+const CODE_STYLE_END = '((:)(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$'
 const CODE_STYLE_PATTERN = (File.CODE_STYLE_PATTERN =
   '([A-Z]+[A-Z-_]+?)' + CODE_STYLE_END)
 
@@ -103,6 +101,10 @@ function getDoneList(config) {
   return config.getDoneList()
 }
 
+function getDoingList(config) {
+  return config.getDoingList()
+}
+
 function getFrontMeta(meta) {
   const metadata = {}
   Object.entries(meta).forEach(([prop, val]) => {
@@ -137,6 +139,37 @@ File.isMarkdown = function (relPath) {
   return /\.md$/i.test(relPath) || path.extname(relPath) === ''
 }
 
+File.prototype.removeCompleted = function ({ task, content, config }) {
+  const doneList = getDoneList(config)
+  if (doneList === task.list) return content
+  if (
+    task.meta.completed &&
+    task.meta.completed.length > 0
+  ) {
+    content = this.removeMetaData(
+      content,
+      'completed',
+      task.meta.completed[0]
+    )
+  }
+  return content
+}
+
+File.addStarted = function ({ task, content, config }) {
+  if (!task || !config || !config.settings) return content
+  if (!config.settings.cards.addStartedMeta) return content
+  if (task.meta.started) return content
+  if (task.list !== getDoingList(config)) return content
+  const now = getIsoDateWithOffset()
+  content = task.addToLastCommentInContent(
+    content,
+    `started${config.getMetaSep()}${now}`,
+    File.isMetaNewLine(config)
+  )
+  const lines = eol.split(content)
+  return lines.join(lineEnd)
+}
+
 File.addCompleted = function ({ task, content, config }) {
   const doneList = getDoneList(config)
   if (
@@ -220,7 +253,6 @@ File.prototype.trackListChanges = function ({ task, content, config, modify }) {
     .filter((list) => !list.filter)
     .map((list) => list.name)
 
-  const doneList = getDoneList(config)
   let beforeTextModified = false
   if (this.isMarkDownFile()) {
     beforeTextModified = trackMarkdownChecklistChanges({task, config, modify})
@@ -239,18 +271,6 @@ File.prototype.trackListChanges = function ({ task, content, config, modify }) {
       if (!task.meta[list]) task.meta[list] = []
       task.meta[list].push(now)
     }
-
-    if (
-      doneList !== task.list &&
-      task.meta.completed &&
-      task.meta.completed.length > 0
-    ) {
-      content = this.removeMetaData(
-        content,
-        'completed',
-        task.meta.completed[0]
-      )
-    }
   }
 
   return { content, beforeTextModified }
@@ -278,7 +298,9 @@ File.prototype.transformTask = function ({config, modify, task}) {
   content = File.parseDueDate(config, content)
   content = File.parseRemindDate(config, content)
   content = File.parseDeferDate(config, content)
+  content = File.addStarted({ task, content, config })
   content = File.addCompleted({ task, content, config })
+  content = this.removeCompleted({ task, content, config })
   content = task.format(content)
   if (
     content.trim() !== task.content.trim() 
@@ -290,7 +312,6 @@ File.prototype.transformTask = function ({config, modify, task}) {
 }
 
 File.prototype.transformTasks = function (config, modify) {
-  // if (this.isCodeFile()) return
   fastSort(this.getTasks())
     .desc(u => u.line)
     .forEach(task => this.transformTask({config, modify, task}))
@@ -360,7 +381,7 @@ File.prototype.extractHashStyleTasks = function (config, pos, content) {
     if (!config.listExists(list)) continue
 
     const posInContent = result.index + pos
-    if (this.hasCodeSpanOrBlockAtPos(posInContent)) continue
+    if (this.isWithinCodeSpanOrBlock(posInContent, content)) continue
     
     const line = this.getLineNumber(posInContent)
     if (this.hasTaskAtLine(line)) continue
@@ -395,7 +416,7 @@ File.prototype.extractLinkStyleTasks = function (config, pos, content) {
     let [match, before, rawTask, text, list, colon, order] = result
     const beforeLength = before ? before.length : 0
     const posInContent = result.index + pos + beforeLength
-    if (this.hasCodeSpanOrBlockAtPos(posInContent)) continue
+    if (this.isWithinCodeSpanOrBlock(posInContent, content)) continue
     var line = this.getLineNumber(posInContent)
     if (self.hasTaskAtLine(line)) continue
     if (!config.listExists(list)) continue
@@ -521,7 +542,6 @@ File.prototype.extractTasksInCodeFile = function (config) {
 }
 
 File.prototype.extractTasksInNonCodeFile = function (config) {
-  this.codeSpanAndBlockPositions = File.getCodePositions(this.getContent())
   this.extractHashStyleTasks(config, 0, this.getContent())
   this.extractLinkStyleTasks(config, 0, this.getContent())
   this.extractCheckboxTasks(config, 0, this.getContent())
@@ -1105,27 +1125,6 @@ File.prototype.removeTask = function (task) {
   }
 }
 
-File.prototype.ignoreCodeBlocks = function () {
-  // BACKLOG This is not used, but we need a way to ignore tasks in code blocks. Maybe save position ranges
-  // ```javascript
-  // var cleanContent = this.content
-  // var replacer = function (block) {
-  //   block = block.replace(new XRegExp(LINK_STYLE_REGEX), '**TASK**')
-  //   block = block.replace(getHashStyleRegex(config.tokenPrefix), '**TASK**')
-  //   return block
-  // }
-  // if (this.isMarkDownFile()) {
-  //   cleanContent = this.content
-  //     .replace(new RegExp(CODE_BLOCK_REGEX), replacer)
-  //     .replace(new RegExp(INLINE_CODE_REGEX), replacer)
-  // }
-  // return cleanContent
-  // ```
-  // <!--
-  // order:-640
-  // -->
-}
-
 File.prototype.isMarkDownFile = function () {
   return /^md|markdown$/i.test(this.getExt())
 }
@@ -1345,19 +1344,9 @@ File.prototype.getSource = function () {
   }
 }
 
-File.getCodePositions = function(content) {
-  const regex = /```.*?```|`.*?`/gms
-  const indicies = []
-  let result
-  while ((result = regex.exec(content)) !== null) {
-    indicies.push([result.index, regex.lastIndex])
-  }
-  return indicies
-}
-
-File.prototype.hasCodeSpanOrBlockAtPos = function(pos) {
-  const positions = this.codeSpanAndBlockPositions || File.getCodePositions(this.content)
-  return positions.find(([start, end]) => pos > start && pos < end)
+File.prototype.isWithinCodeSpanOrBlock = function(pos, content) {
+  const positions = Task.getMarkdownCodePositions(content)
+  return Task.isResultInMarkdownCode(positions, pos)
 }
 
 module.exports = File

package/lib/migrate-config.js

@@ -109,6 +109,10 @@ module.exports = function (repo, defaultSettings = defaultSettingsObject) {
       if (config.settings.cards.doneList === undefined) {
         config.settings.cards.doneList = lists ? lists[lists.length - 1] : ''
       }
+      // Set up default doingList
+      if (config.settings.cards.doingList === undefined) {
+        config.settings.cards.doingList = lists ? lists[lists.length - 1] : ''
+      }
       // Add name
       if (config.settings.name === undefined) {
         config.settings.name = _path.basename(path)

package/lib/plugins/default-card-properties-plugin.js

@@ -12,6 +12,7 @@ module.exports = class DefaultCardPropertiesPlugin extends Plugin {
     return {
       date: `${getIsoDateWithOffset(new Date()).substring(0, 10)}`,
       timestamp: getIsoDateWithOffset(new Date()),
+      clearFilterURL: self.getFilterURL(''),
       getFilterURL: (filter) => self.getFilterURL(filter),
       getFilterLink: (filter) => `[Filter By: ${filter}](${self.getFilterURL(filter)})`
     }

package/lib/project.js

@@ -108,9 +108,10 @@ module.exports = class WorkerProject extends Project {
     )
     let allLists = this.allLists
     allLists = allLists.map((list) => {
-      list.tasks = list.tasks.map((card) => {
+      list.tasks = list.tasks.map((card, index) => {
         card.interpretedContent = ''
         card.totals = totals
+        card.index = index
         return card
       })
       return list

package/lib/task.js

@@ -70,6 +70,7 @@ class Task {
     this.content = obj.content
     this.lastLine = this.getLastLine()
     this.orderModified = obj.orderModified
+    this.index = undefined
     if (dontParse || !this.text) return
     this.parse()
   }
@@ -135,26 +136,17 @@ class Task {
 
   getTextAndDescription() {
     const description = _clone(this.description)
-    const text = this.getText({
-      stripMeta: true,
-      sanitize: true,
-      stripTags: true,
-      stripContext: true,
-    })
-    const descriptionMD = description.map((line) => {
-      return this.getText(
-        {
-          stripMeta: true,
-          sanitize: true,
-          stripTags: true,
-          stripContext: true,
-        },
-        line
-      )
-    })
-    return `${this.markdownBeforeText}${text}${lineEnd}${descriptionMD.join(
+    const taskContent = `${this.markdownBeforeText}${this.text}${lineEnd}${description.join(
       lineEnd
     )}`.replace(/<!--\s*\[\s*([\s\S]*?)\s*\]\s*-->/gm, '$1')
+    return this.getText(
+      {
+        stripMeta: true,
+        sanitize: true,
+        stripTags: true,
+        stripContext: true,
+      },
+      taskContent);
   }
 
   getRawTextAndDescription() {
@@ -205,7 +197,7 @@ class Task {
     })
   }
 }
-const DATE_META_KEYS = Task.DATE_META_KEYS = ['due', 'defer', 'created', 'remind', 'completed', 'archivedAt']
+const DATE_META_KEYS = Task.DATE_META_KEYS = ['due', 'defer', 'created', 'started', 'remind', 'completed', 'archivedAt']
 
 Task.hasCheckPrefix = function (content) {
   return new RegExp(CHECK_REGEX).test(content)
@@ -251,25 +243,44 @@ Task.getTagRegexp = function (prefix = '+') {
   )
 }
 Task.getTags = function (text, prefix = '+') {
-  const tags = []
-  var codePositions = Task.getMarkdownCodePositions(text)
-  var result,
-    re = Task.getTagRegexp(prefix)
+  const tags = [];
+  const codePositions = Task.getMarkdownCodePositions(text);
+  const linkLabelPositions = Task.getMarkdownLinkLabelPositions(text);
+  let result;
+  const re = Task.getTagRegexp(prefix);
 
   while ((result = re.exec(text)) !== null) {
-    if (Task.isResultInMarkdownCode(codePositions, result.index)) continue
-    const tag = result[2]
-    if (tags.includes(tag) || /^[#]+$/.test(tag)) continue
-    tags.push(tag)
+    if (Task.isResultInMarkdownCode(codePositions, result.index)) continue;
+    if (Task.isResultInMarkdownLinkLabel(linkLabelPositions, result.index)) continue;
+    const tag = result[2];
+    if (tags.includes(tag) || /^[#]+$/.test(tag)) continue;
+    tags.push(tag);
   }
 
-  return tags
-}
+  return tags;
+};
+
+Task.getMarkdownLinkLabelPositions = function (text) {
+  const positions = [];
+  const re = /\[([^\]]+)\]\([^\)]+\)/g;
+  let match;
+
+  while ((match = re.exec(text)) !== null) {
+    positions.push({ start: match.index, end: re.lastIndex });
+  }
+
+  return positions;
+};
+
+Task.isResultInMarkdownLinkLabel = function (linkLabelPositions, index) {
+  return linkLabelPositions.some(pos => index >= pos.start && index < pos.end);
+};
 
 Task.ContextRegExp = new RegExp(
   `(^|\\s)@([${Task.AnyLanguageGroup}${Task.EmojiGroup}]+)`,
   'gmiu'
 )
+
 Task.getContext = function (text) {
   const context = []
   var codePositions = Task.getMarkdownCodePositions(text)
@@ -483,16 +494,16 @@ Task.isTask = function (task) {
 }
 
 Task.getMarkdownCodePositions = function (text) {
-  const re = /`([^`]+)`/g
-  let result
-  let positions = []
+  const re = /(```[\s\S]*?```|`[^`]+`)/g;
+  let result;
+  let positions = [];
   while ((result = re.exec(text)) !== null) {
-    const start = result.index
-    const end = start + result[0].length
-    positions.push({ start, end })
+    const start = result.index;
+    const end = start + result[0].length;
+    positions.push({ start, end });
   }
-  return positions
-}
+  return positions;
+};  
 
 Task.isResultInMarkdownCode = function (positions, index) {
   for (let i = 0; i < positions.length; i++) {
@@ -509,12 +520,15 @@ Task.prototype.parseTodoTxt = function () {
 }
 
 Task.removeTags = function (text, prefix = '+') {
-  const positions = Task.getMarkdownCodePositions(text)
+  const codePositions = Task.getMarkdownCodePositions(text);
+  const linkLabelPositions = Task.getMarkdownLinkLabelPositions(text);
   return text.replace(Task.getTagRegexp(prefix), (match, p1, p2, offset) => {
-    if (Task.isResultInMarkdownCode(positions, offset) || match.includes('##')) return match
-    return ''
-  })
-}
+    if (Task.isResultInMarkdownCode(codePositions, offset) || Task.isResultInMarkdownLinkLabel(linkLabelPositions, offset) || match.includes('##')) {
+      return match;
+    }
+    return '';
+  });
+};
 
 Task.removeContext = function (text) {
   const positions = Task.getMarkdownCodePositions(text)
@@ -713,7 +727,7 @@ Task.prototype.getList = function () {
 // order:-700
 // -->
 Task.prototype.getText = function (opts, text) {
-  if (text === undefined) text = this.text
+  if (text === undefined) return
   if (opts) {
     if (opts.stripMeta) {
       text = Task.removeMetaDataFromText(this.config || {}, text)
@@ -732,14 +746,6 @@ Task.prototype.getText = function (opts, text) {
   return text
 }
 
-Task.prototype.getDescription = function (opts) {
-  return this.description
-    .map((line) => {
-      return this.getText(opts, line)
-    })
-    .join(lineEnd)
-}
-
 Task.prototype.getChecksFromHtml = function (html) {
   let $ = cheerio.load(html)
   let checks = $('.task-description').find("input[type='checkbox']")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.53.4",
+  "version": "1.53.6",
   "description": "imdone-core",
   "main": "index.js",
   "scripts": {

package/devops/containers/README.md

@@ -1,11 +0,0 @@
-# Running a git remote in docker
-
-[GitHub - 1nfiniteloop/git-remote: Docker image for a minimal git remote](https://github.com/1nfiniteloop/git-remote)
-
-## setup the container before each test
-
-```bash
-./setup-remote.sh
-```
-
-The remote will remain running after the testing has completed

package/devops/containers/remove-remote.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-docker rm -f git-remote
-docker volume rm git-remote.home
-docker volume rm git-remote.host-keys
-ssh-keygen -R '[localhost]:8022'

package/devops/containers/setup-remote.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-$SCRIPT_DIR/remove-remote.sh
-
-docker run \
-  --name=git-remote \
-  --detach \
-  --publish 0.0.0.0:8022:22 \
-  --volume git-remote.home:/home/git \
-  --volume git-remote.host-keys:/etc/ssh/host_keys \
-  1nfiniteloop/git-remote:latest
-
-docker exec git-remote mkdir /home/git/authorized_keys
-
-# TODO Generate a key in the container and use that instead of copying the key from the host
-# Update to use `GIT_SSH_COMMAND="ssh -i ~/.ssh/id_rsa_example" git clone example`
-# <!--
-# order:0
-# -->
-
-
-docker cp ~/.ssh/id_rsa.pub git-remote:/home/git/authorized_keys
-
-echo "make authorized_keys owned by git"
-docker exec git-remote chown -R git:git /home/git/authorized_keys/id_rsa.pub
-docker exec git-remote chmod 777 /home/git/authorized_keys/id_rsa.pub
-
-echo "create the test project"
-docker exec git-remote su - git -s /bin/bash -c "mkdir /home/git/test-project.git; cd /home/git/test-project.git; git init --bare;"

package/devops/imdone/backlog-config.yml

@@ -1,102 +0,0 @@
-keepEmptyPriority: true
-code:
-  include_lists:
-    - TODO
-    - DOING
-    - DONE
-    - PLANNING
-    - FIXME
-    - ARCHIVE
-    - HACK
-    - CHANGED
-    - XXX
-    - IDEA
-    - NOTE
-    - REVIEW
-    - CURRENT
-    - BACKLOG
-lists:
-  - name: BACKLOG
-    hidden: true
-    ignore: false
-    id: jea67colm3nm22s
-  - name: TODO
-    hidden: false
-    ignore: false
-    id: jea6phpllxpsj7j
-  - name: DOING
-    hidden: false
-    ignore: false
-    id: jea6phpllxpsj7k
-  - name: DONE
-    hidden: false
-    ignore: false
-    id: jea6phpllxpsj7l
-settings:
-  openIn: default
-  customOpenIn: ''
-  editorTheme: blackboard
-  journalType: New File
-  journalPath: stories
-  appendNewCardsTo: imdone-tasks.md
-  newCardSyntax: HASHTAG
-  replaceSpacesWith: '-'
-  plugins:
-    devMode: false
-    CliBacklogPlugin:
-      projectType: BACKLOG_PROJECT
-      storyTemplate: |
-        # Story id
-
-        As a <role>, I want <feature>, so that <benefit>.
-
-        ## Acceptance Criteria
-
-        - [ ] Criteria 1
-        - [ ] Criteria 2
-
-        ## Tasks
-
-        ### Phase One Tasks
-
-        - [ ] Task 1
-
-        ### DoD
-
-        - [ ] Acceptance criteria are met
-        - [ ] Refactoring is complete
-        - [ ] Code builds with no error
-        - [ ] Unit tests are written and pass
-        - [ ] Existing Unit Tests pass
-        - [ ] Sufficient diagnostics/telemetry are logged
-        - [ ] Code review is complete
-        - [ ] UX review is complete (if applicable)
-        - [ ] Documentation is updated
-        - [ ] The feature is merged into the develop branch
-        - [ ] The feature is signed off by the product owner
-  journalTemplate: ''
-  theme: dark
-  views: []
-  name: backlog
-  cards:
-    colors: []
-    template: |
-
-      <!--
-      #story
-      created:${(new Date()).toISOString()}
-      task-id:${sid}
-      -->
-    trackChanges: false
-    metaNewLine: true
-    addCompletedMeta: true
-    addCheckBoxTasks: false
-    doneList: DONE
-    taskPrefix: '##'
-    tagPrefix: '#'
-    metaSep: ':'
-    orderMeta: true
-    maxLines: 6
-    addNewCardsToTop: true
-    defaultList: TODO
-  defaultFilter: allTags = "story"

package/devops/imdone/backlog.imdoneignore

@@ -1 +0,0 @@
-# stories/**/tasks

package/devops/imdone/story-config.yml

@@ -1,71 +0,0 @@
-keepEmptyPriority: true
-code:
-  include_lists:
-    - TODO
-    - DOING
-    - DONE
-    - PLANNING
-    - FIXME
-    - ARCHIVE
-    - HACK
-    - CHANGED
-    - XXX
-    - IDEA
-    - NOTE
-    - REVIEW
-    - CURRENT
-    - BACKLOG
-lists:
-  - name: TODO
-    hidden: false
-    ignore: false
-    id: jea6phpllxpsj7j
-  - name: DOING
-    hidden: false
-    ignore: false
-    id: jea6phpllxpsj7k
-  - name: DONE
-    hidden: false
-    ignore: false
-    id: jea6phpllxpsj7l
-settings:
-  openIn: default
-  customOpenIn: ''
-  editorTheme: blackboard
-  journalType: New File
-  journalPath: tasks
-  appendNewCardsTo: imdone-tasks.md
-  newCardSyntax: HASHTAG
-  replaceSpacesWith: '-'
-  plugins:
-    devMode: false
-    CliBacklogPlugin:
-      projectType: STORY_PROJECT
-  journalTemplate: null
-  theme: dark
-  views: []
-  name: Add-a-command-to-show-defaults
-  defaultFilter: allTags = "task"
-  cards:
-    colors: []
-    template: |
-    
-      <!-- 
-      #task
-      created:${(new Date()).toISOString()}
-      group:"${ungroupedTasks}"
-      story-id:${projectName}
-      task-id:${sid}
-      -->
-    trackChanges: false
-    metaNewLine: true
-    addCompletedMeta: true
-    addCheckBoxTasks: false
-    doneList: DONE
-    taskPrefix: '##'
-    tagPrefix: '#'
-    metaSep: ':'
-    orderMeta: true
-    maxLines: 6
-    addNewCardsToTop: true
-    defaultList: TODO