imdone-core 1.46.2 → 1.47.1

package/.imdoneignore

@@ -8,3 +8,4 @@ tmp
 imdone-export.json
 .imdone/templates
 .imdone
+notes/archive

package/lib/ProjectContext.js

@@ -1,5 +1,5 @@
 const FileProjectContext = require('./domain/entities/FileProjectContext')
-const { isNumber } = require('./task')
+const { isNumber } = require('./adapters/parsers/task/CardContentParser')
 
 module.exports = class ProjectContext extends FileProjectContext {
   constructor(repo) {

package/lib/adapters/file-gateway.js

@@ -44,8 +44,8 @@ module.exports = {
     return fs.promises.writeFile.apply({}, args)
   },
 
-  readdir(...args) {
-    return fs.readdir.apply({}, args)
+  async readdir(...args) {
+    return fs.promises.readdir.apply({}, args)
   },
 
   unlinkSync(...args) {

package/lib/adapters/parsers/file/LocalFileParserFactory.js

@@ -2,7 +2,6 @@ const { createReadStream } = require('fs')
 const ReadStreamMarkdownParser = require('./ReadStreamMarkdownParser')
 const path = require('path')
 const languages = require('../../../languages')
-const appContext = require('../../../context/ApplicationContext')
 const ReadStreamCodeParser = require('./ReadStreamCodeParser')
 
 function getLang(languages, filePath) {
@@ -15,21 +14,27 @@ function getLanguages(config) {
   return { ...languages, ...configLanguages }
 }
 
-module.exports = {
-  async getFileParser(filePath) {
-    const { config } = appContext()
-    const languages = getLanguages(config)
-    const lang = getLang(languages, filePath)
-    if (lang.name === 'text') {
-      return new ReadStreamMarkdownParser(createReadStream(filePath))
-    } else {
-      const parser = new ReadStreamCodeParser(
-        createReadStream(filePath),
-        filePath,
-        lang
-      )
-      await parser.init()
-      return parser
-    }
-  },
+// DOING Use task line parsers for vs code extension and obsidian plugin
+// <!--
+// order:-10000030
+// -->
+
+module.exports.getFileParser = async function getFileParser (filePath, config, readStream) {
+  if (!readStream) {
+    readStream = createReadStream(filePath)
+  }
+  const languages = getLanguages(config)
+  const lang = getLang(languages, filePath)
+  if (lang.name === 'text') {
+    return new ReadStreamMarkdownParser(readStream, config)
+  } else {
+    const parser = new ReadStreamCodeParser(
+      readStream,
+      filePath,
+      lang,
+      config.lists
+    )
+    await parser.init()
+    return parser
+  }
 }

package/lib/adapters/parsers/file/ReadStreamCodeParser.js

@@ -1,121 +1,114 @@
 const path = require('path')
 const ReadStreamTaskParser = require('./ReadStreamTaskParser')
 const CodeStyleTaskParser = require('../task/CodeStyleTaskParser')
+const languages = require('../../../languages')
 const extractComments = require('multilang-extract-comments')
 const eol = require('eol')
-const ReadLine = require('readline')
 const { Readable } = require('stream')
 
-async function streamToString(stream) {
-  const chunks = []
-
-  for await (const chunk of stream) {
-    chunks.push(Buffer.from(chunk))
-  }
-
-  return Buffer.concat(chunks).toString('utf-8')
-}
-
-function stringToStream(string) {
-  const lines = eol.split(string).map((line) => line + String(eol.auto))
-  return Readable.from(lines)
-}
-
 module.exports = class ReadStreamCodeParser extends ReadStreamTaskParser {
-  constructor(readStream, filePath, lang) {
+  constructor(readStream, filePath, lang, lists) {
     super(readStream)
+    this.lists = lists
     this.filePath = filePath
     this.lang = lang
     this.taskParsers = [new CodeStyleTaskParser()]
   }
 
   async init() {
-    const content = await streamToString(this.readStream)
-    this.comments = await this.extractComments(content)
-    this.readStream = stringToStream(content)
-    this.readInterface = this.getReadInterface()
-
-    let line = null
-    let lines = []
-    let lineNo = 1
-    let comment = null
-    do {
-      const { value, done } = await this.readLine()
-      line = done ? null : value
-      comment = this.getCommentAtLine(lineNo)
-      let lineInComment = ''
-      if (comment) {
-        lineInComment = comment.lines[lineNo - comment.begin]
-      }
-      lines.push(lineInComment)
-      lineNo += 1
-    } while (line !== null)
-    this.readInterface.close()
-    this.readStream = Readable.from(
-      lines.map((line) => line + String(eol.auto))
-    )
-    this.readInterface = this.getReadInterface()
+    const code = await streamToString(this.readStream)
+    // TODO Getting tokens from lists should be done higher up in the controller
+    const tokens = this.lists.filter(list => !list.filter).map(list => list.name)
+    this.cards = this.parseCards(code, tokens)
   }
 
   async readTask() {
-    const task = await super.readTask()
-    task.multiLineComment =
-      this.getCommentAtLine(task.line).info.type === 'multiline'
-    task.descriptionStartsWith = task.multiLineComment
-      ? this.lang.block.ignore
-      : this.lang.symbol
-
-    return task
+    return this.cards.shift()
   }
 
-  getCommentAtLine(lineNo) {
-    return this.comments.find(
-      (comment) => lineNo >= comment.begin && lineNo <= comment.end
-    )
+  parseCards(code, tokens = ['TODO']) {
+    const comments = this.parseComments(code);
+    const cards = [];
+  
+    Object.keys(comments).forEach((comment) => {
+      const { begin, end, content } = comments[comment];
+      const line = begin;
+      const lastLine = end - 1;
+      const lines = content.split('\n');
+  
+      // Check if the comment contains "TODO"
+      lines.forEach(codeLine => {
+        if (tokens.find((token) => codeLine.includes(token))) {
+          // Get all lines from start to end
+          
+          cards.push({
+            content,
+            line,
+            lastLine,
+          });
+        }
+      });
+    });
+    return cards;
   }
-
-  getReadInterface() {
-    return ReadLine.createInterface({
-      input: this.readStream,
-      crlfDelay: Infinity,
-      console: false,
-    })
+  
+  parseComments(code) {
+    const options = getLanguageOptions(this.filePath);
+    const comments = extractComments(code, options);
+    return comments;
   }
+  
+}
 
-  async extractComments(content) {
-    const lang = this.lang
-    const multiLineComment = lang.block
-      ? [
-          {
-            start: lang.block.start,
-            middle: lang.block.ignore,
-            end: lang.block.end,
-          },
-        ]
-      : []
-    const options = {
-      pattern: {
-        name: lang.name,
-        nameMatchers: [path.extname(this.filePath)],
-        singleLineComment: [{ start: lang.symbol }],
-        multiLineComment,
-      },
-    }
-    const comments = extractComments(content, options)
-    const contentLines = eol.split(content)
-    return Object.values(comments).map((comment) => {
-      const lines = eol.split(comment.content)
-      const linesInContent = contentLines.slice(comment.begin - 1, comment.end)
-      let contentStartIndex = linesInContent.findIndex((line) =>
-        line.includes(lines[0])
-      )
-      for (let i = 0; i < contentStartIndex; i++) {
-        lines.unshift('')
-      }
-      return {
-        ...comment,
-        lines,
+
+function getLanguageOptions(filePath) {
+  const extension = path.extname(filePath)
+  const language = languages[extension]
+  
+  
+  const {
+      name,
+      symbol,
+      block,
+    } = language || 
+    { 
+      name: 'text', 
+      symbol: '', 
+      block: {
+        start: undefined,
+        end: undefined,
+        ignore: undefined,
       }
-    })
+    };
+  // Use lang to get comment patterns
+
+  const {
+    start,
+    ignore: middle,
+    end
+  } = block || {};
+  
+  return language && {
+    pattern: {
+      name,
+      nameMatchers: extension && [extension] || [],
+      singleLineComment: symbol && [{ start: symbol }] || [],
+      multiLineComment: start && end && [{ start, middle, end }] || [],
+    },
+  };
+}
+
+async function streamToString(stream) {
+  const chunks = []
+
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk))
   }
+
+  return Buffer.concat(chunks).toString('utf-8')
+}
+
+function stringToStream(string) {
+  const lines = eol.split(string).map((line) => line + String(eol.auto))
+  return Readable.from(lines)
 }

package/lib/adapters/parsers/file/ReadStreamMarkdownParser.js

@@ -1,19 +1,17 @@
 const ReadStreamTaskParser = require('./ReadStreamTaskParser')
 const HashStyleTaskParser = require('../task/HashStyleTaskParser')
 const MarkdownStyleTaskParser = require('../task/MarkdownStyleTaskParser')
-const CheckStyleTaskParser = require('../task/CheckStyleTaskParser')
-const appContext = require('../../../context/ApplicationContext')
+// const CheckStyleTaskParser = require('../task/CheckStyleTaskParser')
 
 module.exports = class ReadStreamMarkdownParser extends ReadStreamTaskParser {
-  constructor(readStream) {
-    super(readStream)
-    const { config } = appContext()
+  constructor(readStream, config) {
+    super(readStream, config)
     this.taskParsers = [
-      new HashStyleTaskParser(),
-      new MarkdownStyleTaskParser(),
+      new HashStyleTaskParser(config),
+      new MarkdownStyleTaskParser(config),
     ]
-    if (config.isAddCheckBoxTasks()) {
-      this.taskParsers.push(new CheckStyleTaskParser())
-    }
+    // if (config.isAddCheckBoxTasks()) {
+    //   this.taskParsers.push(new CheckStyleTaskParser())
+    // }
   }
 }

package/lib/adapters/parsers/file/ReadStreamTaskParser.js

@@ -1,19 +1,14 @@
-const appContext = require('../../../context/ApplicationContext')
-const Config = require('../../../config')
 const ReadLine = require('readline')
-const START_TAG = '<card>'
-const END_TAG = '</card>'
+const blankLinesToEndTask = 2
 
 module.exports = class ReadStreamTaskParser {
   constructor(readStream) {
-    this.config = appContext().config
     this.readStream = readStream
     this.task = null
     this.line = null
     this.taskParsers = []
     this.lineNo = 0
     this.blankLines = 0
-    this.blankLinesToEndTask = this.config.blankLinesToEndTask
     this.readInterface = ReadLine.createInterface({
       input: this.readStream,
       crlfDelay: Infinity,
@@ -23,9 +18,8 @@ module.exports = class ReadStreamTaskParser {
 
   async readTask() {
     let taskOrStreamDone = false
-    this.task = null
+    this.task = this.nextTask || null
     this.blankLines = 0
-    this.hasStartTag = false
 
     try {
       while (!taskOrStreamDone) {
@@ -50,7 +44,7 @@ module.exports = class ReadStreamTaskParser {
       throw error
     }
 
-    this.trimBlankLinesToEndTask()
+    this.trimLinesToEndTask()
     return this.task
   }
 
@@ -59,19 +53,24 @@ module.exports = class ReadStreamTaskParser {
   }
 
   isEndOfTask(line) {
-    if (this.task && this.task.hasCardTags) return true
-    if (this.hasStartTag) return false
-
     if (line.trim() === '') {
       this.blankLines++
     } else {
       this.blankLines = 0
     }
 
-    return (
-      this.getTaskFromLine(this.line.value) ||
-      this.blankLines > this.blankLinesToEndTask - 1
-    )
+    this.nextTask = this.getTaskFromLine(line)
+    
+    if (this.blankLines > blankLinesToEndTask - 1) {
+      this.nextTask = undefined
+      return true
+    }
+
+    if (this.nextTask) {
+      return true
+    }
+
+    return false
   }
 
   getTaskFromLine(line) {
@@ -84,30 +83,23 @@ module.exports = class ReadStreamTaskParser {
   }
 
   addLineToTask(line) {
-    if (line.trim() === START_TAG && this.task.description.length == 0) {
-      this.hasStartTag = true
-    } else if (line.trim() === END_TAG && this.hasStartTag) {
-      this.task.hasCardTags = true
-    } else {
-      this.task.description.push(line)
-    }
-
+    this.task.description.push(line)
     this.task.lastLine = this.lineNo
   }
 
-  trimBlankLinesToEndTask() {
+  trimLinesToEndTask() {
     if (!this.task) return
     if (
-      this.blankLines == this.blankLinesToEndTask &&
-      this.blankLinesToEndTask > 1 &&
-      !this.task.hasCardTags
+      this.blankLines == blankLinesToEndTask
     ) {
-      this.task.description.splice(
-        this.task.description.length - this.blankLines + 1,
-        this.blankLinesToEndTask - 1
-      )
-      this.task.lastLine = this.task.lastLine - this.blankLines
+      this.task.description.length = this.task.description.length - (this.blankLines - 1)
+    } else if (this.nextTask){
+      this.task.description.length = this.task.description.length - (this.blankLines + 1)
+    } else {
+      this.task.description.length = this.task.description.length - this.blankLines
     }
+
+    this.task.lastLine = this.task.line + this.task.description.length - 1
   }
 
   close() {

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

@@ -5,24 +5,35 @@ const FILE_TYPES = {
   MARKDOWN: 'markdown',
   CODE: 'code',
 }
+const TASK_TYPES = {
+  CODE: 'CODE',
+  HASHTAG: 'HASHTAG',
+  MARKDOWN: 'MARKDOWN',
+}
 
+const DEFAULT_TOKEN_PREFIX = '#'
 const START_TAG = '<card>'
 const END_TAG = '</card>'
 const CODE_STYLE_PATTERN = '([A-Z]+[A-Z-_]+?)((:)(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$'
 const LIST_NAME_PATTERN = '[\\p{L}0-9-_]{2,}' // [a-zA-Z-_]+?
-const HASH_STYLE_REGEX = new XRegExp(
-  `#(${LIST_NAME_PATTERN})(:(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$`,
-  'gm'
-)
-const HASH_STYLE_META_ORDER_REGEX = new XRegExp(
-  `#(${LIST_NAME_PATTERN})[ \\t]+(.+)$`, 'gm'
-)
 const LINK_STYLE_REGEX = new XRegExp(
   `(\\[.*\\]\\s?)?(\\[(.+)\\]\\(#(${LIST_NAME_PATTERN})(:)(-?[\\d.]+(?:e-?\\d+)?)?\\))`,
   'gm'
 )
 
 const CHECK_REGEX = /^(\s*- )\[([x ])\]/
+
+function getHashStyleRegex(tokenPrefix = DEFAULT_TOKEN_PREFIX, orderMeta = false) {
+  return orderMeta ?
+    new XRegExp(
+      `${tokenPrefix}(${LIST_NAME_PATTERN})[ \\t]+(.+)$`, 'gm'
+    ) :
+    new XRegExp(
+      `${tokenPrefix}(${LIST_NAME_PATTERN})(:(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$`,
+      'gm'
+    )
+}
+
 function getCheckedData(content) {
   const taskRegex = new RegExp(CHECK_REGEX)
   const result = taskRegex.exec(content)
@@ -65,10 +76,10 @@ function isCheckBoxTask (config, line, beforeText) {
 function hasTaskInText(config, text, isCodeFile) {
   return (
     (isCodeFile && hasCodeStyleTask(config, text)) ||
-    ((new XRegExp(HASH_STYLE_REGEX).test(text) ||
-      new XRegExp(HASH_STYLE_META_ORDER_REGEX).test(text) ||
+    ((new XRegExp(getHashStyleRegex(config.tokenPrefix)).test(text) ||
+      new XRegExp(getHashStyleRegex(config.tokenPrefix, true)).test(text) ||
       new XRegExp(LINK_STYLE_REGEX).test(text)) &&
-      config.lists.find((list) => text.includes(`#${list.name}`)))
+      config.lists.find((list) => text.includes(`${config.tokenPrefix}${list.name}`)))
   )
 }
 
@@ -276,15 +287,34 @@ function getTaskContent ({
     getTextFileTaskContent({ config, content, beforeText, fileType })
 }
 
+function getRawTask ({tokenPrefix = DEFAULT_TOKEN_PREFIX, orderMeta, beforeText = '', hasColon = false, list, order= '', text, type}) {
+  if (type === TASK_TYPES.MARKDOWN) {
+    return `${beforeText}[${text}](${tokenPrefix}${list}:${
+      orderMeta ? '' : order
+    })`
+  } 
+  const colon = hasColon || (isNumber(order) && !orderMeta) ? ':' : '';
+  return `${beforeText}${tokenPrefix}${list}${colon}${
+    orderMeta ? '' : order
+  } ${text}`
+}
+
+function isNumber (value) {
+  return !isNaN(parseFloat(value)) && isFinite(value)
+}
+
 module.exports = {
   FILE_TYPES,
+  TASK_TYPES,
   getTaskContent,
+  getRawTask,
   isBeforeTextMarkdownList,
   padDescription,
   getCheckedData,
+  hasTaskInText,
+  isNumber,
+  getHashStyleRegex,
   CHECK_REGEX,
   LIST_NAME_PATTERN,
-  HASH_STYLE_REGEX,
-  HASH_STYLE_META_ORDER_REGEX,
   LINK_STYLE_REGEX
 }

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

@@ -1,8 +1,8 @@
 const TaskParser = require('./TaskParser')
 
 module.exports = class CodeStyleTaskParser extends TaskParser {
-  constructor() {
-    super('CODE')
+  constructor(config) {
+    super('CODE', config)
   }
 
   get pattern() {

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

@@ -1,23 +1,26 @@
 const TaskParser = require('./TaskParser')
+const { getHashStyleRegex } = require('./CardContentParser')
 
 module.exports = class HashStyleTaskParser extends TaskParser {
-  constructor() {
-    super('HASHTAG')
+  constructor(config) {
+    super('HASHTAG', config)
   }
 
   get pattern() {
-    return /^(.*?)#([a-zA-Z-_]+?)((:)(-?[\d.]+(?:e-?\d+)?)?)?[ \t]+(.+)$/gm
+    const config = this.config
+    return getHashStyleRegex(config.tokenPrefix, config.orderMeta)
   }
 
   parse(lineContent, line, matchResult) {
-    const [match, beforeText, list, orderGroup, colon, order, text] = matchResult
+    const [rawTask, list, orderGroup, order, text] = matchResult
+
     return {
-      beforeText,
+      // beforeText,
       text,
       order,
       list,
       line,
-      colon,
+      colon: orderGroup && orderGroup.startsWith(':'),
       type: this.type,
     }
   }

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

@@ -1,8 +1,8 @@
 const TaskParser = require('./TaskParser')
 
 module.exports = class MarkdownStyleTaskParser extends TaskParser {
-  constructor() {
-    super('MARKDOWN')
+  constructor(config) {
+    super('MARKDOWN', config)
   }
 
   get pattern() {

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

@@ -1,5 +1,3 @@
-const Config = require('../../../config')
-const appContext = require('../../../context/ApplicationContext')
 
 class Task {
   constructor({ beforeText, text, list, line, order, checked, colon, type }) {
@@ -17,8 +15,8 @@ class Task {
 }
 
 module.exports = class TaskParser {
-  constructor(type) {
-    this.config = appContext().config
+  constructor(type, config) {
+    this.config = config
     this.type = type
   }
 

package/lib/config.js

@@ -3,7 +3,19 @@
 const _cloneDeep = require('lodash.clonedeep')
 const _assign = require('lodash.assign')
 const _get = require('lodash.get')
-const { JOURNAL_TYPE, DEFAULT_CONFIG } = require('./constants')
+const { 
+  JOURNAL_TYPE, 
+  DEFAULT_CONFIG,
+  CONFIG_FILE_YML,
+  CONFIG_DIR
+} = require('./constants')
+const _path = require('path')
+const findUp = require('find-up')
+const { loadYAML } = require('./adapters/yaml')
+const {
+  exists,
+  readFile,
+} = require('./adapters/file-gateway')
 
 /**
  * Description
@@ -187,20 +199,12 @@ class Config {
     return _get(this, 'settings.cards.archiveCompleted', false)
   }
 
-  get doneList() {
-    return this.getDoneList()
+  get tokenPrefix() {
+    return _get(this, 'settings.cards.tokenPrefix', '#')
   }
 
-  get blankLinesToEndTask() {
-    let blankLinesToEndTask = Math.round(
-      _get(this, 'settings.cards.blankLinesToEndTask', 1)
-    )
-    if (blankLinesToEndTask > 2) {
-      blankLinesToEndTask = 2
-    } else if (blankLinesToEndTask < 1) {
-      blankLinesToEndTask = 1
-    }
-    return blankLinesToEndTask
+  get doneList() {
+    return this.getDoneList()
   }
 
   getMetaSep() {
@@ -209,5 +213,37 @@ class Config {
   }
 }
 
-Config.newDefaultConfig = (config = {}) => new Config({...DEFAULT_CONFIG, lists: [...DEFAULT_CONFIG.lists], ...config})
+Config.newDefaultConfig = (config = {}) => new Config(
+  {
+    ...DEFAULT_CONFIG, 
+    lists: [
+      ...DEFAULT_CONFIG.lists
+    ],
+    ...config
+  }
+)
+
+Config.findImdonePath = async (cwd) => {
+  const configDir = await findUp(CONFIG_DIR, { cwd, type: 'directory' })
+  return _path.dirname(configDir)
+}
+
+Config.getYamlConfig = async (filePath) => {
+  if (!(await exists(filePath))) return
+  const configData = await readFile(filePath, 'utf-8')
+  let configLike = {}
+  try {
+    configLike = loadYAML(configData.toString())
+  } catch (e) {
+    /* noop */
+  }
+  return configLike
+}
+
+Config.load = async (imdonePath) => {
+  const configPath = _path.join(imdonePath, CONFIG_FILE_YML)
+  const configLike = await Config.getYamlConfig(configPath)
+  return new Config(configLike)
+}
+
 module.exports = Config

package/lib/context/StreamingApplicationContext.js

@@ -0,0 +1,31 @@
+const Config = require('../config')
+
+class ApplicationContext {
+  constructor({
+    project,
+    repo,
+    projectContext,
+    projectReader,
+    projectPresenter,
+  }) {
+    this.project = project;
+    this.repo = repo;
+    this.projectContext = projectContext;
+    this.projectReader = projectReader;
+    this.projectPresenter = projectPresenter;
+    this.innerConfig = Config.newDefaultConfig()
+  }
+
+  set config(config) {
+    this.innerConfig = config 
+    this.repo && (this.repo.config = config)
+  }
+
+  get config() {
+    return (this.repo && this.repo.config) || this.innerConfig
+  }
+
+}
+const context = new ApplicationContext({})
+
+module.exports = () => context

package/lib/default-settings.js

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

package/lib/file.js

@@ -24,14 +24,14 @@ var _clone = require('lodash.clone'),
  {
   FILE_TYPES, 
   getTaskContent,
+  getRawTask,
+  getHashStyleRegex,
+  hasTaskInText,
   LIST_NAME_PATTERN,
-  HASH_STYLE_REGEX,
-  HASH_STYLE_META_ORDER_REGEX,
   LINK_STYLE_REGEX,
  } = require('./adapters/parsers/task/CardContentParser')
 
 const appContext = require('./context/ApplicationContext')
-const { isNumber } = require('./task')
 const { hasBlankLines } = require('./tools')
 
 const ERRORS = {
@@ -296,6 +296,11 @@ File.prototype.transformTasks = function (config, modify) {
     .forEach(task => this.transformTask({config, modify, task}))
 }
 
+// TODO Blank lines should be allowed in code tasks
+// #imdone-1.47.0
+// <!--
+// order:-120
+// -->
 File.prototype.extractCodeStyleTasks = function (config, pos, content) {
   var self = this
   var codeStyleRegex = new RegExp(CODE_STYLE_PATTERN, 'gm')
@@ -346,7 +351,7 @@ File.prototype.extractCodeStyleTasks = function (config, pos, content) {
 }
 
 File.prototype.extractHashStyleTasks = function (config, pos, content) {
-  var hashStyleRegex = new XRegExp(HASH_STYLE_REGEX)
+  var hashStyleRegex = getHashStyleRegex(config.tokenPrefix)
   var lang = this.getLang()
   var result
   while ((result = hashStyleRegex.exec(content)) !== null) {
@@ -449,7 +454,7 @@ File.prototype.extractCheckboxTasks = function (config, pos, content) {
       content: content.substring(result.index),
       pos: posInContent,
     })
-    task.rawTask = File.getRawTask(type, text, list, task.order)
+    task.rawTask = getRawTask({tokenPrefix: config.tokenPrefix, orderMeta: config.orderMeta, list, text, type})
     tasks.push(task)
   }
   if (tasks) {
@@ -484,17 +489,6 @@ File.prototype.extractCheckboxTasks = function (config, pos, content) {
   }
 }
 
-File.getRawTask = function (type, text, list, order) {
-  const TYPES = Task.Types
-  if (type === TYPES.MARKDOWN) {
-    return `[${text}](#${list}:${order})`
-  } else if (appContext().repo.config.orderMeta) {
-    return `#${list} ${text}`
-  }
-
-  return `#${list}:${order} ${text}`
-}
-
 File.prototype.extractTasks = function (config) {
   this.tasks = []
   if (this.isMarkDownFile()) {
@@ -628,7 +622,7 @@ File.prototype.deleteTask = function (task, config) {
         config
       )
     } else if (task.type === Task.Types.HASHTAG) {
-      this.deleteCodeOrHashTask(HASH_STYLE_REGEX, task, config)
+      this.deleteCodeOrHashTask(getHashStyleRegex(config.tokenPrefix), task, config)
     }
   } else {
     const fileContent = this.getContentLines()
@@ -643,19 +637,6 @@ File.prototype.deleteTask = function (task, config) {
   }
 }
 
-File.TASK_TYPE_TEMPLATES = {
-  HASHTAG: (t, config) => {
-    const colon = t.hasColon || (isNumber(t.order) && !config.orderMeta) ? ':' : '';
-    return `${t.beforeText || ''}#${t.list}${colon}${
-      config.orderMeta ? '' : t.order
-    } ${t.text}`;
-  },
-  MARKDOWN: (t, config) =>
-    `${t.beforeText || ''}[${t.text}](#${t.list}:${
-      config.orderMeta ? '' : t.order
-    })`,
-}
-
 File.prototype.modifyTask = function (task, config, noEmit) {
   task.orderModified = true
   task.updateOrderMeta(config)
@@ -669,7 +650,16 @@ File.prototype.modifyTask = function (task, config, noEmit) {
   } else {
     task.updateContent()
     const fileContent = this.getContentLines()
-    let text = File.TASK_TYPE_TEMPLATES[task.type](task, config)
+    let text = getRawTask({
+      tokenPrefix: config.tokenPrefix,
+      orderMeta: config.orderMeta,
+      beforeText: task.beforeText,
+      hasColon: task.hasColon,
+      list: task.list,
+      order: task.order,
+      text: task.text,
+      type: task.type,
+    })
     const linesBefore = fileContent.slice(0, task.line - 1)
     if (this.isCodeFile()) {
       const linesBeforeLength = linesBefore.join(lineEnd).length
@@ -741,9 +731,8 @@ File.prototype.modifyCodeOrHashTask = function (re, task, config, noEmit) {
         } else text = task.text
       } else text = task.text
       if (/[a-z]/.test(task.list)) task.type = Task.Types.HASHTAG
-      const hash = task.type === Task.Types.HASHTAG ? '#' : ''
-      const inLineOrder = task.hasColon && !config.orderMeta ? `:${task.order}` : ''
-      var taskContent = `${task.beforeText || ''}${hash}${task.list}${inLineOrder} ${text}`
+      const tokenPrefix = task.type === Task.Types.HASHTAG ? config.tokenPrefix : ''
+      var taskContent = getRawTask({tokenPrefix, orderMeta: config.orderMeta, list: task.list, order: task.order, text, type: task.type})
       task.line = this.getLineNumber(index)
       task.id = getTaskId(self.getPath(), task.line, task.text)
       this.setContent(beforeContent + taskContent + afterContent)
@@ -1111,19 +1100,20 @@ File.prototype.removeTask = function (task) {
 
 File.prototype.ignoreCodeBlocks = function () {
   // BACKLOG:-100 This is not used, but we need a way to ignore tasks in code blocks. Maybe save position ranges
-  var cleanContent = this.content
-  var replacer = function (block) {
-    block = block.replace(new XRegExp(LINK_STYLE_REGEX), '**TASK**')
-    block = block.replace(new XRegExp(HASH_STYLE_REGEX), '**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
+  // ```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
+  // ```
 }
 
 File.prototype.isMarkDownFile = function () {
@@ -1261,13 +1251,7 @@ File.prototype.hasCodeStyleTask = function (config, text) {
 }
 
 File.prototype.hasTaskInText = function (config, text) {
-  return (
-    this.hasCodeStyleTask(config, text) ||
-    ((new XRegExp(HASH_STYLE_REGEX).test(text) ||
-      new XRegExp(HASH_STYLE_META_ORDER_REGEX).test(text) ||
-      new XRegExp(LINK_STYLE_REGEX).test(text)) &&
-      config.lists.find((list) => text.includes(`#${list.name}`)))
-  )
+  return hasTaskInText(config, text, this.isCodeFile())
 }
 
 File.prototype.isInBlockComment = function (content) {

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

@@ -255,7 +255,7 @@ function mixin(repo, fs = require('fs')) {
     cb = tools.cb(cb)
     repo.loadIgnore()
     // new
-    let configData = this.getYamlConfig() || this.getJsonConfig() || {}
+    let configData = this.getYamlConfig() || {}
     repo.updateConfig(configData, cb)
   }
 
@@ -263,21 +263,6 @@ function mixin(repo, fs = require('fs')) {
     return repo.getFullPath(CONFIG_FILE)
   }
 
-  repo.getJsonConfig = function () {
-    const filePath = repo.getFullPath(CONFIG_FILE)
-    if (!fs.existsSync(filePath)) return
-    const configData = fs.readFileSync(filePath)
-    let configLike = {}
-    try {
-      configLike = JSON.parse(configData.toString())
-      if (configLike.exclude) delete configLike.exclude
-      if (configLike.watcher) delete configLike.watcher
-    } catch (e) {
-      /* noop */
-    }
-    return configLike
-  }
-
   repo.getYamlConfig = function () {
     const filePath = repo.getFullPath(CONFIG_FILE_YML)
     if (!fs.existsSync(filePath)) return

package/lib/plugins/archive-plugin.js

@@ -52,7 +52,12 @@ module.exports = class ArchivePlugin extends Plugin {
       ], 
       task.content
     )
-    const taskContent = `${task.beforeText}#${task.list} ${content}\n\n\n`
+    // TODO This should use the CardContentParser to get the raw task
+    // <!--
+    // #imdone-1.47.0
+    // order:-110
+    // -->
+    const taskContent = `${task.beforeText}${config.tokenPrefix}${task.list} ${content}\n\n\n`
 
     this.fileGateway.preparePathForWriting(newPath)
     this.fileGateway.appendFileSync(newPath, taskContent)

package/lib/plugins/plugin-manager.js

@@ -95,48 +95,47 @@ module.exports = class PluginManager extends Emitter {
     const installPath = _path.join(this.pluginPath, name)
     await downloadRepo(version, installPath)
     console.log(`Done installing ${name}`)
-    this.loadPlugin(installPath)
+    await this.loadPlugin(installPath)
     this.emit('plugin-installed', name)
   }
 
   async loadPlugins() {
-    return new Promise((resolve, reject) => {
-      this.defaultPlugins.forEach((pluginPath) => this.loadPlugin(pluginPath))
-
-      this.exists(this.pluginPath).then((path) => {
-        if (!path) return resolve()
-        fs.readdir(this.pluginPath, { withFileTypes: true }, (err, paths) => {
-          if (err) return reject(err)
-          paths
-            .filter(
-              (entry) =>
-                entry.name !== 'node_modules' &&
-                (entry.isDirectory() || entry.isSymbolicLink())
-            )
-            .map((entry) => _path.join(this.pluginPath, entry.name))
-            .forEach((path) => {
-              this.loadPlugin(path)
-            })
-          resolve()
-        })
-      })
-    })
-  }
+    for (const pluginPath of this.defaultPlugins) {
+      await this.loadPlugin(pluginPath)
+    }
 
-  loadPlugin(path) {
+    const path = await this.exists(this.pluginPath)
+    if (!path) return
+    const paths = await fs.promises.readdir(this.pluginPath, { withFileTypes: true })
+    const pluginPaths = paths
+    .filter(
+      (entry) =>
+        entry.name !== 'node_modules' &&
+        (entry.isDirectory() || entry.isSymbolicLink())
+    )
+    .map((entry) => _path.join(this.pluginPath, entry.name))
+    
+    for (const path of pluginPaths) {
+      await this.loadPlugin(path)
+    }
+      
+  }
+  
+  async loadPlugin(path) {
     console.log('Loading plugin: ', path)
     try {
       // eslint-disable-next-line
       delete require.cache[require.resolve(path)]
       // eslint-disable-next-line
       const pluginClass = require(path)
-      this.createPlugin(pluginClass, path)
+      const pluginInstance = await this.createPlugin(pluginClass, path)
+      if (pluginInstance.init) await pluginInstance.init()
     } catch (e) {
       console.error(`Error loading plugin at: ${path}`, e)
     }
   }
 
-  createPlugin(pluginClass, path) {
+  async createPlugin(pluginClass, path) {
     if (!this.isPlugin(pluginClass))
       throw new Error(`${pluginClass.name} is not a plugin`)
     const name = pluginClass.name.toString()
@@ -164,6 +163,8 @@ module.exports = class PluginManager extends Emitter {
       pluginClass,
       info,
     }
+
+    return pluginInstance
   }
 
   destroyPlugins() {
@@ -268,6 +269,16 @@ module.exports = class PluginManager extends Emitter {
     })
   }
 
+  async onTaskFound(task) {
+    await this.eachPluginAsync(async ({ pluginInstance }) => {
+      try {
+        if (pluginInstance.onTaskFound) await pluginInstance.onTaskFound(task)
+      } catch (e) {
+        this.pluginError('onTaskFound', pluginInstance, e)
+      }
+    })
+  }
+
   async onBeforeAddTask({path, list, content, tags, contexts, meta, useCardTemplate}) {
     await this.eachPluginAsync(async ({ pluginInstance }) => {
       try {

package/lib/project.js

@@ -62,6 +62,8 @@ module.exports = class WorkerProject extends Project {
       this.repo.on(event, (data) => onChange(this, event, data))
     })
 
+    this.repo.on('task.found', (task) => this.pluginManager.onTaskFound(task))
+
     const promise = new Promise((resolve, reject) => {
       this.repo.init((err, files) => {
         if (err) {

package/lib/repository.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const { isNumber } = require('./task')
-
 var _get = require('lodash.get'),
   _isObject = require('lodash.isobject'),
   _isFunction = require('lodash.isfunction'),
@@ -37,9 +35,12 @@ var _get = require('lodash.get'),
   functionRegex = require('function-regex'),
   Task = require('./task'),
   newCard = require('./card'),
-  { replaceDateLanguage } = require('./adapters/parsers/DateLanguageParser')
+  { replaceDateLanguage } = require('./adapters/parsers/DateLanguageParser'),
+  { getRawTask, isNumber } = require('./adapters/parsers/task/CardContentParser')
+
 
 const appContext = require('./context/ApplicationContext')
+const get = require('lodash.get')
 
 var ERRORS = constants.ERRORS,
   DEFAULT_FILE_PATTERN = constants.DEFAULT_FILE_PATTERN,
@@ -1100,8 +1101,8 @@ Repository.prototype.appendTask = function({file, content, list}, cb) {
   const description =
     lines.length > 1 ? Task.padDescription(lines.slice(1), taskPrefix) : []
 
-  let appendContent
-  const taskContent = config.orderMeta
+    const rawTask = getRawTask({tokenPrefix: config.tokenPrefix, orderMeta: config.orderMeta, list, order, text, type: taskSyntax})      
+    const taskContent = config.orderMeta
     ? this.getTaskContent({
         description,
         order,
@@ -1111,18 +1112,14 @@ Repository.prototype.appendTask = function({file, content, list}, cb) {
       })
     : description.join(eol.lf)
 
-  if (taskSyntax === Task.Types.MARKDOWN) {
-    appendContent = `${taskPrefix}[${text}](#${list}:${
-      config.orderMeta ? '' : orderString
-    })${eol.lf}${taskContent}`
-  } else {
-    const inLineOrder = config.orderMeta ? '' : `:${orderString}`
-    appendContent = `${taskPrefix}#${list}${inLineOrder} ${text}${eol.lf}${taskContent}`
-  }
-  appendContent = File.trimBlankLines(appendContent)
+  let appendContent = File.trimBlankLines(
+    `${taskPrefix}${rawTask}${eol.lf}${taskContent}`
+  )
+  
   fileContent = `${fileContent}${sep}`
   const cardTerminator = "\n".repeat(2)
   file.setContent(`${fileContent}${appendContent}${cardTerminator}`)
+
   this.writeAndExtract(file, true, (err, file) => {
     if (err) return cb(err)
     const task = file.getTasks().find(task => task.text === text && task.list === list)
@@ -1541,7 +1538,7 @@ Repository.prototype.getTasksInList = function (name, offset, limit) {
   var tasks = _where(this.getTasks(), { list: name })
   if (tasks.length === 0) return []
   var allTasks = fastSort(tasks).by(DEFAULT_SORT)
-  if (Task.isNumber(offset) && Task.isNumber(limit))
+  if (isNumber(offset) && isNumber(limit))
     return allTasks.slice(offset, offset + limit)
   return allTasks
 }

package/lib/task.js

@@ -16,8 +16,10 @@ var _clone = require('lodash.clone'),
 
 const { 
   CHECK_REGEX,
+  TASK_TYPES,
   getCheckedData,
-  isBeforeTextMarkdownList
+  isBeforeTextMarkdownList,
+  isNumber
 } = require('./adapters/parsers/task/CardContentParser.js')
 
 /**
@@ -234,11 +236,7 @@ Task.prototype.getCheckedData = function () {
   return getCheckedData(this.beforeText)
 }
 
-Task.Types = {
-  CODE: 'CODE',
-  HASHTAG: 'HASHTAG',
-  MARKDOWN: 'MARKDOWN',
-}
+Task.Types = TASK_TYPES
 
 Task.AnyLanguageGroup =
   '#\\w:%/.$-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2183\\u2184\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005\\u3006\\u3031-\\u3035\\u303B\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA697\\uA6A0-\\uA6E5\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA793\\uA7A0-\\uA7AA\\uA7F8-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA80-\\uAAAF\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC'
@@ -422,7 +420,7 @@ Task.getMetaOrderRegex = function (config) {
 
 Task.prototype.updateOrderMeta = function (config, descContent = this.description.join(lineEnd)) {
   if (config.orderMeta) {
-    if (!Task.isNumber(this.order)) return this.order = ''
+    if (!isNumber(this.order)) return this.order = ''
     const addNewLine = config.isMetaNewLine()
     const metaSep = config.getMetaSep()
     if (this.meta.order) {
@@ -778,8 +776,4 @@ Task.prototype.equals = function (task) {
   )
 }
 
-Task.isNumber = function(n) {
-  return !isNaN(parseFloat(n)) && isFinite(n);
-}
-
 module.exports = Task

package/lib/usecases/get-tasks-in-file.js

@@ -0,0 +1,31 @@
+const Config = require('../config')
+const { getFileParser } = require('../adapters/parsers/file/LocalFileParserFactory')
+const { Readable } = require('stream');
+
+// DOING Use task line parsers for vs code extension and obsidian plugin
+// <!--
+// order:-10000030
+// -->
+export async function getTasks({filePath, content}) {
+  const projectPath = await Config.findImdonePath(filePath)
+  const config = await Config.load(projectPath)
+
+  // create a readstream from the content and pass it to getFileParser
+  const readStream = new Readable({
+    read() {
+      this.push(content);
+      this.push(null); // Signals the end of the stream
+    }
+  });
+
+  const parser = await getFileParser(filePath, config, readStream)
+
+  const tasks = []
+  let task = true
+  while (task) {
+    task = await parser.readTask()
+    if (task) tasks.push(task)
+  }
+  parser.close()
+  return tasks
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.46.2",
+  "version": "1.47.1",
   "description": "imdone-core",
   "main": "index.js",
   "scripts": {
@@ -56,10 +56,11 @@
     "eol": "^0.9.1",
     "escape-string-regexp": "^1.0.5",
     "fast-sort": "^2.2.0",
+    "find-up": "^5.0.0",
     "function-regex": "^1.0.2",
     "gray-matter": "^4.0.2",
     "ignore": "^5.2.0",
-    "imdone-api": "^0.0.19",
+    "imdone-api": "^1.47.0",
     "isbinaryfile": "^3.0.2",
     "js-yaml": "^3.14.1",
     "json-fns": "^1.0.0",
@@ -98,6 +99,7 @@
     "multilang-extract-comments": "^0.4.0",
     "open": "^9.1.0",
     "ora": "^5.4.1",
+    "parse-code-context": "^1.0.0",
     "prompts": "^2.4.2",
     "readdirp": "^3.6.0",
     "remove-markdown": "^0.3.0",

package/tasks.md

@@ -1,21 +0,0 @@
-backlog
-====
-
-## Ungrouped Tasks
-
-## Phase 1
-
-### TODO
-
-- [ ] Another new task in a new file
-  <!--  +urgent +important  @piascikj group:"Phase 1" -->
-  <!-- created:2023-09-02T03:48:18.338Z sid: -->
-
-## Phase 2
-
-### DOING
-
-- [ ] Another new task in a new files
-  <!--  +urgent +important  @piascikj group:"Phase 2" -->
-  <!-- created:2023-09-02T04:02:09.680Z sid: -->
-