Merge branch 'main' of https://github.com/NotePlan/plugins

Author: jgclark

helpers/NPFrontMatter.js

@@ -1370,8 +1370,7 @@ export function analyzeTemplateStructure(templateData: string): {
   inlineTitleText: string,
 } {
   try {
-    logDebug('analyzeTemplateStructure', `Analyzing template structure for template with ${templateData.length} characters`)
-
+    logDebug('analyzeTemplateStructure', `Analyzing template structure for template with ${templateData.length} characters, starting with "${templateData.substring(0, 20)}..."`)
     // Initialize return object
     const result = {
       hasNewNoteTitle: false,
@@ -1397,6 +1396,7 @@ export function analyzeTemplateStructure(templateData: string): {
         }
       }
     }
+    logDebug('analyzeTemplateStructure', `templateFrontmatterEnd: ${templateFrontmatterEnd}`)
 
     if (templateFrontmatterEnd > 0) {
       // Extract and parse template frontmatter
@@ -1435,29 +1435,39 @@ export function analyzeTemplateStructure(templateData: string): {
     result.hasNewNoteTitle = 'newNoteTitle' in result.templateFrontmatter
 
     // Check for output frontmatter in the body content
+    // Output frontmatter is ONLY valid if the body content STARTS with a separator (--- or --)
     if (result.bodyContent) {
       const bodyLines = result.bodyContent.split('\n')
-
-      // Find separator positions using helper function
-      const { startIndex: startBlock, endIndex: endBlock } = findSeparatorPositions(bodyLines)
-
-      // Only process as frontmatter if we actually found separator markers
-      if (startBlock >= 0 && endBlock >= 0) {
-        // Extract and parse output frontmatter
-        const { attributes, isValid } = extractAndParseFrontmatter(bodyLines, startBlock, endBlock)
-
-        if (isValid) {
-          result.outputFrontmatter = attributes
-          result.hasOutputFrontmatter = Object.keys(result.outputFrontmatter).length > 0
-          result.hasOutputTitle = 'title' in result.outputFrontmatter
+      const firstLine = bodyLines[0]?.trim() || ''
+
+      // Only look for output frontmatter if the first line is a separator
+      if (firstLine === '---' || firstLine === '--') {
+        // Find separator positions using helper function
+        const { startIndex: startBlock, endIndex: endBlock } = findSeparatorPositions(bodyLines)
+
+        // Only process as frontmatter if we actually found separator markers
+        if (startBlock >= 0 && endBlock >= 0) {
+          // Extract and parse output frontmatter
+          const { attributes, isValid } = extractAndParseFrontmatter(bodyLines, startBlock, endBlock)
+
+          if (isValid) {
+            result.outputFrontmatter = attributes
+            result.hasOutputFrontmatter = Object.keys(result.outputFrontmatter).length > 0
+            result.hasOutputTitle = 'title' in result.outputFrontmatter
+          } else {
+            // Not valid frontmatter, so no output frontmatter
+            result.outputFrontmatter = {}
+            result.hasOutputFrontmatter = false
+            result.hasOutputTitle = false
+          }
         } else {
-          // Not valid frontmatter, so no output frontmatter
+          // No frontmatter separators found, so no output frontmatter
           result.outputFrontmatter = {}
           result.hasOutputFrontmatter = false
           result.hasOutputTitle = false
         }
       } else {
-        // No frontmatter separators found, so no output frontmatter
+        // Body doesn't start with a separator, so no output frontmatter
         result.outputFrontmatter = {}
         result.hasOutputFrontmatter = false
         result.hasOutputTitle = false
@@ -1732,7 +1742,7 @@ function findInlineTitleAfterFrontmatter(
 }
 
 /**
- * Robust helper function to detect inline title in template body content
+ * Robust helper function to detect inline title in template body content (after first frontmatter is peeled off)
  * Handles malformed frontmatter, multiple consecutive separators, and multiple frontmatter blocks
  * @param {string} bodyContent - The template body content
  * @returns {{hasInlineTitle: boolean, inlineTitleText: string}}
@@ -1746,9 +1756,24 @@ export function detectInlineTitle(bodyContent: string): { hasInlineTitle: boolea
   const lines = bodyContent.split('\n')
   logDebug('detectInlineTitle', `Processing ${lines.length} lines of rendered body content`)
 
-  // Find any note frontmatter blocks in the content
-  const frontmatterBlocks = findNoteFrontmatterBlock(lines)
-  logDebug('detectInlineTitle', `Found ${frontmatterBlocks.length} frontmatter blocks`)
+  // Check if body content starts with output frontmatter (--- or --)
+  // Output frontmatter is ONLY valid if it starts at the beginning of body content
+  const firstLine = lines[0]?.trim() || ''
+  let frontmatterBlocks = []
+
+  if (firstLine === '---' || firstLine === '--') {
+    // Find the output frontmatter block ONLY at the start
+    const { startIndex: startBlock, endIndex: endBlock } = findSeparatorPositions(lines, 0)
+    if (startBlock === 0 && endBlock >= 0) {
+      const { isValid } = extractAndParseFrontmatter(lines, startBlock, endBlock)
+      if (isValid) {
+        frontmatterBlocks = [{ startIndex: startBlock, endIndex: endBlock, isValid: true }]
+        logDebug('detectInlineTitle', `Found output frontmatter block at start: lines ${startBlock}-${endBlock}`)
+      }
+    }
+  }
+
+  logDebug('detectInlineTitle', `Found ${frontmatterBlocks.length} valid frontmatter blocks`)
 
   // Find inline title after processing all frontmatter blocks
   const result = findInlineTitleAfterFrontmatter(lines, frontmatterBlocks)

helpers/__tests__/NPFrontMatter.detectInlineTitleRobust.test.js

@@ -248,12 +248,8 @@ Content`
   })
 
   describe('Real-world scenarios', () => {
-    it('should handle meeting notes template', () => {
-      const content = `---
-template: meeting
-category: work
----
---
+    it('should handle template with output frontmatter and inline title', () => {
+      const content = `--
 date: 2024-01-15
 attendees: John, Jane
 --
@@ -264,40 +260,6 @@ attendees: John, Jane
       const result = detectInlineTitle(content)
       expect(result).toEqual({ hasInlineTitle: true, inlineTitleText: 'Weekly Team Meeting' })
     })
-
-    it('should handle daily journal template', () => {
-      const content = `---
-template: journal
-type: daily
----
---
-date: 2024-01-15
-mood: good
---
-# January 15, 2024
-## What I accomplished today
-- Worked on project X
-- Had lunch with colleague`
-      const result = detectInlineTitle(content)
-      expect(result).toEqual({ hasInlineTitle: true, inlineTitleText: 'January 15, 2024' })
-    })
-
-    it('should handle project notes template', () => {
-      const content = `---
-template: project
-status: active
----
---
-project: MyApp
-version: 1.0
---
-# Project Update: MyApp v1.0
-## Recent Changes
-- Fixed bug #123
-- Added new feature`
-      const result = detectInlineTitle(content)
-      expect(result).toEqual({ hasInlineTitle: true, inlineTitleText: 'Project Update: MyApp v1.0' })
-    })
   })
 
   describe('Error handling', () => {

helpers/__tests__/NPFrontMatter/NPFrontMatter.analyzeTemplateStructure.test.js

@@ -790,4 +790,72 @@ Some content here`
       expect(result).toBe('This is an H2 title')
     })
   })
+
+  describe('inline title before output frontmatter blocks', () => {
+    test('should detect inline title when it comes before output frontmatter (bug case)', () => {
+      const template = `---
+bg-color-dark: 
+icon: 
+icon-color: 
+icon-style: regular
+area: 
+category: 
+topic: 
+---
+# mytitle
+---
+⌫ unpublish: [[<%- date.now("YYYY-MM-DD", +28) %>]]
+⌫ archive: [[<%- date.now("YYYY-MM-DD", +28) %>]] 
+---
+#### ✔︎ Tasks
++ review: [[<%- date.now("YYYY-MM-DD", +1) %>]]
+---
+#### ✆ Connections
++ No connections
+---
+#### ✪ Keywords 
++ No keywords
+---
+#### ⤷ Links
++ No links
+---
+#### ✎ Notes
++ No notes
+---
+#### ⁂ Details 
++ No details
+---
+#### ☰ References 
++ No references
+---`
+
+      const result = analyzeTemplateStructure(template)
+
+      // This test documents the current bug: inline title is NOT detected
+      // when it appears before output frontmatter blocks
+      expect(result.hasInlineTitle).toBe(true) // This will likely fail, showing the bug
+      expect(result.inlineTitleText).toBe('mytitle')
+    })
+
+    test('should use inline title when calling getNoteTitleFromTemplate', () => {
+      const template = `---
+bg-color-dark: 
+icon: 
+icon-color: 
+icon-style: regular
+area: 
+category: 
+topic: 
+---
+# mytitle
+---
+⌫ unpublish: [[<%- date.now("YYYY-MM-DD", +28) %>]]
+⌫ archive: [[<%- date.now("YYYY-MM-DD", +28) %>]] 
+---`
+
+      const result = getNoteTitleFromTemplate(template)
+
+      expect(result).toBe('mytitle')
+    })
+  })
 })

helpers/note.js

@@ -388,9 +388,7 @@ export function calendarNotesSortedByChanged(): Array<TNote> {
  * @return {Array<TNote>} array of notes
  */
 export function calendarNotesSortedByDate(includeFutureCalendarNotes: boolean = false, includeTeamspaceNotes: boolean = false): Array<TNote> {
-  let notes = (includeFutureCalendarNotes)
-    ? DataStore.calendarNotes.slice()
-    : pastCalendarNotes()
+  let notes = includeFutureCalendarNotes ? DataStore.calendarNotes.slice() : pastCalendarNotes()
 
   // Remove Teamspace calendar notes if requested
   if (!includeTeamspaceNotes) {
@@ -553,9 +551,14 @@ export function replaceSection(
   newSectionContent: string,
 ): void {
   try {
+    // $FlowIgnore
+    const editorNote = note?.note
+    const isEditor = editorNote !== undefined
     logDebug(
       'note / replaceSection',
-      `Starting for note '${displayTitle(note)}'. Will remove '${headingOfSectionToReplace}' -> '${newSectionHeading}' level ${newSectionHeadingLevel}`,
+      `Starting for note '${displayTitle(note)}' ${
+        isEditor ? '(Editor)' : '(not in Editor)'
+      }. Will remove '${headingOfSectionToReplace}' -> '${newSectionHeading}' level ${newSectionHeadingLevel}`,
     )
     // First remove existing heading (the start of the heading text will probably be right, but the end will probably need to be changed)
     const insertionLineIndex = removeSection(note, headingOfSectionToReplace)
@@ -826,13 +829,13 @@ export function numberOfOpenItemsInNote(note: CoreNoteFields): number {
 export function setIconForNote(note: TNote, icon: string, iconColor: ?string, iconStyle: ?string): void {
   // To set icon in frontmatter, first read existing frontmatter, then update.
   const noteFrontmatter = note.frontmatterAttributes
-  noteFrontmatter["icon"] = icon
+  noteFrontmatter['icon'] = icon
   if (iconColor) {
-    noteFrontmatter["icon-color"] = iconColor
+    noteFrontmatter['icon-color'] = iconColor
   }
   if (iconStyle) {
-    noteFrontmatter["icon-style"] = iconStyle
+    noteFrontmatter['icon-style'] = iconStyle
   }
   // $FlowIgnore[cannot-write] documentation says this particular usage *is* safe
   note.frontmatterAttributes = noteFrontmatter
-}
+}

helpers/userInput.js

@@ -325,7 +325,7 @@ export async function chooseFolder(
       alpha: 0.5,
       darkAlpha: 0.5,
     }
-    logDebug('userInput / chooseFolder', `creating with folder path, starting at "${startFolder}"`)
+    logDebug('userInput / chooseFolder', `starting with startFolder: ${startFolder ? `"${startFolder}"` : 'none (/)'}`)
 
     // Get all folders, excluding @Trash
     // V2
@@ -346,9 +346,9 @@ export async function chooseFolder(
     if (folders.length > 0) {
       // Create folder options for display (without new folder option at this point)
       const [simpleFolderOptions, decoratedFolderOptions] = createFolderOptions(folders, teamspaceDefs, includeFolderPath)
-      // for(let i = 0; i < 15; i++) {
-      //   console.log(`- ${i}: ${folders[i]}`)
-      // }
+      for (let i = 0; i < (folders.length > 15 ? 15 : folders.length); i++) {
+        logDebug('userInput / chooseFolder', `- ${i}: ${folders[i]} simpleOption: ${simpleFolderOptions[i].label} decoratedOption: ${decoratedFolderOptions[i].text}`)
+      }
 
       // Get user selection. Use newer CommandBar.showOptions() from v3.18 if available.
       let result: TCommandBarOptionObject | any
@@ -366,6 +366,7 @@ export async function chooseFolder(
         // ✅ for folder creation to a Teamspace root opt-click
         // ✅ for folder creation to a Teamspace subfolder opt-click
 
+        let actualIndex = -1
         if (includeNewFolderOption) {
           // Add in the new folder option just for newer CommandBar use
           decoratedFolderOptions.unshift(addDecoratedNewFolderOption)
@@ -379,12 +380,20 @@ export async function chooseFolder(
             // i.e. new folder wanted, but no name given yet
             folder = ''
             newFolderWanted = true
+            logDebug('userInput / chooseFolder CHOSE NEW FOLDER CREATE OPTION', `- result.index: ${result.index}`)
           } else if (optClickedOnFolder) {
+            logDebug('userInput / chooseFolder CHOSEN OPT CLICKED ON FOLDER', `- optClickedOnFolder: true`)
             // i.e. new folder wanted, and parent folder chosen
-            folder = folders[result.index - 1] // to ignore the added new folder option if present
+            actualIndex = result.index - 1
+            folder = folders[actualIndex] // to ignore the added new folder option if present
             newFolderWanted = true
           } else {
-            folder = folders[result.index - 1] // to ignore the added new folder option if present
+            actualIndex = result.index - 1
+            folder = folders[actualIndex] // to ignore the added new folder option if present
+            logDebug('userInput / chooseFolder CHOSEN FOLDER', `- decoratedFolderOptions[${result.index}]: ${decoratedFolderOptions[result.index].text}`)
+            logDebug('userInput / chooseFolder CHOSEN FOLDER', `- simpleFolderOptions[${result.index}]: ${simpleFolderOptions[result.index].label}`)
+            logDebug('userInput / chooseFolder CHOSEN FOLDER', `- folders[${result.index}]: ${folders[result.index]} (using result index)`)
+            logDebug('userInput / chooseFolder CHOSEN FOLDER', `- actualIndex: ${actualIndex} folders[${actualIndex}]: ${folders[actualIndex]} (using actualIndex)`)
           }
 
           // Handle new folder creation, if requested
@@ -402,7 +411,23 @@ export async function chooseFolder(
           // not including add new folder option
           result = await chooseDecoratedOptionWithModifiers(msg, decoratedFolderOptions)
           clo(result, 'chooseFolder chooseDecoratedOptionWithModifiers result') // ✅
-          value = folders[result.index]
+          actualIndex = result.index
+          value = folders[actualIndex]
+        }
+        logDebug(
+          'userInput / chooseFolder',
+          `User chose: result.index:${result.index} ${
+            includeNewFolderOption ? `(actualIndex in folders array: ${actualIndex} because running with includeNewFolderOption),` : ''
+          } optClickedOnFolder: ${String(optClickedOnFolder)} / folders: ${folders.length}`,
+        )
+        // logDebug output a map of the folders arrray with 3 items on either side of the chosen index
+        // realizing that folder index could be 0, so we need to handle that
+        if (actualIndex > -1) {
+          const foldersSample = folders.map((f, i) => ({ ...(typeof f === 'string' ? { label: f, value: f } : f), index: i })).slice(Math.max(0, actualIndex - 3), actualIndex + 3)
+          logDebug('userInput / chooseFolder', `foldersSample +/- 3 of chosen index`)
+          foldersSample.forEach((folder) => {
+            logDebug('userInput / chooseFolder', `  [${folder.index}]: ${folder.label}${folder.index === actualIndex ? ' <== (chosen)' : ''}`)
+          })
         }
       } else {
         // ✅ for both private + teamspace
@@ -463,7 +488,7 @@ export async function chooseFolder(
       folder = '/'
     }
 
-    logDebug(`userInput / chooseFolder`, ` -> "${folder}"`)
+    logDebug(`userInput / chooseFolder`, ` -> returning "${folder}"`)
     return folder
   } catch (error) {
     logError('userInput / chooseFolder', error.message)