imdone-core 1.47.1 → 1.48.0

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/adapters/storage/config.js

@@ -0,0 +1,50 @@
+const { readFile, writeFile, exists } = require('../file-gateway')
+const { CONFIG_DIR, CONFIG_FILE_YML } = require('../../constants')
+const { loadYAML, dumpYAML } = require('../yaml')
+const findUp = require('find-up')
+const _path = require('path')
+const Config = require('../../config')
+
+module.exports = {
+  load,
+  save,
+  loadForFilePath,
+  findImdonePath,
+}
+
+async function load(projectPath) {
+  const configPath = _path.join(projectPath, CONFIG_FILE_YML)
+  const configLike = await getYamlConfig(configPath)
+  return configLike && new Config(configLike)
+}
+
+async function save(config, projectPath) {
+  const configPath = _path.join(projectPath, CONFIG_FILE_YML)
+  await writeFile(configPath, dumpYAML(config))
+}
+
+async function loadForFilePath(filePath) {
+  const projectPath = await findImdonePath(filePath)
+  return load(projectPath)
+}
+
+async function getYamlConfig(filePath) {
+  if (!(await exists(filePath))) return
+  const configData = await readFile(filePath, 'utf-8')
+  let configLike = {}
+  try {
+    configLike = loadYAML(configData.toString())
+    if (configLike.exclude) delete configLike.exclude
+    if (configLike.watcher) delete configLike.watcher
+
+  } catch (e) {
+    /* noop */
+  }
+  return configLike
+}
+
+async function findImdonePath(cwd) {
+  const configDir = await findUp(CONFIG_DIR, { cwd, type: 'directory' })
+  return _path.dirname(configDir)
+}
+

package/lib/adapters/storage/tags.js

@@ -0,0 +1,30 @@
+const { readFile, writeFile, exists } = require('../file-gateway')
+const { CONFIG_DIR } = require('../../constants')
+const { loadYAML, dumpYAML } = require('../yaml')
+const _path = require('path')
+
+module.exports = {
+  load,
+  save
+}
+
+async function load(projectPath) {
+  const tagsPath = getTagsPath(projectPath)
+  if (!(await exists(tagsPath))) return
+  const tagsData = await readFile(tagsPath, 'utf-8')
+  try {
+    const { tags } = loadYAML(tagsData)
+    return tags
+  } catch (e) {
+    console.error(e)
+    return
+  }
+}
+
+async function save(tags, projectPath) {
+  await writeFile(getTagsPath(projectPath), dumpYAML({ tags }))
+}
+
+function getTagsPath(projectPath) {
+  return _path.join(projectPath, CONFIG_DIR, 'tags.yml')
+}

package/lib/card.js

@@ -78,36 +78,10 @@ module.exports = function newCard(task, _project, dontParse) {
         : { ...computed }
     }
 
