imdone-core 1.54.10 → 2.0.1

package/lib/project.js

@@ -1,24 +1,26 @@
-const { Project } = require('imdone-api/lib/project')
-const PluginManager = require('./plugins/plugin-manager')
-const Repository = require('./repository')
-const _cloneDeep = require('lodash.clonedeep')
-const newCard = require('./card')
-const { JOURNAL_TYPE, CONFIG_DIR } = 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')
-const _isString = require('lodash.isstring')
-const _isFunction = require('lodash.isfunction')
-const exec = require('child_process').exec
-const fastSort = require('fast-sort/dist/sort.js')
-const Task = require('./task')
-const eol = require('eol')
-const { renderMarkdown, extractWikilinkTopics } = require('./adapters/markdown')
-const { getFunctionSignature } = require('./adapters/parsers/function-parser')
-const { format } = require('./adapters/parsers/content-transformer')
+import { Project } from 'imdone-api/lib/project.js';
+import { PluginManager } from './plugins/plugin-manager.js';
+import { Repository } from './repository.js';
+import _cloneDeep from 'lodash.clonedeep';
+import { newCard } from './card.js';
+import { constants } from './constants.js';
+const { JOURNAL_TYPE, CONFIG_DIR } = constants;
+import _path from 'node:path';
+import moment from 'moment';
+import { getIsoDateWithOffset } from './adapters/date-time.js';
+import * as fileGateway from './adapters/file-gateway.js';
+import matter from 'gray-matter';
+import _isObject from 'lodash.isobject';
+import _isString from 'lodash.isstring';
+import _isFunction from 'lodash.isfunction';
+import { exec } from 'node:child_process';
+import { sort } from 'fast-sort';
+import { Task } from './task.js';
+import eol from 'eol';
+import { renderMarkdown, extractWikilinkTopics } from './adapters/markdown.js';
+import { getFunctionSignature } from './adapters/parsers/function-parser.js';
+import { format } from './adapters/parsers/content-transformer.js';
+import { logger } from './adapters/logger.js';
 
 function calculateTotals(lists = []) {
   const totals = {}
@@ -26,7 +28,7 @@ function calculateTotals(lists = []) {
     try {
       totals[list.name] = list.tasks.length
     } catch (e) {
-      console.error('Error calculating list totals:', e)
+      logger.error('Error calculating list totals:', e)
     }
   })
   return totals
@@ -45,7 +47,7 @@ const EVENTS = [
   'config.update',
 ]
 
