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

Author: jgclark

np.Templating/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 See Plugin [README](https://github.com/NotePlan/plugins/blob/main/np.Templating/README.md) for details on available commands and use case.
 
+## [1.11.4] 2025-03-07 @dwertheimer
+
+- Fix: templateFileByTitleEx (templateRunner) was failing to process EJS tags in the frontmatter of receiving template (thx @jgclark)
+
 ## [1.11.3] 2025-03-06 @dwertheimer
 
 - Fix: Improve Template error message (put it in a code block)

np.Templating/lib/NPTemplating.js

@@ -13,7 +13,7 @@ import { debug, helpInfo } from './helpers'
 
 import globals from './globals'
 import { chooseOption } from '@helpers/userInput'
-import { clo, log, logError, logDebug, logWarn, timer } from '@helpers/dev'
+import { clo, log, logError, logDebug, logWarn, timer, clof } from '@helpers/dev'
 import { datePicker, askDateInterval, chooseFolder } from '@helpers/userInput'
 
 /*eslint-disable */
@@ -657,7 +657,7 @@ export default class NPTemplating {
         // we don't have a template yet, so we need to find one using title
         logDebug(pluginJson, `NPTemplating.getTemplate: Searching for template by title without path "${originalFilename}"`)
         let templates = await DataStore.projectNoteByTitle(originalFilename, true, false)
-        clo(templates, `NPTemplating.getTemplate: found templates`)
+        clof(templates, `NPTemplating.getTemplate: found ${templates?.length || 0} templates`, ['title', 'filename'], true)
         if (templates && templates.length > 1) {
           logWarn(pluginJson, `NPTemplating.getTemplate: Multiple templates found for "${templateFilename || ''}"`)
           let templatesSecondary = []

np.Templating/plugin.json

@@ -3,8 +3,8 @@
   "noteplan.minAppVersion": "3.9.10",
   "plugin.id": "np.Templating",
   "plugin.name": "📒 Templating",
-  "plugin.version": "1.11.3",
-  "plugin.lastUpdateInfo": "1.11.3: Minor improvements and bug fixes",
+  "plugin.version": "1.11.4",
+  "plugin.lastUpdateInfo": "1.11.4: Minor improvements and bug fixes",
   "plugin.description": "Templating Plugin for NotePlan",
   "plugin.author": "Mike Erickson (@codedungeon)",
   "plugin.dependencies": [],

np.Templating/src/NPEditor.js

@@ -20,7 +20,7 @@ import FrontmatterModule from '@templatingModules/FrontmatterModule'
 
 import pluginJson from '../plugin.json'
 import { hyphenatedDate } from '@helpers/dateTime'
-import { selectFirstNonTitleLineInEditor } from '@helpers/NPnote'
+import { selectFirstNonTitleLineInEditor, getNoteFromIdentifier } from '@helpers/NPnote'
 import { findEndOfActivePartOfNote } from '@helpers/paragraph'
 import { chooseHeading, showMessage } from '@helpers/userInput'
 
@@ -132,23 +132,29 @@ export async function templateFileByTitleEx(selectedTemplate?: string = '', open
     if (selectedTemplate.length !== 0) {
       //TODO: call overrideSettingsWithTypedArgs() for JSON inputs from form
       const argObj = args && typeof args === 'string' && args.includes('__isJSON__') ? JSON.parse(args) : overrideSettingsWithStringArgs({}, args || '')
+      clo(argObj, `templateFileByTitleEx argObj`)
 
       // args && args.split(',').forEach((arg) => (arg.split('=').length === 2 ? (argObj[arg.split('=')[0]] = arg.split('=')[1]) : null))
       if (!selectedTemplate || selectedTemplate.length === 0) {
         await CommandBar.prompt('You must supply a template title as the first argument', helpInfo('Presets'))
       }
       let failed = false
 
-      const templateData = await NPTemplating.getTemplate(selectedTemplate)
+      // const templateData = await NPTemplating.getTemplate(selectedTemplate) -- seems to load every template in the DataStore -- I don't think it's needed
+      const theNote = await getNoteFromIdentifier(selectedTemplate)
+      let templateData = ''
 
-      if (!templateData) {
+      if (!theNote) {
         failed = true
+      } else {
+        templateData = theNote.content || ''
       }
 
       const isFrontmatter = failed ? false : new FrontmatterModule().isFrontmatterTemplate(templateData)
+      logDebug(pluginJson, `templateFileByTitleEx: "${theNote?.title || ''}": isFrontmatter:${String(isFrontmatter)}`)
       if (!failed && isFrontmatter) {
-        const { frontmatterBody, frontmatterAttributes } = await NPTemplating.preRender(templateData)
-        // clo(frontmatterAttributes, `templateFileByTitleEx frontMatterAttributes after preRender`)
+        const { frontmatterBody, frontmatterAttributes } = await NPTemplating.preRender(templateData, argObj)
+        clo(frontmatterAttributes, `templateFileByTitleEx frontMatterAttributes after preRender`)
         let data = { ...frontmatterAttributes, ...argObj, frontmatter: { ...frontmatterAttributes, ...argObj } }
         if (data['newNoteTitle']) {
           // if form or template has a newNoteTitle field then we need to call templateNew
@@ -157,8 +163,8 @@ export async function templateFileByTitleEx(selectedTemplate?: string = '', open
           return
         }
         let renderedTemplate = await NPTemplating.render(frontmatterBody, data)
-        // logDebug(pluginJson, `templateFileByTitleEx Template Render Complete renderedTemplate= "${renderedTemplate}"`)
-        // clo(frontmatterAttributes, `templateFileByTitleEx frontMatterAttributes before set`)
+        logDebug(pluginJson, `templateFileByTitleEx Template Render Complete renderedTemplate= "${renderedTemplate}"`)
+        clo(frontmatterAttributes, `templateFileByTitleEx frontMatterAttributes before set`)
         // Note:getNoteTitled is going to replace openNoteTitle and writeNoteTitle
         // Whether it's run silently or opened in Editor is sent in the URL