libram 0.8.35 → 0.8.37

package/dist/Clan.js

@@ -1,8 +1,8 @@
 import { decode as decodeEntities } from "html-entities";
 import { availableAmount, cliExecute, getClanId, getClanName, getPlayerId, Monster, putStash, refreshStash, retrieveItem, stashAmount, takeStash, visitUrl, xpath, } from "kolmafia";
-import { getFoldGroup } from "./lib";
-import logger from "./logger";
-import { arrayToCountedMap, countedMapToArray, countedMapToString, notNull, parseNumber, } from "./utils";
+import { getFoldGroup } from "./lib.js";
+import logger from "./logger.js";
+import { arrayToCountedMap, countedMapToArray, countedMapToString, notNull, parseNumber, } from "./utils.js";
 const clanIdCache = {};
 const toPlayerId = (player) => typeof player === "string" ? getPlayerId(player) : player;
 const LOG_FAX_PATTERN = /(\d{2}\/\d{2}\/\d{2}, \d{2}:\d{2}(?:AM|PM): )<a [^>]+>([^<]+)<\/a>(?: faxed in a (?<monster>.*?))<br>/;

package/dist/Dungeon.js

@@ -1,8 +1,8 @@
 import { getClanName, toItem, visitUrl, xpath } from "kolmafia";
