Switch PF2e data source from Pf2eTools to Foundry VTT PF2e
All checks were successful
CI / check (push) Successful in 2m25s
CI / build-image (push) Successful in 23s

Replace the stagnant Pf2eTools bestiary with Foundry VTT PF2e system
data (github.com/foundryvtt/pf2e, v13-dev branch). This gives us 4,355
remaster-era creatures across 49 sources including Monster Core 1+2 and
all adventure paths.

Changes:
- Rewrite index generation script to walk Foundry pack directories
- Rewrite PF2e normalization adapter for Foundry JSON shape (system.*
  fields, items[] for attacks/abilities/spells)
- Add stripFoundryTags utility for Foundry HTML + enrichment syntax
- Implement multi-file source fetching (one request per creature file)
- Add spellcasting section to PF2e stat block (ranked spells + cantrips)
- Add saveConditional and hpDetails to PF2e domain type and stat block
- Add size and rarity to PF2e trait tags
- Filter redundant glossary abilities (healing when in hp.details,
  spell mechanic reminders, allSaves duplicates)
- Add PF2e stat block component tests (22 tests)
- Bump IndexedDB cache version to 5 for clean migration

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Lukas
2026-04-08 21:05:00 +02:00
parent 0c235112ee
commit 1c107a500b
20 changed files with 1872 additions and 25871 deletions

View File

@@ -115,6 +115,7 @@ export function createTestAdapters(options?: {
getDefaultFetchUrl: (sourceCode) =>
`https://example.com/creatures-${sourceCode.toLowerCase()}.json`,
getSourceDisplayName: (sourceCode) => sourceCode,
getCreaturePathsForSource: () => [],
},
};
}

View File

