optolith-database-schema 0.15.3 → 0.15.4

package/lib/cache/newApplicationsAndUses.d.ts

@@ -1,6 +1,7 @@
 import type { CacheConfig } from "../cacheConfig.js";
 import type { SkillApplication, SkillUse } from "../types/_Activatable.js";
 import type { ActivatableIdentifier } from "../types/_IdentifierGroup.js";
+import { ActivatableSelectOptionsCache } from "./activatableSelectOptions.js";
 export type NewApplication = {
     source: ActivatableIdentifier;
     data: SkillApplication;
@@ -14,4 +15,6 @@ export type NewApplicationsAndUsesCache = {
     newApplications: Record<number, NewApplication[]>;
     uses: Record<number, Use[]>;
 };
-export declare const config: CacheConfig<NewApplicationsAndUsesCache>;
+export declare const config: CacheConfig<NewApplicationsAndUsesCache, [
+    generatedSelectOptions: ActivatableSelectOptionsCache
+]>;

package/lib/cache/newApplicationsAndUses.js

@@ -1,5 +1,5 @@
 export const config = {
-    builder(database) {
+    builder(database, generatedSelectOptions) {
         const cache = {
             newApplications: {},
             uses: {},
@@ -63,6 +63,64 @@ export const config = {
                 addNewApplicationsAndUses(activatable, createId(numericId));
             });
         });
+        // prettier-ignore
+        const generatedEntries = [
+            [generatedSelectOptions.advancedCombatSpecialAbilities, id => ({ tag: "AdvancedCombatSpecialAbility", advanced_combat_special_ability: id })],
+            [generatedSelectOptions.advancedKarmaSpecialAbilities, id => ({ tag: "AdvancedKarmaSpecialAbility", advanced_karma_special_ability: id })],
+            [generatedSelectOptions.advancedMagicalSpecialAbilities, id => ({ tag: "AdvancedMagicalSpecialAbility", advanced_magical_special_ability: id })],
+            [generatedSelectOptions.advancedSkillSpecialAbilities, id => ({ tag: "AdvancedSkillSpecialAbility", advanced_skill_special_ability: id })],
+            [generatedSelectOptions.advantages, id => ({ tag: "Advantage", advantage: id })],
+            [generatedSelectOptions.ancestorGlyphs, id => ({ tag: "AncestorGlyph", ancestor_glyph: id })],
+            [generatedSelectOptions.arcaneOrbEnchantments, id => ({ tag: "ArcaneOrbEnchantment", arcane_orb_enchantment: id })],
+            [generatedSelectOptions.attireEnchantments, id => ({ tag: "AttireEnchantment", attire_enchantment: id })],
+            [generatedSelectOptions.blessedTraditions, id => ({ tag: "BlessedTradition", blessed_tradition: id })],
+            [generatedSelectOptions.bowlEnchantments, id => ({ tag: "BowlEnchantment", bowl_enchantment: id })],
+            [generatedSelectOptions.brawlingSpecialAbilities, id => ({ tag: "BrawlingSpecialAbility", brawling_special_ability: id })],
+            [generatedSelectOptions.cauldronEnchantments, id => ({ tag: "CauldronEnchantment", cauldron_enchantment: id })],
+            [generatedSelectOptions.ceremonialItemSpecialAbilities, id => ({ tag: "CeremonialItemSpecialAbility", ceremonial_item_special_ability: id })],
+            [generatedSelectOptions.chronicleEnchantments, id => ({ tag: "ChronicleEnchantment", chronicle_enchantment: id })],
+            [generatedSelectOptions.combatSpecialAbilities, id => ({ tag: "CombatSpecialAbility", combat_special_ability: id })],
+            [generatedSelectOptions.combatStyleSpecialAbilities, id => ({ tag: "CombatStyleSpecialAbility", combat_style_special_ability: id })],
+            [generatedSelectOptions.commandSpecialAbilities, id => ({ tag: "CommandSpecialAbility", command_special_ability: id })],
+            [generatedSelectOptions.daggerRituals, id => ({ tag: "DaggerRitual", dagger_ritual: id })],
+            [generatedSelectOptions.disadvantages, id => ({ tag: "Disadvantage", disadvantage: id })],
+            [generatedSelectOptions.familiarSpecialAbilities, id => ({ tag: "FamiliarSpecialAbility", familiar_special_ability: id })],
+            [generatedSelectOptions.fatePointSexSpecialAbilities, id => ({ tag: "FatePointSexSpecialAbility", fate_point_sex_special_ability: id })],
+            [generatedSelectOptions.fatePointSpecialAbilities, id => ({ tag: "FatePointSpecialAbility", fate_point_special_ability: id })],
+            [generatedSelectOptions.foolsHatEnchantments, id => ({ tag: "FoolsHatEnchantment", fools_hat_enchantment: id })],
+            [generatedSelectOptions.generalSpecialAbilities, id => ({ tag: "GeneralSpecialAbility", general_special_ability: id })],
+            [generatedSelectOptions.instrumentEnchantments, id => ({ tag: "InstrumentEnchantment", instrument_enchantment: id })],
+            [generatedSelectOptions.karmaSpecialAbilities, id => ({ tag: "KarmaSpecialAbility", karma_special_ability: id })],
+            [generatedSelectOptions.krallenkettenzauber, id => ({ tag: "Krallenkettenzauber", krallenkettenzauber: id })],
+            [generatedSelectOptions.liturgicalStyleSpecialAbilities, id => ({ tag: "LiturgicalStyleSpecialAbility", liturgical_style_special_ability: id })],
+            [generatedSelectOptions.lycantropicGifts, id => ({ tag: "LycantropicGift", lycantropic_gift: id })],
+            [generatedSelectOptions.magicalSpecialAbilities, id => ({ tag: "MagicalSpecialAbility", magical_special_ability: id })],
+            [generatedSelectOptions.magicalTraditions, id => ({ tag: "MagicalTradition", magical_tradition: id })],
+            [generatedSelectOptions.magicStyleSpecialAbilities, id => ({ tag: "MagicStyleSpecialAbility", magic_style_special_ability: id })],
+            [generatedSelectOptions.orbEnchantments, id => ({ tag: "OrbEnchantment", orb_enchantment: id })],
+            [generatedSelectOptions.pactGifts, id => ({ tag: "PactGift", pact_gift: id })],
+            [generatedSelectOptions.protectiveWardingCircleSpecialAbilities, id => ({ tag: "ProtectiveWardingCircleSpecialAbility", protective_warding_circle_special_ability: id })],
+            [generatedSelectOptions.ringEnchantments, id => ({ tag: "RingEnchantment", ring_enchantment: id })],
+            [generatedSelectOptions.sermons, id => ({ tag: "Sermon", sermon: id })],
+            [generatedSelectOptions.sexSpecialAbilities, id => ({ tag: "SexSpecialAbility", sex_special_ability: id })],
+            [generatedSelectOptions.sickleRituals, id => ({ tag: "SickleRitual", sickle_ritual: id })],
+            [generatedSelectOptions.sikaryanDrainSpecialAbilities, id => ({ tag: "SikaryanDrainSpecialAbility", sikaryan_drain_special_ability: id })],
+            [generatedSelectOptions.staffEnchantments, id => ({ tag: "StaffEnchantment", staff_enchantment: id })],
+            [generatedSelectOptions.skillStyleSpecialAbilities, id => ({ tag: "SkillStyleSpecialAbility", skill_style_special_ability: id })],
+            [generatedSelectOptions.spellSwordEnchantments, id => ({ tag: "SpellSwordEnchantment", spell_sword_enchantment: id })],
+            [generatedSelectOptions.toyEnchantments, id => ({ tag: "ToyEnchantment", toy_enchantment: id })],
+            [generatedSelectOptions.trinkhornzauber, id => ({ tag: "Trinkhornzauber", trinkhornzauber: id })],
+            [generatedSelectOptions.vampiricGifts, id => ({ tag: "VampiricGift", vampiric_gift: id })],
+            [generatedSelectOptions.visions, id => ({ tag: "Vision", vision: id })],
+            [generatedSelectOptions.wandEnchantments, id => ({ tag: "WandEnchantment", wand_enchantment: id })],
+            [generatedSelectOptions.weaponEnchantments, id => ({ tag: "WeaponEnchantment", weapon_enchantment: id })],
+        ];
+        generatedEntries.forEach(([ids, createId]) => Object.entries(ids).forEach(([stringId, selectOptions]) => {
+            const id = createId(Number.parseInt(stringId));
+            selectOptions.forEach(selectOption => {
+                addNewApplicationsAndUses(selectOption, id);
+            });
+        }));
         return cache;
     },
 };

