imdone-core 1.41.0 → 1.41.1

package/lib/file.js

@@ -788,9 +788,9 @@ const trimBlankLines = File.trimBlankLines = function (content, isCodeFile) {
 }
 
 File.prototype.modifyDescription = function (task, config) {
-  // DOING This should be split out by type (code, markdown, etc)
+  // TODO This should be split out by type (code, markdown, etc)
   // #urgent
-  // <!-- order:-10 -->
+  // <!-- order:-70 -->
   const taskStart = this.getLinePos(task.line)
   const descStart = this.getLinePos(task.line + 1)
   const contentWithTask = this.getContent().substring(taskStart)

package/lib/project.js

@@ -443,34 +443,27 @@ module.exports = class WorkerProject extends Project {
     const filePath = cardData.path
     if (addTemplate) content += cardData.template
 
-    content = this.addOrderMetaToContent(content, list)
     content = this.addTagsToContent(tags, content)
     content = this.addContextsToContent(contexts, content)
     content = this.addMetaToContent(meta, content)
 
     return new Promise((resolve, reject) => {
-      this.repo.addTaskToFile(filePath, list, content, (err, file) => {
+      this.repo.addTaskToFile(filePath, list, content, (err, file, task) => {
         if (err) return reject(err)
-        resolve(file)
+
+        const newList = task.list
+        const list = this.lists.find(l => l.name === newList)
+        const newPos = this.config.isAddNewCardsToTop() ? 0 : list.tasks.length - 1
+
+        this.repo.moveTask({ task, newList, newPos }, (err) => {
+          if (err) return reject(err)
+
+          resolve({ file, task })
+        })
       })
     })
   }
 
-  addOrderMetaToContent(content, _list) {
-    const list = this.lists.find(l => l.name === _list)
-    let order
-    if (this.config.isAddNewCardsToTop()) {
-      order = list.tasks.length
-        ? list.tasks[0].order - 1
-        : 0
-    } else {
-      order = list.tasks.length
-        ? list.tasks[list.tasks.length - 1].order + 1
-        : 0
-    }
-    return Task.addToLastCommentInContent(content, `order${this.config.getMetaSep()}${order}`, this.config.isMetaNewLine())
-  }
-
   addMetaToContent(meta, content) {
     if (meta && meta.length > 0) {
       let metaContent = ''

package/lib/repository.js

@@ -1115,8 +1115,13 @@ Repository.prototype.appendTask = function({file, content, list}, cb) {
     appendContent = `${taskPrefix}#${list}${inLineOrder} ${text}${eol.lf}${taskContent}`
   }
   appendContent = File.trimBlankLines(appendContent)
-  file.setContent(`${fileContent}${sep}${appendContent}${"\n".repeat(2)}`)
-  this.writeAndExtract(file, true, cb)
+  fileContent = `${fileContent}${sep}`
+  file.setContent(`${fileContent}${appendContent}${"\n".repeat(2)}`)
+  this.writeAndExtract(file, true, (err, file) => {
+    if (err) return cb(err)
+    const task = file.getTasks().find(task => task.text === text && task.list === list)
+    cb(null, file, task)
+  })
 }
 
 Repository.prototype.addTaskToFile = function (filePath, list, content, cb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.41.0",
+  "version": "1.41.1",
   "description": "imdone-core",
   "main": "index.js",
   "bin": {