imdone-core 1.53.15 → 1.53.17

package/README.md

@@ -197,11 +197,9 @@ License
 [travis-image]: https://img.shields.io/travis/imdone/imdone-core/master.svg?label=linux
 [travis-url]: https://travis-ci.org/imdone/imdone-core
 
-<!--
-- #BACKLOG:-550 As a vscode user I would like to see the imdone board in vscode so I can get shit done! ic:gh gh:132 id:30 +enhancement
+<!-- # #NOTE Notes
 
--->
-# #NOTE Notes
+**Package Version {{version}}**
 
 [Focus]({{getFilterURL('list = DOING or tags = focus')}})
 [Plan]({{getFilterURL(' ')}})

package/lib/adapters/parsers/content-transformer.js

@@ -1,4 +1,5 @@
 const template = require('lodash.template')
+const uuid = require('uuid'); // Ensure you have uuid installed: npm install uuid
 
 module.exports = {
   format,
@@ -30,31 +31,70 @@ function restoreCodeBlocks(content, codeBlocks) {
   return content
 }
 
+/**
+ * Interpolates the content with the provided data.
+ * @param {string} content - The content to interpolate.
+ * @param {object} data - The data to use for interpolation.
+ * @param {object} opts - The options for interpolation.
+ * @returns {object} - The interpolated content, whether there was interpolation, and error tokens.
+ */
+function interpolate(content, data, opts) {
+  const errorTokens = {};
+  let hasInterpolation = false;
+
+  content = content.replace(opts.interpolate, (match, p1) => {
+    try {
+      const result = template(match, opts)(data);
+      if (result !== match) {
+        hasInterpolation = true;
+      }
+      return result;
+    } catch (e) {
+      const token = `__ERROR_TOKEN_${uuid.v4()}__`;
+      errorTokens[token] = match;
+      return token;
+    }
+  });
+
+  return { content, hasInterpolation, errorTokens };
+}
+
 function format(content, data, mustache) {
-  const opts = { interpolate: /(?<![`\\])\${([\s\S]+?)}/g }
+  const opts = { interpolate: /(?<![`\\])\${([\s\S]+?)}/g };
+  const errorTokens = {};
 
-  if (mustache) content = removeDisplayComments(content)
+  if (mustache) content = removeDisplayComments(content);
 
   // Escape code blocks before processing interpolation
-  const { content: escapedContent, codeBlocks } = escapeCodeBlocks(content)
+  const { content: escapedContent, codeBlocks } = escapeCodeBlocks(content);
+
+  let result = escapedContent;
+  let hasInterpolation = true;
 
-  try {
-    content = template(escapedContent, opts)(data)
-  } catch (e) {
-    console.error(e)
+  while (hasInterpolation) {
+    const interpolationResult = interpolate(result, data, opts);
+    result = interpolationResult.content;
+    hasInterpolation = interpolationResult.hasInterpolation;
+    Object.assign(errorTokens, interpolationResult.errorTokens);
   }
 
   if (mustache) {
-    const opts = { interpolate: /(?<!`){{([\s\S]+?)}}/g }
-    try {
-      content = template(content, opts)(data)
-    } catch (e) {
-      console.error(e)
-      content = content.replace(opts.interpolate, `~~{{${e}}}~~`)
+    const mustacheOpts = { interpolate: /(?<!`){{([\s\S]+?)}}/g };
+    hasInterpolation = true;
+    while (hasInterpolation) {
+      const interpolationResult = interpolate(result, data, mustacheOpts);
+      result = interpolationResult.content;
+      hasInterpolation = interpolationResult.hasInterpolation;
+      Object.assign(errorTokens, interpolationResult.errorTokens);
     }
   }
 
-  content = restoreCodeBlocks(content, codeBlocks)
+  result = restoreCodeBlocks(result, codeBlocks);
 
-  return content
+  // Restore error tokens
+  Object.keys(errorTokens).forEach(token => {
+    result = result.replace(new RegExp(token, 'g'), errorTokens[token]);
+  });
+
+  return result;
 }

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

@@ -15,7 +15,7 @@ module.exports = class CheckStyleTaskParser extends TaskParser {
       (task && !task.beforeText) ||
       (task && task.beforeText.length !== beforeText.length)
     )
-      return null
+      return
     checked = checked.trim() === 'x'
     return {
       beforeText,

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

@@ -28,6 +28,11 @@ module.exports = class TaskParser {
     const re = new RegExp(this.pattern)
     const result = re.exec(lineContent)
     const parseResult = result && this.parse(lineContent, line, result, task)
+
+    if (parseResult && this.config.lists && !this.config.listExists(parseResult.list)) {
+      return
+    }
+
     return parseResult && new Task(parseResult)
   }
 }

package/lib/card.js

@@ -279,6 +279,7 @@ module.exports = function newCard(task, _project, dontParse) {
 
     getDescriptionData() {
       const { markdown, rawMarkdown } = this.getCardMarkdown()
+
       let { encodedText, encodedMD, content } = this.formatContent(
         markdown,
         true

package/lib/file.js

@@ -206,6 +206,11 @@ File.parseDeferDate = function (config, text) {
 }
 
 File.parseDate = function (config, text, dateType) {
+  // TODO Add the ability to set multiple reminders
+  // #imdone-1.54.0
+  // <!--
+  // order:-150
+  // -->
   if (text.includes(`${dateType}${config.getMetaSep()}`)) return text
   let dateString
   return text.replace(new RegExp(`(\\s${dateType})\\s.*?\\.`,'gi'), (match, p1) => {
@@ -597,6 +602,12 @@ File.prototype.deleteDescription = function (task, config) {
   this.modifyDescription(task, config)
 }
 
+// TODO This isn't deleting all the newlines at the end of each line in code files
+// <!--
+// #bug
+// #imdone-1.54.0
+// order:-165
+// -->
 File.prototype.deleteCodeOrHashTask = function (re, task, config) {
   var log = require('debug')('delete-task:deleteCodeOrHashTask')
   var self = this

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

@@ -1,8 +1,12 @@
 const Plugin = require('imdone-api')
 const {getIsoDateWithOffset} = require('../adapters/date-time')
 const path = require('path')
+
 const simpleTemplate = '\n<!--\ncreated:${timestamp}\n-->\n'
 
+const codeSpan = (value) => '`' + value + '`';
+const codeBlock = (value, language = '') => '```' + language + '\n' + value + '\n```';
+
 function flattenObject(object) {
   return Object.keys(object).reduce((acc, key) => {
     return { ...acc, [`template_${key}`]: object[key] };
@@ -24,10 +28,29 @@ module.exports = class DefaultBoardPropertiesPlugin extends Plugin {
     const clearFilterURL = this.getFilterURL('');
     const getFilterURL = (filter) => this.getFilterURL(filter);
     const getFilterLink = (filter) => `[Filter By: ${filter}](${this.getFilterURL(filter)})`;
-  
+    // DOING Make board properties self documenting
+    // <!--
+    // #imdone-1.53.16
+    // #feature
+    // created:2025-02-14T16:54:22-05:00
+    // -->
+    // [Feature Description]
+    // ## :ballot_box_with_check: Tasks
+    // - [ ] Add tasks here
+    // ## :white_check_mark: DoD
+    // - [ ] Code complete (No Tech Debt)
+    // - [ ] Update tests
+    // - [ ] Automate what's working
+    // - [ ] Update tutorial project
+    // - [ ] Update documentation
+    // - [ ] Run like a new user and make the experience better
+    // - [ ] Make sure the first card is expanded by default or in view mode
+    // - [ ] Make sure global and default settings isn't modified when opened for the first time
     return {
       date: `${getIsoDateWithOffset(new Date()).substring(0, 10)}`,
       timestamp: getIsoDateWithOffset(new Date()),
+      codeSpan,
+      codeBlock,  
       clearFilterURL,
       getFilterURL,
       getFilterLink,

package/lib/project.js

@@ -98,6 +98,14 @@ module.exports = class WorkerProject extends Project {
 
     if (!cb) return promise
   }
+
+  initIndexes(allLists) {
+    allLists.forEach((list) => {
+      list.tasks.filter(list => !list.filter).forEach((task, index) => {
+        task.index = index
+      })
+    })
+  }
   
   // HACK To handle circular dependency issue with file
   // <!--
@@ -107,17 +115,23 @@ module.exports = class WorkerProject extends Project {
     return { path: this.path }
   }
 
-  getListsForImdoneJSON(totals) {
-    return this.allLists.map((list) => {
+  getListsForImdoneJSON() {
+    this.initIndexes(this.repo.getTasksByList())
+    let allLists = this.getLists({
+      populateFiltered: true,
+    })
+    const totals = calculateTotals(allLists)
+    allLists = allLists.map((list) => {
       list = { ...list }
       list.tasks = list.tasks.map((card, index) => {
         card.interpretedContent = ''
         card.totals = totals
-        card.index = index
         return card
       })
       return list
     })
+
+    return { allLists, totals }
   }
 
   getInitializedCards(allLists, totals) {
@@ -133,12 +147,7 @@ module.exports = class WorkerProject extends Project {
     this.pluginManager.initDevMode()
     console.time('toJSON time')
     this._updatedAt = new Date()
-    const totals = calculateTotals(
-      this.getLists({
-        populateFiltered: true,
-      })
-    )
-    const allLists = this.getListsForImdoneJSON(totals)
+    const { allLists , totals } = this.getListsForImdoneJSON()
 
     console.time('plugin onBeforeBoardUpdate')
     await this.pluginManager.onBeforeBoardUpdate()
@@ -152,17 +161,13 @@ module.exports = class WorkerProject extends Project {
     console.timeEnd('card init')
 
     console.time('plugin onBoardUpdate')
-    await this.pluginManager.onBoardUpdate(
-      this.getLists({
-        tasks: cards,
-      })
-    )
+    await this.pluginManager.onBoardUpdate(allLists)
     console.timeEnd('plugin onBoardUpdate')
 
-    const lists = this.getLists({
+    const lists = this.filter ? this.getLists({
       tasks: this.getCards(this.filter, cards),
       populateFiltered: true,
-    })
+    }) : allLists
 
     console.timeEnd('toJSON time')
     return {
@@ -263,8 +268,8 @@ module.exports = class WorkerProject extends Project {
   getLists(opts) {
     const {tasks = this.getDefaultFilteredCards(), populateFiltered = false} = opts || {}
     return Repository.getTasksByList(this.repo, tasks, true, populateFiltered)
-  } 
-  
+  }
+
   getTaskQueryProps(props) {
     const queryProps = []
     if (props) {
@@ -328,15 +333,15 @@ module.exports = class WorkerProject extends Project {
     return this.getCards(filter, allTasks)
   }
 
-  getCards(filter, tasks = this.getDefaultFilteredCards()) {
-    tasks = filter ? this.filterCards(tasks, filter) : tasks
-    return tasks
+  getCards(filter, cards = this.getDefaultFilteredCards()) {
+    cards = filter ? this.filterCards(cards, filter) : cards
+    return cards
   }
 
-  filterCards(tasks, filter) {
+  filterCards(cards, filter) {
     const {
       result,
-    } = Repository.filterCards(tasks, filter)
+    } = Repository.filterCards(cards, filter)
     return result
   }
 
@@ -479,7 +484,7 @@ module.exports = class WorkerProject extends Project {
     })
   }
 
-  async copyToClipboard(text, message) {
+  async copyToClipboard(text, message) {this.files
     this.emit('project.copyToClipboard', { text, message })
   }
 

package/lib/task.js

@@ -70,7 +70,7 @@ class Task {
     this.content = obj.content
     this.lastLine = this.getLastLine()
     this.orderModified = obj.orderModified
-    this.index = undefined
+    this.index = obj.index
     if (dontParse || !this.text) return
     this.parse()
   }

package/package.json

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