Hotfix choice finding algorithm

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "quickadd",
 	"name": "QuickAdd",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"minAppVersion": "0.12.5",
 	"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.3.0",
+  "version": "0.3.1",
   "description": "Quickly add new pages or content to your vault.",
   "main": "main.js",
   "scripts": {

src/engine/MacroChoiceEngine.ts

@@ -153,22 +153,7 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
     }
 
     protected async executeChoice(command: IChoiceCommand) {
-        const choices: IChoice[] = this.plugin.settings.choices;
-
-        const findChoice = (choiceArr: IChoice[]) => {
-            let tempChoice: IChoice;
-            for (const choice of choiceArr) {
-                tempChoice = choice;
-
-                if (choice.type === ChoiceType.Multi)
-                    tempChoice = findChoice((<IMultiChoice> choice).choices);
-
-                if (tempChoice.id === command.choiceId)
-                    return tempChoice;
-            }
-        }
-
-        const targetChoice = findChoice(choices);
+        const targetChoice = this.plugin.getChoiceById(command.choiceId);
         if (!targetChoice) {
             log.logError("choice could not be found.");
             return;

src/main.ts

@@ -83,20 +83,29 @@ export default class QuickAdd extends Plugin {
 		}
 	}
 
-	public getChoice(choiceName: string): IChoice {
-		return this.settings.choices.find((choice) => this.getChoiceHelper(choiceName, choice));
+	public getChoiceById(choiceId: string): IChoice {
+		return this.getChoice("id", choiceId);
 	}
 
-	private getChoiceHelper(targetChoiceName: string, currentChoice: IChoice) {
-		if (currentChoice.type === ChoiceType.Multi) {
-			let foundChoice: IChoice = (currentChoice as IMultiChoice).choices
-				.find((choice) => this.getChoiceHelper(targetChoiceName, choice));
+	public getChoiceByName(choiceName: string): IChoice {
+		return this.getChoice("name", choiceName);
+	}
+
+	private getChoice(by: "name" | "id", targetPropertyValue: string): IChoice {
+		let tempChoice: IChoice;
 
-			if (foundChoice) return foundChoice;
+		const findChoice = (choice: IChoice) => {
+			if (choice[by] === targetPropertyValue) {
+				tempChoice = choice;
+				return tempChoice;
+			}
+
+			if (choice.type === ChoiceType.Multi) (choice as IMultiChoice).choices.forEach(findChoice);
 		}
 
-		if (currentChoice.name === targetChoiceName)
-			return currentChoice;
+		this.settings.choices.forEach(findChoice);
+
+		return tempChoice;
 	}
 
 	public removeCommandForChoice(choice: IChoice) {

src/quickAddApi.ts

@@ -16,7 +16,7 @@ export class QuickAddApi {
             suggester: (displayItems: string[] | ((value: string, index?: number, arr?: string[]) => string[]), actualItems: string[]) => {return this.suggester(app, displayItems, actualItems)},
             checkboxPrompt: (items: string[], selectedItems?: string[]) => {return this.checkboxPrompt(app, items, selectedItems)},
             executeChoice: async (choiceName: string) => {
-                const choice: IChoice = plugin.getChoice(choiceName);
+                const choice: IChoice = plugin.getChoiceByName(choiceName);
                 if (!choice) log.logError(`choice named '${choiceName}' not found`);
 
                 await choiceExecutor.execute(choice);

versions.json

@@ -1,4 +1,4 @@
 {
 	"0.2.16": "0.12.4",
-	"0.3.0": "0.12.5"
+	"0.3.1": "0.12.5"
 }