@sv443-network/userutils 9.0.3 → 9.1.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @sv443-network/userutils
 
+## 9.1.0
+
+### Minor Changes
+
+- eb20132: Added the type `ListWithLength` to represent an array or object with a numeric `length`, `count` or `size` property.
+- eb20132: Added `autoPlural()` support for generic objects with a numeric `length`, `count` or `size` property.
+- c9b13d8: Added `signal: AbortSignal` and `rejectOnAbort: boolean` params to `pauseFor()` to allow for cutting the pause short
+- c66324b: Support for words with `-y`/`-ies` extension in `autoPlural()`
+- c9b13d8: Added `getListLength()` function to resolve a value of the new `ListWithLength` type
+- c13e890: `autoPlural()` now defaults `pluralType` to `"auto"` and `num` to 2 if `pluralType` is invalid or `num` resolves to NaN
+
+### Patch Changes
+
+- 3f86215: Fixed fetchAdvanced error "'abort' called on an object that does not implement interface AbortController"
+
+## 9.0.4
+
+### Patch Changes
+
+- 858c948: Fix broken percent transform (`tr.transforms.percent`)
+
 ## 9.0.3
 
 ### Patch Changes

package/README-summary.md

@@ -1,7 +1,7 @@
 ## UserUtils
-Lightweight library with various utilities for userscripts - register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and much more.  
+General purpose DOM/GreaseMonkey library that allows you to register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and much more.  
 Contains builtin TypeScript declarations. Supports ESM and CJS imports via a bundler and global declaration via `@require`  
