imdone-core 2.0.12 → 2.0.14

package/.imdoneignore

@@ -11,3 +11,4 @@ imdone-export.json
 .imdone/templates
 .imdone
 notes/archive
+_lib

package/lib/config.js

@@ -141,6 +141,10 @@ export class Config {
     return this?.cards?.tagPrefix ?? '+'
   }
 
+  getCommentTagsOnly() {
+    return this?.cards?.commentTagsOnly ?? false
+  }
+
   getTaskPrefix() {
     return this?.cards?.taskPrefix ?? '##'
   }

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

@@ -18,6 +18,7 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
   const _init = repo.init
   let initializing = false
   let refreshing = false
+  let watcherPaused = false
 
   function ready() {
     return !initializing && !refreshing
@@ -30,6 +31,30 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
     }
   }
 
+  // Add function to pause the watcher
+  repo.pauseWatcher = async function() {
+    if (repo.watcher && !watcherPaused) {
+      logger.info('Pausing file watcher for:', repo.path)
+      await repo.watcher.close()
+      watcherPaused = true
+      repo.emit('watcher.paused')
+      return true
+    }
+    return false
+  }
+
+  // Add function to unpause the watcher
+  repo.unpauseWatcher = async function() {
+    if (watcherPaused) {
+      logger.info('Unpausing file watcher for:', repo.path)
+      await repo.initWatcher()
+      watcherPaused = false
+      repo.emit('watcher.resumed')
+      return true
+    }
+    return false
+  }
+
   // READY Refactor init to async/await
   // #esm-migration #important
   // <!--
@@ -69,7 +94,10 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
     refreshing = true
     try {
       const files = await _refresh.call(repo)
-      await repo.initWatcher()
+      // Only initialize watcher if it's not paused
+      if (!watcherPaused) {
+        await repo.initWatcher()
+      }
       refreshing = false
       return files
     } catch (err) {
@@ -108,6 +136,11 @@ export function watchedFileSystemStoreMixin(repo, fs = realFs) {
   // defer:2025-03-18
   // -->
   repo.initWatcher = async () => {
+    // Close existing watcher if it exists
+    if (repo.watcher) {
+      await repo.watcher.close()
+    }
+
     return new Promise(async (resolve, reject) => {
       logger.log('initializing watcher for:', repo.path)
       repo.watcher = chokidar.watch(repo.path, {
@@ -118,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) => {
@@ -163,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
@@ -174,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/lib/task.js

@@ -188,6 +188,10 @@ export class Task {
   getTagPrefix () {
     return this.config?.getTagPrefix()
   }
+
+  getCommentTagsOnly () {
+    return this.config?.getCommentTagsOnly()
+  }
   
   static addToLastCommentInContent (content, toAdd, newLine) {
     // BACKLOG respect padding of task prefix for list items
@@ -315,14 +319,16 @@ export class Task {
       'gmiu'
     )
   }
-  static getTags (text, prefix = '+') {
+  static getTags (text, prefix = '+', commentTagsOnly = false) {
     const tags = [];
     const codePositions = Task.getMarkdownCodePositions(text);
     const linkLabelPositions = Task.getMarkdownLinkLabelPositions(text);
+    const commentPositions = Task.getCommentPositions(text);
     let result;
     const re = Task.getTagRegexp(prefix);
 
     while ((result = re.exec(text)) !== null) {
+      if (commentTagsOnly && !Task.isResultInComment(commentPositions, result.index)) continue;
       if (Task.isResultInMarkdownCode(codePositions, result.index)) continue;
       if (Task.isResultInMarkdownLinkLabel(linkLabelPositions, result.index)) continue;
       const tag = result[2];
@@ -349,6 +355,22 @@ export class Task {
     return linkLabelPositions.some(pos => index >= pos.start && index < pos.end);
   };
 
+  static getCommentPositions (text) {
+    const positions = [];
+    const re = /<!--[\s\S]*?-->/g;
+    let match;
+
+    while ((match = re.exec(text)) !== null) {
+      positions.push({ start: match.index, end: re.lastIndex });
+    }
+
+    return positions;
+  }
+
+  static isResultInComment (commentPositions, index) {
+    return commentPositions.some(pos => index >= pos.start && index < pos.end);
+  }
+
   static ContextRegExp = new RegExp(
     `(^|\\s)@([${Task.AnyLanguageGroup}${Task.EmojiGroup}]+)`,
     'gmiu'
@@ -567,7 +589,7 @@ export class Task {
   }
 
   parseTodoTxt () {
-    this.tags = Task.getTags(this.getRawTextAndDescription(), this.getTagPrefix())
+    this.tags = Task.getTags(this.getRawTextAndDescription(), this.getTagPrefix(), this.getCommentTagsOnly())
     this.context = Task.getContext(this.getRawTextAndDescription())
     this.meta = Task.getMetaData(this.config, this)
   }

package/package.json

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

package/types/card.d.ts

@@ -158,6 +158,7 @@ export function newCard(task: any, _project: any, dontParse: any): {
         expand: boolean;
     };
     getTagPrefix(): any;
+    getCommentTagsOnly(): any;
     addToLastCommentInContent(content: any, toAdd: any, newLine: any): string;
     getCheckedData(): {
         pad: number;

package/types/config.d.ts

@@ -32,6 +32,7 @@ export class Config {
     getNewCardSyntax(): any;
     isMetaNewLine(): any;
     getTagPrefix(): any;
+    getCommentTagsOnly(): any;
     getTaskPrefix(): any;
     isAddCheckBoxTasks(): any;
     isAddCompletedMeta(): any;

package/types/file.d.ts

@@ -256,6 +256,7 @@ export class File extends Emitter<[never]> {
             expand: boolean;
         };
         getTagPrefix(): any;
+        getCommentTagsOnly(): any;
         addToLastCommentInContent(content: any, toAdd: any, newLine: any): string;
         getCheckedData(): {
             pad: number;

package/types/task.d.ts

@@ -18,12 +18,17 @@ export class Task {
     static AnyLanguageGroup: string;
     static EmojiGroup: string;
     static getTagRegexp(prefix?: string): RegExp;
-    static getTags(text: any, prefix?: string): string[];
+    static getTags(text: any, prefix?: string, commentTagsOnly?: boolean): string[];
     static getMarkdownLinkLabelPositions(text: any): {
         start: number;
         end: number;
     }[];
     static isResultInMarkdownLinkLabel(linkLabelPositions: any, index: any): any;
+    static getCommentPositions(text: any): {
+        start: number;
+        end: number;
+    }[];
+    static isResultInComment(commentPositions: any, index: any): any;
     static ContextRegExp: RegExp;
     static getContext(text: any): string[];
     static MetaRegExp: RegExp;
@@ -124,6 +129,7 @@ export class Task {
         expand: boolean;
     };
     getTagPrefix(): any;
+    getCommentTagsOnly(): any;
     addToLastCommentInContent(content: any, toAdd: any, newLine: any): string;
     getCheckedData(): {
         pad: number;