imdone-core 2.0.13 → 2.0.14

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

@@ -20,11 +20,10 @@ import _ignore from 'ignore'
 import { sort } from 'fast-sort'
 import { buildMigrateConfig } from '../migrate-config.js'
 import { loadYAML, dumpYAML } from '../adapters/yaml.js';
-import realFs, { readFileSync } from 'fs'
+import realFs from 'fs'
 import { preparePathForWriting, readFile, writeFile, stat, lstat, unlink } from '../adapters/file-gateway.js'
 
 const {
-  CONFIG_FILE,
   CONFIG_FILE_YML,
   ASYNC_LIMIT,
   DEFAULT_IGNORE_PATHS,
@@ -198,11 +197,6 @@ export function fileSystemStoreMixin(repo, fs = realFs) {
     return repo.config
   }
 
-  // READY Refactor loadConfig to use async/await
-  // #esm-migration
-  // <!--
-  // order:-255
-  // -->
   repo.loadConfig = async function (cb) {
     // BACKLOG If a config is bad move it to config.json.bak and save a new one with defaults gh:2 id:9 +enhancement +standup +chore
     // <!--
@@ -217,7 +211,7 @@ export function fileSystemStoreMixin(repo, fs = realFs) {
   }
 
   repo.getConfigFile = function () {
-    return repo.getFullPath(CONFIG_FILE)
+    return repo.getFullPath(CONFIG_FILE_YML)
   }
 
   repo.getYamlConfig = async function () {

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

@@ -151,8 +151,11 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
         atomic: true,
         ignoreInitial: true,
         ignored: (file) => {
-          const ignored = !repo.shouldInclude(file)
-          if (ignored) logger.log('Ignoring file:', file)
+          if (file === repo.path) return false
+          const relPath = repo.getRelativePath(file)
+          const ignored = !repo.shouldInclude(relPath)
+          if (ignored) logger.log('Ignoring file:', relPath)
+
           return ignored
         }
       }).on('error', (err) => {
@@ -196,6 +199,11 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
             stat.mtime
           )
           if (!path || stat.isDirectory()) return
+          
+          const relPath = repo.getRelativePath(path)
+          if (!initializing && _isImdoneConfig(relPath)) onConfigChange(relPath)
+          if (!initializing && _isImdoneIgnore(relPath)) onIgnoreChange(relPath)
+
           var file = repo.getFile(path) || path
           const isFile = File.isFile(file)
           // BACKLOG ## Handle the case where the file is not in the repo
@@ -207,8 +215,6 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
             // logger.log("File update already applied.  Change ignored.")
             return
           }
-          if (_isImdoneConfig(path)) return onConfigChange(path)
-          if (_isImdoneIgnore(path)) return onIgnoreChange(path)
 
           const ok = await repo.fileOK((file && file.path) || path)
           if (!ok) return

package/lib/repository.js

@@ -634,12 +634,12 @@ export class Repository extends Emitter {
   shouldInclude (relPath) {
     relPath = this.getRelativePath(relPath)
     let include = true
-    if (this.config.markdownOnly && relPath) {
-      include = File.isMarkdown(relPath)
-    }
     if (this.ignore) {
       try {
-        include = include && (relPath === '' || !this.ignore.ignores(relPath))
+        include = relPath && !this.ignore.ignores(relPath)
+        if (this.config.markdownOnly && include && relPath) {
+          include = File.isMarkdown(relPath)
+        }
       } catch (e) {
         logger.error(
           `Failed to check ignore status for dir: [${relPath}] in: [${this.path}]. It will be included.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "imdone-core",
   "repository": {
     "type": "git",