@optolith/entity-descriptions 0.4.26 → 0.5.1

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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.5.1](https://github.com/Optolith/entity-descriptions/compare/v0.5.0...v0.5.1) (2026-09-08)
+## [0.5.0](https://github.com/Optolith/entity-descriptions/compare/v0.4.26...v0.5.0) (2026-09-08)
+
+### ⚠ BREAKING CHANGES
+
+* **deps:** upgrade to schema 0.54.0 and other newer dependencies
+
+### build
+
+* **deps:** upgrade to schema 0.54.0 and other newer dependencies ([5ebe2df](https://github.com/Optolith/entity-descriptions/commit/5ebe2df9e468da66f792dd6e40e414037f395579))
+
+### Features
+
+* attributed names for enhancement prerequisites ([0e8600a](https://github.com/Optolith/entity-descriptions/commit/0e8600ac4999c4c7f83b6c719d8955dcc7f87512))
+
+### Bug Fixes
+
+* do not display enchantment parent in parent description ([7e3d5da](https://github.com/Optolith/entity-descriptions/commit/7e3d5daf565eb1729b6f6a31229cd7bfa826bf0d)), closes [#26](https://github.com/Optolith/entity-descriptions/issues/26)
+* indentation for multi-paragraph enhancements ([206f13c](https://github.com/Optolith/entity-descriptions/commit/206f13cc5730148e98c5263cc891a53c10391e3f))
+* sort liturgical chant traditions alphabetically ([2255cd4](https://github.com/Optolith/entity-descriptions/commit/2255cd44f8df474ce4b17b253ead84c4f2c10217)), closes [#35](https://github.com/Optolith/entity-descriptions/issues/35)
 ## [0.4.26](https://github.com/Optolith/entity-descriptions/compare/v0.4.25...v0.4.26) (2026-06-21)
 
 

package/lib/entities/activatable.d.ts

@@ -1,4 +1,4 @@
-import type { ActivatableIdentifier, AdvancedSpecialAbility, AdvantageDisadvantagePrerequisites, AdventurePointsValue, ApplicableCombatTechniques, Aspect_ID, CombatSpecialAbilityUsageType, DaggerRitualCost, EnchantmentCost, Errata, GeneralPrerequisites, MagicalSignCost, Penalty, PropertyDeclaration, PublicationRefs, RatedIdentifier, SelectOptions, SpecialRule, Volume } from "@optolith/database-schema/gen";
+import type { ActivatableIdentifier, AdvancedSpecialAbility, AdvantageDisadvantagePrerequisites, AdventurePointsValue, ApplicableCombatTechniques, Aspect_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";
@@ -12,7 +12,7 @@ export type BaseActivatable = {
     levels?: number;
     maximum?: number;
     select_options?: SelectOptions;
-    usage_type?: CombatSpecialAbilityUsageType;
+    usage_type?: Case<"Passive" | "Active" | "BasicManeuver" | "SpecialManeuver">;
     advanced?: AdvancedSpecialAbility<AdvancedIdentifierSpecialAbility>[];
     penalty?: Penalty;
     combat_techniques?: ApplicableCombatTechniques;

package/lib/entities/activatable.js

@@ -18,6 +18,7 @@ import { attributedName } from "./partial/markdown.js";
 import { additionFormatter } from "./partial/mathOperation.js";
 import { 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";
 import { attributedNameR, localeSortR, translateR, } from "./partial/reader.js";
 import { getResponsiveText, getResponsiveTextOptional, ResponsiveTextSize, } from "./partial/responsiveText.js";
@@ -274,7 +275,7 @@ const renderVolumeValue = (translate, translateMap, getAllResolvedSelectOptions,
                 levels: volume.ByLevel.list.map((_, index) => romanize(index + 1)).join("/"),
             });
         case "Map":
-            return renderResponsiveMap(volume.Map, option => option.points, values => translate("{$points} points", { points: values })).run({
+            return renderResponsiveMap(volume.Map, option => Reader.of(option.points), values => translateR("{$points} points", { points: values })).run({
                 translate,
                 translateMap,
                 responsiveTextSize,
@@ -297,7 +298,7 @@ const renderVolumeValue = (translate, translateMap, getAllResolvedSelectOptions,
             return assertExhaustive(volume);
     }
 };
-const renderArcaneEnergyCost = (translate, translateMap, localeJoin, responsiveTextSize, levels, cost) => {
+const renderArcaneEnergyCost = (translate, translateMap, format, localeJoin, responsiveTextSize, levels, cost) => {
     switch (cost.kind) {
         case "Fixed": {
             const translationWrapper = cost.Fixed.is_permanent === true
@@ -310,7 +311,7 @@ const renderArcaneEnergyCost = (translate, translateMap, localeJoin, responsiveT
                 ? str => str
                 : str => translate("{$cost} per {$interval}", {
                     cost: str,
-                    interval: formatTimeSpan(translate, responsiveTextSize, interval.unit, interval.value),
+                    interval: formatTimeSpan(translate, translateMap, format, responsiveTextSize, interval.unit, interval.value),
                 });
             const wrapInPerLevel = (() => {
                 if (cost.Fixed.per_level === undefined) {
@@ -352,7 +353,7 @@ const renderArcaneEnergyCost = (translate, translateMap, localeJoin, responsiveT
         case "Interval":
             return translate("{$cost} per {$interval}", {
                 cost: translate("{$value} AE", { value: cost.Interval.value }),
-                interval: formatTimeSpan(translate, responsiveTextSize, cost.Interval.interval.unit, cost.Interval.interval.value),
+                interval: formatTimeSpan(translate, translateMap, format, responsiveTextSize, cost.Interval.interval.unit, cost.Interval.interval.value),
             });
         case "ActivationAndHalfInterval":
             return additionFormatter(translate("{$value} AE", {
@@ -361,7 +362,7 @@ const renderArcaneEnergyCost = (translate, translateMap, localeJoin, responsiveT
                 cost: translate("{$value} AE", {
                     value: Math.round(cost.ActivationAndHalfInterval.value / 2),
                 }),
-                interval: formatTimeSpan(translate, responsiveTextSize, cost.ActivationAndHalfInterval.interval.unit, cost.ActivationAndHalfInterval.interval.value),
+                interval: formatTimeSpan(translate, translateMap, format, responsiveTextSize, cost.ActivationAndHalfInterval.interval.unit, cost.ActivationAndHalfInterval.interval.value),
             }));
         case "Indefinite":
             return ((mapNullable(translateMap(cost.Indefinite.translations)?.description, description => getResponsiveText(description, responsiveTextSize)) ?? MISSING_VALUE) +
@@ -372,18 +373,11 @@ const renderArcaneEnergyCost = (translate, translateMap, localeJoin, responsiveT
                     mapNullableDefault(translateMap(option.translations)?.note, note => parensIf(getResponsiveTextOptional(note, responsiveTextSize)), "")), "disjunction"),
             });
         case "Map":
-            return renderResponsiveMap(cost.Map, option => option.value, values => translate("{$value} AE", { value: values }), cost.Map.options.every(option => option.permanent_value !== undefined)
-                ? {
-                    surround: values => translate(", {$value} of which are permanent", {
-                        value: values,
-                    }),
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- is checked beforehand
-                    getAdditionalValue: option => option.permanent_value,
-                }
-                : undefined).run({
+            return renderStandaloneCostMap(cost.Map).run({
                 translate,
                 translateMap,
                 responsiveTextSize,
+                energyUnit: "ArcaneEnergy",
             });
         case "Variable":
             return translate("Variable");
@@ -423,7 +417,7 @@ const renderBindingCost = (translate, translateMap, localeCompare, getAllResolve
                 }),
             });
         case "Map":
-            return renderResponsiveMap(cost.Map, option => option.permanent_value, values => translate("{$value} permanent AE", { value: values })).run({
+            return renderResponsiveMap(cost.Map, option => Reader.of(option.permanentValue), values => translateR("{$value} permanent AE", { value: values })).run({
                 translate,
                 translateMap,
                 responsiveTextSize,
@@ -451,7 +445,7 @@ const renderLifePointsCost = (translate, cost) => cost === undefined
     ? ""
     : // eslint-disable-next-line no-irregular-whitespace
         ` (+ ${translate("{$value} LP", { value: cost.Fixed.value })})`;
-const renderCost = (translate, translateMap, localeJoin, localeCompare, getAllResolvedSelectOptions, responsiveTextSize, levels, cost) => {
+const renderCost = (translate, translateMap, format, localeJoin, localeCompare, getAllResolvedSelectOptions, responsiveTextSize, levels, cost) => {
     if (typeof cost === "number") {
         return {
             label: translate("AE Cost"),
@@ -466,9 +460,9 @@ const renderCost = (translate, translateMap, localeJoin, localeCompare, getAllRe
                 label: translate("AE Cost"),
                 value: cost.kind === "ArcaneEnergyCost"
                     ? "ae_cost" in cost.ArcaneEnergyCost
-                        ? renderArcaneEnergyCost(translate, translateMap, localeJoin, responsiveTextSize, levels, cost.ArcaneEnergyCost.ae_cost) + renderLifePointsCost(translate, cost.ArcaneEnergyCost.lp_cost)
-                        : renderArcaneEnergyCost(translate, translateMap, localeJoin, responsiveTextSize, levels, cost.ArcaneEnergyCost)
-                    : renderArcaneEnergyCost(translate, translateMap, localeJoin, responsiveTextSize, levels, cost),
+                        ? renderArcaneEnergyCost(translate, translateMap, format, localeJoin, responsiveTextSize, levels, cost.ArcaneEnergyCost.ae_cost) + renderLifePointsCost(translate, cost.ArcaneEnergyCost.lp_cost)
+                        : renderArcaneEnergyCost(translate, translateMap, format, localeJoin, responsiveTextSize, levels, cost.ArcaneEnergyCost)
+                    : renderArcaneEnergyCost(translate, translateMap, format, localeJoin, responsiveTextSize, levels, cost),
             };
         case "BindingCost":
             return {
@@ -686,7 +680,7 @@ const renderAdditionalSpecialRules = (traditionName, nameOfPeopleWithThisTraditi
  * Get a JSON representation of the rules text for a special ability.
  */
 export const getActivatableEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getAllInstances, getResolvedSelectOptionById, getAllResolvedSelectOptions }, locale, { entity: entityName, content: entry, id }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     const responsiveTextSize = ResponsiveTextSize.Full;
     if (translation === undefined) {
@@ -713,6 +707,8 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
             (baseEntry.levels !== undefined ? ` I–${romanize(baseEntry.levels)}` : ""),
         subtitle: mapNullable(baseEntry.usage_type, usageType => {
             switch (usageType.kind) {
+                case "Active":
+                    return translate("Active");
                 case "Passive":
                     return translate("Passive");
                 case "BasicManeuver":
@@ -789,7 +785,7 @@ export const getActivatableEntityDescription = createEntityDescriptionCreator(({
                         label: translate("Volume"),
                         value: renderVolumeValue(translate, translateMap, () => getAllResolvedSelectOptions(wrappedId), responsiveTextSize, volume),
                     })),
-                    mapNullable(baseEntry.cost, cost => renderCost(translate, translateMap, locale.join, locale.compare, () => getAllResolvedSelectOptions(wrappedId), responsiveTextSize, baseEntry.levels, cost)),
+                    mapNullable(baseEntry.cost, cost => renderCost(translate, translateMap, format, locale.join, locale.compare, () => getAllResolvedSelectOptions(wrappedId), responsiveTextSize, baseEntry.levels, cost)),
                     mapNullable(baseEntry.property, property => ({
                         label: translate("Property"),
                         value: renderPropertyValue(getInstanceById, translate, translateMap, property),

package/lib/entities/equipment.d.ts

@@ -2,7 +2,7 @@ import type { AmmunitionishIdentifier, EquipmentIdentifier, GenMeleeWeapon, GenR
 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 { Format, Translate, TranslateMap } from "../helpers/translate.js";
 import type { IdMap, LabeledEntityDescriptionSection, RawEntityDescriptionSectionContent } from "../index.js";
 /**
  * Get the name of an equipment item.
@@ -15,7 +15,7 @@ export declare const renderMeleeWeapon: <Damage>(translate: Translate, translate
 /**
  * Render combat values of a ranged weapon.
  */
-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>;
+export declare const renderRangedWeapon: <Damage>(translate: Translate, translateMap: TranslateMap, format: Format, 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.
  */

package/lib/entities/equipment.js

@@ -162,12 +162,12 @@ export const renderMeleeWeapon = (translate, translateMap, localeJoin, getInstan
         },
     };
 };
-const renderReloadTime = (translate, reloadTime) => isNotEmpty(reloadTime)
+const renderReloadTime = (translate, translateMap, format, reloadTime) => isNotEmpty(reloadTime)
     ? reloadTime.length > 1
         ? translate("{$value} actions", {
             value: reloadTime.map(time => time.value).join("/"),
         })
-        : formatTimeSpan(translate, ResponsiveTextSize.Full, "Actions", reloadTime[0].value)
+        : formatTimeSpan(translate, translateMap, format, ResponsiveTextSize.Full, "Actions", reloadTime[0].value)
     : MISSING_VALUE;
 const renderRangeBrackets = (rangeBrackets) => `${rangeBrackets.close.toFixed()}/${rangeBrackets.medium.toFixed()}/${rangeBrackets.far.toFixed()}`;
 const renderAmmunition = (translateMap, getInstanceById, ammunition) => ammunition === undefined
@@ -177,7 +177,7 @@ const renderMeleeDamage = (translate) => (damage) => renderDiceAndFlat(translate
 /**
  * Render combat values of a ranged weapon.
  */
-export const renderRangedWeapon = (translate, translateMap, getInstanceById, measurements, renderDamage, rangedCombatTechniqueId, use) => {
+export const renderRangedWeapon = (translate, translateMap, format, getInstanceById, measurements, renderDamage, rangedCombatTechniqueId, use) => {
     const combatTechnique = getInstanceById("RangedCombatTechnique", rangedCombatTechniqueId);
     return {
         type: "labeled",
@@ -193,7 +193,7 @@ export const renderRangedWeapon = (translate, translateMap, getInstanceById, mea
                 },
                 {
                     label: translate("Reload Time"),
-                    value: renderReloadTime(translate, use.reload_time),
+                    value: renderReloadTime(translate, translateMap, format, use.reload_time),
                 },
                 {
                     label: translate("Range Brackets"),
@@ -624,7 +624,7 @@ const renderBookRules = (translate, rules) => {
  * Get a JSON representation of the rules text for equipment.
  */
 export const getEquipmentEntityDescription = createEntityDescriptionCreator(({ getInstanceById, idMap }, locale, entry) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     if (entry.entity === "Book") {
         const translation = translateMap(entry.content.translations);
         if (translation === undefined) {
@@ -729,7 +729,7 @@ export const getEquipmentEntityDescription = createEntityDescriptionCreator(({ g
                 ? 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))
+                ? Object.entries(combatValues.values.ranged_uses ?? {}).map(([combatTechniqueId, use]) => renderRangedWeapon(translate, translateMap, format, getInstanceById, locale.measurementAdjustments, renderRangedDamage(translate), combatTechniqueId, use))
                 : []),
             {
                 type: "definitionList",
@@ -742,7 +742,7 @@ export const getEquipmentEntityDescription = createEntityDescriptionCreator(({ g
                         label: translate("Burning Time"),
                         value: burningTime.kind === "Unlimited"
                             ? translate("unlimited")
-                            : formatTimeSpan(translate, ResponsiveTextSize.Full, burningTime.Limited.unit, burningTime.Limited.value),
+                            : formatTimeSpan(translate, translateMap, format, ResponsiveTextSize.Full, burningTime.Limited.unit, burningTime.Limited.value),
                     })),
                     mapNullable(baseItemTranslation?.color, color => ({
                         label: translate("Color"),

package/lib/entities/liturgicalChant.js

@@ -84,6 +84,7 @@ const getTextForTraditions = (deps, values) => {
         }
     })
         .filter(isNotNullish)
+        .sort(deps.localeCompare)
         .join(", ");
     return {
         label: deps.translate("Traditions"),
@@ -94,7 +95,7 @@ const getTextForTraditions = (deps, values) => {
  * Get a JSON representation of the rules text for a blessing.
  */
 export const getBlessingEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getAllInstances }, locale, { id, content: entry }) => {
-    const { translate, translateMap } = locale;
+    const { translate, translateMap, format } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -102,6 +103,7 @@ export const getBlessingEntityDescription = createEntityDescriptionCreator(({ ge
     const env = {
         translate,
         translateMap,
+        format,
         localeCompare: locale.compare,
         getInstanceById,
         getAllInstances,
@@ -135,7 +137,7 @@ export const getBlessingEntityDescription = createEntityDescriptionCreator(({ ge
  * Get a JSON representation of the rules text for a liturgical chant.
  */
 export const getLiturgicalChantEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getChildInstancesForInstanceId, idMap }, locale, { content: entry, entity, id }, options) => {
-    const { translate, translateMap, compare: localeCompare, join: localeJoin } = locale;
+    const { translate, translateMap, format, compare: localeCompare, join: localeJoin } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -143,6 +145,7 @@ export const getLiturgicalChantEntityDescription = createEntityDescriptionCreato
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         getChildInstancesForInstanceId,
         localeJoin: locale.join,
@@ -198,7 +201,7 @@ export const getLiturgicalChantEntityDescription = createEntityDescriptionCreato
  * Get a JSON representation of the rules text for a ceremony.
  */
 export const getCeremonyEntityDescription = createEntityDescriptionCreator(({ getInstanceById, getChildInstancesForInstanceId, idMap }, locale, { content: entry, entity, id }, options) => {
-    const { translate, translateMap, compare: localeCompare, join: localeJoin } = locale;
+    const { translate, translateMap, format, compare: localeCompare, join: localeJoin } = locale;
     const translation = translateMap(entry.translations);
     if (translation === undefined) {
         return undefined;
@@ -206,6 +209,7 @@ export const getCeremonyEntityDescription = createEntityDescriptionCreator(({ ge
     const env = {
         translate,
         translateMap,
+        format,
         getInstanceById,
         getChildInstancesForInstanceId,
         localeJoin: locale.join,

package/lib/entities/partial/enhancements.js

@@ -20,7 +20,7 @@ const getEnhancementAPValue = (adventurePoints, parentImprovementCost) => {
 };
 const renderEnhancement = (enhancement, parentImprovementCost) => translateMapR(enhancement.content.translations).thenW(translation => Reader.ask().map(env => translation === undefined
     ? undefined
-    : `- ^[${translation.name}](entity: "Enhancement") (${env.translate("SR {$value}", { value: enhancement.content.skill_rating })}, ${env.translate("{$value} AP", { value: getEnhancementAPValue(enhancement.content.adventurePoints, parentImprovementCost) })}): ${translation.effect}${enhancement.content.prerequisites === undefined ? "" : ` ${env.translate(".input {$hiddenCount :number} {{Prerequisites}}", { hiddenCount: enhancement.content.prerequisites.length })}: ${printEnhancementPrerequisites(env.getInstanceById, { translate: env.translate, translateMap: env.translateMap, compare: env.localeCompare, join: env.localeJoin }, enhancement.content.prerequisites)}`}`));
+    : `- ^[${translation.name}](entity: "Enhancement") (${env.translate("SR {$value}", { value: enhancement.content.skill_rating })}, ${env.translate("{$value} AP", { value: getEnhancementAPValue(enhancement.content.adventurePoints, parentImprovementCost) })}): ${translation.effect.split("\n").join("\n  ")}${enhancement.content.prerequisites === undefined ? "" : ` ${env.translate(".input {$hiddenCount :number} {{Prerequisites}}", { hiddenCount: enhancement.content.prerequisites.length })}: ${printEnhancementPrerequisites(env.getInstanceById, { translate: env.translate, translateMap: env.translateMap, compare: env.localeCompare, join: env.localeJoin }, enhancement.content.prerequisites)}`}`));
 /**
  * Render the enhancements section for an entity description, if applicable.
  */
@@ -33,7 +33,7 @@ export const renderEnhancements = (parentId, parentImprovementCost) => getChildI
     }
     return translateR("Enhancements").map((label) => ({
         type: "labeled",
-        label,
+        label: `${label}:`,
         value: {
             type: "plain",
             text: nonNullishDescriptions.join("\n"),

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

@@ -1,51 +1,40 @@
-import type { MapStyle, ResponsiveTextOptional } from "@optolith/database-schema/gen";
-import type { LocaleMap, Translate, TranslateMap } from "../../helpers/translate.js";
-import { type StdReader } from "./reader.js";
+import { Reader } from "@elyukai/utils/reader";
+import type { ParameterMapStyle, ResponsiveTextOptional } from "@optolith/database-schema/gen";
+import type { LocaleMap } from "../../helpers/translate.js";
+import { type StdEnv, type StdReader } from "./reader.js";
 /**
  * Renders a map of options to a string.
  */
-export declare const renderMap: <M extends {
-    options: MO[];
-    style?: MapStyle;
-    translations?: LocaleMap<MT>;
-}, MOT = M extends {
+export declare const renderMap: <V, T, OT, VEnv, SVEnv>(map: {
     options: {
-        translations?: LocaleMap<infer MOT_>;
+        value: V;
+        translations?: LocaleMap<OT>;
     }[];
-} ? MOT_ : never, MT = M extends {
-    translations?: LocaleMap<infer MT_>;
-} ? MT_ : never, MO extends {
-    translations?: LocaleMap<MOT>;
-} = M extends {
-    options: (infer MO_ & {
-        translations?: LocaleMap<MOT>;
-    })[];
-} ? MO_ : never>(translate: Translate, translateMap: TranslateMap, map: M, getValue: (option: MO) => string | number, surroundValues: ((values: string) => string) | undefined, getLabel: (optionTranslation: MOT) => string, getListPrefix: (translation: MT) => string | undefined, getListSuffix: (translation: MT) => string | undefined, getReplacement: (translation: MT) => string | undefined, ...moreToAppend: ({
-    surround: (values: string) => string;
-    getAdditionalValue: (option: MO, optionTranslation: MOT) => string | number;
-} | undefined)[]) => string;
+    style: ParameterMapStyle;
+    translations?: LocaleMap<T>;
+}, getValue: (option: V) => Reader<VEnv, string | number>, surroundValues: ((values: string) => Reader<SVEnv, string>) | undefined, getLabel: (optionTranslation: OT) => string, getListPrefix: (translation: T) => string | undefined, getListSuffix: (translation: T) => string | undefined, getReplacement: (translation: T) => string | undefined, ...moreToAppend: ({
+    surround: (values: string) => StdReader<string, "t">;
+    getAdditionalValue: (option: V, optionTranslation: OT) => string | number;
+} | undefined)[]) => Reader<StdEnv<"t" | "tm"> & VEnv & SVEnv, string>;
 /**
  * Renders a map of options to a string.
  */
-export declare const renderResponsiveMap: <M extends {
-    options: MO[];
-    style?: MapStyle;
+export declare const renderResponsiveMap: <T, VEnv, SVEnv>(map: {
+    options: {
+        value: T;
+        translations?: LocaleMap<{
+            label: ResponsiveTextOptional;
+        }>;
+    }[];
+    style: ParameterMapStyle;
     translations?: LocaleMap<{
-        list_prepend?: ResponsiveTextOptional;
         listPrefix?: ResponsiveTextOptional;
-        list_append?: ResponsiveTextOptional;
         listSuffix?: ResponsiveTextOptional;
         replacement?: ResponsiveTextOptional;
     }>;
-}, MO extends {
-    translations?: LocaleMap<{
-        label: ResponsiveTextOptional;
-    }>;
-} = M extends {
-    options: (infer MO_)[];
-} ? MO_ : never>(map: M, getValue: (option: MO) => string | number, surroundValues: ((values: string) => string) | undefined, ...moreToAppend: ({
-    surround: (values: string) => string;
-    getAdditionalValue: (option: MO, optionTranslation: {
+}, getValue: (option: T) => Reader<VEnv, string | number>, surroundValues: ((values: string) => Reader<SVEnv, string>) | undefined, ...moreToAppend: ({
+    surround: (values: string) => StdReader<string, "t">;
+    getAdditionalValue: (option: T, optionTranslation: {
         label: ResponsiveTextOptional;
     }) => string | number;
-} | undefined)[]) => StdReader<string, "t" | "tm" | "rts">;
+} | undefined)[]) => Reader<StdEnv<"t" | "tm" | "rts"> & VEnv & SVEnv, string>;

package/lib/entities/partial/map.js

@@ -6,32 +6,32 @@ import { MISSING_VALUE } from "./unknown.js";
 /**
  * Renders a map of options to a string.
  */
-export const renderMap = (translate, translateMap, map, getValue, surroundValues = values => values, getLabel, getListPrefix, getListSuffix, getReplacement, ...moreToAppend) => {
-    const translation = translateMap(map.translations);
+export const renderMap = (map, getValue, surroundValues = values => Reader.of(values), getLabel, getListPrefix, getListSuffix, getReplacement, ...moreToAppend) => Reader.asks(env => {
+    const translation = env.translateMap(map.translations);
     const replacement = mapNullable(translation, t => getReplacement(t));
     if (isNotNullish(replacement)) {
         return replacement;
     }
-    if (map.style?.kind === "Verbose") {
+    if (map.style.kind === "Verbose") {
         return map.options
             .map(option => {
-            const value = getValue(option);
-            const optionTranslation = translateMap(option.translations);
-            return `${surroundValues(typeof value === "number" ? value.toFixed() : value)} ${translate("for")} ${mapNullableDefault(mapNullable(translation, getListPrefix), listPrefix => `${listPrefix} `, "")}${optionTranslation === undefined ? MISSING_VALUE : getLabel(optionTranslation)}${mapNullableDefault(mapNullable(translation, getListSuffix), listSuffix => ` ${listSuffix}`, "")}${moreToAppend
+            const value = getValue(option.value).run(env);
+            const optionTranslation = env.translateMap(option.translations);
+            return `${surroundValues(typeof value === "number" ? value.toFixed() : value).run(env)} ${env.translate("for")} ${mapNullableDefault(mapNullable(translation, getListPrefix), listPrefix => `${listPrefix} `, "")}${optionTranslation === undefined ? MISSING_VALUE : getLabel(optionTranslation)}${mapNullableDefault(mapNullable(translation, getListSuffix), listSuffix => ` ${listSuffix}`, "")}${moreToAppend
                 .filter(isNotNullish)
                 .map(({ surround, getAdditionalValue }) => {
                 const additionalValue = optionTranslation === undefined
                     ? MISSING_VALUE
-                    : getAdditionalValue(option, optionTranslation);
-                return surround(typeof additionalValue === "number" ? additionalValue.toFixed() : additionalValue);
+                    : getAdditionalValue(option.value, optionTranslation);
+                return surround(typeof additionalValue === "number" ? additionalValue.toFixed() : additionalValue).run(env);
             })
                 .join("")}`;
         })
             .join(", ");
     }
-    return `${surroundValues(map.options.map(option => getValue(option)).join("/"))} ${translate("for")} ${mapNullableDefault(mapNullable(translation, getListPrefix), listPrefix => `${listPrefix} `, "")}${map.options
+    return `${surroundValues(map.options.map(option => getValue(option.value).run(env)).join("/")).run(env)} ${env.translate("for")} ${mapNullableDefault(mapNullable(translation, getListPrefix), listPrefix => `${listPrefix} `, "")}${map.options
         .map(option => {
-        const optionTranslation = translateMap(option.translations);
+        const optionTranslation = env.translateMap(option.translations);
         if (optionTranslation === undefined) {
             return MISSING_VALUE;
         }
@@ -41,16 +41,17 @@ export const renderMap = (translate, translateMap, map, getValue, surroundValues
         .filter(isNotNullish)
         .map(({ surround, getAdditionalValue }) => surround(map.options
         .map(option => {
-        const optionTranslation = translateMap(option.translations);
+        const optionTranslation = env.translateMap(option.translations);
         if (optionTranslation === undefined) {
             return MISSING_VALUE;
         }
-        return getAdditionalValue(option, optionTranslation);
+        return getAdditionalValue(option.value, optionTranslation);
     })
-        .join("/")))
+        .join("/")).run(env))
         .join("")}`;
-};
+});
 /**
  * Renders a map of options to a string.
  */
-export const renderResponsiveMap = (map, getValue, surroundValues, ...moreToAppend) => Reader.asks(({ translate, translateMap, responsiveTextSize }) => renderMap(translate, translateMap, map, getValue, surroundValues, translation => getResponsiveTextOptional(translation.label, responsiveTextSize) ?? translation.label.full, translation => mapNullable(translation.listPrefix ?? translation.list_prepend, text => getResponsiveTextOptional(text, responsiveTextSize)), translation => mapNullable(translation.listSuffix ?? translation.list_append, text => getResponsiveTextOptional(text, responsiveTextSize)), translation => mapNullable(translation.replacement, text => getResponsiveTextOptional(text, responsiveTextSize)), ...moreToAppend));
+export const renderResponsiveMap = (map, getValue, surroundValues, ...moreToAppend) => Reader.asks(env => renderMap(map, getValue, surroundValues, translation => getResponsiveTextOptional(translation.label, env.responsiveTextSize) ??
+    translation.label.full, translation => mapNullable(translation.listPrefix, text => getResponsiveTextOptional(text, env.responsiveTextSize)), translation => mapNullable(translation.listSuffix, text => getResponsiveTextOptional(text, env.responsiveTextSize)), translation => mapNullable(translation.replacement, text => getResponsiveTextOptional(text, env.responsiveTextSize)), ...moreToAppend).run(env));

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

@@ -82,7 +82,10 @@ export const printGeneralPrerequisiteGroup = (getInstanceById, getResolvedSelect
         case "RatedSum":
             return printRatedSumPrerequisite(getInstanceById, locale, prerequisite.RatedSum);
         case "Enhancement":
-            return printEnhancementPrerequisite(getInstanceById, locale, prerequisite.Enhancement);
+            return printEnhancementPrerequisite(prerequisite.Enhancement).run({
+                ...locale,
+                getInstanceById,
+            });
         case "Text":
             return printTextPrerequisite(locale, prerequisite.Text);
         case "SexualCharacteristic":
@@ -262,7 +265,11 @@ export const printEnhancementPrerequisiteGroup = (getInstanceById, locale, prere
         case "Rated":
             return printRatedPrerequisite(getInstanceById, locale, prerequisite.Rated);
         case "Enhancement":
-            return printEnhancementPrerequisite(getInstanceById, locale, prerequisite.Enhancement);
+            return printEnhancementPrerequisite(prerequisite.Enhancement).run({
+                ...locale,
+                getInstanceById,
+                hideParent: true,
+            });
         default:
             return assertExhaustive(prerequisite);
     }

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

@@ -1,8 +1,12 @@
+import { Reader } from "@elyukai/utils/reader";
 import type { EnhancementPrerequisite } from "@optolith/database-schema/gen";
-import type { GetInstanceById } from "../../../../helpers/getTypes.js";
-import type { LocaleEnvironment } from "../../../../helpers/locale.js";
+import { type StdEnv } from "../../reader.js";
 import type { PrerequisitePart } from "../part.js";
+type EnvExtra = {
+    hideParent?: true;
+};
 /**
  * Get the translation of an external enhancement prerequisite.
  */
-export declare const printEnhancementPrerequisite: (getInstanceById: GetInstanceById<"Spell" | "Ritual" | "LiturgicalChant" | "Ceremony" | "Enhancement">, locale: Pick<LocaleEnvironment, "translate" | "translateMap">, prerequisite: EnhancementPrerequisite) => PrerequisitePart | undefined;
+export declare const printEnhancementPrerequisite: (prerequisite: EnhancementPrerequisite) => Reader<StdEnv<"t" | "tm" | "ibi", "Enhancement" | "Spell" | "Ritual" | "LiturgicalChant" | "Ceremony"> & EnvExtra, PrerequisitePart | undefined>;
+export {};

package/lib/entities/partial/prerequisites/single/enhancement.js

@@ -1,41 +1,35 @@
+import { Reader } from "@elyukai/utils/reader";
 import { assertExhaustive } from "@optolith/helpers/typeSafety";
+import { fromUniformCase } from "tsondb/schema/gen";
+import { attributedNameFromInstanceR, getInstanceByIdR, translateR, } from "../../reader.js";
 import { MISSING_VALUE } from "../../unknown.js";
-const printLabel = (locale, skillId) => {
+const printLabel = (skillId) => {
     switch (skillId.kind) {
         case "Spell":
         case "Ritual":
-            return locale.translate("spell enhancement");
+            return translateR("spell enhancement");
         case "LiturgicalChant":
         case "Ceremony":
-            return locale.translate("liturgical enhancement");
+            return translateR("liturgical enhancement");
         default:
             return assertExhaustive(skillId);
     }
 };
-const getSkill = (getInstanceById, parentId) => {
-    switch (parentId.kind) {
-        case "Spell":
-            return getInstanceById("Spell", parentId.Spell);
-        case "Ritual":
-            return getInstanceById("Ritual", parentId.Ritual);
-        case "LiturgicalChant":
-            return getInstanceById("LiturgicalChant", parentId.LiturgicalChant);
-        case "Ceremony":
-            return getInstanceById("Ceremony", parentId.Ceremony);
-        default:
-            return assertExhaustive(parentId);
-    }
-};
 /**
  * Get the translation of an external enhancement prerequisite.
  */
-export const printEnhancementPrerequisite = (getInstanceById, locale, prerequisite) => {
-    const enhancement = getInstanceById("Enhancement", prerequisite.id);
-    const skill = enhancement && getSkill(getInstanceById, enhancement.parent);
-    return {
-        label: `${enhancement ? printLabel(locale, enhancement.parent) : MISSING_VALUE} `,
-        value: `*${locale.translateMap(enhancement?.translations)?.name ?? MISSING_VALUE}* ${locale.translate("for")} ${locale.translateMap(skill?.translations)?.name ?? MISSING_VALUE}`,
+export const printEnhancementPrerequisite = (prerequisite) => getInstanceByIdR("Enhancement", prerequisite.id).thenW(enhancement => enhancement === undefined
+    ? Reader.of(undefined)
+    : getInstanceByIdR(enhancement.parent).thenW(skill => printLabel(enhancement.parent).thenW(label => Reader.asks((env) => env.hideParent ?? false).thenW(hideParent => attributedNameFromInstanceR(enhancement, "prerequisite", "Enhancement", prerequisite.id)
+        .map(name => name ?? MISSING_VALUE)
+        .thenW(name => hideParent
+        ? Reader.of(name)
+        : attributedNameFromInstanceR(skill, "prerequisite", enhancement.parent.kind, fromUniformCase(enhancement.parent))
+            .map(skillName => skillName ?? MISSING_VALUE)
+            .thenW(skillName => translateR("for").map(forText => `${name} ${forText} ${skillName}`)))
+        .map((value) => ({
+        label: `${label} `,
+        value,
         sentenceType: undefined,
         isMeta: false,
-    };
-};
+    }))))));

package/lib/entities/partial/rated/activatable/castingTime.d.ts

@@ -3,20 +3,20 @@ import { type StdReader } from "../../reader.js";
 /**
  * Renders the text for a non-modifiable casting time of a fast activatable skill.
  */
-export declare const renderFastSkillNonModifiableCastingTime: (value: FastSkillNonModifiableCastingTime) => StdReader<string, "t" | "rts">;
+export declare const renderFastSkillNonModifiableCastingTime: (value: FastSkillNonModifiableCastingTime) => StdReader<string, "t" | "tm" | "f" | "rts">;
 /**
  * Get the text for a non-modifiable casting time of a slow activatable skill.
  */
-export declare const renderSlowSkillNonModifiableCastingTime: (value: SlowSkillNonModifiableCastingTime) => StdReader<string, "t" | "rts">;
+export declare const renderSlowSkillNonModifiableCastingTime: (value: SlowSkillNonModifiableCastingTime) => StdReader<string, "t" | "tm" | "f" | "rts">;
 /**
  * Translate casting time.
  */
-export declare const renderCastingTime: <NonModifiable extends object>(renderNonModifiableCastingTime: (value: NonModifiable) => StdReader<string, "t" | "rts" | "s" | "nms">, value: CastingTime<NonModifiable>) => StdReader<string, "t" | "rts" | "s" | "nms" | "ibi", "SkillModificationLevel">;
+export declare const renderCastingTime: <NonModifiable extends object>(renderNonModifiableCastingTime: (value: NonModifiable) => StdReader<string, "t" | "tm" | "f" | "rts" | "s" | "nms">, value: CastingTime<NonModifiable>) => StdReader<string, "t" | "tm" | "f" | "rts" | "s" | "nms" | "ibi", "SkillModificationLevel">;
 /**
  * Get the text for the casting time of a fast activatable skill.
  */
-export declare const renderFastCastingTime: (value: FastCastingTime) => StdReader<string, "t" | "rts" | "nms" | "ibi", "SkillModificationLevel">;
+export declare const renderFastCastingTime: (value: FastCastingTime) => StdReader<string, "t" | "tm" | "f" | "rts" | "nms" | "ibi", "SkillModificationLevel">;
 /**
  * Get the text for the casting time of a slow activatable skill.
  */
-export declare const renderSlowCastingTime: (value: SlowCastingTime) => StdReader<string, "t" | "rts" | "nms" | "ibi", "SkillModificationLevel">;
+export declare const renderSlowCastingTime: (value: SlowCastingTime) => StdReader<string, "t" | "tm" | "f" | "rts" | "nms" | "ibi", "SkillModificationLevel">;