@optolith/entity-descriptions 0.4.11 → 0.4.12

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, 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";

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";

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";

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

@@ -1,4 +1,4 @@
-import type { InfluencePrerequisite } from "optolith-database-schema/gen";
+import type { InfluencePrerequisite } 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/magicalTradition.d.ts

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

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

@@ -1,4 +1,4 @@
-import type { PactPrerequisite } from "optolith-database-schema/gen";
+import type { PactPrerequisite } 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/personalityTrait.d.ts

@@ -1,4 +1,4 @@
-import type { PersonalityTraitPrerequisite } from "optolith-database-schema/gen";
+import type { PersonalityTraitPrerequisite } 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/primaryAttribute.d.ts

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

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

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

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

@@ -1,4 +1,4 @@
-import type { PublicationPrerequisite } from "optolith-database-schema/gen";
+import type { PublicationPrerequisite } 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/race.d.ts

@@ -1,4 +1,4 @@
-import type { RacePrerequisite } from "optolith-database-schema/gen";
+import type { RacePrerequisite } 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/rated.d.ts

@@ -1,4 +1,4 @@
-import type { RatedPrerequisite } from "optolith-database-schema/gen";
+import type { RatedPrerequisite } 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/ratedMinimumNumber.d.ts

@@ -1,4 +1,4 @@
-import type { RatedMinimumNumberPrerequisite } from "optolith-database-schema/gen";
+import type { RatedMinimumNumberPrerequisite } 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/ratedSum.d.ts

@@ -1,4 +1,4 @@
-import type { RatedSumPrerequisite } from "optolith-database-schema/gen";
+import type { RatedSumPrerequisite } 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/rule.d.ts

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-import type { SocialStatusPrerequisite } from "optolith-database-schema/gen";
+import type { SocialStatusPrerequisite } 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/state.d.ts

@@ -1,4 +1,4 @@
-import type { StatePrerequisite } from "optolith-database-schema/gen";
+import type { StatePrerequisite } 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/text.d.ts

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

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

@@ -1,4 +1,4 @@
-import type { Profession_ID, ProfessionPackage } from "optolith-database-schema/gen";
+import type { Profession_ID, ProfessionPackage } from "@optolith/database-schema/gen";
 import type { GetAllChildInstancesForParent, GetAllInstances } from "../../helpers/getTypes.js";
 import type { TranslateMap } from "../../helpers/translate.js";
 import type { IdMap } from "../../index.js";

package/lib/entities/partial/professions.js

@@ -9,11 +9,9 @@ export const getBaseProfessionPackageForCurriculum = (getAllInstances, getChildI
     if (baseProfession === undefined) {
         return undefined;
     }
-    return reduceWhile(getChildInstancesForInstanceId("ProfessionVersion", baseProfession.id), (_acc, version) => getChildInstancesForInstanceId("ProfessionPackage", version.id).find(professionPackage => professionPackage.content.experience_level ===
-        idMap.ExperienceLevel.Experienced), isNotNullish, undefined);
+    return reduceWhile(getChildInstancesForInstanceId("ProfessionVersion", baseProfession.id), (_acc, version) => getChildInstancesForInstanceId("ProfessionPackage", version.id).find(professionPackage => professionPackage.content.experience_level === idMap.ExperienceLevel.Experienced), isNotNullish, undefined);
 };
 /**
  * Gets the name of a profession, regardless of the profession version.
  */
-export const getProfessionName = (translateMap, getChildInstancesForInstanceId, professionId) => translateMap(getChildInstancesForInstanceId("ProfessionVersion", professionId)[0]
-    ?.content.translations)?.name.default;
+export const getProfessionName = (translateMap, getChildInstancesForInstanceId, professionId) => translateMap(getChildInstancesForInstanceId("ProfessionVersion", professionId)[0]?.content.translations)?.name.default;

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