@@ -1,359 +1,645 @@
import { describe, expect, it } from "vitest";
import { normalizePf2eBestiary } from "../pf2e-bestiary-adapter.js";
import { normalizeFoundryCreature } from "../pf2e-bestiary-adapter.js";
function minimalCreature(overrides?: Record<string, unknown>) {
return {
_id: "test-id",
name: "Test Creature",
source: "TST",
type: "npc",
system: {
abilities: {
str: { mod: 3 },
dex: { mod: 2 },
con: { mod: 1 },
int: { mod: 0 },
wis: { mod: -1 },
cha: { mod: -2 },
},
attributes: {
ac: { value: 18 },
hp: { max: 45 },
speed: { value: 25 },
},
details: {
level: { value: 3 },
languages: { value: ["common"] },
publication: {
license: "ORC",
remaster: true,
title: "Test Source",
},
},
perception: { mod: 8 },
saves: {
fortitude: { value: 10 },
reflex: { value: 8 },
will: { value: 6 },
},
skills: {},
traits: { rarity: "common", size: { value: "med" }, value: [] },
},
items: [],
...overrides,
};
}
describe("normalizePf2eBestiary", () => {
describe("weaknesses formatting", () => {
it("formats weakness with numeric amount", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
defenses: {
weaknesses: [{ name: "fire", amount: 5 }],
},
}),
],
});
expect(creature.weaknesses).toBe("Fire 5");
describe("normalizeFoundryCreature", () => {
describe("basic fields", () => {
it("maps top-level fields correctly", () => {
const creature = normalizeFoundryCreature(minimalCreature());
expect(creature.system).toBe("pf2e");
expect(creature.name).toBe("Test Creature");
expect(creature.level).toBe(3);
expect(creature.ac).toBe(18);
expect(creature.hp).toBe(45);
expect(creature.perception).toBe(8);
expect(creature.saveFort).toBe(10);
expect(creature.saveRef).toBe(8);
expect(creature.saveWill).toBe(6);
});
it("formats weakness without amount (qualitative)", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
defenses: {
weaknesses: [{ name: "smoke susceptibility" }],
},
}),
],
it("maps ability modifiers", () => {
const creature = normalizeFoundryCreature(minimalCreature());
expect(creature.abilityMods).toEqual({
str: 3,
dex: 2,
con: 1,
int: 0,
wis: -1,
cha: -2,
});
expect(creature.weaknesses).toBe("Smoke susceptibility");
});
it("formats weakness with note and amount", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
defenses: {
weaknesses: [
{ name: "cold iron", amount: 5, note: "except daggers" },
],
it("maps AC conditional from details", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
attributes: {
...minimalCreature().system.attributes,
ac: { value: 20, details: "+2 with shield raised" },
},
}),
],
});
expect(creature.weaknesses).toBe("Cold iron 5 (except daggers)");
});
it("formats weakness with note but no amount", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
defenses: {
weaknesses: [{ name: "smoke susceptibility", note: "see below" }],
},
}),
],
});
expect(creature.weaknesses).toBe("Smoke susceptibility (see below)");
});
it("returns undefined when no weaknesses", () => {
const [creature] = normalizePf2eBestiary({
creature: [minimalCreature({})],
});
expect(creature.weaknesses).toBeUndefined();
},
}),
);
expect(creature.acConditional).toBe("+2 with shield raised");
});
});
describe("senses formatting", () => {
it("strips tags and includes type and range", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
senses: [
{
type: "imprecise",
name: "{@ability tremorsense}",
range: 30,
},
],
}),
],
});
expect(creature.senses).toBe("Tremorsense (imprecise) 30 feet");
});
it("formats sense with only a name", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
senses: [{ name: "darkvision" }],
}),
],
});
it("formats darkvision", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
perception: {
mod: 8,
senses: [{ type: "darkvision" }],
},
},
}),
);
expect(creature.senses).toBe("Darkvision");
});
it("formats sense with name and range but no type", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
senses: [{ name: "scent", range: 60 }],
}),
],
});
it("formats sense with acuity and range", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
perception: {
mod: 8,
senses: [{ type: "tremorsense", acuity: "imprecise", range: 30 }],
},
},
}),
);
expect(creature.senses).toBe("Tremorsense (imprecise) 30 feet");
});
it("omits precise acuity", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
perception: {
mod: 8,
senses: [{ type: "scent", acuity: "precise", range: 60 }],
},
},
}),
);
expect(creature.senses).toBe("Scent 60 feet");
});
});
describe("attack formatting", () => {
it("strips angle brackets from traits", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
attacks: [
{
name: "stinger",
range: "Melee",
attack: 11,
traits: ["deadly <d8>"],
damage: "1d6+4 piercing",
},
],
}),
],
});
const attack = creature.attacks?.[0];
expect(attack).toBeDefined();
expect(attack?.segments[0]).toEqual(
expect.objectContaining({
type: "text",
value: expect.stringContaining("(deadly d8)"),
describe("languages formatting", () => {
it("formats language list", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
details: {
...minimalCreature().system.details,
languages: { value: ["common", "draconic"] },
},
},
}),
);
expect(creature.languages).toBe("Common, Draconic");
});
it("includes details", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
details: {
...minimalCreature().system.details,
languages: {
value: ["common"],
details: "telepathy 100 feet",
},
},
},
}),
);
expect(creature.languages).toBe("Common (telepathy 100 feet)");
});
});
describe("skills formatting", () => {
it("formats and sorts skills", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
skills: {
stealth: { base: 10 },
athletics: { base: 8 },
},
},
}),
);
expect(creature.skills).toBe("Athletics +8, Stealth +10");
});
});
describe("defenses formatting", () => {
it("formats immunities with exceptions", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
attributes: {
...minimalCreature().system.attributes,
immunities: [
{ type: "paralyzed", exceptions: [] },
{
type: "physical",
exceptions: ["adamantine"],
},
],
},
},
}),
);
expect(creature.immunities).toBe(
"Paralyzed, Physical (except Adamantine)",
);
});
it("strips angle brackets from reach values in traits", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
attacks: [
{
name: "tentacle",
range: "Melee",
attack: 18,
traits: ["agile", "chaotic", "magical", "reach <10 feet>"],
damage: "2d8+6 piercing",
it("formats resistances with value", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
attributes: {
...minimalCreature().system.attributes,
resistances: [{ type: "fire", value: 10, exceptions: [] }],
},
},
}),
);
expect(creature.resistances).toBe("Fire 10");
});
it("formats weaknesses", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
attributes: {
...minimalCreature().system.attributes,
weaknesses: [{ type: "cold-iron", value: 5 }],
},
},
}),
);
expect(creature.weaknesses).toBe("Cold iron 5");
});
});
describe("speed formatting", () => {
it("formats base speed", () => {
const creature = normalizeFoundryCreature(minimalCreature());
expect(creature.speed).toBe("25 feet");
});
it("includes other speeds", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
attributes: {
...minimalCreature().system.attributes,
speed: {
value: 40,
otherSpeeds: [
{ type: "fly", value: 120 },
{ type: "swim", value: 40 },
],
},
],
}),
],
});
},
},
}),
);
expect(creature.speed).toBe("40 feet, Fly 120 feet, Swim 40 feet");
});
it("includes speed details", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
system: {
...minimalCreature().system,
attributes: {
...minimalCreature().system.attributes,
speed: {
value: 25,
details: "ignores difficult terrain",
},
},
},
}),
);
expect(creature.speed).toBe("25 feet (ignores difficult terrain)");
});
});
describe("attack normalization", () => {
it("normalizes melee attacks with traits and damage", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "atk1",
name: "dogslicer",
type: "melee",
system: {
bonus: { value: 7 },
damageRolls: {
abc: {
damage: "1d6",
damageType: "slashing",
},
},
traits: {
value: ["agile", "backstabber", "finesse"],
},
},
},
],
}),
);
const attack = creature.attacks?.[0];
expect(attack).toBeDefined();
expect(attack?.name).toBe("Dogslicer");
expect(attack?.activity).toEqual({ number: 1, unit: "action" });
expect(attack?.segments[0]).toEqual({
type: "text",
value: "+7 (agile, backstabber, finesse), 1d6 slashing",
});
});
it("expands slugified trait names", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "atk1",
name: "claw",
type: "melee",
system: {
bonus: { value: 18 },
damageRolls: {
abc: {
damage: "2d8+6",
damageType: "slashing",
},
},
traits: {
value: ["reach-10", "deadly-d10", "versatile-p"],
},
},
},
],
}),
);
const attack = creature.attacks?.[0];
expect(attack?.segments[0]).toEqual({
type: "text",
value: "+18 (reach 10 feet, deadly d10, versatile P), 2d8+6 slashing",
});
});
it("handles multiple damage types", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "atk1",
name: "flaming sword",
type: "melee",
system: {
bonus: { value: 15 },
damageRolls: {
abc: {
damage: "2d8+5",
damageType: "slashing",
},
def: {
damage: "1d6",
damageType: "fire",
},
},
traits: { value: [] },
},
},
],
}),
);
const attack = creature.attacks?.[0];
expect(attack?.segments[0]).toEqual(
expect.objectContaining({
type: "text",
value: expect.stringContaining(
"(agile, chaotic, magical, reach 10 feet)",
),
value: "+15, 2d8+5 slashing plus 1d6 fire",
}),
);
});
});
describe("ability formatting", () => {
it("includes traits from abilities in the text", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
abilities: {
bot: [
{
name: "Change Shape",
activity: { number: 1, unit: "action" },
traits: [
"concentrate",
"divine",
"polymorph",
"transmutation",
],
entries: [
"The naunet can take the appearance of any creature.",
],
},
],
describe("ability normalization", () => {
it("routes abilities by category", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "a1",
name: "Sense Motive",
type: "action",
system: {
category: "interaction",
actionType: { value: "passive" },
actions: { value: null },
traits: { value: [] },
description: { value: "<p>Can sense lies.</p>" },
},
},
}),
],
});
const ability = creature.abilitiesBot?.[0];
expect(ability).toBeDefined();
expect(ability?.name).toBe("Change Shape");
expect(ability?.activity).toEqual({ number: 1, unit: "action" });
expect(ability?.segments[0]).toEqual(
expect.objectContaining({
type: "text",
value: expect.stringContaining(
"(Concentrate, Divine, Polymorph, Transmutation)",
),
{
_id: "a2",
name: "Shield Block",
type: "action",
system: {
category: "defensive",
actionType: { value: "reaction" },
actions: { value: null },
traits: { value: [] },
description: {
value: "<p>Blocks with shield.</p>",
},
},
},
{
_id: "a3",
name: "Breath Weapon",
type: "action",
system: {
category: "offensive",
actionType: { value: "action" },
actions: { value: 2 },
traits: { value: ["arcane", "fire"] },
description: {
value:
"<p>@Damage[8d6[fire]] in a @Template[cone|distance:40].</p>",
},
},
},
],
}),
);
expect(creature.abilitiesTop).toHaveLength(1);
expect(creature.abilitiesTop?.[0]?.name).toBe("Sense Motive");
expect(creature.abilitiesTop?.[0]?.activity).toBeUndefined();
expect(creature.abilitiesMid).toHaveLength(1);
expect(creature.abilitiesMid?.[0]?.name).toBe("Shield Block");
expect(creature.abilitiesMid?.[0]?.activity).toEqual({
number: 1,
unit: "reaction",
});
expect(creature.abilitiesBot).toHaveLength(1);
expect(creature.abilitiesBot?.[0]?.name).toBe("Breath Weapon");
expect(creature.abilitiesBot?.[0]?.activity).toEqual({
number: 2,
unit: "action",
});
});
it("strips Foundry enrichment tags from descriptions", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "a1",
name: "Flame Burst",
type: "action",
system: {
category: "offensive",
actionType: { value: "action" },
actions: { value: 2 },
traits: { value: [] },
description: {
value:
"<p>Deal @Damage[3d6[fire]] damage, @Check[reflex|dc:20|basic] save.</p>",
},
},
},
],
}),
);
expect(
creature.abilitiesBot?.[0]?.segments[0]?.type === "text"
? creature.abilitiesBot[0].segments[0].value
: undefined,
).toBe("Deal 3d6 fire damage, DC 20 basic Reflex save.");
});
it("parses free action activity", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
abilities: {
bot: [
{
name: "Adaptive Strike",
activity: { number: 1, unit: "free" },
entries: ["The naunet chooses adamantine."],
},
],
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "a1",
name: "Quick Draw",
type: "action",
system: {
category: "offensive",
actionType: { value: "free" },
actions: { value: null },
traits: { value: [] },
description: { value: "" },
},
},
}),
],
});
const ability = creature.abilitiesBot?.[0];
expect(ability?.name).toBe("Adaptive Strike");
expect(ability?.activity).toEqual({ number: 1, unit: "free" });
});
it("parses reaction activity", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
abilities: {
mid: [
{
name: "Attack of Opportunity",
activity: { number: 1, unit: "reaction" },
entries: ["Trigger description."],
},
],
},
}),
],
});
const ability = creature.abilitiesMid?.[0];
expect(ability?.name).toBe("Attack of Opportunity");
expect(ability?.activity).toEqual({ number: 1, unit: "reaction" });
});
it("parses multi-action activity", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
abilities: {
bot: [
{
name: "Breath Weapon",
activity: { number: 2, unit: "action" },
entries: ["Fire breath."],
},
],
},
}),
],
});
const ability = creature.abilitiesBot?.[0];
expect(ability?.name).toBe("Breath Weapon");
expect(ability?.activity).toEqual({ number: 2, unit: "action" });
});
it("renders ability without activity or traits normally", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
abilities: {
bot: [
{
name: "Constrict",
entries: ["1d8+8 bludgeoning, DC 26"],
},
],
},
}),
],
});
const ability = creature.abilitiesBot?.[0];
expect(ability).toBeDefined();
expect(ability?.name).toBe("Constrict");
expect(ability?.activity).toBeUndefined();
expect(ability?.segments[0]).toEqual(
expect.objectContaining({
type: "text",
value: "1d8+8 bludgeoning, DC 26",
],
}),
);
expect(creature.abilitiesBot?.[0]?.activity).toEqual({
number: 1,
unit: "free",
});
});
it("includes trigger text before entries", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
abilities: {
mid: [
{
name: "Wing Deflection",
activity: { number: 1, unit: "reaction" },
trigger: "The dragon is targeted with an attack.",
entries: ["The dragon raises its wing."],
it("includes traits in ability text", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "a1",
name: "Change Shape",
type: "action",
system: {
category: "offensive",
actionType: { value: "action" },
actions: { value: 1 },
traits: {
value: ["concentrate", "polymorph"],
},
],
description: {
value: "<p>Takes a new form.</p>",
},
},
},
}),
],
});
const ability = creature.abilitiesMid?.[0];
expect(ability).toBeDefined();
expect(ability?.activity).toEqual({ number: 1, unit: "reaction" });
expect(ability?.trigger).toBe("The dragon is targeted with an attack.");
expect(ability?.segments[0]).toEqual(
expect.objectContaining({
type: "text",
value: "The dragon raises its wing.",
],
}),
);
expect(
creature.abilitiesBot?.[0]?.segments[0]?.type === "text"
? creature.abilitiesBot[0].segments[0].value
: undefined,
).toBe("(Concentrate, Polymorph) Takes a new form.");
});
});
describe("resistances formatting", () => {
it("formats resistance without amount", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
defenses: {
resistances: [{ name: "physical" }],
describe("spellcasting normalization", () => {
it("normalizes prepared spells by rank", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "entry1",
name: "Primal Prepared Spells",
type: "spellcastingEntry",
system: {
tradition: { value: "primal" },
prepared: { value: "prepared" },
spelldc: { dc: 30, value: 22 },
},
},
}),
],
});
expect(creature.resistances).toBe("Physical");
{
_id: "s1",
name: "Earthquake",
type: "spell",
system: {
location: { value: "entry1" },
level: { value: 6 },
traits: { value: [] },
},
},
{
_id: "s2",
name: "Heal",
type: "spell",
system: {
location: { value: "entry1" },
level: { value: 3 },
traits: { value: [] },
},
},
{
_id: "s3",
name: "Detect Magic",
type: "spell",
system: {
location: { value: "entry1" },
level: { value: 1 },
traits: { value: ["cantrip"] },
},
},
],
}),
);
expect(creature.spellcasting).toHaveLength(1);
const sc = creature.spellcasting?.[0];
expect(sc?.name).toBe("Primal Prepared Spells");
expect(sc?.headerText).toBe("DC 30, attack +22");
expect(sc?.daily).toEqual([
{ uses: 6, each: true, spells: ["Earthquake"] },
{ uses: 3, each: true, spells: ["Heal"] },
]);
expect(sc?.atWill).toEqual(["Detect Magic"]);
});
it("formats resistance with amount", () => {
const [creature] = normalizePf2eBestiary({
creature: [
minimalCreature({
defenses: {
resistances: [{ name: "fire", amount: 10 }],
it("normalizes innate spells with uses", () => {
const creature = normalizeFoundryCreature(
minimalCreature({
items: [
{
_id: "entry1",
name: "Divine Innate Spells",
type: "spellcastingEntry",
system: {
tradition: { value: "divine" },
prepared: { value: "innate" },
spelldc: { dc: 32 },
},
},
}),
],
});
expect(creature.resistances).toBe("Fire 10");
{
_id: "s1",
name: "Sure Strike",
type: "spell",
system: {
location: {
value: "entry1",
heightenedLevel: 1,
uses: { max: 3, value: 3 },
},
level: { value: 1 },
traits: { value: [] },
},
},
],
}),
);
const sc = creature.spellcasting?.[0];
expect(sc?.headerText).toBe("DC 32");
expect(sc?.daily).toEqual([
{
uses: 1,
each: true,
spells: ["Sure Strike (\u00d73)"],
},
]);
});
});
});

