optolith-database-schema 0.4.1 → 0.5.0

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.5.0](https://github.com/elyukai/optolith-database-schema/compare/v0.4.1...v0.5.0) (2022-12-01)
+
+
+### ⚠ BREAKING CHANGES
+
+* explicit identifier tags, simpler prerequisites, multiple small changes
+
+### Features
+
+* equipment of blessed ones may be for multiple traditions ([3ffbfa2](https://github.com/elyukai/optolith-database-schema/commit/3ffbfa20cd40279091c71e7ef22496f6eab0f501))
+* explicit identifier tags, simpler prerequisites, multiple small changes ([89ab7dd](https://github.com/elyukai/optolith-database-schema/commit/89ab7dd343db1027672b24c63216aba44f2db855))
+* poisons and elixirs ([2552156](https://github.com/elyukai/optolith-database-schema/commit/2552156860ec527b568621dffa9ad6ebef1ae3e3))
+
+
+### Bug Fixes
+
+* import specifiers ([fddea8b](https://github.com/elyukai/optolith-database-schema/commit/fddea8bc62a6ab4ddfef0fcea082a73749152ad4))
+
 ### [0.4.1](https://github.com/elyukai/optolith-database-schema/compare/v0.4.0...v0.4.1) (2022-08-01)
 
 

package/lib/config.d.ts

@@ -28,6 +28,7 @@ import * as Book from "./types/equipment/item/Book.js";
 import * as CeremonialItem from "./types/equipment/item/CeremonialItem.js";
 import * as Clothes from "./types/equipment/item/Clothes.js";
 import * as Container from "./types/equipment/item/Container.js";
+import * as Elixir from "./types/equipment/item/Elixir.js";
 import * as EquipmentOfBlessedOnes from "./types/equipment/item/EquipmentOfBlessedOnes.js";
 import * as GemOrPreciousStone from "./types/equipment/item/GemOrPreciousStone.js";
 import * as IlluminationLightSource from "./types/equipment/item/IlluminationLightSource.js";
@@ -206,6 +207,7 @@ export declare type TypeMap = {
     diseases: Disease.Disease;
     dominationRituals: DominationRitual.DominationRitual;
     elements: Element.Element;
+    elixirs: Elixir.Elixir;
     elvenMagicalSongs: ElvenMagicalSong.ElvenMagicalSong;
     equipmentOfBlessedOnes: EquipmentOfBlessedOnes.EquipmentOfBlessedOnes;
     equipmentPackages: EquipmentPackage.EquipmentPackage;

package/lib/config.js

@@ -28,6 +28,7 @@ import * as Book from "./types/equipment/item/Book.js";
 import * as CeremonialItem from "./types/equipment/item/CeremonialItem.js";
 import * as Clothes from "./types/equipment/item/Clothes.js";
 import * as Container from "./types/equipment/item/Container.js";
+import * as Elixir from "./types/equipment/item/Elixir.js";
 import * as EquipmentOfBlessedOnes from "./types/equipment/item/EquipmentOfBlessedOnes.js";
 import * as GemOrPreciousStone from "./types/equipment/item/GemOrPreciousStone.js";
 import * as IlluminationLightSource from "./types/equipment/item/IlluminationLightSource.js";
@@ -205,6 +206,7 @@ export const typeValidatorMap = {
     diseases: Disease.validateSchema,
     dominationRituals: DominationRitual.validateSchema,
     elements: Element.validateSchema,
+    elixirs: Elixir.validateSchema,
     elvenMagicalSongs: ElvenMagicalSong.validateSchema,
     equipmentOfBlessedOnes: EquipmentOfBlessedOnes.validateSchema,
     equipmentPackages: EquipmentPackage.validateSchema,

package/lib/main.d.ts

@@ -1,4 +1,4 @@
-import { DefinedError } from "ajv/dist/2020.js";
+import { DefinedError } from "ajv";
 import { TypeMap } from "./config.js";
 import { TypeValidationError } from "./validation/schema.js";
 declare type Result = {

package/lib/main.js

@@ -1,5 +1,6 @@
 import addFormats from "ajv-formats";
-import Ajv from "ajv/dist/2020.js";
+import Ajv2019 from "ajv/dist/2019.js";
+import Ajv2020 from "ajv/dist/2020.js";
 import { lstat, readdir, readFile } from "fs/promises";
 import { join } from "path";
 import YAML from "yaml";
@@ -21,28 +22,37 @@ const readdirRecursive = async (dirPath) => {
     }));
     return flattenedRecursivePaths.flat();
 };
-const registerAllJsonSchemaDocuments = async (validator) => {
+const registerAllJsonSchemaDocuments = async (validatorOptions) => {
     const readFileAsUtf8 = (path) => readFile(path, "utf-8");
     const readFilesAsUtf8 = (paths) => Promise.all(paths.map(readFileAsUtf8));
     const parseJson = (json) => JSON.parse(json);
+    const schemes = (await readFilesAsUtf8(await readdirRecursive(jsonSchemaDir))).map(parseJson);
+    const META_SCHEMA_ID_2020_12 = "https://json-schema.org/draft/2020-12/schema";
+    const validator = schemes[0]?.$schema === META_SCHEMA_ID_2020_12
+        ? new Ajv2020(validatorOptions)
+        : new Ajv2019(validatorOptions);
     const registerSchemaInValidator = (jsonSchema) => { validator.addSchema(jsonSchema); };
-    (await readFilesAsUtf8(await readdirRecursive(jsonSchemaDir)))
-        .map(parseJson)
-        .forEach(registerSchemaInValidator);
+    schemes.forEach(registerSchemaInValidator);
+    return validator;
 };
-const readDataFileAssocsFromDirectory = async (dirPath) => await Promise.all((await readdir(dirPath)).map(async (fileName) => {
-    const filePath = join(dirPath, fileName);
-    try {
-        const fileContent = YAML.parse(await readFile(join(dirPath, fileName), "utf-8"));
-        return [filePath, fileContent];
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            error.message = `in "${filePath}":\n  ${error.message}`;
+const collator = Intl.Collator(undefined, { numeric: true });
+const readDataFileAssocsFromDirectory = async (dirPath) => {
+    const filenames = await readdir(dirPath);
+    filenames.sort(collator.compare);
+    return await Promise.all(filenames.map(async (fileName) => {
+        const filePath = join(dirPath, fileName);
+        try {
+            const fileContent = YAML.parse(await readFile(join(dirPath, fileName), "utf-8"));
+            return [filePath, fileContent];
         }
-        return [filePath, null];
-    }
-}));
+        catch (error) {
+            if (error instanceof Error) {
+                error.message = `in "${filePath}":\n  ${error.message}`;
+            }
+            return [filePath, null];
+        }
+    }));
+};
 const validateAllFromType = async (validator, typeName, path) => {
     const isFile = (await lstat(path)).isFile();
     const typeValidator = typeValidatorMap[typeName];
@@ -89,9 +99,8 @@ const rawResultMapToResult = (rawResultMap) => Object.entries(rawResultMap).redu
     value: {}
 }));
 export const validate = async (entityDirPaths, checkIntegrity) => {
-    const validator = new Ajv({ allErrors: true });
+    const validator = await registerAllJsonSchemaDocuments({});
     addFormats(validator);
-    await registerAllJsonSchemaDocuments(validator);
     const rawResultMap = Object.fromEntries((await Promise.all(Object.entries(entityDirPaths)
         .map(async ([typeName, path]) => [
         typeName,

package/lib/types/Cantrip.d.ts

@@ -8,6 +8,7 @@ import { DurationUnit } from "./_ActivatableSkillDuration.js";
 import { FixedRange } from "./_ActivatableSkillRange.js";
 import { TargetCategory } from "./_ActivatableSkillTargetCategory.js";
 import { Enhancements } from "./_Enhancements.js";
+import { MagicalTraditionIdentifier } from "./_Identifier.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { ResponsiveText } from "./_ResponsiveText.js";
 import { CurriculumReference, MagicalTraditionReference, PropertyReference } from "./_SimpleReferences.js";
@@ -80,10 +81,8 @@ export declare type CommonCantripNote = {
 export declare type CommonCantripTraditionNote = {
     /**
      * The magical tradition's identifier.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: MagicalTraditionIdentifier;
     /**
      * All translations for the entry, identified by IETF language tag (BCP47).
      */

package/lib/types/Culture.d.ts

@@ -4,6 +4,7 @@
 import { Errata } from "./source/_Erratum.js";
 import { PublicationRefs } from "./source/_PublicationRef.js";
 import { CommonnessRatedAdvantageDisadvantage } from "./_CommonnessRatedAdvantageDisadvantage.js";
+import { AdvantageIdentifier, DisadvantageIdentifier, MagicalTraditionIdentifier, ProfessionIdentifier, SkillIdentifier } from "./_Identifier.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { NonEmptyString } from "./_NonEmptyString.js";
 import { BinarySex } from "./_Sex.js";
@@ -49,22 +50,22 @@ export declare type Culture = {
      * A list of common advantages.
      * @minItems 1
      */
-    common_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    common_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * A list of common disadvantages.
      * @minItems 1
      */
-    common_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    common_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * A list of uncommon advantages.
      * @minItems 1
      */
-    uncommon_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    uncommon_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * A list of uncommon disadvantages.
      * @minItems 1
      */
-    uncommon_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    uncommon_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * A list of common skills.
      * @minItems 1
@@ -161,10 +162,8 @@ export declare enum Rarity {
 export declare type ProfessionConstraint = {
     /**
      * The profession's identifier.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: ProfessionIdentifier;
     /**
      * Some profession variants are more common than others. There may be
      * cultures where some variants are not represented at all.
@@ -187,10 +186,8 @@ export declare enum MundaneProfessionSubgroupConstraint {
 export declare type TraditionConstraint = {
     /**
      * The magical tradition's identifier.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: MagicalTraditionIdentifier;
     /**
      * Some professions are more common than others. There may be cultures
      * where some professions are not represented at all.
@@ -252,7 +249,7 @@ export declare type CulturalPackageItem = {
      * @integer
      * @minimum 1
      */
-    id: number;
+    id: SkillIdentifier;
     /**
      * The skill points for the respective skill you get for buying the cultural
      * package.

package/lib/types/Lessons_Curriculum.d.ts

@@ -3,7 +3,8 @@
  */
 import { Errata } from "./source/_Erratum.js";
 import { PublicationRefs } from "./source/_PublicationRef.js";
-import { CombatTechniqueIdentifier, MagicalTraditionIdentifier, SpellworkIdentifier } from "./_Identifier.js";
+import { ElementIdentifier, MagicalTraditionIdentifier, PropertyIdentifier, SkillIdentifier } from "./_Identifier.js";
+import { CombatTechniqueIdentifier, SpellworkIdentifier } from "./_IdentifierGroup.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { NonEmptyString } from "./_NonEmptyString.js";
 import { GuidelineReference } from "./_SimpleReferences.js";
@@ -89,7 +90,7 @@ export declare type ElectiveSpellworkRestriction = {
      * @minimum 1
      * @maximum 6
      */
-    id: number;
+    id: ElementIdentifier;
 };
 /**
  * The academy's restricted spellworks package.
@@ -121,7 +122,7 @@ export declare type RestrictedProperty = {
      * @integer
      * @minimum 1
      */
-    id: number;
+    id: PropertyIdentifier;
     /**
      * Exclude specific spellworks from the restriction.
      * @minItems 1
@@ -207,7 +208,7 @@ export declare type SkillAdjustment = {
      * @integer
      * @minimum 1
      */
-    id: number;
+    id: SkillIdentifier;
     /**
      * The skill points that will be added to the current skill rating.
      * @integer

package/lib/types/Lessons_Guideline.d.ts

@@ -8,7 +8,7 @@ import { NonEmptyString } from "./_NonEmptyString.js";
  */
 export declare type Guideline = {
     /**
-     * The region's identifier. An unique, increasing integer.
+     * The guideline's identifier. An unique, increasing integer.
      * @integer
      * @minimum 1
      */

package/lib/types/Patron.d.ts

@@ -1,10 +1,11 @@
 /**
  * @main Patron
  */
+import { AdvantageIdentifier, AttributeIdentifier, SkillIdentifier } from "./_Identifier.js";
 import { ImprovementCost } from "./_ImprovementCost.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { NonEmptyString } from "./_NonEmptyString.js";
-import { CultureReference, PatronCategoryReference, SkillReference } from "./_SimpleReferences.js";
+import { AdvantageReference, CultureReference, DisadvantageReference, PatronCategoryReference, SkillReference, SpellworkReference } from "./_SimpleReferences.js";
 /**
  * @title Patron
  */
@@ -54,6 +55,29 @@ export declare type Patron = {
      * animal patrons.
      */
     improvement_cost?: ImprovementCost;
+    /**
+     * The patron may grant common advantages that are taken into account during
+     * character creation.
+     *
+     * *Source:* Geisterwald & Knochenklippen, p. 6-7
+     * @minLength 1
+     */
+    common_advantages?: AdvantageReference[];
+    /**
+     * The patron may grant common disadvantages that are taken into account
+     * during character creation.
+     *
+     * *Source:* Geisterwald & Knochenklippen, p. 6-7
+     * @minLength 1
+     */
+    common_disadvantages?: DisadvantageReference[];
+    /**
+     * The animist may learn spellworks common for this patron.
+     *
+     * *Source:* Geisterwald & Knochenklippen, p. 6-7
+     * @minLength 1
+     */
+    common_spellworks?: SpellworkReference[];
     /**
      * All translations for the entry, identified by IETF language tag (BCP47).
      */
@@ -90,7 +114,7 @@ export declare type AdvantageAnimalPower = {
      * @integer
      * @minimum 1
      */
-    id: number;
+    id: AdvantageIdentifier;
     /**
      * It grants a higher level of the advantage.
      * @integer
@@ -110,7 +134,7 @@ export declare type SkillAnimalPower = {
      * @integer
      * @minimum 1
      */
-    id: number;
+    id: SkillIdentifier;
     /**
      * The points that gets added to the skill's rating.
      * @integer
@@ -163,7 +187,7 @@ export declare type AttributeAnimalPower = {
      * @integer
      * @minimum 1
      */
-    id: number;
+    id: AttributeIdentifier;
     /**
      * The value that gets added to the attribute.
      * @integer

package/lib/types/Profession.d.ts

@@ -4,7 +4,8 @@
 import { Errata } from "./source/_Erratum.js";
 import { PublicationRefs } from "./source/_PublicationRef.js";
 import { CommonnessRatedAdvantageDisadvantage } from "./_CommonnessRatedAdvantageDisadvantage.js";
-import { CombatTechniqueIdentifier, LiturgyIdentifier, MagicalActionIdentifier, RequirableSelectOptionIdentifier, SpecialAbilityIdentifier, SpellworkIdentifier } from "./_Identifier.js";
+import { AdvantageIdentifier, DisadvantageIdentifier, SkillIdentifier } from "./_Identifier.js";
+import { CombatTechniqueIdentifier, LiturgyIdentifier, MagicalActionIdentifier, RequirableSelectOptionIdentifier, SpecialAbilityIdentifier, SpellworkIdentifier } from "./_IdentifierGroup.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { NonEmptyString } from "./_NonEmptyString.js";
 import { ProfessionPrerequisites } from "./_Prerequisite.js";
@@ -158,24 +159,24 @@ export declare type ProfessionPackage = {
      * Typical advantages for the profession.
      * @minItems 1
      */
-    suggested_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    suggested_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * Typical disadvantages for the profession.
      * @minItems 1
      */
-    suggested_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    suggested_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * These advantages do not fit well with this profession; to be checked with
      * the GM before taking any of them.
      * @minItems 1
      */
-    unsuitable_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    unsuitable_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * These disadvantages do not fit well with this profession; to be checked
      * with the GM before taking any of them.
      * @minItems 1
      */
-    unsuitable_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    unsuitable_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * Provides examples of variants for the profession, which may include changes
      * to AP values and additional or modified skill ratings, special abilities,
@@ -375,7 +376,7 @@ export declare type SkillRating = {
      * @minimum 1
      * @maximum 59
      */
-    id: number;
+    id: SkillIdentifier;
     /**
      * The rating bonus provided for the skill. If used in a profession variant,
      * it can also be used to lower the bonus of the base profession

package/lib/types/Race.d.ts

@@ -5,6 +5,7 @@ import { Errata } from "./source/_Erratum.js";
 import { PublicationRefs } from "./source/_PublicationRef.js";
 import { CommonnessRatedAdvantageDisadvantage } from "./_CommonnessRatedAdvantageDisadvantage.js";
 import { Dice } from "./_Dice.js";
+import { AdvantageIdentifier, DisadvantageIdentifier, ExperienceLevelIdentifier } from "./_Identifier.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { NonEmptyString } from "./_NonEmptyString.js";
 import { AdvantageReference, AttributeReference, CultureReference, EyeColorReference, HairColorReference } from "./_SimpleReferences.js";
@@ -45,40 +46,40 @@ export declare type Race = {
      * A list of strongly recommended advantages.
      * @minItems 1
      */
-    strongly_recommended_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    strongly_recommended_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * A list of strongly recommended disadvantages.
      * @minItems 1
      */
-    strongly_recommended_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    strongly_recommended_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * A list of common advantages. If common advantages are defined by race
      * variants, leave this field empty. It is overridden by the same field in
      * race variants.
      * @minItems 1
      */
-    common_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    common_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * A list of common disadvantages. If common disadvantages are defined by race
      * variants, leave this field empty. It is overridden by the same field in
      * race variants.
      * @minItems 1
      */
-    common_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    common_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * A list of uncommon advantages. If uncommon advantages are defined by race
      * variants, leave this field empty. It is overridden by the same field in
      * race variants.
      * @minItems 1
      */
-    uncommon_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    uncommon_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * A list of uncommon disadvantages. If uncommon disadvantages are defined by
      * race variants, leave this field empty. It is overridden by the same field
      * in race variants.
      * @minItems 1
      */
-    uncommon_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    uncommon_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * Configuration for random weight generation.
      */
@@ -193,11 +194,8 @@ export declare enum WeightDiceOffsetStrategy {
 export declare type StartingAgeConfigForExperienceLevel = {
     /**
      * The selected experience level's identifier.
-     * @integer
-     * @minimum 1
-     * @maximum 7
      */
-    experience_level_id: number;
+    experience_level_id: ExperienceLevelIdentifier;
     /**
      * The base value for the selected experience level.
      * @integer
@@ -271,22 +269,22 @@ export declare type RaceVariant = {
      * A list of common advantages. If common advantages are defined by the base race, leave this field empty. This field overrides the same field of the base race, if both are defined.
      * @minItems 1
      */
-    common_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    common_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * A list of common disadvantages. If common disadvantages are defined by the base race, leave this field empty. This field overrides the same field of the base race, if both are defined.
      * @minItems 1
      */
-    common_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    common_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * A list of uncommon advantages. If uncommon advantages are defined by the base race, leave this field empty. This field overrides the same field of the base race, if both are defined.
      * @minItems 1
      */
-    uncommon_advantages?: CommonnessRatedAdvantageDisadvantage[];
+    uncommon_advantages?: CommonnessRatedAdvantageDisadvantage<AdvantageIdentifier>[];
     /**
      * A list of uncommon disadvantages. If uncommon disadvantages are defined by the base race, leave this field empty. This field overrides the same field of the base race, if both are defined.
      * @minItems 1
      */
-    uncommon_disadvantages?: CommonnessRatedAdvantageDisadvantage[];
+    uncommon_disadvantages?: CommonnessRatedAdvantageDisadvantage<DisadvantageIdentifier>[];
     /**
      * An array containing 20 (numeric) hair color identifiers. The array also represents the 20-sided die for a random hair color.
      * @minItems 20

package/lib/types/TargetCategory.d.ts

@@ -1,6 +1,7 @@
 /**
  * @main TargetCategory
  */
+import { TargetCategoryIdentifier } from "./_Identifier.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { NonEmptyString } from "./_NonEmptyString.js";
 /**
@@ -28,10 +29,8 @@ export declare type TargetCategory = {
 export declare type TargetCategoryParent = {
     /**
      * The identifier of the superordinate target category.
-     * @integer
-     * @minimum 1
      */
-    id: number;
+    id: TargetCategoryIdentifier;
 };
 export declare type TargetCategoryTranslation = {
     /**

package/lib/types/_Activatable.d.ts

@@ -7,7 +7,8 @@ import { Errata } from "./source/_Erratum.js";
 import { PublicationRefs } from "./source/_PublicationRef.js";
 import { SelectOptionCategory, SkillApplicationOrUse } from "./_ActivatableSelectOptionCategory.js";
 import { DurationUnitValue } from "./_ActivatableSkillDuration.js";
-import { AdvancedSpecialAbilityRestrictedOptionIdentifier, CombatRelatedSpecialAbilityIdentifier, CombatTechniqueIdentifier, MagicalTraditionIdentifier, PatronIdentifier, VolumePointsOptionReferenceIdentifier } from "./_Identifier.js";
+import { MagicalTraditionIdentifier, PatronIdentifier, SkillIdentifier } from "./_Identifier.js";
+import { AdvancedSpecialAbilityRestrictedOptionIdentifier, CombatRelatedSpecialAbilityIdentifier, CombatTechniqueIdentifier, VolumePointsOptionReferenceIdentifier } from "./_IdentifierGroup.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { NonEmptyMarkdown, NonEmptyString } from "./_NonEmptyString.js";
 import { GeneralPrerequisites } from "./_Prerequisite.js";
@@ -162,7 +163,7 @@ export declare type ExplicitSkillSelectOption = {
      * @integer
      * @minimum 1
      */
-    id: number;
+    id: SkillIdentifier;
     /**
      * Registers new applications, which get enabled once this entry is
      * activated with its respective select option. It specifies an entry-unique
@@ -1026,26 +1027,24 @@ export declare type Aspect = AspectReference;
 /**
  * A reference to an advanced special ability.
  */
-export declare type AdvancedSpecialAbility = {
+export declare type AdvancedSpecialAbility<Identifier> = {
     tag: "General";
-    general: AdvancedSpecialAbilityReference;
+    general: AdvancedSpecialAbilityReference<Identifier>;
 } | {
     tag: "RestrictOptions";
-    restrict_options: RestrictAdvancedSpecialAbilityOptions;
+    restrict_options: RestrictAdvancedSpecialAbilityOptions<Identifier>;
 } | {
     tag: "OneOf";
-    one_of: OneOfAdvancedSpecialAbilityOptions;
+    one_of: OneOfAdvancedSpecialAbilityOptions<Identifier>;
 } | {
     tag: "DeriveFromExternalOption";
-    derive_from_external_option: AdvancedSpecialAbilityDerivedFromExternalOption;
+    derive_from_external_option: AdvancedSpecialAbilityDerivedFromExternalOption<Identifier>;
 };
-export declare type RestrictAdvancedSpecialAbilityOptions = {
+export declare type RestrictAdvancedSpecialAbilityOptions<Identifier> = {
     /**
-     * The advanced special ability's numeric identifier.
-     * @integer
-     * @minimum 1
+     * The advanced special ability’s identifier.
      */
-    id: number;
+    id: Identifier;
     /**
      * Specify the select option(s) that only are allowed for the referenced
      * advanced special ability; others are disallowed.
@@ -1053,11 +1052,11 @@ export declare type RestrictAdvancedSpecialAbilityOptions = {
      */
     option: AdvancedSpecialAbilityRestrictedOptionIdentifier[];
 };
-export declare type OneOfAdvancedSpecialAbilityOptions = {
+export declare type OneOfAdvancedSpecialAbilityOptions<Identifier> = {
     /**
      * The possible advanced special abilities.
      */
-    options: AdvancedSpecialAbilityReference;
+    options: AdvancedSpecialAbilityReference<Identifier>;
     /**
      * Do have to choose the advanced special ability when buying the style
      * special ability? Otherwise the decision can be made later.
@@ -1065,7 +1064,7 @@ export declare type OneOfAdvancedSpecialAbilityOptions = {
     is_selection_required_on_purchase: boolean;
     display_option?: DisplayOption;
 };
-export declare type AdvancedSpecialAbilityDerivedFromExternalOption = {
+export declare type AdvancedSpecialAbilityDerivedFromExternalOption<Identifier> = {
     /**
      * The possible advanced special abilities.
      */
@@ -1074,7 +1073,7 @@ export declare type AdvancedSpecialAbilityDerivedFromExternalOption = {
      * Map options from the external entry to allowed advanced special abilities.
      * @minItems 1
      */
-    map: AdvancedSpecialAbilityDerivedFromExternalOptionMapping[];
+    map: AdvancedSpecialAbilityDerivedFromExternalOptionMapping<Identifier>[];
     display_option?: DisplayOption;
 };
 /**
@@ -1082,7 +1081,7 @@ export declare type AdvancedSpecialAbilityDerivedFromExternalOption = {
  * ability.
  * @minItems 1
  */
-export declare type AdvancedSpecialAbilityDerivedFromExternalOptionMapping = {
+export declare type AdvancedSpecialAbilityDerivedFromExternalOptionMapping<Identifier> = {
     /**
      * The select option's identifier.
      */
@@ -1090,7 +1089,7 @@ export declare type AdvancedSpecialAbilityDerivedFromExternalOptionMapping = {
     /**
      * The advanced special ability's identifier.
      */
-    to_advanced: AdvancedSpecialAbilityReference;
+    to_advanced: AdvancedSpecialAbilityReference<Identifier>;
 };
 export declare type AdvancedSpecialAbilityDerivedExternalEntryId = MagicalTraditionIdentifier;
 export declare type AdvancedSpecialAbilityDerivedExternalEntryOptionId = PatronIdentifier;
@@ -1101,10 +1100,10 @@ export declare type AdvancedSpecialAbilityDerivedExternalEntryOptionId = PatronI
  * be that you can choose from a set of special abilities, but then you can't
  * specify an option.
  */
-export declare type AdvancedSpecialAbilities = [
-    AdvancedSpecialAbility,
-    AdvancedSpecialAbility,
-    AdvancedSpecialAbility
+export declare type AdvancedSpecialAbilities<Identifier> = [
+    AdvancedSpecialAbility<Identifier>,
+    AdvancedSpecialAbility<Identifier>,
+    AdvancedSpecialAbility<Identifier>
 ];
 export declare type ApplicableCombatTechniques = {
     tag: "None";

package/lib/types/_ActivatableSelectOptionCategory.d.ts

@@ -1,4 +1,4 @@
-import { ActivatableIdentifier, CombatTechniqueIdentifier, SkillIdentifier } from "./_Identifier.js";
+import { ActivatableIdentifier, CombatTechniqueIdentifier, SkillIdentifier } from "./_IdentifierGroup.js";
 import { LocaleMap } from "./_LocaleMap.js";
 import { CeremonyReference, CloseCombatTechniqueReference, ElementReference, LiturgicalChantReference, RangedCombatTechniqueReference, RitualReference, SkillGroupReference, SpellReference } from "./_SimpleReferences.js";
 export declare type SelectOptionCategory = {