-    getCardActions() {
-      // TODO Stop allowing links/actions from card config
-      // <!-- order:-80 -->
-      const links = project.config.cardActions
-      const allLinks = this.frontMatter.links
-        ? [...links, ...this.frontMatter.links]
-        : [...links]
-      return allLinks.filter(({ display }) => {
-        if (!display) return true
-        try {
-          return display.call({ ...this.data, ...this.desc })
-        } catch (e) {
-          console.error(e)
-        }
-        return false
-      })
-    }
-
     initActions() {
-      this.links = this.getCardActions().map(
-        ({ pack, icon, title, href }, index) => {
-          href = this.formatContent(href).content
-          title = this.formatContent(title).content
-          const action = JSON.stringify({ index })
-          return { pack, icon, title, href, action } // Use index instead of action
-        }
-      )
-
+      this.links = []
       if (!pluginManager) return
-      this.links = [...this.links, ...pluginManager.getCardActions(this)]
+      this.links = [...pluginManager.getCardActions(this)]
     }
 
     get projectPath() {

package/lib/config.js

@@ -123,17 +123,6 @@ class Config {
     return this.settings.views
   }
 
-  get cardActions() {
-    return [..._get(this, 'settings.cards.links', [])]
-  }
-
-  get boardActions() {
-    const settingsActions = _get(this, 'settings.actions', []).map((action) => {
-      return { name: action.name, action: action['function'] }
-    })
-    return [...settingsActions]
-  }
-
   get appendNewCardsTo() {
     return _get(this, 'settings.appendNewCardsTo', false)
   }
@@ -223,27 +212,4 @@ Config.newDefaultConfig = (config = {}) => new 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/constants.js

@@ -57,6 +57,8 @@ module.exports = {
     NOT_A_FILE: 'file must be of type File',
     CALLBACK_REQUIRED: 'Last paramter must be a callback function',
     NO_CONTENT: 'File has no content',
+    LIST_NOT_FOUND: 'List not found',
+    TASK_NOT_FOUND: 'Task not found',
   },
   DEFAULT_CONFIG: {
     keepEmptyPriority: false,

package/lib/file.js

@@ -290,7 +290,7 @@ File.prototype.transformTask = function ({config, modify, task}) {
 }
 
 File.prototype.transformTasks = function (config, modify) {
-  if (this.isCodeFile()) return
+  // if (this.isCodeFile()) return
   fastSort(this.getTasks())
     .desc(u => u.line)
     .forEach(task => this.transformTask({config, modify, task}))

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

@@ -270,9 +270,6 @@ function mixin(repo, fs = require('fs')) {
     let configLike = {}
     try {
       configLike = loadYAML(configData.toString())
-      Repository.trimFunctionsInSettings(configLike)
-      if (configLike.exclude) delete configLike.exclude
-      if (configLike.watcher) delete configLike.watcher
     } catch (e) {
       /* noop */
     }

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

@@ -0,0 +1,13 @@
+const Plugin = require('imdone-api')
+const { save } = require('../adapters/storage/tags.js')
+
+module.exports = class PersistTagsPlugin extends Plugin {
+  constructor(project) {
+    super(project)
+  }
+
+  async onBoardUpdate() {
+    await save(this.project.allTags, this.project.path)
+  }
+  
+}

package/lib/plugins/plugin-manager.js

@@ -14,7 +14,8 @@ module.exports = class PluginManager extends Emitter {
     this.defaultPlugins = [
       './archive-plugin',
       './epic-plugin', 
-      './extension-plugin'
+      './extension-plugin',
+      './persist-tags-plugin',
     ]
     this.pluginsMap = {}
     this.pluginPath = _path.join(project.path, '.imdone', 'plugins')
@@ -234,13 +235,13 @@ module.exports = class PluginManager extends Emitter {
     )
   }
 
-  onBoardUpdate(lists) {
+  async onBoardUpdate(lists) {
     if (!lists || lists.length == 0) return
-    this.eachPlugin(({ pluginInstance }) => {
+    this.eachPluginAsync(async ({ pluginInstance }) => {
       // const timeLabel = `${this.getPluginName(pluginInstance)} onBoardUpdate time`
       // console.time(timeLabel)
       try {
-        pluginInstance.onBoardUpdate(lists)
+        await pluginInstance.onBoardUpdate(lists)
       } catch (e) {
         this.pluginError('onBoardUpdate', pluginInstance, e)
       }

package/lib/project.js

@@ -142,9 +142,9 @@ module.exports = class WorkerProject extends Project {
       files: this.files,
       totals,
       tags: this.getTags(),
-      allMeta: this.repo.allMeta,
-      allContexts: [...this.repo.allContexts],
-      allTags: [...this.repo.allTags],
+      allMeta: this.allMeta,
+      allContexts: this.allContexts,
+      allTags: this.allTags,
       filter: this.filter,
       defaultFilter: this.defaultFilter,
       actions: this.boardActions,
@@ -164,6 +164,18 @@ module.exports = class WorkerProject extends Project {
     if (this.pluginManager) this.pluginManager.destroyPlugins()
   }
 
+  get allTags() {
+    return [...this.repo.allTags]
+  }
+
+  get allContexts() {
+    return [...this.repo.allContexts]
+  }
+
+  get allMeta() {
+    return this.repo.allMeta
+  }
+
   get lists() {
     return this.getLists({
       tasks: this.filteredCards,
@@ -219,8 +231,8 @@ module.exports = class WorkerProject extends Project {
       ...new Set(queryProps),
       ...[...this.repo.metaKeys].map(key => `allMeta.${key}`),
       ...[...this.repo.metaKeys].map(key => `meta.${key}`),
-      ...this.repo.allTags,
-      ...this.repo.allContexts,
+      ...this.allTags,
+      ...this.allContexts,
     ]
   }
 
@@ -295,12 +307,7 @@ module.exports = class WorkerProject extends Project {
   }
 
   get boardActions() {
-    // TODO Stop allowing board actions from config
-    // <!-- order:-90 -->
     return [
-      ...this.config.boardActions.map((item, index) => {
-        return { ...item, index }
-      }),
       ...this.pluginManager.getBoardActions(),
     ]
   }
@@ -474,15 +481,7 @@ module.exports = class WorkerProject extends Project {
     return new Promise((resolve, reject) => {
       this.repo.addTaskToFile(filePath, list, content, (err, file, task) => {
         if (err) return reject(err)
-
-        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 })
-        })
+        resolve({ file, task })
       })
     })
   }

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) {
@@ -942,13 +943,15 @@ Repository.prototype.writeAndExtract = function (file, emit, cb) {
   this.writeFile(file, emit, (err, file) => {
     if (err) return cb(new Error('Unable to write file:' + file.path))
     this.extractTasks(file, (err, file) => {
-      if (err)
+      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)
       })
     })
@@ -1097,20 +1100,18 @@ Repository.prototype.appendTask = function({file, content, list}, cb) {
   let sep = fileContent.indexOf(crlf) > -1 ? crlf : String(eol.lf)
   if (fileContent.endsWith(sep) || fileIsEmpty) sep = ''
   const order = appContext().projectContext.getOrder(list)
-  const orderString = isNumber(order) ? order : ''
-  const description =
-    lines.length > 1 ? Task.padDescription(lines.slice(1), taskPrefix) : []
-
-    const rawTask = getRawTask({tokenPrefix: config.tokenPrefix, orderMeta: config.orderMeta, list, order, text, type: taskSyntax})      
-    const taskContent = config.orderMeta
-    ? this.getTaskContent({
-        description,
-        order,
-        text,
-        taskPrefix,
-        taskSyntax,
-      })
-    : description.join(eol.lf)
+  const description = lines.length > 1 ? Task.padDescription(lines.slice(1), taskPrefix) : []
+  const { orderMeta, tokenPrefix } = config
+  const rawTask = getRawTask({tokenPrefix, orderMeta, list, order, text, type: taskSyntax})      
+  const taskContent = config.orderMeta
+  ? this.getTaskContent({
+      description,
+      order,
+      text,
+      taskPrefix,
+      taskSyntax,
+    })
+  : description.join(eol.lf)
 
   let appendContent = File.trimBlankLines(
     `${taskPrefix}${rawTask}${eol.lf}${taskContent}`
@@ -1674,55 +1675,4 @@ Repository.prototype.query = function (queryString) {
   return Repository.getTasksByList(this, result, true)
 }
 
-function trimFunction(propValue) {
-  let func = null
-  if (propValue && _isFunction(propValue)) {
-    const functionMatch = propValue.toString().match(functionRegex())
-    const lines = eol.split(functionMatch[3])
-    const funcBody = lines.filter((line) => line.trim().length > 0).join(eol.lf)
-    try {
-      func = new Function(funcBody)
-    } catch (e) {
-      console.error(`Unable to parse function:`, propValue.toString())
-      console.error(e)
-    }
-  }
-  return func
-}
-
-Repository.trimFunctionsInSettings = function (config) {
-  const computed = _get(config, 'settings.cards.computed')
-  if (_isObject(computed)) {
-    Object.keys(computed).forEach((key) => {
-      const value = computed[key]
-      const func = trimFunction(value)
-      if (func) config.settings.cards.computed[key] = func
-    })
-  }
-
-  let links = _get(config, 'settings.cards.links')
-  if (Array.isArray(links)) {
-    links = links.map((link) => {
-      ;['action', 'display'].forEach((prop) => {
-        const propValue = link[prop]
-        const func = trimFunction(propValue)
-        if (func) link[prop] = func
-      })
-      return link
-    })
-    config.settings.cards.links = links
-  }
-
-  let actions = _get(config, 'settings.actions')
-  if (Array.isArray(actions)) {
-    actions = actions.map((action) => {
-      const propValue = action.function
-      const func = trimFunction(propValue)
-      if (func) action.function = func
-      return action
-    })
-    config.settings.actions = actions
-  }
-}
-
 module.exports = Repository

package/lib/usecases/get-project-tags.js

@@ -0,0 +1,17 @@
+const {
+  load,
+  save
+} = require('../adapters/storage/tags.js')
+
+const {
+  findImdonePath
+} = require('../adapters/storage/config.js')
+
+module.exports = {
+  getTags
+}
+
+async function getTags(filePath) {
+  const projectPath = await findImdonePath(filePath)
+  return load(projectPath)
+}

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

@@ -1,20 +1,18 @@
-const Config = require('../config')
+const { loadForFilePath } = require('../adapters/storage/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)
+module.exports = {
+  getTasks  
+}
+
+async function getTasks({filePath, content}) {
+  const config = await loadForFilePath(filePath)
 
-  // 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.48.0",
   "description": "imdone-core",
   "main": "index.js",
   "scripts": {

package/lib/adapters/readers/FileSystemConfigReader.js

@@ -1,10 +0,0 @@
-module.exports = class FileSystemConfigReader {
-  constructor(location) {
-    this.location = location
-  }
-
-  // BACKLOG:-880 ## Implement the read method
-  // [${source.path}](${source.path}) #adapter #urgent
-  // <!-- epic:"Release 2.0" -->
-  async read() {}
-}