factoriomod-debug 2.0.14 → 2.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "factoriomod-debug",
   "displayName": "Factorio Modding Tool Kit",
-  "version": "2.0.14",
+  "version": "2.1.2",
   "publisher": "justarandomgeek",
   "description": "Debug Tools for developing Factorio Mods",
   "author": {
@@ -47,14 +47,14 @@
     "@inquirer/input": "^5.0.13",
     "@inquirer/password": "^5.0.13",
     "@stylistic/eslint-plugin": "^5.10.0",
-    "@types/archiver": "^7.0.0",
+    "@types/archiver": "^8.0.0",
     "@types/buffers": "^0.1.34",
     "@types/d3": "^7.4.3",
     "@types/dateformat": "^5.0.3",
     "@types/ini": "^4.1.1",
-    "@types/inquirer": "^9.0.9",
+    "@types/inquirer": "^9.0.10",
     "@types/mute-stream": "^0.0.4",
-    "@types/node": "^25.6.2",
+    "@types/node": "^26.0.0",
     "@types/readdir-glob": "^1.1.5",
     "@types/request": "^2.48.13",
     "@types/semver": "^7.7.1",
@@ -63,20 +63,20 @@
     "@vscode/codicons": "^0.0.45",
     "@vscode/debugadapter": "^1.68.0",
     "@vscode/debugadapter-testsupport": "^1.68.0",
-    "@vscode/vsce": "^3.9.1",
+    "@vscode/vsce": "^3.9.2",
     "@vscode/webview-ui-toolkit": "^1.4.0",
     "archiver": "^8.0.0",
     "c8": "^11.0.0",
-    "commander": "^14.0.3",
+    "commander": "^15.0.0",
     "d3": "^7.9.0",
     "d3-flame-graph": "^5.0.0",
     "dateformat": "^5.0.3",
     "dotize": "^0.6.0",
-    "esbuild": "^0.28.0",
+    "esbuild": "^0.28.1",
     "esbuild-compress": "^2.2.0",
     "esbuild-plugin-import-glob": "^0.1.1",
     "esbuild-visualizer": "^0.7.0",
-    "eslint": "^10.3.0",
+    "eslint": "^10.5.0",
     "globals": "^17.6.0",
     "ini": "^6.0.0",
     "jsonc-parser": "^3.3.1",
@@ -85,19 +85,16 @@
     "readdir-glob": "^3.0.0",
     "remark": "^15.0.1",
     "rimraf": "^6.1.3",
-    "semver": "^7.8.0",
+    "semver": "^7.8.5",
     "tree-kill": "^1.2.2",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.59.3",
-    "vscode-languageclient": "^9.0.1",
-    "vscode-languageserver": "^9.0.1",
+    "typescript-eslint": "^8.61.1",
+    "vscode-languageclient": "^10.0.0",
+    "vscode-languageserver": "^10.0.0",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
     "yoctocolors": "^2.1.2"
   },
