Add system property to ActorSource and ItemSource

stwlam · Aug 1, 2022 · 8e72a41 · 8e72a41
1 parent d583088
commit 8e72a41
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 8 deletions.
diff --git a/src/module/actor/character/data/types.ts b/src/module/actor/character/data/types.ts
@@ -45,7 +45,7 @@ interface CharacterSource extends BaseCreatureSource<"character", CharacterSyste
 }
 
 interface CharacterData
- extends Omit<CharacterSource, "data" | "effects" | "items" | "token" | "type">,
+ extends Omit<CharacterSource, "data" | "system" | "effects" | "items" | "token" | "type">,
  BaseCreatureData<CharacterPF2e, "character", CharacterSystemData, CharacterSource> {
  flags: CharacterFlags;
 }

diff --git a/src/module/actor/creature/data.ts b/src/module/actor/creature/data.ts
@@ -34,7 +34,7 @@ interface BaseCreatureData<
  TType extends CreatureType = CreatureType,
  TSystemData extends CreatureSystemData = CreatureSystemData,
  TSource extends BaseCreatureSource<TType> = BaseCreatureSource<TType>
-> extends Omit<BaseCreatureSource<TType>, "data" | "effects" | "flags" | "items" | "token" | "type">,
+> extends Omit<BaseCreatureSource<TType>, "data" | "system" | "effects" | "flags" | "items" | "token" | "type">,
  BaseActorDataPF2e<TItem, TType, TSystemData, TSource> {}
 
 /** Skill and Lore statistics for rolling. Both short and longform are supported, but eventually only long form will be */

diff --git a/src/module/actor/data/base.ts b/src/module/actor/data/base.ts
@@ -32,6 +32,7 @@ interface BaseActorDataPF2e<
  foundry.data.ActorData<TActor, ActiveEffectPF2e, ItemPF2e> {
  readonly type: TType;
  readonly data: TSystemData;
+ readonly system: TSystemData;
  token: PrototypeTokenDataPF2e;
  flags: ActorFlagsPF2e;
 

diff --git a/src/module/actor/familiar/data.ts b/src/module/actor/familiar/data.ts
@@ -16,7 +16,7 @@ import type { FamiliarPF2e } from ".";
 type FamiliarSource = BaseCreatureSource<"familiar", FamiliarSystemSource>;
 
 interface FamiliarData
- extends Omit<FamiliarSource, "data" | "effects" | "flags" | "items" | "token" | "type">,
+ extends Omit<FamiliarSource, "data" | "system" | "effects" | "flags" | "items" | "token" | "type">,
  BaseCreatureData<FamiliarPF2e, "familiar", FamiliarSystemData, FamiliarSource> {}
 
 interface FamiliarSystemSource extends Pick<CreatureSystemSource, "schema"> {

diff --git a/src/module/actor/hazard/data.ts b/src/module/actor/hazard/data.ts
@@ -16,7 +16,7 @@ import { HazardPF2e } from ".";
 type HazardSource = BaseActorSourcePF2e<"hazard", HazardSystemData>;
 
 interface HazardData
- extends Omit<HazardSource, "data" | "effects" | "flags" | "items" | "token" | "type">,
+ extends Omit<HazardSource, "data" | "system" | "effects" | "flags" | "items" | "token" | "type">,
  BaseActorDataPF2e<HazardPF2e, "hazard", HazardSystemData, HazardSource> {}
 
 /** The raw information contained within the actor data object for hazards. */

diff --git a/src/module/actor/loot/data.ts b/src/module/actor/loot/data.ts
@@ -13,7 +13,7 @@ import { LootPF2e } from ".";
 type LootSource = BaseActorSourcePF2e<"loot", LootSystemSource>;
 
 interface LootData
- extends Omit<LootSource, "data" | "effects" | "flags" | "items" | "token" | "type">,
+ extends Omit<LootSource, "data" | "system" | "effects" | "flags" | "items" | "token" | "type">,
  BaseActorDataPF2e<LootPF2e, "loot", LootSystemData, LootSource> {}
 
 /** The system-level data of loot actors. */

diff --git a/src/module/actor/npc/data.ts b/src/module/actor/npc/data.ts
@@ -29,7 +29,7 @@ interface NPCSource extends BaseCreatureSource<"npc", NPCSystemSource> {
 }
 
 interface NPCData
- extends Omit<NPCSource, "data" | "effects" | "items" | "token" | "type">,
+ extends Omit<NPCSource, "data" | "system" | "effects" | "items" | "token" | "type">,
  BaseCreatureData<NPCPF2e, "npc", NPCSystemData, NPCSource> {
  flags: NPCFlags;
 }

diff --git a/src/module/item/data/base.ts b/src/module/item/data/base.ts
@@ -20,7 +20,7 @@ interface BaseItemDataPF2e<
  TType extends ItemType = ItemType,
  TSystemData extends ItemSystemData = ItemSystemData,
  TSource extends BaseItemSourcePF2e<TType> = BaseItemSourcePF2e<TType>
-> extends Omit<BaseItemSourcePF2e<TType, ItemSystemSource>, "data" | "effects">,
+> extends Omit<BaseItemSourcePF2e<TType, ItemSystemSource>, "data" | "system" | "effects">,
  foundry.data.ItemData<TItem, ActiveEffectPF2e> {
  readonly type: TType;
  readonly data: TSystemData;

diff --git a/src/module/migration/migrations/711-heritage-items.ts b/src/module/migration/migrations/711-heritage-items.ts
@@ -164,7 +164,7 @@ export class Migration711HeritageItems extends MigrationBase {
 
  private ancestrySlugs = Object.keys(this.officialAncestries);
 
- private heritageFromFeat(feature: FeatSource): HeritageSource {
+ private heritageFromFeat(feature: FeatSource): Omit<HeritageSource, "system"> {
  const featureSlug = feature.data.slug ?? "";
  const ancestrySlug =
  this.heritagesWithoutAncestryInName[featureSlug] ?? this.ancestrySlugs.find((s) => featureSlug.includes(s));

diff --git a/types/foundry/common/data/data/actor-data.d.ts b/types/foundry/common/data/data/actor-data.d.ts
@@ -30,6 +30,7 @@ declare module foundry {
  type: TType;
  img: ImagePath;
  data: TSystemSource;
+ system: TSystemSource;
  token: PrototypeTokenSource;
  items: TItemSource[];
  effects: ActiveEffectSource[];

diff --git a/types/foundry/common/data/data/item-data.d.ts b/types/foundry/common/data/data/item-data.d.ts
@@ -23,6 +23,7 @@ declare module foundry {
  type: TType;
  img: ImagePath;
  data: TSystemSource;
+ system: TSystemSource;
  effects: ActiveEffectSource[];
  folder?: string | null;
  sort: number;