libram 0.3.2 → 0.4.2

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);

package/dist/utils.d.ts

@@ -25,3 +25,17 @@ export declare function countedMapToString<T>(map: Map<T, number>): string;
  */
 export declare function sum<T>(addends: T[], mappingFunction: (element: T) => number): number;
 export declare function sumNumbers(addends: number[]): number;
+/**
+ * Checks if a given item is in a readonly array, acting as a typeguard.
+ * @param item Needle
+ * @param array Readonly array haystack
+ * @returns Whether the item is in the array, and narrows the type of the item.
+ */
+export declare function arrayContains<T, A extends T>(item: T, array: ReadonlyArray<A>): item is A;
+/**
+ * Checks if two arrays contain the same elements in the same quantity.
+ * @param a First array for comparison
+ * @param b Second array for comparison
+ * @returns Whether the two arrays are equal, irrespective of order.
+ */
+export declare function setEqual<T>(a: T[], b: T[]): boolean;

package/dist/utils.js

@@ -1,70 +1,8 @@
-"use strict";
-
-require("core-js/modules/es.symbol.js");
-
-require("core-js/modules/es.symbol.description.js");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.notNull = notNull;
-exports.parseNumber = parseNumber;
-exports.clamp = clamp;
-exports.chunk = chunk;
-exports.arrayToCountedMap = arrayToCountedMap;
-exports.countedMapToArray = countedMapToArray;
-exports.countedMapToString = countedMapToString;
-exports.sum = sum;
-exports.sumNumbers = sumNumbers;
-
-require("core-js/modules/es.number.parse-int.js");
-
-require("core-js/modules/es.regexp.exec.js");
-
-require("core-js/modules/es.string.replace.js");
-
-require("core-js/modules/es.array.slice.js");
-
-require("core-js/modules/es.array.iterator.js");
-
-require("core-js/modules/es.object.to-string.js");
-
-require("core-js/modules/es.array.flat-map.js");
-
-require("core-js/modules/es.array.unscopables.flat-map.js");
-
-require("core-js/modules/es.array.fill.js");
-
-require("core-js/modules/es.array.map.js");
-
-require("core-js/modules/es.array.concat.js");
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function notNull(value) {
-  return value !== null;
+export function notNull(value) {
+    return value !== null;
 }
-
-function parseNumber(n) {
-  return Number.parseInt(n.replace(/,/g, ""));
+export function parseNumber(n) {
+    return Number.parseInt(n.replace(/,/g, ""));
 }
 /**
  * Clamp a number between lower and upper bounds.
@@ -73,10 +11,8 @@ function parseNumber(n) {
  * @param min Lower bound.
  * @param max Upper bound.
  */
-
-
-function clamp(n, min, max) {
-  return Math.max(min, Math.min(max, n));
+export function clamp(n, min, max) {
+    return Math.max(min, Math.min(max, n));
 }
 /**
  * Split an {@param array} into {@param chunkSize} sized chunks
@@ -84,57 +20,57 @@ function clamp(n, min, max) {
  * @param array Array to split
  * @param chunkSize Size of chunk
  */
-
-
-function chunk(array, chunkSize) {
-  var result = [];
-
-  for (var i = 0; i < array.length; i += chunkSize) {
-    result.push(array.slice(i, i + chunkSize));
-  }
-
-  return result;
+export function chunk(array, chunkSize) {
+    const result = [];
+    for (let i = 0; i < array.length; i += chunkSize) {
+        result.push(array.slice(i, i + chunkSize));
+    }
+    return result;
 }
-
-function arrayToCountedMap(array) {
-  if (!Array.isArray(array)) return array;
-  var map = new Map();
-  array.forEach(item => {
-    map.set(item, (map.get(item) || 0) + 1);
-  });
-  return map;
+export function arrayToCountedMap(array) {
+    if (!Array.isArray(array))
+        return array;
+    const map = new Map();
+    array.forEach((item) => {
+        map.set(item, (map.get(item) || 0) + 1);
+    });
+    return map;
 }
-
-function countedMapToArray(map) {
-  return _toConsumableArray(map).flatMap(_ref => {
-    var _ref2 = _slicedToArray(_ref, 2),
-        item = _ref2[0],
-        quantity = _ref2[1];
-
-    return Array(quantity).fill(item);
-  });
+export function countedMapToArray(map) {
+    return [...map].flatMap(([item, quantity]) => Array(quantity).fill(item));
 }
-
-function countedMapToString(map) {
-  return _toConsumableArray(map).map(_ref3 => {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        item = _ref4[0],
-        quantity = _ref4[1];
-
-    return "".concat(quantity, " x ").concat(item);
-  }).join(", ");
+export function countedMapToString(map) {
+    return [...map].map(([item, quantity]) => `${quantity} x ${item}`).join(", ");
 }
 /**
  * Sum an array of numbers.
  * @param addends Addends to sum.
  * @param mappingFunction function to turn elements into numbers
  */
-
-
-function sum(addends, mappingFunction) {
-  return addends.reduce((subtotal, element) => subtotal + mappingFunction(element), 0);
+export function sum(addends, mappingFunction) {
+    return addends.reduce((subtotal, element) => subtotal + mappingFunction(element), 0);
+}
+export function sumNumbers(addends) {
+    return sum(addends, (x) => x);
+}
+/**
+ * Checks if a given item is in a readonly array, acting as a typeguard.
+ * @param item Needle
+ * @param array Readonly array haystack
+ * @returns Whether the item is in the array, and narrows the type of the item.
+ */
+export function arrayContains(item, array) {
+    return array.includes(item);
+}
+/**
+ * Checks if two arrays contain the same elements in the same quantity.
+ * @param a First array for comparison
+ * @param b Second array for comparison
+ * @returns Whether the two arrays are equal, irrespective of order.
+ */
+export function setEqual(a, b) {
+    const sortedA = [...a].sort();
+    const sortedB = [...b].sort();
+    return (a.length === b.length &&
+        sortedA.every((item, index) => item === sortedB[index]));
 }
-
-function sumNumbers(addends) {
-  return sum(addends, x => x);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libram",
-  "version": "0.3.2",
+  "version": "0.4.2",
   "description": "JavaScript helper library for KoLmafia",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "private": false,
   "scripts": {
-    "build": "yarn run tsc && yarn run babel --extensions .ts src -d dist",
+    "build": "yarn run tsc",
     "clean": "rm -rf dist",
     "docs": "yarn run typedoc",
     "format": "yarn run prettier --write .",
@@ -37,8 +37,10 @@
     "babel-loader": "^8.2.2",
     "eslint": "^7.16.0",
     "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-libram": "^0.1.9",
     "husky": "^4.3.6",
+    "java-parser": "^1.4.0",
     "lint-staged": ">=10",
     "node-fetch": "^2.6.1",
     "prettier": "^2.1.2",
@@ -51,7 +53,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.14.9",
     "core-js": "3.15.2",
-    "kolmafia": "^1.2.0",
+    "kolmafia": "^1.3.0",
     "lodash": "^4.17.21"
   },
   "husky": {