Add {{TEMPLATE}} to format syntax

chhoumann · Jun 12, 2021 · 1a7d152 · 1a7d152
1 parent 07667a8
commit 1a7d152
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -1,6 +1,7 @@
 export const FORMAT_SYNTAX: string[] = [
     "{{DATE}}", "{{DATE:<DATEFORMAT>}}", "{{VDATE:<VARIABLE NAME>, <DATE FORMAT>}}",
-    "{{VALUE}}", "{{NAME}}", "{{VALUE:<VARIABLE NAME>}}", "{{LINKCURRENT}}", "{{MACRO:<MACRONAME>}}"
+    "{{VALUE}}", "{{NAME}}", "{{VALUE:<VARIABLE NAME>}}", "{{LINKCURRENT}}", "{{MACRO:<MACRONAME>}}",
+    "{{TEMPLATE:<TEMPLATEPATH>}}"
 ];
 
 export const FILE_NAME_FORMAT_SYNTAX: string[] = [
@@ -18,4 +19,4 @@ export const LINK_TO_CURRENT_FILE_REGEX: RegExp = new RegExp(/{{LINKCURRENT}}/);
 export const MARKDOWN_FILE_EXTENSION_REGEX: RegExp = new RegExp(/\.md$/);
 export const JAVASCRIPT_FILE_EXTENSION_REGEX: RegExp = new RegExp(/\.js$/);
 export const MACRO_REGEX: RegExp = new RegExp(/{{MACRO:([^\n\r}]*)}}/);
-export const TEMPLATE_REGEX: RegExp = new RegExp(/{{MACRO:([^\n\r}]*.md$)}}/);
+export const TEMPLATE_REGEX: RegExp = new RegExp(/{{TEMPLATE:([^\n\r}]*.md)}}/);
diff --git a/src/engine/SingleTemplateEngine.ts b/src/engine/SingleTemplateEngine.ts
@@ -7,11 +7,15 @@ export class SingleTemplateEngine extends TemplateEngine {
         super(app, plugin);
     }
     public async run(): Promise<string> {
-        const templateContent: string = await this.getTemplateContent(this.templatePath);
+        let templateContent: string = await this.getTemplateContent(this.templatePath);
         if (!templateContent) {
             throw new Error(`Template ${this.templatePath} not found.`);
         }
 
+        if (this.templater) {
+            templateContent = this.templater.templater.parser.parseTemplates(templateContent);
+        }
+
         return await this.formatter.formatFileContent(templateContent);
     }
 }
diff --git a/src/formatters/formatDisplayFormatter.ts b/src/formatters/formatDisplayFormatter.ts
@@ -3,7 +3,6 @@ import type {App} from "obsidian";
 import {getNaturalLanguageDates} from "../utility";
 import type QuickAdd from "../main";
 import {SingleTemplateEngine} from "../engine/SingleTemplateEngine";
-import {template} from "@babel/core";
 
 export class FormatDisplayFormatter extends Formatter {
     constructor(private app: App, private plugin: QuickAdd) {
@@ -19,6 +18,7 @@ export class FormatDisplayFormatter extends Formatter {
         output = await this.replaceVariableInString(output);
         output = await this.replaceLinkToCurrentFileInString(output);
         output = await this.replaceMacrosInString(output);
+        output = await this.replaceTemplateInString(output);
 
         return output;
     }
@@ -51,8 +51,11 @@ export class FormatDisplayFormatter extends Formatter {
     }
 
     protected async getTemplateContent(templatePath: string): Promise<string> {
-        const templateContent: string = await new SingleTemplateEngine(this.app, this.plugin, templatePath).run();
-        if (!templateContent) return `Template (not found): ${templatePath}`;
-        return templateContent;
+        try {
+            return await new SingleTemplateEngine(this.app, this.plugin, templatePath).run();
+        }
+        catch (e) {
+            return `Template (not found): ${templatePath}`;
+        }
     }
 }
diff --git a/src/formatters/formatter.ts b/src/formatters/formatter.ts
@@ -8,7 +8,6 @@ import {
     VARIABLE_REGEX
 } from "../constants";
 import {getDate} from "../utility";
-import {template} from "@babel/core";
 
 export abstract class Formatter {
     protected value: string;
@@ -140,14 +139,6 @@ export abstract class Formatter {
     return output;
     }
 
-    protected abstract getNaturalLanguageDates();
-
-    protected abstract getMacroValue(macroName: string): Promise<string> | string;
-
-    protected abstract promptForVariable(variableName: string): Promise<string>;
-
-    protected abstract getTemplateContent(templatePath: string): Promise<string>;
-
     protected async replaceTemplateInString(input: string): Promise<string> {
         let output: string = input;
 
@@ -160,4 +151,12 @@ export abstract class Formatter {
 
         return output;
     }
+
+    protected abstract getNaturalLanguageDates();
+
+    protected abstract getMacroValue(macroName: string): Promise<string> | string;
+
+    protected abstract promptForVariable(variableName: string): Promise<string>;
+
+    protected abstract getTemplateContent(templatePath: string): Promise<string>;
 }
diff --git a/src/gui/GenericInputPrompt/GenericInputPromptContent.svelte b/src/gui/GenericInputPrompt/GenericInputPromptContent.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-    import type {App} from "obsidian";
-    export let app: App;
     export let header: string = "";
     export let placeholder: string = "";
     export let value: string = "";

diff --git a/src/gui/GenericInputPrompt/genericInputPrompt.ts b/src/gui/GenericInputPrompt/genericInputPrompt.ts
@@ -20,7 +20,6 @@ export default class GenericInputPrompt extends Modal {
         this.modalContent = new GenericInputPromptContent({
             target: this.contentEl,
             props: {
-                app,
                 header,
                 placeholder,
                 value,