imdone-core 1.53.9 → 1.53.11

package/.imdoneignore

@@ -2,6 +2,7 @@ coverage
 .nyc_output
 test/repos
 test/files
+test/file-spec.js
 __tests__
 test-big-file.md
 tmp

package/lib/adapters/markdown.js

@@ -138,6 +138,7 @@ function resolveFileUrl(src, filePath) {
   const srcDir = dirname(filePath);
   const srcPath = resolve(srcDir, src) // filePath ? path.join(filePath, src) : path.resolve(src);
   const srcUrl = pathToFileURL(srcPath);
+  if (src.endsWith('/')) return srcUrl + '/';
 
   return srcUrl;
 

package/lib/adapters/parsers/content-transformer.js

@@ -0,0 +1,34 @@
+const template = require('lodash.template')
+
+module.exports = {
+  format,
+}
+
+function removeDisplayComments(description) {
+  return description.replace(/<!--\s*\[([\s\S]*?)\]\s*-->/g, '$1')
+}
+
+function format(content, data, mustache) {
+  const opts = { interpolate: /(?<![`\\])\${([\s\S]+?)}/g }
+
+  if (mustache) content = removeDisplayComments(content)
+
+  try {
+    content = template(content, opts)(data)
+  } catch (e) {
+    console.error(e)
+    // content = content.replace(opts.interpolate, `~~\${${e}}~~`)
+  }
+
+  if (mustache) {
+    const opts = { interpolate: /(?<!`){{([\s\S]+?)}}/g }
+    try {
+      content = template(content, opts)(data)
+    } catch (e) {
+      console.error(e)
+      content = content.replace(opts.interpolate, `~~{{${e}}}~~`)
+    }
+  }
+
+  return content
+}

package/lib/card.js

@@ -9,16 +9,12 @@ const _get = require('lodash.get')
 const eol = require('eol')
 const allEmoji = require('markdown-it-emoji/lib/data/full.json')
 const { getFunctionSignature } = require('./adapters/parsers/function-parser')
-
+const { format } = require('./adapters/parsers/content-transformer')
 const { removeMD } = require('./adapters/markdown')
 
 const CONTENT_TOKEN = '__CONTENT__'
 const lf = String(eol.lf)
 
-function removeDisplayComments(description) {
-  return description.replace(/<!--\s*\[([\s\S]*?)\]\s*-->/g, '$1')
-}
-
 module.exports = function newCard(task, _project, dontParse) {
   const project = _project
   const pluginManager = _project && _project.pluginManager
@@ -240,27 +236,7 @@ module.exports = function newCard(task, _project, dontParse) {
     format(content, mustache) {
       const projectData = project ? { ...project.data } : {}
       const data = { ...this.data, ...projectData }
-
-      const opts = { interpolate: /(?<![`\\])\${([\s\S]+?)}/g }
-
-      if (mustache) content = removeDisplayComments(content)
-
-      try {
-        content = template(content, opts)(data)
-      } catch (e) {
-        content = content.replace(opts.interpolate, `~~\${${e}}~~`)
-      }
-
-      if (mustache) {
-        const opts = { interpolate: /(?<!`){{([\s\S]+?)}}/g }
-        try {
-          content = template(content, opts)(data)
-        } catch (e) {
-          content = content.replace(opts.interpolate, `~~{{${e}}}~~`)
-        }
-      }
-
-      return content
+      return format(content, data, mustache)
     }
 
     getCardMarkdown() {

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

@@ -13,9 +13,9 @@ module.exports = class DefaultBoardActionsPlugin extends Plugin {
         title: 'Duplicate card',
         keys: ['shift+d'],
         icon: 'clone',
-        action: (task) => {
+        action: async (task) => {
           const timestamp = project.isoDateWithOffset
-          project.newCard({
+          await project.newCard({
             list: project.config.getDefaultList(),
             path: task.relPath,
             template: task.content.replace(/(\screated:).*(\s)/, `$1${timestamp}$2`),
@@ -40,6 +40,14 @@ module.exports = class DefaultBoardActionsPlugin extends Plugin {
           return project.copyToClipboard(title, `"${title}" copied to clipboard`)
         },
       },
+      {
+        title: `Open in ${isWindows ? 'Explorer' : 'Finder'}`,
+        keys: ['alt+shift+o'],
+        icon: "folder",
+        async action () {
+          await project.openPath(project.path)
+        }
+      }  
     ]
   }
   

package/lib/plugins/plugin-manager.js

@@ -22,7 +22,6 @@ module.exports = class PluginManager extends Emitter {
     this.pluginsMap = {}
     this.pluginPath = _path.join(project.path, '.imdone', 'plugins')
     this.onDevChange = debounce(this.onDevChange.bind(this), 1000)
-    this.loadPlugins()
   }
 
   async startDevMode() {

package/lib/project.js

@@ -18,6 +18,7 @@ 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')
 
 function calculateTotals(lists) {
   const totals = {}
@@ -51,24 +52,31 @@ module.exports = class WorkerProject extends Project {
     this.innerFilter = ''
     this.fileGateway = fileGateway
     this._updatedAt = undefined
+    this.data = {}
+    this.dataKeys = []
   }
 
   init(cb) {
-    this.repo.project = this
-
-    this.pluginManager = new PluginManager(this)
-    this.pluginManager.on('plugin-installed', () => this.emitUpdate())
-    this.pluginManager.on('plugin-uninstalled', () => this.emitUpdate())
-    this.pluginManager.on('plugins-reloaded', () => this.emitUpdate())
-
-    EVENTS.forEach((event) => {
-      this.repo.on(event, (data) => onChange(this, event, data))
-    })
-
-    this.repo.on('task.found', (task) => this.pluginManager.onTaskFound(task))
+    const promise = new Promise(async (resolve, reject) => {
+      this.repo.project = this
+
+      this.pluginManager = new PluginManager(this)
+      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 = 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))
 
-    const promise = new Promise((resolve, reject) => {
-      this.repo.init((err, files) => {
+      this.repo.init(async (err, files) => {
         if (err) {
           if (cb) cb(err)
           else reject(err)
@@ -497,13 +505,16 @@ module.exports = class WorkerProject extends Project {
     * @param {String} opts.comments - The comments to add to the new card
     * @param {Boolean} opts.emit - Whether to emit the new card event 
   */
-  newCard({ list, path, template, title, comments, emit = true }) {
+  async newCard({ list, path, template, title, comments, emit = true }) {
     if (!path || !_path.parse(path).ext) path = this.getNewCardsFile({title})
     path = this.getFullPath(path)
 
     const { isFile, isDirectory } = fileGateway.preparePathForWriting(path)
     
     if (!template) template = this.getNewCardTemplate(path, isFile)
+
+    const boardData = await this.pluginManager.getBoardProperties();
+    template = format(template, boardData)
     
     if (comments) template = Task.addToLastCommentInContent(template, comments, this.config.isMetaNewLine())
 
@@ -532,10 +543,14 @@ module.exports = class WorkerProject extends Project {
     meta = pluginMods.meta
     tags = pluginMods.tags
     contexts = pluginMods.contexts
-    const cardData = this.newCard({list, path, title: eol.split(content)[0], emit: false})
+    const cardData = await this.newCard({list, path, title: eol.split(content)[0], emit: false})
     const filePath = cardData.path
     if (useCardTemplate) content += cardData.template
 
+    const boardData = await this.pluginManager.getBoardProperties();
+    const data = { ...boardData, ...cardData}
+    content = format(content, data)
+
     content = this.addTagsToContent(tags, content)
     content = this.addContextsToContent(contexts, content)
     content = this.addMetaToContent(meta, content)
@@ -733,11 +748,11 @@ module.exports = class WorkerProject extends Project {
       filter: (filter) => {
         this.setFilter(filter)
       },
-      newCard: (list, path) => {
+      newCard: async (list, path) => {
         if (task.source.lang !== 'text')
           return this.alert('Unable to append cards in code files.')
         if (path) path = this.getFullPath(path)
-        this.newCard({ list, path })
+        await this.newCard({ list, path })
       },
       alert: (msg) => {
         this.toast({ message: msg })

package/package.json

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