package/lib/cacheConfig.d.ts

@@ -1,4 +1,4 @@
 import { ValidResults } from "./main.js";
-export type CacheConfig<T> = {
-    builder: (data: ValidResults) => T;
+export type CacheConfig<T, D extends unknown[] = []> = {
+    builder: (data: ValidResults, ...deps: D) => T;
 };

package/lib/config/cache.d.ts

@@ -1,10 +1,13 @@
+import * as ActivatableSelectOptions from "../cache/activatableSelectOptions.js";
 import * as AncestorBloodAdvantages from "../cache/ancestorBloodAdvantages.js";
 import * as NewApplicationsAndUses from "../cache/newApplicationsAndUses.js";
 export type CacheMap = {
+    activatableSelectOptions: ActivatableSelectOptions.ActivatableSelectOptionsCache;
     ancestorBloodAdvantages: AncestorBloodAdvantages.AncestorBloodAdvantagesCache;
     newApplicationsAndUses: NewApplicationsAndUses.NewApplicationsAndUsesCache;
 };
 export declare const cacheMap: {
+    activatableSelectOptions: import("../cacheConfig.js").CacheConfig<ActivatableSelectOptions.ActivatableSelectOptionsCache>;
     ancestorBloodAdvantages: import("../cacheConfig.js").CacheConfig<AncestorBloodAdvantages.AncestorBloodAdvantagesCache>;
-    newApplicationsAndUses: import("../cacheConfig.js").CacheConfig<NewApplicationsAndUses.NewApplicationsAndUsesCache>;
+    newApplicationsAndUses: import("../cacheConfig.js").CacheConfig<NewApplicationsAndUses.NewApplicationsAndUsesCache, [generatedSelectOptions: ActivatableSelectOptions.ActivatableSelectOptionsCache]>;
 };

package/lib/config/cache.js

@@ -1,6 +1,8 @@
+import * as ActivatableSelectOptions from "../cache/activatableSelectOptions.js";
 import * as AncestorBloodAdvantages from "../cache/ancestorBloodAdvantages.js";
 import * as NewApplicationsAndUses from "../cache/newApplicationsAndUses.js";
 export const cacheMap = {
+    activatableSelectOptions: ActivatableSelectOptions.config,
     ancestorBloodAdvantages: AncestorBloodAdvantages.config,
     newApplicationsAndUses: NewApplicationsAndUses.config,
 };

package/lib/helpers/nullable.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Extracts `null` and `undefined` from a type.
+ */
+export type Nullish<T = null | undefined> = T extends null | undefined ? T : never;
+/**
+ * Checks if a value is `null` or `undefined`.
+ */
+export declare const isNullish: <T>(value: T) => value is Exclude<T, NonNullable<T>>;
+/**
+ * Checks if a value is not `null` or `undefined`.
+ */
+export declare const isNotNullish: <T>(value: T) => value is NonNullable<T>;
+/**
+ * Maps a value to another value if it is not `null` or `undefined`.
+ */
+export declare const mapNullable: <T, U>(value: T, map: (value: NonNullable<T>) => U) => U | Nullish<T>;
+/**
+ * Maps a value to another value if it is not `null` or `undefined`, otherwise
+ * returns a default value.
+ */
+export declare const mapNullableDefault: <T, U>(value: T, map: (value: NonNullable<T>) => U, defaultValue: U) => U;
+/**
+ * Returns an array, containing the value if it is not `null` or `undefined`.
+ *
+ * This can be useful in combination with the spread operator or
+ * `Array.prototype.flatMap`.
+ * @example
+ * nullableToArray(2) // [2]
+ * nullableToArray(undefined) // []
+ *
+ * [...nullableToArray(2)] // [2]
+ * [1, ...nullableToArray(2)] // [1, 2]
+ * [1, ...nullableToArray(undefined)] // [1]
+ */
+export declare const nullableToArray: <T>(value: T) => NonNullable<T>[];

package/lib/helpers/nullable.js

@@ -0,0 +1,31 @@
+/**
+ * Checks if a value is `null` or `undefined`.
+ */
+export const isNullish = (value) => value === null || value === undefined;
+/**
+ * Checks if a value is not `null` or `undefined`.
+ */
+export const isNotNullish = (value) => !isNullish(value);
+/**
+ * Maps a value to another value if it is not `null` or `undefined`.
+ */
+export const mapNullable = (value, map) => isNotNullish(value) ? map(value) : value;
+/**
+ * Maps a value to another value if it is not `null` or `undefined`, otherwise
+ * returns a default value.
+ */
+export const mapNullableDefault = (value, map, defaultValue) => (isNotNullish(value) ? map(value) : defaultValue);
+/**
+ * Returns an array, containing the value if it is not `null` or `undefined`.
+ *
+ * This can be useful in combination with the spread operator or
+ * `Array.prototype.flatMap`.
+ * @example
+ * nullableToArray(2) // [2]
+ * nullableToArray(undefined) // []
+ *
+ * [...nullableToArray(2)] // [2]
+ * [1, ...nullableToArray(2)] // [1, 2]
+ * [1, ...nullableToArray(undefined)] // [1]
+ */
+export const nullableToArray = (value) => isNotNullish(value) ? [value] : [];

package/lib/helpers/nullable.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/helpers/nullable.test.js

@@ -0,0 +1,46 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { isNotNullish, isNullish, mapNullable, mapNullableDefault, nullableToArray, } from "./nullable.js";
+describe("isNullish", () => {
+    it("returns if a value is nullish", () => {
+        assert.equal(isNullish(null), true);
+        assert.equal(isNullish(undefined), true);
+        assert.equal(isNullish(false), false);
+        assert.equal(isNullish(0), false);
+        assert.equal(isNullish(""), false);
+    });
+});
+describe("isNotNullish", () => {
+    it("returns if a value is not nullish", () => {
+        assert.equal(isNotNullish(null), false);
+        assert.equal(isNotNullish(undefined), false);
+        assert.equal(isNotNullish(false), true);
+        assert.equal(isNotNullish(0), true);
+        assert.equal(isNotNullish(""), true);
+    });
+});
+describe("mapNullable", () => {
+    it("maps a value if it is not nullish", () => {
+        assert.equal(mapNullable(2, x => x * 2), 4);
+    });
+    it("returns the original value if it is nullish", () => {
+        assert.equal(mapNullable(undefined, x => x * 2), undefined);
+    });
+});
+describe("mapNullableDefault", () => {
+    it("maps a value if it is not nullish", () => {
+        assert.equal(mapNullableDefault(2, x => x * 2, 0), 4);
+    });
+    it("returns a default if the value is nullish", () => {
+        assert.equal(mapNullableDefault(undefined, x => x * 2, 0), 0);
+    });
+});
+describe("nullableToArray", () => {
+    it("wraps a non-nullish value into an array", () => {
+        assert.deepEqual(nullableToArray(2), [2]);
+    });
+    it("returns an empty array if the value is null or undefined", () => {
+        assert.deepEqual(nullableToArray(undefined), []);
+        assert.deepEqual(nullableToArray(null), []);
+    });
+});

package/lib/helpers/object.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Maps all own properties of an object to a new object. Returning `undefined`
+ * from the mapping function will omit the property from the result.
+ */
+export declare const mapObject: <T extends object, U>(object: T, map: (value: T[keyof T], key: keyof T) => U | undefined) => { [key in keyof T]: Exclude<U, undefined>; };

package/lib/helpers/object.js

@@ -0,0 +1,16 @@
+/**
+ * Maps all own properties of an object to a new object. Returning `undefined`
+ * from the mapping function will omit the property from the result.
+ */
+export const mapObject = (object, map) => {
+    const result = {};
+    for (const key in object) {
+        if (Object.hasOwn(object, key)) {
+            const newValue = map(object[key], key);
+            if (newValue !== undefined) {
+                result[key] = newValue;
+            }
+        }
+    }
+    return result;
+};

package/lib/helpers/object.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/helpers/object.test.js

@@ -0,0 +1,15 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { mapObject } from "./object.js";
+describe("mapObject", () => {
+    it("maps all own properties of an object to a new object", () => {
+        const object = { a: 1, b: 2, c: 3 };
+        const result = mapObject(object, (value, key) => value + key);
+        assert.deepEqual(result, { a: "1a", b: "2b", c: "3c" });
+    });
+    it("omits properties for which the mapping function returns undefined", () => {
+        const object = { a: 1, b: 2, c: 3 };
+        const result = mapObject(object, (value, key) => (key === "b" ? undefined : value + key));
+        assert.deepEqual(result, { a: "1a", c: "3c" });
+    });
+});

package/lib/helpers/typeSafety.d.ts

@@ -1,6 +1,14 @@
 /**
  * This function is used to make sure that the `switch` is exhaustive. Place it
  * in the `default` case of the `switch`.
- * @param x The value that is used in the `switch`.
+ * @param _x - The value that is used in the `switch`.
+ * @example
+ * const aorb = (x: "a" | "b") => {
+ *   switch (x) {
+ *     case "a": return 1
+ *     case "b": return 2
+ *     default: return assertExhaustive(x)
+ *   }
+ * }
  */
-export declare function assertExhaustive(x: never): never;
+export declare function assertExhaustive(_x: never): never;

package/lib/helpers/typeSafety.js

@@ -1,8 +1,16 @@
 /**
  * This function is used to make sure that the `switch` is exhaustive. Place it
  * in the `default` case of the `switch`.
- * @param x The value that is used in the `switch`.
+ * @param _x - The value that is used in the `switch`.
+ * @example
+ * const aorb = (x: "a" | "b") => {
+ *   switch (x) {
+ *     case "a": return 1
+ *     case "b": return 2
+ *     default: return assertExhaustive(x)
+ *   }
+ * }
  */
-export function assertExhaustive(x) {
+export function assertExhaustive(_x) {
     throw new Error("The switch is not exhaustive.");
 }

package/lib/helpers/typeSafety.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/helpers/typeSafety.test.js

@@ -0,0 +1,10 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { assertExhaustive } from "./typeSafety.js";
+describe("assertExhaustive", () => {
+    it("should throw an error with the message 'The switch is not exhaustive.'", () => {
+        assert.throws(
+        // @ts-expect-error The function should never receive a value.
+        () => assertExhaustive(""), err => err instanceof Error && err.message === "The switch is not exhaustive.");
+    });
+});

package/lib/main.js

@@ -4,23 +4,23 @@ import { cacheMap } from "./config/cache.js";
 import "./helpers/array.js";
 import { mapSecond } from "./helpers/pair.js";
 import { Result, error, isError, isOk, ok } from "./helpers/result.js";
-import { getRawValidationResults } from "./validation/raw.js";
+import { getRawValidationResults, } from "./validation/raw.js";
 const rawResultMapToResult = (rawResultMap) => rawResultMap.reduce((result, [typeName, typeResults]) => typeResults.reduce((outerResult, [filePath, fileResult]) => {
     if (isOk(outerResult) && isOk(fileResult)) {
         return ok({
             ...outerResult.value,
-            [typeName]: [...(outerResult.value[typeName] ?? []), fileResult.value]
+            [typeName]: [...(outerResult.value[typeName] ?? []), fileResult.value],
         });
     }
     else if (isOk(outerResult) && isError(fileResult)) {
         return error({
-            [filePath]: fileResult.error
+            [filePath]: fileResult.error,
         });
     }
     else if (isError(outerResult) && isError(fileResult)) {
         return error({
             ...outerResult.error,
-            [filePath]: fileResult.error
+            [filePath]: fileResult.error,
         });
     }
     else {
@@ -76,11 +76,17 @@ export const getRawResults = async (entityDirPaths, options = {}) => {
  */
 export const buildCache = async (cachePaths, validResults, options = {}) => {
     const { pretty = false } = options;
+    const activatableSelectOptionsCache = cacheMap.activatableSelectOptions.builder(validResults);
+    const ancestorBloodAdvantagesCache = cacheMap.ancestorBloodAdvantages.builder(validResults);
+    const newApplicationsAndUsesCache = cacheMap.newApplicationsAndUses.builder(validResults, activatableSelectOptionsCache);
+    const cacheData = {
+        activatableSelectOptions: activatableSelectOptionsCache,
+        ancestorBloodAdvantages: ancestorBloodAdvantagesCache,
+        newApplicationsAndUses: newApplicationsAndUsesCache,
+    };
     for (const [cacheName, cachePath] of Object.entries(cachePaths)) {
-        const cacheConfig = cacheMap[cacheName];
-        const cacheData = cacheConfig.builder(validResults);
         await mkdir(dirname(cachePath), { recursive: true });
-        await writeFile(cachePath, JSON.stringify(cacheData, null, pretty ? 2 : undefined), "utf-8");
+        await writeFile(cachePath, JSON.stringify(cacheData[cacheName], null, pretty ? 2 : undefined), "utf-8");
     }
 };
 /**
@@ -91,7 +97,6 @@ export const buildCache = async (cachePaths, validResults, options = {}) => {
 export const getCache = async (cachePaths) => {
     const cache = {};
     for (const [cacheName, cachePath] of Object.entries(cachePaths)) {
-        const cacheConfig = cacheMap[cacheName];
         const cacheData = JSON.parse(await readFile(cachePath, "utf-8"));
         cache[cacheName] = cacheData;
     }

package/lib/types/_ActivatableSelectOptionCategory.d.ts

@@ -1,7 +1,7 @@
-import { TargetCategoryIdentifier } from "./_Identifier.js";
-import { ActivatableIdentifier, CombatTechniqueIdentifier, SkillIdentifier } from "./_IdentifierGroup.js";
+import { SkillIdentifier, TargetCategoryIdentifier } from "./_Identifier.js";
+import { ActivatableIdentifier, CombatTechniqueIdentifier, SkillIdentifier as SkillIdentifierGroup } from "./_IdentifierGroup.js";
 import { LocaleMap } from "./_LocaleMap.js";
-import { CeremonyReference, CloseCombatTechniqueReference, ElementReference, LiturgicalChantReference, RangedCombatTechniqueReference, RitualReference, SkillGroupReference, SpellReference } from "./_SimpleReferences.js";
+import { CeremonyReference, CloseCombatTechniqueReference, ElementReference, LiturgicalChantReference, RangedCombatTechniqueReference, RitualReference, SkillGroupReference, SkillReference, SpellReference } from "./_SimpleReferences.js";
 export type SelectOptionCategory = {
     tag: "Blessings";
     blessings: {};
@@ -156,7 +156,7 @@ export type SkillsSelectOptionCategory = {
     /**
      * Generate AP values for each entry.
      */
-    ap_value?: AdventurePointsValue<SkillIdentifier>;
+    ap_value?: AdventurePointsValue<SkillIdentifierGroup>;
 };
 export type SkillsSelectOptionCategoryCategory = {
     tag: "Skills";
@@ -184,7 +184,7 @@ export type SkillSelectOptionCategoryCategory = {
      * Only include (`Intersection`) or exclude (`Difference`) specific
      * skills.
      */
-    specific?: SpecificFromSkillSelectOptionCategoryCategory<SkillIdentifier>;
+    specific?: SpecificFromSkillSelectOptionCategoryCategory<SkillReference>;
     /**
      * Registers new applications, which get enabled once this entry is
      * activated with its respective select option. It specifies an
@@ -211,7 +211,7 @@ export type SkillSelectOptionCategoryCategory = {
     /**
      * Generate AP values for each entry.
      */
-    ap_value?: AdventurePointsValue<CombatTechniqueIdentifier>;
+    ap_value?: AdventurePointsValue<SkillIdentifier>;
 };
 export type CombatTechniquesSelectOptionCategory = {
     /**

package/lib/types/_Identifier.d.ts

@@ -385,6 +385,15 @@ export type PactGiftIdentifier = {
      */
     pact_gift: number;
 };
+export type VampiricGiftIdentifier = {
+    tag: "VampiricGift";
+    /**
+     * The vampiric gift’s identifier.
+     * @integer
+     * @minimum 1
+     */
+    vampiric_gift: number;
+};
 export type SikaryanDrainSpecialAbilityIdentifier = {
     tag: "SikaryanDrainSpecialAbility";
     /**
@@ -1191,3 +1200,66 @@ export type StateIdentifier = {
      */
     state: number;
 };
+export type DiseaseIdentifier = {
+    tag: "Disease";
+    /**
+     * The disease’s identifier.
+     * @integer
+     * @minimum 1
+     */
+    disease: number;
+};
+export type SexPracticeIdentifier = {
+    tag: "SexPractice";
+    /**
+     * The sex practice’s identifier.
+     * @integer
+     * @minimum 1
+     */
+    sex_practice: number;
+};
+export type GenericIdentifier = {
+    tag: "Generic";
+    /**
+     * The generic entry‘s identifier.
+     * @integer
+     * @minimum 1
+     */
+    generic: number;
+};
+export type TradeSecretIdentifier = {
+    tag: "TradeSecret";
+    /**
+     * The trade secret‘s identifier.
+     * @integer
+     * @minimum 1
+     */
+    trade_secret: number;
+};
+export type AnimalShapeIdentifier = {
+    tag: "AnimalShape";
+    /**
+     * The animal shape‘s identifier.
+     * @integer
+     * @minimum 1
+     */
+    animal_shape: number;
+};
+export type ArcaneBardTraditionIdentifier = {
+    tag: "ArcaneBardTradition";
+    /**
+     * The arcane bard tradition‘s identifier.
+     * @integer
+     * @minimum 1
+     */
+    arcane_bard_tradition: number;
+};
+export type ArcaneDancerTraditionIdentifier = {
+    tag: "ArcaneDancerTradition";
+    /**
+     * The arcane dancer tradition‘s identifier.
+     * @integer
+     * @minimum 1
+     */
+    arcane_dancer_tradition: number;
+};

package/lib/types/_IdentifierGroup.d.ts

@@ -1,5 +1,5 @@
 import * as Identifier from "./_Identifier.js";
-export type ActivatableIdentifier = Identifier.AdvantageIdentifier | Identifier.DisadvantageIdentifier | Identifier.GeneralSpecialAbilityIdentifier | Identifier.FatePointSpecialAbilityIdentifier | Identifier.CombatSpecialAbilityIdentifier | Identifier.MagicalSpecialAbilityIdentifier | Identifier.StaffEnchantmentIdentifier | Identifier.FamiliarSpecialAbilityIdentifier | Identifier.KarmaSpecialAbilityIdentifier | Identifier.ProtectiveWardingCircleSpecialAbilityIdentifier | Identifier.CombatStyleSpecialAbilityIdentifier | Identifier.AdvancedCombatSpecialAbilityIdentifier | Identifier.CommandSpecialAbilityIdentifier | Identifier.MagicStyleSpecialAbilityIdentifier | Identifier.AdvancedMagicalSpecialAbilityIdentifier | Identifier.SpellSwordEnchantmentIdentifier | Identifier.DaggerRitualIdentifier | Identifier.InstrumentEnchantmentIdentifier | Identifier.AttireEnchantmentIdentifier | Identifier.OrbEnchantmentIdentifier | Identifier.WandEnchantmentIdentifier | Identifier.BrawlingSpecialAbilityIdentifier | Identifier.AncestorGlyphIdentifier | Identifier.CeremonialItemSpecialAbilityIdentifier | Identifier.SermonIdentifier | Identifier.LiturgicalStyleSpecialAbilityIdentifier | Identifier.AdvancedKarmaSpecialAbilityIdentifier | Identifier.VisionIdentifier | Identifier.MagicalTraditionIdentifier | Identifier.BlessedTraditionIdentifier | Identifier.PactGiftIdentifier | Identifier.SikaryanDrainSpecialAbilityIdentifier | Identifier.LycantropicGiftIdentifier | Identifier.SkillStyleSpecialAbilityIdentifier | Identifier.AdvancedSkillSpecialAbilityIdentifier | Identifier.ArcaneOrbEnchantmentIdentifier | Identifier.CauldronEnchantmentIdentifier | Identifier.FoolsHatEnchantmentIdentifier | Identifier.ToyEnchantmentIdentifier | Identifier.BowlEnchantmentIdentifier | Identifier.FatePointSexSpecialAbilityIdentifier | Identifier.SexSpecialAbilityIdentifier | Identifier.WeaponEnchantmentIdentifier | Identifier.SickleRitualIdentifier | Identifier.RingEnchantmentIdentifier | Identifier.ChronicleEnchantmentIdentifier | Identifier.KrallenkettenzauberIdentifier | Identifier.TrinkhornzauberIdentifier;
+export type ActivatableIdentifier = Identifier.AdvantageIdentifier | Identifier.DisadvantageIdentifier | Identifier.GeneralSpecialAbilityIdentifier | Identifier.FatePointSpecialAbilityIdentifier | Identifier.CombatSpecialAbilityIdentifier | Identifier.MagicalSpecialAbilityIdentifier | Identifier.StaffEnchantmentIdentifier | Identifier.FamiliarSpecialAbilityIdentifier | Identifier.KarmaSpecialAbilityIdentifier | Identifier.ProtectiveWardingCircleSpecialAbilityIdentifier | Identifier.CombatStyleSpecialAbilityIdentifier | Identifier.AdvancedCombatSpecialAbilityIdentifier | Identifier.CommandSpecialAbilityIdentifier | Identifier.MagicStyleSpecialAbilityIdentifier | Identifier.AdvancedMagicalSpecialAbilityIdentifier | Identifier.SpellSwordEnchantmentIdentifier | Identifier.DaggerRitualIdentifier | Identifier.InstrumentEnchantmentIdentifier | Identifier.AttireEnchantmentIdentifier | Identifier.OrbEnchantmentIdentifier | Identifier.WandEnchantmentIdentifier | Identifier.BrawlingSpecialAbilityIdentifier | Identifier.AncestorGlyphIdentifier | Identifier.CeremonialItemSpecialAbilityIdentifier | Identifier.SermonIdentifier | Identifier.LiturgicalStyleSpecialAbilityIdentifier | Identifier.AdvancedKarmaSpecialAbilityIdentifier | Identifier.VisionIdentifier | Identifier.MagicalTraditionIdentifier | Identifier.BlessedTraditionIdentifier | Identifier.PactGiftIdentifier | Identifier.SikaryanDrainSpecialAbilityIdentifier | Identifier.VampiricGiftIdentifier | Identifier.LycantropicGiftIdentifier | Identifier.SkillStyleSpecialAbilityIdentifier | Identifier.AdvancedSkillSpecialAbilityIdentifier | Identifier.ArcaneOrbEnchantmentIdentifier | Identifier.CauldronEnchantmentIdentifier | Identifier.FoolsHatEnchantmentIdentifier | Identifier.ToyEnchantmentIdentifier | Identifier.BowlEnchantmentIdentifier | Identifier.FatePointSexSpecialAbilityIdentifier | Identifier.SexSpecialAbilityIdentifier | Identifier.WeaponEnchantmentIdentifier | Identifier.SickleRitualIdentifier | Identifier.RingEnchantmentIdentifier | Identifier.ChronicleEnchantmentIdentifier | Identifier.KrallenkettenzauberIdentifier | Identifier.TrinkhornzauberIdentifier;
 export type SpecialAbilityIdentifier = Identifier.GeneralSpecialAbilityIdentifier | Identifier.FatePointSpecialAbilityIdentifier | Identifier.CombatSpecialAbilityIdentifier | Identifier.MagicalSpecialAbilityIdentifier | Identifier.StaffEnchantmentIdentifier | Identifier.FamiliarSpecialAbilityIdentifier | Identifier.KarmaSpecialAbilityIdentifier | Identifier.ProtectiveWardingCircleSpecialAbilityIdentifier | Identifier.CombatStyleSpecialAbilityIdentifier | Identifier.AdvancedCombatSpecialAbilityIdentifier | Identifier.CommandSpecialAbilityIdentifier | Identifier.MagicStyleSpecialAbilityIdentifier | Identifier.AdvancedMagicalSpecialAbilityIdentifier | Identifier.SpellSwordEnchantmentIdentifier | Identifier.DaggerRitualIdentifier | Identifier.InstrumentEnchantmentIdentifier | Identifier.AttireEnchantmentIdentifier | Identifier.OrbEnchantmentIdentifier | Identifier.WandEnchantmentIdentifier | Identifier.BrawlingSpecialAbilityIdentifier | Identifier.AncestorGlyphIdentifier | Identifier.CeremonialItemSpecialAbilityIdentifier | Identifier.SermonIdentifier | Identifier.LiturgicalStyleSpecialAbilityIdentifier | Identifier.AdvancedKarmaSpecialAbilityIdentifier | Identifier.VisionIdentifier | Identifier.MagicalTraditionIdentifier | Identifier.BlessedTraditionIdentifier | Identifier.PactGiftIdentifier | Identifier.SikaryanDrainSpecialAbilityIdentifier | Identifier.LycantropicGiftIdentifier | Identifier.SkillStyleSpecialAbilityIdentifier | Identifier.AdvancedSkillSpecialAbilityIdentifier | Identifier.ArcaneOrbEnchantmentIdentifier | Identifier.CauldronEnchantmentIdentifier | Identifier.FoolsHatEnchantmentIdentifier | Identifier.ToyEnchantmentIdentifier | Identifier.BowlEnchantmentIdentifier | Identifier.FatePointSexSpecialAbilityIdentifier | Identifier.SexSpecialAbilityIdentifier | Identifier.WeaponEnchantmentIdentifier | Identifier.SickleRitualIdentifier | Identifier.RingEnchantmentIdentifier | Identifier.ChronicleEnchantmentIdentifier | Identifier.KrallenkettenzauberIdentifier | Identifier.TrinkhornzauberIdentifier;
 export type CombatRelatedSpecialAbilityIdentifier = Identifier.CombatSpecialAbilityIdentifier | Identifier.CombatStyleSpecialAbilityIdentifier | Identifier.AdvancedCombatSpecialAbilityIdentifier | Identifier.CommandSpecialAbilityIdentifier;
 export type TraditionIdentifier = Identifier.MagicalTraditionIdentifier | Identifier.BlessedTraditionIdentifier;
@@ -13,7 +13,8 @@ export type SkillWithEnhancementsIdentifier = Identifier.SpellIdentifier | Ident
 export type SpellworkIdentifier = Identifier.SpellIdentifier | Identifier.RitualIdentifier;
 export type LiturgyIdentifier = Identifier.LiturgicalChantIdentifier | Identifier.CeremonyIdentifier;
 export type MagicalActionIdentifier = Identifier.CurseIdentifier | Identifier.ElvenMagicalSongIdentifier | Identifier.DominationRitualIdentifier | Identifier.MagicalMelodyIdentifier | Identifier.MagicalDanceIdentifier | Identifier.JesterTrickIdentifier | Identifier.AnimistPowerIdentifier | Identifier.GeodeRitualIdentifier | Identifier.ZibiljaRitualIdentifier;
-export type RequirableSelectOptionIdentifier = Identifier.GeneralIdentifier | Identifier.SkillIdentifier | Identifier.CloseCombatTechniqueIdentifier | Identifier.RangedCombatTechniqueIdentifier;
+export type SelectOptionIdentifier = Identifier.GenericIdentifier | Identifier.BlessingIdentifier | Identifier.CantripIdentifier | Identifier.TradeSecretIdentifier | Identifier.ScriptIdentifier | Identifier.AnimalShapeIdentifier | Identifier.ArcaneBardTraditionIdentifier | Identifier.ArcaneDancerTraditionIdentifier | Identifier.SexPracticeIdentifier | Identifier.RaceIdentifier | Identifier.CultureIdentifier | Identifier.BlessedTraditionIdentifier | Identifier.ElementIdentifier | Identifier.PropertyIdentifier | Identifier.AspectIdentifier | Identifier.DiseaseIdentifier | Identifier.PoisonIdentifier | Identifier.LanguageIdentifier | Identifier.SkillIdentifier | Identifier.CloseCombatTechniqueIdentifier | Identifier.RangedCombatTechniqueIdentifier | Identifier.LiturgicalChantIdentifier | Identifier.CeremonyIdentifier | Identifier.SpellIdentifier | Identifier.RitualIdentifier | Identifier.TargetCategoryIdentifier;
+export type RequirableSelectOptionIdentifier = Identifier.GeneralIdentifier | Identifier.SkillIdentifier | Identifier.CloseCombatTechniqueIdentifier | Identifier.RangedCombatTechniqueIdentifier | Identifier.PropertyIdentifier | Identifier.AspectIdentifier | Identifier.LanguageIdentifier | Identifier.AnimalShapeIdentifier | Identifier.LiturgicalChantIdentifier | Identifier.CeremonyIdentifier | Identifier.SpellIdentifier | Identifier.RitualIdentifier;
 export type CoreRuleDerivableContentIdentifier = Identifier.MagicalTraditionIdentifier | Identifier.FamiliarSpecialAbilityIdentifier | Identifier.MagicalSpecialAbilityIdentifier | Identifier.BlessedTraditionIdentifier;
 export type EquipmentIdentifier = Identifier.AmmunitionIdentifier | Identifier.AnimalIdentifier | Identifier.AnimalCareIdentifier | Identifier.ArmorIdentifier | Identifier.BandageOrRemedyIdentifier | Identifier.BookIdentifier | Identifier.CeremonialItemIdentifier | Identifier.ClothesIdentifier | Identifier.ContainerIdentifier | Identifier.ElixirIdentifier | Identifier.EquipmentOfBlessedOnesIdentifier | Identifier.GemOrPreciousStoneIdentifier | Identifier.IlluminationLightSourceIdentifier | Identifier.IlluminationRefillsOrSuppliesIdentifier | Identifier.JewelryIdentifier | Identifier.LiebesspielzeugIdentifier | Identifier.LuxuryGoodIdentifier | Identifier.MagicalArtifactIdentifier | Identifier.MusicalInstrumentIdentifier | Identifier.OrienteeringAidIdentifier | Identifier.PoisonIdentifier | Identifier.RopeOrChainIdentifier | Identifier.StationaryIdentifier | Identifier.ThievesToolIdentifier | Identifier.ToolOfTheTradeIdentifier | Identifier.TravelGearOrToolIdentifier | Identifier.VehicleIdentifier | Identifier.WeaponIdentifier | Identifier.WeaponAccessoryIdentifier;
 export type OneOrManyNumericIdentifiers = OneNumericIdentifier | ManyNumericIdentifiers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optolith-database-schema",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Definitions and utilities for the flat-file database of Optolith, a character creation tool for the Pen and Paper RPG “The Dark Eye 5”, and its external integrations into other software.",
   "keywords": [
     "tde",
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.8.10",
-    "optolith-tsjsonschemamd": "^0.10.4",
+    "optolith-tsjsonschemamd": "^0.10.5",
     "standard-version": "^9.5.0",
     "typescript": "^5.2.2"
   },

package/schema/_ActivatableSelectOptionCategory.schema.json

@@ -832,7 +832,7 @@
               "description": "The list of specific entries.",
               "type": "array",
               "items": {
-                "$ref": "./_IdentifierGroup.schema.json#/$defs/SkillIdentifier"
+                "$ref": "./_SimpleReferences.schema.json#/$defs/SkillReference"
               },
               "minItems": 1,
               "uniqueItems": true
@@ -903,7 +903,7 @@
                         "type": "object",
                         "properties": {
                           "id": {
-                            "$ref": "./_IdentifierGroup.schema.json#/$defs/CombatTechniqueIdentifier"
+                            "$ref": "./_Identifier.schema.json#/$defs/SkillIdentifier"
                           },
                           "ap_value": {
                             "description": "The AP value for the specified entry.",