gdharness 1.3.22 → 1.3.24

package/build/cli.js

@@ -9786,6 +9786,17 @@ function scriptsNaming(projectPath, classes) {
   });
   return naming.sort((a, b) => a.script.localeCompare(b.script));
 }
+function scriptsDeclaring(projectPath, classes) {
+  const named = new Set(classes);
+  const declaring = [];
+  eachScript(projectPath, (script, source) => {
+    const declares = DECLARATION.exec(source)?.[1];
+    if (declares !== undefined && named.has(declares)) {
+      declaring.push({ script, tool: TOOL.test(codeOf(source)) });
+    }
+  });
+  return declaring.sort((a, b) => a.script.localeCompare(b.script));
+}
 function cachedClasses(projectPath) {
   const cache = join6(projectPath, ".godot", "global_script_class_cache.cfg");
   if (!existsSync4(cache)) {
@@ -10201,7 +10212,7 @@ var EXIT_LEAK, WALK_BEGAN = "gdharness: the engine's shutdown began clearing scr
 var init_engine_leaks = __esm(() => {
   init_class_cache();
   init_gdscript_source();
-  EXIT_LEAK = /ObjectDB instances? (?:was |were )?leaked at exit|resources? still in use at exit|Pages in use exist at exit/;
+  EXIT_LEAK = /ObjectDB instances? (?:was |were )?leaked at exit|resources? still in use at exit|Pages in use exist at exit|RIDs? of type ["'][^"']+["'] (?:was|were) leaked/;
   WALK_STOPPED_SENTENCE = "The engine's shutdown stopped part way through its scripts (godot#117991, fixed in 4.8 by " + "godot#120976), so it reported as leaked at exit what it never got to free, and the report is the " + "engine's rather than the run's. gdharness holds every script loaded from a file past that walk, " + "which keeps it whole, so this one stopped on a script it could not hold, such as one made in code. " + "A leak of the run's own is not told apart in such a run.";
   EXPORTED = new RegExp(`@export(?!_(?:group|subgroup|category)\\b)\\w*(?:\\([^)]*\\))?\\s+(?:@${NAME2}(?:\\([^)]*\\))?\\s+)*` + `(?:static\\s+)?var\\s+(${NAME2})\\s*:\\s*(?:Array|Dictionary)\\s*\\[([^\\]]*)\\]`, "gu");
 });
@@ -10629,8 +10640,9 @@ function orphansLeftOn(line) {
 }
 function orphansLeftSaid(left) {
   const nodes = left.count === 1 ? "1 node" : `${String(left.count)} nodes`;
-  const where = left.during === "after" ? `${left.suite}'s hooks` : `${left.suite} > ${left.during}`;
-  return `${where} left ${nodes} neither freed nor in the tree, which gdUnit4 counts as orphans: ${left.nodes}. Free each one, or make it with auto_free(), which frees it once the case is over.`;
+  const hook = HOOKS_LEFT.get(left.during);
+  const where = hook === undefined ? `${left.suite} > ${left.during}` : `${left.suite}'s ${hook}`;
+  return `${where} left ${nodes} neither freed nor in the tree, which gdUnit4 counts as orphans: ${left.nodes}. Free each one, or make it with auto_free(), which frees it once the ${hook === undefined ? "case" : "suite"} is over.`;
 }
 function orphansPrinted(printed) {
   const suites = [];
@@ -10712,7 +10724,7 @@ function testProgressMessage(printed, elapsedMs) {
   const done = finished.length === 0 ? "No suite has finished" : `${finished.length === 1 ? "One suite has" : `${finished.length} suites have`} finished${failing === 0 ? "" : `, ${failing} with failures`}`;
   return `${done}${running === null ? "" : `; running ${running}`}; ${took} in.`;
 }
-var MalformedReportError, ENTITIES, ATTRIBUTE, HOOK_FAILURE, NOTHING_RAN, NO_SUCH_PATH, DISCOVERY_FAILED = "Script errors were detected during test discovery!", ESCAPE, LOCATION = `'[^'\\n]*' in \\S+:\\d+`, IGNORING_CASE = " \\(ignoring case\\)", PRINTED_ACTUAL, QUOTED_EQUALITY, COLOUR, SPELLED, BOTH_SIDES_ALIKE_NOTE = "[gdharness: the expected and the actual printed alike because gdUnit4 drops the marks that tell them apart when it writes its report, and the runner printed no copy of this one, so neither side above is the value the assertion found.]", VALUE_NOT_RECOVERED_NOTE = '[gdharness: the value after "but was" may not be the one the assertion found. gdUnit4 writes a failing string into its report as a character diff against the expected one with the marks dropped, which merges the two, and the runner printed no copy of this one to read the value back from.]', RENDERED_AWAY_NOTE = '[gdharness: the two sides print alike, so what tells them apart is something gdUnit4 does not print. The usual cause is BBCode in the expected string, which gdUnit4 renders as formatting instead of showing; the value after "but was" is the one the assertion found.]', MOST_REPORTS_SHOWN = 20, LONGEST_DETAIL = 20000, MASKED_BRACKET = "[lb]", PRINTED_DICTIONARY, ORPHANS_LEFT, RUNNING_SUITE, ORPHANS, OVERALL = "Overall Summary", SUITE_COUNTS, CASE_FAILED;
+var MalformedReportError, ENTITIES, ATTRIBUTE, HOOK_FAILURE, NOTHING_RAN, NO_SUCH_PATH, DISCOVERY_FAILED = "Script errors were detected during test discovery!", ESCAPE, LOCATION = `'[^'\\n]*' in \\S+:\\d+`, IGNORING_CASE = " \\(ignoring case\\)", PRINTED_ACTUAL, QUOTED_EQUALITY, COLOUR, SPELLED, BOTH_SIDES_ALIKE_NOTE = "[gdharness: the expected and the actual printed alike because gdUnit4 drops the marks that tell them apart when it writes its report, and the runner printed no copy of this one, so neither side above is the value the assertion found.]", VALUE_NOT_RECOVERED_NOTE = '[gdharness: the value after "but was" may not be the one the assertion found. gdUnit4 writes a failing string into its report as a character diff against the expected one with the marks dropped, which merges the two, and the runner printed no copy of this one to read the value back from.]', RENDERED_AWAY_NOTE = '[gdharness: the two sides print alike, so what tells them apart is something gdUnit4 does not print. The usual cause is BBCode in the expected string, which gdUnit4 renders as formatting instead of showing; the value after "but was" is the one the assertion found.]', MOST_REPORTS_SHOWN = 20, LONGEST_DETAIL = 20000, MASKED_BRACKET = "[lb]", PRINTED_DICTIONARY, ORPHANS_LEFT, HOOKS_LEFT, RUNNING_SUITE, ORPHANS, OVERALL = "Overall Summary", SUITE_COUNTS, CASE_FAILED;
 var init_junit = __esm(() => {
   MalformedReportError = class MalformedReportError extends Error {
     constructor(message) {
@@ -10743,6 +10755,11 @@ var init_junit = __esm(() => {
   };
   PRINTED_DICTIONARY = /^\{\n\t[\s\S]*\n {2}\}$/;
   ORPHANS_LEFT = /^gdharness orphans: (res:\/\/.+?\.(?:gd|cs)) > (.+?) left (\d+): (.+?)\s*$/;
+  HOOKS_LEFT = new Map([
+    ["before", "before()"],
+    ["after", "after()"],
+    ["before or after", "before() or after()"]
+  ]);
   RUNNING_SUITE = /Run Test Suite:\s*(res:\/\/.+?\.(?:gd|cs))(?=\s|$)/;
   ORPHANS = /(\d+)\s+orphans/;
   SUITE_COUNTS = /(\d+)\s+test cases\s*\|\s*(\d+)\s+errors\s*\|\s*(\d+)\s+failures/;
@@ -16462,7 +16479,7 @@ var init_tool_definitions = __esm(() => {
       title: "Run tests",
       effect: "additive",
       description: "Runs the project's gdUnit4 tests and answers with every case that did not pass: where it is, and what the assertion said. Each entry under failed carries its first report as message and detail, and, when it has more than one, its reports under reports in the order the case met them: gdUnit4 goes on past a failed assertion, and a case can fail several and then stop on a runtime error, which makes its status error. Identical reports fold into one with times, at most twenty different ones are kept (reportsLeftOut counts the rest), and past about a megabyte the largest cases keep only their first message (failedWithoutDetail). failures counts the cases that failed an assertion and errors the cases that hit an error, so such a case counts in both. Suites where everything passed are counted, not listed, and an engine message keeps the frames above gdUnit4, not the twenty inside it; identical engine messages come back once under engineEntries, with times saying how often they were printed. The class list is rebuilt first, so a suite written a moment ago is found, and the rebuild's answer is under classes. What changed on disk since it was imported is then imported before any suite runs, and named under importedFirst. On Windows and Linux the run gets a user:// of its own, away from a player's saves; on macOS the engine reads user:// off HOME, so it writes where the player keeps theirs, and savesNote says so. The run is headless unless a suite in it needs a window as gdharness test reads it, and then has one, on a desktop of its own on Windows. A run that found nothing to run is never called a pass, and names the path it looked in. A script that does not load stops gdUnit4 before any suite runs: its errors come back in full under scriptErrors, and the scripts that failed only because one they depend on did are listed by path under failedThroughDependency. When they failed on a class whose own script has a parser error, which gdUnit4 never names, that script is checked by the engine and its error comes first under scriptErrors, with the class it declares under declares, and the errors a script has only because that class did not resolve, which the engine reads as Variant, are kept apart under followFromUnresolved. An autoload that does not compile stops the run at once, its errors listed the same way. A client sending a progress token is told as each suite finishes, and at least every twenty seconds. A run that ends without a report, at its timeout or otherwise, names the suites it finished under suitesFinished, the failing ones with their failed cases under suitesFailing, and the one it was in under suiteRunning. When a client cuts a run off, that is kept in the project and the next project_test there carries it under previousRunCut. A run where nothing failed but orphan nodes were left comes back under warnings, with the count per suite: gdUnit4 decides its verdict on those and keeps them out of its report, so they are read off what it printed. A run whose every case passed is still not called passed when it printed a script error that no case failed on: gdUnit4 fails a case on the script errors its logger sees, and it cannot see a stack overflow, so the cases pass on whatever the faulted calls returned. Those errors come back under uncaughtScriptErrors, and under engineEntries by index with detailUnder rather than with their backtrace a second time; a backtrace that repeats, as a recursion's does, has each repeated frame or cycle of frames written once with the frames it covers and how many times. One raised inside assert_error(...).is_runtime_error is the test's own and is not listed there, and none are when the project turns off gdUnit4's report/godot/script_error setting; a suite declares them all the same. Needs gdUnit4 under addons/gdUnit4.",
-      answer: "passed is the verdict to read. exitCode is the engine's own exit, gdUnit4's code for what it saw, and is 0 beside passed false when the run is failed for something gdUnit4 does not judge, such as an engine error no suite declared. time is gdUnit4's own sum of the seconds its cases took, from its report. tookMs is the whole call in milliseconds, from the class rebuild to the engine's exit, which is what a caller waits for, and tookMsBy splits it into the class rebuild (classes), the import after it (import) and the engine running the suites (engine), each with any wait for an engine slot or the editor's scan in it. The run is judged as gdharness test judges it: undeclaredErrors names each engine error that no suite declared in its GDHARNESS_EXPECTED_ERRORS constant, and each engine warning a suite printed and did not declare in its GDHARNESS_EXPECTED_WARNINGS, marked warning true, with the suite and the case that printed it, and declaredNotPrinted each declared error or warning its case did not print. A declared text must be the whole line after ERROR: or WARNING: and its space, so a longer one its case printed holding the text is named under printedInstead. Either fails the run, and each suite holding one is listed with its count. leakedAtExit holds the engine's lines saying it exited still holding objects, resources or memory pages, which fail the run too, and the note names any script of the project Godot itself never frees. engineErrors counts every engine error the run printed but those a suite declared. orphans totals the orphan nodes gdUnit4 counted, and each suite that left some has its count, and a warning saying how to free them, under warnings, with left naming each case that left some (after for the suite's hooks) and the nodes, by class, name and script. suites lists only the suites with something to say (a case that failed, erred or was skipped, a hook that failed, orphans, or an error undeclared or declared and not printed), and suitesPassed counts the rest. Under classes, the classes each addon declares are counted under addedInAddons and changedInAddons rather than named, and a class the rebuild puts back that the cache had after the last rebuild is named under classes.lostSinceLastRebuild, which is the editor writing its shorter list over the file on every save until restarted. A suite needs a window when it declares const GDHARNESS_NEEDS_WINDOW: bool = true, or calls scene_runner and declares nothing; a run holding one has a window, at the size project.godot gives its viewport and with no sound, and windowed is true and windowNote names those suites and any saying it runs headless that shared the window. On a machine with no display such a run is headless, windowed is false, and windowNote says so. " + IMPORTED_FIRST,
+      answer: "passed is the verdict to read. exitCode is the engine's own exit, gdUnit4's code for what it saw, and is 0 beside passed false when the run is failed for something gdUnit4 does not judge, such as an engine error no suite declared. time is gdUnit4's own sum of the seconds its cases took, from its report. tookMs is the whole call in milliseconds, from the class rebuild to the engine's exit, which is what a caller waits for, and tookMsBy splits it into the class rebuild (classes), the import after it (import) and the engine running the suites (engine), each with any wait for an engine slot or the editor's scan in it. The run is judged as gdharness test judges it: undeclaredErrors names each engine error that no suite declared in its GDHARNESS_EXPECTED_ERRORS constant, and each engine warning a suite printed and did not declare in its GDHARNESS_EXPECTED_WARNINGS, marked warning true, with the suite and the case that printed it, and declaredNotPrinted each declared error or warning its case did not print. A declared text must be the whole line after ERROR: or WARNING: and its space, so a longer one its case printed holding the text is named under printedInstead. Either fails the run, and each suite holding one is listed with its count. leakedAtExit holds the engine's lines saying it exited still holding objects, resources, memory pages or a server's RIDs, which fail the run too, and the note names any script of the project Godot itself never frees. engineErrors counts every engine error the run printed but those a suite declared. orphans totals the orphan nodes gdUnit4 counted, and each suite that left some has its count, and a warning saying how to free them, under warnings, with left naming each case that left some (before or after for one of the suite's hooks, or the one value \"before or after\" where no case began and the two cannot be told apart) and the nodes, by class, name and script. suites lists only the suites with something to say (a case that failed, erred or was skipped, a hook that failed, orphans, or an error undeclared or declared and not printed), and suitesPassed counts the rest. Under classes, the classes each addon declares are counted under addedInAddons and changedInAddons rather than named, and a class the rebuild puts back that the cache had after the last rebuild is named under classes.lostSinceLastRebuild, which is the editor writing its shorter list over the file on every save until restarted. A suite needs a window when it declares const GDHARNESS_NEEDS_WINDOW: bool = true, or calls scene_runner and declares nothing; a run holding one has a window, at the size project.godot gives its viewport and with no sound, and windowed is true and windowNote names those suites and any saying it runs headless that shared the window. On a machine with no display such a run is headless, windowed is false, and windowNote says so. " + IMPORTED_FIRST,
       parameters: {
         projectPath: PROJECT_PATH,
         path: {
@@ -55863,6 +55880,11 @@ ${error.text}`;
     });
   }
   async reloadDependents(projectPath, classes) {
+    for (const { script, tool } of scriptsDeclaring(projectPath, classes)) {
+      if (!tool) {
+        await this.reloadOnce(script);
+      }
+    }
     return await this.reloadInEditor(scriptsNaming(projectPath, classes), projectPath);
   }
   async reloadInEditor(scripts, projectPath = "") {

package/build/godot/addons/gdharness_editor/tools/class_tools.gd

@@ -56,7 +56,15 @@ func reload_script(args: Dictionary) -> Dictionary:
 	if not ResourceLoader.exists(path):
 		return {"ok": false, "error": "No script at " + path}
 
-	var loaded: Resource = load(path)
+	# The copy the editor holds, when it holds one, and otherwise a load that reads the file, rather
+	# than load(): a load recompiles a script whose base has been reloaded from the text it holds,
+	# which is the text before the file changed. A rename reloading a base and then its subclass
+	# logged "not found in base" for the subclass's old call to the renamed method, a moment before
+	# the reload below compiled it clean.
+	var cached: Resource = ResourceLoader.get_cached_ref(path)
+	var loaded: Resource = (
+		cached if cached != null else ResourceLoader.load(path, "", ResourceLoader.CACHE_MODE_IGNORE)
+	)
 	var script: GDScript = loaded as GDScript
 	if script == null:
 		return {"ok": false, "error": path + " is not a GDScript"}

package/build/godot/tests/listed.gd

@@ -101,6 +101,10 @@ class GdhRunner:
 	var orphans_at_case: Dictionary[int, bool] = {}
 	var orphans_at_suite: Dictionary[int, bool] = {}
 	var orphans_named: Dictionary[int, bool] = {}
+	## The orphans new as the suite's first case began, which its before() made, and whether a case
+	## has begun: gdUnit4 counts both hooks' orphans at the suite's end.
+	var orphans_from_before: Dictionary[int, bool] = {}
+	var case_began: bool = false
 	## The suite running, which a case's own event does not carry.
 	var suite_running: String = ""
 
@@ -177,37 +181,54 @@ class GdhRunner:
 				suite_running = event.resource_path()
 				orphans_at_suite = orphan_ids()
 				orphans_named.clear()
+				orphans_from_before.clear()
+				case_began = false
 			GdUnitEvent.TESTCASE_BEFORE:
 				orphans_at_case = orphan_ids()
+				if not case_began:
+					case_began = true
+					for id: int in new_orphans(orphans_at_suite):
+						orphans_from_before[id] = true
 			GdUnitEvent.TESTCASE_AFTER:
 				cases_ended += 1
 		super(event)
 		# After gdUnit4's own report of the case, so the line falls under it.
+		if event.orphan_nodes() == 0:
+			return
 		if event.type() == GdUnitEvent.TESTCASE_AFTER:
-			name_orphans(event, event.test_name(), orphans_at_case)
+			say_left(event.test_name(), new_orphans(orphans_at_case))
 		elif event.type() == GdUnitEvent.TESTSUITE_AFTER:
-			name_orphans(event, "after", orphans_at_suite)
+			var left: Array[int] = new_orphans(orphans_at_suite)
+			if not case_began:
+				say_left("before or after", left)
+				return
+			say_left("before", left.filter(func(id: int) -> bool: return orphans_from_before.has(id)))
+			say_left("after", left.filter(func(id: int) -> bool: return not orphans_from_before.has(id)))
+
+	## The orphans now that were not there in [param before] and no line has named yet.
+	func new_orphans(before: Dictionary[int, bool]) -> Array[int]:
+		var found: Array[int] = []
+		for id: int in orphan_ids():
+			if not before.has(id) and not orphans_named.has(id):
+				found.append(id)
+		return found
 
-	## Prints the orphans [param event] counts that were not there in [param before], under
-	## [constant ORPHANS_LEFT], once each in a suite.
-	func name_orphans(event: GdUnitEvent, during: String, before: Dictionary[int, bool]) -> void:
-		if event.orphan_nodes() == 0:
+	## Prints the orphans [param ids] as left by [param during], under [constant ORPHANS_LEFT], once
+	## each in a suite.
+	func say_left(during: String, ids: Array[int]) -> void:
+		if ids.is_empty():
 			return
 		var named: PackedStringArray = []
-		var count: int = 0
-		for id: int in orphan_ids():
-			var node: Node = instance_from_id(id) as Node
-			if node == null or before.has(id) or orphans_named.has(id):
-				continue
+		for id: int in ids:
 			orphans_named[id] = true
-			count += 1
 			if named.size() < ORPHANS_NAMED:
-				var _named: bool = named.append(described(node))
-		if count == 0:
-			return
-		var more: String = "" if count <= named.size() else ", and %d more" % (count - named.size())
+				var _named: bool = named.append(described(instance_from_id(id) as Node))
+		var more: String = "" if ids.size() <= named.size() else ", and %d more" % (ids.size() - named.size())
 		print(
-			"%s %s > %s left %d: %s%s" % [ORPHANS_LEFT, suite_running, during, count, ", ".join(named), more]
+			(
+				"%s %s > %s left %d: %s%s"
+				% [ORPHANS_LEFT, suite_running, during, ids.size(), ", ".join(named), more]
+			)
 		)
 
 	## The nodes outside every tree that are not on their way out, by instance id, as gdUnit4 counts

package/build/keeper.js

@@ -8308,6 +8308,11 @@ var IGNORING_CASE = " \\(ignoring case\\)";
 var PRINTED_ACTUAL = new RegExp(` but was\\n '((?:(?!\\tat ${LOCATION})[\\s\\S])*?)'((?:${ESCAPE}\\[[0-9;]*m)*)(${IGNORING_CASE})?((?:${ESCAPE}\\[[0-9;]*m)*)\\tat (${LOCATION})`, "g");
 var QUOTED_EQUALITY = new RegExp(`^Expecting(?: error message)?:\\n '([\\s\\S]*)'\\n but was\\n '([\\s\\S]*)'(?:${IGNORING_CASE})?\\n\\tat `);
 var COLOUR = new RegExp(`${ESCAPE}\\[([0-9;]*)m`, "g");
+var HOOKS_LEFT = new Map([
+  ["before", "before()"],
+  ["after", "after()"],
+  ["before or after", "before() or after()"]
+]);
 
 // src/suite-judge.ts
 var TIME = String.raw`(?:\d+h )?(?:\d+min )?(?:\d+s )?\d+ms`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdharness",
-  "version": "1.3.22",
+  "version": "1.3.24",
   "mcpName": "io.github.Aureliolo/gdharness",
   "description": "A harness for driving a Godot 4 project from an agent: editor addons, a runtime bridge into the running game, an MCP server in front of them, and a CLI that installs and diagnoses the Godot side.",
   "type": "module",