-import { Clan } from "./Clan";
-import { getPlayerFromIdOrName } from "./lib";
-import { $items } from "./template-string";
-import { countedMapToArray } from "./utils";
+import { Clan } from "./Clan.js";
+import { getPlayerFromIdOrName } from "./lib.js";
+import { $items } from "./template-string.js";
+import { countedMapToArray } from "./utils.js";
 export class Dungeon {
     name_;
     loot;

package/dist/Kmail.js

@@ -1,8 +1,8 @@
 import { decode as decodeEntities } from "html-entities";
 import { extractMeat, isGiftable, visitUrl } from "kolmafia";
-import { extractItems } from "./lib";
-import { combineQuery, EMPTY_VALUE, fetchUrl } from "./url";
-import { arrayToCountedMap, chunk } from "./utils";
+import { extractItems } from "./lib.js";
+import { combineQuery, EMPTY_VALUE, fetchUrl } from "./url.js";
+import { arrayToCountedMap, chunk } from "./utils.js";
 export default class Kmail {
     id;
     date;

package/dist/Macro.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/Macro.test.js

@@ -0,0 +1,126 @@
+/* eslint-disable libram/verify-constants */
+import { describe, it, expect } from "vitest";
+import { InvalidMacroError, Macro } from "./combat.js";
+import { $class, $effect, $item, $location, $monster, $skill, $stat, } from "./template-string.js";
+describe(Macro, () => {
+    it("abort", () => {
+        expect(Macro.abort().toString()).toEqual(`abort;`);
+    });
+    it("abortWithWarning", () => {
+        expect(Macro.abortWithWarning("test").toString()).toEqual(`abort "test";`);
+    });
+    it("runaway", () => {
+        expect(Macro.runaway().toString()).toEqual(`runaway;`);
+    });
+    it("if_", () => {
+        expect(Macro.if_("mock", Macro.abort()).toString()).toEqual(`if mock;abort;endif;`);
+    });
+    it("ifNot", () => {
+        expect(Macro.ifNot("mock", Macro.abort()).toString()).toEqual(`if !(mock);abort;endif;`);
+    });
+    it("while_", () => {
+        expect(Macro.while_("mock", Macro.abort()).toString()).toEqual(`while mock;abort;endwhile;`);
+    });
+    it("externalIf false", () => {
+        expect(Macro.externalIf(false, "true", "false").toString()).toEqual(`false;`);
+    });
+    it("externalIf true", () => {
+        expect(Macro.externalIf(true, "true", "false").toString()).toEqual(`true;`);
+    });
+    it("repeat", () => {
+        expect(Macro.attack().repeat().toString()).toEqual(`attack;repeat;`);
+    });
+    it("repeat message", () => {
+        expect(Macro.attack().repeat("mock").toString()).toEqual(`attack;repeat mock;`);
+    });
+    it("skill", () => {
+        const mock = $skill `mock skill`;
+        expect(Macro.skill(mock).toString()).toEqual(`skill ${mock.name};`);
+    });
+    it("trySkill", () => {
+        const mock = $skill `mock skill`;
+        expect(Macro.trySkill(mock).toString()).toEqual(`if hasskill ${mock.name};skill ${mock.name};endif;`);
+    });
+    it("trySkillRepeat", () => {
+        const mock = $skill `mock skill`;
+        expect(Macro.trySkillRepeat(mock).toString()).toEqual(`if hasskill ${mock.name};skill ${mock.name};repeat hasskill ${mock.name};endif;`);
+    });
+    it("item", () => {
+        const mock = $item `mock item`;
+        expect(Macro.item(mock).toString()).toEqual(`use ${mock.name};`);
+    });
+    it("tryItem", () => {
+        const mock = $item `mock item`;
+        expect(Macro.tryItem(mock).toString()).toEqual(`if hascombatitem mock item;use ${mock.name};endif;`);
+    });
+    it("attack", () => {
+        expect(Macro.attack().toString()).toEqual(`attack;`);
+    });
+    it.todo("ifHolidayWanderer");
+    it.todo("ifNotHolidayWanderer");
+});
+describe(Macro.makeBALLSPredicate, () => {
+    it("Monster", () => {
+        const mock = $monster `mock monster`;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`monsterid ${mock.id}`);
+    });
+    it("Monster[]", () => {
+        const mockArray = [$monster `mock monster1`, $monster `mock monster2`];
+        expect(Macro.makeBALLSPredicate(mockArray)).toEqual(`(monsterid ${mockArray[0].id} || monsterid ${mockArray[1].id})`);
+    });
+    it("Effect", () => {
+        const mock = $effect `mock effect`;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`haseffect ${mock.id}`);
+    });
+    it("Skill", () => {
+        const mock = $skill `mock skill`;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`hasskill ${mock.name}`);
+    });
+    it("Skill Overlapping", () => {
+        const mock = $skill `Thrust-Smack`;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`hasskill ${mock.id}`);
+    });
+    it("Item", () => {
+        const mock = $item `mock item`;
+        // @ts-expect-error TypeScript believes that this is readonly
+        mock.combat = true;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`hascombatitem ${mock.name}`);
+    });
+    it("Item Overlapping", () => {
+        const mock = $item `spider web`;
+        // @ts-expect-error TypeScript believes that this is readonly
+        mock.combat = true;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`hascombatitem ${mock.id}`);
+    });
+    it("Item Invalid", () => {
+        const mock = $item `invalid mock item`;
+        expect(() => Macro.makeBALLSPredicate(mock)).toThrow(InvalidMacroError);
+    });
+    it("Location", () => {
+        const mock = $location `mock location`;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`snarfblat ${mock.id}`);
+    });
+    it("Location Invalid", () => {
+        const mock = $location `invalid mock location`;
+        // @ts-expect-error TypeScript believes that this is readonly
+        mock.id = -1;
+        expect(() => Macro.makeBALLSPredicate(mock)).toThrow(InvalidMacroError);
+    });
+    it("Class", () => {
+        const mock = $class `Mock Name`;
+        // @ts-expect-error TypeScript believes that this is readonly
+        mock.id = 1;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`mockname`);
+    });
+    it("Class Invalid", () => {
+        const mock = $class `invalid mock class`;
+        expect(() => Macro.makeBALLSPredicate(mock)).toThrow(InvalidMacroError);
+    });
+    it("Stat", () => {
+        const mock = $stat `Mock`;
+        expect(Macro.makeBALLSPredicate(mock)).toEqual(`mockclass`);
+    });
+    it("string", () => {
+        expect(Macro.makeBALLSPredicate("mock")).toEqual("mock");
+    });
+});

package/dist/actions/ActionSource.d.ts

@@ -1,6 +1,6 @@
 import { Familiar, Item, Skill } from "kolmafia";
