@optolith/entity-descriptions 0.11.2 → 0.13.0

package/lib/entities/profession.js

@@ -12,7 +12,7 @@ import { createEntityDescriptionCreator } from "../creator.js";
 import { combineNameComponents, getNameComponents, renderActivatableNameComponents, renderCombinedActivatableNameComponents, } from "./partial/activatableNameChunks.js";
 import { renderCommonnessRatedAdvantagesOrDisadvantages, renderValueWithPossibleTranslation, } from "./partial/commonnessRatedAdvantagesAndDisadvantages.js";
 import { attributedCustomName, attributedInstance, attributedName, attributedNameFromInstance, } from "./partial/markdown.js";
-import { printProfessionPrerequisites } from "./partial/prerequisites/index.js";
+import { printProfessionPrerequisites, printProfessionVariantPrerequisites, } from "./partial/prerequisites/index.js";
 import { parensIf } from "./partial/rated/activatable/parensIf.js";
 import { attributedCustomNameR, attributedNameR, customNameR, formatR, getChildInstancesForInstanceIdFnR, getChildInstancesForInstanceIdR, getInstanceByIdR, localeCompareR, localeJoinR, localeSortR, strictNameR, translateMapFnR, translateR, translationR, } from "./partial/reader.js";
 import { MISSING_VALUE, UNHANDLED_VALUE } from "./partial/unknown.js";
@@ -385,7 +385,7 @@ const renderSpecialAbilityName = (specialAbility) => Reader.asks(({ translate, t
             else {
                 return isCombinedEnhancementNameComponents(possiblyCombined)
                     ? renderCombinedEnhancementNameComponents(possiblyCombined)
-                    : wrapActivatableInAttributedString(renderCombinedActivatableNameComponents(translateMap, possiblyCombined, false, list => localeJoin(list, "disjunction"), "profession"), possiblyCombined.id);
+                    : renderCombinedActivatableNameComponents(translateMap, possiblyCombined, false, list => localeJoin(list, "disjunction"), "profession");
             }
         }
         default:
@@ -448,7 +448,7 @@ const renderSpellworks = (professionPackages) => Reader.sequence([
 const retrieveBlessedTraditionIdentifierFromPrerequisiteGroup = (prerequisite) => prerequisite.kind === "Activatable" && prerequisite.Activatable.id.kind === "BlessedTradition"
     ? [prerequisite.Activatable.id.BlessedTradition]
     : [];
-const retrieveBlessedTraditionIdentifierFromPrerequisites = (prerequisites) => prerequisites?.flatMap(part => {
+const retrieveBlessedTraditionIdentifierFromPrerequisite = (part) => {
     switch (part.kind) {
         case "Single":
             return retrieveBlessedTraditionIdentifierFromPrerequisiteGroup(part.Single);
@@ -459,6 +459,17 @@ const retrieveBlessedTraditionIdentifierFromPrerequisites = (prerequisites) => p
         default:
             return assertExhaustive(part);
     }
+};
+const retrieveBlessedTraditionIdentifierFromPrerequisites = (prerequisites) => prerequisites?.flatMap(retrieveBlessedTraditionIdentifierFromPrerequisite) ?? [];
+const retrieveBlessedTraditionIdentifierFromVariantPrerequisites = (prerequisites) => prerequisites?.flatMap(part => {
+    switch (part.kind) {
+        case "Add":
+            return retrieveBlessedTraditionIdentifierFromPrerequisite(part.Add);
+        case "Remove":
+            return [];
+        default:
+            return assertExhaustive(part);
+    }
 }) ?? [];
 const renderBlessingList = (blessings) => Reader.traverse(blessings, id => attributedNameR("profession", "Blessing", id).map(name => name ?? MISSING_VALUE)).thenW(localeSortR);
 const renderRestrictedBlessings = (restrictedBlessings) => {
@@ -508,7 +519,7 @@ const renderBlessings = (traditions) => {
 };
 const renderBlessingsForPackages = (professionPackages) => renderBlessings(professionPackages.map(pkg => retrieveBlessedTraditionIdentifierFromPrerequisites(pkg.content.prerequisites)));
 const renderBlessingsForVariant = (professionVariant) => renderBlessings([
-    retrieveBlessedTraditionIdentifierFromPrerequisites(professionVariant.prerequisites),
+    retrieveBlessedTraditionIdentifierFromVariantPrerequisites(professionVariant.prerequisites),
 ]).map(blessingsText => (blessingsText !== undefined ? [blessingsText] : []));
 const renderLiturgicalChantName = (liturgyIds) => Reader.traverse(liturgyIds, id => attributedNameR("profession", id).map(name => name ?? MISSING_VALUE)).thenW(list => localeJoinR(list, "disjunction"));
 const renderLiturgicalChants = (professionPackages) => Reader.sequence([
@@ -540,7 +551,7 @@ const renderProfessionVariantText = (base, variant, translation) => translation.
     : Reader.sequence([
         variant.prerequisites === undefined
             ? Reader.of([])
-            : printProfessionPrerequisites(variant.prerequisites).thenW(prerequisitesText => translateR("Additional Prerequisites").map(label => [
+            : printProfessionVariantPrerequisites(variant.prerequisites).thenW(prerequisitesText => translateR("Additional Prerequisites").map(label => [
                 `${label}: ${prerequisitesText}`,
             ])),
         renderVariantOption(base, variant, "skill_specialization", renderVariantSkillSpecializationOption),