imdone-core 1.41.0 → 1.42.0

package/lib/adapters/date-time.js

@@ -1,11 +1,20 @@
 const moment = require('moment');
-module.exports = {
-  getIsoDateWithOffset: function ({date, config}) {
-    const momentDate = moment(date);
-    if (momentDate.isDST() && config && config.noDST) {
-      const offset = momentDate.utcOffset();
-      momentDate.utcOffset(offset - 60);
-    }
-    return momentDate.format();
+let innerNoDST = false;
+
+function setNoDST(noDST) {
+  innerNoDST = noDST;
+}
+
+function getIsoDateWithOffset (date) {
+  const momentDate = moment(date);
+  if (momentDate.isDST() && innerNoDST) {
+    const offset = momentDate.utcOffset();
+    momentDate.utcOffset(offset - 60);
   }
+  return momentDate.format();
+}
+
+module.exports = {
+  setNoDST,
+  getIsoDateWithOffset
 }

package/lib/adapters/parsers/DateLanguageParser.js

@@ -0,0 +1,10 @@
+const chrono = require('chrono-node')
+
+module.exports = {
+  replaceDateLanguage(text, asDate) {
+    return text.replace(/\(?\${(.*?)}\)?/g, (match, p1) => {
+      const date = chrono.parseDate(p1)
+      return date ? date.toISOString() : p1
+    })
+  }
+}

package/lib/adapters/yaml.js

@@ -0,0 +1,6 @@
+YAML = require('js-yaml'),
+
+module.exports = {
+  dumpYAML: YAML.dump,
+  loadYAML: YAML.load,
+}

package/lib/card.js

@@ -117,7 +117,7 @@ module.exports = function newCard(task, _project, dontParse) {
 
     get defaultData() {
       return {
-        timestamp: getIsoDateWithOffset({config: project.config}),
+        timestamp: getIsoDateWithOffset(),
         ..._pick(
           this,
           ...['beforeText',

package/lib/cli/ProjectConfigFactory.js

@@ -1,5 +1,5 @@
 const DefaultApplicationContext = require('./adapters/ApplicationContext')
-const { loadYAML, dumpYAML } = require('../tools')
+const { loadYAML, dumpYAML } = require('../adapters/yaml')
 const Config = require('../config')
 const { readFile, mkdir, cp, rm, writeFile, access } = require('fs').promises
 const { resolve } = path = require('path')

package/lib/config.js

@@ -94,10 +94,6 @@ class Config {
     return _get(this, 'settings.cards.addCompletedMeta', false)
   }
 
-  get noDST() {
-    return _get(this, 'settings.noDST', false)
-  }
-
   get markdownOnly() {
     return this.settings.markdownOnly
   }

package/lib/default-settings.js

@@ -1,13 +1,11 @@
-const { loadYAML } = require("./tools")
+const { loadYAML } = require('./adapters/yaml')
 
 const defaultSettingsString = `openIn: default #override
-editorTheme: blackboard
 journalType: New File
 journalPath: imdone-tasks #override
 appendNewCardsTo: imdone-tasks.md
 newCardSyntax: HASHTAG #override
 replaceSpacesWith: '-' #override
-noDST: false
 plugins:
   devMode: false
 cards:
@@ -31,7 +29,6 @@ cards:
   addNewCardsToTop: true #override
   showTagsAndMeta: true #override
 journalTemplate: #override
-theme: 'dark'
 markdownOnly: false #override
 `
 module.exports = loadYAML(defaultSettingsString)

package/lib/file.js

@@ -149,7 +149,7 @@ File.addCompleted = function ({ task, content, config }) {
   if (task.list !== doneList) return content
   if (task.completed || task.meta.completed) return content
   if (content.includes(`completed${config.getMetaSep()}`)) return content
-  const now = getIsoDateWithOffset({ config })
+  const now = getIsoDateWithOffset()
   content = task.addToLastCommentInContent(
     content,
     `completed${config.getMetaSep()}${now}`,
@@ -167,7 +167,7 @@ File.parseDueDate = function (config, text) {
     try {
       const due = chrono.parseDate(dueMatch, new Date(), {forwardDate: true})
       if (!due) return dueMatch
-      dueString = getIsoDateWithOffset({date: due, config})
+      dueString = getIsoDateWithOffset(due)
       return `${p1.toLowerCase()}${config.getMetaSep()}${dueString}`
     } catch (e) {
       console.log(`Unable to parse due date for ${text}`)
@@ -788,9 +788,9 @@ const trimBlankLines = File.trimBlankLines = function (content, isCodeFile) {
 }
 
 File.prototype.modifyDescription = function (task, config) {
-  // DOING This should be split out by type (code, markdown, etc)
+  // TODO This should be split out by type (code, markdown, etc)
   // #urgent
-  // <!-- order:-10 -->
+  // <!-- order:-70 -->
   const taskStart = this.getLinePos(task.line)
   const descStart = this.getLinePos(task.line + 1)
   const contentWithTask = this.getContent().substring(taskStart)

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

@@ -22,7 +22,9 @@ var _path = require('path'),
   _ignore = require('ignore'),
   fastSort = require('fast-sort/dist/sort.js'),
   Repository = require('../repository'),
-  buildMigrateConfig = require('../migrate-config')
+  buildMigrateConfig = require('../migrate-config'),
+  { loadYAML, dumpYAML } = require('../adapters/yaml')
+
 
 module.exports = mixin
 
@@ -196,7 +198,7 @@ function mixin(repo, fs = require('fs')) {
       delete data.cardPropertiesFunction
       delete data.path
       if (data.lists) data.lists.forEach((list) => delete list.tasks)
-      var yaml = tools.dumpYAML(data)
+      var yaml = dumpYAML(data)
       if (exists) {
         fs.writeFile(file, yaml, _cb)
       } else {
@@ -277,7 +279,7 @@ function mixin(repo, fs = require('fs')) {
     const configData = fs.readFileSync(filePath, 'utf-8')
     let configLike = {}
     try {
-      configLike = tools.loadYAML(configData.toString())
+      configLike = loadYAML(configData.toString())
       Repository.trimFunctionsInSettings(configLike)
       if (configLike.exclude) delete configLike.exclude
       if (configLike.watcher) delete configLike.watcher

package/lib/project.js

@@ -443,34 +443,27 @@ module.exports = class WorkerProject extends Project {
     const filePath = cardData.path
     if (addTemplate) content += cardData.template
 
-    content = this.addOrderMetaToContent(content, list)
     content = this.addTagsToContent(tags, content)
     content = this.addContextsToContent(contexts, content)
     content = this.addMetaToContent(meta, content)
 
     return new Promise((resolve, reject) => {
-      this.repo.addTaskToFile(filePath, list, content, (err, file) => {
+      this.repo.addTaskToFile(filePath, list, content, (err, file, task) => {
         if (err) return reject(err)
-        resolve(file)
+
+        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 })
+        })
       })
     })
   }
 
-  addOrderMetaToContent(content, _list) {
-    const list = this.lists.find(l => l.name === _list)
-    let order
-    if (this.config.isAddNewCardsToTop()) {
-      order = list.tasks.length
-        ? list.tasks[0].order - 1
-        : 0
-    } else {
-      order = list.tasks.length
-        ? list.tasks[list.tasks.length - 1].order + 1
-        : 0
-    }
-    return Task.addToLastCommentInContent(content, `order${this.config.getMetaSep()}${order}`, this.config.isMetaNewLine())
-  }
-
   addMetaToContent(meta, content) {
     if (meta && meta.length > 0) {
       let metaContent = ''

package/lib/repository.js

@@ -36,7 +36,8 @@ var _get = require('lodash.get'),
   JSONfns = require('json-fns'),
   functionRegex = require('function-regex'),
   Task = require('./task'),
-  newCard = require('./card')
+  newCard = require('./card'),
+  { replaceDateLanguage } = require('./adapters/parsers/DateLanguageParser')
 
 const appContext = require('./context/ApplicationContext')
 
@@ -1115,8 +1116,13 @@ Repository.prototype.appendTask = function({file, content, list}, cb) {
     appendContent = `${taskPrefix}#${list}${inLineOrder} ${text}${eol.lf}${taskContent}`
   }
   appendContent = File.trimBlankLines(appendContent)
-  file.setContent(`${fileContent}${sep}${appendContent}${"\n".repeat(2)}`)
-  this.writeAndExtract(file, true, cb)
+  fileContent = `${fileContent}${sep}`
+  file.setContent(`${fileContent}${appendContent}${"\n".repeat(2)}`)
+  this.writeAndExtract(file, true, (err, file) => {
+    if (err) return cb(err)
+    const task = file.getTasks().find(task => task.text === text && task.list === list)
+    cb(null, file, task)
+  })
 }
 
 Repository.prototype.addTaskToFile = function (filePath, list, content, cb) {
@@ -1610,7 +1616,7 @@ Repository.parseSortFromMongoQuery = function (mongoQuery) {
 }
 
 Repository.sortByQuery = function (tasks, queryString = '') {
-  queryString = tools.replaceDateLanguage(queryString)
+  queryString = replaceDateLanguage(queryString)
   let { sort } = Repository.parseSortFromQueryString(queryString)
   if (!sort || sort.length === 0) sort = DEFAULT_SORT
   fastSort(tasks).by(sort)
@@ -1619,7 +1625,7 @@ Repository.sortByQuery = function (tasks, queryString = '') {
 Repository.query = function (tasks, queryString = '') {
   let query
   let sort
-  queryString = tools.replaceDateLanguage(queryString)
+  queryString = replaceDateLanguage(queryString)
   const resp = Repository.parseSortFromQueryString(queryString)
   try {
     query = monquery(resp.queryString)

package/lib/tools.js

@@ -5,11 +5,9 @@ var _isFunction = require('lodash.isfunction'),
   crypto = require('crypto'),
   _path = require('path'),
   markdown = require('markdown-it')().use(require('markdown-it-checkbox')),
-  YAML = require('js-yaml'),
   fastSort = require('fast-sort/dist/sort.js'),
   eol = require('eol'),
   max_bytes = 512
-const chrono = require('chrono-node')
 
 function mkdirp(fs, path, mode, cb, position) {
   if (_isFunction(mode)) {
@@ -255,15 +253,7 @@ module.exports = {
       }
     }
   },
-  replaceDateLanguage(text, asDate) {
-    return text.replace(/\(?\${(.*?)}\)?/g, (match, p1) => {
-      const date = chrono.parseDate(p1)
-      return date ? date.toISOString() : p1
-    })
-  },
   mkdirp: mkdirp,
-  dumpYAML: YAML.dump,
-  loadYAML: YAML.load,
   sortTasks(tasks) {
     return fastSort(tasks).asc([u => u.order, u => u.text])
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.41.0",
+  "version": "1.42.0",
   "description": "imdone-core",
   "main": "index.js",
   "bin": {