Merge remote-tracking branch 'origin/svelte-main' into feature/max-exorcism-level

src/lib/features/database/characters/sections/CharacterMetadataSection.svelte

@@ -78,19 +78,27 @@
 
 <DetailsContainer title="Metadata">
   {#if editMode}
-    <DetailItem
+    <SuggestionDetailItem
       label="Name (EN)"
       bind:value={editData.name}
       editable={true}
       type="text"
       placeholder="English name"
+      suggestion={suggestions?.nameEn}
+      dismissedSuggestion={dismissedSuggestions?.has('name')}
+      onAcceptSuggestion={() => onAcceptSuggestion?.('name', suggestions?.nameEn)}
+      onDismissSuggestion={() => onDismissSuggestion?.('name')}
     />
-    <DetailItem
+    <SuggestionDetailItem
       label="Name (JP)"
       bind:value={editData.nameJp}
       editable={true}
       type="text"
       placeholder="日本語名"
+      suggestion={suggestions?.nameJp}
+      dismissedSuggestion={dismissedSuggestions?.has('nameJp')}
+      onAcceptSuggestion={() => onAcceptSuggestion?.('nameJp', suggestions?.nameJp)}
+      onDismissSuggestion={() => onDismissSuggestion?.('nameJp')}
     />
     <SuggestionDetailItem
       label="Rarity"
@@ -103,12 +111,16 @@
       onAcceptSuggestion={() => onAcceptSuggestion?.('rarity', suggestions?.rarity)}
       onDismissSuggestion={() => onDismissSuggestion?.('rarity')}
     />
-    <DetailItem
+    <SuggestionDetailItem
       label="Granblue ID"
       bind:value={editData.granblueId}
       editable={true}
       type="text"
       placeholder="Granblue ID"
+      suggestion={suggestions?.granblueId}
+      dismissedSuggestion={dismissedSuggestions?.has('granblueId')}
+      onAcceptSuggestion={() => onAcceptSuggestion?.('granblueId', suggestions?.granblueId)}
+      onDismissSuggestion={() => onDismissSuggestion?.('granblueId')}
     />
     <DetailItem
       label="Character ID"

src/lib/features/database/summons/sections/SummonMetadataSection.svelte

@@ -34,19 +34,27 @@
 
 <DetailsContainer title="Metadata">
   {#if editMode}
-    <DetailItem
+    <SuggestionDetailItem
       label="Name (EN)"
       bind:value={editData.name}
       editable={true}
       type="text"
       placeholder="English name"
+      suggestion={suggestions?.nameEn}
+      dismissedSuggestion={dismissedSuggestions?.has('name')}
+      onAcceptSuggestion={() => onAcceptSuggestion?.('name', suggestions?.nameEn)}
+      onDismissSuggestion={() => onDismissSuggestion?.('name')}
     />
-    <DetailItem
+    <SuggestionDetailItem
       label="Name (JP)"
       bind:value={editData.nameJp}
       editable={true}
       type="text"
       placeholder="日本語名"
+      suggestion={suggestions?.nameJp}
+      dismissedSuggestion={dismissedSuggestions?.has('nameJp')}
+      onAcceptSuggestion={() => onAcceptSuggestion?.('nameJp', suggestions?.nameJp)}
+      onDismissSuggestion={() => onDismissSuggestion?.('nameJp')}
     />
     <SuggestionDetailItem
       label="Rarity"
@@ -65,6 +73,14 @@
       editable={true}
       type="text"
     />
+    <DetailItem
+      label="Summon ID"
+      sublabel="Internal game identifier (if known)"
+      bind:value={editData.summonId}
+      editable={true}
+      type="text"
+      placeholder="Optional"
+    />
   {:else}
     <DetailItem label="Name (EN)" value={summon.name?.en || '—'} />
     <DetailItem label="Name (JP)" value={summon.name?.ja || '—'} />

src/lib/features/database/weapons/sections/WeaponMetadataSection.svelte

@@ -34,19 +34,27 @@
 
 <DetailsContainer title="Metadata">
   {#if editMode}
-    <DetailItem
+    <SuggestionDetailItem
       label="Name (EN)"
       bind:value={editData.name}
       editable={true}
       type="text"
       placeholder="English name"
+      suggestion={suggestions?.nameEn}
+      dismissedSuggestion={dismissedSuggestions?.has('name')}
+      onAcceptSuggestion={() => onAcceptSuggestion?.('name', suggestions?.nameEn)}
+      onDismissSuggestion={() => onDismissSuggestion?.('name')}
     />
-    <DetailItem
+    <SuggestionDetailItem
       label="Name (JP)"
       bind:value={editData.nameJp}
       editable={true}
       type="text"
       placeholder="日本語名"
+      suggestion={suggestions?.nameJp}
+      dismissedSuggestion={dismissedSuggestions?.has('nameJp')}
+      onAcceptSuggestion={() => onAcceptSuggestion?.('nameJp', suggestions?.nameJp)}
+      onDismissSuggestion={() => onDismissSuggestion?.('nameJp')}
     />
     <SuggestionDetailItem
       label="Rarity"

src/lib/utils/rarity.ts

@@ -8,6 +8,14 @@ export function getRarityLabel(rarity: number): string {
 	return RARITY_LABELS[rarity] || '—'
 }
 
+/**
+ * Get rarity prefix for URL generation (e.g., "SSR", "SR", "R")
+ * Returns empty string for unknown rarity values
+ */
+export function getRarityPrefix(rarity: number): string {
+	return RARITY_LABELS[rarity] || ''
+}
+
 export function getRarityOptions() {
 	return Object.entries(RARITY_LABELS).map(([value, label]) => ({
 		value: Number(value),

src/routes/(app)/database/characters/import/+page.svelte

@@ -13,6 +13,7 @@
 		buildGamewithUrl,
 		buildKamigameUrl
 	} from '$lib/utils/external-links'
+	import { getRarityPrefix } from '$lib/utils/rarity'
 
 	// Components
 	import CharacterUncapSection from '$lib/features/database/characters/sections/CharacterUncapSection.svelte'
@@ -85,6 +86,23 @@
 	// Get selected entity data
 	const selectedEntity = $derived(selectedWikiPage ? entities.get(selectedWikiPage) : null)
 
+	// Auto-generate wiki URLs when Name (JP) or Rarity changes
+	$effect(() => {
+		if (!selectedWikiPage) return
+		const formData = formDataByPage[selectedWikiPage]
+		if (!formData) return
+
+		const nameJp = formData.nameJp
+		const rarity = formData.rarity
+
+		if (nameJp) {
+			// Auto-generate wikiJa: "Name (JP) (SSR)"
+			formData.wikiJa = `${nameJp} (${getRarityPrefix(rarity)})`
+			// Auto-generate kamigame: "Name (JP)" for characters (no rarity prefix)
+			formData.kamigame = nameJp
+		}
+	})
+
 	// Entity tabs for TabbedEntitySelector
 	const entityTabs = $derived<EntityTab[]>(
 		Array.from(entities.entries()).map(([wikiPage, entity]) => ({
@@ -451,43 +469,6 @@
 				{@const suggestions = selectedEntity.suggestions}
 				{@const dismissed = dismissedByPage[selectedWikiPage] ?? new Set<string>()}
 				<section class="details">
-					<!-- Basic Info: Name fields needed for import (not in MetadataSection) -->
-					<DetailsContainer title="Basic Info">
-						<SuggestionDetailItem
-							label="Name (EN)"
-							bind:value={formDataByPage[selectedWikiPage].name}
-							editable={true}
-							type="text"
-							placeholder="Character name"
-							suggestion={suggestions?.nameEn}
-							dismissedSuggestion={dismissed.has('name')}
-							onAcceptSuggestion={() => handleAcceptSuggestion('name', suggestions?.nameEn)}
-							onDismissSuggestion={() => handleDismissSuggestion('name')}
-						/>
-						<SuggestionDetailItem
-							label="Name (JP)"
-							bind:value={formDataByPage[selectedWikiPage].nameJp}
-							editable={true}
-							type="text"
-							placeholder="キャラクター名"
-							suggestion={suggestions?.nameJp}
-							dismissedSuggestion={dismissed.has('nameJp')}
-							onAcceptSuggestion={() => handleAcceptSuggestion('nameJp', suggestions?.nameJp)}
-							onDismissSuggestion={() => handleDismissSuggestion('nameJp')}
-						/>
-						<SuggestionDetailItem
-							label="Granblue ID"
-							bind:value={formDataByPage[selectedWikiPage].granblueId}
-							editable={true}
-							type="text"
-							placeholder="3040001000"
-							suggestion={suggestions?.granblueId}
-							dismissedSuggestion={dismissed.has('granblueId')}
-							onAcceptSuggestion={() => handleAcceptSuggestion('granblueId', suggestions?.granblueId)}
-							onDismissSuggestion={() => handleDismissSuggestion('granblueId')}
-						/>
-					</DetailsContainer>
-
 					<CharacterMetadataSection
 						character={emptyCharacter}
 						editMode={true}

src/routes/(app)/database/summons/import/+page.svelte

@@ -13,6 +13,7 @@
 		buildGamewithUrl,
 		buildKamigameUrl
 	} from '$lib/utils/external-links'
+	import { getRarityPrefix } from '$lib/utils/rarity'
 
 	// Components
 	import SummonUncapSection from '$lib/features/database/summons/sections/SummonUncapSection.svelte'
@@ -84,6 +85,23 @@
 	// Get selected entity data
 	const selectedEntity = $derived(selectedWikiPage ? entities.get(selectedWikiPage) : null)
 
+	// Auto-generate wiki URLs when Name (JP) or Rarity changes
+	$effect(() => {
+		if (!selectedWikiPage) return
+		const formData = formDataByPage[selectedWikiPage]
+		if (!formData) return
+
+		const nameJp = formData.nameJp
+		const rarity = formData.rarity
+
+		if (nameJp) {
+			// Auto-generate wikiJa: "Name (JP) (SSR)"
+			formData.wikiJa = `${nameJp} (${getRarityPrefix(rarity)})`
+			// Auto-generate kamigame: "SSRName (JP)" for summons
+			formData.kamigame = `${getRarityPrefix(rarity)}${nameJp}`
+		}
+	})
+
 	// Entity tabs for TabbedEntitySelector
 	const entityTabs = $derived<EntityTab[]>(
 		Array.from(entities.entries()).map(([wikiPage, entity]) => ({
@@ -430,39 +448,6 @@
 				{@const suggestions = selectedEntity.suggestions}
 				{@const dismissed = dismissedByPage[selectedWikiPage] ?? new Set<string>()}
 				<section class="details">
-					<DetailsContainer title="Basic Info">
-						<SuggestionDetailItem
-							label="Name (EN)"
-							bind:value={formDataByPage[selectedWikiPage].name}
-							editable={true}
-							type="text"
-							placeholder="Summon name"
-							suggestion={suggestions?.nameEn}
-							dismissedSuggestion={dismissed.has('name')}
-							onAcceptSuggestion={() => handleAcceptSuggestion('name', suggestions?.nameEn)}
-							onDismissSuggestion={() => handleDismissSuggestion('name')}
-						/>
-						<SuggestionDetailItem
-							label="Name (JP)"
-							bind:value={formDataByPage[selectedWikiPage].nameJp}
-							editable={true}
-							type="text"
-							placeholder="召喚石名"
-							suggestion={suggestions?.nameJp}
-							dismissedSuggestion={dismissed.has('nameJp')}
-							onAcceptSuggestion={() => handleAcceptSuggestion('nameJp', suggestions?.nameJp)}
-							onDismissSuggestion={() => handleDismissSuggestion('nameJp')}
-						/>
-						<DetailItem
-							label="Summon ID"
-							sublabel="Internal game identifier (if known)"
-							bind:value={formDataByPage[selectedWikiPage].summonId}
-							editable={true}
-							type="text"
-							placeholder="Optional"
-						/>
-					</DetailsContainer>
-
 					<SummonMetadataSection
 						summon={emptySummon}
 						editMode={true}

src/routes/(app)/database/weapons/import/+page.svelte

@@ -13,6 +13,7 @@
 		buildGamewithUrl,
 		buildKamigameUrl
 	} from '$lib/utils/external-links'
+	import { getRarityPrefix } from '$lib/utils/rarity'
 
 	// Components
 	import WeaponUncapSection from '$lib/features/database/weapons/sections/WeaponUncapSection.svelte'
@@ -84,6 +85,23 @@
 	// Get selected entity data
 	const selectedEntity = $derived(selectedWikiPage ? entities.get(selectedWikiPage) : null)
 
+	// Auto-generate wiki URLs when Name (JP) or Rarity changes
+	$effect(() => {
+		if (!selectedWikiPage) return
+		const formData = formDataByPage[selectedWikiPage]
+		if (!formData) return
+
+		const nameJp = formData.nameJp
+		const rarity = formData.rarity
+
+		if (nameJp) {
+			// Auto-generate wikiJa: "Name (JP) (SSR)"
+			formData.wikiJa = `${nameJp} (${getRarityPrefix(rarity)})`
+			// Auto-generate kamigame: "SSRName (JP)" for weapons
+			formData.kamigame = `${getRarityPrefix(rarity)}${nameJp}`
+		}
+	})
+
 	// Entity tabs for TabbedEntitySelector
 	const entityTabs = $derived<EntityTab[]>(
 		Array.from(entities.entries()).map(([wikiPage, entity]) => ({
@@ -446,31 +464,6 @@
 				{@const suggestions = selectedEntity.suggestions}
 				{@const dismissed = dismissedByPage[selectedWikiPage] ?? new Set<string>()}
 				<section class="details">
-					<DetailsContainer title="Basic Info">
-						<SuggestionDetailItem
-							label="Name (EN)"
-							bind:value={formDataByPage[selectedWikiPage].name}
-							editable={true}
-							type="text"
-							placeholder="Weapon name"
-							suggestion={suggestions?.nameEn}
-							dismissedSuggestion={dismissed.has('name')}
-							onAcceptSuggestion={() => handleAcceptSuggestion('name', suggestions?.nameEn)}
-							onDismissSuggestion={() => handleDismissSuggestion('name')}
-						/>
-						<SuggestionDetailItem
-							label="Name (JP)"
-							bind:value={formDataByPage[selectedWikiPage].nameJp}
-							editable={true}
-							type="text"
-							placeholder="武器名"
-							suggestion={suggestions?.nameJp}
-							dismissedSuggestion={dismissed.has('nameJp')}
-							onAcceptSuggestion={() => handleAcceptSuggestion('nameJp', suggestions?.nameJp)}
-							onDismissSuggestion={() => handleDismissSuggestion('nameJp')}
-						/>
-					</DetailsContainer>
-
 					<WeaponMetadataSection
 						weapon={emptyWeapon}
 						editMode={true}