Skip to content

Commit

Permalink
Turn on isolatedModules in tsconfig.json (foundryvtt#9916)
Browse files Browse the repository at this point in the history
  • Loading branch information
stwlam committed Sep 7, 2023
1 parent e95c531 commit 3c6a35e
Show file tree
Hide file tree
Showing 168 changed files with 362 additions and 363 deletions.
7 changes: 4 additions & 3 deletions build/lib/compendium-pack.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { ActorSourcePF2e } from "@actor/data/index.ts";
import { ItemSourcePF2e, MeleeSource, isPhysicalData } from "@item/data/index.ts";
import { FEAT_CATEGORIES } from "@item/feat/values.ts";
import { itemIsOfType } from "@item/helpers.ts";
import { SIZES } from "@module/data.ts";
import { MigrationRunnerBase } from "@module/migration/runner/base.ts";
import { RuleElementSource } from "@module/rules/index.ts";
Expand All @@ -9,9 +10,8 @@ import fs from "fs";
import path from "path";
import coreIconsJSON from "../core-icons.json" assert { type: "json" };
import { PackError, getFilesRecursively } from "./helpers.ts";
import { PackEntry } from "./types.ts";
import { DBFolder, LevelDatabase } from "./level-database.ts";
import { itemIsOfType } from "@item/helpers.ts";
import { PackEntry } from "./types.ts";

interface PackMetadata {
system: string;
Expand Down Expand Up @@ -480,4 +480,5 @@ interface ConvertUUIDOptions {
map: Map<string, Map<string, string>>;
}

export { CompendiumPack, PackError, PackMetadata, isItemSource, isActorSource, REMaybeWithUUIDs };
export { CompendiumPack, PackError, isActorSource, isItemSource };
export type { PackMetadata, REMaybeWithUUIDs };
2 changes: 1 addition & 1 deletion build/lib/extractor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -866,4 +866,4 @@ class PackExtractor {
}
}

export { ExtractArgs, PackExtractor };
export { type ExtractArgs, PackExtractor };
2 changes: 1 addition & 1 deletion build/lib/level-database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,4 @@ interface LevelDatabaseOptions<T> {
dbOptions?: DatabaseOptions<string, T>;
}

export { DBFolder, LevelDatabase };
export { type DBFolder, LevelDatabase };
2 changes: 1 addition & 1 deletion build/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ import type { MacroPF2e } from "@module/macro.ts";
type CompendiumDocumentPF2e = ActorPF2e | ItemPF2e<ActorPF2e | null> | JournalEntry | MacroPF2e | RollTable;
type PackEntry = CompendiumDocumentPF2e["_source"];

export { PackEntry };
export type { PackEntry };
3 changes: 2 additions & 1 deletion src/module/actor/actions/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,5 @@ abstract class BaseAction<TData extends BaseActionVariantData, TAction extends B
protected abstract toActionVariant(data?: TData): TAction;
}

export { BaseAction, BaseActionData, BaseActionVariant, BaseActionVariantData };
export { BaseAction, BaseActionVariant };
export type { BaseActionData, BaseActionVariantData };
9 changes: 5 additions & 4 deletions src/module/actor/actions/simple.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ActionCost, ActionUseOptions } from "./types.ts";
import { ActorPF2e } from "@actor";
import type { ActorPF2e } from "@actor";
import type { EffectPF2e } from "@item";
import { getSelectedOrOwnActors } from "@util/token-actor-utils.ts";
import { BaseAction, BaseActionData, BaseActionVariant, BaseActionVariantData } from "./base.ts";
import { EffectPF2e } from "@item";
import { ActionCost, ActionUseOptions } from "./types.ts";

interface SimpleActionVariantData extends BaseActionVariantData {
effect?: string | EffectPF2e;
Expand Down Expand Up @@ -100,4 +100,5 @@ class SimpleAction extends BaseAction<SimpleActionVariantData, SimpleActionVaria
}
}

