tiny-essentials 1.27.1 → 1.28.1

package/dist/v1/libs/TinyAdvancedRaffle.mjs

@@ -1,4 +1,6 @@
-import TinyEvents from './TinyEvents.mjs';
+import { EventEmitter } from 'events';
+import { createCheckDestroyed } from './utils.mjs';
+const checkDestroy = createCheckDestroyed('TinyAdvancedRaffle');
 /**
  * Defines the available normalization strategies for probability weight calculations.
  * @typedef {'relative' | 'softmax'} Normalization
@@ -101,180 +103,7 @@ import TinyEvents from './TinyEvents.mjs';
  *
  * @class
  */
-class TinyAdvancedRaffle {
-    #events = new TinyEvents();
-    /**
-     * Emits an event, triggering all registered handlers for that event.
-     *
-     * @param {string|string[]} event - The event name to emit.
-     * @param {...any} payload - Optional data to pass to each handler.
-     * @returns {boolean[]} True if any listeners were called, false otherwise.
-     */
-    #emit(event, ...payload) {
-        return this.#events.emit(event, ...payload);
-    }
-    /**
-     * Enables or disables throwing an error when the maximum number of listeners is exceeded.
-     *
-     * @param {boolean} shouldThrow - If true, an error will be thrown when the max is exceeded.
-     */
-    setThrowOnMaxListeners(shouldThrow) {
-        return this.#events.setThrowOnMaxListeners(shouldThrow);
-    }
-    /**
-     * Checks whether an error will be thrown when the max listener limit is exceeded.
-     *
-     * @returns {boolean} True if an error will be thrown, false if only a warning is shown.
-     */
-    getThrowOnMaxListeners() {
-        return this.#events.getThrowOnMaxListeners();
-    }
-    /////////////////////////////////////////////////////////////
-    /**
-     * Adds a listener to the beginning of the listeners array for the specified event.
-     *
-     * @param {string|string[]} event - Event name.
-     * @param {handler} handler - The callback function.
-     */
-    prependListener(event, handler) {
-        return this.#events.prependListener(event, handler);
-    }
-    /**
-     * Adds a one-time listener to the beginning of the listeners array for the specified event.
-     *
-     * @param {string|string[]} event - Event name.
-     * @param {handler} handler - The callback function.
-     * @returns {handler[]} - The wrapped handler used internally.
-     */
-    prependListenerOnce(event, handler) {
-        return this.#events.prependListenerOnce(event, handler);
-    }
-    //////////////////////////////////////////////////////////////////////
-    /**
-     * Adds a event listener.
-     *
-     * @param {string|string[]} event - Event name, such as 'onScrollBoundary' or 'onAutoScroll'.
-     * @param {handler} handler - Callback function to be called when event fires.
-     */
-    appendListener(event, handler) {
-        return this.#events.appendListener(event, handler);
-    }
-    /**
-     * Registers an event listener that runs only once, then is removed.
-     *
-     * @param {string|string[]} event - Event name, such as 'onScrollBoundary' or 'onAutoScroll'.
-     * @param {handler} handler - The callback function to run on event.
-     * @returns {handler[]} - The wrapped version of the handler.
-     */
-    appendListenerOnce(event, handler) {
-        return this.#events.appendListenerOnce(event, handler);
-    }
-    /**
-     * Adds a event listener.
-     *
-     * @param {string|string[]} event - Event name, such as 'onScrollBoundary' or 'onAutoScroll'.
-     * @param {handler} handler - Callback function to be called when event fires.
-     */
-    on(event, handler) {
-        return this.#events.on(event, handler);
-    }
-    /**
-     * Registers an event listener that runs only once, then is removed.
-     *
-     * @param {string|string[]} event - Event name, such as 'onScrollBoundary' or 'onAutoScroll'.
-     * @param {handler} handler - The callback function to run on event.
-     * @returns {handler[]} - The wrapped version of the handler.
-     */
-    once(event, handler) {
-        return this.#events.once(event, handler);
-    }
-    ////////////////////////////////////////////////////////////////////
-    /**
-     * Removes a previously registered event listener.
-     *
-     * @param {string|string[]} event - The name of the event to remove the handler from.
-     * @param {handler} handler - The specific callback function to remove.
-     */
-    off(event, handler) {
-        return this.#events.off(event, handler);
-    }
-    /**
-     * Removes all event listeners of a specific type from the element.
-     *
-     * @param {string|string[]} event - The event type to remove (e.g. 'onScrollBoundary').
-     */
-    offAll(event) {
-        return this.#events.offAll(event);
-    }
-    /**
-     * Removes all event listeners of all types from the element.
-     */
-    offAllTypes() {
-        return this.#events.offAllTypes();
-    }
-    ////////////////////////////////////////////////////////////
-    /**
-     * Returns the number of listeners for a given event.
-     *
-     * @param {string} event - The name of the event.
-     * @returns {number} Number of listeners for the event.
-     */
-    listenerCount(event) {
-        return this.#events.listenerCount(event);
-    }
-    /**
-     * Returns a copy of the array of listeners for the specified event.
-     *
-     * @param {string} event - The name of the event.
-     * @returns {handler[]} Array of listener functions.
-     */
-    listeners(event) {
-        return this.#events.listeners(event);
-    }
-    /**
-     * Returns a copy of the array of listeners for the specified event.
-     *
-     * @param {string} event - The name of the event.
-     * @returns {handler[]} Array of listener functions.
-     */
-    onceListeners(event) {
-        return this.#events.onceListeners(event);
-    }
-    /**
-     * Returns a copy of the internal listeners array for the specified event,
-     * including wrapper functions like those used by `.once()`.
-     * @param {string | symbol} event - The event name.
-     * @returns {handler[]} An array of raw listener functions.
-     */
-    allListeners(event) {
-        return this.#events.allListeners(event);
-    }
-    /**
-     * Returns an array of event names for which there are registered listeners.
-     *
-     * @returns {string[]} Array of registered event names.
-     */
-    eventNames() {
-        return this.#events.eventNames();
-    }
-    //////////////////////////////////////////////////////
-    /**
-     * Sets the maximum number of listeners per event before a warning is shown.
-     *
-     * @param {number} n - The maximum number of listeners.
-     */
-    setMaxListeners(n) {
-        return this.#events.setMaxListeners(n);
-    }
-    /**
-     * Gets the maximum number of listeners allowed per event.
-     *
-     * @returns {number} The maximum number of listeners.
-     */
-    getMaxListeners() {
-        return this.#events.getMaxListeners();
-    }
-    ///////////////////////////////////////////////////
+class TinyAdvancedRaffle extends EventEmitter {
     /**
      * Whether this instance has been destroyed.
      * @type {boolean}
@@ -358,6 +187,7 @@ class TinyAdvancedRaffle {
      * @returns {Record<string, number>} - Object with item IDs as keys and their respective draw counts.
      */
     get freq() {
+        checkDestroy(this.#isDestroyed);
         return Object.fromEntries(this.#freq);
     }
     /**
@@ -365,6 +195,7 @@ class TinyAdvancedRaffle {
      * @returns {number} Total count of items.
      */
     get size() {
+        checkDestroy(this.#isDestroyed);
         return this.#items.size;
     }
     /**
@@ -372,6 +203,7 @@ class TinyAdvancedRaffle {
      * @returns {Normalization} Current normalization mode.
      */
     get normalization() {
+        checkDestroy(this.#isDestroyed);
         return this.#normalization;
     }
     /**
@@ -380,7 +212,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If value is not a non-empty string.
      */
     set normalization(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof value !== 'string' || !value.trim()) {
             throw new TypeError("normalization must be a non-empty string (e.g., 'relative', 'softmax').");
         }
@@ -391,6 +223,7 @@ class TinyAdvancedRaffle {
      * @returns {number|null} Current seed or `null` if RNG is not seeded.
      */
     get seed() {
+        checkDestroy(this.#isDestroyed);
         return this.#seed;
     }
     /**
@@ -399,7 +232,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If not `null` or a finite number.
      */
     set seed(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (value !== null && (typeof value !== 'number' || !Number.isFinite(value)))
             throw new TypeError('seed must be a finite number or null.');
         this.#seed = value;
@@ -411,6 +244,7 @@ class TinyAdvancedRaffle {
      * @returns {WeightsCallback[]} Array of registered global modifier functions.
      */
     get globalModifiers() {
+        checkDestroy(this.#isDestroyed);
         return [...this.#globalModifiers];
     }
     /**
@@ -419,7 +253,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If not an array of functions.
      */
     set globalModifiers(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!Array.isArray(value) || !value.every((fn) => typeof fn === 'function'))
             throw new TypeError('globalModifiers must be an array of functions (WeightsCallback).');
         this.#globalModifiers = value;
@@ -429,6 +263,7 @@ class TinyAdvancedRaffle {
      * @returns {TempModifier[]} Array of temporary modifier entries.
      */
     get temporaryModifiers() {
+        checkDestroy(this.#isDestroyed);
         return [...this.#temporaryModifiers];
     }
     /**
@@ -437,7 +272,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If structure is invalid.
      */
     set temporaryModifiers(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!Array.isArray(value) ||
             !value.every((obj) => obj && typeof obj.fn === 'function' && Number.isInteger(obj.uses) && obj.uses > 0))
             throw new TypeError('temporaryModifiers must be an array of objects { fn: function, uses: positive integer }.');
@@ -448,6 +283,7 @@ class TinyAdvancedRaffle {
      * @returns {WeightsCallback[]} Array of conditional rule functions.
      */
     get conditionalRules() {
+        checkDestroy(this.#isDestroyed);
         return [...this.#conditionalRules];
     }
     /**
@@ -456,7 +292,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If not an array of functions.
      */
     set conditionalRules(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!Array.isArray(value) || !value.every((fn) => typeof fn === 'function'))
             throw new TypeError('conditionalRules must be an array of functions (WeightsCallback).');
         this.#conditionalRules = value;
@@ -466,6 +302,7 @@ class TinyAdvancedRaffle {
      * @returns {Record<string, Pity>} Object keyed by system name.
      */
     get pitySystems() {
+        checkDestroy(this.#isDestroyed);
         return Object.fromEntries(this.#pitySystems);
     }
     /**
@@ -474,7 +311,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If structure is invalid.
      */
     set pitySystems(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!(value instanceof Map) ||
             ![...value.values()].every((p) => p &&
                 typeof p.threshold === 'number' &&
@@ -490,6 +327,7 @@ class TinyAdvancedRaffle {
      * @returns {string[]} Array of item IDs excluded from draws.
      */
     get exclusions() {
+        checkDestroy(this.#isDestroyed);
         return Array.from(this.#exclusions);
     }
     /**
@@ -498,7 +336,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If not a Set of strings.
      */
     set exclusions(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!(value instanceof Set) || ![...value].every((v) => typeof v === 'string'))
             throw new TypeError('exclusions must be a Set<string>.');
         this.#exclusions = value;
@@ -508,6 +346,7 @@ class TinyAdvancedRaffle {
      * @returns {Record<string, string[]>} Object where each key is a group name and value is an array of item IDs.
      */
     get groups() {
+        checkDestroy(this.#isDestroyed);
         /** @type {Record<string, string[]>} */
         const groups = {};
         this.#groups.forEach((value, key) => (groups[key] = Array.from(value)));
@@ -519,7 +358,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If not a valid Map<string, Set<string>>.
      */
     set groups(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!(value instanceof Map) ||
             ![...value.values()].every((v) => v instanceof Set && [...v].every((i) => typeof i === 'string')))
             throw new TypeError('groups must be a Map<string, Set<string>>.');
@@ -530,6 +369,7 @@ class TinyAdvancedRaffle {
      * @returns {RngGenerator} Function returning a floating-point number in [0, 1).
      */
     get rng() {
+        checkDestroy(this.#isDestroyed);
         return this.#rng;
     }
     /**
@@ -538,7 +378,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If not a valid function.
      */
     set rng(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof value !== 'function' || typeof value() !== 'number')
             throw new TypeError('rng must be a function returning a number (RngGenerator).');
         this.#rng = value;
@@ -548,6 +388,7 @@ class TinyAdvancedRaffle {
      * @returns {Record<string, ItemDataGetter>} Object keyed by item ID.
      */
     get items() {
+        checkDestroy(this.#isDestroyed);
         /** @type {Record<string, ItemDataGetter>} */
         const items = {};
         this.#items.forEach((value, key) => {
@@ -561,7 +402,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If structure is invalid.
      */
     set items(value) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!(value instanceof Map) ||
             ![...value.values()].every((item) => item &&
                 typeof item.id === 'string' &&
@@ -582,6 +423,7 @@ class TinyAdvancedRaffle {
      * @param {Normalization} [opts.normalization='relative'] - Probability normalization mode.
      */
     constructor(opts = {}) {
+        super();
         const { rng = null, seed = null, normalization = 'relative' } = opts;
         this.#normalization = normalization;
         this.#seed = seed;
@@ -593,15 +435,6 @@ class TinyAdvancedRaffle {
             this.#rng = Math.random;
         this.#seed = seed ?? null;
     }
-    /**
-     * Checks if the instance has been destroyed and throws an error if so.
-     * @private
-     * @throws {Error} If the instance has already been destroyed.
-     */
-    _checkDestroyed() {
-        if (this.#isDestroyed)
-            throw new Error('This instance has been destroyed and can no longer be used.');
-    }
     /* ===========================
        Public: Item management
        =========================== */
@@ -612,6 +445,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `itemId` is not a string.
      */
     hasItem(itemId) {
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string')
             throw new TypeError('itemId must be a string');
         return this.#items.has(itemId);
@@ -628,7 +462,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If any parameter has an invalid type.
      */
     addItem(id, opts = {}) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof id !== 'string' || !id.trim())
             throw new TypeError('id must be a non-empty string');
         if (typeof opts !== 'object' || opts === null)
@@ -661,7 +495,7 @@ class TinyAdvancedRaffle {
         // Register in groups map
         for (const g of groups)
             this._ensureGroup(g).add(id);
-        this.#emit('itemAdded', entry);
+        this.emit('itemAdded', entry);
         return entry;
     }
     /**
@@ -671,7 +505,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If id is not a string.
      */
     removeItem(id) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof id !== 'string' || !id.trim())
             throw new TypeError('id must be a non-empty string');
         const it = this.#items.get(id);
@@ -683,7 +517,7 @@ class TinyAdvancedRaffle {
                 s.delete(id);
         }
         this.#items.delete(id);
-        this.#emit('itemRemoved', id);
+        this.emit('itemRemoved', id);
         this.resetFreq(id);
         this.resetPity(id);
         return true;
@@ -696,7 +530,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If weight is invalid.
      */
     setBaseWeight(id, weight) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof id !== 'string' || !id.trim())
             throw new TypeError('id must be a non-empty string');
         if (typeof weight !== 'number' || !Number.isFinite(weight) || weight < 0)
@@ -705,7 +539,7 @@ class TinyAdvancedRaffle {
         if (!it)
             throw new Error('Item not found');
         it.baseWeight = Math.max(0, Number(weight) || 0);
-        this.#emit('weightChanged', { id, weight: it.baseWeight });
+        this.emit('weightChanged', { id, weight: it.baseWeight });
     }
     /**
      * Get an item by its ID.
@@ -714,6 +548,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If id is not a string.
      */
     getItem(id) {
+        checkDestroy(this.#isDestroyed);
         if (typeof id !== 'string' || !id.trim())
             throw new TypeError('id must be a non-empty string');
         return this.#items.get(id) ?? null;
@@ -723,13 +558,14 @@ class TinyAdvancedRaffle {
      * @returns {ItemData[]} Array of cloned item objects.
      */
     listItems() {
+        checkDestroy(this.#isDestroyed);
         return Array.from(this.#items.values()).map((i) => ({ ...i }));
     }
     /**
      * Clear all items from the system.
      */
     clearList() {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         this.#items.clear();
         this.clearFreqs();
         this.clearPities();
@@ -744,6 +580,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `fn` is not a function.
      */
     hasGlobalModifier(fn) {
+        checkDestroy(this.#isDestroyed);
         if (typeof fn !== 'function')
             throw new TypeError('fn must be a function');
         return this.#globalModifiers.includes(fn);
@@ -755,7 +592,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `fn` is not a function.
      */
     addGlobalModifier(fn) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof fn !== 'function')
             throw new TypeError('fn must be a function');
         this.#globalModifiers.push(fn);
@@ -766,7 +603,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `fn` is not a function.
      */
     removeGlobalModifier(fn) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof fn !== 'function')
             throw new TypeError('fn must be a function');
         this.#globalModifiers = this.#globalModifiers.filter((x) => x !== fn);
@@ -778,6 +615,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `fn` is not a function.
      */
     hasTemporaryModifier(fn) {
+        checkDestroy(this.#isDestroyed);
         if (typeof fn !== 'function')
             throw new TypeError('fn must be a function');
         return this.#temporaryModifiers.some((mod) => mod.fn === fn);
@@ -791,7 +629,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `uses` is not a number.
      */
     addTemporaryModifier(fn, uses = 1) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof fn !== 'function')
             throw new TypeError('fn must be a function');
         if (typeof uses !== 'number' || Number.isNaN(uses))
@@ -806,7 +644,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `fn` is not a function.
      */
     removeTemporaryModifier(fn) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof fn !== 'function')
             throw new TypeError('fn must be a function');
         const originalLength = this.#temporaryModifiers.length;
@@ -820,6 +658,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `ruleFn` is not a function.
      */
     hasConditionalRule(ruleFn) {
+        checkDestroy(this.#isDestroyed);
         if (typeof ruleFn !== 'function')
             throw new TypeError('ruleFn must be a function');
         return this.#conditionalRules.includes(ruleFn);
@@ -832,7 +671,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `ruleFn` is not a function.
      */
     addConditionalRule(ruleFn) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof ruleFn !== 'function')
             throw new TypeError('ruleFn must be a function');
         this.#conditionalRules.push(ruleFn);
@@ -845,7 +684,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `ruleFn` is not a function.
      */
     removeConditionalRule(ruleFn) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof ruleFn !== 'function')
             throw new TypeError('ruleFn must be a function');
         const originalLength = this.#conditionalRules.length;
@@ -862,6 +701,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `itemId` is not a string.
      */
     hasPity(itemId) {
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string')
             throw new TypeError('itemId must be a string');
         return this.#pitySystems.has(itemId);
@@ -878,7 +718,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If parameters are invalid.
      */
     configurePity(itemId, cfg) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!this.#items.has(itemId))
             throw new Error('Item not found');
         if (typeof cfg !== 'object' || cfg === null)
@@ -904,7 +744,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If itemId is not a string.
      */
     resetPity(itemId) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string' || !itemId.trim())
             throw new TypeError('itemId must be a non-empty string');
         const p = this.#pitySystems.get(itemId);
@@ -917,7 +757,7 @@ class TinyAdvancedRaffle {
      * Remove all pity configurations.
      */
     clearPities() {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         this.#pitySystems.clear();
     }
     /* ===========================
@@ -930,6 +770,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `itemId` is not a string.
      */
     hasExclusion(itemId) {
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string')
             throw new TypeError('itemId must be a string');
         return this.#exclusions.has(itemId);
@@ -940,7 +781,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `itemId` is not a string.
      */
     excludeItem(itemId) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string')
             throw new TypeError('itemId must be a string');
         this.#exclusions.add(itemId);
@@ -951,7 +792,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `itemId` is not a string.
      */
     includeItem(itemId) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string')
             throw new TypeError('itemId must be a string');
         this.#exclusions.delete(itemId);
@@ -964,7 +805,7 @@ class TinyAdvancedRaffle {
      * @private
      */
     _ensureGroup(name) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof name !== 'string')
             throw new TypeError('name must be a string');
         let group = this.#groups.get(name);
@@ -982,6 +823,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If parameters are not strings.
      */
     hasInGroup(itemId, groupName) {
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string' || typeof groupName !== 'string')
             throw new TypeError('itemId and groupName must be strings');
         const group = this.#groups.get(groupName);
@@ -995,7 +837,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If parameters are not strings.
      */
     addToGroup(itemId, groupName) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string' || typeof groupName !== 'string')
             throw new TypeError('itemId and groupName must be strings');
         const it = this.#items.get(itemId);
@@ -1011,7 +853,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If parameters are not strings.
      */
     removeFromGroup(itemId, groupName) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string' || typeof groupName !== 'string')
             throw new TypeError('itemId and groupName must be strings');
         const g = this.#groups.get(groupName);
@@ -1029,7 +871,7 @@ class TinyAdvancedRaffle {
      * Effectively resets the internal frequency map to an empty state.
      */
     clearFreqs() {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         this.#freq.clear();
     }
     /**
@@ -1040,7 +882,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `itemId` is not a string.
      */
     resetFreq(itemId) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof itemId !== 'string')
             throw new TypeError('itemId must be a string');
         this.#freq.delete(itemId);
@@ -1055,7 +897,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `context` is provided but is not an object.
      */
     computeEffectiveWeights(context = {}) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof context !== 'object' || context === null)
             throw new TypeError(`computeEffectiveWeights: parameter 'context' must be a non-null object, got ${typeof context}`);
         if ('previousDraws' in context && !Array.isArray(context.previousDraws))
@@ -1131,9 +973,9 @@ class TinyAdvancedRaffle {
      * @param {Map<string, number>} weights - Map of item IDs to their weights.
      * @returns {Array<{id: string, weight: number, p: number, cumulative: number}>} Distribution array.
      * @throws {TypeError} If `weights` is not a Map.
+     * @private
      */
     _weightsToDistribution(weights) {
-        this._checkDestroyed();
         if (!(weights instanceof Map))
             throw new TypeError(`_weightsToDistribution: parameter 'weights' must be a Map, got ${typeof weights}`);
         for (const [key, val] of weights) {
@@ -1179,7 +1021,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `opts` is not an object.
      */
     drawOne(opts = {}) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof opts !== 'object' || opts === null)
             throw new TypeError(`drawOne: parameter 'opts' must be a non-null object, got ${typeof opts}`);
         if ('previousDraws' in opts && !Array.isArray(opts.previousDraws))
@@ -1216,7 +1058,7 @@ class TinyAdvancedRaffle {
         if (!item)
             return null;
         const result = { id: item.id, label: item.label, meta: { ...item.meta }, prob: chosen.p };
-        this.#emit('draw', result);
+        this.emit('draw', result);
         // add frequence
         if (result)
             this.#freq.set(result.id, (this.#freq.get(result.id) || 0) + 1);
@@ -1229,7 +1071,6 @@ class TinyAdvancedRaffle {
      * @private
      */
     _consumeTemporaryModifiers() {
-        this._checkDestroyed();
         for (let i = this.#temporaryModifiers.length - 1; i >= 0; --i) {
             const t = this.#temporaryModifiers[i];
             t.uses -= 1;
@@ -1251,7 +1092,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `opts` is not an object.
      */
     drawMany(count = 1, opts = {}) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (!Number.isInteger(count) || count <= 0)
             throw new TypeError(`drawMany: parameter 'count' must be a positive integer, got ${count}`);
         if (typeof opts !== 'object' || opts === null)
@@ -1319,7 +1160,7 @@ class TinyAdvancedRaffle {
      * @returns {ExportedJson} Exported configuration object.
      */
     exportToJson() {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         const data = {
             items: Array.from(this.#items.values()).map((it) => ({
                 id: it.id,
@@ -1345,7 +1186,7 @@ class TinyAdvancedRaffle {
      * @throws {TypeError} If `data.seed` is not a number, null, or undefined.
      */
     loadFromJson(data) {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         if (typeof data !== 'object' || data === null)
             throw new TypeError('data must be a non-null object');
         if (!Array.isArray(data.items) || !Array.isArray(data.pity) || !Array.isArray(data.exclusions))
@@ -1394,7 +1235,7 @@ class TinyAdvancedRaffle {
      * @returns {TinyAdvancedRaffle} A new cloned instance, fully independent from the original.
      */
     clone() {
-        this._checkDestroyed();
+        checkDestroy(this.#isDestroyed);
         const cloneInstance = new TinyAdvancedRaffle();
         // Primitive values
         cloneInstance.#normalization = this.#normalization;
@@ -1437,9 +1278,9 @@ class TinyAdvancedRaffle {
      * @param {number} seed - Seed value for PRNG (integer).
      * @returns {RngGenerator} A function that returns a pseudo-random number in [0, 1).
      * @throws {TypeError} If `seed` is not a finite number.
+     * @private
      */
     _makeSeededRng(seed) {
-        this._checkDestroyed();
         if (typeof seed !== 'number' || !Number.isFinite(seed))
             throw new TypeError('seed must be a finite number');
         // mulberry32
@@ -1459,7 +1300,6 @@ class TinyAdvancedRaffle {
     destroy() {
         if (this.#isDestroyed)
             return;
-        this.#isDestroyed = true;
         // Clear all Maps and Sets
         this.#pitySystems.clear();
         this.#exclusions.clear();
@@ -1472,6 +1312,7 @@ class TinyAdvancedRaffle {
         this.#conditionalRules = [];
         // Nullify core references
         this.#seed = null;
+        this.#isDestroyed = true;
     }
 }
 export default TinyAdvancedRaffle;