-  "extensionDependencies": [
-    "sumneko.lua"
-  ],
   "type": "module",
   "main": "dist/fmtk-vscode.js",
   "bin": {
@@ -114,26 +111,6 @@
     "workspaceContains:**/mod-settings.dat"
   ],
   "contributes": {
-    "colors": [
-      {
-        "id": "factorio.ProfileTimerForeground",
-        "description": "Color for line timer text when running Factorio Mod profiler",
-        "defaults": {
-          "dark": "#ffffff",
-          "highContrast": "#ffffff",
-          "light": "#000000"
-        }
-      },
-      {
-        "id": "factorio.ProfileFunctionTimerForeground",
-        "description": "Color for function timer text when running Factorio Mod profiler",
-        "defaults": {
-          "dark": "#ffffff66",
-          "highContrast": "#ffffff",
-          "light": "#000000"
-        }
-      }
-    ],
     "configuration": [
       {
         "title": "Factorio",
@@ -184,101 +161,6 @@
             ],
             "default": "inside"
           },
-          "factorio.profile.timerHighlightColor": {
-            "type": "string",
-            "description": "Color to be used to highlight hot timers",
-            "pattern": "^#[0-9a-fA-F]{6}$",
-            "default": "#FF0000"
-          },
-          "factorio.profile.displayAverageTime": {
-            "type": "boolean",
-            "description": "Display average time in labels instead of cumulative time.",
-            "default": true
-          },
-          "factorio.profile.colorBy": {
-            "type": "string",
-            "description": "Which attribute to color labels by",
-            "enum": [
-              "count",
-              "totaltime",
-              "averagetime"
-            ],
-            "default": "totaltime"
-          },
-          "factorio.profile.colorScaleFactor": {
-            "type": "number",
-            "description": "Adjustment factor for color scale function",
-            "default": 1,
-            "exclusiveMinimum": 0
-          },
-          "factorio.profile.colorScaleMode": {
-            "type": "string",
-            "description": "Scale function for coloring timer labels",
-            "enum": [
-              "boost",
-              "linear",
-              "mute"
-            ],
-            "default": "boost"
-          },
-          "factorio.profile.rulers": {
-            "type": "array",
-            "description": "Ruler colors and thresholds to display hotspots in the scrollbar",
-            "items": {
-              "oneOf": [
-                {
-                  "required": [
-                    "color"
-                  ],
-                  "properties": {
-                    "color": {
-                      "type": "string",
-                      "pattern": "^#[0-9a-fA-F]{1,8}$"
-                    }
-                  }
-                },
-                {
-                  "required": [
-                    "themeColor"
-                  ],
-                  "properties": {
-                    "themeColor": {
-                      "type": "string"
-                    }
-                  }
-                }
-              ],
-              "required": [
-                "threshold"
-              ],
-              "properties": {
-                "threshold": {
-                  "type": "number",
-                  "maximum": 1,
-                  "minimum": 0
-                },
-                "lane": {
-                  "enum": [
-                    "Left",
-                    "Center",
-                    "Right",
-                    "Full"
-                  ],
-                  "default": "Right"
-                }
-              }
-            },
-            "default": [
-              {
-                "color": "#FF0000",
-                "threshold": 0.75
-              },
-              {
-                "color": "#FF6600",
-                "threshold": 0.5
-              }
-            ]
-          },
           "factorio.versions": {
             "type": "array",
             "description": "Factorio installations configured for use with debugging and profiling.",
@@ -367,9 +249,12 @@
             "default": "latest"
           },
           "factorio.workspace.manageLibraryDataLinks": {
-            "type": "boolean",
-            "default": false,
-            "description": "Automatically manage /data link in `\"Lua.workspace.library\"`. Setting to false will remove the link if present."
+            "type": [
+              "boolean",
+              "null"
+            ],
+            "default": null,
+            "description": "Automatically manage /data link in `\"Lua.workspace.library\"`. Setting to false will remove the link if present. Default off for LuaLS, on for EmmyLua."
           },
           "factorio.debug.env": {
             "type": "object",
@@ -378,16 +263,11 @@
               "type": "string"
             }
           },
