Move utils to a dedicated directory

jest.config.js

@@ -12,6 +12,7 @@ module.exports = {
  "^@module/(.*)$": "<rootDir>/src/module/$1",
  "^@scripts/(.*)$": "<rootDir>/src/scripts/$1",
  "^@system/(.*)$": "<rootDir>/src/module/system/$1",
+ "^@util$": "<rootDir>/src/util",
  },
  setupFiles: ["./tests/setup.ts"],
  globals: {

packs/scripts/extract.ts

@@ -6,7 +6,7 @@ import yargs from "yargs";
 import { JSDOM } from "jsdom";
 import type { ActorPF2e } from "@actor/base";
 import type { ItemPF2e } from "@item/base";
-import { sluggify } from "@module/utils";
+import { sluggify } from "@util";
 import systemJSON from "system.json";
 import templateJSON from "static/template.json";
 

packs/scripts/packman/compendium-pack.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import * as path from "path";
-import { sluggify } from "@module/utils";
+import { sluggify } from "@util";
 import { ItemSourcePF2e } from "@item/data";
 import { isPhysicalData } from "@item/data/helpers";
 import { MigrationRunnerBase } from "@module/migration/runner/base";

src/module/actor/base.ts

@@ -4,7 +4,7 @@ import { DicePF2e } from "@scripts/dice";
 import { ItemPF2e, SpellcastingEntryPF2e, PhysicalItemPF2e, ContainerPF2e } from "@item";
 import type { ConditionPF2e, ArmorPF2e } from "@item";
 import { ConditionData, WeaponData, ItemSourcePF2e, ItemType } from "@item/data";
-import { ErrorPF2e, objectHasKey } from "@module/utils";
+import { ErrorPF2e, objectHasKey } from "@util";
 import type { ActiveEffectPF2e } from "@module/active-effect";
 import { LocalizePF2e } from "@module/system/localize";
 import { ItemTransfer } from "./item-transfer";

src/module/actor/character/index.ts

@@ -34,7 +34,7 @@ import {
  RuleElementSynthetics,
  WeaponPotencyPF2e,
 } from "@module/rules/rules-data-definitions";
-import { ErrorPF2e, toNumber } from "@module/utils";
+import { ErrorPF2e, toNumber } from "@util";
 import { AncestryPF2e, BackgroundPF2e, ClassPF2e, ConsumablePF2e, FeatPF2e, WeaponPF2e } from "@item";
 import { CreaturePF2e } from "../index";
 import { LocalizePF2e } from "@module/system/localize";

src/module/actor/character/sheet.ts

@@ -11,7 +11,7 @@ import { goesToEleven, ZeroToThree } from "@module/data";
 import { CharacterPF2e } from ".";
 import { CreatureSheetPF2e } from "../creature/sheet";
 import { ManageCombatProficiencies } from "../sheet/popups/manage-combat-proficiencies";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { LorePF2e } from "@item";
 import { AncestryBackgroundClassManager } from "@item/abc/abc-manager";
 import { CharacterProficiency } from "./data";

src/module/actor/creature/index.ts

@@ -23,7 +23,7 @@ import { LightLevels } from "@module/scene/data";
 import { Statistic, StatisticBuilder } from "@system/statistic";
 import { MeasuredTemplatePF2e, TokenPF2e } from "@module/canvas";
 import { TokenDocumentPF2e } from "@scene";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { PredicatePF2e, RawPredicate } from "@system/predication";
 
 /** An "actor" in a Pathfinder sense rather than a Foundry one: all should contain attributes and abilities */

src/module/actor/creature/sheet.ts

@@ -3,7 +3,7 @@ import { ActorSheetPF2e } from "../sheet/base";
 import { LocalizePF2e } from "@module/system/localize";
 import { ConsumablePF2e, SpellPF2e, SpellcastingEntryPF2e } from "@item";
 import { CreaturePF2e } from "@actor";
-import { ErrorPF2e, objectHasKey } from "@module/utils";
+import { ErrorPF2e, objectHasKey } from "@util";
 import { BaseWeaponType, WeaponGroup } from "@item/weapon/data";
 import { ZeroToFour } from "@module/data";
 import { SkillData } from "./data";

src/module/actor/hazard/sheet.ts

@@ -1,5 +1,5 @@
 import { ActorSheetPF2e } from "../sheet/base";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { HazardPF2e } from ".";
 import { ConsumablePF2e, SpellPF2e } from "@item";
 import { ItemDataPF2e } from "@item/data";

src/module/actor/item-transfer.ts

@@ -1,7 +1,7 @@
 import { PhysicalItemPF2e } from "@item/index";
 import { LocalizePF2e } from "@module/system/localize";
 import { UserPF2e } from "@module/user";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { ActorPF2e } from "./index";
 
 export interface ItemTransferData {

src/module/actor/loot/index.ts

@@ -2,7 +2,7 @@ import { ActorPF2e } from "@actor/base";
 import { PhysicalItemPF2e } from "@item/physical";
 import { ItemPF2e } from "@item/base";
 import { addCoins, attemptToRemoveCoinsByValue, extractPriceFromItem } from "@item/treasure/helpers";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { UserPF2e } from "@module/user";
 import { LootData, LootSource } from "./data";
 import { ActiveEffectPF2e } from "@module/active-effect";

src/module/actor/npc/index.ts

@@ -14,7 +14,7 @@ import { RollParameters } from "@system/rolls";
 import { CreaturePF2e, ActorPF2e } from "@actor";
 import { MeleeData } from "@item/data";
 import { DamageType } from "@module/damage-calculation";
-import { sluggify } from "@module/utils";
+import { sluggify } from "@util";
 import { SpellAttackRollModifier, SpellDifficultyClass } from "@item/spellcasting-entry/data";
 import { Rarity } from "@module/data";
 import { NPCData, NPCStrike } from "./data";

src/module/actor/npc/legacy-edit-sheet.ts

@@ -3,7 +3,7 @@ import { SKILL_DICTIONARY } from "@actor/data/values";
 import { NPCPF2e } from ".";
 import { identifyCreature } from "@module/recall-knowledge";
 import { RecallKnowledgePopup } from "../sheet/popups/recall-knowledge-popup";
-import { getActionIcon, objectHasKey } from "@module/utils";
+import { getActionIcon, objectHasKey } from "@util";
 import { ConsumablePF2e, SpellPF2e } from "@item";
 import { SpellcastingSheetData } from "./sheet";
 import { ItemDataPF2e } from "@item/data";

src/module/actor/npc/sheet.ts

@@ -19,7 +19,7 @@ import {
  TreasureData,
  WeaponData,
 } from "@item/data";
-import { ErrorPF2e, objectHasKey } from "@module/utils";
+import { ErrorPF2e, objectHasKey } from "@util";
 import { ActorSheetDataPF2e, InventoryItem, SheetInventory } from "../sheet/data-types";
 import { LabeledString, ValuesList, ZeroToEleven } from "@module/data";
 import { NPCAttributes, NPCSkillData, NPCStrike, NPCSystemData } from "./data";

src/module/actor/sheet/base.ts

@@ -24,7 +24,7 @@ import {
  SELECTABLE_TAG_FIELDS,
  TagSelectorOptions,
 } from "@module/system/trait-selector";
-import { ErrorPF2e, objectHasKey, tupleHasValue } from "@module/utils";
+import { ErrorPF2e, objectHasKey, tupleHasValue } from "@util";
 import { LocalizePF2e } from "@system/localize";
 import type { ActorPF2e } from "../base";
 import { SKILL_DICTIONARY } from "@actor/data/values";

src/module/actor/sheet/loot/loot-npcs-popup.ts

@@ -1,6 +1,6 @@
 import { ActorPF2e } from "@actor/base";
 import { PhysicalItemSource } from "@item/data";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 
 interface PopupData extends FormApplicationData<ActorPF2e> {
  tokenInfo: Array<{

src/module/actor/sheet/popups/identify-popup.ts

@@ -1,6 +1,6 @@
 import { identifyItem, IdentifyAlchemyDCs, IdentifyMagicDCs } from "@item/identification";
 import { PhysicalItemPF2e } from "@item/physical";
-import { tupleHasValue } from "@module/utils";
+import { tupleHasValue } from "@util";
 
 export class IdentifyItemPopup extends FormApplication<PhysicalItemPF2e> {
  static override get defaultOptions(): FormApplicationOptions {

src/module/actor/sheet/popups/recall-knowledge-popup.ts

@@ -1,5 +1,5 @@
 import { IdentifyCreatureData } from "@module/recall-knowledge";
-import { padArray } from "@module/utils";
+import { padArray } from "@util";
 
 export class RecallKnowledgePopup extends Application {
  static override get defaultOptions() {

src/module/actor/sheet/popups/scroll-wand-popup.ts

@@ -1,6 +1,6 @@
 import { ActorPF2e } from "@actor/index";
 import { SpellSource } from "@item/spell/data";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 
 export class ScrollWandPopup extends FormApplication<ActorPF2e> {
  onSubmitCallback: ScrollWandCallback;

src/module/actor/sheet/trick-magic-item-popup.ts

@@ -6,7 +6,7 @@ import {
 import type { ConsumablePF2e } from "@item";
 import { CharacterPF2e } from "@actor";
 import { LocalizePF2e } from "@module/system/localize";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { SKILL_DICTIONARY } from "@actor/data/values";
 
 type TrickMagicItemSkill = TrickMagicItemPopup["SKILLS"][number];

src/module/apps/compendium-browser/index.ts

@@ -3,7 +3,7 @@ import { PhysicalItemPF2e } from "@item/physical";
 import { KitPF2e } from "@item/kit";
 import { MagicSchool } from "@item/spell/data";
 import { coinValueInCopper, extractPriceFromItem } from "@item/treasure/helpers";
-import { ErrorPF2e, tupleHasValue } from "@module/utils";
+import { ErrorPF2e, tupleHasValue } from "@util";
 import { ActorPF2e, FamiliarPF2e } from "@actor";
 import { LocalizePF2e } from "@system/localize";
 

src/module/apps/ui/compendium-directory/index.ts

@@ -1,5 +1,5 @@
 import { LocalizePF2e } from "@module/system/localize";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { PackFolderPF2e } from "./folder";
 
 type FolderName = keyof typeof LocalizePF2e.translations.PF2E.CompendiumDirectory.Folders;

src/module/damage-calculation.ts

@@ -1,7 +1,7 @@
 import { Alignment } from "@actor/creature/data";
 import { ModeOfBeing } from "@actor/data";
 import { isChaotic, isEvil, isGood, isLawful } from "./alignment";
-import { groupBy, sum } from "./utils";
+import { groupBy, sum } from "../util";
 
 const physicalDamageTypes = ["bludgeoning", "piercing", "slashing", "bleed"] as const;
 const lifeEnergyDamageTypes = ["positive", "negative"] as const;

src/module/item/abc/abc-manager.ts

@@ -3,7 +3,7 @@ import { AncestrySource, BackgroundSource, ClassSource, ItemSourcePF2e } from "@
 import { ABCFeatureEntryData } from "@item/abc/data";
 import { CharacterPF2e } from "@actor/index";
 import type { FeatSource } from "@item/feat/data";
-import { ErrorPF2e, sluggify } from "@module/utils";
+import { ErrorPF2e, sluggify } from "@util";
 
 export interface ABCManagerOptions {
  assurance?: string[];

src/module/item/ancestry/index.ts

@@ -3,7 +3,7 @@ import { CharacterPF2e } from "@actor";
 import { Size } from "@module/data";
 import { ABCItemPF2e } from "../abc";
 import { AncestryData } from "./data";
-import { sluggify } from "@module/utils";
+import { sluggify } from "@util";
 
 export class AncestryPF2e extends ABCItemPF2e {
  static override get schema(): typeof AncestryData {

src/module/item/armor/index.ts

@@ -1,6 +1,6 @@
 import { MAGIC_TRADITIONS } from "@item/spell/data";
 import { LocalizePF2e } from "@module/system/localize";
-import { addSign } from "@module/utils";
+import { addSign } from "@util";
 import { PhysicalItemPF2e } from "../physical";
 import { getArmorBonus } from "../runes";
 import { ArmorCategory, ArmorData, ArmorGroup, BaseArmorType } from "./data";

src/module/item/base.ts

@@ -6,7 +6,7 @@ import {
  ProficiencyModifier,
  StatisticModifier,
 } from "@module/modifiers";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { DicePF2e } from "@scripts/dice";
 import { ActorPF2e } from "@actor";
 import { RuleElementPF2e, RuleElements } from "../rules/rules";

src/module/item/class/index.ts

@@ -4,7 +4,7 @@ import { ARMOR_CATEGORIES } from "@item/armor/data";
 import { FeatPF2e } from "@item/feat";
 import { WEAPON_CATEGORIES } from "@item/weapon/data";
 import { ZeroToFour } from "@module/data";
-import { sluggify } from "@module/utils";
+import { sluggify } from "@util";
 import { ABCItemPF2e } from "../abc";
 import { ClassData, ClassTrait } from "./data";
 

src/module/item/consumable/index.ts

@@ -2,7 +2,7 @@ import { LocalizePF2e } from "@module/system/localize";
 import { ConsumableData, ConsumableType } from "./data";
 import { PhysicalItemPF2e, SpellPF2e } from "@item";
 import { TrickMagicItemCastData } from "@item/data";
-import { ErrorPF2e, tupleHasValue } from "@module/utils";
+import { ErrorPF2e, tupleHasValue } from "@util";
 import { ChatMessagePF2e } from "@module/chat-message";
 import { canCastConsumable } from "./spell-consumables";
 import { TrickMagicItemPopup } from "@actor/sheet/trick-magic-item-popup";

src/module/item/consumable/spell-consumables.ts

@@ -3,7 +3,7 @@ import type { ActorPF2e, CharacterPF2e, NPCPF2e } from "@actor/index";
 import { ConsumableData, ConsumableSource, SpellSource, TrickMagicItemCastData } from "@item/data";
 import { ConsumablePF2e } from "@item/index";
 import { calculateDC, DCOptions } from "@module/dc";
-import { ErrorPF2e, tupleHasValue } from "@module/utils";
+import { ErrorPF2e, tupleHasValue } from "@util";
 
 const scrollCompendiumIds: Record<number, string | undefined> = {
  1: "RjuupS9xyXDLgyIr",

src/module/item/container/helpers.ts

@@ -8,7 +8,7 @@ import {
  weightToBulk,
 } from "../physical/bulk";
 import { PhysicalItemData } from "../data";
-import { groupBy } from "@module/utils";
+import { groupBy } from "@util";
 import { Size } from "@module/data";
 
 /**

src/module/item/effect/index.ts

@@ -1,5 +1,5 @@
 import { UserPF2e } from "@module/user";
-import { sluggify } from "@module/utils";
+import { sluggify } from "@util";
 import { ItemPF2e } from "../base";
 import { EffectData } from "./data";
 

src/module/item/equipment/index.ts

@@ -1,5 +1,5 @@
 import { LocalizePF2e } from "@module/system/localize";
-import { objectHasKey } from "@module/utils";
+import { objectHasKey } from "@util";
 import { PhysicalItemPF2e } from "../physical";
 import { EquipmentData, EquipmentTrait } from "./data";
 

src/module/item/kit/index.ts

@@ -1,6 +1,6 @@
 import { ActorPF2e } from "@actor/index";
 import { ContainerPF2e, ItemPF2e, PhysicalItemPF2e } from "@item/index";
-import { ErrorPF2e } from "@module/utils";
+import { ErrorPF2e } from "@util";
 import { KitData, KitEntryData } from "./data";
 
 const SYSTEM_EQUIPMENT_PACK_ID = "pf2e.equipment-srd";

src/module/item/physical/bulk.ts

@@ -1,5 +1,5 @@
 import { Size, SIZES } from "@module/data";
-import { add, applyNTimes, combineObjects, groupBy, isBlank, Optional } from "@module/utils";
+import { add, applyNTimes, combineObjects, groupBy, isBlank, Optional } from "@util";
 import { ItemDataPF2e, PhysicalItemData } from "../data";
 import { isPhysicalData } from "../data/helpers";
 

src/module/item/runes.ts

@@ -1,6 +1,6 @@
 import { OneToFour, Rarity, ZeroToFour, ZeroToThree } from "@module/data";
 import { DiceModifierPF2e } from "@module/modifiers";
-import { isBlank, toNumber } from "@module/utils";
+import { isBlank, toNumber } from "@util";
 import { DamageDieSize } from "@system/damage/damage";
 import { RawPredicate } from "@system/predication";
 import type { ResilientRuneType } from "./armor/data";

src/module/item/sheet/base.ts

@@ -13,7 +13,7 @@ import {
  TagSelectorBasic,
  TAG_SELECTOR_TYPES,
 } from "@module/system/trait-selector";
-import { ErrorPF2e, sluggify, tupleHasValue } from "@module/utils";
+import { ErrorPF2e, sluggify, tupleHasValue } from "@util";
 import { ActiveEffectPF2e } from "@module/active-effect";
 import { InlineRollsLinks } from "@scripts/ui/inline-roll-links";
 

src/module/item/spell/index.ts

@@ -5,7 +5,7 @@ import { MagicTradition } from "@item/spellcasting-entry/data";
 import { DamageType } from "@module/damage-calculation";
 import { OneToTen, OneToThree, TwoToThree } from "@module/data";
 import { ModifierPF2e } from "@module/modifiers";
-import { ordinal, toNumber, objectHasKey } from "@module/utils";
+import { ordinal, toNumber, objectHasKey } from "@util";
 import { DicePF2e } from "@scripts/dice";
 import { MagicSchool, SpellData, SpellTrait } from "./data";
 

src/module/item/spell/sheet.ts

@@ -2,7 +2,7 @@ import { SpellPF2e } from "@item/spell";
 import { ItemSheetPF2e } from "../sheet/base";
 import { ItemSheetDataPF2e, SpellSheetData } from "../sheet/data-types";
 import { SpellDamage, SpellSystemData } from "./data";
-import { objectHasKey } from "@module/utils";
+import { objectHasKey } from "@util";
 
 const DEFAULT_INTERVAL_SCALING: SpellSystemData["scaling"] = {
  interval: 1,

src/module/item/spellcasting-entry/index.ts

@@ -1,7 +1,7 @@
 import { CharacterPF2e, CreaturePF2e } from "@actor";
 import { SpellPF2e } from "@item/spell";
 import { goesToEleven, OneToTen, ZeroToTen } from "@module/data";
-import { groupBy, ErrorPF2e } from "@module/utils";
+import { groupBy, ErrorPF2e } from "@util";
 import { ItemPF2e } from "../base";
 import { SlotKey, SpellcastingEntryData } from "./data";
 import { UserPF2e } from "@module/user";

src/module/item/treasure/helpers.ts

@@ -1,5 +1,5 @@
 import type { ActorPF2e } from "@actor/index";
-import { groupBy } from "@module/utils";
+import { groupBy } from "@util";
 import type { ItemDataPF2e, ItemType, PhysicalItemData, TreasureData } from "@item/data";
 import type { PhysicalItemPF2e } from "@item/index";
 import { isPhysicalData } from "@item/data/helpers";

src/module/item/weapon/index.ts

@@ -3,7 +3,7 @@ import { RuneValuationData, WEAPON_VALUATION_DATA } from "../runes";
 import { LocalizePF2e } from "@module/system/localize";
 import { BaseWeaponType, WeaponCategory, WeaponData, WeaponGroup, WeaponTrait } from "./data";
 import { coinsToString, coinValueInCopper, combineCoins, extractPriceFromItem, toCoins } from "@item/treasure/helpers";
-import { ErrorPF2e, sluggify } from "@module/utils";
+import { ErrorPF2e, sluggify } from "@util";
 import { MaterialGradeData, MATERIAL_VALUATION_DATA } from "@item/physical/materials";
 import { toBulkItem } from "@item/physical/bulk";
 import { IdentificationStatus, MystifiedData } from "@item/physical/data";

src/module/item/weapon/sheet.ts

@@ -6,7 +6,7 @@ import { WEAPON_PROPERTY_RUNE_TYPES } from "@item/runes";
 import { PhysicalItemSheetData } from "@item/sheet/data-types";
 import { coinValueInCopper, extractPriceFromItem } from "@item/treasure/helpers";
 import { OneToFour, OneToThree } from "@module/data";
-import { objectHasKey } from "@module/utils";
+import { objectHasKey } from "@util";
 import { LocalizePF2e } from "@system/localize";
 import { WeaponPF2e } from ".";
 import { WeaponPropertyRuneSlot } from "./data";

src/module/migration/migrations/601-migrate-effect-compendia.ts

@@ -1,6 +1,6 @@
 import { MigrationBase } from "../base";
 import { ItemSourcePF2e } from "@item/data";
-import { objectHasKey } from "@module/utils";
+import { objectHasKey } from "@util";
 
 export class Migration601SplitEffectCompendia extends MigrationBase {
  static override version = 0.601;

src/module/migration/migrations/619-remove-wand-and-scroll-tradition.ts

@@ -1,7 +1,7 @@
 import { ActorSourcePF2e } from "@actor/data";
 import { ItemSourcePF2e } from "@item/data";
 import { SpellcastingEntrySource } from "@item/spellcasting-entry/data";
-import { tupleHasValue } from "@module/utils";
+import { tupleHasValue } from "@util";
 import { MigrationBase } from "../base";
 
 const LEGIT_TRADITIONS = ["arcane", "divine", "occult", "primal", "focus", "ritual", "halcyon", ""] as const;

src/module/migration/migrations/621-remove-config-spellSchools.ts

@@ -1,6 +1,6 @@
 import { MigrationBase } from "../base";
 import { ItemSourcePF2e } from "@item/data";
-import { objectHasKey } from "@module/utils";
+import { objectHasKey } from "@util";
 import { MagicSchool } from "@item/spell/data";
 
 /** Remove duplicate magic schools localization map */

src/module/migration/migrations/627-lowercase-spell-saves.ts

@@ -1,5 +1,5 @@
 import { ItemSourcePF2e } from "@item/data";
-import { tupleHasValue } from "@module/utils";
+import { tupleHasValue } from "@util";
 import { MigrationBase } from "../base";
 
 const AllSaves = ["fortitude", "reflex", "will"] as const;