View File

@@ -1,6 +1,11 @@
import { describe, expect, it } from "vitest";
const PACK_DIR_PREFIX = /^pathfinder-monster-core\//;
const JSON_EXTENSION = /\.json$/;
import {
getAllPf2eSourceCodes,
getCreaturePathsForSource,
getDefaultPf2eFetchUrl,
getPf2eSourceDisplayName,
loadPf2eBestiaryIndex,
@@ -30,7 +35,15 @@ describe("loadPf2eBestiaryIndex", () => {
it("contains a substantial number of creatures", () => {
const index = loadPf2eBestiaryIndex();
expect(index.creatures.length).toBeGreaterThan(2000);
expect(index.creatures.length).toBeGreaterThan(2500);
});
it("creatures have size and type populated", () => {
const index = loadPf2eBestiaryIndex();
const withSize = index.creatures.filter((c) => c.size !== "");
const withType = index.creatures.filter((c) => c.type !== "");
expect(withSize.length).toBeGreaterThan(index.creatures.length * 0.9);
expect(withType.length).toBeGreaterThan(index.creatures.length * 0.8);
});
it("returns the same cached instance on subsequent calls", () => {
@@ -49,20 +62,42 @@ describe("getAllPf2eSourceCodes", () => {
});
describe("getDefaultPf2eFetchUrl", () => {
it("returns Pf2eTools GitHub URL with lowercase source code", () => {
const url = getDefaultPf2eFetchUrl("B1");
it("returns Foundry VTT PF2e base URL", () => {
const url = getDefaultPf2eFetchUrl("pathfinder-monster-core");
expect(url).toBe(
"https://raw.githubusercontent.com/Pf2eToolsOrg/Pf2eTools/dev/data/bestiary/creatures-b1.json",
"https://raw.githubusercontent.com/foundryvtt/pf2e/v13-dev/packs/pf2e/",
);
});
it("normalizes custom base URL with trailing slash", () => {
const url = getDefaultPf2eFetchUrl(
"pathfinder-monster-core",
"https://example.com/pf2e",
);
expect(url).toBe("https://example.com/pf2e/");
});
});
describe("getPf2eSourceDisplayName", () => {
it("returns display name for a known source", () => {
expect(getPf2eSourceDisplayName("B1")).toBe("Bestiary");
const name = getPf2eSourceDisplayName("pathfinder-monster-core");
expect(name).toBe("Monster Core");
});
it("falls back to source code for unknown source", () => {
expect(getPf2eSourceDisplayName("UNKNOWN")).toBe("UNKNOWN");
});
});
describe("getCreaturePathsForSource", () => {
it("returns file paths for a known source", () => {
const paths = getCreaturePathsForSource("pathfinder-monster-core");
expect(paths.length).toBeGreaterThan(100);
expect(paths[0]).toMatch(PACK_DIR_PREFIX);
expect(paths[0]).toMatch(JSON_EXTENSION);
});
it("returns empty array for unknown source", () => {
expect(getCreaturePathsForSource("nonexistent")).toEqual([]);
});
});

View File

@@ -0,0 +1,162 @@
import { describe, expect, it } from "vitest";
import { stripFoundryTags } from "../strip-foundry-tags.js";
describe("stripFoundryTags", () => {
describe("@Damage tags", () => {
it("formats damage with type bracket", () => {
expect(stripFoundryTags("@Damage[3d6+10[fire]]")).toBe("3d6+10 fire");
});
it("prefers display text when present", () => {
expect(
stripFoundryTags("@Damage[3d6+10[fire]]{3d6+10 fire damage}"),
).toBe("3d6+10 fire damage");
});
it("handles multiple damage types", () => {
expect(
stripFoundryTags("@Damage[2d8+5[slashing]] plus @Damage[1d6[fire]]"),
).toBe("2d8+5 slashing plus 1d6 fire");
});
});
describe("@Check tags", () => {
it("formats basic saving throw", () => {
expect(stripFoundryTags("@Check[reflex|dc:33|basic]")).toBe(
"DC 33 basic Reflex",
);
});
it("formats non-basic check", () => {
expect(stripFoundryTags("@Check[athletics|dc:25]")).toBe(
"DC 25 Athletics",
);
});
it("formats check without DC", () => {
expect(stripFoundryTags("@Check[fortitude]")).toBe("Fortitude");
});
});
describe("@UUID tags", () => {
it("extracts display text", () => {
expect(
stripFoundryTags(
"@UUID[Compendium.pf2e.conditionitems.Item.Grabbed]{Grabbed}",
),
).toBe("Grabbed");
});
it("extracts last segment when no display text", () => {
expect(
stripFoundryTags("@UUID[Compendium.pf2e.conditionitems.Item.Grabbed]"),
).toBe("Grabbed");
});
});
describe("@Template tags", () => {
it("formats cone template", () => {
expect(stripFoundryTags("@Template[cone|distance:40]")).toBe(
"40-foot cone",
);
});
it("formats emanation template", () => {
expect(stripFoundryTags("@Template[emanation|distance:10]")).toBe(
"10-foot emanation",
);
});
it("prefers display text", () => {
expect(
stripFoundryTags("@Template[cone|distance:40]{40-foot cone}"),
).toBe("40-foot cone");
});
});
describe("unknown @Tag patterns", () => {
it("uses display text for unknown tags", () => {
expect(stripFoundryTags("@Localize[some.key]{Some Text}")).toBe(
"Some Text",
);
});
it("strips unknown tags without display text", () => {
expect(stripFoundryTags("@Localize[some.key]")).toBe("");
});
});
describe("HTML stripping", () => {
it("strips paragraph tags", () => {
expect(stripFoundryTags("<p>text</p>")).toBe("text");
});
it("converts br to newline", () => {
expect(stripFoundryTags("line1<br />line2")).toBe("line1\nline2");
});
it("converts hr to newline", () => {
expect(stripFoundryTags("before<hr />after")).toBe("before\nafter");
});
it("strips strong and em tags", () => {
expect(stripFoundryTags("<strong>bold</strong> <em>italic</em>")).toBe(
"bold italic",
);
});
it("converts p-to-p transitions to newlines", () => {
expect(stripFoundryTags("<p>first</p><p>second</p>")).toBe(
"first\nsecond",
);
});
it("strips action-glyph spans", () => {
expect(
stripFoundryTags('<span class="action-glyph">1</span> Strike'),
).toBe("Strike");
});
});
describe("HTML entities", () => {
it("decodes &amp;", () => {
expect(stripFoundryTags("fire &amp; ice")).toBe("fire & ice");
});
it("decodes &lt; and &gt;", () => {
expect(stripFoundryTags("&lt;tag&gt;")).toBe("<tag>");
});
it("decodes &quot;", () => {
expect(stripFoundryTags("&quot;hello&quot;")).toBe('"hello"');
});
});
describe("whitespace handling", () => {
it("collapses multiple spaces", () => {
expect(stripFoundryTags("a b c")).toBe("a b c");
});
it("collapses multiple blank lines", () => {
expect(stripFoundryTags("a\n\n\nb")).toBe("a\nb");
});
it("trims leading and trailing whitespace", () => {
expect(stripFoundryTags(" hello ")).toBe("hello");
});
});
describe("combined/edge cases", () => {
it("handles enrichment tags inside HTML", () => {
expect(
stripFoundryTags(
"<p>Deal @Damage[2d6[fire]] damage, @Check[reflex|dc:20|basic] save.</p>",
),
).toBe("Deal 2d6 fire damage, DC 20 basic Reflex save.");
});
it("handles empty string", () => {
expect(stripFoundryTags("")).toBe("");
});
});
});

View File

@@ -3,7 +3,7 @@ import { type IDBPDatabase, openDB } from "idb";
const DB_NAME = "initiative-bestiary";
const STORE_NAME = "sources";
const DB_VERSION = 4;
const DB_VERSION = 5;
interface CachedSourceInfo {
readonly sourceCode: string;

View File

@@ -1,389 +1,531 @@
import type {
CreatureId,
Pf2eCreature,
SpellcastingBlock,
TraitBlock,
TraitSegment,
} from "@initiative/domain";
import { creatureId } from "@initiative/domain";
import { stripTags } from "./strip-tags.js";
import { stripFoundryTags } from "./strip-foundry-tags.js";
// -- Raw Pf2eTools types (minimal, for parsing) --
// -- Raw Foundry VTT types (minimal, for parsing) --
interface RawPf2eCreature {
interface RawFoundryCreature {
_id: string;
name: string;
source: string;
level?: number;
traits?: string[];
perception?: { std?: number };
senses?: { name?: string; type?: string; range?: number }[];
languages?: { languages?: string[] };
skills?: Record<string, { std?: number }>;
abilityMods?: Record<string, number>;
items?: string[];
defenses?: RawDefenses;
speed?: Record<string, number | { number: number }>;
attacks?: RawAttack[];
abilities?: {
top?: RawAbility[];
mid?: RawAbility[];
bot?: RawAbility[];
type: string;
system: {
abilities: Record<string, { mod: number }>;
attributes: {
ac: { value: number; details?: string };
hp: { max: number; details?: string };
speed: {
value: number;
otherSpeeds?: { type: string; value: number }[];
details?: string;
};
immunities?: { type: string; exceptions?: string[] }[];
resistances?: { type: string; value: number; exceptions?: string[] }[];
weaknesses?: { type: string; value: number }[];
allSaves?: { value: string };
};
details: {
level: { value: number };
languages: { value?: string[]; details?: string };
publication: { license: string; remaster: boolean; title: string };
};
perception: {
mod: number;
details?: string;
senses?: { type: string; acuity?: string; range?: number }[];
};
saves: {
fortitude: { value: number; saveDetail?: string };
reflex: { value: number; saveDetail?: string };
will: { value: number; saveDetail?: string };
};
skills: Record<string, { base: number; note?: string }>;
traits: { rarity: string; size: { value: string }; value: string[] };
};
_copy?: unknown;
items: RawFoundryItem[];
}
interface RawDefenses {
ac?: Record<string, unknown>;
savingThrows?: {
fort?: { std?: number };
ref?: { std?: number };
will?: { std?: number };
};
hp?: { hp?: number }[];
immunities?: (string | { name: string })[];
resistances?: { amount?: number; name: string; note?: string }[];
weaknesses?: { amount?: number; name: string; note?: string }[];
}
interface RawAbility {
name?: string;
activity?: { number?: number; unit?: string };
trigger?: string;
traits?: string[];
entries?: RawEntry[];
}
interface RawAttack {
range?: string;
interface RawFoundryItem {
_id: string;
name: string;
attack?: number;
traits?: string[];
damage?: string;
type: string;
system: Record<string, unknown>;
sort?: number;
}
type RawEntry = string | RawEntryObject;
interface RawEntryObject {
type?: string;
items?: (string | { name?: string; entry?: string })[];
entries?: RawEntry[];
interface MeleeSystem {
bonus?: { value: number };
damageRolls?: Record<string, { damage: string; damageType: string }>;
traits?: { value: string[] };
}
// -- Module state --
let sourceDisplayNames: Record<string, string> = {};
export function setPf2eSourceDisplayNames(names: Record<string, string>): void {
sourceDisplayNames = names;
interface ActionSystem {
category?: string;
actionType?: { value: string };
actions?: { value: number | null };
traits?: { value: string[] };
description?: { value: string };
}
interface SpellcastingEntrySystem {
tradition?: { value: string };
prepared?: { value: string };
spelldc?: { dc: number; value?: number };
}
interface SpellSystem {
location?: {
value: string;
heightenedLevel?: number;
uses?: { max: number; value: number };
};
level?: { value: number };
traits?: { value: string[] };
}
const SIZE_MAP: Record<string, string> = {
tiny: "tiny",
sm: "small",
med: "medium",
lg: "large",
huge: "huge",
grg: "gargantuan",
};
// -- Helpers --
function capitalize(s: string): string {
return s.charAt(0).toUpperCase() + s.slice(1);
}
function parseActivity(
activity: { number?: number; unit?: string } | undefined,
): { number: number; unit: "action" | "free" | "reaction" } | undefined {
if (!activity?.unit) return undefined;
const unit = activity.unit;
if (unit === "action" || unit === "free" || unit === "reaction") {
return { number: activity.number ?? 1, unit };
}
return undefined;
}
function stripAngleBrackets(s: string): string {
return s.replaceAll(/<([^>]+)>/g, "$1");
}
function makeCreatureId(source: string, name: string): CreatureId {
const slug = name
.toLowerCase()
.replaceAll(/[^a-z0-9]+/g, "-")
.replaceAll(/(^-|-$)/g, "");
return creatureId(`${source.toLowerCase()}:${slug}`);
return creatureId(`${source}:${slug}`);
}
function formatSpeed(
speed: Record<string, number | { number: number }> | undefined,
): string {
if (!speed) return "";
const parts: string[] = [];
for (const [mode, value] of Object.entries(speed)) {
if (typeof value === "number") {
parts.push(
mode === "walk" ? `${value} feet` : `${capitalize(mode)} ${value} feet`,
);
} else if (typeof value === "object" && "number" in value) {
parts.push(
mode === "walk"
? `${value.number} feet`
: `${capitalize(mode)} ${value.number} feet`,
);
}
const NUMERIC_SLUG = /^(.+)-(\d+)$/;
const LETTER_SLUG = /^(.+)-([a-z])$/;
/** Format rules for traits with a numeric suffix: "reach-10" → "reach 10 feet" */
const NUMERIC_TRAIT_FORMATS: Record<string, (n: string) => string> = {
reach: (n) => `reach ${n} feet`,
range: (n) => `range ${n} feet`,
"range-increment": (n) => `range increment ${n} feet`,
versatile: (n) => `versatile ${n}`,
deadly: (n) => `deadly d${n}`,
fatal: (n) => `fatal d${n}`,
"fatal-aim": (n) => `fatal aim d${n}`,
reload: (n) => `reload ${n}`,
};
/** Format rules for traits with a letter suffix: "versatile-p" → "versatile P" */
const LETTER_TRAIT_FORMATS: Record<string, (l: string) => string> = {
versatile: (l) => `versatile ${l.toUpperCase()}`,
deadly: (l) => `deadly d${l}`,
};
/** Expand slugified trait names: "reach-10" → "reach 10 feet" */
function formatTrait(slug: string): string {
const numMatch = NUMERIC_SLUG.exec(slug);
if (numMatch) {
const [, base, num] = numMatch;
const fmt = NUMERIC_TRAIT_FORMATS[base];
return fmt ? fmt(num) : `${base} ${num}`;
}
return parts.join(", ");
const letterMatch = LETTER_SLUG.exec(slug);
if (letterMatch) {
const [, base, letter] = letterMatch;
const fmt = LETTER_TRAIT_FORMATS[base];
if (fmt) return fmt(letter);
}
return slug.replaceAll("-", " ");
}
function formatSkills(
skills: Record<string, { std?: number }> | undefined,
): string | undefined {
if (!skills) return undefined;
const parts = Object.entries(skills)
.map(([name, val]) => `${capitalize(name)} +${val.std ?? 0}`)
.sort();
return parts.length > 0 ? parts.join(", ") : undefined;
}
// -- Formatting --
function formatSenses(
senses:
| readonly { name?: string; type?: string; range?: number }[]
| undefined,
senses: { type: string; acuity?: string; range?: number }[] | undefined,
): string | undefined {
if (!senses || senses.length === 0) return undefined;
return senses
.map((s) => {
const label = stripTags(s.name ?? s.type ?? "");
if (!label) return "";
const parts = [capitalize(label)];
if (s.type && s.name) parts.push(`(${s.type})`);
const parts = [capitalize(s.type.replaceAll("-", " "))];
if (s.acuity && s.acuity !== "precise") {
parts.push(`(${s.acuity})`);
}
if (s.range != null) parts.push(`${s.range} feet`);
return parts.join(" ");
})
.filter(Boolean)
.join(", ");
}
function formatLanguages(
languages: { languages?: string[] } | undefined,
languages: { value?: string[]; details?: string } | undefined,
): string | undefined {
if (!languages?.languages || languages.languages.length === 0)
return undefined;
return languages.languages.map(capitalize).join(", ");
if (!languages?.value || languages.value.length === 0) return undefined;
const list = languages.value.map(capitalize).join(", ");
return languages.details ? `${list} (${languages.details})` : list;
}
function formatSkills(
skills: Record<string, { base: number; note?: string }> | undefined,
): string | undefined {
if (!skills) return undefined;
const entries = Object.entries(skills);
if (entries.length === 0) return undefined;
return entries
.map(([name, val]) => {
const label = capitalize(name.replaceAll("-", " "));
return `${label} +${val.base}`;
})
.sort()
.join(", ");
}
function formatImmunities(
immunities: readonly (string | { name: string })[] | undefined,
immunities: { type: string; exceptions?: string[] }[] | undefined,
): string | undefined {
if (!immunities || immunities.length === 0) return undefined;
return immunities
.map((i) => capitalize(typeof i === "string" ? i : i.name))
.map((i) => {
const base = capitalize(i.type.replaceAll("-", " "));
if (i.exceptions && i.exceptions.length > 0) {
return `${base} (except ${i.exceptions.map((e) => capitalize(e.replaceAll("-", " "))).join(", ")})`;
}
return base;
})
.join(", ");
}
function formatResistances(
resistances:
| readonly { amount?: number; name: string; note?: string }[]
| { type: string; value: number; exceptions?: string[] }[]
| undefined,
): string | undefined {
if (!resistances || resistances.length === 0) return undefined;
return resistances
.map((r) => {
const base =
r.amount == null
? capitalize(r.name)
: `${capitalize(r.name)} ${r.amount}`;
return r.note ? `${base} (${r.note})` : base;
const base = `${capitalize(r.type.replaceAll("-", " "))} ${r.value}`;
if (r.exceptions && r.exceptions.length > 0) {
return `${base} (except ${r.exceptions.map((e) => capitalize(e.replaceAll("-", " "))).join(", ")})`;
}
return base;
})
.join(", ");
}
function formatWeaknesses(
weaknesses:
| readonly { amount?: number; name: string; note?: string }[]
| undefined,
weaknesses: { type: string; value: number }[] | undefined,
): string | undefined {
if (!weaknesses || weaknesses.length === 0) return undefined;
return weaknesses
.map((w) => {
const base =
w.amount == null
? capitalize(w.name)
: `${capitalize(w.name)} ${w.amount}`;
return w.note ? `${base} (${w.note})` : base;
})
.map((w) => `${capitalize(w.type.replaceAll("-", " "))} ${w.value}`)
.join(", ");
}
// -- Entry parsing --
function segmentizeEntries(entries: unknown): TraitSegment[] {
if (!Array.isArray(entries)) return [];
const segments: TraitSegment[] = [];
for (const entry of entries) {
if (typeof entry === "string") {
segments.push({ type: "text", value: stripTags(entry) });
} else if (typeof entry === "object" && entry !== null) {
const obj = entry as RawEntryObject;
if (obj.type === "list" && Array.isArray(obj.items)) {
segments.push({
type: "list",
items: obj.items.map((item) => {
if (typeof item === "string") {
return { text: stripTags(item) };
}
return { label: item.name, text: stripTags(item.entry ?? "") };
}),
});
} else if (Array.isArray(obj.entries)) {
segments.push(...segmentizeEntries(obj.entries));
}
function formatSpeed(speed: {
value: number;
otherSpeeds?: { type: string; value: number }[];
details?: string;
}): string {
const parts = [`${speed.value} feet`];
if (speed.otherSpeeds) {
for (const s of speed.otherSpeeds) {
parts.push(`${capitalize(s.type)} ${s.value} feet`);
}
}
return segments;
const base = parts.join(", ");
return speed.details ? `${base} (${speed.details})` : base;
}
function formatAffliction(a: Record<string, unknown>): TraitSegment[] {
const parts: string[] = [];
if (a.note) parts.push(stripTags(String(a.note)));
if (a.DC) parts.push(`DC ${a.DC}`);
if (a.savingThrow) parts.push(String(a.savingThrow));
const stages = a.stages as
| { stage: number; entry: string; duration: string }[]
| undefined;
if (stages) {
for (const s of stages) {
parts.push(`Stage ${s.stage}: ${stripTags(s.entry)} (${s.duration})`);
}
}
return parts.length > 0 ? [{ type: "text", value: parts.join("; ") }] : [];
}
// -- Attack normalization --
function normalizeAbilities(
abilities: readonly RawAbility[] | undefined,
): TraitBlock[] | undefined {
if (!abilities || abilities.length === 0) return undefined;
return abilities
.filter((a) => a.name)
.map((a) => {
const raw = a as Record<string, unknown>;
const activity = parseActivity(a.activity);
const trigger = a.trigger ? stripTags(a.trigger) : undefined;
const traits =
a.traits && a.traits.length > 0
? `(${a.traits.map((t) => capitalize(stripAngleBrackets(stripTags(t)))).join(", ")}) `
: "";
const prefix = traits;
const body = Array.isArray(a.entries)
? segmentizeEntries(a.entries)
: formatAffliction(raw);
const name = stripTags(a.name as string);
if (prefix && body.length > 0 && body[0].type === "text") {
return {
name,
activity,
trigger,
segments: [
{ type: "text" as const, value: prefix + body[0].value },
...body.slice(1),
],
};
}
return {
name,
activity,
trigger,
segments: prefix
? [{ type: "text" as const, value: prefix }, ...body]
: body,
};
});
}
function normalizeAttacks(
attacks: readonly RawAttack[] | undefined,
): TraitBlock[] | undefined {
if (!attacks || attacks.length === 0) return undefined;
return attacks.map((a) => {
const parts: string[] = [];
if (a.range) parts.push(a.range);
const attackMod = a.attack == null ? "" : ` +${a.attack}`;
const traits =
a.traits && a.traits.length > 0
? ` (${a.traits.map((t) => stripAngleBrackets(stripTags(t))).join(", ")})`
: "";
const damage = a.damage
? `, ${stripAngleBrackets(stripTags(a.damage))}`
: "";
return {
name: capitalize(stripTags(a.name)),
activity: { number: 1, unit: "action" as const },
segments: [
{
type: "text" as const,
value: `${parts.join(" ")}${attackMod}${traits}${damage}`,
},
],
};
});
}
// -- Defenses extraction --
function extractDefenses(defenses: RawDefenses | undefined) {
const acRecord = defenses?.ac ?? {};
const acStd = (acRecord.std as number | undefined) ?? 0;
const acEntries = Object.entries(acRecord).filter(([k]) => k !== "std");
function normalizeAttack(item: RawFoundryItem): TraitBlock {
const sys = item.system as unknown as MeleeSystem;
const bonus = sys.bonus?.value ?? 0;
const traits = sys.traits?.value ?? [];
const damageEntries = Object.values(sys.damageRolls ?? {});
const damage = damageEntries
.map((d) => `${d.damage} ${d.damageType}`)
.join(" plus ");
const traitStr =
traits.length > 0 ? ` (${traits.map(formatTrait).join(", ")})` : "";
return {
ac: acStd,
acConditional:
acEntries.length > 0
? acEntries.map(([k, v]) => `${v} ${k}`).join(", ")
: undefined,
saveFort: defenses?.savingThrows?.fort?.std ?? 0,
saveRef: defenses?.savingThrows?.ref?.std ?? 0,
saveWill: defenses?.savingThrows?.will?.std ?? 0,
hp: defenses?.hp?.[0]?.hp ?? 0,
immunities: formatImmunities(defenses?.immunities),
resistances: formatResistances(defenses?.resistances),
weaknesses: formatWeaknesses(defenses?.weaknesses),
name: capitalize(item.name),
activity: { number: 1, unit: "action" },
segments: [
{
type: "text",
value: `+${bonus}${traitStr}, ${damage}`,
},
],
};
}
function parseActivity(
actionType: string | undefined,
actionCount: number | null | undefined,
): { number: number; unit: "action" | "free" | "reaction" } | undefined {
if (actionType === "action") {
return { number: actionCount ?? 1, unit: "action" };
}
if (actionType === "reaction") {
return { number: 1, unit: "reaction" };
}
if (actionType === "free") {
return { number: 1, unit: "free" };
}
return undefined;
}
// -- Ability normalization --
function normalizeAbility(item: RawFoundryItem): TraitBlock {
const sys = item.system as unknown as ActionSystem;
const actionType = sys.actionType?.value;
const actionCount = sys.actions?.value;
const description = stripFoundryTags(sys.description?.value ?? "");
const traits = sys.traits?.value ?? [];
const activity = parseActivity(actionType, actionCount);
const traitStr =
traits.length > 0
? `(${traits.map((t) => capitalize(formatTrait(t))).join(", ")}) `
: "";
const text = traitStr ? `${traitStr}${description}` : description;
const segments: { type: "text"; value: string }[] = text
? [{ type: "text", value: text }]
: [];
return { name: item.name, activity, segments };
}
// -- Spellcasting normalization --
function classifySpell(spell: RawFoundryItem): {
isCantrip: boolean;
rank: number;
label: string;
} {
const sys = spell.system as unknown as SpellSystem;
const isCantrip = (sys.traits?.value ?? []).includes("cantrip");
const rank = sys.location?.heightenedLevel ?? sys.level?.value ?? 0;
const uses = sys.location?.uses;
const label =
uses && uses.max > 1 ? `${spell.name} (\u00d7${uses.max})` : spell.name;
return { isCantrip, rank, label };
}
function normalizeSpellcastingEntry(
entry: RawFoundryItem,
allSpells: readonly RawFoundryItem[],
): SpellcastingBlock {
const sys = entry.system as unknown as SpellcastingEntrySystem;
const tradition = capitalize(sys.tradition?.value ?? "");
const prepared = sys.prepared?.value ?? "";
const dc = sys.spelldc?.dc ?? 0;
const attack = sys.spelldc?.value ?? 0;
const name = entry.name || `${tradition} ${capitalize(prepared)} Spells`;
const headerText = `DC ${dc}${attack ? `, attack +${attack}` : ""}`;
const linkedSpells = allSpells.filter(
(s) => (s.system as unknown as SpellSystem).location?.value === entry._id,
);
const byRank = new Map<number, string[]>();
const cantrips: string[] = [];
for (const spell of linkedSpells) {
const { isCantrip, rank, label } = classifySpell(spell);
if (isCantrip) {
cantrips.push(spell.name);
continue;
}
const existing = byRank.get(rank) ?? [];
existing.push(label);
byRank.set(rank, existing);
}
const daily = [...byRank.entries()]
.sort(([a], [b]) => b - a)
.map(([rank, spellNames]) => ({
uses: rank,
each: true,
spells: spellNames,
}));
return {
name,
headerText,
atWill: orUndefined(cantrips),
daily: orUndefined(daily),
};
}
function normalizeSpellcasting(
items: readonly RawFoundryItem[],
): SpellcastingBlock[] {
const entries = items.filter((i) => i.type === "spellcastingEntry");
const spells = items.filter((i) => i.type === "spell");
return entries.map((entry) => normalizeSpellcastingEntry(entry, spells));
}
// -- Main normalization --
function normalizeCreature(raw: RawPf2eCreature): Pf2eCreature {
const source = raw.source ?? "";
const defenses = extractDefenses(raw.defenses);
const mods = raw.abilityMods ?? {};
function orUndefined<T>(arr: T[]): T[] | undefined {
return arr.length > 0 ? arr : undefined;
}
/** Build display traits: [rarity (if not common), size, ...type traits] */
function buildTraits(traits: {
rarity: string;
size: { value: string };
value: string[];
}): string[] {
const result: string[] = [];
if (traits.rarity && traits.rarity !== "common") {
result.push(traits.rarity);
}
const size = SIZE_MAP[traits.size.value] ?? "medium";
result.push(size);
result.push(...traits.value);
return result;
}
const HEALING_GLOSSARY =
/^<p>@Localize\[PF2E\.NPC\.Abilities\.Glossary\.(FastHealing|Regeneration|NegativeHealing)\]/;
/** Glossary-only abilities that duplicate structured data shown elsewhere. */
const REDUNDANT_GLOSSARY =
/^<p>@Localize\[PF2E\.NPC\.Abilities\.Glossary\.(ConstantSpells|AtWillSpells)\]/;
const STRIP_GLOSSARY_AND_P = /<p>@Localize\[[^\]]+\]<\/p>|<\/?p>/g;
/** True when the description has no user-visible content beyond glossary tags. */
function isGlossaryOnly(desc: string | undefined): boolean {
if (!desc) return true;
return desc.replace(STRIP_GLOSSARY_AND_P, "").trim() === "";
}
function isRedundantAbility(
item: RawFoundryItem,
excludeName: string | undefined,
hpDetails: string | undefined,
): boolean {
const sys = item.system as unknown as ActionSystem;
const desc = sys.description?.value;
// Ability duplicates the allSaves line — suppress only if glossary-only
if (excludeName && item.name.toLowerCase() === excludeName.toLowerCase()) {
return isGlossaryOnly(desc);
}
if (!desc) return false;
// Healing/regen glossary when hp.details already shows the info
if (hpDetails && HEALING_GLOSSARY.test(desc)) return true;
// Spell mechanic glossary reminders shown in the spellcasting section
if (REDUNDANT_GLOSSARY.test(desc)) return true;
return false;
}
function actionsByCategory(
items: readonly RawFoundryItem[],
category: string,
excludeName?: string,
hpDetails?: string,
): TraitBlock[] {
return items
.filter(
(a) =>
a.type === "action" &&
(a.system as unknown as ActionSystem).category === category &&
!isRedundantAbility(a, excludeName, hpDetails),
)
.map(normalizeAbility);
}
function extractAbilityMods(
mods: Record<string, { mod: number }>,
): Pf2eCreature["abilityMods"] {
return {
system: "pf2e",
id: makeCreatureId(source, raw.name),
name: raw.name,
source,
sourceDisplayName: sourceDisplayNames[source] ?? source,
level: raw.level ?? 0,
traits: raw.traits ?? [],
perception: raw.perception?.std ?? 0,
senses: formatSenses(raw.senses),
languages: formatLanguages(raw.languages),
skills: formatSkills(raw.skills),
abilityMods: {
str: mods.str ?? 0,
dex: mods.dex ?? 0,
con: mods.con ?? 0,
int: mods.int ?? 0,
wis: mods.wis ?? 0,
cha: mods.cha ?? 0,
},
...defenses,
speed: formatSpeed(raw.speed),
attacks: normalizeAttacks(raw.attacks),
abilitiesTop: normalizeAbilities(raw.abilities?.top),
abilitiesMid: normalizeAbilities(raw.abilities?.mid),
abilitiesBot: normalizeAbilities(raw.abilities?.bot),
str: mods.str?.mod ?? 0,
dex: mods.dex?.mod ?? 0,
con: mods.con?.mod ?? 0,
int: mods.int?.mod ?? 0,
wis: mods.wis?.mod ?? 0,
cha: mods.cha?.mod ?? 0,
};
}
export function normalizePf2eBestiary(raw: {
creature: unknown[];
}): Pf2eCreature[] {
return (raw.creature ?? [])
.filter((c: unknown) => {
const obj = c as { _copy?: unknown };
return !obj._copy;
})
.map((c) => normalizeCreature(c as RawPf2eCreature));
export function normalizeFoundryCreature(
raw: unknown,
sourceCode?: string,
sourceDisplayName?: string,
): Pf2eCreature {
const r = raw as RawFoundryCreature;
const sys = r.system;
const publication = sys.details?.publication;
const source = sourceCode ?? publication?.title ?? "";
const items = r.items ?? [];
const allSavesText = sys.attributes.allSaves?.value ?? "";
return {
system: "pf2e",
id: makeCreatureId(source, r.name),
name: r.name,
source,
sourceDisplayName: sourceDisplayName ?? publication?.title ?? "",
level: sys.details?.level?.value ?? 0,
traits: buildTraits(sys.traits),
perception: sys.perception?.mod ?? 0,
senses: formatSenses(sys.perception?.senses),
languages: formatLanguages(sys.details?.languages),
skills: formatSkills(sys.skills),
abilityMods: extractAbilityMods(sys.abilities ?? {}),
ac: sys.attributes.ac.value,
acConditional: sys.attributes.ac.details || undefined,
saveFort: sys.saves.fortitude.value,
saveRef: sys.saves.reflex.value,
saveWill: sys.saves.will.value,
saveConditional: allSavesText || undefined,
hp: sys.attributes.hp.max,
hpDetails: sys.attributes.hp.details || undefined,
immunities: formatImmunities(sys.attributes.immunities),
resistances: formatResistances(sys.attributes.resistances),
weaknesses: formatWeaknesses(sys.attributes.weaknesses),
speed: formatSpeed(sys.attributes.speed),
attacks: orUndefined(
items.filter((i) => i.type === "melee").map(normalizeAttack),
),
abilitiesTop: orUndefined(actionsByCategory(items, "interaction")),
abilitiesMid: orUndefined(
actionsByCategory(
items,
"defensive",
allSavesText || undefined,
sys.attributes.hp.details || undefined,
),
),
abilitiesBot: orUndefined(actionsByCategory(items, "offensive")),
spellcasting: orUndefined(normalizeSpellcasting(items)),
};
}
export function normalizeFoundryCreatures(
rawCreatures: unknown[],
sourceCode?: string,
sourceDisplayName?: string,
): Pf2eCreature[] {
return rawCreatures.map((raw) =>
normalizeFoundryCreature(raw, sourceCode, sourceDisplayName),
);
}

View File

@@ -14,6 +14,8 @@ interface CompactCreature {
readonly pc: number;
readonly sz: string;
readonly tp: string;
readonly f: string;
readonly li: string;
}
interface CompactIndex {
@@ -53,15 +55,18 @@ export function getAllPf2eSourceCodes(): string[] {
}
export function getDefaultPf2eFetchUrl(
sourceCode: string,
_sourceCode: string,
baseUrl?: string,
): string {
const filename = `creatures-${sourceCode.toLowerCase()}.json`;
if (baseUrl !== undefined) {
const normalized = baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`;
return `${normalized}${filename}`;
return baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`;
}
return `https://raw.githubusercontent.com/Pf2eToolsOrg/Pf2eTools/dev/data/bestiary/${filename}`;
return "https://raw.githubusercontent.com/foundryvtt/pf2e/v13-dev/packs/pf2e/";
}
export function getCreaturePathsForSource(sourceCode: string): string[] {
const compact = rawIndex as unknown as CompactIndex;
return compact.creatures.filter((c) => c.s === sourceCode).map((c) => c.f);
}
export function getPf2eSourceDisplayName(sourceCode: string): string {

View File

@@ -56,4 +56,5 @@ export interface Pf2eBestiaryIndexPort {
getAllSourceCodes(): string[];
getDefaultFetchUrl(sourceCode: string, baseUrl?: string): string;
getSourceDisplayName(sourceCode: string): string;
getCreaturePathsForSource(sourceCode: string): string[];
}

View File

@@ -47,5 +47,6 @@ export const productionAdapters: Adapters = {
getAllSourceCodes: pf2eBestiaryIndex.getAllPf2eSourceCodes,
getDefaultFetchUrl: pf2eBestiaryIndex.getDefaultPf2eFetchUrl,
getSourceDisplayName: pf2eBestiaryIndex.getPf2eSourceDisplayName,
getCreaturePathsForSource: pf2eBestiaryIndex.getCreaturePathsForSource,
},
};

View File

@@ -0,0 +1,99 @@
/**
* Strips Foundry VTT HTML descriptions with enrichment syntax to plain
* readable text. Handles @Damage, @Check, @UUID, @Template and generic
* @Tag patterns as well as common HTML elements.
*/
// -- Enrichment-param helpers --
function formatDamage(params: string): string {
// "3d6+10[fire]" → "3d6+10 fire"
return params.replaceAll(/\[([^\]]*)\]/g, " $1").trim();
}
function formatCheck(params: string): string {
// "reflex|dc:33|basic" → "DC 33 basic Reflex"
const parts = params.split("|");
const type = parts[0] ?? "";
let dc = "";
let basic = false;
for (const part of parts.slice(1)) {
if (part.startsWith("dc:")) {
dc = part.slice(3);
} else if (part === "basic") {
basic = true;
}
}
const label = type.charAt(0).toUpperCase() + type.slice(1);
const dcStr = dc ? `DC ${dc} ` : "";
const basicStr = basic ? "basic " : "";
return `${dcStr}${basicStr}${label}`;
}
function formatTemplate(params: string): string {
// "cone|distance:40" → "40-foot cone"
const parts = params.split("|");
const shape = parts[0] ?? "";
let distance = "";
for (const part of parts.slice(1)) {
if (part.startsWith("distance:")) {
distance = part.slice(9);
}
}
return distance ? `${distance}-foot ${shape}` : shape;
}
export function stripFoundryTags(html: string): string {
if (typeof html !== "string") return String(html);
let result = html;
// Strip Foundry enrichment tags (with optional display text)
// @Tag[params]{display} → display (prefer display text)
// @Tag[params] → extracted content
// @Damage has nested brackets: @Damage[3d6+10[fire]]
result = result.replaceAll(
/@Damage\[((?:[^[\]]|\[[^\]]*\])*)\](?:\{([^}]+)\})?/g,
(_, params: string, display: string | undefined) =>
display ?? formatDamage(params),
);
result = result.replaceAll(
/@Check\[([^\]]+)\](?:\{([^}]*)\})?/g,
(_, params: string) => formatCheck(params),
);
result = result.replaceAll(
/@UUID\[[^\]]+?([^./\]]+)\](?:\{([^}]+)\})?/g,
(_, lastSegment: string, display: string | undefined) =>
display ?? lastSegment,
);
result = result.replaceAll(
/@Template\[([^\]]+)\](?:\{([^}]+)\})?/g,
(_, params: string, display: string | undefined) =>
display ?? formatTemplate(params),
);
// Catch-all for unknown @Tag patterns
result = result.replaceAll(
/@\w+\[[^\]]*\](?:\{([^}]+)\})?/g,
(_, display: string | undefined) => display ?? "",
);
// Strip action-glyph spans (content is a number the renderer handles)
result = result.replaceAll(/<span class="action-glyph">[^<]*<\/span>/gi, "");
// Strip HTML tags
result = result.replaceAll(/<br\s*\/?>/gi, "\n");
result = result.replaceAll(/<hr\s*\/?>/gi, "\n");
result = result.replaceAll(/<\/p>\s*<p[^>]*>/gi, "\n");
result = result.replaceAll(/<[^>]+>/g, "");
// Decode common HTML entities
result = result.replaceAll("&amp;", "&");
result = result.replaceAll("&lt;", "<");
result = result.replaceAll("&gt;", ">");
result = result.replaceAll("&quot;", '"');
// Collapse whitespace
result = result.replaceAll(/[ \t]+/g, " ");
result = result.replaceAll(/\n\s*\n/g, "\n");
return result.trim();
}

View File

@@ -0,0 +1,280 @@
// @vitest-environment jsdom
import "@testing-library/jest-dom/vitest";
import type { Pf2eCreature } from "@initiative/domain";
import { creatureId } from "@initiative/domain";
import { cleanup, render, screen } from "@testing-library/react";
import { afterEach, describe, expect, it } from "vitest";
import { Pf2eStatBlock } from "../pf2e-stat-block.js";
afterEach(cleanup);
const PERCEPTION_SENSES_REGEX = /\+2.*Darkvision/;
const SKILLS_REGEX = /Acrobatics \+5.*Stealth \+5/;
const SAVE_CONDITIONAL_REGEX = /\+12.*\+1 status to all saves vs\. magic/;
const SAVE_CONDITIONAL_ABSENT_REGEX = /status to all saves/;
const HP_DETAILS_REGEX = /115.*regeneration 20/;
const REGEN_REGEX = /regeneration/;
const ATTACK_NAME_REGEX = /Dogslicer/;
const ATTACK_DAMAGE_REGEX = /1d6 slashing/;
const SPELLCASTING_ENTRY_REGEX = /Divine Innate Spells\./;
const ABILITY_MID_NAME_REGEX = /Goblin Scuttle/;
const ABILITY_MID_DESC_REGEX = /The goblin Steps\./;
const CANTRIPS_REGEX = /Cantrips:/;
const AC_REGEX = /16/;
const GOBLIN_WARRIOR: Pf2eCreature = {
system: "pf2e",
id: creatureId("pathfinder-monster-core:goblin-warrior"),
name: "Goblin Warrior",
source: "pathfinder-monster-core",
sourceDisplayName: "Monster Core",
level: -1,
traits: ["small", "goblin", "humanoid"],
perception: 2,
senses: "Darkvision",
languages: "Common, Goblin",
skills: "Acrobatics +5, Athletics +2, Nature +1, Stealth +5",
abilityMods: { str: 0, dex: 3, con: 1, int: 0, wis: -1, cha: 1 },
ac: 16,
saveFort: 5,
saveRef: 7,
saveWill: 3,
hp: 6,
speed: "25 feet",
attacks: [
{
name: "Dogslicer",
activity: { number: 1, unit: "action" },
segments: [
{
type: "text",
value: "+7 (agile, backstabber, finesse), 1d6 slashing",
},
],
},
],
abilitiesMid: [
{
name: "Goblin Scuttle",
activity: { number: 1, unit: "reaction" },
segments: [{ type: "text", value: "The goblin Steps." }],
},
],
};
const NAUNET: Pf2eCreature = {
system: "pf2e",
id: creatureId("pathfinder-monster-core-2:naunet"),
name: "Naunet",
source: "pathfinder-monster-core-2",
sourceDisplayName: "Monster Core 2",
level: 7,
traits: ["large", "monitor", "protean"],
perception: 14,
senses: "Darkvision",
languages: "Chthonian, Empyrean, Protean",
skills:
"Acrobatics +14, Athletics +16, Intimidation +16, Stealth +14, Survival +12",
abilityMods: { str: 5, dex: 3, con: 5, int: 0, wis: 3, cha: 3 },
ac: 24,
saveFort: 18,
saveRef: 14,
saveWill: 12,
saveConditional: "+1 status to all saves vs. magic",
hp: 120,
resistances: "Precision 5, Protean anatomy 10",
speed: "25 feet, Fly 30 feet, Swim 25 feet (unfettered movement)",
spellcasting: [
{
name: "Divine Innate Spells",
headerText: "DC 25, attack +17",
daily: [
{ uses: 4, each: true, spells: ["Unfettered Movement (Constant)"] },
],
atWill: ["Detect Magic"],
},
],
};
const TROLL: Pf2eCreature = {
system: "pf2e",
id: creatureId("pathfinder-monster-core:forest-troll"),
name: "Forest Troll",
source: "pathfinder-monster-core",
sourceDisplayName: "Monster Core",
level: 5,
traits: ["large", "giant", "troll"],
perception: 11,
senses: "Darkvision",
languages: "Jotun",
skills: "Athletics +12, Intimidation +12",
abilityMods: { str: 5, dex: 2, con: 6, int: -2, wis: 0, cha: -2 },
ac: 20,
saveFort: 17,
saveRef: 11,
saveWill: 7,
hp: 115,
hpDetails: "regeneration 20 (deactivated by acid or fire)",
weaknesses: "Fire 10",
speed: "30 feet",
};
function renderStatBlock(creature: Pf2eCreature) {
return render(<Pf2eStatBlock creature={creature} />);
}
describe("Pf2eStatBlock", () => {
describe("header", () => {
it("renders creature name and level", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(
screen.getByRole("heading", { name: "Goblin Warrior" }),
).toBeInTheDocument();
expect(screen.getByText("Level -1")).toBeInTheDocument();
});
it("renders traits as tags", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("Small")).toBeInTheDocument();
expect(screen.getByText("Goblin")).toBeInTheDocument();
expect(screen.getByText("Humanoid")).toBeInTheDocument();
});
it("renders source display name", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("Monster Core")).toBeInTheDocument();
});
});
describe("perception and senses", () => {
it("renders perception modifier and senses", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("Perception")).toBeInTheDocument();
expect(screen.getByText(PERCEPTION_SENSES_REGEX)).toBeInTheDocument();
});
it("renders languages", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("Languages")).toBeInTheDocument();
expect(screen.getByText("Common, Goblin")).toBeInTheDocument();
});
it("renders skills", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("Skills")).toBeInTheDocument();
expect(screen.getByText(SKILLS_REGEX)).toBeInTheDocument();
});
});
describe("ability modifiers", () => {
it("renders all six ability labels", () => {
renderStatBlock(GOBLIN_WARRIOR);
for (const label of ["Str", "Dex", "Con", "Int", "Wis", "Cha"]) {
expect(screen.getByText(label)).toBeInTheDocument();
}
});
it("renders positive and negative modifiers", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("+3")).toBeInTheDocument();
expect(screen.getByText("-1")).toBeInTheDocument();
});
});
describe("defenses", () => {
it("renders AC and saves", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("AC")).toBeInTheDocument();
expect(screen.getByText(AC_REGEX)).toBeInTheDocument();
expect(screen.getByText("Fort")).toBeInTheDocument();
expect(screen.getByText("Ref")).toBeInTheDocument();
expect(screen.getByText("Will")).toBeInTheDocument();
});
it("renders HP", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("HP")).toBeInTheDocument();
expect(screen.getByText("6")).toBeInTheDocument();
});
it("renders saveConditional inline with saves", () => {
renderStatBlock(NAUNET);
expect(screen.getByText(SAVE_CONDITIONAL_REGEX)).toBeInTheDocument();
});
it("omits saveConditional when absent", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(
screen.queryByText(SAVE_CONDITIONAL_ABSENT_REGEX),
).not.toBeInTheDocument();
});
it("renders hpDetails in parentheses after HP", () => {
renderStatBlock(TROLL);
expect(screen.getByText(HP_DETAILS_REGEX)).toBeInTheDocument();
});
it("omits hpDetails when absent", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.queryByText(REGEN_REGEX)).not.toBeInTheDocument();
});
it("renders resistances and weaknesses", () => {
renderStatBlock(NAUNET);
expect(screen.getByText("Resistances")).toBeInTheDocument();
expect(
screen.getByText("Precision 5, Protean anatomy 10"),
).toBeInTheDocument();
});
});
describe("abilities", () => {
it("renders mid (defensive) abilities", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText(ABILITY_MID_NAME_REGEX)).toBeInTheDocument();
expect(screen.getByText(ABILITY_MID_DESC_REGEX)).toBeInTheDocument();
});
});
describe("speed and attacks", () => {
it("renders speed", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText("Speed")).toBeInTheDocument();
expect(screen.getByText("25 feet")).toBeInTheDocument();
});
it("renders attacks", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.getByText(ATTACK_NAME_REGEX)).toBeInTheDocument();
expect(screen.getByText(ATTACK_DAMAGE_REGEX)).toBeInTheDocument();
});
});
describe("spellcasting", () => {
it("renders spellcasting entry with header", () => {
renderStatBlock(NAUNET);
expect(screen.getByText(SPELLCASTING_ENTRY_REGEX)).toBeInTheDocument();
expect(screen.getByText("DC 25, attack +17")).toBeInTheDocument();
});
it("renders ranked spells", () => {
renderStatBlock(NAUNET);
expect(screen.getByText("Rank 4:")).toBeInTheDocument();
expect(
screen.getByText("Unfettered Movement (Constant)"),
).toBeInTheDocument();
});
it("renders cantrips", () => {
renderStatBlock(NAUNET);
expect(screen.getByText("Cantrips:")).toBeInTheDocument();
expect(screen.getByText("Detect Magic")).toBeInTheDocument();
});
it("omits spellcasting when absent", () => {
renderStatBlock(GOBLIN_WARRIOR);
expect(screen.queryByText(CANTRIPS_REGEX)).not.toBeInTheDocument();
});
});
});

