imdone-core 1.47.0 → 1.47.2

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

@@ -2,9 +2,9 @@ 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) {
   var lang = languages[path.extname(filePath)]
   return lang || { name: 'text', symbol: '' }
@@ -15,21 +15,23 @@ 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
-    }
-  },
+
+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

@@ -23,8 +23,8 @@ const LINK_STYLE_REGEX = new XRegExp(
 
 const CHECK_REGEX = /^(\s*- )\[([x ])\]/
 
-function getHashStyleRegex(tokenPrefix = DEFAULT_TOKEN_PREFIX, metaOrder = false) {
-  return metaOrder ?
+function getHashStyleRegex(tokenPrefix = DEFAULT_TOKEN_PREFIX, orderMeta = false) {
+  return orderMeta ?
     new XRegExp(
       `${tokenPrefix}(${LIST_NAME_PATTERN})[ \\t]+(.+)$`, 'gm'
     ) :
@@ -287,16 +287,26 @@ function getTaskContent ({
     getTextFileTaskContent({ config, content, beforeText, fileType })
 }
 
-function getRawTask ({tokenPrefix = DEFAULT_TOKEN_PREFIX, orderMeta, beforeText = '', hasColon = false, list, order= '', text, type}) {
+function getRawTask ({
+  tokenPrefix = DEFAULT_TOKEN_PREFIX,
+  orderMeta = true,
+  beforeText = '',
+  hasColon = false,
+  list,
+  order = '',
+  text,
+  type = TASK_TYPES.HASHTAG
+}) {
   if (type === TASK_TYPES.MARKDOWN) {
-    return `${beforeText}[${text}](${tokenPrefix}${list}:${
+    return `${beforeText || ''}[${text}](${tokenPrefix}${list}:${
       orderMeta ? '' : order
     })`
+  } else {
+    const colon = hasColon || (isNumber(order) && !orderMeta) ? ':' : '';
+    return `${beforeText || ''}${tokenPrefix}${list}${colon}${
+      orderMeta ? '' : order
+    } ${text}`  
   } 
-  const colon = hasColon || (isNumber(order) && !orderMeta) ? ':' : '';
-  return `${beforeText}${tokenPrefix}${list}${colon}${
-    orderMeta ? '' : order
-  } ${text}`
 }
 
 function isNumber (value) {

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

@@ -207,18 +207,6 @@ class Config {
     return this.getDoneList()
   }
 
-  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
-  }
-
   getMetaSep() {
     const metaSep = _get(this, 'settings.cards.metaSep', COLON)
     return META_SEPS.includes(metaSep) ? metaSep : COLON

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/plugins/archive-plugin.js

@@ -1,5 +1,6 @@
 const Plugin = require('imdone-api')
 const path = require('path')
+const { getRawTask } = require('../adapters/parsers/task/CardContentParser')
 
 module.exports = class ArchivePlugin extends Plugin {
   constructor(project) {
@@ -14,24 +15,28 @@ module.exports = class ArchivePlugin extends Plugin {
     return this.project.fileGateway
   }
 
-  onBeforeBoardUpdate() {
+  async onBeforeBoardUpdate() {
     const config = this.config
     if (!config || !config.archiveCompleted || this.archivingTasks) return
     this.archivingTasks = true
     const cards = this.project.getAllCards(`meta.archived != "true" and list = ${config.doneList}`)
     const messageUser = cards.length > 1
+
     if (!cards.length) {
       this.archivingTasks = false
       return
     } else {
       if (messageUser) this.project.snackBar({message: `Archiving ${cards.length} card(s)...`})
     }
+
     cards.forEach(card => this.archiveTask(card))
+
     if (messageUser) this.project.snackBar({message: ` Done archiving ${cards.length} card(s). Deleting original(s)...`})
-    this.project.deleteTasks(cards).then(() => {
-      this.archivingTasks = false
-      if (messageUser) this.project.snackBar({message: `Done deleting original card(s).`})
-    })
+    await this.project.deleteTasks(cards)
+
+    this.archivingTasks = false
+    if (messageUser) this.project.snackBar({message: `Done deleting original card(s).`})
+
   }
 
   archiveTask (task, config = this.config) {
@@ -57,8 +62,11 @@ module.exports = class ArchivePlugin extends Plugin {
     // #imdone-1.47.0
     // order:-110
     // -->
-    const taskContent = `${task.beforeText}${config.tokenPrefix}${task.list} ${content}\n\n\n`
-
+    const { tokenPrefix } = config
+    const { beforeText, list } = task
+    const taskStart = getRawTask({tokenPrefix, beforeText, list, text: ''})
+    const taskContent = `${taskStart} ${content}\n\n\n`
+    
     this.fileGateway.preparePathForWriting(newPath)
     this.fileGateway.appendFileSync(newPath, taskContent)
   }

package/lib/repository.js

@@ -465,6 +465,7 @@ Repository.prototype.addFile = function (file, cb) {
   if (this.destroyed) return cb(new Error('destroyed'))
   var self = this
   this.fileOK(file, function (err, ok) {
+    if (err) return cb(err)
     if (ok) {
       var index = self.files.findIndex(({ path }) => path === file.path)
       if (index > -1) {
@@ -945,10 +946,10 @@ Repository.prototype.writeAndExtract = function (file, emit, cb) {
       if (err)
         return cb(new Error('Unable to extract tasks for file:' + file.path))
       this.addFile(file, (err) => {
-        if (err)
-          return cb(
-            new Error('Unable to add file after extracting tasks:' + file.path)
-          )
+        if (err) {
+          err.message = `Unable to add file after extracting tasks: #{file.path}\n${err.message}` 
+          return cb(err)
+        }
         cb(null, file)
       })
     })

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

@@ -1,27 +1,27 @@
-const languages = require('../languages') 
 const Config = require('../config')
-const File = require('../file')
-const pluginManager = {
-  onTaskUpdate: () => {},
-  getCardProperties: () => { return {} },
-  getCardActions: () => [],
-}
+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)
-  const project = { path: projectPath, config, pluginManager }
-  // var file = new File({
-  //   repoId: projectPath,
-  //   filePath,
-  //   content,
-  //   languages,
-  //   project,
-  // })
 
-  // return file.extractTasks(config).getTasks()
+  const readStream = new Readable({
+    read() {
+      this.push(content);
+      this.push(null);
+    }
+  });
+
+  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.47.0",
+  "version": "1.47.2",
   "description": "imdone-core",
   "main": "index.js",
   "scripts": {
@@ -99,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/lib/adapters/parsers/task/readme.md

@@ -1,6 +0,0 @@
-# Tasks
-
-- [ ] ## #DOING Use task line parsers for vs code extension and obsidian plugin
-  <!--
-  order:-10000030
-  -->