-module.exports = class WorkerProject extends Project {
+export class WorkerProject extends Project {
   constructor(repo) {
     super()
     this.repo = repo
@@ -146,44 +148,32 @@ module.exports = class WorkerProject extends Project {
     this.innerFilter = filter
   }
 
-  async init(cb) {
-    const promise = new Promise(async (resolve, reject) => {
-      this.pluginManager.on('plugin-installed', () => this.emitUpdate())
-      this.pluginManager.on('plugin-uninstalled', () => this.emitUpdate())
-      this.pluginManager.on('plugins-reloaded', () => this.emitUpdate())
-      await this.pluginManager.loadPlugins()
-      this.data = await this.pluginManager.getBoardProperties()
-      this.dataKeys = this.getDataKeys(this.data)
-  
-      console.log('data', this.data)
-      console.log('dataKeys', this.dataKeys)
-      EVENTS.forEach((event) => {
-        this.repo.on(event, (data) => onChange(this, event, data))
-      })
-  
-      this.repo.on('task.found', (task) => this.pluginManager.onTaskFound(task))
+  async init() {
+    this.pluginManager.on('plugin-installed', () => this.emitUpdate())
+    this.pluginManager.on('plugin-uninstalled', () => this.emitUpdate())
+    this.pluginManager.on('plugins-reloaded', () => this.emitUpdate())
+    await this.pluginManager.loadPlugins()
+    this.data = await this.pluginManager.getBoardProperties()
+    this.dataKeys = this.getDataKeys(this.data)
 
-      this.repo.init(async (err, files) => {
-        if (err) {
-          if (cb) cb(err)
-          else reject(err)
-          return
-        }
-        this.pluginManager
-          .startDevMode()
-          .then(() => {
-            if (cb) cb(null, files)
-            else resolve(files)
-          })
-          .catch(err => {
-            console.log('Error on starting dev mode', err)
-            if (cb) cb(err)
-            else reject(err)
-          })
-      })
+    logger.log('data', this.data)
+    logger.log('dataKeys', this.dataKeys)
+    EVENTS.forEach((event) => {
+      this.repo.on(event, (data) => onChange(this, event, data))
     })
 
-    if (!cb) return promise
+    this.repo.on('task.found', (task) => this.pluginManager.onTaskFound(task))
+
+    const files = await this.repo.init()
+    
+    try {
+      await this.pluginManager.startDevMode()
+    } catch (err) {
+      logger.log('Error on starting dev mode', err)
+      throw new Error('Error on starting dev mode', { cause: err })
+    }
+
+    return files
   }
 
   initIndexes(allLists) {
@@ -232,41 +222,41 @@ module.exports = class WorkerProject extends Project {
 
   async toImdoneJSON() {
     this.pluginManager.initDevMode()
-    console.time('toJSON time')
+    logger.time('toJSON time')
     this._updatedAt = new Date()
     const { allLists , totals } = this.getListsForImdoneJSON()
 
-    console.time('plugin onBeforeBoardUpdate time')
+    logger.time('plugin onBeforeBoardUpdate time')
     await this.pluginManager.onBeforeBoardUpdate()
-    console.timeEnd('plugin onBeforeBoardUpdate time')
+    logger.timeEnd('plugin onBeforeBoardUpdate time')
 
-    console.time('getBoardProperties time')
+    logger.time('getBoardProperties time')
     const data = this.data = await this.pluginManager.getBoardProperties()
-    console.timeEnd('getBoardProperties time')
+    logger.timeEnd('getBoardProperties time')
     
-    console.time('getDataKeys time')
+    logger.time('getDataKeys time')
     const dataKeys = this.dataKays = this.getDataKeys(data)
-    console.timeEnd('getDataKeys time')
+    logger.timeEnd('getDataKeys time')
 
-    console.time('card init time')
+    logger.time('card init time')
     const cards = this.getInitializedCards(allLists, totals)
-    console.timeEnd('card init time')
+    logger.timeEnd('card init time')
 
-    console.time('plugin onBoardUpdate time')
+    logger.time('plugin onBoardUpdate time')
     await this.pluginManager.onBoardUpdate(allLists)
-    console.timeEnd('plugin onBoardUpdate time')
+    logger.timeEnd('plugin onBoardUpdate time')
 
-    console.time('getTags time')
+    logger.time('getTags time')
     const tags = this.getTags(cards)
-    console.timeEnd('getTags time')
+    logger.timeEnd('getTags time')
 
-    console.time('getLists time')
+    logger.time('getLists time')
     const lists = this.filter
     ? this.getRequestedLists(cards)
     : allLists
-    console.timeEnd('getLists time')
+    logger.timeEnd('getLists time')
 
-    console.timeEnd('toJSON time')
+    logger.timeEnd('toJSON time')
     return {
       path: this.path,
       config: this.config,
@@ -308,8 +298,8 @@ module.exports = class WorkerProject extends Project {
     this.emit('file.update')
   }
 
-  destroy() {
-    this.repo.destroy()
+  async destroy() {
+    await this.repo.destroy()
     if (this.pluginManager) this.pluginManager.destroyPlugins()
   }
 
@@ -387,7 +377,7 @@ module.exports = class WorkerProject extends Project {
       })
     })
 
-    return fastSort(tags).by([
+    return sort(tags).by([
       {desc: (tag) => tag.count},
       {asc: (tag) => tag.name},
     ])
@@ -434,10 +424,8 @@ module.exports = class WorkerProject extends Project {
   async removeMetadata(task, key, value) {
     if (!task.meta[key]) return
     const file = this.getFileForTask(task)
-    return this.updateCardContent(
-      task,
-      file.removeMetaData(task.content, key, value)
-    )
+    const content = file.removeMetaData(task.content, key, value)
+    return await this.updateCardContent(task,content)
   }
 
   async addTag(task, tag) {
@@ -449,7 +437,7 @@ module.exports = class WorkerProject extends Project {
       tagContent,
       this.config.isMetaNewLine()
     )
-    return this.updateCardContent(task, content)
+    return await this.updateCardContent(task, content)
   }
 
   async removeTag(task, tag) {
@@ -458,18 +446,13 @@ module.exports = class WorkerProject extends Project {
       `\\${this.config.getTagPrefix()}${tag}\\s`,
       'g'
     )
-    console.log('removeTag regex:', tagContent)
+    logger.log('removeTag regex:', tagContent)
     const content = task.content.replace(tagContent, '')
-    return this.updateCardContent(task, content)
+    return await this.updateCardContent(task, content)
   }
 
   async moveTask(task, newList, newPos) {
-    return new Promise((resolve, reject) => {
-      this.repo.moveTask({task, newList, newPos}, (err) => {
-        if (err) return reject(err)
-        resolve()
-      })
-    })
+    return this.repo.moveTask({task, newList, newPos})
   }
 
   getFile(filePath) {
@@ -485,16 +468,9 @@ module.exports = class WorkerProject extends Project {
   }
 
   async updateCardContent(task, content) {
-    return new Promise((resolve, reject) => {
-      this.repo.modifyTaskFromContent(task, content, (err, file) => {
-        if (err) {
-          console.error(err)
-          reject(err)
-        }
-        this.emitUpdate()
-        resolve(file)
-      })
-    })
+    const file = await this.repo.modifyTaskFromContent(task, content)
+    this.emitUpdate()
+    return file
   }
 
   async snackBar({ message, type, duration }) {
@@ -550,7 +526,7 @@ module.exports = class WorkerProject extends Project {
     if (!path || !_path.parse(path).ext) path = this.getNewCardsFile({title})
     path = this.getFullPath(path)
 
-    const { isFile, isDirectory } = fileGateway.preparePathForWriting(path)
+    const { isFile, isDirectory } = await fileGateway.preparePathForWriting(path)
     
     if (!template) template = this.getNewCardTemplate(path, isFile)
 
@@ -574,10 +550,10 @@ module.exports = class WorkerProject extends Project {
   }
 
   async addCardToFile(opts) {
-    return this.addTaskToFile(opts)
+    return await this.addTaskToFile(opts)
   }
   
-  async addTaskToFile({path, list = this.config.getDefaultList(), content, tags = [], contexts = [], meta = [], useCardTemplate = false}) {
+  async addTaskToFile({path, list = this.config?.getDefaultList(), content, tags = [], contexts = [], meta = [], useCardTemplate = false}) {
     const pluginMods = await this.pluginManager.onBeforeAddTask({path, list, meta, tags, contexts, content, useCardTemplate})
     path = pluginMods.path
     content = pluginMods.content
@@ -596,12 +572,7 @@ module.exports = class WorkerProject extends Project {
     content = this.addContextsToContent(contexts, content)
     content = this.addMetaToContent(meta, content)
 
-    return new Promise((resolve, reject) => {
-      this.repo.addTaskToFile(filePath, list, content, (err, file, task) => {
-        if (err) return reject(err)
-        resolve({ file, task })
-      })
-    })
+    return await this.repo.addTaskToFile(filePath, list, content)
   }
 
   addMetaToContent(meta, content) {
@@ -655,23 +626,12 @@ module.exports = class WorkerProject extends Project {
   }
 
   async deleteTask(task) {
-    return new Promise((resolve, reject) => {
-      this.repo.deleteTask(task, async (err) => {
-        if (err) return reject(err)
-        await this.pluginManager.onAfterDeleteTask(task)
-        resolve()
-      })
-    })
+      await this.repo.deleteTask(task)
+      await this.pluginManager.onAfterDeleteTask(task)
   }
 
   async deleteTasks(tasks) {
-    return new Promise((resolve, reject) => {
-      this.repo.deleteTasks(tasks, async (err) => {
-        if (err) return reject(err)
-        resolve()
-      })
-    })
-  
+    await this.repo.deleteTasks(tasks)
   }
 
   setFilter(filter) {
@@ -820,19 +780,19 @@ module.exports = class WorkerProject extends Project {
     }
 
     try {
-      console.log('actionFunction:', actionFunction)
+      logger.log('actionFunction:', actionFunction)
       const func = new Function(`return ${actionFunction}`)()
       func.apply(actionThis)
     } catch (e) {
-      console.error(e)
-      console.log('action:', actionFunction)
-      console.log('this:', actionThis)
+      logger.error(e)
+      logger.log('action:', actionFunction)
+      logger.log('this:', actionThis)
     }
   }
-  performBoardAction(action, task) {
+  async performBoardAction(action, task) {
     if (task) task = this.repo.getTask(task.id)
     if (action && action.plugin)
-      return this.pluginManager.performBoardAction(action, task)
+      return await this.pluginManager.performBoardAction(action, task)
     const actions = {
       filter: (filter) => {
         this.setFilter(filter)
@@ -850,7 +810,7 @@ module.exports = class WorkerProject extends Project {
         if (cc) params.push(`cc=${encodeURIComponent(cc)}`)
         if (bcc) params.push(`bcc=${encodeURIComponent(bcc)}`)
         const url = `mailto:${to}?${params.join('&')}`
-        console.log('opening email with:', url)
+        logger.log('opening email with:', url)
         this.openUrl(url)
       },
       copy: (content, message) => {
@@ -865,16 +825,16 @@ module.exports = class WorkerProject extends Project {
     try {
       actionFunction.apply(actionThis)
     } catch (err) {
-      console.error(err)
-      console.log('action:', actionFunction)
-      console.log('this:', actionThis)
+      logger.error(err)
+      logger.log('action:', actionFunction)
+      logger.log('this:', actionThis)
     }
   }
 
   exec(cmd) {
     return new Promise((resolve, reject) => {
       exec(cmd, (error, stdout, stderr) => {
-        if (stderr) console.warn('cmd stderr:', stderr)
+        if (stderr) logger.warn('cmd stderr:', stderr)
         if (error) return reject(error)
         resolve(stdout)
       })
@@ -889,16 +849,9 @@ module.exports = class WorkerProject extends Project {
     return this.pluginManager.uninstallPlugin(name)
   }
 
-  refresh() {
-    return new Promise((resolve, reject) => {
-      this.repo.refresh((err) => {
-        if (err) return reject(err)
-        ;(async () => {
-          await this.pluginManager.reloadPlugins()
-          resolve()
-        })()
-      })
-    })
+  async refresh() {
+    await this.repo.refresh()
+    await this.pluginManager.reloadPlugins()
   }
 
   renderMarkdown(content, filePath) {