libram 0.4.1 → 0.4.2

package/dist/since.js

@@ -1,76 +1,23 @@
-"use strict";
-
-require("core-js/modules/es.object.to-string.js");
-
-require("core-js/modules/es.regexp.to-string.js");
-
-require("core-js/modules/es.reflect.construct.js");
-
-require("core-js/modules/es.array.iterator.js");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sinceKolmafiaRevision = sinceKolmafiaRevision;
-exports.sinceKolmafiaVersion = sinceKolmafiaVersion;
-exports.KolmafiaVersionError = void 0;
-
-require("core-js/modules/es.array.concat.js");
-
-require("core-js/modules/es.regexp.exec.js");
-
-var _kolmafia = require("kolmafia");
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
-
-function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
+/**
+ * Provides functions for checking KoLmafia's version and revision.
+ * @packageDocumentation
+ */
+import { getRevision, getVersion } from "kolmafia";
 /**
  * Represents an exception thrown when the current KoLmafia version does not
  * match an expected condition.
  */
-var KolmafiaVersionError = /*#__PURE__*/function (_Error) {
-  _inherits(KolmafiaVersionError, _Error);
-
-  var _super = _createSuper(KolmafiaVersionError);
-
-  function KolmafiaVersionError(message) {
-    var _this;
-
-    _classCallCheck(this, KolmafiaVersionError);
-
-    _this = _super.call(this, message); // Explicitly set the prototype, so that 'instanceof' still works in Node.js
-    // even when the class is transpiled down to ES5
-    // See: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
-    // Note that this code isn't needed for Rhino.
-
-    Object.setPrototypeOf(_assertThisInitialized(_this), KolmafiaVersionError.prototype);
-    return _this;
-  }
-
-  return KolmafiaVersionError;
-}( /*#__PURE__*/_wrapNativeSuper(Error)); // Manually set class name, so that the stack trace shows proper name in Rhino
-
-
-exports.KolmafiaVersionError = KolmafiaVersionError;
+export class KolmafiaVersionError extends Error {
+    constructor(message) {
+        super(message);
+        // Explicitly set the prototype, so that 'instanceof' still works in Node.js
+        // even when the class is transpiled down to ES5
+        // See: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
+        // Note that this code isn't needed for Rhino.
+        Object.setPrototypeOf(this, KolmafiaVersionError.prototype);
+    }
+}
+// Manually set class name, so that the stack trace shows proper name in Rhino
 KolmafiaVersionError.prototype.name = "KolmafiaVersionError";
 /**
  * Returns the currently executing script name, suitable for embedding in an
@@ -78,13 +25,10 @@ KolmafiaVersionError.prototype.name = "KolmafiaVersionError";
  * @returns Path of the main script wrapped in single-quotes, or `"This script"`
  *    if the path cannot be determined
  */
-
 function getScriptName() {
-  var _require$main;
-
-  // In Rhino, the current script name is available in require.main.id
-  var scriptName = (_require$main = require.main) === null || _require$main === void 0 ? void 0 : _require$main.id;
-  return scriptName ? "'".concat(scriptName, "'") : "This script";
+    // In Rhino, the current script name is available in require.main.id
+    const scriptName = require.main?.id;
+    return scriptName ? `'${scriptName}'` : "This script";
 }
 /**
  * If KoLmafia's revision number is less than `revision`, throws an exception.
@@ -102,17 +46,15 @@ function getScriptName() {
  * sinceKolmafiaRevision(20500);
  * ```
  */
