Allows for sub-items below a task re #19

Author: lynchjames

src/constants.ts

@@ -3,9 +3,9 @@ export const DATE_REGEX = /(?<target>{{date:?(?<date>[^}]*)}})/g;
 
 export const DAY_PLANNER_FILENAME = 'Day Planner-{{date}}.md';
 
-//https://regex101.com/r/FClNLv/2
+//https://regex101.com/r/VAxRnc/3
 export const PLAN_PARSER_REGEX = 
-/^((-?[\s]*\[?(?<completion>[x ]*)\])?(\d.)?\s*?(?<hours>\d{1,2}):(?<minutes>\d{2})\s)((?<break>BREAK)|(?<end>END|finish)|((?<text>.*)))$/gmi;
+/^(((-?[\s]*\[?(?<completion>[x ]*)\])?(\d.)?\s*?(?<hours>\d{1,2}):(?<minutes>\d{2})\s)((?<break>BREAK)|(?<end>END|finish)|((?<text>.*))))|((?<unmatched>[ \t]*- .*))$/gmi;
 
 export const DAY_PLANNER_DEFAULT_CONTENT =
 `## Day Planner

src/mermaid.ts

@@ -22,7 +22,7 @@ export default class PlannerMermaid {
     }
 
     generate(planSummary: PlanSummaryData): string {
-        const {tasks, breaks} = this.generateEntries(planSummary.items);
+        const {tasks, breaks} = this.generateEntries(planSummary.validItems());
         return this.mermaidTemplate(tasks, breaks);
     }
 

src/parser.ts

@@ -1,4 +1,5 @@
 import { Vault } from 'obsidian';
+import { pid } from 'process';
 import { PLAN_PARSER_REGEX } from './constants';
 import { PlanItem, PlanSummaryData } from './plan-data';
 
@@ -31,6 +32,11 @@ export default class Parser {
     private transform(regexMatches: RegExpExecArray[]): PlanItem[]{
         const results = regexMatches.map((value:RegExpExecArray, index) => {
             try {
+                const isUnmatched = value.groups.unmatched !== undefined;
+                if(isUnmatched) {
+                    const unMatchedText = value[0];
+                    return new PlanItem(index, value.index, false, false, false, true, undefined, undefined, unMatchedText, unMatchedText)
+                }
                 const isCompleted = this.matchValue(value.groups.completion, 'x');
                 const isBreak = this.matchValue(value.groups.break, 'break');
                 const isEnd = this.matchValue(value.groups.end, 'end');
@@ -44,6 +50,7 @@ export default class Parser {
                     isCompleted, 
                     isBreak,
                     isEnd,
+                    false,
                     time, 
                     `${value.groups.hours.padStart(2, '0')}:${value.groups.minutes}`,
                     value.groups.text?.trim(),

src/plan-data.ts

@@ -16,16 +16,17 @@ export class PlanSummaryData {
     calculate(): void {
         try {
             const now = new Date();
-            if(this.items.length === 0){
+            const validItems = this.validItems();
+            if(validItems.length === 0){
                 this.empty = true;
                 return;
             }
-            this.items.forEach((item, i) => {
-                const next = this.items[i+1];
-                if(item.time < now && (item.isEnd || (next && now < next.time))){
+            validItems.forEach((item, i) => {
+                const next = validItems[i+1];
+                if(item.time < now && (item.isEnd || (next && now < next.time))) {
                     this.current = item;
                     this.next = item.isEnd ? null : next;
-                } else if(item.time < now){
+                } else if(item.time < now) {
                     item.isPast = true;
                     this.past.push(item);
                 }
@@ -34,6 +35,10 @@ export class PlanSummaryData {
             console.log(error)
         }
     }
+
+    validItems(): PlanItem[] {
+        return this.items.filter(item => !item.isUnMatched);
+    }
 }
 
 export class PlanItem {
@@ -44,18 +49,20 @@ export class PlanItem {
     isPast: boolean;
     isBreak: boolean;
     isEnd: boolean;
+    isUnMatched: boolean;
     time: Date;
     rawTime: string;
     text: string;
     raw: string;
-
+    
     constructor(matchIndex: number, charIndex: number, isCompleted: boolean, 
-        isBreak: boolean, isEnd: boolean, time: Date, rawTime:string, text: string, raw: string){
+        isBreak: boolean, isEnd: boolean, isUnMatched: boolean, time: Date, rawTime:string, text: string, raw: string){
         this.matchIndex = matchIndex;
         this.charIndex = charIndex;
         this.isCompleted = isCompleted;
         this.isBreak = isBreak;
         this.isEnd = isEnd;
+        this.isUnMatched = isUnMatched;
         this.time = time;
         this.rawTime = rawTime;
         this.text = text;

src/planner-md.ts

@@ -67,6 +67,8 @@ export default class PlannerMarkdown {
                 let result = '';
                 if(item === planSummary.current){
                     result = item.isEnd ? this.updateItemCompletion(item, true) : this.currentItemText(planSummary);
+                } else if(item.isUnMatched) {
+                    result = item.raw;  
                 } else {
                     result = this.updateItemCompletion(item, item.isPast);
                 }
@@ -120,7 +122,7 @@ export default class PlannerMarkdown {
             const next = planSummary.next;
 
             const progressMarkdown = `> ||${current.rawTime}||${this.progress.progressMarkdown(current, next)}||${next.rawTime}||`;
-            let replacementItem = `\n**Current Task**\n${this.updateItemCompletion(current, false)}\n\n${progressMarkdown}\n`;      
+            let replacementItem = `\n**Current Task**\n\n${progressMarkdown}\n\n${this.updateItemCompletion(current, false)}`;      
             return replacementItem;
         } catch (error) {
             console.log(error)