From c821873ac628b9840a6481eeddeebc920f081ecc Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Fri, 28 Nov 2025 21:04:26 -0800
Subject: [PATCH] fix: test fixtures and awakening type issues

- remove recruits property from Character test mock (doesn't exist in type)
- add missing subaura property to Summon test mocks
- consolidate Awakening imports to use entities source
- make awakening type/level optional in GridWeapon/GridSummon
- fix null handling in AwakeningDisplay (null -> undefined)
---
 src/lib/api/adapters/__tests__/entity.adapter.test.ts     | 1 -
 src/lib/api/adapters/__tests__/grid.adapter.test.ts       | 1 +
 .../sidebar/modifications/AwakeningDisplay.svelte         | 2 +-
 src/lib/types/api/party.ts                                | 8 ++++----
 src/lib/utils/modifiers.ts                                | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/lib/api/adapters/__tests__/entity.adapter.test.ts b/src/lib/api/adapters/__tests__/entity.adapter.test.ts
index 861a6e85..5e9d60a6 100644
--- a/src/lib/api/adapters/__tests__/entity.adapter.test.ts
+++ b/src/lib/api/adapters/__tests__/entity.adapter.test.ts
@@ -58,7 +58,6 @@ describe('EntityAdapter', () => {
 			ulb: true
 		},
 		special: false,
-		recruits: null,
 		gender: 0,
 		race: [1, 2],
 		proficiency: [1, 2],
diff --git a/src/lib/api/adapters/__tests__/grid.adapter.test.ts b/src/lib/api/adapters/__tests__/grid.adapter.test.ts
index 4e24ab65..56e482e6 100644
--- a/src/lib/api/adapters/__tests__/grid.adapter.test.ts
+++ b/src/lib/api/adapters/__tests__/grid.adapter.test.ts
@@ -57,6 +57,7 @@ describe('GridAdapter', () => {
 		element: 1,
 		maxLevel: 150,
 		uncap: { flb: true, ulb: true, transcendence: false },
+		subaura: false,
 		hp: { minHp: 100, maxHp: 500, maxHpFlb: 600, maxHpUlb: 700 },
 		atk: { minAtk: 200, maxAtk: 1000, maxAtkFlb: 1200, maxAtkUlb: 1400 }
 	}
diff --git a/src/lib/components/sidebar/modifications/AwakeningDisplay.svelte b/src/lib/components/sidebar/modifications/AwakeningDisplay.svelte
index ea0e8e54..0ee2394d 100644
--- a/src/lib/components/sidebar/modifications/AwakeningDisplay.svelte
+++ b/src/lib/components/sidebar/modifications/AwakeningDisplay.svelte
@@ -36,7 +36,7 @@
   }
 
   let awakeningData = $derived(getAwakeningData())
-  let imageUrl = $derived(getAwakeningImage(awakeningData))
+  let imageUrl = $derived(getAwakeningImage(awakeningData ?? undefined))
   let displayName = $derived(awakeningData?.type?.name?.en || awakeningData?.type?.name?.ja || 'Awakening')
 </script>
 
diff --git a/src/lib/types/api/party.ts b/src/lib/types/api/party.ts
index 72ebbd38..627323f8 100644
--- a/src/lib/types/api/party.ts
+++ b/src/lib/types/api/party.ts
@@ -30,8 +30,8 @@ export interface GridWeapon {
   weaponKeys?: WeaponKey[]
   ax?: SimpleAxSkill[]
   awakening?: {
-    type: Awakening
-    level: number
+    type?: Awakening
+    level?: number
   }
 }
 
@@ -44,8 +44,8 @@ export interface GridCharacter {
   transcendenceStep?: number
   character: Character  // Named properly, not "object"
   awakening?: {
-    type: Awakening
-    level: number
+    type?: Awakening
+    level?: number
   }
   aetherialMastery?: { modifier: number; strength: number }
   overMastery?: Array<{ modifier: number; strength: number }>
diff --git a/src/lib/utils/modifiers.ts b/src/lib/utils/modifiers.ts
index 8c5d7ada..e826480f 100644
--- a/src/lib/utils/modifiers.ts
+++ b/src/lib/utils/modifiers.ts
@@ -2,8 +2,7 @@
  * Utility functions for weapon and character modifiers (awakenings, weapon keys, AX skills)
  */
 
-import type { Awakening } from '$lib/types/Awakening'
-import type { WeaponKey } from '$lib/types/api/entities'
+import type { Awakening, WeaponKey } from '$lib/types/api/entities'
 import type { SimpleAxSkill } from '$lib/types/SimpleAxSkill'
 
 /**