typed-factorio 3.35.0 → 3.36.0

package/common/data-global.d.ts

@@ -4,7 +4,7 @@
  * This is only available in the settings or prototype stage.
  * Only prototypes for the current stage can be accessed.
  */
-declare const data: import("factorio:common").DataGlobal
+declare const data: import("factorio:prototype").Data
 
 /**
  * A table of (mod name -> mod version) for all currently active mods.

package/common/types.d.ts

@@ -1,7 +1,7 @@
 /** @noResolution */
 declare module "factorio:common" {
-  import { ModSetting, LuaBootstrap } from "factorio:runtime"
-  import { Data } from "factorio:prototype"
+  import { Data, PrototypeMap } from "factorio:prototype"
+  import { LuaBootstrap, ModSetting } from "factorio:runtime"
   import { SettingsPrototypeMap } from "factorio:settings"
   /**
    * A type map of type name -> prototype type.
@@ -16,28 +16,9 @@ declare module "factorio:common" {
     readonly name: string
   }
 
-  /**
-   * See {@link Data} for documentation.
-   */
-  export interface DataGlobal<M = GlobalPrototypeMap> {
-    /**
-     * A table of the already added prototypes.
-     * Indexed by prototype type, then by prototype name.
-     */
-    readonly raw: {
-      readonly [type in keyof M]: {
-        readonly [name in string]?: M[type]
-      }
-    }
-
-    extend<P extends AnyPrototype<M>>(prototypes: readonly P[]): void
-
-    is_demo: boolean
-  }
-
   export interface SettingsGlobal {
     readonly startup: {
-      readonly [name: string]: ModSetting
+      [name: string]: ModSetting
     }
   }
 
@@ -61,7 +42,7 @@ declare module "factorio:common" {
    * data.extend(...)
    * ```
    */
-  export type PrototypeData = Data
+  export type PrototypeData = Data<PrototypeMap>
 
   /**
    * Represents the `data` global variable for the settings stage.
@@ -74,7 +55,7 @@ declare module "factorio:common" {
    * data.extend(...)
    * ```
    */
-  export type SettingsData = DataGlobal<SettingsPrototypeMap>
+  export type SettingsData = Data<SettingsPrototypeMap>
 
   /**
    * You can optionally extend this interface to provide type checking and autocompletion for custom input names, like so:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typed-factorio",
-  "version": "3.35.0",
+  "version": "3.36.0",
   "description": "Featureful typescript definitions for the Factorio modding api.",
   "keywords": [
     "factorio",

package/prototype/generated/types.d.ts

@@ -4846,7 +4846,7 @@ declare module "factorio:prototype" {
    * The data table and its properties are defined in Lua, so their source code can be viewed in {@linkplain https://github.com/wube/factorio-data/blob/master/core/lualib/dataloader.lua dataloader.lua}.
    * @see {@link https://lua-api.factorio.com/2.0.75/types/Data.html Online documentation}
    */
-  export interface Data {
+  export interface Data<M = import("factorio:common").GlobalPrototypeMap> {
     /**
      * A dictionary of prototype types to values that themselves are dictionaries of prototype names to specific prototypes.
      *
@@ -4859,14 +4859,11 @@ declare module "factorio:prototype" {
      * local health = data.raw["container"]["wooden-chest"].max_health
      * @see {@link https://lua-api.factorio.com/2.0.75/types/Data.html#raw Online documentation}
      */
-    raw: {
-      readonly [Type in PrototypeType]: {
-        readonly [Name in string]?: PrototypeMap[Type]
+    readonly raw: {
+      [Type in keyof M]: {
+        [Name in string]?: M[Type]
       }
     }
-    /**
-     * Add additional prototypes.
-     */
     /**
      * The primary way to add prototypes to the data table.
      * @example
@@ -4886,7 +4883,7 @@ declare module "factorio:prototype" {
      * data:extend({not_coal, proto2})
      * @see {@link https://lua-api.factorio.com/2.0.75/types/Data.html#extend Online documentation}
      */
-    extend<P extends AnyPrototype>(prototypes: readonly P[]): void
+    extend<P extends import("factorio:common").AnyPrototype<M>>(prototypes: readonly P[]): void
     /**
      * Set by the game based on whether the demo or retail version is running. Should not be used by mods.
      * @see {@link https://lua-api.factorio.com/2.0.75/types/Data.html#is_demo Online documentation}