export { SimpleAction, SimpleActionResult, SimpleActionVariant, SimpleActionVariantData, SimpleActionUseOptions };
export { SimpleAction, SimpleActionVariant };
export type { SimpleActionResult, SimpleActionUseOptions, SimpleActionVariantData };
7 changes: 4 additions & 3 deletions src/module/actor/actions/single-check.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ActorPF2e } from "@actor";
import type { ActorPF2e } from "@actor";
import { ModifierPF2e, RawModifier } from "@actor/modifiers.ts";
import { DCSlug } from "@actor/types.ts";
import { ItemPF2e } from "@item";
import type { ItemPF2e } from "@item";
import { RollNotePF2e, RollNoteSource } from "@module/notes.ts";
import { ActionMacroHelpers } from "@system/action-macros/index.ts";
import {
Expand Down Expand Up @@ -153,4 +153,5 @@ class SingleCheckAction extends BaseAction<SingleCheckActionVariantData, SingleC
}
}

export { SingleCheckAction, SingleCheckActionUseOptions, SingleCheckActionVariant, SingleCheckActionVariantData };
export { SingleCheckAction, SingleCheckActionVariant };
export type { SingleCheckActionUseOptions, SingleCheckActionVariantData };
14 changes: 3 additions & 11 deletions src/module/actor/actions/types.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ActorPF2e } from "@actor";
import type { ChatMessagePF2e } from "@module/chat-message/document.ts";

const ACTION_COST = ["free", "reaction", 1, 2, 3] as const;
type ActionCost = (typeof ACTION_COST)[number];
const ACTION_COSTS = ["free", "reaction", 1, 2, 3] as const;
type ActionCost = (typeof ACTION_COSTS)[number];

interface ActionMessageOptions {
blind: boolean;
Expand Down Expand Up @@ -45,12 +45,4 @@ interface Action {
use(options?: Partial<ActionUseOptions>): Promise<unknown>;
}

export {
ACTION_COST,
Action,
ActionCost,
ActionMessageOptions,
ActionUseOptions,
ActionVariant,
ActionVariantUseOptions,
};
export type { Action, ActionCost, ActionMessageOptions, ActionUseOptions, ActionVariant, ActionVariantUseOptions };
3 changes: 2 additions & 1 deletion src/module/actor/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1961,4 +1961,5 @@ const ActorProxyPF2e = new Proxy(ActorPF2e, {
},
});

export { ActorPF2e, ActorProxyPF2e, ActorUpdateContext, HitPointsSummary };
export { ActorPF2e, ActorProxyPF2e };
export type { ActorUpdateContext, HitPointsSummary };
2 changes: 1 addition & 1 deletion src/module/actor/character/attribute-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -562,4 +562,4 @@ interface LevelBoostData extends BoostFlawRow {
minLevel: number;
}

export { AttributeBuilder, BoostFlawState };
export { AttributeBuilder, type BoostFlawState };
7 changes: 4 additions & 3 deletions src/module/actor/character/crafting/entry.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ActorPF2e, CharacterPF2e } from "@actor";
import { ItemPF2e } from "@item";
import type { ActorPF2e, CharacterPF2e } from "@actor";
import type { ItemPF2e } from "@item";
import { CraftingEntryRuleData, CraftingEntryRuleSource } from "@module/rules/rule-element/crafting/entry.ts";
import { PredicatePF2e, RawPredicate } from "@system/predication.ts";
import { CraftingFormula } from "./formula.ts";
Expand Down Expand Up @@ -271,4 +271,5 @@ interface PreparedFormulaSheetData {
isSignatureItem: boolean;
}

export { CraftingEntry, CraftingEntryData, PreparedFormulaData };
export { CraftingEntry };
export type { CraftingEntryData, PreparedFormulaData };
6 changes: 4 additions & 2 deletions src/module/actor/character/crafting/formula.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { CoinsPF2e } from "@item/physical/helpers.ts";
import { Rarity } from "@module/data.ts";
import { calculateDC } from "@module/dc.ts";

