Turn on no-unused-expressions in eslint (foundryvtt#12425)

.eslintrc.json

@@ -27,6 +27,12 @@
  "allowForLoopAfterthoughts": true
  }
  ],
+ "no-unused-expressions": [
+ "error",
+ {
+ "allowShortCircuit": true
+ }
+ ],
  "spaced-comment": [
  "error",
  "always",

src/module/actor/character/crafting/entry.ts

@@ -113,12 +113,9 @@ class CraftingEntry implements Omit<CraftingEntryData, "parentItem"> {
 
  if (this.isAlchemical && index !== -1) {
  const formula = this.preparedFormulaData[index];
- formula.quantity ? (formula.quantity += 1) : (formula.quantity = 2);
+ formula.quantity = Math.max((formula.quantity ?? 0) + 1, 2);
  } else {
- this.preparedFormulaData.push({
- itemUUID: formula.uuid,
- quantity: 1,
- });
+ this.preparedFormulaData.push({ itemUUID: formula.uuid, quantity: 1 });
  }
 
  return this.#updateRE();
@@ -160,17 +157,15 @@ class CraftingEntry implements Omit<CraftingEntryData, "parentItem"> {
  async increaseFormulaQuantity(index: number, itemUUID: string): Promise<void> {
  const formula = this.preparedFormulaData[index];
  if (!formula || formula.itemUUID !== itemUUID) return;
-
- formula.quantity ? (formula.quantity += 1) : (formula.quantity = 2);
+ formula.quantity = Math.max((formula.quantity ?? 0) + 1, 2);
 
  return this.#updateRE();
  }
 
  async decreaseFormulaQuantity(index: number, itemUUID: string): Promise<void> {
  const formula = this.preparedFormulaData[index];
  if (!formula || formula.itemUUID !== itemUUID) return;
-
- formula.quantity ? (formula.quantity -= 1) : (formula.quantity = 0);
+ formula.quantity = Math.max((formula.quantity ?? 0) - 1, 0);
 
  if (formula.quantity <= 0) {
  await this.unprepareFormula(index, itemUUID);
@@ -188,7 +183,6 @@ class CraftingEntry implements Omit<CraftingEntryData, "parentItem"> {
 
  const formula = this.preparedFormulaData[index];
  if (!formula || formula.itemUUID !== itemUUID) return;
-
  formula.quantity = quantity;
 
  return this.#updateRE();

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

@@ -509,9 +509,7 @@ class CompendiumBrowser extends Application {
  filter.isExpanded = !filter.isExpanded;
  const contentElement = title.nextElementSibling;
  if (contentElement instanceof HTMLElement) {
- filter.isExpanded
- ? (contentElement.style.display = "")
- : (contentElement.style.display = "none");
+ contentElement.style.display = filter.isExpanded ? "" : "none";
  }
  };
  switch (filterType) {
@@ -546,9 +544,11 @@ class CompendiumBrowser extends Application {
  const checkbox = currentTab.filterData.checkboxes[filterName];
  const option = checkbox.options[optionName];
  option.selected = !option.selected;
- option.selected
- ? checkbox.selected.push(optionName)
- : (checkbox.selected = checkbox.selected.filter((name) => name !== optionName));
+ if (option.selected) {
+ checkbox.selected.push(optionName);
+ } else {
+ checkbox.selected = checkbox.selected.filter((name) => name !== optionName);
+ }
  this.#clearScrollLimit(true);
  }
  });

src/module/apps/sidebar/chat-log.ts

@@ -290,7 +290,11 @@ class ChatLogPF2e extends ChatLog<ChatMessagePF2e> {
  if (!canvas) return;
  const token = message.token?.object;
  if (token?.isVisible && token.isOwner) {
- token.controlled ? token.release() : token.control({ releaseOthers: !event.shiftKey });
+ if (token.controlled) {
+ token.release();
+ } else {
+ token.control({ releaseOthers: !event.shiftKey });
+ }
  // If a double click, also pan to the token
  if (event.type === "dblclick") {
  const scale = Math.max(1, canvas.stage.scale.x);

src/module/item/shield/document.ts

@@ -141,7 +141,6 @@ class ShieldPF2e<TParent extends ActorPF2e | null = ActorPF2e | null> extends Ph
  { options: [mainDamageType, versatileDamageType], selection: mainDamageType },
  this.system.traits.integrated.versatile ?? {},
  );
- this.system.traits.integrated.versatile.options;
  } else if (this.system.traits.integrated) {
  this.system.traits.integrated.versatile = null;
  }

src/module/migration/migrations/659-multiple-damage-rows.ts

@@ -73,7 +73,7 @@ export class Migration659MultipleDamageRows extends MigrationBase {
  }
 
  if ("damageType" in data) {
- "game" in globalThis ? (data["-=damageType"] = null) : (data.damageType = undefined);
+ data["-=damageType"] = null;
  }
  }
 }

src/module/migration/migrations/666-usage-and-stowing-containers.ts

@@ -55,7 +55,7 @@ export class Migration666UsageAndStowingContainers extends MigrationBase {
  if (isPhysical && keepUsage && source.system.usage) {
  source.system.usage.value = traits.usage.value;
  }
- "game" in globalThis ? (traits["-=usage"] = null) : delete traits.usage;
+ traits["-=usage"] = null;
  }
 
  // Set usage on containers and whether they're for stowing

src/module/migration/migrations/670-ancestry-vision.ts

@@ -37,11 +37,11 @@ export class Migration670AncestryVision extends MigrationBase {
  const features: Record<string, MaybeOldABCFeatureEntryData | null> = ancestry.system.items;
  for (const [key, value] of Object.entries(features)) {
  if (value?.id === this.LOWLIGHTVISION_ID) {
- "game" in globalThis ? (features[`-=${key}`] = null) : delete features[key];
+ features[`-=${key}`] = null;
  // Prefer darkvision if the ancestry item somehow has both features
  ancestry.system.vision = ancestry.system.vision === "darkvision" ? "darkvision" : "lowLightVision";
  } else if (value?.id === this.DARKVISION_ID) {
- "game" in globalThis ? (features[`-=${key}`] = null) : delete features[key];
+ features[`-=${key}`] = null;
  ancestry.system.vision = "darkvision";
  }
  }

src/module/migration/migrations/672-remove-npc-base-properties.ts

@@ -11,7 +11,7 @@ export class Migration672RemoveNPCBaseProperties extends MigrationBase {
  property[replace] = Number(property[replace]) || 0;
  if (typeof property.base === "number") {
  property[replace] = property.base;
- "game" in globalThis ? (property["-=base?"] = null) : delete property.base;
+ property["-=base"] = null;
  }
  }
 
@@ -39,5 +39,5 @@ interface PropertyWithBase {
  value: number;
  max?: number;
  base?: number;
- "-=base?"?: null;
+ "-=base"?: null;
 }

src/module/migration/migrations/679-tower-shield-speed-penalty.ts

@@ -30,7 +30,7 @@ export class Migration679TowerShieldSpeedPenalty extends MigrationBase {
  potencyRune.value = (Number(systemData.potencyRune?.value) || 0) as ZeroToFour;
  if ("resilient" in systemData) {
  // Aborted attempt to store rune data?
- "game" in globalThis ? (systemData["-=resilient"] = null) : delete systemData.resilient;
+ systemData["-=resilient"] = null;
  }
  }
  }

src/module/migration/migrations/820-remove-unused-traits-data.ts

@@ -6,18 +6,14 @@ export class Migration820RemoveUnusedTraitsData extends MigrationBase {
  static override version = 0.82;
 
  override async updateItem(source: ItemSourcePF2e): Promise<void> {
- source.system.traits;
  const systemSource: MaybeWithTraits = source.system;
-
  if (!systemSource.traits) return;
 
  if ("custom" in systemSource.traits) {
- delete systemSource.traits.custom;
  systemSource.traits["-=custom"] = null;
  }
 
  if (source.type === "spellcastingEntry" || source.type === "condition") {
- delete systemSource.traits;
  systemSource["-=traits"] = null;
  }
  }

src/module/migration/migrations/862-specific-magic-armor.ts

@@ -24,7 +24,7 @@ export class Migration862SpecificMagicArmor extends MigrationBase {
  source.system.baseItem = "power-suit";
  break;
  case "subterfuge-suit":
- source.system.baseItem === "subterfuge-suit";
+ source.system.baseItem = "subterfuge-suit";
  break;
  case "clothing-explorers":
  source.system.slug = "explorers-clothing";

src/module/migration/migrations/895-fix-variant-spell-traits.ts

@@ -77,7 +77,7 @@ export class Migration895FixVariantSpellTraits extends MigrationBase {
  #fixOtherVariants(source: SpellSource): void {
  for (const partial of Object.values(source.system.damage).filter((p) => R.isObject(p))) {
  if (typeof partial.type === "string") {
- partial.type === ("healing" as DamageType) ? "untyped" : partial.type;
+ partial.type = partial.type === ("healing" as DamageType) ? "untyped" : partial.type;
  partial.type ||= "untyped";
  }
  }

src/module/rules/rule-element/ae-like.ts

@@ -238,7 +238,6 @@ class AELikeRuleElement<TSchema extends AELikeSchema> extends RuleElementPF2e<TS
  typeof value === "boolean" || typeof value === "number" || typeof value === "string" || value === null;
  if (!isLoggable) return;
 
- value;
  const level = item.isOfType("feat")
  ? Number(/-(\d+)$/.exec(item.system.location ?? "")?.[1]) || item.level
  : "level" in item && typeof item["level"] === "number"

src/module/rules/rule-element/grant-item/rule-element.ts

@@ -347,7 +347,6 @@ class GrantItemRuleElement extends RuleElementPF2e<GrantItemSchema> {
  }
 
  const flags = { pf2e: { grantedBy: { id: this.item.id, onDelete: "cascade" } } };
- conditionSource.flags.pf2e?.grantedBy;
  const condition = new ConditionPF2e(
  fu.mergeObject(conditionSource, {
  _id: fu.randomID(),

src/module/rules/rule-element/multiple-attack-penalty.ts

@@ -28,7 +28,8 @@ class MultipleAttackPenaltyRuleElement extends RuleElementPF2e<MAPRuleSchema> {
  if (this.ignored) return;
 
  const selector = this.resolveInjectedProperties(this.selector);
- if (this.ignored || selector.length === 0) true;
+ if (this.ignored || selector.length === 0) return;
+
  const value = Number(this.resolveValue(this.value)) || 0;
  if (value < 0) {
  const label = game.i18n.format("PF2E.UI.RuleElements.MultipleAttackPenalty.Breakdown", {