View File

@@ -12,7 +12,7 @@ const DND_BASE_URL =
"https://raw.githubusercontent.com/5etools-mirror-3/5etools-src/main/data/bestiary/";
const PF2E_BASE_URL =
"https://raw.githubusercontent.com/Pf2eToolsOrg/Pf2eTools/dev/data/bestiary/";
"https://raw.githubusercontent.com/foundryvtt/pf2e/v13-dev/packs/pf2e/";
export function BulkImportPrompt() {
const { bestiaryIndex, pf2eBestiaryIndex } = useAdapters();

View File

@@ -114,9 +114,11 @@ export function Pf2eStatBlock({ creature }: Readonly<Pf2eStatBlockProps>) {
{formatMod(creature.saveRef)},{" "}
<span className="font-semibold">Will</span>{" "}
{formatMod(creature.saveWill)}
{creature.saveConditional ? `; ${creature.saveConditional}` : ""}
</div>
<div>
<span className="font-semibold">HP</span> {creature.hp}
{creature.hpDetails ? ` (${creature.hpDetails})` : ""}
</div>
<PropertyLine label="Immunities" value={creature.immunities} />
<PropertyLine label="Resistances" value={creature.resistances} />
@@ -138,6 +140,35 @@ export function Pf2eStatBlock({ creature }: Readonly<Pf2eStatBlockProps>) {
{/* Bottom abilities (active abilities) */}
<TraitSection entries={creature.abilitiesBot} />
{/* Spellcasting */}
{creature.spellcasting && creature.spellcasting.length > 0 && (
<>
<SectionDivider />
{creature.spellcasting.map((sc) => (
<div key={sc.name} className="space-y-1 text-sm">
<div>
<span className="font-semibold italic">{sc.name}.</span>{" "}
{sc.headerText}
</div>
{sc.daily?.map((d) => (
<div key={d.uses} className="pl-2">
<span className="font-semibold">
{d.uses === 0 ? "Cantrips" : `Rank ${d.uses}`}:
</span>{" "}
{d.spells.join(", ")}
</div>
))}
{sc.atWill && sc.atWill.length > 0 && (
<div className="pl-2">
<span className="font-semibold">Cantrips:</span>{" "}
{sc.atWill.join(", ")}
</div>
)}
</div>
))}
</>
)}
</div>
);
}

View File

@@ -21,7 +21,10 @@ interface StatBlockPanelProps {
function extractSourceCode(cId: CreatureId): string {
const colonIndex = cId.indexOf(":");
if (colonIndex === -1) return "";
return cId.slice(0, colonIndex).toUpperCase();
const prefix = cId.slice(0, colonIndex);
// D&D source codes are short uppercase (e.g. "mm" from "MM").
// PF2e source codes use hyphens (e.g. "pathfinder-monster-core").
return prefix.includes("-") ? prefix : prefix.toUpperCase();
}
function CollapsedTab({

View File

@@ -9,10 +9,7 @@ import {
normalizeBestiary,
setSourceDisplayNames,
} from "../adapters/bestiary-adapter.js";
import {
normalizePf2eBestiary,
setPf2eSourceDisplayNames,
} from "../adapters/pf2e-bestiary-adapter.js";
import { normalizeFoundryCreatures } from "../adapters/pf2e-bestiary-adapter.js";
import { useAdapters } from "../contexts/adapter-context.js";
import { useRulesEditionContext } from "../contexts/rules-edition-context.js";
@@ -52,7 +49,6 @@ export function useBestiary(): BestiaryHook {
setSourceDisplayNames(index.sources as Record<string, string>);
const pf2eIndex = pf2eBestiaryIndex.loadIndex();
setPf2eSourceDisplayNames(pf2eIndex.sources as Record<string, string>);
if (index.creatures.length > 0 || pf2eIndex.creatures.length > 0) {
setIsLoaded(true);
@@ -113,17 +109,40 @@ export function useBestiary(): BestiaryHook {
const fetchAndCacheSource = useCallback(
async (sourceCode: string, url: string): Promise<void> => {
const response = await fetch(url);
if (!response.ok) {
throw new Error(
`Failed to fetch: ${response.status} ${response.statusText}`,
let creatures: AnyCreature[];
if (edition === "pf2e") {
// PF2e: url is a base URL; fetch each creature file in parallel
const paths = pf2eBestiaryIndex.getCreaturePathsForSource(sourceCode);
const baseUrl = url.endsWith("/") ? url : `${url}/`;
const responses = await Promise.all(
paths.map(async (path) => {
const response = await fetch(`${baseUrl}${path}`);
if (!response.ok) {
throw new Error(
`Failed to fetch ${path}: ${response.status} ${response.statusText}`,
);
}
return response.json();
}),
);
const displayName = pf2eBestiaryIndex.getSourceDisplayName(sourceCode);
creatures = normalizeFoundryCreatures(
responses,
sourceCode,
displayName,
);
} else {
const response = await fetch(url);
if (!response.ok) {
throw new Error(
`Failed to fetch: ${response.status} ${response.statusText}`,
);
}
const json = await response.json();
creatures = normalizeBestiary(json);
}
const json = await response.json();
const creatures =
edition === "pf2e"
? normalizePf2eBestiary(json)
: normalizeBestiary(json);
const displayName =
edition === "pf2e"
? pf2eBestiaryIndex.getSourceDisplayName(sourceCode)
@@ -149,7 +168,11 @@ export function useBestiary(): BestiaryHook {
async (sourceCode: string, jsonData: unknown): Promise<void> => {
const creatures =
edition === "pf2e"
? normalizePf2eBestiary(jsonData as { creature: unknown[] })
? normalizeFoundryCreatures(
Array.isArray(jsonData) ? jsonData : [jsonData],
sourceCode,
pf2eBestiaryIndex.getSourceDisplayName(sourceCode),
)
: normalizeBestiary(
jsonData as Parameters<typeof normalizeBestiary>[0],
);