Move ItemPF2e to "@item/base/document" (foundryvtt#10913)

Plus "@item/sheet" and "@item/data" to "@item/base" as well

build/conditions.ts

@@ -1,4 +1,4 @@
-import { CompendiumPack } from "./lib/compendium-pack.js";
+import { CompendiumPack } from "./lib/compendium-pack.ts";
 
 CompendiumPack.loadJSON("packs/actions");
 CompendiumPack.loadJSON("packs/adventure-specific-actions");

build/lib/compendium-pack.ts

@@ -1,5 +1,5 @@
 import type { ActorSourcePF2e } from "@actor/data/index.ts";
-import { ItemSourcePF2e, MeleeSource, isPhysicalData } from "@item/data/index.ts";
+import { isPhysicalData, ItemSourcePF2e, MeleeSource } from "@item/base/data/index.ts";
 import { FEAT_OR_FEATURE_CATEGORIES } from "@item/feat/values.ts";
 import { itemIsOfType } from "@item/helpers.ts";
 import { SIZES } from "@module/data.ts";
@@ -9,7 +9,7 @@ import { isObject, setHasElement, sluggify, tupleHasValue } from "@util/misc.ts"
 import fs from "fs";
 import path from "path";
 import coreIconsJSON from "../core-icons.json" assert { type: "json" };
-import { PackError, getFilesRecursively } from "./helpers.ts";
+import { getFilesRecursively, PackError } from "./helpers.ts";
 import { DBFolder, LevelDatabase } from "./level-database.ts";
 import { PackEntry } from "./types.ts";
 
@@ -490,5 +490,5 @@ interface ConvertUUIDOptions {
  map: Map<string, Map<string, string>>;
 }
 
-export { CompendiumPack, PackError, isActorSource, isItemSource };
+export { CompendiumPack, isActorSource, isItemSource, PackError };
 export type { PackMetadata, REMaybeWithUUIDs };

build/lib/extractor.ts

@@ -1,7 +1,6 @@
 import type { ActorSourcePF2e } from "@actor/data/index.ts";
 import type { NPCAttributesSource, NPCSystemSource } from "@actor/npc/data.ts";
-import { isPhysicalData } from "@item/data/helpers.ts";
-import { ItemSourcePF2e, MeleeSource, SpellSource } from "@item/data/index.ts";
+import { ItemSourcePF2e, MeleeSource, SpellSource, isPhysicalData } from "@item/base/data/index.ts";
 import { PublicationData } from "@module/data.ts";
 import { RuleElementSource } from "@module/rules/index.ts";
 import { isObject, sluggify } from "@util/index.ts";

build/lib/level-database.ts

@@ -1,4 +1,4 @@
-import { ItemSourcePF2e } from "@item/data/index.ts";
+import { ItemSourcePF2e } from "@item/base/data/index.ts";
 import { tupleHasValue } from "@util";
 import type { AbstractSublevel } from "abstract-level";
 import { ClassicLevel, type DatabaseOptions } from "classic-level";

build/run-migration.ts

@@ -1,5 +1,5 @@
 import { ActorSourcePF2e } from "@actor/data/index.ts";
-import { ItemSourcePF2e } from "@item/data/index.ts";
+import { ItemSourcePF2e } from "@item/base/data/index.ts";
 import { sluggify } from "@util";
 import fs from "fs-extra";
 import { JSDOM } from "jsdom";

src/module/actor/base.ts

@@ -16,12 +16,11 @@ import {
 import { AbstractEffectPF2e, ArmorPF2e, ContainerPF2e, ItemPF2e, ItemProxyPF2e, PhysicalItemPF2e } from "@item";
 import { ActionTrait } from "@item/ability/types.ts";
 import { AfflictionSource } from "@item/affliction/index.ts";
+import { ItemSourcePF2e, ItemType, PhysicalItemSource, hasInvestedProperty } from "@item/base/data/index.ts";
 import { ConditionKey, ConditionSlug, ConditionSource, type ConditionPF2e } from "@item/condition/index.ts";
 import { PersistentDialog } from "@item/condition/persistent-damage-dialog.ts";
 import { CONDITION_SLUGS } from "@item/condition/values.ts";
 import { isCycle } from "@item/container/helpers.ts";
-import { hasInvestedProperty } from "@item/data/helpers.ts";
-import { ItemSourcePF2e, ItemType, PhysicalItemSource } from "@item/data/index.ts";
 import { EffectFlags, EffectSource } from "@item/effect/data.ts";
 import { MAGIC_TRADITIONS } from "@item/spell/values.ts";
 import { RitualSpellcasting } from "@item/spellcasting-entry/rituals.ts";

src/module/actor/character/data.ts

@@ -36,7 +36,7 @@ import {
 import { AttributeString, MovementType, SaveType } from "@actor/types.ts";
 import type { WeaponPF2e } from "@item";
 import { ArmorCategory } from "@item/armor/types.ts";
-import { ProficiencyRank } from "@item/data/index.ts";
+import { ProficiencyRank } from "@item/base/data/index.ts";
 import { DeitySystemData } from "@item/deity/data.ts";
 import { DeityDomain } from "@item/deity/types.ts";
 import { MagicTradition } from "@item/spell/types.ts";

src/module/actor/character/document.ts

@@ -41,7 +41,7 @@ import type {
 import { ItemPF2e, WeaponPF2e } from "@item";
 import { ActionTrait } from "@item/ability/types.ts";
 import { ARMOR_CATEGORIES } from "@item/armor/values.ts";
-import { ItemType, PhysicalItemSource } from "@item/data/index.ts";
+import { ItemType, PhysicalItemSource } from "@item/base/data/index.ts";
 import { getPropertyRuneStrikeAdjustments, getResilientBonus } from "@item/physical/runes.ts";
 import { MagicTradition } from "@item/spell/types.ts";
 import { MAGIC_TRADITIONS } from "@item/spell/values.ts";

src/module/actor/character/feats.ts

@@ -1,6 +1,6 @@
 import type { ActorPF2e, CharacterPF2e } from "@actor";
 import type { FeatPF2e, HeritagePF2e, ItemPF2e } from "@item";
-import { ItemSystemData } from "@item/data/base.ts";
+import { ItemSystemData } from "@item/base/data/system.ts";
 import { FeatOrFeatureCategory } from "@item/feat/types.ts";
 import { sluggify, tupleHasValue } from "@util";
 import * as R from "remeda";

src/module/actor/character/sheet.ts

@@ -18,8 +18,7 @@ import {
  PhysicalItemPF2e,
 } from "@item";
 import { isSpellConsumable } from "@item/consumable/spell-consumables.ts";
-import { ActionCost, Frequency } from "@item/data/base.ts";
-import { ItemSourcePF2e } from "@item/data/index.ts";
+import { ActionCost, Frequency, ItemSourcePF2e } from "@item/base/data/index.ts";
 import { MagicTradition } from "@item/spell/types.ts";
 import { SpellcastingSheetData } from "@item/spellcasting-entry/types.ts";
 import { toggleWeaponTrait } from "@item/weapon/helpers.ts";

src/module/actor/creature/document.ts

@@ -5,7 +5,7 @@ import { MODIFIER_TYPES, ModifierPF2e, RawModifier, StatisticModifier } from "@a
 import { MovementType, SaveType, SkillLongForm } from "@actor/types.ts";
 import { ArmorPF2e, ItemPF2e, type PhysicalItemPF2e } from "@item";
 import { isCycle } from "@item/container/helpers.ts";
-import { ArmorSource, ItemType } from "@item/data/index.ts";
+import { ArmorSource, ItemType } from "@item/base/data/index.ts";
 import { EquippedData, ItemCarryType } from "@item/physical/data.ts";
 import { isEquipped } from "@item/physical/usage.ts";
 import type { ActiveEffectPF2e } from "@module/active-effect.ts";

src/module/actor/creature/sheet.ts

@@ -3,9 +3,8 @@ import { createSpellcastingDialog } from "@actor/sheet/spellcasting-dialog.ts";
 import { ATTRIBUTE_ABBREVIATIONS, SKILL_DICTIONARY } from "@actor/values.ts";
 import { ItemPF2e, SpellPF2e, SpellcastingEntryPF2e } from "@item";
 import { ActionCategory, ActionTrait } from "@item/ability/index.ts";
-import { ActionType } from "@item/data/base.ts";
-import { ItemSourcePF2e } from "@item/data/index.ts";
-import { ITEM_CARRY_TYPES } from "@item/data/values.ts";
+import { ActionType, ItemSourcePF2e } from "@item/base/data/index.ts";
+import { ITEM_CARRY_TYPES } from "@item/base/data/values.ts";
 import { SpellcastingSheetData } from "@item/spellcasting-entry/index.ts";
 import { DropCanvasItemDataPF2e } from "@module/canvas/drop-canvas-data.ts";
 import { ZeroToFour, goesToEleven } from "@module/data.ts";

src/module/actor/creature/spell-preparation-sheet.ts

@@ -2,7 +2,7 @@ import { ActorPF2e, CreaturePF2e } from "@actor";
 import { onClickCreateSpell } from "@actor/sheet/helpers.ts";
 import { ItemSummaryRenderer } from "@actor/sheet/item-summary-renderer.ts";
 import { ItemPF2e, SpellPF2e } from "@item";
-import { ItemSourcePF2e, SpellSource } from "@item/data/index.ts";
+import { ItemSourcePF2e, SpellSource } from "@item/base/data/index.ts";
 import { SpellcastingEntryPF2e, SpellcastingSheetData } from "@item/spellcasting-entry/index.ts";
 import { ErrorPF2e, htmlClosest, htmlQueryAll } from "@util";
 import MiniSearch from "minisearch";

src/module/actor/data/base.ts

@@ -5,7 +5,7 @@ import type { ActorSizePF2e } from "@actor/data/size.ts";
 import type { StatisticModifier } from "@actor/modifiers.ts";
 import { ActorAlliance, AttributeString, SkillLongForm } from "@actor/types.ts";
 import type { ConsumablePF2e, MeleePF2e, WeaponPF2e } from "@item";
-import { ItemSourcePF2e } from "@item/data/index.ts";
+import { ItemSourcePF2e } from "@item/base/data/index.ts";
 import { MigrationRecord, Rarity, Size, ValueAndMaybeMax, ZeroToTwo } from "@module/data.ts";
 import { AutoChangeEntry } from "@module/rules/rule-element/ae-like.ts";
 import { AttackRollParams, DamageRollParams, RollParameters } from "@module/system/rolls.ts";

src/module/actor/familiar/document.ts

@@ -5,7 +5,7 @@ import { createEncounterRollOptions, setHitPointsRollOptions } from "@actor/help
 import { ModifierPF2e, applyStackingRules } from "@actor/modifiers.ts";
 import { SaveType } from "@actor/types.ts";
 import { SAVE_TYPES, SKILL_ABBREVIATIONS, SKILL_DICTIONARY, SKILL_EXPANDED } from "@actor/values.ts";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import type { CombatantPF2e, EncounterPF2e } from "@module/encounter/index.ts";
 import type { RuleElementPF2e } from "@module/rules/index.ts";
 import type { TokenDocumentPF2e } from "@scene/index.ts";

src/module/actor/hazard/document.ts

@@ -7,7 +7,7 @@ import { ModifierPF2e } from "@actor/modifiers.ts";
 import { SaveType } from "@actor/types.ts";
 import { SAVE_TYPES } from "@actor/values.ts";
 import { ConditionPF2e } from "@item";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import { Rarity } from "@module/data.ts";
 import { extractModifiers } from "@module/rules/helpers.ts";
 import { TokenDocumentPF2e } from "@scene/index.ts";

src/module/actor/inventory/index.ts

@@ -1,6 +1,6 @@
 import { ActorPF2e } from "@actor";
 import { ItemProxyPF2e, KitPF2e, PhysicalItemPF2e } from "@item";
-import { ItemSourcePF2e } from "@item/data/index.ts";
+import { ItemSourcePF2e } from "@item/base/data/index.ts";
 import { Coins } from "@item/physical/data.ts";
 import { CoinsPF2e, coinCompendiumIds } from "@item/physical/helpers.ts";
 import { DENOMINATIONS } from "@item/physical/values.ts";

src/module/actor/loot/document.ts

@@ -1,6 +1,6 @@
 import { ActorPF2e } from "@actor";
 import type { ItemPF2e } from "@item";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import { PhysicalItemPF2e } from "@item/physical/document.ts";
 import { CoinsPF2e } from "@item/physical/helpers.ts";
 import { ActiveEffectPF2e } from "@module/active-effect.ts";

src/module/actor/npc/document.ts

@@ -7,7 +7,7 @@ import { ModifierPF2e, StatisticModifier } from "@actor/modifiers.ts";
 import { AttributeString, SaveType } from "@actor/types.ts";
 import { SAVE_TYPES, SKILL_DICTIONARY, SKILL_EXPANDED, SKILL_LONG_FORMS } from "@actor/values.ts";
 import { ItemPF2e, LorePF2e, MeleePF2e } from "@item";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import { calculateDC } from "@module/dc.ts";
 import { RollNotePF2e } from "@module/notes.ts";
 import { CreatureIdentificationData, creatureIdentificationDCs } from "@module/recall-knowledge.ts";

src/module/actor/npc/skills-editor.ts

@@ -1,7 +1,7 @@
 import type { NPCPF2e } from "@actor";
 import { NPCSkillData } from "@actor/npc/data.ts";
 import { SKILL_LONG_FORMS } from "@actor/values.ts";
-import { LoreSource } from "@item/data/index.ts";
+import { LoreSource } from "@item/base/data/index.ts";
 import { htmlClosest, htmlQuery, htmlQueryAll, setHasElement } from "@util";
 
 /** Specialized form to setup skills for an NPC character. */

src/module/actor/party/document.ts

@@ -1,6 +1,6 @@
 import { ActorPF2e, type CreaturePF2e } from "@actor";
 import { resetActors } from "@actor/helpers.ts";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import { CombatantPF2e, EncounterPF2e } from "@module/encounter/index.ts";
 import { RuleElementPF2e } from "@module/rules/index.ts";
 import { RuleElementSchema } from "@module/rules/rule-element/data.ts";

src/module/actor/party/invalid-campaign.ts

@@ -1,7 +1,7 @@
 import { createHTMLElement, fontAwesomeIcon } from "@util";
-import { PartyCampaign } from "./types.ts";
+import type { DataSchema } from "types/foundry/common/data/fields.d.ts";
 import { PartyPF2e } from "./document.ts";
-import { DataSchema } from "types/foundry/common/data/fields.js";
+import { PartyCampaign } from "./types.ts";
 
 const { DataModel } = foundry.abstract;
 

src/module/actor/party/kingdom/model.ts

@@ -2,7 +2,7 @@ import { ActorPF2e } from "@actor";
 import { FeatGroup } from "@actor/character/feats.ts";
 import { MODIFIER_TYPES, ModifierPF2e, RawModifier, createProficiencyModifier } from "@actor/modifiers.ts";
 import { CampaignFeaturePF2e, ItemPF2e } from "@item";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import { ChatMessagePF2e } from "@module/chat-message/document.ts";
 import { ZeroToFour } from "@module/data.ts";
 import { extractModifierAdjustments } from "@module/rules/helpers.ts";

src/module/actor/party/kingdom/sheet.ts

@@ -4,7 +4,7 @@ import { MODIFIER_TYPES } from "@actor/modifiers.ts";
 import { ActorSheetPF2e } from "@actor/sheet/base.ts";
 import { ActorSheetDataPF2e } from "@actor/sheet/data-types.ts";
 import { ItemPF2e, type CampaignFeaturePF2e } from "@item";
-import { ItemSourcePF2e } from "@item/data/index.ts";
+import { ItemSourcePF2e } from "@item/base/data/index.ts";
 import { DropCanvasItemDataPF2e } from "@module/canvas/drop-canvas-data.ts";
 import { ChatMessagePF2e } from "@module/chat-message/document.ts";
 import { ValueAndMax } from "@module/data.ts";

src/module/actor/party/sheet.ts

@@ -7,7 +7,7 @@ import { ActorSheetDataPF2e, ActorSheetRenderOptionsPF2e } from "@actor/sheet/da
 import { DistributeCoinsPopup } from "@actor/sheet/popups/distribute-coins-popup.ts";
 import { SKILL_LONG_FORMS } from "@actor/values.ts";
 import { ItemPF2e } from "@item";
-import { ItemSourcePF2e } from "@item/data/index.ts";
+import { ItemSourcePF2e } from "@item/base/data/index.ts";
 import { Bulk } from "@item/physical/index.ts";
 import { PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts";
 import { ValueAndMax, ZeroToFour } from "@module/data.ts";

src/module/actor/party/types.ts

@@ -1,5 +1,5 @@
 import { ActorUpdateContext } from "@actor/base.ts";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import type { TokenDocumentPF2e } from "@scene";
 import type { Statistic } from "@system/statistic/index.ts";
 import type DataModel from "types/foundry/common/abstract/data.d.ts";

src/module/actor/sheet/base.ts

@@ -3,10 +3,8 @@ import { CraftingFormula } from "@actor/character/crafting/index.ts";
 import { StrikeData } from "@actor/data/base.ts";
 import { SAVE_TYPES } from "@actor/values.ts";
 import { AbstractEffectPF2e, ItemPF2e, ItemProxyPF2e, PhysicalItemPF2e, SpellPF2e } from "@item";
+import { ActionType, ItemSourcePF2e, ItemType, isPhysicalData } from "@item/base/data/index.ts";
 import { createConsumableFromSpell } from "@item/consumable/spell-consumables.ts";
-import { ActionType } from "@item/data/base.ts";
-import { isPhysicalData } from "@item/data/helpers.ts";
-import { ItemSourcePF2e, ItemType } from "@item/data/index.ts";
 import { itemIsOfType } from "@item/helpers.ts";
 import { Coins } from "@item/physical/data.ts";
 import { DENOMINATIONS, PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts";

src/module/actor/sheet/item-summary-renderer.ts

@@ -1,7 +1,7 @@
-import { ActorPF2e } from "@actor/base.ts";
-import { AbstractEffectPF2e, ConsumablePF2e, ItemPF2e, SpellPF2e } from "@item";
-import { ItemSummaryData } from "@item/data/index.ts";
-import { isItemSystemData } from "@item/data/helpers.ts";
+import type { ActorPF2e } from "@actor/base.ts";
+import type { ConsumablePF2e, SpellPF2e } from "@item";
+import { AbstractEffectPF2e, ItemPF2e } from "@item";
+import { ItemSummaryData, isItemSystemData } from "@item/base/data/index.ts";
 import { InlineRollLinks } from "@scripts/ui/inline-roll-links.ts";
 import { UserVisibilityPF2e } from "@scripts/ui/user-visibility.ts";
 import { createHTMLElement, htmlClosest, htmlQuery, htmlQueryAll } from "@util";

src/module/actor/vehicle/document.ts

@@ -1,7 +1,7 @@
 import { setHitPointsRollOptions } from "@actor/helpers.ts";
 import { ModifierPF2e } from "@actor/modifiers.ts";
 import { ActorDimensions } from "@actor/types.ts";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import { extractModifierAdjustments, extractModifiers } from "@module/rules/helpers.ts";
 import type { UserPF2e } from "@module/user/index.ts";
 import { TokenDocumentPF2e } from "@scene/index.ts";

src/module/actor/vehicle/sheet.ts

@@ -1,7 +1,7 @@
 import { ActorSheetDataPF2e } from "@actor/sheet/data-types.ts";
 import { VehiclePF2e } from "@actor/vehicle/index.ts";
 import { AbilityItemPF2e, ItemPF2e } from "@item";
-import { ActionCost, Frequency } from "@item/data/base.ts";
+import { ActionCost, Frequency } from "@item/base/data/system.ts";
 import { ErrorPF2e, getActionGlyph, getActionIcon, htmlClosest, htmlQuery, htmlQueryAll } from "@util";
 import { ActorSheetPF2e } from "../sheet/base.ts";
 import { AdjustedValue, getAdjustment } from "@module/sheet/helpers.ts";

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

@@ -1,7 +1,6 @@
 import { KitPF2e, PhysicalItemPF2e } from "@item";
 import { ActionCategory, ActionTrait } from "@item/ability/index.ts";
-import { ActionType } from "@item/data/base.ts";
-import { ItemType } from "@item/data/index.ts";
+import { ActionType, ItemType } from "@item/base/data/index.ts";
 import { PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts";
 import { BaseSpellcastingEntry } from "@item/spellcasting-entry/index.ts";
 import type { UserPF2e } from "@module/user/document.ts";

src/module/canvas/token/aura/renderer.ts

@@ -1,5 +1,5 @@
 import { AuraAppearanceData, AuraData } from "@actor/types.ts";
-import { ItemTrait } from "@item/data/base.ts";
+import { ItemTrait } from "@item/base/data/system.ts";
 import { TokenAuraData } from "@scene/token-document/aura/index.ts";
 import { isVideoFilePath } from "@util";
 import type { EffectAreaSquare } from "../../effect-area-square.ts";

src/module/chat-message/data.ts

@@ -1,5 +1,5 @@
 import type { BaseRawModifier, DamageDicePF2e } from "@actor/modifiers.ts";
-import { ItemType } from "@item/data/index.ts";
+import { ItemType } from "@item/base/data/index.ts";
 import { MagicTradition } from "@item/spell/types.ts";
 import { ZeroToTwo } from "@module/data.ts";
 import { RollNoteSource } from "@module/notes.ts";

src/module/dc.ts

@@ -1,4 +1,4 @@
-import { ProficiencyRank } from "@item/data/index.ts";
+import { ProficiencyRank } from "@item/base/data/index.ts";
 import { Rarity } from "./data.ts";
 
 /**

src/module/item/abc/data.ts

@@ -1,4 +1,4 @@
-import { ItemSystemSource } from "@item/data/base.ts";
+import { ItemSystemSource } from "@item/base/data/system.ts";
 
 interface ABCFeatureEntryData {
  uuid: string;

src/module/item/abc/sheet.ts

@@ -4,7 +4,7 @@ import { ItemPF2e } from "@item";
 import { ABCFeatureEntryData } from "@item/abc/data.ts";
 import { FeatOrFeatureCategory } from "@item/feat/types.ts";
 import { FEAT_CATEGORIES } from "@item/feat/values.ts";
-import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/sheet/index.ts";
+import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/base/sheet/index.ts";
 import { htmlClosest, htmlQuery, htmlQueryAll, setHasElement } from "@util";
 
 abstract class ABCSheetPF2e<TItem extends ABCItem> extends ItemSheetPF2e<TItem> {

src/module/item/ability/data.ts

@@ -6,7 +6,7 @@ import {
  ItemSystemData,
  ItemSystemSource,
  ItemTraitsNoRarity,
-} from "@item/data/base.ts";
+} from "@item/base/data/system.ts";
 import { OneToThree } from "@module/data.ts";
 import { ActionCategory, ActionTrait } from "./types.ts";
 

src/module/item/ability/document.ts

@@ -1,9 +1,8 @@
-import { ActorPF2e } from "@actor";
+import type { ActorPF2e } from "@actor";
 import { ItemPF2e } from "@item";
-import { ActionCost, Frequency } from "@item/data/base.ts";
-import { ItemSummaryData } from "@item/data/index.ts";
+import { ActionCost, Frequency, ItemSummaryData } from "@item/base/data/index.ts";
 import { RangeData } from "@item/types.ts";
-import { UserPF2e } from "@module/user/index.ts";
+import type { UserPF2e } from "@module/user/index.ts";
 import { getActionTypeLabel } from "@util";
 import { AbilityItemSource, AbilitySystemData } from "./data.ts";
 import { normalizeActionChangeData } from "./helpers.ts";

src/module/item/ability/helpers.ts

@@ -1,5 +1,5 @@
 import { EffectPF2e, ItemPF2e } from "@item";
-import { FrequencySource } from "@item/data/base.ts";
+import { FrequencySource } from "@item/base/data/system.ts";
 import type { FeatSheetPF2e } from "@item/feat/sheet.ts";
 import { RangeData } from "@item/types.ts";
 import { ErrorPF2e, htmlQuery, isImageFilePath } from "@util";

src/module/item/ability/sheet.ts

@@ -1,5 +1,5 @@
 import { AbilityItemPF2e } from "@item/ability/document.ts";
-import { ItemSheetDataPF2e, ItemSheetPF2e } from "../sheet/base.ts";
+import { ItemSheetDataPF2e, ItemSheetPF2e } from "../base/sheet/base.ts";
 import { activateActionSheetListeners, createSelfEffectSheetData, handleSelfEffectDrop } from "./helpers.ts";
 import { SelfEffectReference } from "./index.ts";