@optolith/entity-descriptions 0.13.0 → 0.13.2

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.13.2](https://github.com/Optolith/entity-descriptions/compare/v0.13.1...v0.13.2) (2026-09-16)
+
+### Features
+
+* add focus rule badges to activatable entries, spellworks and liturgical chants and ceremonies ([dd142b4](https://github.com/Optolith/entity-descriptions/commit/dd142b47f3cd29620d29a2561e4a8ae8ad1d2a2d)), closes [#41](https://github.com/Optolith/entity-descriptions/issues/41)
+## [0.13.1](https://github.com/Optolith/entity-descriptions/compare/v0.13.0...v0.13.1) (2026-09-16)
+
+### Bug Fixes
+
+* prepend levels to activatable name in library according to name builder rules ([d97c05b](https://github.com/Optolith/entity-descriptions/commit/d97c05b6301a10f4d7add81d2903f0f51d9f2d0a))
+* print correct any special ability of group prerequisite translation ([0196e4b](https://github.com/Optolith/entity-descriptions/commit/0196e4b5f069ac3893b834275eaf30c16f9e3e18))
 ## [0.13.0](https://github.com/Optolith/entity-descriptions/compare/v0.12.0...v0.13.0) (2026-09-16)
 
 ### ⚠ BREAKING CHANGES

package/lib/entities/activatable.d.ts

@@ -1,4 +1,4 @@
-import type { ActivatableIdentifier, AdvancedSpecialAbility, AdvantageDisadvantagePrerequisites, AdvantageDisadvantageSubtype, AdventurePointsValue, ApplicableCombatTechniques, Aspect_ID, Brew_ID, DaggerRitualCost, EnchantmentCost, Errata, GeneralPrerequisites, MagicalSignCost, Penalty, PropertyDeclaration, PublicationRefs, RatedIdentifier, SelectOptions, SpecialRule, Volume } from "@optolith/database-schema/gen";
+import type { ActivatableIdentifier, ActivatableNameBuilderRules, AdvancedSpecialAbility, AdvantageDisadvantagePrerequisites, AdvantageDisadvantageSubtype, AdventurePointsValue, ApplicableCombatTechniques, Aspect_ID, Brew_ID, DaggerRitualCost, EnchantmentCost, Errata, GeneralPrerequisites, MagicalSignCost, Penalty, PropertyDeclaration, PublicationRefs, RatedIdentifier, SelectOptions, SpecialRule, Volume } from "@optolith/database-schema/gen";
 import { Case } from "tsondb/schema/gen";
 import type { GetAllInstances, GetInstanceById } from "../helpers/getTypes.js";
 import type { GetAllResolvedNewSkillApplications, GetAllResolvedSelectOptions, GetAllResolvedSkillUses } from "../index.js";
@@ -9,6 +9,7 @@ type AdvancedIdentifierSpecialAbility = string | Case<AdvancedSpecialAbilityKind
  * The base fields for a special ability entity in the database.
  */
 export type BaseActivatable = {
+    nameBuilderRules?: ActivatableNameBuilderRules;
     levels?: number;
     subtype?: AdvantageDisadvantageSubtype;
     maximum?: number;
@@ -50,7 +51,7 @@ export type BaseActivatableTranslation = {
  * Get a JSON representation of the rules text for a special ability.
  */
 export declare const getActivatableEntityDescription: import("../creator.js").EntityDescriptionCreator<"Advantage" | "Disadvantage" | "AdvancedCombatSpecialAbility" | "AdvancedKarmaSpecialAbility" | "AdvancedMagicalSpecialAbility" | "AdvancedSkillSpecialAbility" | "AncestorGlyph" | "ArcaneOrbEnchantment" | "AttireEnchantment" | "Beutelzauber" | "BlessedTradition" | "BowlEnchantment" | "BrawlingSpecialAbility" | "CauldronEnchantment" | "CeremonialItemSpecialAbility" | "ChronicleEnchantment" | "CombatSpecialAbility" | "CombatStyleSpecialAbility" | "CommandSpecialAbility" | "DaggerRitual" | "FamiliarSpecialAbility" | "FatePointSexSpecialAbility" | "FatePointSpecialAbility" | "FoolsHatEnchantment" | "GeneralSpecialAbility" | "Haubenzauber" | "Hauerkettenzauber" | "InstrumentEnchantment" | "KarmaSpecialAbility" | "Keulenzauber" | "Krallenkettenzauber" | "Kristallkugelzauber" | "LiturgicalStyleSpecialAbility" | "LycantropicGift" | "MagicalSign" | "MagicalSpecialAbility" | "MagicalTradition" | "MagicStyleSpecialAbility" | "OrbEnchantment" | "PactGift" | "ProtectiveWardingCircleSpecialAbility" | "RingEnchantment" | "Schweinetrommelzauber" | "Sermon" | "SexSpecialAbility" | "SickleRitual" | "SikaryanDrainSpecialAbility" | "SkillStyleSpecialAbility" | "SpellSwordEnchantment" | "StaffEnchantment" | "ToyEnchantment" | "Trinkhornzauber" | "VampiricGift" | "Vision" | "WandEnchantment" | "WeaponEnchantment", {
-    getInstanceById: GetInstanceById<"Publication" | "Subject" | ActivatableIdentifier["kind"] | RatedIdentifier["kind"] | "TradeSecret" | "Aspect" | "Property" | "Race" | "Culture" | "State" | "Enhancement" | "PactCategory" | "PactDomain" | "SocialStatus" | "Weapon" | "Patron" | "PersonalityTrait" | "Brew" | "Blessing" | "Cantrip">;
+    getInstanceById: GetInstanceById<"Publication" | "Subject" | ActivatableIdentifier["kind"] | RatedIdentifier["kind"] | "TradeSecret" | "Aspect" | "Property" | "Race" | "Culture" | "State" | "Enhancement" | "PactCategory" | "PactDomain" | "SocialStatus" | "Weapon" | "Patron" | "PersonalityTrait" | "Brew" | "Blessing" | "Cantrip" | "FocusRule">;
     getAllInstances: GetAllInstances<"Script">;
     getResolvedSelectOptionById: GetResolvedSelectOptionById;
     getAllResolvedSelectOptions: GetAllResolvedSelectOptions;

package/lib/entities/activatable.js

@@ -2,7 +2,7 @@ import { stripInlineMarkdown } from "@elyukai/markdown/render/strip";
 import { isNotEmpty } from "@elyukai/utils/array/nonEmpty";
 import { count } from "@elyukai/utils/array/reductions";
 import { deepEqual } from "@elyukai/utils/equality";
-import { constant, on } from "@elyukai/utils/function";
+import { constant, identity, on } from "@elyukai/utils/function";
 import { isNotNullish } from "@elyukai/utils/nullable";
 import { reduceCompare } from "@elyukai/utils/ordering";
 import { Reader } from "@elyukai/utils/reader";
@@ -18,7 +18,7 @@ import { renderAdventurePointsValue } from "./partial/adventurePointsValue.js";
 import { renderParameterMap } from "./partial/map.js";
 import { attributedName } from "./partial/markdown.js";
 import { additionFormatter } from "./partial/mathOperation.js";
-import { printAdvantageDisadvantagePrerequisites, printGeneralPrerequisites, } from "./partial/prerequisites/index.js";
+import { getDerivedFocusRuleBadgeFromPrerequisites, printAdvantageDisadvantagePrerequisites, printGeneralPrerequisites, } from "./partial/prerequisites/index.js";
 import { printActivatableName, } from "./partial/prerequisites/single/activatable.js";
 import { renderStandaloneCostMap } from "./partial/rated/activatable/cost.js";
 import { parensIf } from "./partial/rated/activatable/parensIf.js";
@@ -809,13 +809,27 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
     const makeTraditionName = entityName === "BlessedTradition" || entityName === "MagicalTradition"
         ? name => translate("Tradition ({$tradition})", { tradition: name })
         : name => name;
+    const { levels } = baseEntry;
+    const addLevels = levels === undefined
+        ? identity
+        : baseEntry.nameBuilderRules?.levelPlacement?.kind === "BeforeOptions"
+            ? name => {
+                const nameParts = name.split("(");
+                if (nameParts.length > 1) {
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- array is checked to have at least two elements
+                    return `${nameParts[0]}I–${romanize(levels)} (${nameParts.slice(1).join("(")}`;
+                }
+                return `${name} I–${romanize(levels)}`;
+            }
+            : name => `${name} I–${romanize(levels)}`;
     return {
-        title: makeTraditionName(translation.name_in_library ?? translation.name + parensIf(translation.additionalName)) + (baseEntry.levels !== undefined ? ` I–${romanize(baseEntry.levels)}` : ""),
+        title: addLevels(makeTraditionName(translation.name_in_library ?? translation.name + parensIf(translation.additionalName))),
         subtitle: mapNullable(baseEntry.subtype, subtype => renderAdvantageDisadvantageSubtype(subtype).run(env)) ??
             mapNullable(baseEntry.usage_type, usageType => renderCombatSpecialAbilityType(usageType).run(env)),
-        badge: mapNullable(entityName === "CombatStyleSpecialAbility" || entityName === "AdvancedCombatSpecialAbility"
+        badge: mapNullable(entityName === "CombatStyleSpecialAbility" ||
+            entityName === "AdvancedCombatSpecialAbility"
             ? entry.type
-            : undefined, combatType => {
+            : undefined, (combatType) => {
             switch (combatType.kind) {
                 case "Armed":
                     return { type: "armedCombat", value: translate("AC") };
@@ -824,7 +838,8 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
                 default:
                     return assertExhaustive(combatType);
             }
-        }),
+        }) ??
+            mapNullable(baseEntry.prerequisites, getDerivedFocusRuleBadgeFromPrerequisites)?.run(env),
         className: "special-ability",
         body: [
             mapNullable(translation.special_rules, specialRules => ({
@@ -877,9 +892,9 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
                         label: translate("Prerequisites"),
                         value: wrappedId.kind === "Advantage" || wrappedId.kind === "Disadvantage"
                             ? printAdvantageDisadvantagePrerequisites(prerequisites, translation.name, wrappedId.kind).run(env)
-                            : printGeneralPrerequisites(prerequisites, mapNullable(baseEntry.levels, levels => ({
+                            : printGeneralPrerequisites(prerequisites, mapNullable(levels, safeLevels => ({
                                 id: wrappedId,
-                                levels,
+                                levels: safeLevels,
                             })), renderTrailingAdvancedPrerequisitesNote(translate, entityName)).run(env),
                     })),
                     mapNullable(baseEntry.combat_techniques, combatTechniques => ({

package/lib/entities/liturgicalChant.d.ts

@@ -12,7 +12,7 @@ export declare const getBlessingEntityDescription: import("../creator.js").Entit
  * Get a JSON representation of the rules text for a liturgical chant.
  */
 export declare const getLiturgicalChantEntityDescription: import("../creator.js").EntityDescriptionCreator<"LiturgicalChant", {
-    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "SkillModificationLevel" | "TargetCategory" | "Aspect" | "BlessedTradition" | "DerivedCharacteristic" | RatedIdentifier["kind"] | "Enhancement">;
+    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "SkillModificationLevel" | "TargetCategory" | "Aspect" | "BlessedTradition" | "DerivedCharacteristic" | RatedIdentifier["kind"] | "Enhancement" | "FocusRule">;
     getChildInstancesForInstanceId: GetAllChildInstancesForParent<"Enhancement">;
     idMap: IdMap;
 }, import("../index.js").EntityDescription>;
@@ -20,7 +20,7 @@ export declare const getLiturgicalChantEntityDescription: import("../creator.js"
  * Get a JSON representation of the rules text for a ceremony.
  */
 export declare const getCeremonyEntityDescription: import("../creator.js").EntityDescriptionCreator<"Ceremony", {
-    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "SkillModificationLevel" | "TargetCategory" | "Aspect" | "BlessedTradition" | "DerivedCharacteristic" | RatedIdentifier["kind"] | "Enhancement">;
+    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "SkillModificationLevel" | "TargetCategory" | "Aspect" | "BlessedTradition" | "DerivedCharacteristic" | RatedIdentifier["kind"] | "Enhancement" | "FocusRule">;
     getChildInstancesForInstanceId: GetAllChildInstancesForParent<"Enhancement">;
     idMap: IdMap;
 }, import("../index.js").EntityDescription>;

package/lib/entities/liturgicalChant.js

@@ -1,9 +1,11 @@
+import { mapNullable } from "@elyukai/utils/nullable";
 import { isNotNullish } from "@optolith/helpers/nullable";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
 import { Case } from "tsondb/schema/gen";
 import { createEntityDescriptionCreator } from "../creator.js";
 import { renderEnhancements } from "./partial/enhancements.js";
 import { attributedInstance, attributedName } from "./partial/markdown.js";
+import { getDerivedFocusRuleBadgeFromPrerequisites } from "./partial/prerequisites/index.js";
 import { renderOneTimeDuration } from "./partial/rated/activatable/duration.js";
 import { renderEffect } from "./partial/rated/activatable/effect.js";
 import { combineGeneratedTextWithStaticTranslation, renderFastPerformanceParameters, renderSlowPerformanceParameters, } from "./partial/rated/activatable/index.js";
@@ -173,6 +175,7 @@ export const getLiturgicalChantEntityDescription = createEntityDescriptionCreato
     return {
         title: translation.name,
         className: "liturgical-chant",
+        badge: mapNullable(entry.prerequisites, getDerivedFocusRuleBadgeFromPrerequisites)?.run(env),
         body: [
             {
                 type: "definitionList",
@@ -237,6 +240,7 @@ export const getCeremonyEntityDescription = createEntityDescriptionCreator(({ ge
     return {
         title: translation.name,
         className: "ceremony",
+        badge: mapNullable(entry.prerequisites, getDerivedFocusRuleBadgeFromPrerequisites)?.run(env),
         body: [
             {
                 type: "definitionList",

package/lib/entities/partial/prerequisites/index.d.ts

@@ -1,6 +1,7 @@
 import { Reader } from "@elyukai/utils/reader";
 import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisites, AnimistPowerPrerequisites, ArcaneTraditionPrerequisites, DerivedCharacteristicPrerequisites, EnhancementPrerequisites, GeneralPrerequisites, GeodeRitualPrerequisites, InfluencePrerequisites, LanguagePrerequisites, LiturgyPrerequisites, PersonalityTraitPrerequisites, PlainGeneralPrerequisites, ProfessionPrerequisites, ProfessionVariantPrerequisites, PublicationPrerequisites, SpellworkPrerequisites } from "@optolith/database-schema/gen";
-import type { StdEnv } from "../../../env.js";
+import type { StdEnv, StdReader } from "../../../env.js";
+import type { RawEntityDescriptionBadge } from "../../../index.js";
 import { printAdvantageDisadvantagePrerequisiteGroup, printAnimistPowerPrerequisiteGroup, printArcaneTraditionPrerequisiteGroup, printDerivedCharacteristicPrerequisiteGroup, printEnhancementPrerequisiteGroup, printGeneralPrerequisiteGroup, printGeodeRitualPrerequisiteGroup, printInfluencePrerequisiteGroup, printLanguagePrerequisiteGroup, printLiturgyPrerequisiteGroup, printPersonalityTraitPrerequisiteGroup, printProfessionPrerequisiteGroup, printPublicationPrerequisiteGroup, printSpellworkPrerequisiteGroup } from "./prerequisiteGroups.js";
 type DeriveEnvF<T extends (...args: any[]) => any> = ReturnType<T> extends Reader<infer E, unknown> ? E : never;
 /**
@@ -70,4 +71,8 @@ export declare const printGeodeRitualPrerequisites: (value: GeodeRitualPrerequis
  * Print enhancement prerequisites as a string.
  */
 export declare const printEnhancementPrerequisites: (value: EnhancementPrerequisites) => Reader<DeriveEnvF<typeof printEnhancementPrerequisiteGroup> & StdEnv<"lj" | "lc">, string>;
+/**
+ * Get the focus rule badge from prerequisites.
+ */
+export declare const getDerivedFocusRuleBadgeFromPrerequisites: (prerequisites: AdvantageDisadvantagePrerequisites | GeneralPrerequisites | PlainGeneralPrerequisites) => StdReader<RawEntityDescriptionBadge | undefined, "ibi", "FocusRule">;
 export {};

package/lib/entities/partial/prerequisites/index.js

@@ -7,7 +7,7 @@ import { isNotNullish } from "@optolith/helpers/nullable";
 import { romanize } from "@optolith/helpers/roman";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
 import { renderActivatableNameComponents, renderActivatableNameComponentsCombinedIfPossible, } from "../activatableNameChunks.js";
-import { localeJoinR, translateR } from "../reader.js";
+import { getInstanceByIdR, localeJoinR, translateR } from "../reader.js";
 import { MISSING_VALUE } from "../unknown.js";
 import { printDisplayOption } from "./displayOption.js";
 import { hasPartValueObject, joinPrerequisiteParts } from "./part.js";
@@ -230,3 +230,26 @@ export const printGeodeRitualPrerequisites = (value) => printPlainPrerequisites(
  * Print enhancement prerequisites as a string.
  */
 export const printEnhancementPrerequisites = (value) => printPlainPrerequisites(printEnhancementPrerequisiteGroup, value);
+const getDerivedFocusRuleBadgeFromPrerequisite = (prerequisite) => prerequisite.kind === "Single" &&
+    prerequisite.Single.kind === "Rule" &&
+    prerequisite.Single.Rule.id.kind === "FocusRule"
+    ? getInstanceByIdR(prerequisite.Single.Rule.id).map(focusRule => focusRule?.level)
+    : Reader.of(undefined);
+/**
+ * Get the focus rule badge from prerequisites.
+ */
+export const getDerivedFocusRuleBadgeFromPrerequisites = (prerequisites) => Reader.asks(env => {
+    for (const element of prerequisites) {
+        const actualPrerequisite = "level" in element ? (element.level === 1 ? element.prerequisite : undefined) : element;
+        if (actualPrerequisite !== undefined) {
+            const badge = getDerivedFocusRuleBadgeFromPrerequisite(actualPrerequisite).run(env);
+            if (badge !== undefined) {
+                return {
+                    type: "level",
+                    value: romanize(badge),
+                };
+            }
+        }
+    }
+    return undefined;
+});

package/lib/entities/partial/prerequisites/prerequisiteGroups.js

@@ -1,6 +1,7 @@
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
 import { printActivatablePrerequisite } from "./single/activatable.js";
 import { printAnimistPowerPrerequisite } from "./single/animistPower.js";
+import { printAnySpecialAbilityOfGroupPrerequisite } from "./single/anySpecialAbilityOfGroup.js";
 import { printBlessedTraditionPrerequisite } from "./single/blessedTradition.js";
 import { printCommonSuggestedByRCPPrerequisite } from "./single/commonSuggestedByRCP.js";
 import { printCulturePrerequisite } from "./single/culture.js";
@@ -82,7 +83,7 @@ export const printGeneralPrerequisiteGroup = (prerequisite) => {
         case "TinyActivatable":
             return printTinyActivatablePrerequisite(prerequisite.TinyActivatable);
         case "AnySpecialAbilityOfGroup":
-            return printMagicalTraditionPrerequisite(prerequisite.AnySpecialAbilityOfGroup);
+            return printAnySpecialAbilityOfGroupPrerequisite(prerequisite.AnySpecialAbilityOfGroup);
         case "Rated":
             return printRatedPrerequisite(prerequisite.Rated);
         case "RatedMinimumNumber":

package/lib/entities/spell.d.ts

@@ -12,7 +12,7 @@ export declare const getCantripEntityDescription: import("../creator.js").Entity
  * Get a JSON representation of the rules text for a skill.
  */
 export declare const getSpellEntityDescription: import("../creator.js").EntityDescriptionCreator<"Spell", {
-    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "SkillModificationLevel" | "TargetCategory" | "Property" | "MagicalTradition" | "DerivedCharacteristic" | RatedIdentifier["kind"] | "Enhancement">;
+    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "SkillModificationLevel" | "TargetCategory" | "Property" | "MagicalTradition" | "DerivedCharacteristic" | RatedIdentifier["kind"] | "Enhancement" | "FocusRule">;
     getChildInstancesForInstanceId: GetAllChildInstancesForParent<"Enhancement">;
     idMap: IdMap;
 }, import("../index.js").EntityDescription>;
@@ -20,7 +20,7 @@ export declare const getSpellEntityDescription: import("../creator.js").EntityDe
  * Get a JSON representation of the rules text for a ritual.
  */
 export declare const getRitualEntityDescription: import("../creator.js").EntityDescriptionCreator<"Ritual", {
-    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "SkillModificationLevel" | "TargetCategory" | "Property" | "MagicalTradition" | "DerivedCharacteristic" | RatedIdentifier["kind"] | "Enhancement">;
+    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "SkillModificationLevel" | "TargetCategory" | "Property" | "MagicalTradition" | "DerivedCharacteristic" | RatedIdentifier["kind"] | "Enhancement" | "FocusRule">;
     getChildInstancesForInstanceId: GetAllChildInstancesForParent<"Enhancement">;
     idMap: IdMap;
 }, import("../index.js").EntityDescription>;

package/lib/entities/spell.js

@@ -12,7 +12,7 @@ import { createEntityDescriptionCreator } from "../creator.js";
 import { renderAnimalTypesSection } from "./partial/animalTypes.js";
 import { renderEnhancements } from "./partial/enhancements.js";
 import { attributedCustomName, attributedName } from "./partial/markdown.js";
-import { printAnimistPowerPrerequisites, printGeodeRitualPrerequisites, } from "./partial/prerequisites/index.js";
+import { getDerivedFocusRuleBadgeFromPrerequisites, printAnimistPowerPrerequisites, printGeodeRitualPrerequisites, } from "./partial/prerequisites/index.js";
 import { renderCastingTime, renderFastSkillNonModifiableCastingTime, renderSlowSkillNonModifiableCastingTime, } from "./partial/rated/activatable/castingTime.js";
 import { renderMagicalActionCost, renderModifiableOneTimeCost, renderNonModifiableOneTimeCost, renderNonModifiableSustainedCost, renderStandaloneCostMap, } from "./partial/rated/activatable/cost.js";
 import { renderExpressionBasedDuration, renderMusicDuration, renderOneTimeDuration, renderSustainedDuration, } from "./partial/rated/activatable/duration.js";
@@ -162,6 +162,7 @@ export const getSpellEntityDescription = createEntityDescriptionCreator(({ getIn
     return {
         title: translation.name,
         className: "spell",
+        badge: mapNullable(entry.prerequisites, getDerivedFocusRuleBadgeFromPrerequisites)?.run(env),
         body: [
             {
                 type: "definitionList",
@@ -221,6 +222,7 @@ export const getRitualEntityDescription = createEntityDescriptionCreator(({ getI
     return {
         title: translation.name,
         className: "ritual",
+        badge: mapNullable(entry.prerequisites, getDerivedFocusRuleBadgeFromPrerequisites)?.run(env),
         body: [
             {
                 type: "definitionList",