imdone-core 1.47.1 → 1.47.2

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

@@ -4,6 +4,7 @@ const path = require('path')
 const languages = require('../../../languages')
 const ReadStreamCodeParser = require('./ReadStreamCodeParser')
 
+
 function getLang(languages, filePath) {
   var lang = languages[path.extname(filePath)]
   return lang || { name: 'text', symbol: '' }
@@ -14,10 +15,6 @@ function getLanguages(config) {
   return { ...languages, ...configLanguages }
 }
 
-// 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) {

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

@@ -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/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

@@ -2,19 +2,15 @@ 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
+      this.push(null);
     }
   });
 

package/package.json

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