@optolith/entity-descriptions 0.4.10 → 0.4.12

package/lib/entities/equipment.d.ts

@@ -1,6 +1,7 @@
-import type { EquipmentIdentifier, GenMeleeWeapon, GenRangedWeapon, LocaleMeasurementAdjustments } from "optolith-database-schema/gen";
+import type { AmmunitionishIdentifier, EquipmentIdentifier, GenMeleeWeapon, GenRangedWeapon, LocaleMeasurementAdjustments } from "@optolith/database-schema/gen";
 import { type TaggedEntity } from "../creator.js";
 import type { GetInstanceById } from "../helpers/getTypes.js";
+import type { LocaleJoin } from "../helpers/locale.js";
 import type { Translate, TranslateMap } from "../helpers/translate.js";
 import type { IdMap, LabeledEntityDescriptionSection, RawEntityDescriptionSectionContent } from "../index.js";
 /**
@@ -10,15 +11,15 @@ export declare const getEquipmentName: (translate: Translate, translateMap: Tran
 /**
  * Render combat values of a melee weapon.
  */
-export declare const renderMeleeWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, getInstanceById: GetInstanceById<"Attribute" | "CloseCombatTechnique" | "Reach">, measurements: Required<LocaleMeasurementAdjustments>, renderDamage: (damage: Damage) => string, closeCombatTechniqueId: string, use: GenMeleeWeapon<Damage>) => LabeledEntityDescriptionSection<RawEntityDescriptionSectionContent>;
+export declare const renderMeleeWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, localeJoin: LocaleJoin, getInstanceById: GetInstanceById<"Attribute" | "CloseCombatTechnique" | "Reach">, measurements: Required<LocaleMeasurementAdjustments>, renderDamage: (damage: Damage) => string, closeCombatTechniqueId: string, use: GenMeleeWeapon<Damage>) => LabeledEntityDescriptionSection<RawEntityDescriptionSectionContent>;
 /**
  * Render combat values of a ranged weapon.
  */
-export declare const renderRangedWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, getInstanceById: GetInstanceById<"RangedCombatTechnique" | "Ammunition">, measurements: Required<LocaleMeasurementAdjustments>, renderDamage: (damage: Damage) => string, rangedCombatTechniqueId: string, use: GenRangedWeapon<Damage>) => LabeledEntityDescriptionSection<RawEntityDescriptionSectionContent>;
+export declare const renderRangedWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, getInstanceById: GetInstanceById<"RangedCombatTechnique" | AmmunitionishIdentifier["kind"]>, measurements: Required<LocaleMeasurementAdjustments>, renderDamage: (damage: Damage) => string, rangedCombatTechniqueId: string, use: GenRangedWeapon<Damage>) => LabeledEntityDescriptionSection<RawEntityDescriptionSectionContent>;
 /**
  * Get a JSON representation of the rules text for equipment.
  */
