fix: YAML parsing respects monster key (close #191)

index.ts

@@ -1,4 +1,5 @@
 import type { Component } from "obsidian";
+import type { Creature, HomebrewCreature } from "obsidian-overload";
 import type { DefaultLayout, Layout } from "types/layout";
 
 export type ability =
@@ -105,11 +106,11 @@ export interface StatblockParameters
         | "legendary_actions"
         | "reactions"
     > {
-    traits?: { desc: string; name: string }[] | [string, string][];
-    actions?: Trait[] | [string, string][];
-    bonus_actions?: Trait[] | [string, string][];
-    legendary_actions?: Trait[] | [string, string][];
-    reactions?: Trait[] | [string, string][];
+    traits?: { desc: string; name: string }[];
+    actions?: Trait[];
+    bonus_actions?: Trait[];
+    legendary_actions?: Trait[];
+    reactions?: Trait[];
 }
 
 export type Spell = string | { [key: string]: string };
@@ -153,7 +154,7 @@ export interface StatblockAPI {
         statblockEl: HTMLDivElement,
         display: string
     ): Component;
-    saveMonsters(homebrew: import(".").HomebrewCreature[]): unknown;
+    saveMonsters(homebrew: HomebrewCreature[]): unknown;
     settings: StatblockData;
     data: Map<string, Monster>;
 }

package.json

@@ -44,7 +44,7 @@
         "fast-sort": "^3.0.2",
         "jest": "^27.4.7",
         "obsidian": "^0.16.0",
-        "obsidian-overload": "^1.7.0",
+        "obsidian-overload": "^1.15.1",
         "standard-version": "^9.3.2",
         "svelte": "^3.49.0",
         "svelte-dnd-action": "^0.9.12",

src/view/statblock.ts

@@ -1,7 +1,7 @@
 import { App, ButtonComponent, Modal, TFile } from "obsidian";
 import { Layout5e } from "src/layouts/basic 5e/basic5e";
 import { MarkdownRenderChild } from "obsidian";
-import type { Monster, StatblockParameters, Trait } from "types";
+import type { Monster, StatblockParameters, Trait } from "../../index";
 
 import Statblock from "./Statblock.svelte";
 import type StatBlockPlugin from "src/main";

src/watcher/watcher.ts

@@ -113,7 +113,7 @@ export class Watcher extends Component {
             "message",
             async (evt: MessageEvent<UpdateEventMessage>) => {
                 if (evt.data.type == "update") {
-                    const { monster, path } = evt.data;
+                    let { monster, path } = evt.data;
                     let update = false;
                     if (this.watchPaths.has(path)) {
                         const existing = this.watchPaths.get(path);
@@ -124,6 +124,17 @@ export class Watcher extends Component {
                                 `Fantasy Statblocks: Updating ${monster.name}`
                             );
                     }
+
+                    if (
+                        "monster" in monster &&
+                        this.plugin.bestiary.has(monster.monster)
+                    ) {
+                        monster = {
+                            ...this.plugin.bestiary.get(monster.monster),
+                            ...monster
+                        };
+                    }
+
                     this.watchPaths.set(path, monster.name);
                     await this.plugin.saveMonster(monster, false, false);