imdone-core 2.0.13 → 2.0.15

package/lib/config.js

@@ -145,6 +145,10 @@ export class Config {
     return this?.cards?.commentTagsOnly ?? false
   }
 
+  getCommentMetaOnly() {
+    return this?.cards?.commentMetaOnly ?? 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

@@ -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/plugins/persist-tags-plugin.js

@@ -12,7 +12,13 @@ export default class PersistTagsPlugin extends Plugin {
   }
 
   async onBoardUpdate() {
+    if (!this.persistTags) {
+      return
+    }
     await save(this.project.allTags.sort(), this.project.path)
   }
-  
+
+  get persistTags() {
+    return this.getSettings()?.persistTags ?? true
+  }
 }

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

@@ -339,59 +339,7 @@ export class Task {
     return tags;
   };
 
-  static getMarkdownLinkLabelPositions (text) {
-    const positions = [];
-    const re = /\[([^\]]+)\]\([^\)]+\)/g;
-    let match;
-
-    while ((match = re.exec(text)) !== null) {
-      positions.push({ start: match.index, end: re.lastIndex });
-    }
-
-    return positions;
-  };
-
-  static isResultInMarkdownLinkLabel (linkLabelPositions, index) {
-    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'
-  )
-
-  static getContext (text) {
-    const context = []
-    var codePositions = Task.getMarkdownCodePositions(text)
-    var result,
-      re = new RegExp(Task.ContextRegExp)
-
-    while ((result = re.exec(text)) !== null) {
-      if (Task.isResultInMarkdownCode(codePositions, result.index)) continue
-      const con = result[2]
-      if (!context.includes(con)) context.push(con)
-    }
-
-    return context
-  }
-
-  static MetaRegExp = new RegExp(
+    static MetaRegExp = new RegExp(
     `(^|\\s)([a-zA-Z-_]+?):(?!\\/\\/)([${Task.AnyLanguageGroup}${Task.EmojiGroup}]+)`,
     'gu'
   )
@@ -413,8 +361,15 @@ export class Task {
   }
 
   static parseMetaData (config, content) {
+    const commentMetaOnly = config.getCommentMetaOnly()
+    const commentPositions = Task.getCommentPositions(content);
     var meta = {}
     Task.eachMetaInContent(config, content, (result) => {
+      if (
+        commentMetaOnly 
+        && !Task.isResultInComment(commentPositions, result.index)
+      ) return;;
+      
       var key = result[2]
       var val = result[3]
       if (!meta[key]) meta[key] = []
@@ -425,8 +380,9 @@ export class Task {
   }
 
   static getMetaData (config, task) {
-    var text = Task.isTask(task) ? task.getRawTextAndDescription() : task
-    var meta = Task.parseMetaData(config, text)
+    const text = Task.isTask(task) ? task.getRawTextAndDescription() : task
+
+    const meta = Task.parseMetaData(config, text)
     Object.entries(meta).forEach(([key, val]) => {
       if (Task.DATE_META_KEYS.includes(key)) {
         try {
@@ -462,6 +418,60 @@ export class Task {
     )
   }
 
+  static getMarkdownLinkLabelPositions (text) {
+    const positions = [];
+    const re = /\[([^\]]+)\]\([^\)]+\)/g;
+    let match;
+
+    while ((match = re.exec(text)) !== null) {
+      positions.push({ start: match.index, end: re.lastIndex });
+    }
+
+    return positions;
+  };
+
+  static isResultInMarkdownLinkLabel (linkLabelPositions, index) {
+    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'
+  )
+
+  static getContext (text, commentTagsOnly = false) {
+    const context = []
+    const commentPositions = Task.getCommentPositions(text);
+    const codePositions = Task.getMarkdownCodePositions(text)
+    var result,
+      re = new RegExp(Task.ContextRegExp)
+
+    while ((result = re.exec(text)) !== null) {
+      if (commentTagsOnly && !Task.isResultInComment(commentPositions, result.index)) continue
+      if (Task.isResultInMarkdownCode(codePositions, result.index)) continue
+      const con = result[2]
+      if (!context.includes(con)) context.push(con)
+    }
+
+    return context
+  }
+
   static hasWindowsEOL (content) {
     return /\r\n|\r/.test(content)
   }
@@ -590,7 +600,7 @@ export class Task {
 
   parseTodoTxt () {
     this.tags = Task.getTags(this.getRawTextAndDescription(), this.getTagPrefix(), this.getCommentTagsOnly())
-    this.context = Task.getContext(this.getRawTextAndDescription())
+    this.context = Task.getContext(this.getRawTextAndDescription(), this.getCommentTagsOnly())
     this.meta = Task.getMetaData(this.config, this)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "imdone-core",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "async-es": "^3.2.6",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
-    "chrono-node": "^2.7.8",
+    "chrono-node": "~2.7.8",
     "commander": "^13.1.0",
     "debug": ">=4.3.4",
     "eol": "^0.9.1",
@@ -101,8 +101,8 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.13",
-    "@vitest/coverage-istanbul": "^3.0.8",
-    "@vitest/coverage-v8": "^3.0.8",
+    "@vitest/coverage-istanbul": "^3.1.1",
+    "@vitest/coverage-v8": "^3.1.1",
     "chai": "^5.2.0",
     "colors": "^1.4.0",
     "dependency-cruiser": "^16.10.0",
@@ -114,6 +114,6 @@
     "json-stringify-safe": "~5.0.0",
     "prettier": "^2.5.1",
     "typescript": "^5.8.2",
-    "vitest": "^3.0.8"
+    "vitest": "^3.1.1"
   }
 }

package/types/adapters/file-gateway.d.ts

@@ -2,13 +2,13 @@ export function exists(path: any): Promise<false | _fs.Stats>;
 export function statSync(path: any): _fs.Stats | undefined;
 export function init(fileSystem?: typeof _fs): void;
 export function existsSync(...args: any[]): boolean;
-export function readFileSync(...args: any[]): string | Buffer<ArrayBufferLike>;
+export function readFileSync(...args: any[]): string | NonSharedBuffer;
 export function appendFileSync(...args: any[]): void;
 export function writeFileSync(...args: any[]): void;
-export function readdir(...args: any[]): Promise<_fs.Dirent[]>;
+export function readdir(...args: any[]): Promise<_fs.Dirent<Buffer<ArrayBufferLike>>[]>;
 export function unlinkSync(...args: any[]): void;
 export function readdirSyncRecursive(path: any): any[];
-export function readdirSync(path: any): _fs.Dirent[];
+export function readdirSync(path: any): _fs.Dirent<string>[];
 export function sanitizeFileName(fileName: any, replaceSpacesWith: any): any;
 export function preparePathForWriting(path: any, directory?: boolean): Promise<{
     isFile: any;

package/types/card.d.ts

@@ -100,7 +100,7 @@ export function newCard(task: any, _project: any, dontParse: any): {
     beforeText: any;
     text: any;
     list: any;
-    order: any;
+    order: number | undefined;
     hasColon: any;
     line: any;
     id: any;

package/types/config.d.ts

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

package/types/file.d.ts

@@ -198,7 +198,7 @@ export class File extends Emitter<[never]> {
         beforeText: any;
         text: any;
         list: any;
-        order: any;
+        order: number | undefined;
         hasColon: any;
         line: any;
         id: any;

package/types/plugins/persist-tags-plugin.d.ts

@@ -2,4 +2,5 @@ export default class PersistTagsPlugin {
     static get pluginName(): string;
     constructor(project: any);
     onBoardUpdate(): Promise<void>;
+    get persistTags(): any;
 }

package/types/task.d.ts

@@ -19,6 +19,13 @@ export class Task {
     static EmojiGroup: string;
     static getTagRegexp(prefix?: string): RegExp;
     static getTags(text: any, prefix?: string, commentTagsOnly?: boolean): string[];
+    static MetaRegExp: RegExp;
+    static getMetaRegExp(config: any): RegExp;
+    static getMetaRegExpQuotes(config: any): RegExp;
+    static parseMetaData(config: any, content: any): {};
+    static getMetaData(config: any, task: any): {};
+    static execMetaRegex(re: any, content: any, codePositions: any, cb: any): void;
+    static eachMetaInContent(config: any, content: any, cb: any): void;
     static getMarkdownLinkLabelPositions(text: any): {
         start: number;
         end: number;
@@ -30,14 +37,7 @@ export class Task {
     }[];
     static isResultInComment(commentPositions: any, index: any): any;
     static ContextRegExp: RegExp;
-    static getContext(text: any): string[];
-    static MetaRegExp: RegExp;
-    static getMetaRegExp(config: any): RegExp;
-    static getMetaRegExpQuotes(config: any): RegExp;
-    static parseMetaData(config: any, content: any): {};
-    static getMetaData(config: any, task: any): {};
-    static execMetaRegex(re: any, content: any, codePositions: any, cb: any): void;
-    static eachMetaInContent(config: any, content: any, cb: any): void;
+    static getContext(text: any, commentTagsOnly?: boolean): string[];
     static hasWindowsEOL(content: any): boolean;
     static getLinePos(content: any, lineNo: any): any;
     static getLineNumber(content: any, pos: any): number;
@@ -70,8 +70,8 @@ export class Task {
     beforeText: any;
     text: any;
     list: any;
-    set order(val: any);
-    get order(): any;
+    set order(val: number | undefined);
+    get order(): number | undefined;
     hasColon: any;
     line: any;
     id: any;