-
-
-function sinceKolmafiaRevision(revision) {
-  if (!Number.isInteger(revision)) {
-    throw new TypeError("Invalid revision number ".concat(revision, " (must be an integer)"));
-  } // Based on net.sourceforge.kolmafia.textui.Parser.sinceException()
-
-
-  if ((0, _kolmafia.getRevision)() < revision) {
-    throw new KolmafiaVersionError("".concat(getScriptName(), " requires revision r").concat(revision, " of kolmafia or higher (current: ").concat((0, _kolmafia.getRevision)(), "). Up-to-date builds can be found at https://ci.kolmafia.us/."));
-  }
+export function sinceKolmafiaRevision(revision) {
+    if (!Number.isInteger(revision)) {
+        throw new TypeError(`Invalid revision number ${revision} (must be an integer)`);
+    }
+    // Based on net.sourceforge.kolmafia.textui.Parser.sinceException()
+    const currentRevision = getRevision();
+    if (currentRevision > 0 && currentRevision < revision) {
+        throw new KolmafiaVersionError(`${getScriptName()} requires revision r${revision} of kolmafia or higher (current: ${getRevision()}). Up-to-date builds can be found at https://ci.kolmafia.us/.`);
+    }
 }
 /**
  * If KoLmafia's version is less than `majorVersion.minorVersion`, throws an
@@ -122,6 +64,7 @@ function sinceKolmafiaRevision(revision) {
  * This behaves like the `since X.Y;` statement in ASH.
  * @param majorVersion Major version number
  * @param minorVersion Minor version number
+ * @deprecated Point versions are no longer released by KoLmafia
  * @throws {KolmafiaVersionError}
  *    If KoLmafia's major version is less than `majorVersion`, or if the major
  *    versions are equal but the minor version is less than `minorVersion`
@@ -134,29 +77,30 @@ function sinceKolmafiaRevision(revision) {
  * sinceKolmafiaVersion(20, 7);
  * ```
  */
-
-
-function sinceKolmafiaVersion(majorVersion, minorVersion) {
-  if (!Number.isInteger(majorVersion)) {
-    throw new TypeError("Invalid major version number ".concat(majorVersion, " (must be an integer)"));
-  }
-
-  if (!Number.isInteger(minorVersion)) {
-    throw new TypeError("Invalid minor version number ".concat(minorVersion, " (must be an integer)"));
-  }
-
-  var versionStr = (0, _kolmafia.getVersion)();
-  var versionStrMatch = /v(\d+)\.(\d+)/.exec(versionStr);
-
-  if (!versionStrMatch) {
-    // This is not something the user should handle
-    throw new Error("Unexpected KoLmafia version string: \"".concat(versionStr, "\". You may need to update the script."));
-  }
-
-  var currentMajorVersion = Number(versionStrMatch[1]);
-  var currentMinorVersion = Number(versionStrMatch[2]); // Based on net.sourceforge.kolmafia.textui.Parser.sinceException()
-
-  if (currentMajorVersion < majorVersion || currentMajorVersion === majorVersion && currentMinorVersion < minorVersion) {
-    throw new KolmafiaVersionError("".concat(getScriptName(), " requires version ").concat(majorVersion, ".").concat(minorVersion, " of kolmafia or higher (current: ").concat(currentMajorVersion, ".").concat(currentMinorVersion, "). Up-to-date builds can be found at https://ci.kolmafia.us/."));
-  }
-}
+export function sinceKolmafiaVersion(majorVersion, minorVersion) {
+    if (getRevision() >= 25720) {
+        return;
+    }
+    if (!Number.isInteger(majorVersion)) {
+        throw new TypeError(`Invalid major version number ${majorVersion} (must be an integer)`);
+    }
+    if (!Number.isInteger(minorVersion)) {
+        throw new TypeError(`Invalid minor version number ${minorVersion} (must be an integer)`);
+    }
+    if (majorVersion > 21 || (majorVersion === 20 && minorVersion > 9)) {
+        throw new Error(`There were no versions released after 21.09. This command will always fail`);
+    }
+    const versionStr = getVersion();
+    const versionStrMatch = /v(\d+)\.(\d+)/.exec(versionStr);
+    if (!versionStrMatch) {
+        // This is not something the user should handle
+        throw new Error(`Unexpected KoLmafia version string: "${versionStr}". You may need to update the script.`);
+    }
+    const currentMajorVersion = Number(versionStrMatch[1]);
+    const currentMinorVersion = Number(versionStrMatch[2]);
+    // Based on net.sourceforge.kolmafia.textui.Parser.sinceException()
+    if (currentMajorVersion < majorVersion ||
+        (currentMajorVersion === majorVersion && currentMinorVersion < minorVersion)) {
+        throw new KolmafiaVersionError(`${getScriptName()} requires version ${majorVersion}.${minorVersion} of kolmafia or higher (current: ${currentMajorVersion}.${currentMinorVersion}). Up-to-date builds can be found at https://ci.kolmafia.us/.`);
+    }
+}

package/dist/template-string.js

@@ -1,299 +1,207 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.$thralls = exports.$thrall = exports.$stats = exports.$stat = exports.$slots = exports.$slot = exports.$skills = exports.$skill = exports.$servants = exports.$servant = exports.$phyla = exports.$phylum = exports.$monsters = exports.$monster = exports.$locations = exports.$location = exports.$items = exports.$item = exports.$familiars = exports.$familiar = exports.$elements = exports.$element = exports.$effects = exports.$effect = exports.$coinmasters = exports.$coinmaster = exports.$classes = exports.$class = exports.$bounties = exports.$bounty = void 0;
-
-require("core-js/modules/es.array.concat.js");
-
-require("core-js/modules/es.regexp.exec.js");
-
-require("core-js/modules/es.string.split.js");
-
-var concatTemplateString = function concatTemplateString(literals) {
-  for (var _len = arguments.length, placeholders = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    placeholders[_key - 1] = arguments[_key];
-  }
-
-  return literals.reduce((acc, literal, i) => acc + literal + (placeholders[i] || ""), "");
+const concatTemplateString = (literals, ...placeholders) => literals.reduce((acc, literal, i) => acc + literal + (placeholders[i] || ""), "");
+const createSingleConstant = (Type) => (literals, ...placeholders) => {
+    const input = concatTemplateString(literals, ...placeholders);
+    return Type.get(input);
 };
-
-var createSingleConstant = Type => function (literals) {
-  for (var _len2 = arguments.length, placeholders = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-    placeholders[_key2 - 1] = arguments[_key2];
-  }
-
-  var input = concatTemplateString.apply(void 0, [literals].concat(placeholders));
-  return Type.get(input);
-};
-
-var createPluralConstant = Type => function (literals) {
-  for (var _len3 = arguments.length, placeholders = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-    placeholders[_key3 - 1] = arguments[_key3];
-  }
-
-  var input = concatTemplateString.apply(void 0, [literals].concat(placeholders));
-
-  if (input === "") {
-    return Type.all();
-  }
-
-  return Type.get(input.split(/\s*,\s*/));
+const createPluralConstant = (Type) => (literals, ...placeholders) => {
+    const input = concatTemplateString(literals, ...placeholders);
+    if (input === "") {
+        return Type.all();
+    }
+    return Type.get(input.split(/\s*,\s*/));
 };
 /**
  * A Bounty specified by name.
  *
  * @category In-game constant
  */
-
-
-var $bounty = createSingleConstant(Bounty);
+export const $bounty = createSingleConstant(Bounty);
 /**
  * A list of Bounties specified by a comma-separated list of names.
  * For a list of all possible Bounties, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$bounty = $bounty;
-var $bounties = createPluralConstant(Bounty);
+export const $bounties = createPluralConstant(Bounty);
 /**
  * A Class specified by name.
  *
  * @category In-game constant
  */
-
-exports.$bounties = $bounties;
-var $class = createSingleConstant(Class);
+export const $class = createSingleConstant(Class);
 /**
  * A list of Classes specified by a comma-separated list of names.
  * For a list of all possible Classes, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$class = $class;
-var $classes = createPluralConstant(Class);
+export const $classes = createPluralConstant(Class);
 /**
  * A Coinmaster specified by name.
  *
  * @category In-game constant
  */
-
-exports.$classes = $classes;
-var $coinmaster = createSingleConstant(Coinmaster);
+export const $coinmaster = createSingleConstant(Coinmaster);
 /**
  * A list of Coinmasters specified by a comma-separated list of names.
  * For a list of all possible Coinmasters, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$coinmaster = $coinmaster;
-var $coinmasters = createPluralConstant(Coinmaster);
+export const $coinmasters = createPluralConstant(Coinmaster);
 /**
  * An Effect specified by name.
  *
  * @category In-game constant
  */
-
-exports.$coinmasters = $coinmasters;
-var $effect = createSingleConstant(Effect);
+export const $effect = createSingleConstant(Effect);
 /**
  * A list of Effects specified by a comma-separated list of names.
  * For a list of all possible Effects, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$effect = $effect;
-var $effects = createPluralConstant(Effect);
+export const $effects = createPluralConstant(Effect);
 /**
  * An Element specified by name.
  *
  * @category In-game constant
  */
-
-exports.$effects = $effects;
-var $element = createSingleConstant(Element);
+export const $element = createSingleConstant(Element);
 /**
  * A list of Elements specified by a comma-separated list of names.
  * For a list of all possible Elements, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$element = $element;
-var $elements = createPluralConstant(Element);
+export const $elements = createPluralConstant(Element);
 /**
  * A Familiar specified by name.
  *
  * @category In-game constant
  */
-
-exports.$elements = $elements;
-var $familiar = createSingleConstant(Familiar);
+export const $familiar = createSingleConstant(Familiar);
 /**
  * A list of Familiars specified by a comma-separated list of names.
  * For a list of all possible Familiars, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$familiar = $familiar;
-var $familiars = createPluralConstant(Familiar);
+export const $familiars = createPluralConstant(Familiar);
 /**
  * An Item specified by name.
  *
  * @category In-game constant
  */
-
-exports.$familiars = $familiars;
-var $item = createSingleConstant(Item);
+export const $item = createSingleConstant(Item);
 /**
  * A list of Items specified by a comma-separated list of names.
  * For a list of all possible Items, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$item = $item;
-var $items = createPluralConstant(Item);
+export const $items = createPluralConstant(Item);
 /**
  * A Location specified by name.
  *
  * @category In-game constant
  */
-
-exports.$items = $items;
-var $location = createSingleConstant(Location);
+export const $location = createSingleConstant(Location);
 /**
  * A list of Locations specified by a comma-separated list of names.
  * For a list of all possible Locations, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$location = $location;
-var $locations = createPluralConstant(Location);
+export const $locations = createPluralConstant(Location);
 /**
  * A Monster specified by name.
  *
  * @category In-game constant
  */
-
-exports.$locations = $locations;
-var $monster = createSingleConstant(Monster);
+export const $monster = createSingleConstant(Monster);
 /**
  * A list of Monsters specified by a comma-separated list of names.
  * For a list of all possible Monsters, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$monster = $monster;
-var $monsters = createPluralConstant(Monster);
+export const $monsters = createPluralConstant(Monster);
 /**
  * A Phylum specified by name.
  *
  * @category In-game constant
  */
-
-exports.$monsters = $monsters;
-var $phylum = createSingleConstant(Phylum);
+export const $phylum = createSingleConstant(Phylum);
 /**
  * A list of Phyla specified by a comma-separated list of names.
  * For a list of all possible Phyla, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$phylum = $phylum;
-var $phyla = createPluralConstant(Phylum);
+export const $phyla = createPluralConstant(Phylum);
 /**
  * A Servant specified by name.
  *
  * @category In-game constant
  */
-
-exports.$phyla = $phyla;
-var $servant = createSingleConstant(Servant);
+export const $servant = createSingleConstant(Servant);
 /**
  * A list of Servants specified by a comma-separated list of names.
  * For a list of all possible Servants, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$servant = $servant;
-var $servants = createPluralConstant(Servant);
+export const $servants = createPluralConstant(Servant);
 /**
  * A Skill specified by name.
  *
  * @category In-game constant
  */
-
-exports.$servants = $servants;
-var $skill = createSingleConstant(Skill);
+export const $skill = createSingleConstant(Skill);
 /**
  * A list of Skills specified by a comma-separated list of names.
  * For a list of all possible Skills, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$skill = $skill;
-var $skills = createPluralConstant(Skill);
+export const $skills = createPluralConstant(Skill);
 /**
  * A Slot specified by name.
  *
  * @category In-game constant
  */
-
-exports.$skills = $skills;
-var $slot = createSingleConstant(Slot);
+export const $slot = createSingleConstant(Slot);
 /**
  * A list of Slots specified by a comma-separated list of names.
  * For a list of all possible Slots, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$slot = $slot;
-var $slots = createPluralConstant(Slot);
+export const $slots = createPluralConstant(Slot);
 /**
  * A Stat specified by name.
  *
  * @category In-game constant
  */
-
-exports.$slots = $slots;
-var $stat = createSingleConstant(Stat);
+export const $stat = createSingleConstant(Stat);
 /**
  * A list of Stats specified by a comma-separated list of names.
  * For a list of all possible Stats, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$stat = $stat;
-var $stats = createPluralConstant(Stat);
+export const $stats = createPluralConstant(Stat);
 /**
  * A Thrall specified by name.
  *
  * @category In-game constant
  */
-
-exports.$stats = $stats;
-var $thrall = createSingleConstant(Thrall);
+export const $thrall = createSingleConstant(Thrall);
 /**
  * A list of Thralls specified by a comma-separated list of names.
  * For a list of all possible Thralls, leave the template string blank.
  *
  * @category In-game constant
  */
-
-exports.$thrall = $thrall;
-var $thralls = createPluralConstant(Thrall);
-exports.$thralls = $thralls;
+export const $thralls = createPluralConstant(Thrall);