-The library also works in any DOM environment without the [GreaseMonkey API](https://wiki.greasespot.net/Greasemonkey_Manual:API), but some features will be unavailable or limited.  
+The library works in any DOM environment with or without the [GreaseMonkey API](https://wiki.greasespot.net/Greasemonkey_Manual:API), but some features will be unavailable or limited.  
   
 You may want to check out my [template for userscripts in TypeScript](https://github.com/Sv443/Userscript.ts) that you can use to get started quickly. It also includes this library by default.  
   
@@ -66,22 +66,27 @@ View the documentation of previous major releases:
     - [`decompress()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#decompress) - decompress a previously compressed string
     - [`computeHash()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#computehash) - compute the hash / checksum of a string or ArrayBuffer
     - [`randomId()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#randomid) - generate a random ID of a given length and radix
+    - [`consumeGen()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#consumegen) - consumes a ValueGen and returns the value
+    - [`consumeStringGen()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#consumestringgen) - consumes a StringGen and returns the string
+    - [`getListLength()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#getlistlength) - get the length of any object with a numeric `length`, `count` or `size` property
 - **Arrays:**
     - [`randomItem()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#randomitem) - returns a random item from an array
     - [`randomItemIndex()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#randomitemindex) - returns a tuple of a random item and its index from an array
     - [`takeRandomItem()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#takerandomitem) - returns a random item from an array and mutates it to remove the item
     - [`randomizeArray()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#randomizearray) - returns a copy of the array with its items in a random order
 - **Translation:**
-    - [`tr()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#tr) - simple JSON-based translation system with placeholder and nesting support
-    - [`tr.forLang()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trforlang) - translate with the specified language instead of the currently active one
-    - [`tr.setLanguage()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trsetlanguage) - set the currently active language for translations
-    - [`tr.getLanguage()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trgetlanguage) - returns the currently active language
-    - [`tr.addTranslations()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#traddtranslations) - add a language and its translations
-    - [`tr.getTranslations()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trgettranslations) - returns the translations for the given language or the currently active one
-    - [`tr.deleteTranslations()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trdeletetranslations) - delete the translations for the given language or the active one
-    - [`tr.hasKey()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trhaskey) - check if a translation key exists for the given or active language
-    - [`tr.addTransform()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#traddtransform) - add a transformation function to dynamically modify the translation value
-    - [`tr.deleteTransform()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trdeletetransform) - delete a transformation function that was previously added
+    - [`tr.for()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trfor) - translates a key for the specified language
+    - [`tr.use()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#truse) - creates a translation function for the specified language
+    - [`tr.hasKey()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trhaskey) - checks if a key exists in the given language
+    - [`tr.addTranslations()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#traddtranslations) - add a flat or recursive translation object for a language
+    - [`tr.getTranslations()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trgettranslations) - returns the translation object for a language
+    - [`tr.deleteTranslations()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trdeletetranslations) - delete the translation object for a language
+    - [`tr.setFallbackLanguage()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trsetfallbacklanguage) - set the fallback language used when a key is not found in the given language
+    - [`tr.getFallbackLanguage()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trgetfallbacklanguage) - returns the fallback language
+    - [`tr.addTransform()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#traddtransform) - adds a transform function to the translation system for custom argument insertion and much more
+    - [`tr.deleteTransform()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trdeletetransform) - removes a transform function
+    - [`tr.transforms`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trtransforms) - predefined transform functions for quickly adding custom argument insertion
+    - [`TrKeys`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#trkeys) - generic type that extracts all keys from a flat or recursive translation object into a union
 - **Colors:**
     - [`hexToRgb()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#hextorgb) - convert a hex color string to an RGB or RGBA value tuple
     - [`rgbToHex()`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#rgbtohex) - convert RGB or RGBA values to a hex color string
@@ -95,6 +100,7 @@ View the documentation of previous major releases:
     - [`Prettify`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#prettify) - expands a complex type into a more readable format while keeping functionality the same
     - [`ValueGen`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#valuegen) - a "generator" value that allows for super flexible value typing and declaration
     - [`StringGen`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#stringgen) - a "generator" string that allows for super flexible string typing and declaration, including enhanced support for unions
+    - [`ListWithLength`](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#listwithlength) - represents an array or object with a numeric `length`, `count` or `size` property
 
 <br><br>
 
@@ -138,9 +144,15 @@ Shameless plug: I made a [template for userscripts in TypeScript](https://github
     // @require https://update.greasyfork.org/scripts/472956/UserUtils.js
     // @require https://openuserjs.org/src/libs/Sv443/UserUtils.js
     ```
-      
-    > **Note:**  
-    > In order for your userscript not to break on a major library update, use one the versioned URLs above after replacing `INSERT_VERSION` with the desired version (e.g. `8.3.2`) or the versioned URL that's shown at the top of the [GreasyFork page.](https://greasyfork.org/scripts/472956-userutils)  
+
+- If you are using this library in a generic DOM environment without access to the GreaseMonkey API, either download the latest release from the [releases page](https://github.com/Sv443-Network/UserUtils/releases) to include in your project or add one of the following tags to the &lt;head&gt;:
+    ```html
+    <script src="https://cdn.jsdelivr.net/npm/@sv443-network/userutils@INSERT_VERSION/dist/index.global.js"></script>
+    <script src="https://unpkg.com/@sv443-network/userutils@INSERT_VERSION/dist/index.global.js"></script>
+    ```
+
+> **Note:**  
+> In order for your userscript not to break on a major library update, use one the versioned URLs above after replacing `INSERT_VERSION` with the desired version (e.g. `8.3.2`) or the versioned URL that's shown [at the top of the GreasyFork page.](https://greasyfork.org/scripts/472956-userutils)  
 
 <br>
 
@@ -156,7 +168,7 @@ Shameless plug: I made a [template for userscripts in TypeScript](https://github
 
 <br>
 
-- If you're using TypeScript and it complains about the missing global variable `UserUtils`, install the library using the package manager of your choice and add the following inside a `.d.ts` file somewhere in the directory (or a subdirectory) defined in your `tsconfig.json`'s `baseUrl` option or `include` array:
+- If you're using TypeScript and it complains about the missing global variable `UserUtils`, install the library using the package manager of your choice and add the following inside any `.ts` file that is included in the final build:  
     ```ts
     declare const UserUtils: typeof import("@sv443-network/userutils");
 

package/README.md

@@ -2,9 +2,9 @@
 
 <!-- #region Description -->
 ## UserUtils
-Lightweight library with various utilities for userscripts - register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and much more.  
+General purpose DOM/GreaseMonkey library that allows you to register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and much more.  
 Contains builtin TypeScript declarations. Supports ESM and CJS imports via a bundler and global declaration via `@require`  
-The library also works in any DOM environment without the [GreaseMonkey API](https://wiki.greasespot.net/Greasemonkey_Manual:API), but some features will be unavailable or limited.  
+The library works in any DOM environment with or without the [GreaseMonkey API](https://wiki.greasespot.net/Greasemonkey_Manual:API), but some features will be unavailable or limited.  
   
 You may want to check out my [template for userscripts in TypeScript](https://github.com/Sv443/Userscript.ts) that you can use to get started quickly. It also includes this library by default.  
 If you like using this library, please consider [supporting the development ❤️](https://github.com/sponsors/Sv443)
@@ -71,6 +71,7 @@ View the documentation of previous major releases:
     - [`randomId()`](./docs.md#randomid) - generate a random ID of a given length and radix
     - [`consumeGen()`](./docs.md#consumegen) - consumes a ValueGen and returns the value
     - [`consumeStringGen()`](./docs.md#consumestringgen) - consumes a StringGen and returns the string
+    - [`getListLength()`](./docs.md#getlistlength) - get the length of any object with a numeric `length`, `count` or `size` property
   - [**Arrays:**](./docs.md#arrays)
     - [`randomItem()`](./docs.md#randomitem) - returns a random item from an array
     - [`randomItemIndex()`](./docs.md#randomitemindex) - returns a tuple of a random item and its index from an array
@@ -102,6 +103,7 @@ View the documentation of previous major releases:
     - [`Prettify`](./docs.md#prettify) - expands a complex type into a more readable format while keeping functionality the same
     - [`ValueGen`](./docs.md#valuegen) - a "generator" value that allows for super flexible value typing and declaration
     - [`StringGen`](./docs.md#stringgen) - a "generator" string that allows for super flexible string typing and declaration, including enhanced support for unions
+    - [`ListWithLength`](./docs.md#listwithlength) - represents an array or object with a numeric `length`, `count` or `size` property
 
 <br><br>
 
@@ -132,21 +134,27 @@ Shameless plug: I made a [template for userscripts in TypeScript](https://github
 
 <br>
 
-- If you are not using a bundler, want to reduce the size of your userscript, or declared the package as external in your bundler, you can include the latest release by adding one of these directives to the userscript header, depending on your preferred CDN:
+- If you are not using a bundler, want to reduce the size of your script, or declared the package as external in your bundler, you can include the latest release by adding one of these directives to the userscript header, depending on your preferred CDN:
   
   Versioned (recommended):
   ```
   // @require https://cdn.jsdelivr.net/npm/@sv443-network/userutils@INSERT_VERSION/dist/index.global.js
   // @require https://unpkg.com/@sv443-network/userutils@INSERT_VERSION/dist/index.global.js
   ```
-  Non-versioned (not recommended because auto-updating):
+  Non-versioned (not recommended because it auto-updates):
   ```
   // @require https://update.greasyfork.org/scripts/472956/UserUtils.js
   // @require https://openuserjs.org/src/libs/Sv443/UserUtils.js
   ```
-    
+
+- If you are using this library in a generic DOM environment without access to the GreaseMonkey API, either download the latest release from the [releases page](https://github.com/Sv443-Network/UserUtils/releases) to include in your project or add one of the following tags to the &lt;head&gt;:
+  ```html
+  <script src="https://cdn.jsdelivr.net/npm/@sv443-network/userutils@INSERT_VERSION/dist/index.global.js"></script>
+  <script src="https://unpkg.com/@sv443-network/userutils@INSERT_VERSION/dist/index.global.js"></script>
+  ```
+
 > [!NOTE]  
-> In order for your userscript not to break on a major library update, use one the versioned URLs above after replacing `INSERT_VERSION` with the desired version (e.g. `8.3.2`) or the versioned URL that's shown at the top of the [GreasyFork page.](https://greasyfork.org/scripts/472956-userutils)  
+> In order for your script not to break on a major library update, use one the versioned URLs above after replacing `INSERT_VERSION` with the desired version (e.g. `8.3.2`) or the versioned URL that's shown [at the top of the GreasyFork page.](https://greasyfork.org/scripts/472956-userutils)  
 
 <br>
 
@@ -163,7 +171,7 @@ Shameless plug: I made a [template for userscripts in TypeScript](https://github
 
 <br>
 
-- If you're using TypeScript and it complains about the missing global variable `UserUtils`, install the library using the package manager of your choice and add the following inside a `.d.ts` file somewhere in the directory (or a subdirectory) defined in your `tsconfig.json`'s `baseUrl` option or `include` array:  
+- If you're using TypeScript and it complains about the missing global variable `UserUtils`, install the library using the package manager of your choice and add the following inside any `.ts` file that is included in the final build:  
   
   ```ts
   declare const UserUtils: typeof import("@sv443-network/userutils");

package/dist/index.cjs

@@ -1331,10 +1331,23 @@ var Dialog = class _Dialog extends NanoEmitter {
 };
 
 // lib/misc.ts
-function autoPlural(word, num) {
-  if (Array.isArray(num) || num instanceof NodeList)
-    num = num.length;
-  return `${word}${num === 1 ? "" : "s"}`;
+function autoPlural(term, num, pluralType = "auto") {
+  let n = num;
+  if (typeof n !== "number")
+    n = getListLength(n, false);
+  if (!["-s", "-ies"].includes(pluralType))
+    pluralType = "auto";
+  if (isNaN(n))
+    n = 2;
+  const pType = pluralType === "auto" ? String(term).endsWith("y") ? "-ies" : "-s" : pluralType;
+  switch (pType) {
+    case "-s":
+      return `${term}${n === 1 ? "" : "s"}`;
+    case "-ies":
+      return `${String(term).slice(0, -1)}${n === 1 ? "y" : "ies"}`;
+    default:
+      return String(term);
+  }
 }
 function insertValues(input, ...values) {
   return input.replace(/%\d/gm, (match) => {
@@ -1343,29 +1356,33 @@ function insertValues(input, ...values) {
     return (_b = (_a = values[argIndex]) != null ? _a : match) == null ? undefined : _b.toString();
   });
 }
-function pauseFor(time) {
-  return new Promise((res) => {
-    setTimeout(() => res(), time);
+function pauseFor(time, signal, rejectOnAbort = false) {
+  return new Promise((res, rej) => {
+    const timeout = setTimeout(() => res(), time);
+    signal == null ? undefined : signal.addEventListener("abort", () => {
+      clearTimeout(timeout);
+      rejectOnAbort ? rej(new Error("The pause was aborted")) : res();
+    });
   });
 }
 function fetchAdvanced(_0) {
   return __async(this, arguments, function* (input, options = {}) {
-    var _a;
     const { timeout = 1e4 } = options;
-    const { signal, abort } = new AbortController();
-    (_a = options.signal) == null ? undefined : _a.addEventListener("abort", abort);
-    let signalOpts = {}, id = undefined;
+    const ctl = new AbortController();
+    const _a = options, { signal } = _a, restOpts = __objRest(_a, ["signal"]);
+    signal == null ? undefined : signal.addEventListener("abort", () => ctl.abort());
+    let sigOpts = {}, id = undefined;
     if (timeout >= 0) {
-      id = setTimeout(() => abort(), timeout);
-      signalOpts = { signal };
+      id = setTimeout(() => ctl.abort(), timeout);
+      sigOpts = { signal: ctl.signal };
     }
     try {
-      const res = yield fetch(input, __spreadValues(__spreadValues({}, options), signalOpts));
-      id && clearTimeout(id);
+      const res = yield fetch(input, __spreadValues(__spreadValues({}, restOpts), sigOpts));
+      typeof id !== "undefined" && clearTimeout(id);
       return res;
     } catch (err) {
-      id && clearTimeout(id);
-      throw err;
+      typeof id !== "undefined" && clearTimeout(id);
+      throw new Error("Error while calling fetch", { cause: err });
     }
   });
 }
@@ -1381,6 +1398,9 @@ function consumeStringGen(strGen) {
     );
   });
 }
+function getListLength(obj, zeroOnInvalid = true) {
+  return "length" in obj ? obj.length : "size" in obj ? obj.size : "count" in obj ? obj.count : zeroOnInvalid ? 0 : NaN;
+}
 
 // lib/SelectorObserver.ts
 var domLoaded = false;
@@ -1692,11 +1712,11 @@ var templateLiteralTransform = [
   }
 ];
 var percentTransform = [
-  /\$\{([a-zA-Z0-9$_-]+)\}/gm,
+  /%(\d+)/gm,
   ({ matches, trArgs, trValue }) => {
     let str = String(trValue);
     for (const match of matches) {
-      const repl = match[1] !== undefined ? trArgs[0][match[1]] : undefined;
+      const repl = match[1] !== undefined ? trArgs == null ? undefined : trArgs[Number(match[1]) - 1] : undefined;
       if (typeof repl !== "undefined")
         str = str.replace(match[0], String(repl));
     }
@@ -1741,6 +1761,7 @@ exports.defaultDialogCss = defaultDialogCss;
 exports.defaultStrings = defaultStrings;
 exports.digitCount = digitCount;
 exports.fetchAdvanced = fetchAdvanced;
+exports.getListLength = getListLength;
 exports.getSiblingsFrame = getSiblingsFrame;
 exports.getUnsafeWindow = getUnsafeWindow;
 exports.hexToRgb = hexToRgb;

package/dist/index.global.js

@@ -8,7 +8,7 @@
 // ==UserLibrary==
 // @name         UserUtils
 // @description  Lightweight library with various utilities for userscripts - register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and much more
-// @version      9.0.3
+// @version      9.1.0
 // @license      MIT
 // @copyright    Sv443 (https://github.com/Sv443)
 
@@ -1369,10 +1369,23 @@ Has: ${checksum}`);
   };
 
   // lib/misc.ts
-  function autoPlural(word, num) {
-    if (Array.isArray(num) || num instanceof NodeList)
-      num = num.length;
-    return `${word}${num === 1 ? "" : "s"}`;
+  function autoPlural(term, num, pluralType = "auto") {
+    let n = num;
+    if (typeof n !== "number")
+      n = getListLength(n, false);
+    if (!["-s", "-ies"].includes(pluralType))
+      pluralType = "auto";
+    if (isNaN(n))
+      n = 2;
+    const pType = pluralType === "auto" ? String(term).endsWith("y") ? "-ies" : "-s" : pluralType;
+    switch (pType) {
+      case "-s":
+        return `${term}${n === 1 ? "" : "s"}`;
+      case "-ies":
+        return `${String(term).slice(0, -1)}${n === 1 ? "y" : "ies"}`;
+      default:
+        return String(term);
+    }
   }
   function insertValues(input, ...values) {
     return input.replace(/%\d/gm, (match) => {
@@ -1381,29 +1394,33 @@ Has: ${checksum}`);
       return (_b = (_a = values[argIndex]) != null ? _a : match) == null ? undefined : _b.toString();
     });
   }
-  function pauseFor(time) {
-    return new Promise((res) => {
-      setTimeout(() => res(), time);
+  function pauseFor(time, signal, rejectOnAbort = false) {
+    return new Promise((res, rej) => {
+      const timeout = setTimeout(() => res(), time);
+      signal == null ? undefined : signal.addEventListener("abort", () => {
+        clearTimeout(timeout);
+        rejectOnAbort ? rej(new Error("The pause was aborted")) : res();
+      });
     });
   }
   function fetchAdvanced(_0) {
     return __async(this, arguments, function* (input, options = {}) {
-      var _a;
       const { timeout = 1e4 } = options;
-      const { signal, abort } = new AbortController();
-      (_a = options.signal) == null ? undefined : _a.addEventListener("abort", abort);
-      let signalOpts = {}, id = undefined;
+      const ctl = new AbortController();
+      const _a = options, { signal } = _a, restOpts = __objRest(_a, ["signal"]);
+      signal == null ? undefined : signal.addEventListener("abort", () => ctl.abort());
+      let sigOpts = {}, id = undefined;
       if (timeout >= 0) {
-        id = setTimeout(() => abort(), timeout);
-        signalOpts = { signal };
+        id = setTimeout(() => ctl.abort(), timeout);
+        sigOpts = { signal: ctl.signal };
       }
       try {
-        const res = yield fetch(input, __spreadValues(__spreadValues({}, options), signalOpts));
-        id && clearTimeout(id);
+        const res = yield fetch(input, __spreadValues(__spreadValues({}, restOpts), sigOpts));
+        typeof id !== "undefined" && clearTimeout(id);
         return res;
       } catch (err) {
-        id && clearTimeout(id);
-        throw err;
+        typeof id !== "undefined" && clearTimeout(id);
+        throw new Error("Error while calling fetch", { cause: err });
       }
     });
   }
@@ -1419,6 +1436,9 @@ Has: ${checksum}`);
       );
     });
   }
+  function getListLength(obj, zeroOnInvalid = true) {
+    return "length" in obj ? obj.length : "size" in obj ? obj.size : "count" in obj ? obj.count : zeroOnInvalid ? 0 : NaN;
+  }
 
   // lib/SelectorObserver.ts
   var domLoaded = false;
@@ -1730,11 +1750,11 @@ Has: ${checksum}`);
     }
   ];
   var percentTransform = [
-    /\$\{([a-zA-Z0-9$_-]+)\}/gm,
+    /%(\d+)/gm,
     ({ matches, trArgs, trValue }) => {
       let str = String(trValue);
       for (const match of matches) {
-        const repl = match[1] !== undefined ? trArgs[0][match[1]] : undefined;
+        const repl = match[1] !== undefined ? trArgs == null ? undefined : trArgs[Number(match[1]) - 1] : undefined;
         if (typeof repl !== "undefined")
           str = str.replace(match[0], String(repl));
       }
@@ -1779,6 +1799,7 @@ Has: ${checksum}`);
   exports.defaultStrings = defaultStrings;
   exports.digitCount = digitCount;
   exports.fetchAdvanced = fetchAdvanced;
+  exports.getListLength = getListLength;
   exports.getSiblingsFrame = getSiblingsFrame;
   exports.getUnsafeWindow = getUnsafeWindow;
   exports.hexToRgb = hexToRgb;

package/dist/index.js

@@ -1329,10 +1329,23 @@ var Dialog = class _Dialog extends NanoEmitter {
 };
 
 // lib/misc.ts
-function autoPlural(word, num) {
-  if (Array.isArray(num) || num instanceof NodeList)
-    num = num.length;
-  return `${word}${num === 1 ? "" : "s"}`;
+function autoPlural(term, num, pluralType = "auto") {
+  let n = num;
+  if (typeof n !== "number")
+    n = getListLength(n, false);
+  if (!["-s", "-ies"].includes(pluralType))
+    pluralType = "auto";
+  if (isNaN(n))
+    n = 2;
+  const pType = pluralType === "auto" ? String(term).endsWith("y") ? "-ies" : "-s" : pluralType;
+  switch (pType) {
+    case "-s":
+      return `${term}${n === 1 ? "" : "s"}`;
+    case "-ies":
+      return `${String(term).slice(0, -1)}${n === 1 ? "y" : "ies"}`;
+    default:
+      return String(term);
+  }
 }
 function insertValues(input, ...values) {
   return input.replace(/%\d/gm, (match) => {
@@ -1341,29 +1354,33 @@ function insertValues(input, ...values) {
     return (_b = (_a = values[argIndex]) != null ? _a : match) == null ? undefined : _b.toString();
   });
 }
-function pauseFor(time) {
-  return new Promise((res) => {
-    setTimeout(() => res(), time);
+function pauseFor(time, signal, rejectOnAbort = false) {
+  return new Promise((res, rej) => {
+    const timeout = setTimeout(() => res(), time);
+    signal == null ? undefined : signal.addEventListener("abort", () => {
+      clearTimeout(timeout);
+      rejectOnAbort ? rej(new Error("The pause was aborted")) : res();
+    });
   });
 }
 function fetchAdvanced(_0) {
   return __async(this, arguments, function* (input, options = {}) {
-    var _a;
     const { timeout = 1e4 } = options;
-    const { signal, abort } = new AbortController();
-    (_a = options.signal) == null ? undefined : _a.addEventListener("abort", abort);
-    let signalOpts = {}, id = undefined;
+    const ctl = new AbortController();
+    const _a = options, { signal } = _a, restOpts = __objRest(_a, ["signal"]);
+    signal == null ? undefined : signal.addEventListener("abort", () => ctl.abort());
+    let sigOpts = {}, id = undefined;
     if (timeout >= 0) {
-      id = setTimeout(() => abort(), timeout);
-      signalOpts = { signal };
+      id = setTimeout(() => ctl.abort(), timeout);
+      sigOpts = { signal: ctl.signal };
     }
     try {
-      const res = yield fetch(input, __spreadValues(__spreadValues({}, options), signalOpts));
-      id && clearTimeout(id);
+      const res = yield fetch(input, __spreadValues(__spreadValues({}, restOpts), sigOpts));
+      typeof id !== "undefined" && clearTimeout(id);
       return res;
     } catch (err) {
-      id && clearTimeout(id);
-      throw err;
+      typeof id !== "undefined" && clearTimeout(id);
+      throw new Error("Error while calling fetch", { cause: err });
     }
   });
 }
@@ -1379,6 +1396,9 @@ function consumeStringGen(strGen) {
     );
   });
 }
+function getListLength(obj, zeroOnInvalid = true) {
+  return "length" in obj ? obj.length : "size" in obj ? obj.size : "count" in obj ? obj.count : zeroOnInvalid ? 0 : NaN;
+}
 
 // lib/SelectorObserver.ts
 var domLoaded = false;
@@ -1690,11 +1710,11 @@ var templateLiteralTransform = [
   }
 ];
 var percentTransform = [
-  /\$\{([a-zA-Z0-9$_-]+)\}/gm,
+  /%(\d+)/gm,
   ({ matches, trArgs, trValue }) => {
     let str = String(trValue);
     for (const match of matches) {
-      const repl = match[1] !== undefined ? trArgs[0][match[1]] : undefined;
+      const repl = match[1] !== undefined ? trArgs == null ? undefined : trArgs[Number(match[1]) - 1] : undefined;
       if (typeof repl !== "undefined")
         str = str.replace(match[0], String(repl));
     }
@@ -1718,4 +1738,4 @@ var tr = {
   }
 };
 
-export { DataStore, DataStoreSerializer, Debouncer, Dialog, NanoEmitter, SelectorObserver, addGlobalStyle, addParent, autoPlural, clamp, compress, computeHash, consumeGen, consumeStringGen, currentDialogId, darkenColor, debounce, decompress, defaultDialogCss, defaultStrings, digitCount, fetchAdvanced, getSiblingsFrame, getUnsafeWindow, hexToRgb, insertValues, interceptEvent, interceptWindowEvent, isScrollable, lightenColor, mapRange, observeElementProp, openDialogs, openInNewTab, pauseFor, preloadImages, randRange, randomId, randomItem, randomItemIndex, randomizeArray, rgbToHex, setInnerHtmlUnsafe, takeRandomItem, tr };
+export { DataStore, DataStoreSerializer, Debouncer, Dialog, NanoEmitter, SelectorObserver, addGlobalStyle, addParent, autoPlural, clamp, compress, computeHash, consumeGen, consumeStringGen, currentDialogId, darkenColor, debounce, decompress, defaultDialogCss, defaultStrings, digitCount, fetchAdvanced, getListLength, getSiblingsFrame, getUnsafeWindow, hexToRgb, insertValues, interceptEvent, interceptWindowEvent, isScrollable, lightenColor, mapRange, observeElementProp, openDialogs, openInNewTab, pauseFor, preloadImages, randRange, randomId, randomItem, randomItemIndex, randomizeArray, rgbToHex, setInnerHtmlUnsafe, takeRandomItem, tr };

package/dist/lib/misc.d.ts

@@ -2,13 +2,18 @@
  * @module lib/misc  
  * This module contains miscellaneous functions that don't fit in another category - [see the documentation for more info](https://github.com/Sv443-Network/UserUtils/blob/main/docs.md#misc)  
  */
-import type { Prettify, Stringifiable } from "./types.js";
+import type { ListWithLength, Prettify, Stringifiable } from "./types.js";
+/** Which plural form to use when auto-pluralizing */
+export type PluralType = "auto" | "-s" | "-ies";
 /**
- * Automatically appends an `s` to the passed {@linkcode word}, if {@linkcode num} is not equal to 1  
- * @param word A word in singular form, to auto-convert to plural  
- * @param num If this is an array or NodeList, the amount of items is used  
+ * Automatically pluralizes the given string by adding an `-s` or `-ies` to the passed {@linkcode term}, if {@linkcode num} is not equal to 1.  
+ * By default, words ending in `-y` will have it replaced with `-ies`, and all other words will simply have `-s` appended.  
+ * {@linkcode pluralType} will default to `auto` if invalid and {@linkcode num} is set to 2 if it resolves to `NaN`.  
+ * @param term The term, written in singular form, to auto-convert to plural form  
+ * @param num A number, or list-like value that has either a `length`, `count` or `size` property, like an array, Map or NodeList - does not support iterables, they need to be converted to an array first  
+ * @param pluralType Which plural form to use when auto-pluralizing. Defaults to `"auto"`, which removes the last char and uses `-ies` for words ending in `y` and simply appends `-s` for all other words  
  */
-export declare function autoPlural(word: Stringifiable, num: number | unknown[] | NodeList): string;
+export declare function autoPlural(term: Stringifiable, num: number | ListWithLength, pluralType?: PluralType): string;
 /**
  * Inserts the passed values into a string at the respective placeholders.  
  * The placeholder format is `%n`, where `n` is the 1-indexed argument number.  
@@ -16,8 +21,12 @@ export declare function autoPlural(word: Stringifiable, num: number | unknown[]
  * @param values The values to insert, in order, starting at `%1`  
  */
 export declare function insertValues(input: string, ...values: Stringifiable[]): string;
-/** Pauses async execution for the specified time in ms */
-export declare function pauseFor(time: number): Promise<void>;
+/**
+ * Pauses async execution for the specified time in ms.  
+ * If an `AbortSignal` is passed, the pause will be aborted when the signal is triggered.  
+ * By default, this will resolve the promise, but you can set {@linkcode rejectOnAbort} to true to reject it instead.  
+ */
+export declare function pauseFor(time: number, signal?: AbortSignal, rejectOnAbort?: boolean): Promise<void>;
 /** Options for the `fetchAdvanced()` function */
 export type FetchAdvancedOpts = Prettify<Partial<{
     /** Timeout in milliseconds after which the fetch call will be canceled with an AbortController signal */
@@ -46,3 +55,9 @@ export type StringGen = ValueGen<Stringifiable>;
  * @template TStrUnion The union of strings that the StringGen should yield - this allows for finer type control compared to {@linkcode consumeGen()}  
  */
 export declare function consumeStringGen<TStrUnion extends string>(strGen: StringGen): Promise<TStrUnion>;
+/**
+ * Returns the length of the given list-like object (anything with a numeric `length`, `size` or `count` property, like an array, Map or NodeList).  
+ * If the object doesn't have any of these properties, it will return 0 by default.  
+ * Set {@linkcode zeroOnInvalid} to false to return NaN instead of 0 if the object doesn't have any of the properties.  
+ */
+export declare function getListLength(obj: ListWithLength, zeroOnInvalid?: boolean): number;

package/dist/lib/types.d.ts

@@ -28,3 +28,11 @@ export type NonEmptyString<TString extends string> = TString extends "" ? never
 export type Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
+/** Any value that is list-like, i.e. has a numeric length, count or size property */
+export type ListWithLength = {
+    length: number;
+} | {
+    count: number;
+} | {
+    size: number;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sv443-network/userutils",
   "libName": "UserUtils",
-  "version": "9.0.3",
+  "version": "9.1.0",
   "description": "Lightweight library with various utilities for userscripts - register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and much more",
   "main": "dist/index.js",
   "module": "dist/index.js",