-export declare const getEquipmentEntityDescription: import("../creator.js").EntityDescriptionCreator<"Weapon" | "Armor" | "Ammunition" | "Animal" | "AnimalCare" | "BandageOrRemedy" | "Book" | "CeremonialItem" | "Clothes" | "ClothingPackage" | "Container" | "EquipmentOfBlessedOnes" | "GemOrPreciousStone" | "IlluminationLightSource" | "IlluminationRefillOrSupply" | "Jewelry" | "Laboratory" | "Liebesspielzeug" | "LuxuryGood" | "MagicalArtifact" | "MusicalInstrument" | "Newspaper" | "OrienteeringAid" | "RopeOrChain" | "Stationery" | "ThievesTool" | "ToolOfTheTrade" | "TravelGearOrTool" | "Vehicle" | "WeaponAccessory" | "WorkingSupernaturalCreature", {
-    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "Reach" | "SocialStatus" | "CloseCombatTechnique" | "RangedCombatTechnique" | "MagicalTradition" | "BlessedTradition" | "DerivedCharacteristic" | "Ammunition" | "Race" | "Culture" | "Profession" | "Skill">;
+export declare const getEquipmentEntityDescription: import("../creator.js").EntityDescriptionCreator<"Weapon" | "Ammunition" | "Armor" | "Animal" | "AnimalCare" | "BandageOrRemedy" | "Book" | "CeremonialItem" | "Clothes" | "ClothingPackage" | "Container" | "EquipmentOfBlessedOnes" | "GemOrPreciousStone" | "IlluminationLightSource" | "IlluminationRefillOrSupply" | "Jewelry" | "Laboratory" | "Liebesspielzeug" | "LuxuryGood" | "MagicalArtifact" | "MusicalInstrument" | "Newspaper" | "OrienteeringAid" | "RopeOrChain" | "Stationery" | "ThievesTool" | "ToolOfTheTrade" | "TravelGearOrTool" | "Vehicle" | "WeaponAccessory" | "WorkingSupernaturalCreature", {
+    getInstanceById: GetInstanceById<"Publication" | "Attribute" | "Reach" | "SocialStatus" | "CloseCombatTechnique" | "RangedCombatTechnique" | "MagicalTradition" | "BlessedTradition" | "DerivedCharacteristic" | AmmunitionishIdentifier["kind"] | "Race" | "Culture" | "Profession" | "Skill">;
     idMap: IdMap;
 }, import("../index.js").EntityDescription>;

package/lib/entities/equipment.js

@@ -1,11 +1,14 @@
 import { ensureNonEmpty, isNotEmpty } from "@elyukai/utils/array/nonEmpty";
+import { on } from "@elyukai/utils/function";
 import { isNotNullish } from "@elyukai/utils/nullable";
+import { compareNumber } from "@elyukai/utils/ordering";
 import { romanize } from "@elyukai/utils/roman";
 import { sign } from "@elyukai/utils/string/number";
 import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { mapNullable } from "@optolith/helpers/nullable";
 import { createEntityDescriptionCreator } from "../creator.js";
 import { renderDice, renderDiceAndFlat } from "./partial/dice.js";
+import { attributedName, attributedNameFromInstance } from "./partial/markdown.js";
 import { additionFormatter, subtractionFormatter } from "./partial/mathOperation.js";
 import { parensIf } from "./partial/rated/activatable/parensIf.js";
 import { ResponsiveTextSize } from "./partial/responsiveText.js";
@@ -91,9 +94,19 @@ const renderPrimaryAttributeAndDamageThreshold = (translateMap, getInstanceById,
 const renderAttackParryModifier = (attackModifier, parryModifier) => attackModifier === undefined && parryModifier === undefined
     ? "—"
     : `${attackModifier === undefined ? "—" : sign(attackModifier)}/${parryModifier === undefined ? "—" : sign(parryModifier)}`;
-const renderReach = (translateMap, getInstanceById, reach) => reach === undefined
+const renderReach = (translateMap, localeJoin, getInstanceById, reaches) => reaches === undefined
     ? "—"
-    : (translateMap(getInstanceById("Reach", reach)?.translations)?.name ?? MISSING_VALUE);
+    : localeJoin(reaches
+        .map((reach) => {
+        const instance = getInstanceById("Reach", reach);
+        return [
+            instance?.position ?? 0,
+            attributedNameFromInstance(translateMap, instance, "equipment", "Reach", reach) ??
+                MISSING_VALUE,
+        ];
+    })
+        .toSorted(on(e => e[0], compareNumber))
+        .map(e => e[1]), "conjunction");
 const renderLength = (translate, measurements, length) => length === undefined
     ? "—"
     : translate(".input {$value :number} {{{$value} inches}}", {
@@ -102,7 +115,7 @@ const renderLength = (translate, measurements, length) => length === undefined
 /**
  * Render combat values of a melee weapon.
  */
-export const renderMeleeWeapon = (translate, translateMap, getInstanceById, measurements, renderDamage, closeCombatTechniqueId, use) => {
+export const renderMeleeWeapon = (translate, translateMap, localeJoin, getInstanceById, measurements, renderDamage, closeCombatTechniqueId, use) => {
     const combatTechnique = getInstanceById("CloseCombatTechnique", closeCombatTechniqueId);
     const fields = combatTechnique?.special ?? {
         can_parry: { kind: "Prohibited" },
@@ -137,7 +150,7 @@ export const renderMeleeWeapon = (translate, translateMap, getInstanceById, meas
                     ? undefined
                     : {
                         label: translate("Reach"),
-                        value: renderReach(translateMap, getInstanceById, use.reach),
+                        value: renderReach(translateMap, localeJoin, getInstanceById, use.reach),
                     },
                 fields.has_length.kind === "Prohibited"
                     ? undefined
@@ -159,7 +172,7 @@ const renderReloadTime = (translate, reloadTime) => isNotEmpty(reloadTime)
 const renderRangeBrackets = (rangeBrackets) => `${rangeBrackets.close.toFixed()}/${rangeBrackets.medium.toFixed()}/${rangeBrackets.far.toFixed()}`;
 const renderAmmunition = (translateMap, getInstanceById, ammunition) => ammunition === undefined
     ? "—"
-    : (translateMap(getInstanceById("Ammunition", ammunition)?.translations)?.name ?? MISSING_VALUE);
+    : (attributedName(translateMap, getInstanceById, "equipment", ammunition) ?? MISSING_VALUE);
 const renderMeleeDamage = (translate) => (damage) => renderDiceAndFlat(translate, damage.dice, damage.flat);
 /**
  * Render combat values of a ranged weapon.
@@ -713,7 +726,7 @@ export const getEquipmentEntityDescription = createEntityDescriptionCreator(({ g
         className: "equipment",
         body: [
             ...(combatValues?.type === "Weapon"
-                ? Object.entries(combatValues.values.melee_uses ?? {}).map(([combatTechniqueId, use]) => renderMeleeWeapon(translate, translateMap, getInstanceById, locale.measurementAdjustments, renderMeleeDamage(translate), combatTechniqueId, use))
+                ? Object.entries(combatValues.values.melee_uses ?? {}).map(([combatTechniqueId, use]) => renderMeleeWeapon(translate, translateMap, locale.join, getInstanceById, locale.measurementAdjustments, renderMeleeDamage(translate), combatTechniqueId, use))
                 : []),
             ...(combatValues?.type === "Weapon"
                 ? Object.entries(combatValues.values.ranged_uses ?? {}).map(([combatTechniqueId, use]) => renderRangedWeapon(translate, translateMap, getInstanceById, locale.measurementAdjustments, renderRangedDamage(translate), combatTechniqueId, use))

package/lib/entities/equipmentPackage.d.ts

@@ -1,4 +1,4 @@
-import type { EquipmentIdentifier } from "optolith-database-schema/gen";
+import type { EquipmentIdentifier } from "@optolith/database-schema/gen";
 import type { GetInstanceById } from "../helpers/getTypes.js";
 /**
  * Get a JSON representation of the rules text for an equipment package.

package/lib/entities/influence.d.ts

@@ -1,4 +1,4 @@
-import type { ActivatableIdentifier } from "optolith-database-schema/gen";
+import type { ActivatableIdentifier } from "@optolith/database-schema/gen";
 import type { GetAllChildInstancesForParent, GetInstanceById } from "../helpers/getTypes.js";
 import type { GetResolvedSelectOptionById } from "./partial/prerequisites/single/activatable.js";
 /**

package/lib/entities/liturgicalChant.d.ts

@@ -1,4 +1,4 @@
-import { type RatedIdentifier } from "optolith-database-schema/gen";
+import { type RatedIdentifier } from "@optolith/database-schema/gen";
 import type { GetAllChildInstancesForParent, GetInstanceById } from "../helpers/getTypes.js";
 import type { IdMap } from "../index.js";
 /**

package/lib/entities/partial/activatableNameChunks.d.ts

@@ -1,4 +1,4 @@
-import type { ActivatableIdentifier, ActivatableNameBuilderRules, RequirableSelectOptionIdentifier } from "optolith-database-schema/gen";
+import type { ActivatableIdentifier, ActivatableNameBuilderRules, RequirableSelectOptionIdentifier } from "@optolith/database-schema/gen";
 import type { LocaleMap, Translate, TranslateMap } from "../../helpers/translate.js";
 import type { GetResolvedSelectOptionById } from "./prerequisites/single/activatable.js";
 /**
@@ -8,7 +8,7 @@ export type ActivatableNameComponents = {
     id: ActivatableIdentifier;
     base: ActivatableNameChunk;
     options: ActivatableNameChunk | [ActivatableNameChunk, ActivatableNameChunk] | undefined;
-    level: number | undefined;
+    level: number | [start: number, end: number] | undefined;
     nameBuilderRules: Required<ActivatableNameBuilderRules>;
 };
 /**
@@ -18,7 +18,7 @@ export type CombinedActivatableNameComponents = {
     id: ActivatableIdentifier;
     base: ActivatableNameChunk;
     options: (ActivatableNameChunk | [ActivatableNameChunk, ActivatableNameChunk])[];
-    level: number | undefined;
+    level: number | [start: number, end: number] | undefined;
     nameBuilderRules: Required<ActivatableNameBuilderRules>;
 };
 /**
@@ -52,6 +52,14 @@ export declare const renderMultipleStandaloneActivatableNameComponents: (transla
  * Renders the name components of multiple activatable entries, combining parts if possible.
  */
 export declare const renderActivatableNameComponentsCombinedIfPossible: (translateMap: TranslateMap, components: ActivatableNameComponents[], formatAsPrerequisite: boolean, join?: (list: string[]) => string) => string;
+/**
+ * Renders the options of an activatable entry, combining them if necessary.
+ */
+export declare const renderNameComponentsOptions: (displayedInProfession: boolean, getResolvedSelectOptionById: GetResolvedSelectOptionById, id: ActivatableIdentifier, options: RequirableSelectOptionIdentifier[] | undefined) => ActivatableNameChunk | [ActivatableNameChunk, ActivatableNameChunk] | undefined;
+/**
+ * Provides default values for name builder rules and ensures that all properties are present.
+ */
+export declare const makeNameBuilderRulesWithDefaults: (input: ActivatableNameBuilderRules | undefined) => Required<ActivatableNameBuilderRules>;
 /**
  * Gets the name components for an activatable entry.
  */

package/lib/entities/partial/activatableNameChunks.js

@@ -60,9 +60,11 @@ const zipChunks = (chunks) => chunks
     .reduce((acc, chunk) => (acc === "" ? chunk : combineChunks(acc, chunk, (a, b) => `${a}, ${b}`)), "");
 const renderLevel = (formatAsPrerequisite, id, level) => level === undefined
     ? undefined
-    : formatAsPrerequisite || id.kind === "Advantage" || id.kind === "Disadvantage" || level === 1
-        ? romanize(level)
-        : `I–${romanize(level)}`;
+    : Array.isArray(level)
+        ? `${romanize(level[0])}–${romanize(level[1])}`
+        : formatAsPrerequisite || id.kind === "Advantage" || id.kind === "Disadvantage" || level === 1
+            ? romanize(level)
+            : `I–${romanize(level)}`;
 /**
  * Converts a name chunk to a displayable string.
  */
@@ -83,7 +85,9 @@ const renderActivatableNameChunk = (translateMap, chunk) => {
  */
 export const renderActivatableNameComponentsWithoutLevel = (translateMap, components) => {
     const { levelPlacement, useParenthesis } = components.nameBuilderRules;
-    const wrapParens = useParenthesis ? str => `(${str})` : identity;
+    const wrapParens = useParenthesis
+        ? str => (str.length > 0 ? `(${str})` : undefined)
+        : identity;
     const base = renderActivatableNameChunk(translateMap, components.base);
     const options = components.options === undefined
         ? undefined
@@ -125,6 +129,10 @@ export const combineNameComponents = (elements) => {
  */
 export const renderCombinedActivatableNameComponents = (translateMap, components, formatAsPrerequisite, join = list => list.join(", ")) => renderActivatableNameComponents(translateMap, {
     ...components,
+    nameBuilderRules: {
+        ...components.nameBuilderRules,
+        useParenthesis: true,
+    },
     options: join(components.options.map(chunk => renderActivatableNameChunk(translateMap, normalizeChunks(chunk)))),
 }, formatAsPrerequisite);
 /**
@@ -306,7 +314,10 @@ export const renderActivatableNameComponentsCombinedIfPossible = (translateMap,
 //     ),
 //   )(staticData)
 // }
-const renderOptions = (displayedInProfession, getResolvedSelectOptionById, id, options) => {
+/**
+ * Renders the options of an activatable entry, combining them if necessary.
+ */
+export const renderNameComponentsOptions = (displayedInProfession, getResolvedSelectOptionById, id, options) => {
     const arr = options?.map(optionId => {
         const optTranslations = getResolvedSelectOptionById(id, optionId)?.content.translations;
         return optTranslations === undefined
@@ -319,18 +330,22 @@ const renderOptions = (displayedInProfession, getResolvedSelectOptionById, id, o
     }
     return arr[0];
 };
+/**
+ * Provides default values for name builder rules and ensures that all properties are present.
+ */
+export const makeNameBuilderRulesWithDefaults = (input) => ({
+    levelPlacement: input?.levelPlacement ?? {
+        kind: "AfterOptions",
+    },
+    useParenthesis: input?.useParenthesis ?? true,
+});
 /**
  * Gets the name components for an activatable entry.
  */
 export const getNameComponents = (translate, id, options, level, nameBuilderRules, translations, getBaseName, getResolvedSelectOptionById, displayedInProfession) => {
-    const nameBuilderRulesWithDefaults = {
-        levelPlacement: nameBuilderRules?.levelPlacement ?? {
-            kind: "AfterOptions",
-        },
-        useParenthesis: nameBuilderRules?.useParenthesis ?? true,
-    };
+    const nameBuilderRulesWithDefaults = makeNameBuilderRulesWithDefaults(nameBuilderRules);
     const renderedBase = mapObject(translations, getBaseName);
-    const renderedOptions = renderOptions(displayedInProfession, getResolvedSelectOptionById, id, options);
+    const renderedOptions = renderNameComponentsOptions(displayedInProfession, getResolvedSelectOptionById, id, options);
     const isTradition = id.kind === "MagicalTradition" || id.kind === "BlessedTradition";
     const actualBase = isTradition ? translate("Tradition") : renderedBase;
     const actualOptions = isTradition

package/lib/entities/partial/adventurePointsValue.d.ts

@@ -1,5 +1,5 @@
-import type { ResolvedSelectOption, ResolvedSelectOptionIdentifier } from "optolith-database-schema/cache";
-import type { ActivatableIdentifier, AdventurePointsValue } from "optolith-database-schema/gen";
+import type { ResolvedSelectOption, ResolvedSelectOptionIdentifier } from "@optolith/database-schema/cache";
+import type { ActivatableIdentifier, AdventurePointsValue } from "@optolith/database-schema/gen";
 import type { GetAllInstances } from "../../helpers/getTypes.js";
 import type { LocaleEnvironment } from "../../helpers/locale.js";
 import type { BaseActivatable, BaseActivatableTranslation } from "../activatable.js";

package/lib/entities/partial/animalTypes.d.ts

@@ -1,4 +1,4 @@
-import type { AnimalType_ID } from "optolith-database-schema/gen";
+import type { AnimalType_ID } from "@optolith/database-schema/gen";
 import type { GetInstanceById } from "../../helpers/getTypes.js";
 import type { LocaleCompare } from "../../helpers/locale.js";
 import type { Translate, TranslateMap } from "../../helpers/translate.js";

package/lib/entities/partial/animalTypes.js

@@ -7,7 +7,8 @@ export const renderAnimalTypesSection = (translate, translateMap, localeCompare,
     value: animalTypes.length === 0
         ? translate("All")
         : animalTypes
-            .map(animalTypeId => translateMap(getInstanceById("AnimalType", animalTypeId)?.translations)?.name ?? MISSING_VALUE)
+            .map(animalTypeId => translateMap(getInstanceById("AnimalType", animalTypeId)?.translations)?.name ??
+            MISSING_VALUE)
             .toSorted(localeCompare)
             .join(", "),
 });

package/lib/entities/partial/commonnessRatedAdvantagesAndDisadvantages.d.ts

@@ -1,16 +1,16 @@
-import type { CommonnessRatedAdvantageDisadvantage } from "optolith-database-schema/gen";
+import type { CommonnessRatedAdvantageDisadvantage } from "@optolith/database-schema/gen";
 import type { TranslationKeysWithoutParams } from "../../helpers/translate.js";
 import type { RawDefinitionListEntityDescriptionSectionItem } from "../../index.js";
 import type { StdReader } from "./reader.js";
 /**
  * Render the names of either commonness-rated advantages or commonness-rated disadvantages.
  */
-export declare const renderCommonnessRatedAdvantagesOrDisadvantages: <E extends "Advantage" | "Disadvantage">(entity: E, items: CommonnessRatedAdvantageDisadvantage<string>[] | undefined) => StdReader<string, "t" | "tm" | "lc" | "ibi", E>;
+export declare const renderCommonnessRatedAdvantagesOrDisadvantages: <E extends "Advantage" | "Disadvantage", T extends string | undefined>(entity: E, items: CommonnessRatedAdvantageDisadvantage<string>[] | undefined, emptyString: T) => StdReader<string | T, "tm" | "lc" | "ibi" | "rso", E>;
 /**
  * Render the names of commonness-rated advantages and disadvantages together.
  */
-export declare const renderCommonnessRatedAdvantagesAndDisadvantages: (advantages: CommonnessRatedAdvantageDisadvantage<string>[] | undefined, disadvantages: CommonnessRatedAdvantageDisadvantage<string>[] | undefined) => StdReader<string, "t" | "tm" | "lc" | "ibi", "Advantage" | "Disadvantage">;
+export declare const renderCommonnessRatedAdvantagesAndDisadvantages: <T extends string | undefined>(advantages: CommonnessRatedAdvantageDisadvantage<string>[] | undefined, disadvantages: CommonnessRatedAdvantageDisadvantage<string>[] | undefined, emptyString: T) => StdReader<string | T, "tm" | "lc" | "ibi" | "rso", "Advantage" | "Disadvantage">;
 /**
  * Render a value with a possible translation, falling back to explicity rendering the value if no translation is available.
  */
-export declare const renderValueWithPossibleTranslation: <T>(label: TranslationKeysWithoutParams, value: T, renderValue: (value: T) => string, valueTranslation: string | undefined) => StdReader<RawDefinitionListEntityDescriptionSectionItem, "t">;
+export declare const renderValueWithPossibleTranslation: <T>(label: TranslationKeysWithoutParams, value: T, renderValue: (value: T) => string, _valueTranslation: string | undefined) => StdReader<RawDefinitionListEntityDescriptionSectionItem, "t">;

package/lib/entities/partial/commonnessRatedAdvantagesAndDisadvantages.js

@@ -1,36 +1,79 @@
 import { isNotEmpty } from "@elyukai/utils/array/nonEmpty";
 import { mapNullable } from "@elyukai/utils/nullable";
 import { Reader } from "@elyukai/utils/reader";
+import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { ensureNonEmpty } from "@optolith/helpers/array";
+import { Case } from "tsondb/schema/gen";
+import { makeNameBuilderRulesWithDefaults, renderCombinedActivatableNameComponents, renderNameComponentsOptions, } from "./activatableNameChunks.js";
 import { attributedCustomName } from "./markdown.js";
-import { parensIf } from "./rated/activatable/parensIf.js";
 import { MISSING_VALUE } from "./unknown.js";
-const renderCommonnessRatedAdvantageOrDisadvantageName = (translateMap, getInstanceById, entity, item) => {
+const convertCommonnessRatedAdvantageOrDisadvantageLevel = (level) => {
+    switch (level.kind) {
+        case "Range":
+            return [level.Range.min, level.Range.max];
+        case "Constant":
+            return level.Constant;
+        default:
+            return assertExhaustive(level);
+    }
+};
+const makeActivatableIdentifierForCommonnessRatedAdvantageOrDisadvantage = (entity, id) => {
+    switch (entity) {
+        case "Advantage":
+            return Case("Advantage", id);
+        case "Disadvantage":
+            return Case("Disadvantage", id);
+        default:
+            return assertExhaustive(entity);
+    }
+};
+const renderCommonnessRatedAdvantageOrDisadvantageName = (translateMap, getInstanceById, getResolvedSelectOptionById, entity, item) => {
     const customTranslation = translateMap(item.translations);
-    return (attributedCustomName(translateMap, getInstanceById, entity, translation => {
-        const name = translation.name_in_library ?? translation.name;
-        return customTranslation?.options !== undefined && name.endsWith(")")
-            ? `${name.slice(0, -1)}; ${customTranslation.options})`
-            : name + parensIf(customTranslation?.options);
+    return (attributedCustomName(translateMap, getInstanceById, entity, (translation, instance) => {
+        if (customTranslation?.full !== undefined) {
+            return customTranslation.full;
+        }
+        const id = makeActivatableIdentifierForCommonnessRatedAdvantageOrDisadvantage(entity, item.id);
+        const level = item.level === undefined
+            ? undefined
+            : convertCommonnessRatedAdvantageOrDisadvantageLevel(item.level);
+        const options = customTranslation?.options === undefined
+            ? (item.options?.map(option => renderNameComponentsOptions(false, getResolvedSelectOptionById, id, [option]) ??
+                MISSING_VALUE) ?? [])
+            : [customTranslation.options];
+        const name = translation.name_in_library !== undefined && options.length === 0
+            ? translation.name_in_library
+            : translation.name;
+        return renderCombinedActivatableNameComponents(translateMap, {
+            id,
+            base: name,
+            level,
+            nameBuilderRules: makeNameBuilderRulesWithDefaults(instance.nameBuilderRules),
+            options: customTranslation?.options === undefined
+                ? (item.options?.map(option => renderNameComponentsOptions(false, getResolvedSelectOptionById, id, [
+                    option,
+                ]) ?? MISSING_VALUE) ?? [])
+                : [customTranslation.options],
+        }, false);
     }, entity, item.id) ?? MISSING_VALUE);
 };
 /**
  * Render the names of either commonness-rated advantages or commonness-rated disadvantages.
  */
-export const renderCommonnessRatedAdvantagesOrDisadvantages = (entity, items) => Reader.asks(({ translate, translateMap, getInstanceById, localeCompare }) => items === undefined || !isNotEmpty(items)
-    ? translate("none")
+export const renderCommonnessRatedAdvantagesOrDisadvantages = (entity, items, emptyString) => Reader.asks(({ translateMap, getInstanceById, getResolvedSelectOptionById, localeCompare }) => items === undefined || !isNotEmpty(items)
+    ? emptyString
     : items
-        .map(item => renderCommonnessRatedAdvantageOrDisadvantageName(translateMap, getInstanceById, entity, item))
+        .map(item => renderCommonnessRatedAdvantageOrDisadvantageName(translateMap, getInstanceById, getResolvedSelectOptionById, entity, item))
         .toSorted(localeCompare)
         .join(", "));
 /**
  * Render the names of commonness-rated advantages and disadvantages together.
  */
-export const renderCommonnessRatedAdvantagesAndDisadvantages = (advantages, disadvantages) => Reader.asks(({ translate, translateMap, getInstanceById, localeCompare }) => mapNullable(ensureNonEmpty([["Advantage", advantages], ["Disadvantage", disadvantages]].flatMap(([entity, items]) => items?.map(item => renderCommonnessRatedAdvantageOrDisadvantageName(translateMap, getInstanceById, entity, item)) ?? [])), renderedItems => renderedItems.toSorted(localeCompare).join(", ")) ?? translate("none"));
+export const renderCommonnessRatedAdvantagesAndDisadvantages = (advantages, disadvantages, emptyString) => Reader.asks(({ translateMap, getInstanceById, getResolvedSelectOptionById, localeCompare }) => mapNullable(ensureNonEmpty([["Advantage", advantages], ["Disadvantage", disadvantages]].flatMap(([entity, items]) => items?.map(item => renderCommonnessRatedAdvantageOrDisadvantageName(translateMap, getInstanceById, getResolvedSelectOptionById, entity, item)) ?? [])), renderedItems => renderedItems.toSorted(localeCompare).join(", ")) ?? emptyString);
 /**
  * Render a value with a possible translation, falling back to explicity rendering the value if no translation is available.
  */
-export const renderValueWithPossibleTranslation = (label, value, renderValue, valueTranslation) => Reader.asks(({ translate }) => ({
+export const renderValueWithPossibleTranslation = (label, value, renderValue, _valueTranslation) => Reader.asks(({ translate }) => ({
     label: translate(label),
-    value: valueTranslation ?? renderValue(value),
+    value: /* valueTranslation ?? */ renderValue(value),
 }));

package/lib/entities/partial/dice.d.ts

@@ -1,4 +1,4 @@
-import type { Dice } from "optolith-database-schema/gen";
+import type { Dice } from "@optolith/database-schema/gen";
 import type { Translate } from "../../helpers/translate.js";
 /**
  * Renders a dice expression like "2D6" into a localized string.

package/lib/entities/partial/enhancements.d.ts

@@ -1,4 +1,4 @@
-import type { ImprovementCost, RatedIdentifier, SkillWithEnhancementsIdentifier } from "optolith-database-schema/gen";
+import type { ImprovementCost, RatedIdentifier, SkillWithEnhancementsIdentifier } from "@optolith/database-schema/gen";
 import type { RawEntityDescriptionSection } from "../../index.js";
 import { type StdReader } from "./reader.js";
 /**

package/lib/entities/partial/herbary.d.ts

@@ -1,4 +1,4 @@
-import type { AlternativeName, LaboratoryLevel, Resistance } from "optolith-database-schema/gen";
+import type { AlternativeName, LaboratoryLevel, Resistance } from "@optolith/database-schema/gen";
 import type { GetInstanceById } from "../../helpers/getTypes.js";
 import type { LocaleMap, Translate, TranslateMap } from "../../helpers/translate.js";
 import type { IdMap } from "../../index.js";

package/lib/entities/partial/map.d.ts

@@ -1,4 +1,4 @@
-import type { MapStyle, ResponsiveTextOptional } from "optolith-database-schema/gen";
+import type { MapStyle, ResponsiveTextOptional } from "@optolith/database-schema/gen";
 import type { LocaleMap, Translate, TranslateMap } from "../../helpers/translate.js";
 import { type StdReader } from "./reader.js";
 /**

package/lib/entities/partial/map.js

@@ -9,7 +9,7 @@ import { MISSING_VALUE } from "./unknown.js";
 export const renderMap = (translate, translateMap, map, getValue, surroundValues = values => values, getLabel, getListPrefix, getListSuffix, getReplacement, ...moreToAppend) => {
     const translation = translateMap(map.translations);
     const replacement = mapNullable(translation, t => getReplacement(t));
-    if (replacement !== undefined) {
+    if (isNotNullish(replacement)) {
         return replacement;
     }
     if (map.style?.kind === "Verbose") {

package/lib/entities/partial/markdown.d.ts

@@ -1,7 +1,7 @@
 /**
  * Some helpers to create Markdown content.
  */
-import type { EntityMap } from "optolith-database-schema/gen";
+import type { EntityMap } from "@optolith/database-schema/gen";
 import { type IdArgsVariant } from "tsondb/schema/gen";
 import type { GetInstanceById } from "../../helpers/getTypes.js";
 import type { LocaleMap, TranslateMap } from "../../helpers/translate.js";
@@ -32,7 +32,7 @@ export declare const customName: <E extends { [K in keyof EntityMap]: EntityMap[
  */
 export declare const attributedCustomName: <E extends { [K in keyof EntityMap]: EntityMap[K] extends {
     translations: LocaleMap<object>;
-} ? K : never; }[keyof EntityMap]>(translateMap: TranslateMap, getInstanceById: GetInstanceById<E>, context: string, fn: (translation: EntityMap[E]["translations"][string]) => string, ...args: IdArgsVariant<EntityMap, E>) => string | undefined;
+} ? K : never; }[keyof EntityMap]>(translateMap: TranslateMap, getInstanceById: GetInstanceById<E>, context: string, fn: (translation: EntityMap[E]["translations"][string], instance: EntityMap[E]) => string, ...args: IdArgsVariant<EntityMap, E>) => string | undefined;
 /**
  * Renders the name of an instance in an attributed string.
  */

package/lib/entities/partial/markdown.js

@@ -34,7 +34,10 @@ export const customName = (translateMap, getInstanceById, fn, ...args) => mapNul
  */
 export const attributedCustomName = (translateMap, getInstanceById, context, fn, ...args) => {
     const id = normalizedIdArgs(args);
-    return mapNullable(translateMap(getInstanceById(...args)?.translations), translation => attributedInstance(fn(translation), id.entityName, id.id, { context: `"${context}"` }));
+    const instance = getInstanceById(...args);
+    return mapNullable(translateMap(instance?.translations), translation => attributedInstance(
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- instance must be non-nullish if translation is non-nullish
+    fn(translation, instance), id.entityName, id.id, { context: `"${context}"` }));
 };
 /**
  * Renders the name of an instance in an attributed string.

package/lib/entities/partial/mathOperation.d.ts

@@ -1,4 +1,4 @@
-import type { MathOperation } from "optolith-database-schema/gen";
+import type { MathOperation } from "@optolith/database-schema/gen";
 type UnaryFormatter = (value: string | number) => string;
 type BinaryFormatter = (left: string | number, right: string | number) => string;
 /**

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

@@ -1,4 +1,4 @@
-import type { DisplayOption } from "optolith-database-schema/gen";
+import type { DisplayOption } from "@optolith/database-schema/gen";
 import type { TranslateMap } from "../../../helpers/translate.js";
 import type { PrerequisitePart } from "./part.js";
 /**

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

@@ -1,4 +1,4 @@
-import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisites, AnimistPowerPrerequisites, ArcaneTraditionPrerequisites, DerivedCharacteristicPrerequisites, EnhancementPrerequisites, GeneralPrerequisites, GeodeRitualPrerequisites, InfluencePrerequisites, LanguagePrerequisites, LiturgyPrerequisites, PersonalityTraitPrerequisites, PlainGeneralPrerequisites, ProfessionPrerequisites, PublicationPrerequisites, RatedIdentifier, SpecialAbilityIdentifier, SpellworkPrerequisites } from "optolith-database-schema/gen";
+import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisites, AnimistPowerPrerequisites, ArcaneTraditionPrerequisites, DerivedCharacteristicPrerequisites, EnhancementPrerequisites, GeneralPrerequisites, GeodeRitualPrerequisites, InfluencePrerequisites, LanguagePrerequisites, LiturgyPrerequisites, PersonalityTraitPrerequisites, PlainGeneralPrerequisites, ProfessionPrerequisites, PublicationPrerequisites, RatedIdentifier, SpellworkPrerequisites } from "@optolith/database-schema/gen";
 import type { GetAllChildInstancesForParent, GetInstanceById } from "../../../helpers/getTypes.js";
 import type { LocaleEnvironment } from "../../../helpers/locale.js";
 import type { GetResolvedSelectOptionById } from "./single/activatable.js";
@@ -18,7 +18,7 @@ export declare const printPlainGeneralPrerequisites: (getInstanceById: GetInstan
  * Print general prerequisites as a string.
  */
 export declare const printGeneralPrerequisites: (getInstanceById: GetInstanceById<"Race" | "Culture" | "PactCategory" | "PactDomain" | "SocialStatus" | "State" | ActivatableIdentifier["kind"] | RatedIdentifier["kind"] | "Property" | "Aspect" | "Enhancement">, getResolvedSelectOptionById: GetResolvedSelectOptionById, locale: LocaleEnvironment, value: GeneralPrerequisites, printPreviousLevelPrerequisites?: {
-    id: SpecialAbilityIdentifier;
+    id: ActivatableIdentifier;
     levels: number;
 }, trailingText?: string) => string;
 /**
@@ -60,7 +60,7 @@ export declare const printAnimistPowerPrerequisites: (getInstanceById: GetInstan
 /**
  * Print geode ritual prerequisites as a string.
  */
-export declare const printGeodeRitualPrerequisites: (getInstanceById: GetInstanceById<"Influence">, locale: LocaleEnvironment, value: GeodeRitualPrerequisites) => string;
+export declare const printGeodeRitualPrerequisites: (getInstanceById: GetInstanceById<"Influence" | ActivatableIdentifier["kind"] | "Aspect">, getResolvedSelectOptionById: GetResolvedSelectOptionById, locale: LocaleEnvironment, value: GeodeRitualPrerequisites) => string;
 /**
  * Print enhancement prerequisites as a string.
  */

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

@@ -201,7 +201,7 @@ export const printAnimistPowerPrerequisites = (getInstanceById, locale, value) =
 /**
  * Print geode ritual prerequisites as a string.
  */
-export const printGeodeRitualPrerequisites = (getInstanceById, locale, value) => printPlainPrerequisites(prerequisite => printGeodeRitualPrerequisiteGroup(getInstanceById, locale, prerequisite), locale, value);
+export const printGeodeRitualPrerequisites = (getInstanceById, getResolvedSelectOptionById, locale, value) => printPlainPrerequisites(prerequisite => printGeodeRitualPrerequisiteGroup(getInstanceById, getResolvedSelectOptionById, locale, prerequisite), locale, value);
 /**
  * Print enhancement prerequisites as a string.
  */

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

@@ -1,4 +1,4 @@
-import type { SentenceType } from "optolith-database-schema/gen";
+import type { SentenceType } from "@optolith/database-schema/gen";
 import type { LocaleCompare } from "../../../helpers/locale.js";
 import type { Translate, TranslateMap } from "../../../helpers/translate.js";
 import { type ActivatableNameComponents } from "../activatableNameChunks.js";

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

@@ -1,4 +1,4 @@
-import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisiteGroup, AnimistPowerPrerequisiteGroup, ArcaneTraditionPrerequisiteGroup, DerivedCharacteristicPrerequisiteGroup, EnhancementPrerequisiteGroup, GeneralPrerequisiteGroup, GeodeRitualPrerequisiteGroup, InfluencePrerequisiteGroup, LanguagePrerequisiteGroup, LiturgyPrerequisiteGroup, PersonalityTraitPrerequisiteGroup, PreconditionGroup, ProfessionPrerequisiteGroup, PublicationPrerequisiteGroup, RatedIdentifier, SpellworkPrerequisiteGroup } from "optolith-database-schema/gen";
+import type { ActivatableIdentifier, AdvantageDisadvantagePrerequisiteGroup, AnimistPowerPrerequisiteGroup, ArcaneTraditionPrerequisiteGroup, DerivedCharacteristicPrerequisiteGroup, EnhancementPrerequisiteGroup, GeneralPrerequisiteGroup, GeodeRitualPrerequisiteGroup, InfluencePrerequisiteGroup, LanguagePrerequisiteGroup, LiturgyPrerequisiteGroup, PersonalityTraitPrerequisiteGroup, PreconditionGroup, ProfessionPrerequisiteGroup, PublicationPrerequisiteGroup, RatedIdentifier, SpellworkPrerequisiteGroup } from "@optolith/database-schema/gen";
 import type { GetAllChildInstancesForParent, GetInstanceById } from "../../../helpers/getTypes.js";
 import type { LocaleEnvironment } from "../../../helpers/locale.js";
 import type { PrerequisitePart } from "./part.js";
@@ -54,7 +54,7 @@ export declare const printAnimistPowerPrerequisiteGroup: (getInstanceById: GetIn
 /**
  * Print the translation of a geode ritual prerequisite group.
  */
-export declare const printGeodeRitualPrerequisiteGroup: (getInstanceById: GetInstanceById<"Influence">, locale: LocaleEnvironment, prerequisite: GeodeRitualPrerequisiteGroup) => PrerequisitePart | undefined;
+export declare const printGeodeRitualPrerequisiteGroup: (getInstanceById: GetInstanceById<"Influence" | ActivatableIdentifier["kind"] | "Aspect">, getResolvedSelectOptionById: GetResolvedSelectOptionById, locale: LocaleEnvironment, prerequisite: GeodeRitualPrerequisiteGroup) => PrerequisitePart | undefined;
 /**
  * Print the translation of an enhancement prerequisite group.
  */

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

@@ -241,13 +241,16 @@ printAnimistPowerPrerequisite(getInstanceById, locale, prerequisite.AnimistPower
 /**
  * Print the translation of a geode ritual prerequisite group.
  */
-export const printGeodeRitualPrerequisiteGroup = (getInstanceById, locale, prerequisite) => 
-// switch (prerequisite.tag) {
-//   case "Influence":
-//   default:
-//     return assertExhaustive(prerequisite)
-// }
-printInfluencePrerequisite(getInstanceById, locale, prerequisite.Influence);
+export const printGeodeRitualPrerequisiteGroup = (getInstanceById, getResolvedSelectOptionById, locale, prerequisite) => {
+    switch (prerequisite.kind) {
+        case "Activatable":
+            return printActivatablePrerequisite(getInstanceById, getResolvedSelectOptionById, locale, prerequisite.Activatable, false);
+        case "Influence":
+            return printInfluencePrerequisite(getInstanceById, locale, prerequisite.Influence);
+        default:
+            return assertExhaustive(prerequisite);
+    }
+};
 /**
  * Print the translation of an enhancement prerequisite group.
  */

package/lib/entities/partial/prerequisites/single/activatable.d.ts

@@ -1,5 +1,5 @@
-import type { ResolvedSelectOption, ResolvedSelectOptionIdentifier } from "optolith-database-schema/cache";
-import type { ActivatableIdentifier, ActivatablePrerequisite, RequirableSelectOptionIdentifier } from "optolith-database-schema/gen";
+import type { ResolvedSelectOption, ResolvedSelectOptionIdentifier } from "@optolith/database-schema/cache";
+import type { ActivatableIdentifier, ActivatablePrerequisite, RequirableSelectOptionIdentifier } from "@optolith/database-schema/gen";
 import type { GetInstanceById } from "../../../../helpers/getTypes.js";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { Translate } from "../../../../helpers/translate.js";

package/lib/entities/partial/prerequisites/single/animistPower.d.ts

@@ -1,4 +1,4 @@
-import type { AnimistPowerPrerequisite } from "optolith-database-schema/gen";
+import type { AnimistPowerPrerequisite } from "@optolith/database-schema/gen";
 import { type GetInstanceById } from "../../../../helpers/getTypes.js";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";

package/lib/entities/partial/prerequisites/single/blessedTradition.d.ts

@@ -1,4 +1,4 @@
-import type { BlessedTraditionPrerequisite } from "optolith-database-schema/gen";
+import type { BlessedTraditionPrerequisite } from "@optolith/database-schema/gen";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";
 /**

package/lib/entities/partial/prerequisites/single/culture.d.ts

@@ -1,4 +1,4 @@
-import type { CulturePrerequisite } from "optolith-database-schema/gen";
+import type { CulturePrerequisite } from "@optolith/database-schema/gen";
 import type { GetInstanceById } from "../../../../helpers/getTypes.js";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";

package/lib/entities/partial/prerequisites/single/enhancement.d.ts

@@ -1,4 +1,4 @@
-import type { EnhancementPrerequisite } from "optolith-database-schema/gen";
+import type { EnhancementPrerequisite } from "@optolith/database-schema/gen";
 import type { GetInstanceById } from "../../../../helpers/getTypes.js";
 import type { LocaleEnvironment } from "../../../../helpers/locale.js";
 import type { PrerequisitePart } from "../part.js";