factoriomod-debug 2.0.5 → 2.0.7

package/dist/multipart-parser-3M5RC66T.js

@@ -0,0 +1,7 @@
+
+			import {createRequire} from 'module'
+			const require = createRequire(import.meta.url)
+			
+import{i as F,j as U}from"./chunk-ZLQDNPPN.js";var f=0,t={START_BOUNDARY:f++,HEADER_FIELD_START:f++,HEADER_FIELD:f++,HEADER_VALUE_START:f++,HEADER_VALUE:f++,HEADER_VALUE_ALMOST_DONE:f++,HEADERS_ALMOST_DONE:f++,PART_DATA_START:f++,PART_DATA:f++,END:f++},w=1,_={PART_BOUNDARY:w,LAST_BOUNDARY:w*=2},O=10,g=13,B=32,m=45,V=58,Y=97,x=122,C=u=>u|32,R=()=>{},y=class{constructor(o){this.index=0,this.flags=0,this.onHeaderEnd=R,this.onHeaderField=R,this.onHeadersEnd=R,this.onHeaderValue=R,this.onPartBegin=R,this.onPartData=R,this.onPartEnd=R,this.boundaryChars={},o=`\r
+--`+o;let n=new Uint8Array(o.length);for(let r=0;r<o.length;r++)n[r]=o.charCodeAt(r),this.boundaryChars[n[r]]=!0;this.boundary=n,this.lookbehind=new Uint8Array(this.boundary.length+8),this.state=t.START_BOUNDARY}write(o){let n=0,r=o.length,E=this.index,{lookbehind:l,boundary:d,boundaryChars:H,index:e,state:i,flags:A}=this,b=this.boundary.length,p=b-1,N=o.length,a,S,h=c=>{this[c+"Mark"]=n},s=c=>{delete this[c+"Mark"]},D=(c,P,T,k)=>{(P===void 0||P!==T)&&this[c](k&&k.subarray(P,T))},L=(c,P)=>{let T=c+"Mark";T in this&&(P?(D(c,this[T],n,o),delete this[T]):(D(c,this[T],o.length,o),this[T]=0))};for(n=0;n<r;n++)switch(a=o[n],i){case t.START_BOUNDARY:if(e===d.length-2){if(a===m)A|=_.LAST_BOUNDARY;else if(a!==g)return;e++;break}else if(e-1===d.length-2){if(A&_.LAST_BOUNDARY&&a===m)i=t.END,A=0;else if(!(A&_.LAST_BOUNDARY)&&a===O)e=0,D("onPartBegin"),i=t.HEADER_FIELD_START;else return;break}a!==d[e+2]&&(e=-2),a===d[e+2]&&e++;break;case t.HEADER_FIELD_START:i=t.HEADER_FIELD,h("onHeaderField"),e=0;case t.HEADER_FIELD:if(a===g){s("onHeaderField"),i=t.HEADERS_ALMOST_DONE;break}if(e++,a===m)break;if(a===V){if(e===1)return;L("onHeaderField",!0),i=t.HEADER_VALUE_START;break}if(S=C(a),S<Y||S>x)return;break;case t.HEADER_VALUE_START:if(a===B)break;h("onHeaderValue"),i=t.HEADER_VALUE;case t.HEADER_VALUE:a===g&&(L("onHeaderValue",!0),D("onHeaderEnd"),i=t.HEADER_VALUE_ALMOST_DONE);break;case t.HEADER_VALUE_ALMOST_DONE:if(a!==O)return;i=t.HEADER_FIELD_START;break;case t.HEADERS_ALMOST_DONE:if(a!==O)return;D("onHeadersEnd"),i=t.PART_DATA_START;break;case t.PART_DATA_START:i=t.PART_DATA,h("onPartData");case t.PART_DATA:if(E=e,e===0){for(n+=p;n<N&&!(o[n]in H);)n+=b;n-=p,a=o[n]}if(e<d.length)d[e]===a?(e===0&&L("onPartData",!0),e++):e=0;else if(e===d.length)e++,a===g?A|=_.PART_BOUNDARY:a===m?A|=_.LAST_BOUNDARY:e=0;else if(e-1===d.length)if(A&_.PART_BOUNDARY){if(e=0,a===O){A&=~_.PART_BOUNDARY,D("onPartEnd"),D("onPartBegin"),i=t.HEADER_FIELD_START;break}}else A&_.LAST_BOUNDARY&&a===m?(D("onPartEnd"),i=t.END,A=0):e=0;if(e>0)l[e-1]=a;else if(E>0){let c=new Uint8Array(l.buffer,l.byteOffset,l.byteLength);D("onPartData",0,E,c),E=0,h("onPartData"),n--}break;case t.END:break;default:throw new Error(`Unexpected state entered: ${i}`)}L("onHeaderField"),L("onHeaderValue"),L("onPartData"),this.index=e,this.state=i,this.flags=A}end(){if(this.state===t.HEADER_FIELD_START&&this.index===0||this.state===t.PART_DATA&&this.index===this.boundary.length)this.onPartEnd();else if(this.state!==t.END)throw new Error("MultipartParser.end(): stream ended unexpectedly")}};function I(u){let o=u.match(/\bfilename=("(.*?)"|([^()<>@,;:\\"/[\]?={}\s\t]+))($|;\s)/i);if(!o)return;let n=o[2]||o[3]||"",r=n.slice(n.lastIndexOf("\\")+1);return r=r.replace(/%22/g,'"'),r=r.replace(/&#(\d{4});/g,(E,l)=>String.fromCharCode(l)),r}async function v(u,o){if(!/multipart/i.test(o))throw new TypeError("Failed to fetch");let n=o.match(/boundary=(?:"([^"]+)"|([^;]+))/i);if(!n)throw new TypeError("no or bad content-type header, no multipart boundary");let r=new y(n[1]||n[2]),E,l,d,H,e,i,A=[],b=new U,p=s=>{d+=h.decode(s,{stream:!0})},N=s=>{A.push(s)},a=()=>{let s=new F(A,i,{type:e});b.append(H,s)},S=()=>{b.append(H,d)},h=new TextDecoder("utf-8");h.decode(),r.onPartBegin=function(){r.onPartData=p,r.onPartEnd=S,E="",l="",d="",H="",e="",i=null,A.length=0},r.onHeaderField=function(s){E+=h.decode(s,{stream:!0})},r.onHeaderValue=function(s){l+=h.decode(s,{stream:!0})},r.onHeaderEnd=function(){if(l+=h.decode(),E=E.toLowerCase(),E==="content-disposition"){let s=l.match(/\bname=("([^"]*)"|([^()<>@,;:\\"/[\]?={}\s\t]+))/i);s&&(H=s[2]||s[3]||""),i=I(l),i&&(r.onPartData=N,r.onPartEnd=a)}else E==="content-type"&&(e=l);l="",E=""};for await(let s of u)r.write(s);return r.end(),b}export{v as toFormData};
+//# sourceMappingURL=multipart-parser-3M5RC66T.js.map

package/doc/debugapi.md

@@ -24,6 +24,10 @@ If normal breakpoints are unusable for some reason, you can call `__DebugAdapter
 
 `__DebugAdapter.terminate()` can be used to terminate a debug session from mod code.
 
+## Restart Session
+
+`__DebugAdapter.restart()` can be used to restart a debug session from mod code.
+
 ## Simulate Events
 
 `__DebugAdapter.raise_event(event:defines.events|number|string,data:EventData,modname:string)` can be used to call event handlers directly for testing. `data` is not validated, so you must ensure it is a well-formed event payload for `event` yourself. All event and custom-input handlers are raisable, even those not raisable through `script`.

package/doc/internal/noncharacters.md

@@ -67,6 +67,7 @@ PUA U+E000-U+F8FF also available for use?
 | EE 80 8D | E00D | ~~step~~                |         |
 | EE 80 8E | E00E | ~~breakpoint~~          |         |
 | EE 80 8F | E00F | ~~exception~~           |         |
+| EE 80 90 | E010 | restart                 |         |
 
 ## after FDD7 in buffer:
 

package/doc/language-lua.md

@@ -101,10 +101,6 @@ remote.__typed_interfaces.foo = ({
 remote.__typed_interfaces.foo.bar("arg 1", "arg 2")
 ```
 
-### LuaObject Type Tests
-
-To allow the Language Server to see that `LuaObject.object_name` is "like `type()`" for type tests, such as `if obj.object_name == "LuaPlayer" then end`, the plugin rewrites it to appear as an internal function `if __object_name(obj) == "LuaPlayer" then end`, and this function is marked as "like `type()`" in the configuration.
-
 ### Commands
 
 In-game lua commands `/c`, `/command`, `/silent-command`, `/sc`, and `/measured-command` will be ignored at the start of any line, including the optional `__modname__` designator if present.

package/eslint.config.ts

@@ -0,0 +1,102 @@
+import { globalIgnores } from "eslint/config";
+import globals from "globals";
+import tseslint from 'typescript-eslint';
+import stylisticTs from '@stylistic/eslint-plugin-ts';
+
+export default tseslint.config([
+	globalIgnores(["dist", "coverage", "test/factorio"]),
+	...tseslint.configs.recommendedTypeChecked,
+	{
+		plugins: {
+			"@stylistic/ts": stylisticTs,
+		},
+
+		languageOptions: {
+			globals: {
+				...globals.browser,
+				...globals.node,
+			},
+
+			ecmaVersion: 2022,
+			sourceType: "module",
+
+			parserOptions: {
+				project: "./tsconfig.json",
+			},
+		},
+
+		rules: {
+			"@stylistic/ts/member-delimiter-style": ["error", {
+				multiline: {
+					delimiter: "none",
+					requireLast: true,
+				},
+
+				singleline: {
+					delimiter: "semi",
+					requireLast: false,
+				},
+			}],
+
+
+			"@stylistic/ts/semi": ["error"],
+			"brace-style": ["error", "1tbs", {
+				allowSingleLine: true,
+			}],
+
+			"block-spacing": "error",
+			"space-before-blocks": "error",
+			"keyword-spacing": "error",
+
+			"arrow-spacing": ["error", {
+				before: false,
+				after: false,
+			}],
+
+			"switch-colon-spacing": "error",
+			"comma-spacing": "error",
+			"comma-style": "error",
+
+			"comma-dangle": ["error", {
+				arrays: "always-multiline",
+				objects: "always-multiline",
+				imports: "always-multiline",
+				exports: "always-multiline",
+				functions: "only-multiline",
+			}],
+
+			"key-spacing": "error",
+
+			indent: ["error", "tab", {
+				SwitchCase: 1,
+				flatTernaryExpressions: true,
+			}],
+
+			curly: "error",
+			eqeqeq: ["error", "always"],
+			"no-bitwise": "error",
+			"no-redeclare": "off",
+			"@typescript-eslint/no-redeclare": "error",
+
+			"@typescript-eslint/no-unused-vars": "off",
+			"@typescript-eslint/no-explicit-any": "off",
+			"@typescript-eslint/no-unsafe-assignment": "off",
+			"@typescript-eslint/no-unsafe-member-access": "off",
+			"@typescript-eslint/no-unsafe-call": "off",
+			"@typescript-eslint/no-unsafe-return": "off",
+			"@typescript-eslint/no-unsafe-argument": "off",
+			"@typescript-eslint/restrict-template-expressions": "off",
+
+			"no-var": "error",
+
+			"@typescript-eslint/consistent-type-imports": ["error", {
+				disallowTypeAnnotations: true,
+				fixStyle: 'separate-type-imports',
+				prefer: 'type-imports',
+			}],
+			"@typescript-eslint/consistent-type-exports": "error",
+
+			"@typescript-eslint/no-deprecated": "error",
+			"@typescript-eslint/no-extraneous-class": "error",
+		},
+	}]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "factoriomod-debug",
   "displayName": "Factorio Modding Tool Kit",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "publisher": "justarandomgeek",
   "description": "Debug Tools for developing Factorio Mods",
   "author": {
@@ -13,7 +13,7 @@
     "multi-root ready"
   ],
   "engines": {
-    "vscode": "^1.96.0",
+    "vscode": "^1.101.0",
     "node": ">20"
   },
   "icon": "images/factoriomod-debug-icon.png",
@@ -30,10 +30,10 @@
     "url": "https://github.com/justarandomgeek/vscode-factoriomod-debug/issues"
   },
   "scripts": {
-    "lint": "eslint src --ext ts",
+    "lint": "eslint . --ext ts",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "typecheck-watch": "tsc -p tsconfig.json --noEmit --watch",
-    "esbuild": "tsx ./build.ts",
+    "esbuild": "node ./build.ts",
     "watch": "npm run esbuild -- --watch",
     "stats": "npm run esbuild -- --minify --meta && esbuild-visualizer --metadata ./out/meta.json --filename ./out/stats.html",
     "vscode:prepublish": "npm run prepare",
@@ -44,62 +44,69 @@
     "test": "c8 mocha"
   },
   "devDependencies": {
+    "@inquirer/input": "^4.1.12",
+    "@inquirer/password": "^4.0.15",
+    "@stylistic/eslint-plugin-ts": "^4.4.1",
     "@types/archiver": "^6.0.3",
     "@types/buffers": "^0.1.34",
-    "@types/chai": "^5.0.1",
-    "@types/chai-as-promised": "^8.0.1",
+    "@types/chai": "^5.2.2",
+    "@types/chai-as-promised": "^8.0.2",
     "@types/d3": "^7.4.3",
     "@types/dot-object": "^2.1.6",
     "@types/ini": "^4.1.1",
-    "@types/inquirer": "^9.0.7",
+    "@types/inquirer": "^9.0.8",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.10.2",
+    "@types/mute-stream": "^0.0.4",
+    "@types/node": "^22.15.32",
     "@types/node-fetch": "^2.6.12",
     "@types/readdir-glob": "^1.1.5",
     "@types/request": "^2.48.12",
-    "@types/semver": "^7.5.8",
-    "@types/vscode": "^1.96.0",
+    "@types/semver": "^7.7.0",
+    "@types/vscode": "^1.101.0",
     "@types/vscode-webview": "^1.57.5",
     "@vscode/codicons": "^0.0.36",
     "@vscode/debugadapter": "^1.68.0",
     "@vscode/debugadapter-testsupport": "^1.68.0",
-    "@vscode/vsce": "^3.2.1",
+    "@vscode/vsce": "^3.5.0",
     "@vscode/webview-ui-toolkit": "^1.4.0",
     "archiver": "^7.0.1",
     "c8": "^10.1.3",
-    "chai": "^5.1.2",
+    "chai": "^5.2.0",
     "chai-as-promised": "^8.0.1",
-    "commander": "^12.1.0",
+    "commander": "^14.0.0",
     "d3": "^7.9.0",
     "d3-flame-graph": "^4.1.3",
     "dot-object": "^2.1.5",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.25.5",
     "esbuild-plugin-import-glob": "^0.1.1",
-    "esbuild-visualizer": "^0.6.0",
-    "eslint": "^9.17.0",
+    "esbuild-visualizer": "^0.7.0",
+    "eslint": "^9.29.0",
+    "globals": "^16.2.0",
     "ini": "^5.0.0",
-    "inquirer": "^12.2.0",
+    "jiti": "^2.4.2",
     "jsonc-parser": "^3.3.1",
-    "mimer": "^2.0.2",
-    "mocha": "^11.0.1",
+    "mime": "^4.0.7",
+    "mocha": "11.6.0",
     "node-fetch": "^3.3.2",
     "readdir-glob": "^2.0.1",
     "remark": "^15.0.1",
     "rimraf": "^6.0.1",
-    "semver": "^7.6.3",
+    "semver": "^7.7.2",
     "tree-kill": "^1.2.2",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.18.1",
+    "tsx": "^4.20.3",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.34.1",
     "vscode-languageclient": "^9.0.1",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.12",
-    "vscode-uri": "^3.0.8"
+    "vscode-uri": "^3.1.0",
+    "yoctocolors": "^2.1.1"
   },
   "extensionDependencies": [
     "sumneko.lua"
   ],
-  "main": "./dist/fmtk-vscode.js",
+  "type": "module",
+  "main": "dist/fmtk-vscode.js",
   "bin": {
     "fmtk": "dist/fmtk-cli.js",
     "factoriomod-debug": "dist/fmtk-cli.js"
@@ -285,8 +292,33 @@
             "items": {
               "type": "object",
               "required": [
-                "name",
-                "factorioPath"
+                "name"
+              ],
+              "anyOf": [
+                {
+                  "required": [
+                    "onlineDocs"
+                  ]
+                },
+                {
+                  "required": [
+                    "factorioPath"
+                  ],
+                  "properties": {
+                    "configPath": {
+                      "type": "string",
+                      "description": "Path to Factorio config.ini file."
+                    },
+                    "docsPath": {
+                      "type": "string",
+                      "description": "Path to runtime-api.json, must be relative to factorioPath."
+                    },
+                    "protosPath": {
+                      "type": "string",
+                      "description": "Path to prototype-api.json, must be relative to factorioPath."
+                    }
+                  }
+                }
               ],
               "properties": {
                 "name": {
@@ -294,7 +326,7 @@
                   "description": "Display name for this installation"
                 },
                 "active": {
-                  "const": true
+                  "deprecationMessage": "Active status is no longer marked in settings"
                 },
                 "factorioPath": {
                   "type": "string",
@@ -309,31 +341,12 @@
                     "${workspaceFolder}/factorio/bin/x64/factorio"
                   ]
                 },
-                "configPath": {
-                  "type": "string",
-                  "description": "Path to Factorio config.ini file."
-                },
                 "onlineDocs": {
                   "type": [
                     "boolean",
                     "string"
                   ],
                   "description": "Use online docs, version id or `true` for `latest`"
-                },
-                "docsPath": {
-                  "type": "string",
-                  "description": "Path to runtime-api.json, must be relative to factorioPath."
-                },
-                "protosPath": {
-                  "type": "string",
-                  "description": "Path to prototype-api.json, must be relative to factorioPath."
-                },
-                "nativeDebugger": {
-                  "type": "string",
-                  "description": "Native debugger to launch factorio with",
-                  "examples": [
-                    "vsjitdebugger.exe"
-                  ]
                 }
               }
             }

package/schema/campaign.json

@@ -1,6 +1,6 @@
 {
   "title": "Factorio Campaign description.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "oneOf": [
     {
       "allOf":[

package/schema/datainfo.json

@@ -1,19 +1,19 @@
 {
   "title": "Factorio Data info.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema",
   "type": "object",
   "properties": {
     "name":{
       "type":"string",
       "title": "Internal name of the mod",
-      "pattern": "[a-zA-Z0-9_-]+",
+      "pattern": "^[a-zA-Z0-9_\\-]+$",
       "maxLength": 49,
       "minLength": 4
     },
     "version": {
       "type":"string",
       "title": "Version String",
-      "pattern": "(\\d+\\.){2}\\d+"
+      "pattern": "^(\\d+\\.){2}\\d+$"
     },
     "title": {
       "type": "string",
@@ -44,7 +44,7 @@
     "factorio_version": {
       "type":"string",
       "title": "The Factorio major version this mod supports",
-      "pattern": "\\d+\\.\\d+"
+      "pattern": "^\\d+\\.\\d+$"
     },
     "dependencies": {
       "type":"array",

package/schema/localeinfo.json

@@ -1,6 +1,6 @@
 {
   "title": "Factorio Locale info.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "required":[
   ],

package/schema/mapgen.json

@@ -1,6 +1,6 @@
 {
   "title": "Factorio Map Gen Settings",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "terrain_segmentation": {

package/schema/mapsettings.json

@@ -1,6 +1,6 @@
 {
   "title": "Factorio Map Settings",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "difficulty_settings":

package/schema/migration.json

@@ -1,6 +1,6 @@
 {
   "title": "Factorio json migration",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "definitions": {
     "migration_item": {

package/schema/modinfo.json

@@ -1,6 +1,6 @@
 {
   "title": "Factorio Mod info.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema",
   "allOf":[
     {
       "$ref": "datainfo.json"

package/schema/scenario.json

@@ -1,6 +1,6 @@
 {
   "title": "Factorio Scenario description.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "oneOf": [
     {
       "type": "object",

package/schema/serversettings.json

@@ -1,6 +1,6 @@
 {
   "title": "Factorio Server Settings",
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
     "name":{