Merge branch 'extract-no-img' into 'master'

Fix type of RollTableSource to reflect that the img property is optional See merge request hooking/foundry-vtt---pathfinder-2e!6169
foundryvtt · Nov 26, 2021 · e13932b · e13932b
2 parents 5960060 + 4ca0e9b
commit e13932b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packs/scripts/extract.ts b/packs/scripts/extract.ts
@@ -191,7 +191,8 @@ function sanitizeDocument<T extends PackEntry>(entityData: T, { isEmbedded } = {
  delete entityData.flags[flagScope];
  }
  }
- entityData.img = entityData.img.replace(
+
+ entityData.img &&= entityData.img.replace(
  "https://assets.forge-vtt.com/bazaar/systems/pf2e/assets/",
  "systems/pf2e/"
  ) as ImagePath;

diff --git a/types/foundry/common/data/data/macro-data.d.ts b/types/foundry/common/data/data/macro-data.d.ts
@@ -4,7 +4,7 @@ declare module foundry {
  _id: string;
  name: string;
  type: "chat" | "script";
- img: string;
+ img: ImagePath;
  actorIds: string[];
  author: string;
  command: string;

diff --git a/types/foundry/common/data/data/roll-table-data.d.ts b/types/foundry/common/data/data/roll-table-data.d.ts
@@ -22,7 +22,7 @@ declare module foundry {
  interface RollTableSource {
  _id: string;
  name: string;
- img: string;
+ img?: ImagePath;
  description: string;
  results: TableResultSource[];
  formula: string;
@@ -48,6 +48,8 @@ declare module foundry {
  }
 
  interface RollTableData extends Omit<RollTableSource, "results"> {
+ img: ImagePath;
+
  readonly _source: RollTableSource;
  }
  }