@optolith/database-schema 0.76.0 → 0.77.1

package/lib/types/equipment/item/TravelGearOrTool.js

@@ -41,7 +41,7 @@ export const TravelGearOrTool = DB.Entity(import.meta.url, {
             return checkWeaponCombatTechniqueIntegrity({
                 ...rest,
                 instanceContent: instanceContent.combat_use.Weapon,
-            }, { secondary: true });
+            });
         }
         return [];
     },

package/lib/types/equipment/item/Weapon.js

@@ -97,7 +97,7 @@ export const Weapon = DB.Entity(import.meta.url, {
             keyPathInEntityMap: "name",
         },
     ],
-    customConstraints: params => checkWeaponCombatTechniqueIntegrity(params, { secondary: false }),
+    customConstraints: params => checkWeaponCombatTechniqueIntegrity(params),
 });
 export const ImprovisedWeapon = DB.TypeAlias(import.meta.url, {
     name: "ImprovisedWeapon",

package/lib/types/equipment/item/WeaponAccessory.js

@@ -41,7 +41,7 @@ export const WeaponAccessory = DB.Entity(import.meta.url, {
             return checkWeaponCombatTechniqueIntegrity({
                 ...rest,
                 instanceContent: instanceContent.combat_use.Weapon,
-            }, { secondary: true });
+            });
         }
         return [];
     },

package/lib/types/equipment/item/_Item.js

@@ -48,7 +48,7 @@ export const DefaultItem = (sourceUrl, singularName, pluralName) => DB.Entity(so
             return checkWeaponCombatTechniqueIntegrity({
                 ...rest,
                 instanceContent: combatUse.Weapon,
-            }, { secondary: true });
+            });
         }
         return [];
     },

package/lib/types/equipment/item/_Weapon.d.ts

@@ -16,10 +16,10 @@ export declare const Length: DB.TypeAlias<"Length", DB.Integer, []>;
 export declare const checkWeaponCombatTechniqueIntegrity: ({ instanceContent, getInstanceById, getDisplayNameAndId, }: {
     instanceContent: {
         melee_uses?: Record<string, GenMeleeWeapon<unknown>>;
+        meleeUses?: Record<string, GenMeleeWeapon<unknown>>;
         ranged_uses?: Record<string, GenRangedWeapon<unknown>>;
+        rangedUses?: Record<string, GenRangedWeapon<unknown>>;
     };
     getInstanceById: GetInstanceById;
     getDisplayNameAndId: GetDisplayNameAndId;
-}, { secondary: _secondary }: {
-    secondary: boolean;
 }) => string[];

package/lib/types/equipment/item/_Weapon.js

@@ -47,15 +47,18 @@ export const Length = DB.TypeAlias(import.meta.url, {
     comment: "The length of the weapon in cm/halffingers.",
     type: () => DB.Integer({ minimum: 1 }),
 });