export class CraftingFormula implements CraftingFormulaData {
class CraftingFormula implements CraftingFormulaData {
/** The difficulty class to craft this item */
dc: number;

Expand Down Expand Up @@ -80,10 +80,12 @@ export class CraftingFormula implements CraftingFormulaData {
}
}

export interface CraftingFormulaData {
interface CraftingFormulaData {
uuid: ItemUUID;
sort?: number;
dc?: number;
batchSize?: number;
deletable?: boolean;
}

export { CraftingFormula, type CraftingFormulaData };
12 changes: 6 additions & 6 deletions src/module/actor/character/data.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ActorPF2e } from "@actor";
import type { ActorPF2e } from "@actor";
import { CraftingEntryData } from "@actor/character/crafting/entry.ts";
import { CraftingFormulaData } from "@actor/character/crafting/formula.ts";
import {
Expand All @@ -23,7 +23,7 @@ import {
CreatureTraitsSource,
SenseData,
} from "@actor/creature/index.ts";
import { CreatureSensePF2e } from "@actor/creature/sense.ts";
import type { CreatureSensePF2e } from "@actor/creature/sense.ts";
import {
ActorAttributesSource,
ActorFlagsPF2e,
Expand All @@ -35,7 +35,7 @@ import {
TraitViewData,
} from "@actor/data/base.ts";
import { AttributeString, MovementType, SaveType } from "@actor/types.ts";
import { FeatPF2e, ItemPF2e, WeaponPF2e } from "@item";
import type { FeatPF2e, ItemPF2e, WeaponPF2e } from "@item";
import { ArmorCategory } from "@item/armor/types.ts";
import { ItemSystemData } from "@item/data/base.ts";
import { ProficiencyRank } from "@item/data/index.ts";
Expand All @@ -45,10 +45,10 @@ import { MagicTradition } from "@item/spell/types.ts";
import { BaseWeaponType, WeaponCategory, WeaponGroup } from "@item/weapon/types.ts";
import { ValueAndMax, ZeroToFour } from "@module/data.ts";
import { DamageType } from "@system/damage/types.ts";
import { PredicatePF2e } from "@system/predication.ts";
import type { PredicatePF2e } from "@system/predication.ts";
import { ArmorClassTraceData } from "@system/statistic/armor-class.ts";
import { StatisticTraceData } from "@system/statistic/data.ts";
import { CharacterPF2e } from "./document.ts";
import type { CharacterPF2e } from "./document.ts";
import { FeatGroup } from "./feats.ts";
import { WeaponAuxiliaryAction } from "./helpers.ts";
import { CharacterSheetTabVisibility } from "./sheet.ts";
Expand Down Expand Up @@ -526,7 +526,7 @@ interface BonusFeat<T extends FeatLike = FeatPF2e> {
feat: T;
}

export {
export type {
BaseWeaponProficiencyKey,
BonusFeat,
CategoryProficiencies,
Expand Down
8 changes: 4 additions & 4 deletions src/module/actor/character/elemental-blast.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { AttackTraitHelpers } from "@actor/creature/helpers.ts";
import { calculateMAPs } from "@actor/helpers.ts";
import { ModifierPF2e, StatisticModifier } from "@actor/modifiers.ts";
import { AbilityItemPF2e } from "@item";
import type { AbilityItemPF2e } from "@item";
import { ActionTrait } from "@item/ability/types.ts";
import { RangeData } from "@item/types.ts";
import { WeaponTrait } from "@item/weapon/types.ts";
import { extractDamageSynthetics, extractModifierAdjustments } from "@module/rules/helpers.ts";
import { ElementTrait, elementTraits } from "@scripts/config/traits.ts";
Expand All @@ -26,8 +27,7 @@ import type {
SchemaField,
StringField,
} from "types/foundry/common/data/fields.d.ts";
import { CharacterPF2e } from "./document.ts";
import { RangeData } from "@item/types.ts";
import type { CharacterPF2e } from "./document.ts";

class ElementalBlast {
actor: CharacterPF2e;
Expand Down Expand Up @@ -521,4 +521,4 @@ interface BlastConfigDamageType {
selected: boolean;
}

export { ElementalBlast, ElementalBlastConfig };
export { ElementalBlast, type ElementalBlastConfig };
7 changes: 4 additions & 3 deletions src/module/actor/character/feats.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ActorPF2e } from "@actor";
import { FeatPF2e, ItemPF2e } from "@item";
import { FeatCategory } from "@item/feat/types.ts";
import { sluggify, tupleHasValue } from "@util";
import { CharacterPF2e } from "./document.ts";
import { BonusFeat, FeatLike, SlottedFeat } from "./data.ts";
import { ActorPF2e } from "@actor";
import type { CharacterPF2e } from "./document.ts";

type FeatSlotLevel = number | { id: string; label: string };

Expand Down Expand Up @@ -337,4 +337,5 @@ function isFeatLike(item: ItemPF2e): item is FeatLike {
return "category" in item && "location" in item.system && "isFeat" in item && "isFeature" in item;
}

export { CharacterFeats, FeatGroup, FeatGroupOptions, FeatSlotLevel };
export { CharacterFeats, FeatGroup };
export type { FeatGroupOptions, FeatSlotLevel };
2 changes: 1 addition & 1 deletion src/module/actor/character/sheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1588,4 +1588,4 @@ interface ElementalBlastSheetConfig extends ElementalBlastConfig {
};
}

export { CharacterSheetPF2e, CharacterSheetTabVisibility };
export { CharacterSheetPF2e, type CharacterSheetTabVisibility };
4 changes: 2 additions & 2 deletions src/module/actor/character/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { HitPointsSummary } from "@actor/base.ts";
import { AttributeString, SaveType, SkillLongForm } from "@actor/types.ts";
import { MagicTradition } from "@item/spell/types.ts";
import { ZeroToFour } from "@module/data.ts";
import { Statistic } from "@system/statistic/index.ts";
import type { Statistic } from "@system/statistic/index.ts";

interface CharacterHitPointsSummary extends HitPointsSummary {
recoveryMultiplier: number;
Expand Down Expand Up @@ -32,7 +32,7 @@ type GuaranteedGetStatisticSlug =
| "classDC"
| MagicTradition;

export {
export type {
CharacterHitPointsSummary,
CharacterSkill,
CharacterSkills,
Expand Down
4 changes: 2 additions & 2 deletions src/module/actor/creature/config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ALLIANCES } from "@actor/creature/values.ts";
import { createSheetOptions, SheetOptions } from "@module/sheet/helpers.ts";
import { ErrorPF2e, setHasElement } from "@util";
import { CreaturePF2e } from "./index.ts";
import type { CreaturePF2e } from "./index.ts";
import { BaseCreatureSource, CreatureSystemSource, CreatureType } from "./data.ts";

/** A DocumentSheet presenting additional, per-actor settings */
Expand Down Expand Up @@ -68,4 +68,4 @@ interface CreatureConfigData<TActor extends CreaturePF2e> extends DocumentSheetD
alliances: SheetOptions;
}

export { CreatureConfig, CreatureConfigData };
export { CreatureConfig, type CreatureConfigData };
10 changes: 5 additions & 5 deletions src/module/actor/creature/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
BaseActorSourcePF2e,
StrikeData,
} from "@actor/data/base.ts";
import { DamageDicePF2e, ModifierPF2e, RawModifier, StatisticModifier } from "@actor/modifiers.ts";
import type { DamageDicePF2e, ModifierPF2e, RawModifier, StatisticModifier } from "@actor/modifiers.ts";
import type {
ActorAlliance,
AttributeString,
Expand All @@ -21,8 +21,8 @@ import type {
} from "@actor/types.ts";
import type { CREATURE_ACTOR_TYPES } from "@actor/values.ts";
import { LabeledNumber, ValueAndMax, ValuesList, ZeroToThree } from "@module/data.ts";
import { Statistic, StatisticTraceData } from "@system/statistic/index.ts";
import { CreatureSensePF2e, SenseAcuity, SenseType } from "./sense.ts";
import type { Statistic, StatisticTraceData } from "@system/statistic/index.ts";
import type { CreatureSensePF2e, SenseAcuity, SenseType } from "./sense.ts";
import { Alignment, CreatureTrait } from "./types.ts";

type BaseCreatureSource<TType extends CreatureType, TSystemSource extends CreatureSystemSource> = BaseActorSourcePF2e<
Expand Down Expand Up @@ -228,7 +228,8 @@ interface HeldShieldData {
icon: ImageFilePath;
}

export {
export { VisionLevels };
export type {
Abilities,
AbilityData,
Attitude,
Expand All @@ -255,5 +256,4 @@ export {
SkillAbbreviation,
SkillData,
VisionLevel,
VisionLevels,
};
10 changes: 5 additions & 5 deletions src/module/actor/creature/types.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { ActorPF2e, ActorUpdateContext } from "@actor/base.ts";
import type { ActorPF2e, ActorUpdateContext } from "@actor/base.ts";
import { ActorSheetDataPF2e } from "@actor/sheet/data-types.ts";
import { AttributeString, SaveType } from "@actor/types.ts";
import { AbilityItemPF2e, MeleePF2e, WeaponPF2e } from "@item";
import { ZeroToFour } from "@module/data.ts";
import { SheetOptions } from "@module/sheet/helpers.ts";
import { TokenDocumentPF2e } from "@scene/index.ts";
import type { TokenDocumentPF2e } from "@scene/index.ts";
import { AbilityData, CreatureSystemData, SaveData, SkillData } from "./data.ts";
import { CreaturePF2e } from "./document.ts";
import { ALIGNMENTS, ALIGNMENT_TRAITS } from "./values.ts";
import type { CreaturePF2e } from "./document.ts";
import type { ALIGNMENTS, ALIGNMENT_TRAITS } from "./values.ts";

type Alignment = SetElement<typeof ALIGNMENTS>;
type AlignmentTrait = SetElement<typeof ALIGNMENT_TRAITS>;
Expand Down Expand Up @@ -50,7 +50,7 @@ interface CreatureSheetData<TActor extends CreaturePF2e> extends ActorSheetDataP
};
}

export {
export type {
Alignment,
AlignmentTrait,
CreatureSheetData,
Expand Down
23 changes: 15 additions & 8 deletions src/module/actor/data/base.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
import { ActorPF2e } from "@actor/base.ts";
import type { ActorPF2e } from "@actor/base.ts";
import { DexterityModifierCapData } from "@actor/character/types.ts";
import { Abilities } from "@actor/creature/data.ts";
import { ActorSizePF2e } from "@actor/data/size.ts";
import { StatisticModifier } from "@actor/modifiers.ts";
import type { ActorSizePF2e } from "@actor/data/size.ts";
import type { StatisticModifier } from "@actor/modifiers.ts";
import { ActorAlliance, AttributeString, SkillLongForm } from "@actor/types.ts";
import { ConsumablePF2e, MeleePF2e, WeaponPF2e } from "@item";
import type { ConsumablePF2e, MeleePF2e, WeaponPF2e } from "@item";
import { ItemSourcePF2e } from "@item/data/index.ts";
import { DocumentSchemaRecord, 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";
import { CheckRoll } from "@system/check/roll.ts";
import { DamageRoll } from "@system/damage/roll.ts";
import type { CheckRoll } from "@system/check/roll.ts";
import type { DamageRoll } from "@system/damage/roll.ts";
import { StatisticTraceData } from "@system/statistic/data.ts";
import { ActorType } from "./index.ts";
import { ImmunityData, ImmunitySource, ResistanceData, ResistanceSource, WeaknessData, WeaknessSource } from "./iwr.ts";
import type {
ImmunityData,
ImmunitySource,
ResistanceData,
ResistanceSource,
WeaknessData,
WeaknessSource,
} from "./iwr.ts";

/** Base interface for all actor data */
interface BaseActorSourcePF2e<TType extends ActorType, TSystemSource extends ActorSystemSource = ActorSystemSource>
Expand Down Expand Up @@ -278,7 +285,7 @@ interface PrototypeTokenPF2e<TParent extends ActorPF2e | null> extends foundry.d
};
}

export {
export type {
ActorAttributes,
ActorAttributesSource,
ActorDetails,
Expand Down
Loading

0 comments on commit 3c6a35e

Please sign in to comment.