@@ -1,4 +1,4 @@
-import type { CastingTime, FastCastingTime, FastSkillNonModifiableCastingTime, SlowCastingTime, SlowSkillNonModifiableCastingTime } from "optolith-database-schema/gen";
+import type { CastingTime, FastCastingTime, FastSkillNonModifiableCastingTime, SlowCastingTime, SlowSkillNonModifiableCastingTime } from "@optolith/database-schema/gen";
 import { type StdReader } from "../../reader.js";
 /**
  * Renders the text for a non-modifiable casting time of a fast activatable skill.

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

@@ -1,4 +1,4 @@
-import type { CheckResultBasedModifier, CheckResultValue } from "optolith-database-schema/gen";
+import type { CheckResultBasedModifier, CheckResultValue } from "@optolith/database-schema/gen";
 import { type StdReader } from "../../reader.js";
 interface CheckResultBased {
     /**

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

@@ -1,5 +1,5 @@
 import { Reader } from "@elyukai/utils/reader";
-import type { CheckResultBasedModifier, DurationUnitValue, ElvenMagicalSongPermanentCost, FirstPersonMagicalMelodyCost, NonModifiableOneTimeCostPerCountable, NonModifiableSustainedCost, OneTimeCost, OneTimeCostMap, ResponsiveText, ResponsiveTextOptional, ResponsiveTextReplace, SkillModificationLevel_ID, SustainedCost } from "optolith-database-schema/gen";
+import type { CheckResultBasedModifier, DurationUnitValue, ElvenMagicalSongPermanentCost, FirstPersonMagicalMelodyCost, NonModifiableOneTimeCostPerCountable, NonModifiableSustainedCost, OneTimeCost, OneTimeCostMap, ResponsiveText, ResponsiveTextOptional, ResponsiveTextReplace, SkillModificationLevel_ID, SustainedCost } from "@optolith/database-schema/gen";
 import { type LocaleMap } from "../../../../helpers/translate.js";
 import { type StdEnv, type StdReader } from "../../reader.js";
 /**

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

@@ -1,4 +1,4 @@
-import type { CastingTimeDuringLovemaking, CheckResultBasedDuration, DurationForSustained, FixedDuration, Immediate, MusicDuration, PermanentDuration, ResponsiveText } from "optolith-database-schema/gen";
+import type { CastingTimeDuringLovemaking, CheckResultBasedDuration, DurationForSustained, FixedDuration, Immediate, MusicDuration, PermanentDuration, ResponsiveText } from "@optolith/database-schema/gen";
 import type { LocaleMap } from "../../../../helpers/translate.js";
 import { type StdReader } from "../../reader.js";
 /**

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

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

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

@@ -1,4 +1,4 @@
-import type { FastOneTimePerformanceParameters, FastSustainedPerformanceParameters, OneTimePerformanceParameters, ResponsiveTextOptional, SlowOneTimePerformanceParameters, SlowSustainedPerformanceParameters } from "optolith-database-schema/gen";
+import type { FastOneTimePerformanceParameters, FastSustainedPerformanceParameters, OneTimePerformanceParameters, ResponsiveTextOptional, SlowOneTimePerformanceParameters, SlowSustainedPerformanceParameters } from "@optolith/database-schema/gen";
 import type { RawDefinitionListEntityDescriptionSectionItem } from "../../../../index.js";
 import type { StdReader } from "../../reader.js";
 type RenderedPerformanceParameters = {

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

@@ -1,4 +1,4 @@
-import type { CheckResultBasedRange, FixedRange, Range, RangeValue } from "optolith-database-schema/gen";
+import type { CheckResultBasedRange, FixedRange, Range, RangeValue } from "@optolith/database-schema/gen";
 import { type StdReader } from "../../reader.js";
 /**
  * Returns the text for the non-modifiable range of an activatable skill.

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

@@ -1,4 +1,4 @@
-import type { FastSkillModificationLevelConfig, SkillModificationLevel, SlowSkillModificationLevelConfig } from "optolith-database-schema/gen";
+import type { FastSkillModificationLevelConfig, SkillModificationLevel, SlowSkillModificationLevelConfig } from "@optolith/database-schema/gen";
 /**
  * The speed of an activatable skill.
  */

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

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