Fix VDATE parsing bug

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "quickadd",
 	"name": "QuickAdd",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"minAppVersion": "0.12.00",
 	"description": "Quickly add new pages or content to your vault.",
 	"author": "Christian B. B. Houmann",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickadd",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Quickly add new pages or content to your vault.",
   "main": "main.js",
   "scripts": {

src/formatters/completeFormatter.ts

@@ -68,11 +68,15 @@ export class CompleteFormatter extends Formatter {
         return this.value;
     }
 
+    protected async promptForVariable(header?: string): Promise<string> {
+        return await GenericInputPrompt.Prompt(this.app, header);
+    }
+
     protected async suggestForValue(suggestedValues: string[]) {
         return await GenericSuggester.Suggest(this.app, suggestedValues, suggestedValues);
     }
 
-    protected async getMacroValue(macroName: string) {
+    protected async getMacroValue(macroName: string): Promise<string> {
         const macroEngine: SingleMacroEngine = new SingleMacroEngine(this.app, this.plugin.settings.macros);
         return await macroEngine.runAndGetOutput(macroName);
     }

src/formatters/fileNameDisplayFormatter.ts

@@ -40,4 +40,8 @@ export class FileNameDisplayFormatter extends Formatter {
     protected getMacroValue(macroName: string) {
         return `_macro: ${macroName}`;
     }
+
+    protected async promptForVariable(variableName: string): Promise<string> {
+        return `_${variableName}_`;
+    }
 }

src/formatters/formatDisplayFormatter.ts

@@ -42,4 +42,8 @@ export class FormatDisplayFormatter extends Formatter {
     protected getMacroValue(macroName: string) {
         return `_macro: ${macroName}_`;
     }
+
+    protected promptForVariable(variableName: string): Promise<string> {
+        return Promise.resolve(`${variableName}_`);
+    }
 }

src/formatters/formatter.ts

@@ -76,7 +76,7 @@ export abstract class Formatter {
                     const suggestedValues = variableName.split(",");
 
                     if (suggestedValues.length === 1)
-                        this.variables.set(variableName, await this.promptForValue(variableName));
+                        this.variables.set(variableName, await this.promptForVariable(variableName));
                     else
                         this.variables.set(variableName, await this.suggestForValue(suggestedValues));
                 }
@@ -116,12 +116,12 @@ export abstract class Formatter {
 
             if (variableName && dateFormat) {
                 if (!this.variables[variableName]) {
-                    this.variables[variableName] = await this.promptForValue(variableName);
+                    this.variables[variableName] = await this.promptForVariable(variableName);
 
                     const parseAttempt = this.getNaturalLanguageDates().parseDate(this.variables[variableName]);
 
                     if (parseAttempt)
-                        this.variables[variableName] = window.moment().format(dateFormat);
+                        this.variables[variableName] = parseAttempt.moment.format(dateFormat);
                     else
                         throw new Error(`unable to parse date variable ${this.variables[variableName]}`);
                 }
@@ -137,5 +137,7 @@ export abstract class Formatter {
 
     protected abstract getNaturalLanguageDates();
 
-    protected abstract getMacroValue(macroName: string): string;
+    protected abstract getMacroValue(macroName: string): Promise<string> | string;
+
+    protected abstract promptForVariable(variableName: string): Promise<string>;
 }

versions.json

@@ -1,3 +1,3 @@
 {
-	"0.1.2": "0.12.4"
+	"0.1.3": "0.12.4"
 }