imdone-core 1.44.5 → 1.45.0

package/lib/adapters/file-gateway.js

@@ -1,13 +1,15 @@
 const tools = require('../tools')
-
+const _path = require('path')
 let fs = require('fs')
+const sanitize = require('sanitize-filename')
+
 
 module.exports = {
   init(fileSystem = fs) {
     fs = fileSystem
   },
 
-  sep: require('path').sep,
+  sep: _path.sep,
 
   existsSync(...args) {
     console.warn('sync call')
@@ -61,7 +63,10 @@ module.exports = {
 
   statSync(path) {
     console.warn('sync call')
-    return fs.statSync(path)
+    try {
+      return fs.statSync(path)
+    } catch {
+    }
   },
 
   readdirSyncRecursive(path) {
@@ -73,4 +78,12 @@ module.exports = {
     console.warn('sync call')
     return fs.readdirSync(path, { withFileTypes: true })
   },
+  sanitizeFileName(fileName, replaceSpacesWith) {
+    // Remove markdown emoji
+    fileName = fileName.replace(/:\w+:/g, '').trim()
+    fileName = sanitize(fileName)
+    if (replaceSpacesWith)
+      fileName = fileName.replace(/ /g, replaceSpacesWith)
+    return fileName
+  }
 }

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

@@ -43,6 +43,13 @@ function getContentLines(content) {
   })
 }
 
+function isCustomCardTerminator(config, line) {
+  return config.customCardTerminator 
+    && config.customCardTerminator.trim() 
+    && line 
+    && line.trim() === config.customCardTerminator
+}
+
 function isCheckBoxTask (config, line, beforeText) {
   if (!config.isAddCheckBoxTasks()) return
 
@@ -146,6 +153,7 @@ function getCardTagsTaskContent ({
   }
 }
 
+// This finds the end of task
 function getCodeFileTaskContent ({
   config,
   content,
@@ -208,13 +216,13 @@ function getTextFileTaskContent ({
 
   for (let i = 1; i < lines.length; i++) {
     let line = lines[i]
-    let taskContentLine = `${line}`
     if (hasTaskInText(config, line)) break
     if (isCheckBoxTask(config, line, beforeText)) break
     if (isTaskInList && isLineOutsideMarkdownList(line, beforeText)) break
+    if (isCustomCardTerminator(config, line)) break
     
-    taskContentLines.push(taskContentLine)
     rawTaskContentLines.push(line)
+    taskContentLines.push(`${line}`)
 
     // Check for matching block comments in markdown files
     if (isMarkDownFile && line.trim().indexOf('<!--') > -1)

package/lib/card.js

@@ -56,7 +56,12 @@ module.exports = function newCard(task, _project, dontParse) {
     }
 
     onTaskUpdate() {
-      pluginManager.onTaskUpdate(this)
+      // TODO We should be mapping to the imdone-api task
+      // #imdone-1.45.0
+      const interpretedContent = pluginManager.onTaskUpdate(this)
+      if (interpretedContent && interpretedContent.length > 0) {
+        this.interpretedContent = interpretedContent
+      }
     }
 
     initProps() {
@@ -239,7 +244,7 @@ module.exports = function newCard(task, _project, dontParse) {
     format(content, mustache) {
       const data = this.data
 
-      const opts = { interpolate: /(?<!`)\${([\s\S]+?)}/g }
+      const opts = { interpolate: /(?<![`\\])\${([\s\S]+?)}/g }
 
       if (mustache) content = removeDisplayComments(content)
 

package/lib/config.js

@@ -20,6 +20,7 @@ class Config {
     _assign(this, opts)
     if (!this.settings) this.settings = {}
     if (!this.settings.views) this.settings.views = []
+    if (!this.settings.cards) this.settings.cards = {}
   }
 
   get defaultFilter() {
@@ -94,6 +95,14 @@ class Config {
     return _get(this, 'settings.cards.addCompletedMeta', false)
   }
 
+  get customCardTerminator() {
+    return _get(this, 'settings.cards.customCardTerminator')
+  }
+
+  set customCardTerminator(terminator) {
+    this.settings.cards.customCardTerminator = terminator
+  }
+
   get markdownOnly() {
     return this.settings.markdownOnly
   }

package/lib/file.js

@@ -278,6 +278,7 @@ File.prototype.transformTask = function ({config, modify, task}) {
   content = File.parseRemindDate(config, content)
   content = File.parseDeferDate(config, content)
   content = File.addCompleted({ task, content, config })
+  content = task.format(content)
   if (
     content.trim() !== task.content.trim() 
     || trackListChanges.beforeTextModified
@@ -946,6 +947,7 @@ File.prototype.extractTaskWithDescription = function ({
   task.updateOrderMeta(config)
 
   task.orderModified = task.order + "" !== order + "" && !bothAreUndefNull(task.order, order)
+  task.init()
 
   return task
 }

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

@@ -85,9 +85,14 @@ function mixin(repo, fs = require('fs')) {
     })
   }
 
-  repo.addFilePath = function (path) {
-    if (!repo.allFiles.includes(path)) {
-      repo.allFiles.push(path)
+  repo.addFilePath = async function (path) {
+    var relPath = repo.getRelativePath(path)
+    var fullPath = repo.getFullPath(path)
+
+    const stat = await fs.promises.lstat(fullPath)
+    if (stat.isDirectory()) relPath += _path.sep
+    if (!repo.allFiles.includes(relPath)) {
+      repo.allFiles.push(relPath)
     }
   }
 
@@ -329,6 +334,7 @@ function mixin(repo, fs = require('fs')) {
 
               file.setModifiedTime(stats.mtime)
               file.modified = false
+              repo.addFilePath(filePath)
               if (emitFileUpdate) repo.emit('file.saved', file)
               cb(null, file)
             })

package/lib/plugins/epic-plugin.js

@@ -13,6 +13,7 @@ function getEpicMeta(task) {
 module.exports = class EpicPlugin extends Plugin {
   constructor(project) {
     super(project)
+    this.epics = {}
   }
 
   onBeforeBoardUpdate() {

package/lib/project.js

@@ -3,10 +3,10 @@ const PluginManager = require('./plugins/plugin-manager')
 const Repository = require('./repository')
 const _cloneDeep = require('lodash.clonedeep')
 const newCard = require('./card')
-const sanitize = require('sanitize-filename')
 const { JOURNAL_TYPE } = require('./constants')
 const _path = require('path')
 const moment = require('moment')
+const { getIsoDateWithOffset } = require('./adapters/date-time')
 const fileGateway = require('./adapters/file-gateway')
 const matter = require('gray-matter')
 const _isObject = require('lodash.isobject')
@@ -175,6 +175,10 @@ module.exports = class WorkerProject extends Project {
     return this.getCards(this.filter)
   }
 
+  get isoDateWithOffset() {
+    return getIsoDateWithOffset()
+  }
+
   removeList(list) {
     this.repo.removeList(list)
   }
@@ -412,6 +416,22 @@ module.exports = class WorkerProject extends Project {
     this.emit('project.saveFile', { file: filePath, content })
   }
 
+  preparePathForWriting(path) {
+    let stat = fileGateway.statSync(path)
+    if (!stat) {
+      let { dir, ext } = _path.parse(path)
+      if (!ext) {
+        dir = path
+      }
+      fileGateway.mkdirpSync(dir)
+      stat = fileGateway.statSync(path)
+    }
+    return {
+      isFile: stat && stat.isFile(),
+      isDirectory: stat && stat.isDirectory()
+    }
+  }
+
   /*
     * @param {Object} opts - The options object
     * @param {String} opts.list - The list name to add the card to
@@ -422,25 +442,23 @@ module.exports = class WorkerProject extends Project {
     * @param {Boolean} opts.emit - Whether to emit the new card event 
   */
   newCard({ list, path, template, title, comments, emit = true }) {
-    if (path) {
-      path = this.getFullPath(path)
-      if (!fileGateway.existsSync(path)) {
-        fileGateway.writeFileSync(path, '')
-      }
-    } // TODO: Need a way to handle new cards using new fie for each card
-    else {
-      path = this.getFullPath(this.getNewCardsFile({title}))
-    }
-    const stat = fileGateway.statSync(path)
-    if (!template) template = this.getNewCardTemplate(path, stat)
+    if (!path || !_path.parse(path).ext) path = this.getFullPath(this.getNewCardsFile({title}))
+
+    const { isFile, isDirectory } = this.preparePathForWriting(path)
+    
+    if (!template) template = this.getNewCardTemplate(path, isFile)
     
     if (comments) template = Task.addToLastCommentInContent(template, comments, this.config.isMetaNewLine())
 
+    let relativePath = _path.relative(this.path, path)
+    if (isDirectory) relativePath += _path.sep
+
     const data = {
       list,
       path,
+      relativePath,
       template,
-      isDirectory: stat.isDirectory(),
+      isDirectory,
     }
     if (emit) this.emit('project.newCard', data)
     return data
@@ -475,7 +493,6 @@ module.exports = class WorkerProject extends Project {
 
         this.repo.moveTask({ task, newList, newPos }, (err) => {
           if (err) return reject(err)
-
           resolve({ file, task })
         })
       })
@@ -545,9 +562,9 @@ module.exports = class WorkerProject extends Project {
   setFilter(filter) {
     this.emit('project.filter', { filter })
   }
-
-  getNewCardTemplate(file, stat) {
-    const frontMatter = this.getNewCardFileFrontMatter(file, stat)
+ 
+  getNewCardTemplate(file, isFile) {
+    const frontMatter = this.getNewCardFileFrontMatter(file, isFile)
     const card = newCard(
       {
         frontMatter,
@@ -562,9 +579,9 @@ module.exports = class WorkerProject extends Project {
     return card.formatContent(frontMatter.template).content
   }
 
-  getNewCardFileFrontMatter(file, stat) {
+  getNewCardFileFrontMatter(file, isFile) {
     let fileContent = ''
-    if (file && stat.isFile()) {
+    if (file && isFile) {
       fileContent = fileGateway.readFileSync(file, 'utf8')
     } else if (JOURNAL_TYPE.NEW_FILE === this.config.journlType) {
       fileContent = this.config.journalTemplate
@@ -597,8 +614,7 @@ module.exports = class WorkerProject extends Project {
     if (!this.config) return ''
     const filePath = this.appendNewCardsTo(title)
     if (!filePath) return ''
-    if (fileGateway.existsSync(filePath))
-      return relPath ? filePath.replace(this.path, '') : filePath
+    return filePath
   }
 
   appendNewCardsTo(title) {
@@ -613,20 +629,12 @@ module.exports = class WorkerProject extends Project {
       const fileFolder = this.getFullPath(this.config.journalPath)
       const filePath = _path.join(fileFolder, fileName)
 
-      if (!fileGateway.existsSync(fileFolder))
-        fileGateway.mkdirpSync(fileFolder)
-      if (!fileGateway.existsSync(filePath))
-        fileGateway.writeFileSync(filePath, this.config.journalTemplate)
-
       return filePath
     }
   }
 
-  sanitizeFileName(name) {
-    let fileName = sanitize(name)
-    if (this.config.replaceSpacesWith)
-      fileName = fileName.replace(/ /g, this.config.replaceSpacesWith)
-    return fileName
+  sanitizeFileName(fileName) {
+    return fileGateway.sanitizeFileName(fileName, this.config.replaceSpacesWith)
   }
 
   getJournalFile() {
@@ -641,13 +649,7 @@ module.exports = class WorkerProject extends Project {
       `${journalFilePrefix}${today}${journalFileSuffix}.md`
     )
 
-    const fullFolderPath = this.getFullPath(folderPath)
     const fullFilePath = this.getFullPath(filePath)
-    if (!fileGateway.existsSync(fullFolderPath))
-      fileGateway.mkdirpSync(fullFolderPath)
-    if (!fileGateway.existsSync(fullFilePath)) {
-      fileGateway.writeFileSync(fullFilePath, this.config.journalTemplate)
-    }
     return { filePath, fullFilePath }
   }
 

package/lib/repository.js

@@ -1117,7 +1117,8 @@ Repository.prototype.appendTask = function({file, content, list}, cb) {
   }
   appendContent = File.trimBlankLines(appendContent)
   fileContent = `${fileContent}${sep}`
-  file.setContent(`${fileContent}${appendContent}${"\n".repeat(2)}`)
+  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)

package/package.json

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