typed-factorio 0.6.1 → 0.7.3

package/generated/classes.d.ts

@@ -241,11 +241,6 @@ type RaiseableEvents =
   | typeof defines.events.script_raised_revive
   | typeof defines.events.script_raised_set_tiles
 
-/** A custom event id created by {@link LuaBootstrap.generate_event_name}, with type data of the event. */
-type CustomEventId<T extends table> = uint & {
-  _eventData: T
-}
-
 /**
  * Entry point for registering event handlers. It is accessible through the global object named `script`.
  *
@@ -336,14 +331,13 @@ interface LuaBootstrap {
    * @param f - The handler for this event. Passing `nil` will unregister it.
    * @param filters - The filters for this event. Can only be used when registering for individual events.
    */
-  on_event<E extends keyof EventFilters>(
+  on_event<E extends EventId<any, table>>(
     event: E,
-    f: ((data: EventTypes[E]) => void) | undefined,
-    filters?: EventFilters[E][]
+    f: ((data: E["_eventData"]) => void) | undefined,
+    filters?: E["_filter"][]
   ): void
-  on_event<E extends defines.events>(event: E | E[], f: ((data: EventTypes[E]) => void) | undefined): void
+  on_event<E extends EventId<any>>(event: E | E[], f: ((data: E["_eventData"]) => void) | undefined): void
   on_event(event: string, f: ((data: CustomInputEvent) => void) | undefined): void
-  on_event<T extends table>(event: CustomEventId<T>, f: ((data: T) => void) | undefined): void
   /**
    * Register a handler to run every nth-tick(s). When the game is on tick 0 it will trigger all registered handlers.
    *
@@ -388,9 +382,8 @@ interface LuaBootstrap {
    * @param event - The event identifier to get a handler for.
    * @returns Reference to the function currently registered as the handler.
    */
-  get_event_handler<E extends defines.events>(event: E): (data: EventTypes[E]) => void
+  get_event_handler<E extends EventId<any>>(event: E): (data: E["_eventData"]) => void
   get_event_handler(event: string): (data: CustomInputEvent) => void
-  get_event_handler<T extends table>(event: CustomEventId<T>): (data: T) => void
   /**
    * Gets the mod event order as a string.
    *
@@ -427,7 +420,7 @@ interface LuaBootstrap {
    * @param event - ID of the event to filter.
    * @param filters - The filters or `nil` to clear them.
    */
-  set_event_filter<E extends keyof EventFilters>(event: E, filters: EventFilters[E][] | undefined): void
+  set_event_filter<E extends EventId<any, table>>(event: E, filters: E["_filter"][] | undefined): void
   /**
    * Gets the filters for the given event.
    *
@@ -436,7 +429,7 @@ interface LuaBootstrap {
    * @param event - ID of the event to get.
    * @returns The filters or `nil` if none are defined.
    */
-  get_event_filter<E extends keyof EventFilters>(event: E): EventFilters[E][] | undefined
+  get_event_filter<E extends EventId<any, table>>(event: E): E["_filter"][] | undefined
   /**
    * Raise an event. Only events generated with
    * {@link LuaBootstrap.generate_event_name LuaBootstrap::generate_event_name} and the following can be raised:
@@ -464,8 +457,10 @@ interface LuaBootstrap {
    * @param event - ID of the event to raise.
    * @param data - Table with extra data that will be passed to the event handler.
    */
-  raise_event<T extends table>(event: CustomEventId<T>, data: T): void
-  raise_event<E extends RaiseableEvents>(event: E, data: Omit<EventTypes[E], keyof EventData>): void
+  raise_event<E extends RaiseableEvents | CustomEventId<any>>(
+    event: E,
+    data: Omit<E["_eventData"], keyof EventData>
+  ): void
   /**
    * Raises {@link OnConsoleChatEvent on_console_chat} with the given parameters.
    *
@@ -1393,9 +1388,15 @@ interface LuaControl {
    */
   selected: LuaEntity | undefined
   /**
-   * The GUI target the player currently has open; `nil` if none.
+   * The GUI the player currently has open, or `nil` if no GUI is open. Writing to it fires the
+   * {@link OnGuiOpenedEvent on_gui_opened} event.
+   *
+   * This is the GUI that will asked to close (by firing the {@link OnGuiClosedEvent on_gui_closed} event) when the
+   * `Esc` or `E` keys are pressed. If this attribute is not `nil`, and a new GUI is written to it, the existing one
+   * will be asked to close.
    *
-   * **Note**: Write supports any of the types. Read will return the entity, equipment, equipment-grid, player, element or nil.
+   * **Note**: Write supports any of the types. Read will return the `entity`, `equipment`, `equipment-grid`,
+   * `player`, `element` or `nil`.
    *
    * {@link https://lua-api.factorio.com/next/LuaControl.html#LuaControl.opened View documentation}
    */
@@ -2613,7 +2614,7 @@ interface LuaEntity extends LuaControl {
   /**
    * Get the rails that this signal is connected to.
    *
-   * *Can only be used if this is RailSignal*
+   * *Can only be used if this is RailSignal or RailChainSignal*
    *
    * {@link https://lua-api.factorio.com/next/LuaEntity.html#LuaEntity.get_connected_rails View documentation}
    */
@@ -2873,7 +2874,7 @@ interface LuaEntity extends LuaControl {
   /**
    * Sets the current recipe in this assembly machine.
    *
-   * *Can only be used if this is CraftingMachine*
+   * *Can only be used if this is AssemblingMachine*
    *
    * {@link https://lua-api.factorio.com/next/LuaEntity.html#LuaEntity.set_recipe View documentation}
    *
@@ -3700,7 +3701,7 @@ interface LuaEntity extends LuaControl {
   /**
    * The state of this rail signal.
    *
-   * *Can only be used if this is RailSignal*
+   * *Can only be used if this is RailSignal or RailChainSignal*
    *
    * {@link https://lua-api.factorio.com/next/LuaEntity.html#LuaEntity.signal_state View documentation}
    */
@@ -7895,53 +7896,59 @@ interface LuaGameScript {
    */
   regenerate_entity(entities: string | string[]): void
   /**
-   * Take a screenshot and save it to a file.
+   * Take a screenshot and save it to a file. The filename should include a file extension indicating the desired
+   * image format. Supports `.png`, `.jpg` / `.jpeg`, `.tga` and `.bmp`.
    *
    * **Note**: If Factorio is running headless, this function will do nothing.
    *
    * {@link https://lua-api.factorio.com/next/LuaGameScript.html#LuaGameScript.take_screenshot View documentation}
    */
   take_screenshot(params: {
+    /** The player to focus on. Defaults to the local player. */
     readonly player?: PlayerIdentification
     /** If defined, the screenshot will only be taken for this player. */
     readonly by_player?: PlayerIdentification
     /** If defined, the screenshot will be taken on this surface. */
     readonly surface?: SurfaceIdentification
-    /** If defined, the screenshot will be centered on this position. */
+    /** If defined, the screenshot will be centered on this position. Otherwise, the screenshot will center on `player`. */
     readonly position?: Position
     /**
-     * Maximum allowed resolution is 16384x16384 (resp. 8192x8192 when anti_alias is true), but maximum recommended
-     * resolution is 4096x4096 (resp. 2048x2048).
+     * The maximum allowed resolution is 16384x16384 (8192x8192 when `anti_alias` is `true`), but the maximum
+     * recommended resolution is 4096x4096 (resp. 2048x2048).
      */
     readonly resolution?: Position
+    /** The map zoom to take the screenshot at. Defaults to `1`. */
     readonly zoom?: double
-    /** Path to save the screenshot in */
+    /** The sub-path in `"script-output"` to save the screenshot to. Defaults to `"screenshot.png"`. */
     readonly path?: string
-    /** Include game GUI in the screenshot? */
+    /** Whether to include GUIs in the screenshot or not. Defaults to `false`. */
     readonly show_gui?: boolean
-    /** Include entity info (alt-mode)? */
+    /** Whether to include entity info ("Alt mode") or not. Defaults to `false`. */
     readonly show_entity_info?: boolean
-    /** When true, and player is specified, building preview for item in player's cursor will be rendered also. */
+    /**
+     * When `true` and when `player` is specified, the building preview for the item in the player's cursor will
+     * also be rendered. Defaults to `false`.
+     */
     readonly show_cursor_building_preview?: boolean
-    /** Render in double resolution and scale down (including GUI)? */
+    /** Whether to render in double resolution and downscale the result (including GUI). Defaults to `false`. */
     readonly anti_alias?: boolean
-    /** The render quality if using jpg format (0-100 inclusive). */
-    readonly quality?: int
     /**
-     * If true, the screenshot will be saved even during replay playback, otherwise this function call does nothing
-     * in replays.
+     * The `.jpg` render quality as a percentage (from 0% to 100% inclusive), if used. A lower value means a more
+     * compressed image. Defaults to `80`.
      */
+    readonly quality?: int
+    /** Whether to save the screenshot even during replay playback. Defaults to `false`. */
     readonly allow_in_replay?: boolean
-    /** Overrides current surface daytime for duration of screenshot rendering. */
+    /** Overrides the current surface daytime for the duration of screenshot rendering. */
     readonly daytime?: double
-    /** Overrides tick of water animation (if animated water is enabled). */
+    /** Overrides the tick of water animation, if animated water is enabled. */
     readonly water_tick?: uint
     /**
-     * Screenshot requests are processed in between update and render. The game may skip rendering (drop frames) if
-     * previous frame has not finished rendering or the game simulation starts to fall under 60 updates per second.
-     * If force_render is set to true, the game won't drop frames and process the screenshot request at the end of
-     * the update in which the request was created. This is not honored on multiplayer clients that are catching up
-     * to server.
+     * Screenshot requests are processed in between game update and render. The game may skip rendering (ie. drop
+     * frames) if the previous frame has not finished rendering or the game simulation starts to fall below 60
+     * updates per second. If `force_render` is set to `true`, the game won't drop frames and process the screenshot
+     * request at the end of the update in which the request was created. This is not honored on multiplayer clients
+     * that are catching up to server. Defaults to `false`.
      */
     readonly force_render?: boolean
   }): void
@@ -7951,12 +7958,18 @@ interface LuaGameScript {
    * {@link https://lua-api.factorio.com/next/LuaGameScript.html#LuaGameScript.set_wait_for_screenshots_to_finish View documentation}
    */
   set_wait_for_screenshots_to_finish(): void
+  /**
+   * Take a screenshot of the technology screen and save it to a file. The filename should include a file extension
+   * indicating the desired image format. Supports `.png`, `.jpg` / `.jpeg`, `.tga` and `.bmp`.
+   *
+   * {@link https://lua-api.factorio.com/next/LuaGameScript.html#LuaGameScript.take_technology_screenshot View documentation}
+   */
   take_technology_screenshot(params: {
-    /** The force to use. If not given the `"player`" force is used. */
+    /** The force whose technology to screenshot. If not given, the `"player`" force is used. */
     readonly force?: ForceIdentification
-    /** Path to save the screenshot in. */
+    /** The sub-path in `"script-output"` to save the screenshot to. Defaults to `"technology-screenshot.png"`. */
     readonly path?: string
-    /** If defined, the screenshot will only be taken for this player. */
+    /** If given, the screenshot will only be taken for this player. */
     readonly by_player?: PlayerIdentification
     /** The technology to highlight. */
     readonly selected_technology?: TechnologyIdentification
@@ -7965,7 +7978,10 @@ interface LuaGameScript {
      * technology's parents. Defaults to `false`.
      */
     readonly skip_disabled?: boolean
-    /** The render quality if using jpg format (0-100 inclusive). */
+    /**
+     * The `.jpg` render quality as a percentage (from 0% to 100% inclusive), if used. A lower value means a more
+     * compressed image. Defaults to `80`.
+     */
     readonly quality?: int
   }): void
   /**
@@ -9843,7 +9859,7 @@ interface BaseGuiElement {
    */
   show_percent_for_small_numbers: boolean
   /**
-   * The location of this widget when stored in {@link LuaGui.screen LuaGui::screen} or `nil` if not not set or not in
+   * The location of this widget when stored in {@link LuaGui.screen LuaGui::screen}, or `nil` if not set or not in
    * {@link LuaGui.screen LuaGui::screen}.
    *
    * {@link https://lua-api.factorio.com/next/LuaGuiElement.html#LuaGuiElement.location View documentation}
@@ -14429,7 +14445,7 @@ interface LuaPlayer extends LuaControl {
    * Gets the current per-player settings for the this player, indexed by prototype name. Returns the same structure
    * as {@link LuaSettings.get_player_settings LuaSettings::get_player_settings}.
    *
-   * **Note**: This can become invalid if during operation this player becomes invalid.
+   * **Note**: This table will become invalid if its associated player does.
    *
    * {@link https://lua-api.factorio.com/next/LuaPlayer.html#LuaPlayer.mod_settings View documentation}
    */
@@ -16710,7 +16726,7 @@ interface LuaSettings {
    * Gets the current per-player settings for the given player, indexed by prototype name. Returns the same structure
    * as {@link LuaPlayer.mod_settings LuaPlayer::mod_settings}.
    *
-   * **Note**: This can become invalid if during operation if the given player becomes invalid.
+   * **Note**: This table will become invalid if its associated player does.
    *
    * {@link https://lua-api.factorio.com/next/LuaSettings.html#LuaSettings.get_player_settings View documentation}
    *
@@ -17547,15 +17563,15 @@ interface LuaSurface {
    */
   find_entities(area?: BoundingBox): LuaEntity[]
   /**
-   * Find entities of given type or name in a given area.
+   * Find all entities of the given type or name in the given area.
    *
-   * If no filters (`name`, `type`, `force`, etc.) are given, returns all entities in the search area. If multiple
-   * filters are specified, returns only entities matching all given filters.
+   * If no filters (`name`, `type`, `force`, etc.) are given, this returns all entities in the search area. If
+   * multiple filters are specified, only entities matching all given filters are returned.
    *
-   * If no area or position are given, then the entire surface is searched. If position is given, returns entities
-   * colliding with that position (i.e the given position is within the entity's collision box). If position and
-   * radius are given, returns entities in that radius of the position. If area is specified, returns entities
-   * colliding with that area.
+   * If no `area` or `position` are given, the entire surface is searched. If `position` is given, this returns the
+   * entities colliding with that position (i.e the given position is within the entity's collision box). If
+   * `position` and `radius` are given, this returns the entities within the radius of the position. If `area` is
+   * specified, this returns the entities colliding with that area.
    *
    * {@link https://lua-api.factorio.com/next/LuaSurface.html#LuaSurface.find_entities_filtered View documentation}
    *
@@ -17592,11 +17608,11 @@ interface LuaSurface {
     readonly invert?: boolean
   }): LuaEntity[]
   /**
-   * Find tiles of a given name in a given area.
+   * Find all tiles of the given name in the given area.
    *
-   * If no filters are given returns all tiles in the search area.
+   * If no filters are given, this returns all tiles in the search area.
    *
-   * If no area or position and radius is given, then the entire surface is searched. If position and radius are
+   * If no `area` or `position` and `radius` is given, the entire surface is searched. If `position` and `radius` are
    * given, only tiles within the radius of the position are included.
    *
    * {@link https://lua-api.factorio.com/next/LuaSurface.html#LuaSurface.find_tiles_filtered View documentation}
@@ -17618,10 +17634,10 @@ interface LuaSurface {
    * As it doesn't construct all the wrapper objects, this is more efficient if one is only interested in the number
    * of entities.
    *
-   * If no area or position are given, then the entire surface is searched. If position is given, returns entities
-   * colliding with that position (i.e the given position is within the entity's collision box). If position and
-   * radius are given, returns entities in that radius of the position. If area is specified, returns entities
-   * colliding with that area.
+   * If no `area` or `position` are given, the entire surface is searched. If `position` is given, this returns the
+   * entities colliding with that position (i.e the given position is within the entity's collision box). If
+   * `position` and `radius` are given, this returns entities in the radius of the position. If `area` is specified,
+   * this returns entities colliding with that area.
    *
    * {@link https://lua-api.factorio.com/next/LuaSurface.html#LuaSurface.count_entities_filtered View documentation}
    */
@@ -17651,7 +17667,7 @@ interface LuaSurface {
    * {@link LuaSurface.find_tiles_filtered LuaSurface::find_tiles_filtered}, except this only returns the count. As it
    * doesn't construct all the wrapper objects, this is more efficient if one is only interested in the number of tiles.
    *
-   * If no area or position and radius is given, then the entire surface is searched. If position and radius are
+   * If no `area` or `position` and `radius` is given, the entire surface is searched. If `position` and `radius` are
    * given, only tiles within the radius of the position are included.
    *
    * {@link https://lua-api.factorio.com/next/LuaSurface.html#LuaSurface.count_tiles_filtered View documentation}

package/generated/concepts.d.ts

@@ -2735,7 +2735,7 @@ type Alignment =
  */
 interface EventData {
   /** The identifier of the event this handler was registered to. */
-  readonly name: defines.events
+  readonly name: EventId<EventData>
   /** The tick during which the event happened. */
   readonly tick: uint
   /** The name of the mod that raised the event if it was raised using {@link LuaBootstrap.raise_event LuaBootstrap::raise_event}. */

package/generated/defines.d.ts

@@ -649,351 +649,437 @@ declare namespace defines {
    */
   namespace events {
     /** Event type: {@link OnTickEvent} */
-    const on_tick: unique symbol
+    const on_tick: EventId<OnTickEvent>
     /** Event type: {@link OnGuiClickEvent} */
-    const on_gui_click: unique symbol
+    const on_gui_click: EventId<OnGuiClickEvent>
     /** Event type: {@link OnGuiConfirmedEvent} */
-    const on_gui_confirmed: unique symbol
+    const on_gui_confirmed: EventId<OnGuiConfirmedEvent>
     /** Event type: {@link OnGuiTextChangedEvent} */
-    const on_gui_text_changed: unique symbol
+    const on_gui_text_changed: EventId<OnGuiTextChangedEvent>
     /** Event type: {@link OnGuiCheckedStateChangedEvent} */
-    const on_gui_checked_state_changed: unique symbol
-    /** Event type: {@link OnEntityDiedEvent} */
-    const on_entity_died: unique symbol
-    /** Event type: {@link OnPostEntityDiedEvent} */
-    const on_post_entity_died: unique symbol
-    /** Event type: {@link OnEntityDamagedEvent} */
-    const on_entity_damaged: unique symbol
+    const on_gui_checked_state_changed: EventId<OnGuiCheckedStateChangedEvent>
+    /**
+     * Event type: {@link OnEntityDiedEvent}
+     *
+     * Event filter: {@link LuaEntityDiedEventFilter}
+     */
+    const on_entity_died: EventId<OnEntityDiedEvent, LuaEntityDiedEventFilter>
+    /**
+     * Event type: {@link OnPostEntityDiedEvent}
+     *
+     * Event filter: {@link LuaPostEntityDiedEventFilter}
+     */
+    const on_post_entity_died: EventId<OnPostEntityDiedEvent, LuaPostEntityDiedEventFilter>
+    /**
+     * Event type: {@link OnEntityDamagedEvent}
+     *
+     * Event filter: {@link LuaEntityDamagedEventFilter}
+     */
+    const on_entity_damaged: EventId<OnEntityDamagedEvent, LuaEntityDamagedEventFilter>
     /** Event type: {@link OnPickedUpItemEvent} */
-    const on_picked_up_item: unique symbol
-    /** Event type: {@link OnBuiltEntityEvent} */
-    const on_built_entity: unique symbol
-    /** Event type: {@link OnSectorScannedEvent} */
-    const on_sector_scanned: unique symbol
+    const on_picked_up_item: EventId<OnPickedUpItemEvent>
+    /**
+     * Event type: {@link OnBuiltEntityEvent}
+     *
+     * Event filter: {@link LuaPlayerBuiltEntityEventFilter}
+     */
+    const on_built_entity: EventId<OnBuiltEntityEvent, LuaPlayerBuiltEntityEventFilter>
+    /**
+     * Event type: {@link OnSectorScannedEvent}
+     *
+     * Event filter: {@link LuaSectorScannedEventFilter}
+     */
+    const on_sector_scanned: EventId<OnSectorScannedEvent, LuaSectorScannedEventFilter>
     /** Event type: {@link OnPlayerMinedItemEvent} */
-    const on_player_mined_item: unique symbol
+    const on_player_mined_item: EventId<OnPlayerMinedItemEvent>
     /** Event type: {@link OnPreBuildEvent} */
-    const on_pre_build: unique symbol
+    const on_pre_build: EventId<OnPreBuildEvent>
     /** Event type: {@link OnRocketLaunchedEvent} */
-    const on_rocket_launched: unique symbol
-    /** Event type: {@link OnPrePlayerMinedItemEvent} */
-    const on_pre_player_mined_item: unique symbol
+    const on_rocket_launched: EventId<OnRocketLaunchedEvent>
+    /**
+     * Event type: {@link OnPrePlayerMinedItemEvent}
+     *
+     * Event filter: {@link LuaPrePlayerMinedEntityEventFilter}
+     */
+    const on_pre_player_mined_item: EventId<OnPrePlayerMinedItemEvent, LuaPrePlayerMinedEntityEventFilter>
     /** Event type: {@link OnChunkGeneratedEvent} */
-    const on_chunk_generated: unique symbol
+    const on_chunk_generated: EventId<OnChunkGeneratedEvent>
     /** Event type: {@link OnPlayerCraftedItemEvent} */
-    const on_player_crafted_item: unique symbol
-    /** Event type: {@link OnRobotBuiltEntityEvent} */
-    const on_robot_built_entity: unique symbol
-    /** Event type: {@link OnRobotPreMinedEvent} */
-    const on_robot_pre_mined: unique symbol
+    const on_player_crafted_item: EventId<OnPlayerCraftedItemEvent>
+    /**
+     * Event type: {@link OnRobotBuiltEntityEvent}
+     *
+     * Event filter: {@link LuaRobotBuiltEntityEventFilter}
+     */
+    const on_robot_built_entity: EventId<OnRobotBuiltEntityEvent, LuaRobotBuiltEntityEventFilter>
+    /**
+     * Event type: {@link OnRobotPreMinedEvent}
+     *
+     * Event filter: {@link LuaPreRobotMinedEntityEventFilter}
+     */
+    const on_robot_pre_mined: EventId<OnRobotPreMinedEvent, LuaPreRobotMinedEntityEventFilter>
     /** Event type: {@link OnRobotMinedEvent} */
-    const on_robot_mined: unique symbol
+    const on_robot_mined: EventId<OnRobotMinedEvent>
     /** Event type: {@link OnResearchStartedEvent} */
-    const on_research_started: unique symbol
+    const on_research_started: EventId<OnResearchStartedEvent>
     /** Event type: {@link OnResearchFinishedEvent} */
-    const on_research_finished: unique symbol
+    const on_research_finished: EventId<OnResearchFinishedEvent>
     /** Event type: {@link OnResearchReversedEvent} */
-    const on_research_reversed: unique symbol
+    const on_research_reversed: EventId<OnResearchReversedEvent>
     /** Event type: {@link OnPlayerRotatedEntityEvent} */
-    const on_player_rotated_entity: unique symbol
-    /** Event type: {@link OnMarkedForDeconstructionEvent} */
-    const on_marked_for_deconstruction: unique symbol
-    /** Event type: {@link OnCancelledDeconstructionEvent} */
-    const on_cancelled_deconstruction: unique symbol
+    const on_player_rotated_entity: EventId<OnPlayerRotatedEntityEvent>
+    /**
+     * Event type: {@link OnMarkedForDeconstructionEvent}
+     *
+     * Event filter: {@link LuaEntityMarkedForDeconstructionEventFilter}
+     */
+    const on_marked_for_deconstruction: EventId<
+      OnMarkedForDeconstructionEvent,
+      LuaEntityMarkedForDeconstructionEventFilter
+    >
+    /**
+     * Event type: {@link OnCancelledDeconstructionEvent}
+     *
+     * Event filter: {@link LuaEntityDeconstructionCancelledEventFilter}
+     */
+    const on_cancelled_deconstruction: EventId<
+      OnCancelledDeconstructionEvent,
+      LuaEntityDeconstructionCancelledEventFilter
+    >
     /** Event type: {@link OnTriggerCreatedEntityEvent} */
-    const on_trigger_created_entity: unique symbol
+    const on_trigger_created_entity: EventId<OnTriggerCreatedEntityEvent>
     /** Event type: {@link OnTriggerFiredArtilleryEvent} */
-    const on_trigger_fired_artillery: unique symbol
+    const on_trigger_fired_artillery: EventId<OnTriggerFiredArtilleryEvent>
     /** Event type: {@link OnTrainChangedStateEvent} */
-    const on_train_changed_state: unique symbol
+    const on_train_changed_state: EventId<OnTrainChangedStateEvent>
     /** Event type: {@link OnPlayerCreatedEvent} */
-    const on_player_created: unique symbol
+    const on_player_created: EventId<OnPlayerCreatedEvent>
     /** Event type: {@link OnResourceDepletedEvent} */
-    const on_resource_depleted: unique symbol
+    const on_resource_depleted: EventId<OnResourceDepletedEvent>
     /** Event type: {@link OnPlayerDrivingChangedStateEvent} */
-    const on_player_driving_changed_state: unique symbol
+    const on_player_driving_changed_state: EventId<OnPlayerDrivingChangedStateEvent>
     /** Event type: {@link OnForceCreatedEvent} */
-    const on_force_created: unique symbol
+    const on_force_created: EventId<OnForceCreatedEvent>
     /** Event type: {@link OnForcesMergingEvent} */
-    const on_forces_merging: unique symbol
+    const on_forces_merging: EventId<OnForcesMergingEvent>
     /** Event type: {@link OnPlayerCursorStackChangedEvent} */
-    const on_player_cursor_stack_changed: unique symbol
+    const on_player_cursor_stack_changed: EventId<OnPlayerCursorStackChangedEvent>
     /** Event type: {@link OnPreEntitySettingsPastedEvent} */
-    const on_pre_entity_settings_pasted: unique symbol
+    const on_pre_entity_settings_pasted: EventId<OnPreEntitySettingsPastedEvent>
     /** Event type: {@link OnEntitySettingsPastedEvent} */
-    const on_entity_settings_pasted: unique symbol
+    const on_entity_settings_pasted: EventId<OnEntitySettingsPastedEvent>
     /** Event type: {@link OnPlayerMainInventoryChangedEvent} */
-    const on_player_main_inventory_changed: unique symbol
+    const on_player_main_inventory_changed: EventId<OnPlayerMainInventoryChangedEvent>
     /** Event type: {@link OnPlayerArmorInventoryChangedEvent} */
-    const on_player_armor_inventory_changed: unique symbol
+    const on_player_armor_inventory_changed: EventId<OnPlayerArmorInventoryChangedEvent>
     /** Event type: {@link OnPlayerAmmoInventoryChangedEvent} */
-    const on_player_ammo_inventory_changed: unique symbol
+    const on_player_ammo_inventory_changed: EventId<OnPlayerAmmoInventoryChangedEvent>
     /** Event type: {@link OnPlayerGunInventoryChangedEvent} */
-    const on_player_gun_inventory_changed: unique symbol
+    const on_player_gun_inventory_changed: EventId<OnPlayerGunInventoryChangedEvent>
     /** Event type: {@link OnPlayerPlacedEquipmentEvent} */
-    const on_player_placed_equipment: unique symbol
+    const on_player_placed_equipment: EventId<OnPlayerPlacedEquipmentEvent>
     /** Event type: {@link OnPlayerRemovedEquipmentEvent} */
-    const on_player_removed_equipment: unique symbol
+    const on_player_removed_equipment: EventId<OnPlayerRemovedEquipmentEvent>
     /** Event type: {@link OnPrePlayerDiedEvent} */
-    const on_pre_player_died: unique symbol
+    const on_pre_player_died: EventId<OnPrePlayerDiedEvent>
     /** Event type: {@link OnPlayerDiedEvent} */
-    const on_player_died: unique symbol
+    const on_player_died: EventId<OnPlayerDiedEvent>
     /** Event type: {@link OnPlayerRespawnedEvent} */
-    const on_player_respawned: unique symbol
+    const on_player_respawned: EventId<OnPlayerRespawnedEvent>
     /** Event type: {@link OnPlayerJoinedGameEvent} */
-    const on_player_joined_game: unique symbol
+    const on_player_joined_game: EventId<OnPlayerJoinedGameEvent>
     /** Event type: {@link OnPlayerLeftGameEvent} */
-    const on_player_left_game: unique symbol
+    const on_player_left_game: EventId<OnPlayerLeftGameEvent>
     /** Event type: {@link OnPlayerBuiltTileEvent} */
-    const on_player_built_tile: unique symbol
+    const on_player_built_tile: EventId<OnPlayerBuiltTileEvent>
     /** Event type: {@link OnPlayerMinedTileEvent} */
-    const on_player_mined_tile: unique symbol
+    const on_player_mined_tile: EventId<OnPlayerMinedTileEvent>
     /** Event type: {@link OnRobotBuiltTileEvent} */
-    const on_robot_built_tile: unique symbol
+    const on_robot_built_tile: EventId<OnRobotBuiltTileEvent>
     /** Event type: {@link OnRobotMinedTileEvent} */
-    const on_robot_mined_tile: unique symbol
+    const on_robot_mined_tile: EventId<OnRobotMinedTileEvent>
     /** Event type: {@link OnPlayerSelectedAreaEvent} */
-    const on_player_selected_area: unique symbol
+    const on_player_selected_area: EventId<OnPlayerSelectedAreaEvent>
     /** Event type: {@link OnPlayerAltSelectedAreaEvent} */
-    const on_player_alt_selected_area: unique symbol
+    const on_player_alt_selected_area: EventId<OnPlayerAltSelectedAreaEvent>
     /** Event type: {@link OnPlayerChangedSurfaceEvent} */
-    const on_player_changed_surface: unique symbol
+    const on_player_changed_surface: EventId<OnPlayerChangedSurfaceEvent>
     /** Event type: {@link OnSelectedEntityChangedEvent} */
-    const on_selected_entity_changed: unique symbol
+    const on_selected_entity_changed: EventId<OnSelectedEntityChangedEvent>
     /** Event type: {@link OnMarketItemPurchasedEvent} */
-    const on_market_item_purchased: unique symbol
+    const on_market_item_purchased: EventId<OnMarketItemPurchasedEvent>
     /** Event type: {@link OnPlayerDroppedItemEvent} */
-    const on_player_dropped_item: unique symbol
+    const on_player_dropped_item: EventId<OnPlayerDroppedItemEvent>
     /** Event type: {@link OnBiterBaseBuiltEvent} */
-    const on_biter_base_built: unique symbol
+    const on_biter_base_built: EventId<OnBiterBaseBuiltEvent>
     /** Event type: {@link OnPlayerChangedForceEvent} */
-    const on_player_changed_force: unique symbol
+    const on_player_changed_force: EventId<OnPlayerChangedForceEvent>
     /** Event type: {@link OnEntityRenamedEvent} */
-    const on_entity_renamed: unique symbol
+    const on_entity_renamed: EventId<OnEntityRenamedEvent>
     /** Event type: {@link OnGuiSelectionStateChangedEvent} */
-    const on_gui_selection_state_changed: unique symbol
+    const on_gui_selection_state_changed: EventId<OnGuiSelectionStateChangedEvent>
     /** Event type: {@link OnRuntimeModSettingChangedEvent} */
-    const on_runtime_mod_setting_changed: unique symbol
+    const on_runtime_mod_setting_changed: EventId<OnRuntimeModSettingChangedEvent>
     /** Event type: {@link OnDifficultySettingsChangedEvent} */
-    const on_difficulty_settings_changed: unique symbol
+    const on_difficulty_settings_changed: EventId<OnDifficultySettingsChangedEvent>
     /** Event type: {@link OnSurfaceCreatedEvent} */
-    const on_surface_created: unique symbol
+    const on_surface_created: EventId<OnSurfaceCreatedEvent>
     /** Event type: {@link OnSurfaceDeletedEvent} */
-    const on_surface_deleted: unique symbol
+    const on_surface_deleted: EventId<OnSurfaceDeletedEvent>
     /** Event type: {@link OnPreSurfaceDeletedEvent} */
-    const on_pre_surface_deleted: unique symbol
-    /** Event type: {@link OnPlayerMinedEntityEvent} */
-    const on_player_mined_entity: unique symbol
-    /** Event type: {@link OnRobotMinedEntityEvent} */
-    const on_robot_mined_entity: unique symbol
+    const on_pre_surface_deleted: EventId<OnPreSurfaceDeletedEvent>
+    /**
+     * Event type: {@link OnPlayerMinedEntityEvent}
+     *
+     * Event filter: {@link LuaPlayerMinedEntityEventFilter}
+     */
+    const on_player_mined_entity: EventId<OnPlayerMinedEntityEvent, LuaPlayerMinedEntityEventFilter>
+    /**
+     * Event type: {@link OnRobotMinedEntityEvent}
+     *
+     * Event filter: {@link LuaRobotMinedEntityEventFilter}
+     */
+    const on_robot_mined_entity: EventId<OnRobotMinedEntityEvent, LuaRobotMinedEntityEventFilter>
     /** Event type: {@link OnTrainCreatedEvent} */
-    const on_train_created: unique symbol
+    const on_train_created: EventId<OnTrainCreatedEvent>
     /** Event type: {@link OnGuiElemChangedEvent} */
-    const on_gui_elem_changed: unique symbol
+    const on_gui_elem_changed: EventId<OnGuiElemChangedEvent>
     /** Event type: {@link OnPlayerSetupBlueprintEvent} */
-    const on_player_setup_blueprint: unique symbol
+    const on_player_setup_blueprint: EventId<OnPlayerSetupBlueprintEvent>
     /** Event type: {@link OnPlayerDeconstructedAreaEvent} */
-    const on_player_deconstructed_area: unique symbol
+    const on_player_deconstructed_area: EventId<OnPlayerDeconstructedAreaEvent>
     /** Event type: {@link OnPlayerConfiguredBlueprintEvent} */
-    const on_player_configured_blueprint: unique symbol
+    const on_player_configured_blueprint: EventId<OnPlayerConfiguredBlueprintEvent>
     /** Event type: {@link OnConsoleChatEvent} */
-    const on_console_chat: unique symbol
+    const on_console_chat: EventId<OnConsoleChatEvent>
     /** Event type: {@link OnConsoleCommandEvent} */
-    const on_console_command: unique symbol
+    const on_console_command: EventId<OnConsoleCommandEvent>
     /** Event type: {@link OnPlayerRemovedEvent} */
-    const on_player_removed: unique symbol
+    const on_player_removed: EventId<OnPlayerRemovedEvent>
     /** Event type: {@link OnPrePlayerRemovedEvent} */
-    const on_pre_player_removed: unique symbol
+    const on_pre_player_removed: EventId<OnPrePlayerRemovedEvent>
     /** Event type: {@link OnPlayerUsedCapsuleEvent} */
-    const on_player_used_capsule: unique symbol
-    /** Event type: {@link ScriptRaisedBuiltEvent} */
-    const script_raised_built: unique symbol
-    /** Event type: {@link ScriptRaisedDestroyEvent} */
-    const script_raised_destroy: unique symbol
-    /** Event type: {@link ScriptRaisedReviveEvent} */
-    const script_raised_revive: unique symbol
+    const on_player_used_capsule: EventId<OnPlayerUsedCapsuleEvent>
+    /**
+     * Event type: {@link ScriptRaisedBuiltEvent}
+     *
+     * Event filter: {@link LuaScriptRaisedBuiltEventFilter}
+     */
+    const script_raised_built: EventId<ScriptRaisedBuiltEvent, LuaScriptRaisedBuiltEventFilter>
+    /**
+     * Event type: {@link ScriptRaisedDestroyEvent}
+     *
+     * Event filter: {@link LuaScriptRaisedDestroyEventFilter}
+     */
+    const script_raised_destroy: EventId<ScriptRaisedDestroyEvent, LuaScriptRaisedDestroyEventFilter>
+    /**
+     * Event type: {@link ScriptRaisedReviveEvent}
+     *
+     * Event filter: {@link LuaScriptRaisedReviveEventFilter}
+     */
+    const script_raised_revive: EventId<ScriptRaisedReviveEvent, LuaScriptRaisedReviveEventFilter>
     /** Event type: {@link ScriptRaisedSetTilesEvent} */
-    const script_raised_set_tiles: unique symbol
+    const script_raised_set_tiles: EventId<ScriptRaisedSetTilesEvent>
     /** Event type: {@link OnPlayerPromotedEvent} */
-    const on_player_promoted: unique symbol
+    const on_player_promoted: EventId<OnPlayerPromotedEvent>
     /** Event type: {@link OnPlayerDemotedEvent} */
-    const on_player_demoted: unique symbol
+    const on_player_demoted: EventId<OnPlayerDemotedEvent>
     /** Event type: {@link OnCombatRobotExpiredEvent} */
-    const on_combat_robot_expired: unique symbol
+    const on_combat_robot_expired: EventId<OnCombatRobotExpiredEvent>
     /** Event type: {@link OnWorkerRobotExpiredEvent} */
-    const on_worker_robot_expired: unique symbol
+    const on_worker_robot_expired: EventId<OnWorkerRobotExpiredEvent>
     /** Event type: {@link OnPlayerChangedPositionEvent} */
-    const on_player_changed_position: unique symbol
+    const on_player_changed_position: EventId<OnPlayerChangedPositionEvent>
     /** Event type: {@link OnModItemOpenedEvent} */
-    const on_mod_item_opened: unique symbol
+    const on_mod_item_opened: EventId<OnModItemOpenedEvent>
     /** Event type: {@link OnGuiOpenedEvent} */
-    const on_gui_opened: unique symbol
+    const on_gui_opened: EventId<OnGuiOpenedEvent>
     /** Event type: {@link OnGuiClosedEvent} */
-    const on_gui_closed: unique symbol
+    const on_gui_closed: EventId<OnGuiClosedEvent>
     /** Event type: {@link OnGuiValueChangedEvent} */
-    const on_gui_value_changed: unique symbol
+    const on_gui_value_changed: EventId<OnGuiValueChangedEvent>
     /** Event type: {@link OnPlayerMutedEvent} */
-    const on_player_muted: unique symbol
+    const on_player_muted: EventId<OnPlayerMutedEvent>
     /** Event type: {@link OnPlayerUnmutedEvent} */
-    const on_player_unmuted: unique symbol
+    const on_player_unmuted: EventId<OnPlayerUnmutedEvent>
     /** Event type: {@link OnPlayerCheatModeEnabledEvent} */
-    const on_player_cheat_mode_enabled: unique symbol
+    const on_player_cheat_mode_enabled: EventId<OnPlayerCheatModeEnabledEvent>
     /** Event type: {@link OnPlayerCheatModeDisabledEvent} */
-    const on_player_cheat_mode_disabled: unique symbol
+    const on_player_cheat_mode_disabled: EventId<OnPlayerCheatModeDisabledEvent>
     /** Event type: {@link OnCharacterCorpseExpiredEvent} */
-    const on_character_corpse_expired: unique symbol
-    /** Event type: {@link OnPreGhostDeconstructedEvent} */
-    const on_pre_ghost_deconstructed: unique symbol
+    const on_character_corpse_expired: EventId<OnCharacterCorpseExpiredEvent>
+    /**
+     * Event type: {@link OnPreGhostDeconstructedEvent}
+     *
+     * Event filter: {@link LuaPreGhostDeconstructedEventFilter}
+     */
+    const on_pre_ghost_deconstructed: EventId<OnPreGhostDeconstructedEvent, LuaPreGhostDeconstructedEventFilter>
     /** Event type: {@link OnPlayerPipetteEvent} */
-    const on_player_pipette: unique symbol
+    const on_player_pipette: EventId<OnPlayerPipetteEvent>
     /** Event type: {@link OnPlayerDisplayResolutionChangedEvent} */
-    const on_player_display_resolution_changed: unique symbol
+    const on_player_display_resolution_changed: EventId<OnPlayerDisplayResolutionChangedEvent>
     /** Event type: {@link OnPlayerDisplayScaleChangedEvent} */
-    const on_player_display_scale_changed: unique symbol
+    const on_player_display_scale_changed: EventId<OnPlayerDisplayScaleChangedEvent>
     /** Event type: {@link OnPrePlayerCraftedItemEvent} */
-    const on_pre_player_crafted_item: unique symbol
+    const on_pre_player_crafted_item: EventId<OnPrePlayerCraftedItemEvent>
     /** Event type: {@link OnPlayerCancelledCraftingEvent} */
-    const on_player_cancelled_crafting: unique symbol
+    const on_player_cancelled_crafting: EventId<OnPlayerCancelledCraftingEvent>
     /** Event type: {@link OnChunkChartedEvent} */
-    const on_chunk_charted: unique symbol
+    const on_chunk_charted: EventId<OnChunkChartedEvent>
     /** Event type: {@link OnTechnologyEffectsResetEvent} */
-    const on_technology_effects_reset: unique symbol
+    const on_technology_effects_reset: EventId<OnTechnologyEffectsResetEvent>
     /** Event type: {@link OnForceResetEvent} */
-    const on_force_reset: unique symbol
+    const on_force_reset: EventId<OnForceResetEvent>
     /** Event type: {@link OnLandMineArmedEvent} */
-    const on_land_mine_armed: unique symbol
+    const on_land_mine_armed: EventId<OnLandMineArmedEvent>
     /** Event type: {@link OnForcesMergedEvent} */
-    const on_forces_merged: unique symbol
+    const on_forces_merged: EventId<OnForcesMergedEvent>
     /** Event type: {@link OnPlayerTrashInventoryChangedEvent} */
-    const on_player_trash_inventory_changed: unique symbol
+    const on_player_trash_inventory_changed: EventId<OnPlayerTrashInventoryChangedEvent>
     /** Event type: {@link OnPrePlayerLeftGameEvent} */
-    const on_pre_player_left_game: unique symbol
+    const on_pre_player_left_game: EventId<OnPrePlayerLeftGameEvent>
     /** Event type: {@link OnPreSurfaceClearedEvent} */
-    const on_pre_surface_cleared: unique symbol
+    const on_pre_surface_cleared: EventId<OnPreSurfaceClearedEvent>
     /** Event type: {@link OnSurfaceClearedEvent} */
-    const on_surface_cleared: unique symbol
+    const on_surface_cleared: EventId<OnSurfaceClearedEvent>
     /** Event type: {@link OnChunkDeletedEvent} */
-    const on_chunk_deleted: unique symbol
+    const on_chunk_deleted: EventId<OnChunkDeletedEvent>
     /** Event type: {@link OnPreChunkDeletedEvent} */
-    const on_pre_chunk_deleted: unique symbol
+    const on_pre_chunk_deleted: EventId<OnPreChunkDeletedEvent>
     /** Event type: {@link OnTrainScheduleChangedEvent} */
-    const on_train_schedule_changed: unique symbol
+    const on_train_schedule_changed: EventId<OnTrainScheduleChangedEvent>
     /** Event type: {@link OnPlayerBannedEvent} */
-    const on_player_banned: unique symbol
+    const on_player_banned: EventId<OnPlayerBannedEvent>
     /** Event type: {@link OnPlayerKickedEvent} */
-    const on_player_kicked: unique symbol
+    const on_player_kicked: EventId<OnPlayerKickedEvent>
     /** Event type: {@link OnPlayerUnbannedEvent} */
-    const on_player_unbanned: unique symbol
+    const on_player_unbanned: EventId<OnPlayerUnbannedEvent>
     /** Event type: {@link OnRocketLaunchOrderedEvent} */
-    const on_rocket_launch_ordered: unique symbol
+    const on_rocket_launch_ordered: EventId<OnRocketLaunchOrderedEvent>
     /** Event type: {@link OnScriptPathRequestFinishedEvent} */
-    const on_script_path_request_finished: unique symbol
+    const on_script_path_request_finished: EventId<OnScriptPathRequestFinishedEvent>
     /** Event type: {@link OnAiCommandCompletedEvent} */
-    const on_ai_command_completed: unique symbol
-    /** Event type: {@link OnMarkedForUpgradeEvent} */
-    const on_marked_for_upgrade: unique symbol
-    /** Event type: {@link OnCancelledUpgradeEvent} */
-    const on_cancelled_upgrade: unique symbol
+    const on_ai_command_completed: EventId<OnAiCommandCompletedEvent>
+    /**
+     * Event type: {@link OnMarkedForUpgradeEvent}
+     *
+     * Event filter: {@link LuaEntityMarkedForUpgradeEventFilter}
+     */
+    const on_marked_for_upgrade: EventId<OnMarkedForUpgradeEvent, LuaEntityMarkedForUpgradeEventFilter>
+    /**
+     * Event type: {@link OnCancelledUpgradeEvent}
+     *
+     * Event filter: {@link LuaUpgradeCancelledEventFilter}
+     */
+    const on_cancelled_upgrade: EventId<OnCancelledUpgradeEvent, LuaUpgradeCancelledEventFilter>
     /** Event type: {@link OnPlayerToggledMapEditorEvent} */
-    const on_player_toggled_map_editor: unique symbol
-    /** Event type: {@link OnEntityClonedEvent} */
-    const on_entity_cloned: unique symbol
+    const on_player_toggled_map_editor: EventId<OnPlayerToggledMapEditorEvent>
+    /**
+     * Event type: {@link OnEntityClonedEvent}
+     *
+     * Event filter: {@link LuaEntityClonedEventFilter}
+     */
+    const on_entity_cloned: EventId<OnEntityClonedEvent, LuaEntityClonedEventFilter>
     /** Event type: {@link OnAreaClonedEvent} */
-    const on_area_cloned: unique symbol
+    const on_area_cloned: EventId<OnAreaClonedEvent>
     /** Event type: {@link OnBrushClonedEvent} */
-    const on_brush_cloned: unique symbol
+    const on_brush_cloned: EventId<OnBrushClonedEvent>
     /** Event type: {@link OnGameCreatedFromScenarioEvent} */
-    const on_game_created_from_scenario: unique symbol
+    const on_game_created_from_scenario: EventId<OnGameCreatedFromScenarioEvent>
     /** Event type: {@link OnSurfaceImportedEvent} */
-    const on_surface_imported: unique symbol
+    const on_surface_imported: EventId<OnSurfaceImportedEvent>
     /** Event type: {@link OnSurfaceRenamedEvent} */
-    const on_surface_renamed: unique symbol
+    const on_surface_renamed: EventId<OnSurfaceRenamedEvent>
     /** Event type: {@link OnPlayerToggledAltModeEvent} */
-    const on_player_toggled_alt_mode: unique symbol
-    /** Event type: {@link OnPlayerRepairedEntityEvent} */
-    const on_player_repaired_entity: unique symbol
+    const on_player_toggled_alt_mode: EventId<OnPlayerToggledAltModeEvent>
+    /**
+     * Event type: {@link OnPlayerRepairedEntityEvent}
+     *
+     * Event filter: {@link LuaPlayerRepairedEntityEventFilter}
+     */
+    const on_player_repaired_entity: EventId<OnPlayerRepairedEntityEvent, LuaPlayerRepairedEntityEventFilter>
     /** Event type: {@link OnPlayerFastTransferredEvent} */
-    const on_player_fast_transferred: unique symbol
+    const on_player_fast_transferred: EventId<OnPlayerFastTransferredEvent>
     /** Event type: {@link OnPreRobotExplodedCliffEvent} */
-    const on_pre_robot_exploded_cliff: unique symbol
+    const on_pre_robot_exploded_cliff: EventId<OnPreRobotExplodedCliffEvent>
     /** Event type: {@link OnRobotExplodedCliffEvent} */
-    const on_robot_exploded_cliff: unique symbol
+    const on_robot_exploded_cliff: EventId<OnRobotExplodedCliffEvent>
     /** Event type: {@link OnEntitySpawnedEvent} */
-    const on_entity_spawned: unique symbol
+    const on_entity_spawned: EventId<OnEntitySpawnedEvent>
     /** Event type: {@link OnCutsceneWaypointReachedEvent} */
-    const on_cutscene_waypoint_reached: unique symbol
+    const on_cutscene_waypoint_reached: EventId<OnCutsceneWaypointReachedEvent>
     /** Event type: {@link OnUnitGroupCreatedEvent} */
-    const on_unit_group_created: unique symbol
+    const on_unit_group_created: EventId<OnUnitGroupCreatedEvent>
     /** Event type: {@link OnUnitAddedToGroupEvent} */
-    const on_unit_added_to_group: unique symbol
+    const on_unit_added_to_group: EventId<OnUnitAddedToGroupEvent>
     /** Event type: {@link OnUnitRemovedFromGroupEvent} */
-    const on_unit_removed_from_group: unique symbol
+    const on_unit_removed_from_group: EventId<OnUnitRemovedFromGroupEvent>
     /** Event type: {@link OnUnitGroupFinishedGatheringEvent} */
-    const on_unit_group_finished_gathering: unique symbol
+    const on_unit_group_finished_gathering: EventId<OnUnitGroupFinishedGatheringEvent>
     /** Event type: {@link OnBuildBaseArrivedEvent} */
-    const on_build_base_arrived: unique symbol
+    const on_build_base_arrived: EventId<OnBuildBaseArrivedEvent>
     /** Event type: {@link OnChartTagAddedEvent} */
-    const on_chart_tag_added: unique symbol
+    const on_chart_tag_added: EventId<OnChartTagAddedEvent>
     /** Event type: {@link OnChartTagModifiedEvent} */
-    const on_chart_tag_modified: unique symbol
+    const on_chart_tag_modified: EventId<OnChartTagModifiedEvent>
     /** Event type: {@link OnChartTagRemovedEvent} */
-    const on_chart_tag_removed: unique symbol
+    const on_chart_tag_removed: EventId<OnChartTagRemovedEvent>
     /** Event type: {@link OnLuaShortcutEvent} */
-    const on_lua_shortcut: unique symbol
+    const on_lua_shortcut: EventId<OnLuaShortcutEvent>
     /** Event type: {@link OnGuiLocationChangedEvent} */
-    const on_gui_location_changed: unique symbol
+    const on_gui_location_changed: EventId<OnGuiLocationChangedEvent>
     /** Event type: {@link OnGuiSelectedTabChangedEvent} */
-    const on_gui_selected_tab_changed: unique symbol
+    const on_gui_selected_tab_changed: EventId<OnGuiSelectedTabChangedEvent>
     /** Event type: {@link OnGuiSwitchStateChangedEvent} */
-    const on_gui_switch_state_changed: unique symbol
+    const on_gui_switch_state_changed: EventId<OnGuiSwitchStateChangedEvent>
     /** Event type: {@link OnForceCeaseFireChangedEvent} */
-    const on_force_cease_fire_changed: unique symbol
+    const on_force_cease_fire_changed: EventId<OnForceCeaseFireChangedEvent>
     /** Event type: {@link OnForceFriendsChangedEvent} */
-    const on_force_friends_changed: unique symbol
+    const on_force_friends_changed: EventId<OnForceFriendsChangedEvent>
     /** Event type: {@link OnStringTranslatedEvent} */
-    const on_string_translated: unique symbol
+    const on_string_translated: EventId<OnStringTranslatedEvent>
     /** Event type: {@link OnScriptTriggerEffectEvent} */
-    const on_script_trigger_effect: unique symbol
+    const on_script_trigger_effect: EventId<OnScriptTriggerEffectEvent>
     /** Event type: {@link OnPlayerSetQuickBarSlotEvent} */
-    const on_player_set_quick_bar_slot: unique symbol
+    const on_player_set_quick_bar_slot: EventId<OnPlayerSetQuickBarSlotEvent>
     /** Event type: {@link OnPrePlayerToggledMapEditorEvent} */
-    const on_pre_player_toggled_map_editor: unique symbol
+    const on_pre_player_toggled_map_editor: EventId<OnPrePlayerToggledMapEditorEvent>
     /** Event type: {@link OnPreScriptInventoryResizedEvent} */
-    const on_pre_script_inventory_resized: unique symbol
+    const on_pre_script_inventory_resized: EventId<OnPreScriptInventoryResizedEvent>
     /** Event type: {@link OnScriptInventoryResizedEvent} */
-    const on_script_inventory_resized: unique symbol
+    const on_script_inventory_resized: EventId<OnScriptInventoryResizedEvent>
     /** Event type: {@link OnEntityDestroyedEvent} */
-    const on_entity_destroyed: unique symbol
+    const on_entity_destroyed: EventId<OnEntityDestroyedEvent>
     /** Event type: {@link OnPlayerClickedGpsTagEvent} */
-    const on_player_clicked_gps_tag: unique symbol
+    const on_player_clicked_gps_tag: EventId<OnPlayerClickedGpsTagEvent>
     /** Event type: {@link OnPlayerFlushedFluidEvent} */
-    const on_player_flushed_fluid: unique symbol
+    const on_player_flushed_fluid: EventId<OnPlayerFlushedFluidEvent>
     /** Event type: {@link OnPermissionGroupEditedEvent} */
-    const on_permission_group_edited: unique symbol
+    const on_permission_group_edited: EventId<OnPermissionGroupEditedEvent>
     /** Event type: {@link OnPrePermissionStringImportedEvent} */
-    const on_pre_permission_string_imported: unique symbol
+    const on_pre_permission_string_imported: EventId<OnPrePermissionStringImportedEvent>
     /** Event type: {@link OnPermissionStringImportedEvent} */
-    const on_permission_string_imported: unique symbol
+    const on_permission_string_imported: EventId<OnPermissionStringImportedEvent>
     /** Event type: {@link OnPrePermissionGroupDeletedEvent} */
-    const on_pre_permission_group_deleted: unique symbol
+    const on_pre_permission_group_deleted: EventId<OnPrePermissionGroupDeletedEvent>
     /** Event type: {@link OnPermissionGroupDeletedEvent} */
-    const on_permission_group_deleted: unique symbol
+    const on_permission_group_deleted: EventId<OnPermissionGroupDeletedEvent>
     /** Event type: {@link OnPermissionGroupAddedEvent} */
-    const on_permission_group_added: unique symbol
+    const on_permission_group_added: EventId<OnPermissionGroupAddedEvent>
     /** Event type: {@link OnCutsceneCancelledEvent} */
-    const on_cutscene_cancelled: unique symbol
+    const on_cutscene_cancelled: EventId<OnCutsceneCancelledEvent>
     /** Event type: {@link OnPlayerConfiguredSpiderRemoteEvent} */
-    const on_player_configured_spider_remote: unique symbol
+    const on_player_configured_spider_remote: EventId<OnPlayerConfiguredSpiderRemoteEvent>
     /** Event type: {@link OnPlayerUsedSpiderRemoteEvent} */
-    const on_player_used_spider_remote: unique symbol
+    const on_player_used_spider_remote: EventId<OnPlayerUsedSpiderRemoteEvent>
     /** Event type: {@link OnSpiderCommandCompletedEvent} */
-    const on_spider_command_completed: unique symbol
+    const on_spider_command_completed: EventId<OnSpiderCommandCompletedEvent>
     /** Event type: {@link OnEntityLogisticSlotChangedEvent} */
-    const on_entity_logistic_slot_changed: unique symbol
+    const on_entity_logistic_slot_changed: EventId<OnEntityLogisticSlotChangedEvent>
     /** Event type: {@link OnEquipmentInsertedEvent} */
-    const on_equipment_inserted: unique symbol
+    const on_equipment_inserted: EventId<OnEquipmentInsertedEvent>
     /** Event type: {@link OnEquipmentRemovedEvent} */
-    const on_equipment_removed: unique symbol
+    const on_equipment_removed: EventId<OnEquipmentRemovedEvent>
   }
   /**
    * See the {@link https://lua-api.factorio.com/next/events.html events page} for more info on what events contain and

package/generated/events.d.ts

@@ -15,7 +15,7 @@ interface CustomInputEvent {
   /** Information about the prototype that is selected when the custom input is used. `nil` if none is selected. */
   readonly selected_prototype?: SelectedPrototypeData
   /** Identifier of the event */
-  readonly name: defines.events
+  readonly name: string
   /** Tick the event was generated. */
   readonly tick: uint
 }
@@ -2961,201 +2961,16 @@ interface ScriptRaisedSetTilesEvent {
   readonly tick: uint
 }
 
-interface EventTypes {
-  [defines.events.on_tick]: OnTickEvent
-  [defines.events.on_gui_click]: OnGuiClickEvent
-  [defines.events.on_gui_confirmed]: OnGuiConfirmedEvent
-  [defines.events.on_gui_text_changed]: OnGuiTextChangedEvent
-  [defines.events.on_gui_checked_state_changed]: OnGuiCheckedStateChangedEvent
-  [defines.events.on_entity_died]: OnEntityDiedEvent
-  [defines.events.on_post_entity_died]: OnPostEntityDiedEvent
-  [defines.events.on_entity_damaged]: OnEntityDamagedEvent
-  [defines.events.on_picked_up_item]: OnPickedUpItemEvent
-  [defines.events.on_built_entity]: OnBuiltEntityEvent
-  [defines.events.on_sector_scanned]: OnSectorScannedEvent
-  [defines.events.on_player_mined_item]: OnPlayerMinedItemEvent
-  [defines.events.on_pre_build]: OnPreBuildEvent
-  [defines.events.on_rocket_launched]: OnRocketLaunchedEvent
-  [defines.events.on_pre_player_mined_item]: OnPrePlayerMinedItemEvent
-  [defines.events.on_chunk_generated]: OnChunkGeneratedEvent
-  [defines.events.on_player_crafted_item]: OnPlayerCraftedItemEvent
-  [defines.events.on_robot_built_entity]: OnRobotBuiltEntityEvent
-  [defines.events.on_robot_pre_mined]: OnRobotPreMinedEvent
-  [defines.events.on_robot_mined]: OnRobotMinedEvent
-  [defines.events.on_research_started]: OnResearchStartedEvent
-  [defines.events.on_research_finished]: OnResearchFinishedEvent
-  [defines.events.on_research_reversed]: OnResearchReversedEvent
-  [defines.events.on_player_rotated_entity]: OnPlayerRotatedEntityEvent
-  [defines.events.on_marked_for_deconstruction]: OnMarkedForDeconstructionEvent
-  [defines.events.on_cancelled_deconstruction]: OnCancelledDeconstructionEvent
-  [defines.events.on_trigger_created_entity]: OnTriggerCreatedEntityEvent
-  [defines.events.on_trigger_fired_artillery]: OnTriggerFiredArtilleryEvent
-  [defines.events.on_train_changed_state]: OnTrainChangedStateEvent
-  [defines.events.on_player_created]: OnPlayerCreatedEvent
-  [defines.events.on_resource_depleted]: OnResourceDepletedEvent
-  [defines.events.on_player_driving_changed_state]: OnPlayerDrivingChangedStateEvent
-  [defines.events.on_force_created]: OnForceCreatedEvent
-  [defines.events.on_forces_merging]: OnForcesMergingEvent
-  [defines.events.on_player_cursor_stack_changed]: OnPlayerCursorStackChangedEvent
-  [defines.events.on_pre_entity_settings_pasted]: OnPreEntitySettingsPastedEvent
-  [defines.events.on_entity_settings_pasted]: OnEntitySettingsPastedEvent
-  [defines.events.on_player_main_inventory_changed]: OnPlayerMainInventoryChangedEvent
-  [defines.events.on_player_armor_inventory_changed]: OnPlayerArmorInventoryChangedEvent
-  [defines.events.on_player_ammo_inventory_changed]: OnPlayerAmmoInventoryChangedEvent
-  [defines.events.on_player_gun_inventory_changed]: OnPlayerGunInventoryChangedEvent
-  [defines.events.on_player_placed_equipment]: OnPlayerPlacedEquipmentEvent
-  [defines.events.on_player_removed_equipment]: OnPlayerRemovedEquipmentEvent
-  [defines.events.on_pre_player_died]: OnPrePlayerDiedEvent
-  [defines.events.on_player_died]: OnPlayerDiedEvent
-  [defines.events.on_player_respawned]: OnPlayerRespawnedEvent
-  [defines.events.on_player_joined_game]: OnPlayerJoinedGameEvent
-  [defines.events.on_player_left_game]: OnPlayerLeftGameEvent
-  [defines.events.on_player_built_tile]: OnPlayerBuiltTileEvent
-  [defines.events.on_player_mined_tile]: OnPlayerMinedTileEvent
-  [defines.events.on_robot_built_tile]: OnRobotBuiltTileEvent
-  [defines.events.on_robot_mined_tile]: OnRobotMinedTileEvent
-  [defines.events.on_player_selected_area]: OnPlayerSelectedAreaEvent
-  [defines.events.on_player_alt_selected_area]: OnPlayerAltSelectedAreaEvent
-  [defines.events.on_player_changed_surface]: OnPlayerChangedSurfaceEvent
-  [defines.events.on_selected_entity_changed]: OnSelectedEntityChangedEvent
-  [defines.events.on_market_item_purchased]: OnMarketItemPurchasedEvent
-  [defines.events.on_player_dropped_item]: OnPlayerDroppedItemEvent
-  [defines.events.on_biter_base_built]: OnBiterBaseBuiltEvent
-  [defines.events.on_player_changed_force]: OnPlayerChangedForceEvent
-  [defines.events.on_entity_renamed]: OnEntityRenamedEvent
-  [defines.events.on_gui_selection_state_changed]: OnGuiSelectionStateChangedEvent
-  [defines.events.on_runtime_mod_setting_changed]: OnRuntimeModSettingChangedEvent
-  [defines.events.on_difficulty_settings_changed]: OnDifficultySettingsChangedEvent
-  [defines.events.on_surface_created]: OnSurfaceCreatedEvent
-  [defines.events.on_surface_deleted]: OnSurfaceDeletedEvent
-  [defines.events.on_pre_surface_deleted]: OnPreSurfaceDeletedEvent
-  [defines.events.on_player_mined_entity]: OnPlayerMinedEntityEvent
-  [defines.events.on_robot_mined_entity]: OnRobotMinedEntityEvent
-  [defines.events.on_train_created]: OnTrainCreatedEvent
-  [defines.events.on_gui_elem_changed]: OnGuiElemChangedEvent
-  [defines.events.on_player_setup_blueprint]: OnPlayerSetupBlueprintEvent
-  [defines.events.on_player_deconstructed_area]: OnPlayerDeconstructedAreaEvent
-  [defines.events.on_player_configured_blueprint]: OnPlayerConfiguredBlueprintEvent
-  [defines.events.on_console_chat]: OnConsoleChatEvent
-  [defines.events.on_console_command]: OnConsoleCommandEvent
-  [defines.events.on_player_removed]: OnPlayerRemovedEvent
-  [defines.events.on_pre_player_removed]: OnPrePlayerRemovedEvent
-  [defines.events.on_player_used_capsule]: OnPlayerUsedCapsuleEvent
-  [defines.events.script_raised_built]: ScriptRaisedBuiltEvent
-  [defines.events.script_raised_destroy]: ScriptRaisedDestroyEvent
-  [defines.events.script_raised_revive]: ScriptRaisedReviveEvent
-  [defines.events.script_raised_set_tiles]: ScriptRaisedSetTilesEvent
-  [defines.events.on_player_promoted]: OnPlayerPromotedEvent
-  [defines.events.on_player_demoted]: OnPlayerDemotedEvent
-  [defines.events.on_combat_robot_expired]: OnCombatRobotExpiredEvent
-  [defines.events.on_worker_robot_expired]: OnWorkerRobotExpiredEvent
-  [defines.events.on_player_changed_position]: OnPlayerChangedPositionEvent
-  [defines.events.on_mod_item_opened]: OnModItemOpenedEvent
-  [defines.events.on_gui_opened]: OnGuiOpenedEvent
-  [defines.events.on_gui_closed]: OnGuiClosedEvent
-  [defines.events.on_gui_value_changed]: OnGuiValueChangedEvent
-  [defines.events.on_player_muted]: OnPlayerMutedEvent
-  [defines.events.on_player_unmuted]: OnPlayerUnmutedEvent
-  [defines.events.on_player_cheat_mode_enabled]: OnPlayerCheatModeEnabledEvent
-  [defines.events.on_player_cheat_mode_disabled]: OnPlayerCheatModeDisabledEvent
-  [defines.events.on_character_corpse_expired]: OnCharacterCorpseExpiredEvent
-  [defines.events.on_pre_ghost_deconstructed]: OnPreGhostDeconstructedEvent
-  [defines.events.on_player_pipette]: OnPlayerPipetteEvent
-  [defines.events.on_player_display_resolution_changed]: OnPlayerDisplayResolutionChangedEvent
-  [defines.events.on_player_display_scale_changed]: OnPlayerDisplayScaleChangedEvent
-  [defines.events.on_pre_player_crafted_item]: OnPrePlayerCraftedItemEvent
-  [defines.events.on_player_cancelled_crafting]: OnPlayerCancelledCraftingEvent
-  [defines.events.on_chunk_charted]: OnChunkChartedEvent
-  [defines.events.on_technology_effects_reset]: OnTechnologyEffectsResetEvent
-  [defines.events.on_force_reset]: OnForceResetEvent
-  [defines.events.on_land_mine_armed]: OnLandMineArmedEvent
-  [defines.events.on_forces_merged]: OnForcesMergedEvent
-  [defines.events.on_player_trash_inventory_changed]: OnPlayerTrashInventoryChangedEvent
-  [defines.events.on_pre_player_left_game]: OnPrePlayerLeftGameEvent
-  [defines.events.on_pre_surface_cleared]: OnPreSurfaceClearedEvent
-  [defines.events.on_surface_cleared]: OnSurfaceClearedEvent
-  [defines.events.on_chunk_deleted]: OnChunkDeletedEvent
-  [defines.events.on_pre_chunk_deleted]: OnPreChunkDeletedEvent
-  [defines.events.on_train_schedule_changed]: OnTrainScheduleChangedEvent
-  [defines.events.on_player_banned]: OnPlayerBannedEvent
-  [defines.events.on_player_kicked]: OnPlayerKickedEvent
-  [defines.events.on_player_unbanned]: OnPlayerUnbannedEvent
-  [defines.events.on_rocket_launch_ordered]: OnRocketLaunchOrderedEvent
-  [defines.events.on_script_path_request_finished]: OnScriptPathRequestFinishedEvent
-  [defines.events.on_ai_command_completed]: OnAiCommandCompletedEvent
-  [defines.events.on_marked_for_upgrade]: OnMarkedForUpgradeEvent
-  [defines.events.on_cancelled_upgrade]: OnCancelledUpgradeEvent
-  [defines.events.on_player_toggled_map_editor]: OnPlayerToggledMapEditorEvent
-  [defines.events.on_entity_cloned]: OnEntityClonedEvent
-  [defines.events.on_area_cloned]: OnAreaClonedEvent
-  [defines.events.on_brush_cloned]: OnBrushClonedEvent
-  [defines.events.on_game_created_from_scenario]: OnGameCreatedFromScenarioEvent
-  [defines.events.on_surface_imported]: OnSurfaceImportedEvent
-  [defines.events.on_surface_renamed]: OnSurfaceRenamedEvent
-  [defines.events.on_player_toggled_alt_mode]: OnPlayerToggledAltModeEvent
-  [defines.events.on_player_repaired_entity]: OnPlayerRepairedEntityEvent
-  [defines.events.on_player_fast_transferred]: OnPlayerFastTransferredEvent
-  [defines.events.on_pre_robot_exploded_cliff]: OnPreRobotExplodedCliffEvent
-  [defines.events.on_robot_exploded_cliff]: OnRobotExplodedCliffEvent
-  [defines.events.on_entity_spawned]: OnEntitySpawnedEvent
-  [defines.events.on_cutscene_waypoint_reached]: OnCutsceneWaypointReachedEvent
-  [defines.events.on_unit_group_created]: OnUnitGroupCreatedEvent
-  [defines.events.on_unit_added_to_group]: OnUnitAddedToGroupEvent
-  [defines.events.on_unit_removed_from_group]: OnUnitRemovedFromGroupEvent
-  [defines.events.on_unit_group_finished_gathering]: OnUnitGroupFinishedGatheringEvent
-  [defines.events.on_build_base_arrived]: OnBuildBaseArrivedEvent
-  [defines.events.on_chart_tag_added]: OnChartTagAddedEvent
-  [defines.events.on_chart_tag_modified]: OnChartTagModifiedEvent
-  [defines.events.on_chart_tag_removed]: OnChartTagRemovedEvent
-  [defines.events.on_lua_shortcut]: OnLuaShortcutEvent
-  [defines.events.on_gui_location_changed]: OnGuiLocationChangedEvent
-  [defines.events.on_gui_selected_tab_changed]: OnGuiSelectedTabChangedEvent
-  [defines.events.on_gui_switch_state_changed]: OnGuiSwitchStateChangedEvent
-  [defines.events.on_force_cease_fire_changed]: OnForceCeaseFireChangedEvent
-  [defines.events.on_force_friends_changed]: OnForceFriendsChangedEvent
-  [defines.events.on_string_translated]: OnStringTranslatedEvent
-  [defines.events.on_script_trigger_effect]: OnScriptTriggerEffectEvent
-  [defines.events.on_player_set_quick_bar_slot]: OnPlayerSetQuickBarSlotEvent
-  [defines.events.on_pre_player_toggled_map_editor]: OnPrePlayerToggledMapEditorEvent
-  [defines.events.on_pre_script_inventory_resized]: OnPreScriptInventoryResizedEvent
-  [defines.events.on_script_inventory_resized]: OnScriptInventoryResizedEvent
-  [defines.events.on_entity_destroyed]: OnEntityDestroyedEvent
-  [defines.events.on_player_clicked_gps_tag]: OnPlayerClickedGpsTagEvent
-  [defines.events.on_player_flushed_fluid]: OnPlayerFlushedFluidEvent
-  [defines.events.on_permission_group_edited]: OnPermissionGroupEditedEvent
-  [defines.events.on_pre_permission_string_imported]: OnPrePermissionStringImportedEvent
-  [defines.events.on_permission_string_imported]: OnPermissionStringImportedEvent
-  [defines.events.on_pre_permission_group_deleted]: OnPrePermissionGroupDeletedEvent
-  [defines.events.on_permission_group_deleted]: OnPermissionGroupDeletedEvent
-  [defines.events.on_permission_group_added]: OnPermissionGroupAddedEvent
-  [defines.events.on_cutscene_cancelled]: OnCutsceneCancelledEvent
-  [defines.events.on_player_configured_spider_remote]: OnPlayerConfiguredSpiderRemoteEvent
-  [defines.events.on_player_used_spider_remote]: OnPlayerUsedSpiderRemoteEvent
-  [defines.events.on_spider_command_completed]: OnSpiderCommandCompletedEvent
-  [defines.events.on_entity_logistic_slot_changed]: OnEntityLogisticSlotChangedEvent
-  [defines.events.on_equipment_inserted]: OnEquipmentInsertedEvent
-  [defines.events.on_equipment_removed]: OnEquipmentRemovedEvent
-}
-
-interface EventFilters {
-  [defines.events.on_entity_died]: LuaEntityDiedEventFilter
-  [defines.events.on_post_entity_died]: LuaPostEntityDiedEventFilter
-  [defines.events.on_entity_damaged]: LuaEntityDamagedEventFilter
-  [defines.events.on_built_entity]: LuaPlayerBuiltEntityEventFilter
-  [defines.events.on_sector_scanned]: LuaSectorScannedEventFilter
-  [defines.events.on_pre_player_mined_item]: LuaPrePlayerMinedEntityEventFilter
-  [defines.events.on_robot_built_entity]: LuaRobotBuiltEntityEventFilter
-  [defines.events.on_robot_pre_mined]: LuaPreRobotMinedEntityEventFilter
-  [defines.events.on_marked_for_deconstruction]: LuaEntityMarkedForDeconstructionEventFilter
-  [defines.events.on_cancelled_deconstruction]: LuaEntityDeconstructionCancelledEventFilter
-  [defines.events.on_player_mined_entity]: LuaPlayerMinedEntityEventFilter
-  [defines.events.on_robot_mined_entity]: LuaRobotMinedEntityEventFilter
-  [defines.events.script_raised_built]: LuaScriptRaisedBuiltEventFilter
-  [defines.events.script_raised_destroy]: LuaScriptRaisedDestroyEventFilter
-  [defines.events.script_raised_revive]: LuaScriptRaisedReviveEventFilter
-  [defines.events.on_pre_ghost_deconstructed]: LuaPreGhostDeconstructedEventFilter
-  [defines.events.on_marked_for_upgrade]: LuaEntityMarkedForUpgradeEventFilter
-  [defines.events.on_cancelled_upgrade]: LuaUpgradeCancelledEventFilter
-  [defines.events.on_entity_cloned]: LuaEntityClonedEventFilter
-  [defines.events.on_player_repaired_entity]: LuaPlayerRepairedEntityEventFilter
+/** An event id. */
+type EventId<T extends table, F = unknown> = uint & {
+  readonly _eventData: T
+  readonly _filter: F
+}
+
+/**
+ * An event id generated by {@link LuaBootstrap.generate_event_name LuaBootstrap::generate_event_name} and raisable via
+ * {@link LuaBootstrap.raise_event LuaBootstrap::raise_event}.
+ */
+type CustomEventId<T extends table> = EventId<T> & {
+  _customEventIdBrand: any
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typed-factorio",
-  "version": "0.6.1",
+  "version": "0.7.3",
   "description": "Featureful typescript definitions for the the Factorio modding lua api.",
   "keywords": [
     "factorio",
@@ -25,7 +25,6 @@
   },
   "dependencies": {
     "lua-types": "^2.10.1",
-    "typescript": "~4.3.5",
     "typescript-to-lua": "^1.0.0"
   },
   "devDependencies": {
@@ -34,6 +33,7 @@
     "jest": "^27.0.6",
     "prettier": "^2.3.2",
     "ts-jest": "^27.0.4",
-    "ts-node": "^10.1.0"
+    "ts-node": "^10.1.0",
+    "typescript": "~4.3.5"
   }
 }