imdone-core 1.54.6 → 1.54.8

package/cli.js

@@ -5,9 +5,11 @@ const ora = require('ora')
 const chalk = require('chalk')
 const package = require('./package.json')
 const { createFileSystemProject } = require('./lib/project-factory.js')
+const { load } = require('./lib/adapters/storage/config.js')
 // const { log } = hideLogs()
 const spinner = ora('Loading unicorns')
 
+
 setTimeout(() => {
 	spinner.color = 'yellow';
 	spinner.text = 'Loading rainbows';
@@ -23,13 +25,17 @@ const mainCmd = program
 mainCmd
 .command('action <pluginName> <actionTitle>')
 .option('-t, --task <task>', 'Task filePath:line')
+.option('-w, --working-dir <workingDir>', 'Working directory')
+.option('-c, --config <config>', 'Config file path')
 .description('Run a board action')
 .action(async function (plugin, title, options) {
   spinner.start()
   const action = {plugin, title}
   const [filePath, line] = options.task ? options.task.split(':') : []
   try {
-    const project = createFileSystemProject({path:  process.env.PWD})
+    const path = options.workingDir || process.env.PWD
+    const config = options.config && await load(options.config)
+    const project = createFileSystemProject({path, config})
     await project.init()
     await project.toImdoneJSON()
     chalk.bgGreen('Project loaded')

package/lib/adapters/storage/config.js

@@ -9,12 +9,11 @@ module.exports = {
   load,
   save,
   loadForFilePath,
-  findImdonePath,
+  findImdonePath
 }
 
-async function load(projectPath) {
-  const configPath = _path.join(projectPath, CONFIG_FILE_YML)
-  const configLike = await getYamlConfig(configPath)
+async function load(projectPath, configPath = _path.join(projectPath, CONFIG_FILE_YML)) {
+  const configLike = await loadYamlConfig(configPath)
   return configLike && new Config(configLike)
 }
 
@@ -28,7 +27,7 @@ async function loadForFilePath(filePath) {
   return load(projectPath)
 }
 
-async function getYamlConfig(filePath) {
+async function loadYamlConfig(filePath) {
   if (!(await exists(filePath))) return
   const configData = await readFile(filePath, 'utf-8')
   let configLike = {}

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

@@ -252,7 +252,7 @@ function mixin(repo, fs = require('fs')) {
     cb = tools.cb(cb)
     repo.loadIgnore()
     // new
-    let configData = this.getYamlConfig() || {}
+    const configData =  (!repo.config || repo.config.dirty) ? this.getYamlConfig() : repo.config || {}
     repo.updateConfig(configData, cb)
   }
 

package/lib/plugins/default-board-properties-plugin.js

@@ -23,7 +23,7 @@ module.exports = class DefaultBoardPropertiesPlugin extends Plugin {
     this.templates = await this.getTemplates()
   }
 
-  getBoardProperties() {
+  async getBoardProperties() {
     const templates = flattenObject(this.templates);
     const clearFilterURL = this.getFilterURL('');
     const getFilterURL = (filter) => this.getFilterURL(filter);

package/lib/plugins/extension-plugin.js

@@ -38,8 +38,8 @@ module.exports = class ExtensionPlugin extends Plugin {
     return this.cardPropertiesFunction(task)
   }
 
-  getBoardProperties() {
-    return this.boardPropertiesFunction()
+  async getBoardProperties() {
+    return await this.boardPropertiesFunction()
   }
 
   getCardActions(task) {

package/lib/plugins/plugin-manager.js

@@ -321,11 +321,15 @@ module.exports = class PluginManager extends Emitter {
     return cardProps
   }
 
-  getBoardProperties() {
+  // READY Make getBoardProperties async
+  // <!--
+  // order:-10
+  // -->
+  async getBoardProperties() {
     let boardProps = {}
-    this.eachPlugin(({ pluginInstance }) => {
+    await this.eachPluginAsync(async ({ pluginInstance }) => {
       try {
-        const pluginProps = pluginInstance.getBoardProperties ? pluginInstance.getBoardProperties() : {}
+        const pluginProps = pluginInstance.getBoardProperties ? await pluginInstance.getBoardProperties() : {}
         boardProps = { ...boardProps, ...pluginProps }
       } catch (e) {
         this.pluginError('getBoardProperties', pluginInstance, e)

package/lib/project-factory.js

@@ -5,7 +5,7 @@ const ProjectContext = require('./ProjectContext')
 const Project = require('./project')
 const context = require('./context/ApplicationContext')
 
-function createWatchedFSProject({path, config, repo = watchedFsStore(new Repository(path, config))}) {
+function createFileSystemProject({path, config, repo = fsStore(new Repository(path, config))}) {
     context().repo = repo
     context().projectContext = new ProjectContext(repo)
     context().project = new Project(repo)
@@ -13,19 +13,9 @@ function createWatchedFSProject({path, config, repo = watchedFsStore(new Reposit
 }
 
 module.exports = {
-    createWatchedFileSystemProject: function(path) {
-        if (typeof path === 'object' && path.confg) return createWatchedFSProject(path)
-        const repo = watchedFsStore(new Repository(path))
-        context().repo = repo
-        context().projectContext = new ProjectContext(repo)
-        context().project = new Project(repo)
-        return context().project
+    createWatchedFileSystemProject: function({path, config, repo = watchedFsStore(new Repository(path, config))}) {
+        return createFileSystemProject({path, config, repo})
     },
 
-    createFileSystemProject: function ({path, config, repo = fsStore(new Repository(path, config))}) {
-        context().repo = repo
-        context().projectContext = new ProjectContext(repo)
-        context().project = new Project(repo)
-        return context().project
-    }
+    createFileSystemProject
 }

package/lib/project.js

@@ -65,7 +65,7 @@ module.exports = class WorkerProject extends Project {
       this.pluginManager.on('plugin-uninstalled', () => this.emitUpdate())
       this.pluginManager.on('plugins-reloaded', () => this.emitUpdate())
       await this.pluginManager.loadPlugins()
-      this.data = this.pluginManager.getBoardProperties()
+      this.data = await this.pluginManager.getBoardProperties()
       this.dataKeys = this.getDataKeys(this.data)
   
       console.log('data', this.data)
@@ -154,7 +154,7 @@ module.exports = class WorkerProject extends Project {
     console.timeEnd('plugin onBeforeBoardUpdate time')
 
     console.time('getBoardProperties time')
-    const data = this.data = this.pluginManager.getBoardProperties()
+    const data = this.data = await this.pluginManager.getBoardProperties()
     console.timeEnd('getBoardProperties time')
     
     console.time('getDataKeys time')

package/lib/repository.js

@@ -80,6 +80,7 @@ Repository.prototype.init = function (cb) {
 
 Repository.prototype.refresh = function (cb) {
   cb = tools.cb(cb)
+  this.config.dirty = true
   this.loadConfig((err, config) => {
     if (err) {
       return cb(err)

package/lib/task.js

@@ -12,7 +12,6 @@ var _clone = require('lodash.clone'),
   lineEnd = String(eol.auto),
   fastSort = require('fast-sort/dist/sort.js'),
   { escapeRegExp } = require('./tools'),
-  cheerio = require('cheerio'),
   { extractWikilinkTopics } = require('./adapters/markdown');
 
 const { 
@@ -747,14 +746,17 @@ Task.prototype.getText = function (opts, text) {
 }
 
 Task.prototype.getChecksFromHtml = function (html) {
-  let $ = cheerio.load(html)
-  let checks = $('.task-description').find("input[type='checkbox']")
-  const result = []
-  checks.each(function () {
-    result.push($(this).is(':checked'))
-  })
-  return result
-}
+  const result = [];
+  const checkboxRegex = /<input[^>]*type=['"]checkbox['"][^>]*>/gi;
+  const checkedRegex = /checked(?:=['"]?checked['"]?)?/i;
+
+  let match;
+  while ((match = checkboxRegex.exec(html)) !== null) {
+    result.push(checkedRegex.test(match[0]));
+  }
+
+  return result;
+};
 
 /**
  * Description

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.54.6",
+  "version": "1.54.8",
   "description": "imdone-core",
   "main": "index.js",
   "bin": {
@@ -48,7 +48,6 @@
     "async": "~1.5.0",
     "chalk": "^4.1.2",
     "checksum": "^0.1.1",
-    "cheerio": "^1.0.0-rc.10",
     "chrono-node": "^2.6.4",
     "command-exists": "^1.2.9",
     "commander": "^11.1.0",
@@ -60,7 +59,7 @@
     "find-up": "^5.0.0",
     "gray-matter": "^4.0.2",
     "ignore": "^5.2.0",
-    "imdone-api": "^1.53.0",
+    "imdone-api": "^1.54.0",
     "isbinaryfile": "^3.0.2",
     "js-yaml": "^3.14.1",
     "json-fns": "^1.0.0",
@@ -104,7 +103,7 @@
     "readdirp": "^3.6.0",
     "remove-markdown": "^0.3.0",
     "rimraf": "^3.0.2",
-    "sane": "^4.1.0",
+    "sane": "^5.0.1",
     "sanitize-filename": "^1.6.3",
     "sift": "^17.1.3",
     "simple-git": "^3.19.1",