-          "factorio.debug.runMode": {
-            "description": "Run mode for Debug Adapter",
-            "default": "inline",
-            "enum": [
-              "inline",
-              "external"
-            ],
-            "enumDescriptions": [
-              "Run inside extension, communicate directly",
-              "Run in an external process, communicate via stdio"
+          "factorio.debug.shim": {
+            "description": "debug shim to launch instead of native DAP",
+            "type": "string",
+            "examples": [
+              "vsjitdebugger.exe"
             ]
           },
           "factorio.tasks.execArgvOptions": {
@@ -542,6 +422,20 @@
         "command": "factorio.disableMouseAutoCapture",
         "category": "Factorio",
         "title": "Disable Mouse Auto Capture"
+      },
+      {
+        "command": "factorio.startProfile",
+        "category": "Factorio",
+        "title": "Start Profile",
+        "icon": "$(record)",
+        "enablement": "!factorio.debugProfileStarting"
+      },
+      {
+        "command": "factorio.stopProfile",
+        "category": "Factorio",
+        "title": "Stop Profile",
+        "icon": "$(stop-circle)",
+        "enablement": "!factorio.debugProfileStopping"
       }
     ],
     "views": {
@@ -651,6 +545,18 @@
           "when": "view == factoriomods && viewItem =~ /latest/",
           "group": "inline@6"
         }
+      ],
+      "debug/toolBar": [
+        {
+          "command": "factorio.startProfile",
+          "group": "navigation",
+          "when": "debugType == 'factorio' && !factorio.debugProfileIsRunning"
+        },
+        {
+          "command": "factorio.stopProfile",
+          "group": "navigation",
+          "when": "debugType == 'factorio' && factorio.debugProfileIsRunning"
+        }
       ]
     },
     "languages": [
@@ -791,49 +697,21 @@
     ],
     "debuggers": [
       {
-        "type": "factoriomod",
-        "label": "Factorio Mod Debug",
-        "program": "./dist/fmtk-cli.js",
+        "type": "factorio",
+        "label": "Factorio Debug Adapter Adapter",
+        "program": "factorio",
         "args": [
-          "debug"
+          "--dap"
         ],
-        "runtime": "node",
         "languages": [
-          "lua",
-          "typescript"
+          "lua"
         ],
         "configurationAttributes": {
           "launch": {
             "properties": {
-              "trace": {
-                "type": "boolean",
-                "description": "Enable logging of the Debug Adapter Protocol.",
-                "default": false,
-                "examples": [
-                  true
-                ]
-              },
               "tags": {
                 "type": "object",
-                "description": "Extra debug session tags, readable under `__DebugAdapter.tags` during this session."
-              },
-              "modsPath": {
-                "type": "string",
-                "description": "Absolute path to Factorio mods directory."
-              },
-              "manageMod": {
-                "type": "boolean",
-                "description": "Enable automatic management of the debugadapter mod",
-                "default": true
-              },
-              "useInstrumentMode": {
-                "type": "boolean",
-                "description": "Use Instrument Mode to hook all mods. Requires Factorio >= 0.18.10",
-                "default": true
-              },
-              "checkPrototypes": {
-                "type": "boolean",
-                "description": "Add --check-unused-prototype-data to factorioArgs."
+                "description": "Extra debug session tags, readable under `debugadapter.tags` during this session."
               },
               "factorioArgs": {
                 "type": "array",
@@ -847,211 +725,34 @@
                 "default": [],
                 "description": "Extra command line arguments to pass to Factorio"
               },
-              "env": {
-                "type": "object",
-                "description": "Environment variables to pass to Factorio",
-                "additionalProperties": {
-                  "type": "string"
-                }
-              },
-              "adjustMods": {
-                "description": "Dictionary of modname -> true or version string to enable, false to disable",
-                "additionalProperties": {
-                  "oneOf": [
-                    {
-                      "type": "boolean"
-                    },
-                    {
-                      "type": "string",
-                      "pattern": "(\\d+\\.){2}\\d+"
-                    }
-                  ]
-                }
-              },
-              "adjustModSettings": {
-                "description": "List of settings to adjust before launching",
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "defaultSnippets": [
-                    {
-                      "label": "setting",
-                      "body": {
-                        "scope": "${1|startup,runtime-global,runtime-per-player|}",
-                        "name": "$2",
-                        "value": "$3"
-                      }
-                    }
-                  ],
-                  "required": [
-                    "scope",
-                    "name"
-                  ],
-                  "properties": {
-                    "scope": {
-                      "enum": [
-                        "startup",
-                        "runtime-global",
-                        "runtime-per-player"
-                      ],
-                      "description": "The scope of the setting to adjust"
-                    },
-                    "name": {
-                      "type": "string",
-                      "description": "The prototype name of the setting to adjust"
-                    },
-                    "value": {
-                      "description": "New value for setting, omit to clear setting",
-                      "type": [
-                        "boolean",
-                        "number",
-                        "string"
-                      ]
-                    }
-                  }
-                }
-              },
-              "disableExtraMods": {
-                "description": "Disable any mods not named in `adjustMods`",
-                "type": "boolean"
-              },
-              "allowDisableBaseMod": {
-                "description": "Allow disabling the base mod. This is normally prevented, as it usually leaves the game in an unusable state.",
-                "type": "boolean"
-              },
-              "hookSettings": {
-                "type": "boolean",
-                "description": "Hook Settings Stage for stepping/debug",
-                "default": false
-              },
-              "hookData": {
+              "followSymlinks": {
                 "type": "boolean",
-                "description": "Hook Data Stage for stepping/debug",
-                "default": false
-              },
-              "hookControl": {
-                "type": [
-                  "array",
-                  "boolean"
-                ],
-                "description": "List of mods to hook in Control Stage, or bool to (un)hook all. Use `level` for scenario/campaign scripts.",
-                "items": {
-                  "type": "string"
-                },
-                "default": true
-              },
-              "hookMode": {
-                "enum": [
-                  "debug",
-                  "profile"
-                ],
-                "default": "debug",
-                "description": "Select hook to install. Default is `debug` for stepping. Select `profile` for live profiling."
-              },
-              "hookLog": {
-                "type": "boolean",
-                "description": "Hook `log()` and convert to Output events",
-                "default": true
-              },
-              "keepOldLog": {
-                "type": "boolean",
-                "description": "When hooking `log()`, also call original `log()`",
-                "default": false
-              },
-              "runningBreak": {
-                "type": "integer",
-                "description": "Frequency of `running` break event, in line hook hits. Lower value is higher performance overhead. Lower value is shorter latency on Pause command.",
-                "default": 5000,
-                "minimum": 1
-              },
-              "runningTimeout": {
-                "type": "integer",
-                "description": "Timeout in ms for eval and variables requests while running",
-                "default": 2000,
-                "minimum": 1000
-              },
-              "profileSlowStart": {
-                "type": "integer",
-                "description": "Number of events to dump profilers after every Lua stack at startup (to allow for saving for migration). Use this if you're trying to profile migrations or other early load behavior.",
-                "default": 0,
-                "minimum": 0
-              },
-              "profileUpdateRate": {
-                "type": "integer",
-                "description": "Number of Lua stacks to accumulate (per mod) after slow-start before dumping. Lower value will update faster but run slower.",
-                "default": 500,
-                "minimum": 1
-              },
-              "profileLines": {
-                "type": "boolean",
-                "description": "Track and display execution time per-line. This greatly increases the noise/overhead in the measurments.",
-                "default": true
-              },
-              "profileFuncs": {
-                "type": "boolean",
-                "description": "Track and display execution time per-function.",
-                "default": true
-              },
-              "profileTree": {
-                "type": "boolean",
-                "description": "Track and display execution time on a call tree.",
-                "default": true
+                "default": true,
+                "description": "Follow symlinks when emitting source locations"
               }
             }
           }
         },
         "initialConfigurations": [
           {
-            "type": "factoriomod",
+            "type": "factorio",
             "request": "launch",
-            "name": "Factorio Mod Debug"
-          },
-          {
-            "type": "factoriomod",
-            "request": "launch",
-            "name": "Factorio Mod Debug (Settings & Data)",
-            "hookSettings": true,
-            "hookData": true
-          },
-          {
-            "type": "factoriomod",
-            "request": "launch",
-            "name": "Factorio Mod Debug (Profile)",
-            "hookMode": "profile"
+            "name": "Factorio Debug Adapter"
           }
         ],
         "configurationSnippets": [
           {
-            "label": "Factorio Mod Debug: Debug",
-            "description": "A new configuration for debugging Factorio mods.",
-            "body": {
-              "type": "factoriomod",
-              "request": "launch",
-              "name": "Factorio Mod Debug"
-            }
-          },
-          {
-            "label": "Factorio Mod Debug: Debug (Settings & Data)",
-            "description": "A new configuration for debugging Factorio mods in Settings & Data stages.",
-            "body": {
-              "type": "factoriomod",
-              "request": "launch",
-              "name": "Factorio Mod Debug",
-              "hookSettings": true,
-              "hookData": true
-            }
-          },
-          {
-            "label": "Factorio Mod Debug: Profile",
-            "description": "A new configuration for profiling Factorio mods.",
-            "body": {
-              "type": "factoriomod",
-              "request": "launch",
-              "name": "Factorio Mod Debug (Profile)",
-              "hookMode": "profile"
-            }
+            "type": "factorio",
+            "request": "launch",
+            "name": "Factorio Debug Adapter",
+            "factorioArgs": [],
+            "tags": {}
           }
         ]
+      },
+      {
+        "type": "factoriomod",
+        "deprecated": "Please upgrade to `factorio` launch type"
       }
     ],
     "customEditors": [

package/readme.md

@@ -2,11 +2,10 @@
 
 A collection of tools for developing Factorio mods. This package is both [an npm package](https://www.npmjs.com/package/factoriomod-debug) providing the command line tool `fmtk`, and a [VS Code Extension](https://marketplace.visualstudio.com/items?itemName=justarandomgeek.factoriomod-debug) providing additional editor integration.
 
- * [Debug Adapter](doc/debugadapter.md)
- * [Mod Profiling](doc/profile.md)
+ * Debug Adapter - This extension uses Factorio's native [LuaDebugAdapter](https://lua-api.factorio.com/latest/classes/LuaDebugAdapter.html) support to enable debugging and profiling of mods
  * [JSON Validation](doc/language-json.md)
  * [Language Support for Locale and Changelog files](doc/language.md)
- * [Language Server integration for Lua](doc/language-lua.md) via [sumneko.lua](https://marketplace.visualstudio.com/items?itemName=sumneko.lua)
+ * [Language Server integration for Lua](doc/language-lua.md) via [sumneko.lua](https://marketplace.visualstudio.com/items?itemName=sumneko.lua) or [tangzx.emmylua](https://marketplace.visualstudio.com/items?itemName=tangzx.emmylua), [xuhuanzy.emmylua-luals](https://open-vsx.org/extension/xuhuanzy/emmylua-luals), [theo.emmylua](https://open-vsx.org/extension/theo/emmylua)
  * [Packaging and Publishing](doc/package.md)
 
  * [Getting LSP on text editors other than vscode](doc/lsptutorial.md)

package/schema/datainfo.json

@@ -51,7 +51,7 @@
       "title": "Mods this mod depends on or are incompatible with",
       "items": {
         "type":"string",
-        "pattern": "^(([!?~]|\\(\\?\\)) *)?([a-zA-Z0-9_ -]+)( *([<>=]=?) *((\\d+\\.){1,2}\\d+))?$",
+        "pattern": "^(([!?~+]|\\(\\?\\)) *)?([a-zA-Z0-9_ -]+)( *([<>]=?|=) *((\\d+\\.){1,2}\\d+))?$",
         "defaultSnippets": [
           {
             "label": "simple",
@@ -69,6 +69,10 @@
             "label": "optional",
             "body": "? ${1:modname}"
           },
+          {
+            "label": "recommended",
+            "body": "+ ${1:modname}"
+          },
           {
             "label": "hidden",
             "body": "(?) ${1:modname}"

package/schema/modinfo.json

@@ -19,13 +19,13 @@
               "description": "$3",
               "version": "${4:0.0.0}",
               "author": "$5",
-              "factorio_version": "2.0"
+              "factorio_version": "2.1"
             }
         }
       ],
       "properties": {
         "factorio_version": {
-          "default": "2.0"
+          "default": "2.1"
         },
         "package": {
           "type":"object",

package/dist/Flamegraph.css

@@ -1,2 +0,0 @@
-.d3-flame-graph rect{stroke:#eee;fill-opacity:.8}.d3-flame-graph rect:hover{stroke:#474747;stroke-width:.5;cursor:pointer}.d3-flame-graph-label{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:12px;font-family:Verdana;margin-left:4px;margin-right:4px;line-height:1.5;padding:0;font-weight:400;color:#000;text-align:left}.d3-flame-graph .fade{opacity:.6!important}.d3-flame-graph .title{font-size:20px;font-family:Verdana}.d3-flame-graph-tip{background-color:#000;border:none;border-radius:3px;padding:5px 10px;min-width:250px;text-align:left;color:#fff;z-index:10}
-/*# sourceMappingURL=Flamegraph.css.map */