-import { Macro } from "../combat";
-import { Requirement } from "../maximize";
+import { Macro } from "../combat.js";
+import { Requirement } from "../maximize.js";
 export type FindActionSourceConstraints = {
     /**
      * Function returning true if we only accept familiar-based actions.

package/dist/actions/ActionSource.js

@@ -1,7 +1,7 @@
 import { mallPrice, useFamiliar } from "kolmafia";
-import { Macro } from "../combat";
-import { Requirement } from "../maximize";
-import { sum, flat } from "../utils";
+import { Macro } from "../combat.js";
+import { Requirement } from "../maximize.js";
+import { sum, flat } from "../utils.js";
 /**
  * Merge a set of constraints into one
  *

package/dist/actions/Banish.d.ts

@@ -1,4 +1,4 @@
-import { ActionSource, FindActionSourceConstraints } from "./ActionSource";
+import { ActionSource, FindActionSourceConstraints } from "./ActionSource.js";
 /**
  * Find an available banish source subject to constraints.
  *

package/dist/actions/Banish.js

@@ -1,11 +1,11 @@
 import { canEquip, cliExecute, myTurncount, restoreMp, retrieveItem, visitUrl, } from "kolmafia";
-import { Macro } from "../combat";
-import { getFoldGroup, have } from "../lib";
-import { Requirement } from "../maximize";
-import { get } from "../property";
-import * as AsdonMartin from "../resources/2017/AsdonMartin";
-import { $item, $items, $skill } from "../template-string";
-import { ActionSource, findActionSource, } from "./ActionSource";
+import { Macro } from "../combat.js";
+import { getFoldGroup, have } from "../lib.js";
+import { Requirement } from "../maximize.js";
+import { get } from "../property.js";
+import * as AsdonMartin from "../resources/2017/AsdonMartin.js";
+import { $item, $items, $skill } from "../template-string.js";
+import { ActionSource, findActionSource, } from "./ActionSource.js";
 // Value of _lastCombatStarted the last time we updated scrapbook charges.
 let scrapbookChargesLastUpdated = get("_lastCombatStarted");
 // Free unlimited source every 30 turns.

package/dist/actions/FreeKill.d.ts

@@ -1,4 +1,4 @@
-import { ActionSource, FindActionSourceConstraints } from "./ActionSource";
+import { ActionSource, FindActionSourceConstraints } from "./ActionSource.js";
 /**
  * Find an available free kill source subject to constraints.
  *

package/dist/actions/FreeKill.js

@@ -1,11 +1,11 @@
 import { canEquip, myLightning, restoreMp, retrieveItem, use } from "kolmafia";
-import { Macro } from "../combat";
-import { have } from "../lib";
-import { Requirement } from "../maximize";
-import { get } from "../property";
-import * as AsdonMartin from "../resources/2017/AsdonMartin";
-import { $familiar, $item, $items, $skill } from "../template-string";
-import { ActionSource, findActionSource, } from "./ActionSource";
+import { Macro } from "../combat.js";
+import { have } from "../lib.js";
+import { Requirement } from "../maximize.js";
+import { get } from "../property.js";
+import * as AsdonMartin from "../resources/2017/AsdonMartin.js";
+import { $familiar, $item, $items, $skill } from "../template-string.js";
+import { ActionSource, findActionSource, } from "./ActionSource.js";
 const freeKillSources = [
     // Free limited sources
     new ActionSource($skill `Gingerbread Mob Hit`, () => !get("_gingerbreadMobHitUsed") && have($skill `Gingerbread Mob Hit`)

package/dist/actions/FreeRun.d.ts

@@ -1,4 +1,4 @@
-import { ActionSource, FindActionSourceConstraints } from "./ActionSource";
+import { ActionSource, FindActionSourceConstraints } from "./ActionSource.js";
 /**
  * Find an available free run source subject to constraints.
  *

package/dist/actions/FreeRun.js

@@ -1,12 +1,12 @@
 import { retrieveItem } from "kolmafia";
-import { Macro } from "../combat";
-import { ensureEffect, getSongCount, getSongLimit, have } from "../lib";
-import { Requirement } from "../maximize";
-import { get } from "../property";
-import * as Bandersnatch from "../resources/2009/Bandersnatch";
-import * as StompingBoots from "../resources/2011/StompingBoots";
-import { $effect, $familiar, $item, $items, $skill } from "../template-string";
-import { ActionSource, findActionSource, } from "./ActionSource";
+import { Macro } from "../combat.js";
+import { ensureEffect, getSongCount, getSongLimit, have } from "../lib.js";
+import { Requirement } from "../maximize.js";
+import { get } from "../property.js";
+import * as Bandersnatch from "../resources/2009/Bandersnatch.js";
+import * as StompingBoots from "../resources/2011/StompingBoots.js";
+import { $effect, $familiar, $item, $items, $skill, } from "../template-string.js";
+import { ActionSource, findActionSource, } from "./ActionSource.js";
 const everythingLooksGreen = (otherClause = () => true) => () => otherClause() && !have($effect `Everything Looks Green`) ? 1 : 0;
 const freeRunSources = [
     // Free unlimited source

package/dist/actions/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./ActionSource";
-export * from "./Banish";
-export * from "./FreeKill";
-export * from "./FreeRun";
+export * from "./ActionSource.js";
+export * from "./Banish.js";
+export * from "./FreeKill.js";
+export * from "./FreeRun.js";

package/dist/actions/index.js

@@ -1,4 +1,4 @@
-export * from "./ActionSource";
-export * from "./Banish";
-export * from "./FreeKill";
-export * from "./FreeRun";
+export * from "./ActionSource.js";
+export * from "./Banish.js";
+export * from "./FreeKill.js";
+export * from "./FreeRun.js";

package/dist/ascend.d.ts

@@ -1,6 +1,6 @@
 import { Skill, Class, Item, Path, MafiaClass } from "kolmafia";
-import { MoonSign } from "./moonSign";
-import { ChateauMantegna } from "./resources";
+import { MoonSign } from "./moonSign.js";
+import { ChateauMantegna } from "./resources/index.js";
 export declare enum Lifestyle {
     casual = 1,
     softcore = 2,

package/dist/ascend.js

@@ -1,9 +1,9 @@
 import { eudoraItem, getCampground, Item, Path, use, visitUrl, xpath, haveSkill, getPermedSkills, toSkill, } from "kolmafia";
-import { signNameToId } from "./moonSign";
-import { get } from "./property";
-import { ChateauMantegna } from "./resources";
-import { $item, $items, $stat } from "./template-string";
-import { arrayContains, tc } from "./utils";
+import { signNameToId } from "./moonSign.js";
+import { get } from "./property.js";
+import { ChateauMantegna } from "./resources/index.js";
+import { $item, $items, $stat } from "./template-string.js";
+import { arrayContains, tc } from "./utils.js";
 export var Lifestyle;
 (function (Lifestyle) {
     Lifestyle[Lifestyle["casual"] = 1] = "casual";

package/dist/challengePaths/2014/HeavyRains.js

@@ -1,7 +1,7 @@
 import { Modifier, Monster, monsterFactoidsAvailable, myRain, numericModifier, useSkill, visitUrl, } from "kolmafia";
-import { have } from "../../lib";
-import { withChoice } from "../../property";
-import { $monster, $path, $skill } from "../../template-string";
+import { have } from "../../lib.js";
+import { withChoice } from "../../property.js";
+import { $monster, $path, $skill } from "../../template-string.js";
 /**
  * Cast Rain Man and fight the target monster
  * @param target the monster to fight

package/dist/challengePaths/2015/CommunityService.d.ts

@@ -1,5 +1,5 @@
 import { Effect } from "kolmafia";
-import { Requirement } from "../../maximize";
+import { Requirement } from "../../maximize.js";
 export default class CommunityService {
     private choice;
     private stat;

package/dist/challengePaths/2015/CommunityService.js

@@ -1,10 +1,10 @@
 import { equippedItem, familiarWeight, getPower, haveEquipped, myAdventures, myBasestat, myBuffedstat, myFamiliar, myMaxhp, myThrall, myTurncount, numericModifier, print, runChoice, toSlot, visitUrl, weightAdjustment, } from "kolmafia";
-import { have } from "../../lib";
-import { Requirement } from "../../maximize";
-import { get } from "../../property";
-import { MummingTrunk } from "../../resources";
-import { $effect, $familiar, $item, $items, $path, $slot, $stat, $thrall, } from "../../template-string";
-import { clamp, sum } from "../../utils";
+import { have } from "../../lib.js";
+import { Requirement } from "../../maximize.js";
+import { get } from "../../property.js";
+import { MummingTrunk } from "../../resources/index.js";
+import { $effect, $familiar, $item, $items, $path, $slot, $stat, $thrall, } from "../../template-string.js";
+import { clamp, sum } from "../../utils.js";
 const thralls = new Map([
     [$stat `muscle`, $thrall `Elbow Macaroni`],
     [$stat `moxie`, $thrall `Penne Dreadful`],

package/dist/challengePaths/2016/NuclearAutumn.js

@@ -1,5 +1,5 @@
 import { visitUrl } from "kolmafia";
-import { $path } from "../../template-string";
+import { $path } from "../../template-string.js";
 /**
  * Visits the Cooling Tank on level 8 of the Fallout shelter to gain 300 rads
  */

package/dist/challengePaths/index.d.ts

@@ -1,4 +1,4 @@
-import * as HeavyRains from "./2014/HeavyRains";
-import CommunityService from "./2015/CommunityService";
-import * as NuclearAutumn from "./2016/NuclearAutumn";
+import * as HeavyRains from "./2014/HeavyRains.js";
+import CommunityService from "./2015/CommunityService.js";
+import * as NuclearAutumn from "./2016/NuclearAutumn.js";
 export { CommunityService, NuclearAutumn, HeavyRains };

package/dist/challengePaths/index.js

@@ -1,4 +1,4 @@
-import * as HeavyRains from "./2014/HeavyRains";
-import CommunityService from "./2015/CommunityService";
-import * as NuclearAutumn from "./2016/NuclearAutumn";
+import * as HeavyRains from "./2014/HeavyRains.js";
+import CommunityService from "./2015/CommunityService.js";
+import * as NuclearAutumn from "./2016/NuclearAutumn.js";
 export { CommunityService, NuclearAutumn, HeavyRains };

package/dist/combat.d.ts

@@ -119,7 +119,7 @@ export declare class Macro {
      * Create a new macro with an "abort" step to this macro, with a warning message to print
      *
      * @param warning The warning message to print
-     * @returns  {Macro} This object itself.
+     * @returns {Macro} This object itself.
      */
     static abortWithWarning<T extends Macro>(this: Constructor<T>, warning: string): T;
     /**
@@ -134,7 +134,12 @@ export declare class Macro {
      * @returns {Macro} This object itself.
      */
     static runaway<T extends Macro>(this: Constructor<T>): T;
-    private static makeBALLSPredicate;
+    /**
+     *
+     * @param condition The BALLS condition or a type to make a condition for (Monster, Item, Skill, etc.)
+     * @returns {string} The BALLS condition string
+     */
+    static makeBALLSPredicate(condition: PreBALLSPredicate): string;
     /**
      * Add an "if" statement to this macro.
      *
@@ -170,19 +175,19 @@ export declare class Macro {
     /**
      * Add a "while" statement to this macro.
      *
-     * @param condition The BALLS condition for the if statement.
+     * @param condition The BALLS condition for the while statement.
      * @param contents Loop to repeat while the condition is true.
      * @returns {Macro} This object itself.
      */
-    while_(condition: string, contents: string | Macro): this;
+    while_(condition: PreBALLSPredicate, contents: string | Macro): this;
     /**
      * Create a new macro with a "while" statement.
      *
-     * @param condition The BALLS condition for the if statement.
+     * @param condition The BALLS condition for the while statement.
      * @param contents Loop to repeat while the condition is true.
      * @returns {Macro} This object itself.
      */
-    static while_<T extends Macro>(this: Constructor<T>, condition: string, contents: string | Macro): T;
+    static while_<T extends Macro>(this: Constructor<T>, condition: PreBALLSPredicate, contents: string | Macro): T;
     /**
      * Conditionally add a step to a macro based on a condition evaluated at the time of building the macro.
      *
@@ -204,9 +209,10 @@ export declare class Macro {
     /**
      * Add a repeat step to the macro.
      *
+     * @param condition The BALLS condition for the repeat statement, optional.
      * @returns {Macro} This object itself.
      */
-    repeat(): this;
+    repeat(condition?: PreBALLSPredicate): this;
     /**
      * Add one or more skill cast steps to the macro.
      *

package/dist/combat.js

@@ -1,7 +1,7 @@
 import { adv1, choiceFollowsFight, Class, Effect, getAutoAttack, inMultiFight, Item, Location, Monster, removeProperty, runCombat, setAutoAttack, Skill, Stat, urlEncode, visitUrl, xpath, } from "kolmafia";
-import { getTodaysHolidayWanderers } from "./lib";
-import { overlappingItemNames, overlappingSkillNames, } from "./overlappingNames";
-import { get, set } from "./property";
+import { getTodaysHolidayWanderers } from "./lib.js";
+import { overlappingItemNames, overlappingSkillNames, } from "./overlappingNames.js";
+import { get, set } from "./property.js";
 const MACRO_NAME = "Script Autoattack Macro";
 /**
  * Get the KoL native ID of the macro with name name.
@@ -246,7 +246,7 @@ export class Macro {
      * Create a new macro with an "abort" step to this macro, with a warning message to print
      *
      * @param warning The warning message to print
-     * @returns  {Macro} This object itself.
+     * @returns {Macro} This object itself.
      */
     static abortWithWarning(warning) {
         return new this().abortWithWarning(warning);
@@ -267,49 +267,49 @@ export class Macro {
     static runaway() {
         return new this().runaway();
     }
+    /**
+     *
+     * @param condition The BALLS condition or a type to make a condition for (Monster, Item, Skill, etc.)
+     * @returns {string} The BALLS condition string
+     */
     static makeBALLSPredicate(condition) {
-        let ballsCondition = "";
         if (condition instanceof Monster) {
-            ballsCondition = `monsterid ${condition.id}`;
+            return `monsterid ${condition.id}`;
         }
         else if (condition instanceof Array) {
-            ballsCondition = condition
-                .map((mon) => `monsterid ${mon.id}`)
-                .join(" || ");
-            ballsCondition = `(${ballsCondition})`;
+            return `(${condition
+                .map((entry) => Macro.makeBALLSPredicate(entry))
+                .join(" || ")})`;
         }
         else if (condition instanceof Effect) {
-            ballsCondition = `haseffect ${condition.id}`;
+            return `haseffect ${condition.id}`;
         }
         else if (condition instanceof Skill) {
-            ballsCondition = `hasskill ${skillBallsMacroName(condition)}`;
+            return `hasskill ${skillBallsMacroName(condition)}`;
         }
         else if (condition instanceof Item) {
             if (!condition.combat) {
                 throw new InvalidMacroError(`Item ${condition} cannot be made a valid BALLS predicate (it is not combat-usable)`);
             }
-            ballsCondition = `hascombatitem ${itemOrItemsBallsMacroName(condition)}`;
+            return `hascombatitem ${itemOrItemsBallsMacroName(condition)}`;
         }
         else if (condition instanceof Location) {
             const snarfblat = condition.id;
             if (snarfblat < 1) {
                 throw new InvalidMacroError(`Location ${condition} cannot be made a valid BALLS predicate (it has no location id)`);
             }
-            ballsCondition = `snarfblat ${snarfblat}`;
+            return `snarfblat ${snarfblat}`;
         }
         else if (condition instanceof Class) {
             if (condition.id > 6) {
                 throw new InvalidMacroError(`Class ${condition} cannot be made a valid BALLS predicate (it is not a standard class)`);
             }
-            ballsCondition = condition.toString().replaceAll(" ", "").toLowerCase();
+            return condition.toString().replaceAll(" ", "").toLowerCase();
         }
         else if (condition instanceof Stat) {
-            ballsCondition = `${condition.toString().toLowerCase()}class`;
+            return `${condition.toString().toLowerCase()}class`;
         }
-        else {
-            ballsCondition = condition;
-        }
-        return ballsCondition;
+        return condition;
     }
     /**
      * Add an "if" statement to this macro.
@@ -358,17 +358,19 @@ export class Macro {
     /**
      * Add a "while" statement to this macro.
      *
-     * @param condition The BALLS condition for the if statement.
+     * @param condition The BALLS condition for the while statement.
      * @param contents Loop to repeat while the condition is true.
      * @returns {Macro} This object itself.
      */
     while_(condition, contents) {
-        return this.step(`while ${condition}`).step(contents).step("endwhile");
+        return this.step(`while ${Macro.makeBALLSPredicate(condition)}`)
+            .step(contents)
+            .step("endwhile");
     }
     /**
      * Create a new macro with a "while" statement.
      *
-     * @param condition The BALLS condition for the if statement.
+     * @param condition The BALLS condition for the while statement.
      * @param contents Loop to repeat while the condition is true.
      * @returns {Macro} This object itself.
      */
@@ -405,10 +407,13 @@ export class Macro {
     /**
      * Add a repeat step to the macro.
      *
+     * @param condition The BALLS condition for the repeat statement, optional.
      * @returns {Macro} This object itself.
      */
-    repeat() {
-        return this.step("repeat");
+    repeat(condition) {
+        return condition === undefined
+            ? this.step("repeat")
+            : this.step(`repeat ${Macro.makeBALLSPredicate(condition)}`);
     }
     /**
      * Add one or more skill cast steps to the macro.
@@ -437,8 +442,10 @@ export class Macro {
      * @returns {Macro} This object itself.
      */
     trySkill(...skills) {
-        return this.step(...skills.map((skill) => {
-            return Macro.if_(`hasskill ${skillBallsMacroName(skill)}`, Macro.skill(skill));
+        return this.step(...skills
+            .map((skillOrName) => skillOrNameToSkill(skillOrName))
+            .map((skill) => {
+            return Macro.if_(Macro.makeBALLSPredicate(skill), Macro.skill(skill));
         }));
     }
     /**
@@ -457,8 +464,10 @@ export class Macro {
      * @returns {Macro} This object itself.
      */
     trySkillRepeat(...skills) {
-        return this.step(...skills.map((skill) => {
-            return Macro.if_(`hasskill ${skillBallsMacroName(skill)}`, Macro.skill(skill).repeat());
+        return this.step(...skills
+            .map((skillOrName) => skillOrNameToSkill(skillOrName))
+            .map((skill) => {
+            return Macro.if_(Macro.makeBALLSPredicate(skill), Macro.skill(skill).repeat(skill));
         }));
     }
     /**
@@ -498,7 +507,7 @@ export class Macro {
      */
     tryItem(...items) {
         return this.step(...items.map((item) => {
-            return Macro.if_(itemOrItemsBallsMacroPredicate(item), `use ${itemOrItemsBallsMacroName(item)}`);
+            return Macro.if_(itemOrItemsBallsMacroPredicate(item), Macro.item(item));
         }));
     }
     /**

package/dist/diet/index.js

@@ -1,11 +1,11 @@
 import { canEquip, fullnessLimit, historicalAge, historicalPrice, inebrietyLimit, itemType, mallPrice, mallPrices, myFullness, myInebriety, myLevel, myPrimestat, mySpleenUse, npcPrice, spleenLimit, } from "kolmafia";
-import { have } from "../lib";
-import { get as getModifier } from "../modifier";
-import { get } from "../property";
-import { Mayo, installed as mayoInstalled } from "../resources/2015/MayoClinic";
-import { $effect, $item, $items, $skill, $stat } from "../template-string";
-import { notNullish, sum } from "../utils";
-import { knapsack } from "./knapsack";
+import { have } from "../lib.js";
+import { get as getModifier } from "../modifier.js";
+import { get } from "../property.js";
+import { Mayo, installed as mayoInstalled, } from "../resources/2015/MayoClinic.js";
+import { $effect, $item, $items, $skill, $stat } from "../template-string.js";
+import { notNullish, sum } from "../utils.js";
+import { knapsack } from "./knapsack.js";
 function isMonday() {
     // Checking Tuesday's ruby is a hack to see if it's Monday in Arizona.
     return getModifier("Muscle Percent", $item `Tuesday's ruby`) > 0;

package/dist/diet/knapsack.js

@@ -1,4 +1,4 @@
-import { sum } from "../utils";
+import { sum } from "../utils.js";
 class Not {
     thing;
     constructor(thing) {

package/dist/diet/knapsack.test.d.ts

@@ -0,0 +1 @@
+export {};