-export const checkWeaponCombatTechniqueIntegrity = ({ instanceContent, getInstanceById, getDisplayNameAndId, }, { secondary: _secondary }) => {
+export const checkWeaponCombatTechniqueIntegrity = ({ instanceContent, getInstanceById, getDisplayNameAndId, }) => {
     const checkPart = (rule, value, name, type, id) => (rule.kind === "Prohibited") === (value === undefined) || rule.kind === "Optional"
         ? undefined
         : `${name} must${rule.kind === "Required" ? "" : " not"} be provided for ${type} combat technique ${getDisplayNameAndId(type === "close" ? "CloseCombatTechnique" : "RangedCombatTechnique", id)}`;
     return [
-        instanceContent.melee_uses === undefined && instanceContent.ranged_uses === undefined
+        instanceContent.melee_uses === undefined &&
+            instanceContent.ranged_uses === undefined &&
+            instanceContent.meleeUses === undefined &&
+            instanceContent.rangedUses === undefined
             ? "either melee uses or ranged uses have to be provided"
             : undefined,
-        ...Object.entries(instanceContent.melee_uses ?? {}).flatMap(([ctId, meleeUse]) => {
+        ...Object.entries(instanceContent.melee_uses ?? instanceContent.meleeUses ?? {}).flatMap(([ctId, meleeUse]) => {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- integrity has been checked, it must be present
             const ct = getInstanceById("CloseCombatTechnique", ctId);
             return [
@@ -66,7 +69,7 @@ export const checkWeaponCombatTechniqueIntegrity = ({ instanceContent, getInstan
                 checkPart(ct.special.has_shield_size, meleeUse.size, "a shield size", "close", ctId),
             ];
         }),
-        ...Object.entries(instanceContent.ranged_uses ?? {}).flatMap(([ctId, rangedUse]) => {
+        ...Object.entries(instanceContent.ranged_uses ?? instanceContent.rangedUses ?? {}).flatMap(([ctId, rangedUse]) => {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- integrity has been checked, it must be present
             const ct = getInstanceById("RangedCombatTechnique", ctId);
             return [

package/lib/types/equipment/item/sub/Reach.js

@@ -16,9 +16,7 @@ export const Reach = DB.Entity(import.meta.url, {
         })),
     }),
     instanceDisplayName: {},
-    sortOrder: {
-        keyPath: "position",
-    },
+    sortOrder: { keyPath: "position", isIndex: true },
     uniqueConstraints: [
         {
             entityMapKeyPath: "translations",

package/lib/types/index.d.ts

@@ -28,12 +28,14 @@ export { Clothes } from "./equipment/item/Clothes.js";
 export { ClothingPackage } from "./equipment/item/ClothingPackage.js";
 export { Container } from "./equipment/item/Container.js";
 export { Elixir } from "./equipment/item/Elixir.js";
+export { EquipmentCategory } from "./equipment/item/EquipmentCategory.ts";
 export { EquipmentOfBlessedOnes } from "./equipment/item/EquipmentOfBlessedOnes.js";
 export { GemOrPreciousStone } from "./equipment/item/GemOrPreciousStone.js";
 export { HerbalAid } from "./equipment/item/HerbalAid.js";
 export { HerbalPreservation } from "./equipment/item/HerbalPreservation.js";
 export { IlluminationLightSource } from "./equipment/item/IlluminationLightSource.js";
 export { IlluminationRefillOrSupply } from "./equipment/item/IlluminationRefillOrSupply.js";
+export { Item } from "./equipment/item/Item.js";
 export { Jewelry } from "./equipment/item/Jewelry.js";
 export { Laboratory } from "./equipment/item/Laboratory.js";
 export { Liebesspielzeug } from "./equipment/item/Liebesspielzeug.js";

package/lib/types/index.js

@@ -28,12 +28,14 @@ export { Clothes } from "./equipment/item/Clothes.js";
 export { ClothingPackage } from "./equipment/item/ClothingPackage.js";
 export { Container } from "./equipment/item/Container.js";
 export { Elixir } from "./equipment/item/Elixir.js";
+export { EquipmentCategory } from "./equipment/item/EquipmentCategory.js";
 export { EquipmentOfBlessedOnes } from "./equipment/item/EquipmentOfBlessedOnes.js";
 export { GemOrPreciousStone } from "./equipment/item/GemOrPreciousStone.js";
 export { HerbalAid } from "./equipment/item/HerbalAid.js";
 export { HerbalPreservation } from "./equipment/item/HerbalPreservation.js";
 export { IlluminationLightSource } from "./equipment/item/IlluminationLightSource.js";
 export { IlluminationRefillOrSupply } from "./equipment/item/IlluminationRefillOrSupply.js";
+export { Item } from "./equipment/item/Item.js";
 export { Jewelry } from "./equipment/item/Jewelry.js";
 export { Laboratory } from "./equipment/item/Laboratory.js";
 export { Liebesspielzeug } from "./equipment/item/Liebesspielzeug.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optolith/database-schema",
-  "version": "0.76.0",
+  "version": "0.77.1",
   "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",
@@ -39,20 +39,20 @@
   "license": "MPL-2.0",
   "dependencies": {
     "@elyukai/utils": "^0.3.6",
-    "tsondb": "^0.21.2",
-    "yaml": "^2.9.0"
+    "tsondb": "^0.21.4",
+    "yaml": "^2.9.1"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/node": "^26.5.0",
-    "commit-and-tag-version": "^13.1.2",
-    "eslint": "^10.10.0",
-    "globals": "^17.12.0",
+    "@types/node": "^26.6.4",
+    "commit-and-tag-version": "^13.2.1",
+    "eslint": "^10.12.0",
+    "globals": "^17.13.0",
     "nodemon": "^3.1.14",
-    "prettier": "^3.9.6",
+    "prettier": "^3.9.9",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-7": "npm:typescript@^7.0.2",
-    "typescript-eslint": "^8.70.0"
+    "typescript-eslint": "^8.71.0"
   },
   "repository": "github:Optolith/database-schema",
   "bugs": {