@optolith/database-schema 0.52.2 → 0.54.0

package/lib/cache/activatableSelectOptions.js

@@ -5,12 +5,13 @@ import { compareNullish, compareNumber } from "@elyukai/utils/ordering";
 import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { Case, fromUniformCase } from "tsondb/schema/gen";
 const wrapPlainApValue = (apValue) => apValue === undefined ? undefined : Case("Fixed", apValue);
-const matchesSpecificSkillishIdList = (id, config) => {
+const matchesSpecificSkillishIdList = (config, matches) => {
+    const isInList = config.list.some(matches);
     switch (config.operation.kind) {
         case "Intersection":
-            return config.list.includes(id);
+            return isInList;
         case "Difference":
-            return !config.list.includes(id);
+            return !isInList;
         default:
             return assertExhaustive(config.operation);
     }
@@ -112,9 +113,24 @@ const getDefaultSkillishFilter = (category) => {
     const { specific } = category;
     return specific === undefined
         ? undefined
-        : ({ id }) => matchesSpecificSkillishIdList(id, specific);
+        : ({ id }) => matchesSpecificSkillishIdList(specific, required => required === id);
 };
-const getDerivedSkillishSelectOptions = (database, entryId, entity, category, options, filter = getDefaultSkillishFilter(category)) => {
+const getSpellworkFilter = (category) => {
+    const { specific } = category;
+    return specific === undefined
+        ? undefined
+        : ({ id, content: { property } }) => matchesSpecificSkillishIdList(specific, required => {
+            switch (required.kind) {
+                case "Single":
+                    return required.Single === id;
+                case "Property":
+                    return property === required.Property;
+                default:
+                    return assertExhaustive(required);
+            }
+        });
+};
+const getDerivedSkillishSelectOptions = (database, entryId, entity, category, options, filter) => {
     const { prerequisites } = category;
     const { bindingCost, ap_value } = options;
     const instances = database.getAllInstanceContainersOfEntity(entity);
@@ -625,17 +641,17 @@ const getDerivedSelectOptions = (selectOptionCategory, entryId, database, idMap)
                             const matchesGroupRequirement = category.Skills.groups === undefined ||
                                 category.Skills.groups.some(ref => ref === content.group);
                             const matchesIdRequirement = category.Skills.specific === undefined ||
-                                matchesSpecificSkillishIdList(id, category.Skills.specific);
+                                matchesSpecificSkillishIdList(category.Skills.specific, required => required === id);
                             return matchesGroupRequirement && matchesIdRequirement;
                         });
                     case "Spells":
-                        return getDerivedSkillishSelectOptions(database, entryId, "Spell", category.Spells, selectOptionCategory.Skills);
+                        return getDerivedSkillishSelectOptions(database, entryId, "Spell", category.Spells, selectOptionCategory.Skills, getSpellworkFilter(category.Spells));
                     case "Rituals":
-                        return getDerivedSkillishSelectOptions(database, entryId, "Ritual", category.Rituals, selectOptionCategory.Skills);
+                        return getDerivedSkillishSelectOptions(database, entryId, "Ritual", category.Rituals, selectOptionCategory.Skills, getSpellworkFilter(category.Rituals));
                     case "LiturgicalChants":
-                        return getDerivedSkillishSelectOptions(database, entryId, "LiturgicalChant", category.LiturgicalChants, selectOptionCategory.Skills);
+                        return getDerivedSkillishSelectOptions(database, entryId, "LiturgicalChant", category.LiturgicalChants, selectOptionCategory.Skills, getDefaultSkillishFilter(category.LiturgicalChants));
                     case "Ceremonies":
-                        return getDerivedSkillishSelectOptions(database, entryId, "Ceremony", category.Ceremonies, selectOptionCategory.Skills);
+                        return getDerivedSkillishSelectOptions(database, entryId, "Ceremony", category.Ceremonies, selectOptionCategory.Skills, getDefaultSkillishFilter(category.Ceremonies));
                     default:
                         return assertExhaustive(category);
                 }
@@ -644,9 +660,9 @@ const getDerivedSelectOptions = (selectOptionCategory, entryId, database, idMap)
             return selectOptionCategory.CombatTechniques.categories.flatMap(category => {
                 switch (category.kind) {
                     case "CloseCombatTechniques":
-                        return getDerivedSkillishSelectOptions(database, entryId, "CloseCombatTechnique", category.CloseCombatTechniques, selectOptionCategory.CombatTechniques);
+                        return getDerivedSkillishSelectOptions(database, entryId, "CloseCombatTechnique", category.CloseCombatTechniques, selectOptionCategory.CombatTechniques, getDefaultSkillishFilter(category.CloseCombatTechniques));
                     case "RangedCombatTechniques":
-                        return getDerivedSkillishSelectOptions(database, entryId, "RangedCombatTechnique", category.RangedCombatTechniques, selectOptionCategory.CombatTechniques);
+                        return getDerivedSkillishSelectOptions(database, entryId, "RangedCombatTechnique", category.RangedCombatTechniques, selectOptionCategory.CombatTechniques, getDefaultSkillishFilter(category.RangedCombatTechniques));
                     default:
                         return assertExhaustive(category);
                 }