gdharness 1.3.0 → 1.3.1

package/build/godot/addons/gdharness_editor/property_values.gd

@@ -14,8 +14,9 @@ extends RefCounted
 ## write accepts. What is here on top of it is the part only a property knows: the type wanted, so a
 ## dictionary shaped like a vector or a bare pair of numbers can be read as one.
 
-const Read = preload("reading.gd")
-const Serialisation = preload("serialisation.gd")
+const GdhRead = preload("reading.gd")
+const GdhSerialisation = preload("serialisation.gd")
+const GdhShapes = preload("value_shapes.gd")
 
 # The data types a Theme names its items by, as in "Button/colors/font_color", and what each holds.
 const THEME_ITEMS: Dictionary[String, Array] = {
@@ -65,12 +66,18 @@ const FLOAT_SHAPES: Array[int] = [
 # names, so a write to "Visibility" or "Transform" changed nothing and was answered as made.
 const HEADINGS: int = PROPERTY_USAGE_CATEGORY | PROPERTY_USAGE_GROUP | PROPERTY_USAGE_SUBGROUP
 
-var _values: Serialisation = Serialisation.new()
+var _values: GdhSerialisation = GdhSerialisation.new()
 
 # Why the value being parsed cannot be written, when the parse is what found out. A resource is
 # built inside the parse and there is nowhere in a parsed value to put the reason it is wrong.
 var _refused: String = ""
 
+# The stored properties the last write_all changed without being given them, by name, as [what it
+# held before, what it holds now]. A setter keeps other properties in step with the one it is given:
+# a Gradient given a third colour gives that point an offset of 0, a Control given a size moves its
+# offsets. An answer naming only what was given leaves the caller to guess the rest.
+var _also_changed: Dictionary = {}
+
 
 ## Turns what arrived over the wire into the Godot value a property wants.
 ##
@@ -85,7 +92,7 @@ func parse(value: Variant, expected_type: int = TYPE_NIL, elements: Array = [])
 		var fields: Dictionary = value
 		# A dictionary with keys that are not text arrives as its entries, and is read against the
 		# declared element types like any other.
-		if str(fields.get("_type", "")) == "Dictionary" and Serialisation.pairs(fields.get("entries")):
+		if str(fields.get("_type", "")) == "Dictionary" and GdhSerialisation.pairs(fields.get("entries")):
 			var built: Dictionary = _values.deserialize_value(fields)
 			return _parse_entries(built, elements)
 		var tagged: Array = _parse_tagged_dictionary(fields)
@@ -113,38 +120,39 @@ func cannot_hold(
 ) -> String:
 	var held: String = type_string(expected_type)
 	var cost: String = " Setting it would save a different value than the one asked for."
-	if not Serialisation.acceptable(value, expected_type):
+	if not GdhSerialisation.acceptable(value, expected_type):
 		var shape: String = "%s.%s is %s and the value given is %s, which cannot become one."
-		return shape % [holder, property, held, type_string(typeof(value))] + cost
+		var remedy: String = GdhShapes.remedy(value, expected_type)
+		return shape % [holder, property, held, type_string(typeof(value))] + remedy + cost
 
 	# And the same question of each element, because a list is accepted for a packed or typed array
 	# whatever is in it: a polygon written as [{"x": 1}] passes the check above and lands as one zero
 	# vector, and [1.5, "x"] for a PackedInt32Array as [1, 0].
-	var element: int = Read.as_int(PACKED_ELEMENTS.get(expected_type, TYPE_NIL), TYPE_NIL)
+	var element: int = GdhRead.as_int(PACKED_ELEMENTS.get(expected_type, TYPE_NIL), TYPE_NIL)
 	if expected_type == TYPE_ARRAY and not elements.is_empty():
-		element = Read.as_int(elements[0], TYPE_NIL)
+		element = GdhRead.as_int(elements[0], TYPE_NIL)
 	if element != TYPE_NIL and value is Array:
 		var items: Array = value
 		for index: int in items.size():
-			if not Serialisation.acceptable(items[index], element):
+			if not GdhSerialisation.acceptable(items[index], element):
 				var shape: String = "%s.%s is %s and item %d of the list given is %s, not %s."
 				var named: Array = [
 					holder, property, held, index, type_string(typeof(items[index])), type_string(element)
 				]
-				return shape % named + cost
+				return shape % named + GdhShapes.remedy(items[index], element) + cost
 	if expected_type == TYPE_DICTIONARY and elements.size() == 2 and value is Dictionary:
 		var entries: Dictionary = value
-		var key_type: int = Read.as_int(elements[0], TYPE_NIL)
-		var value_type: int = Read.as_int(elements[1], TYPE_NIL)
+		var key_type: int = GdhRead.as_int(elements[0], TYPE_NIL)
+		var value_type: int = GdhRead.as_int(elements[1], TYPE_NIL)
 		for key: Variant in entries:
-			if not Serialisation.acceptable(key, key_type):
+			if not GdhSerialisation.acceptable(key, key_type):
 				var shape: String = "%s.%s has %s keys, and %s is not one."
 				return shape % [holder, property, type_string(key_type), shown(key)] + cost
 			var entry: Variant = entries[key]
-			if not Serialisation.acceptable(entry, value_type):
+			if not GdhSerialisation.acceptable(entry, value_type):
 				var shape: String = "%s.%s holds %s values, and the one given for %s is %s."
 				var named: Array = [holder, property, type_string(value_type), shown(key), shown(entry)]
-				return shape % named + cost
+				return shape % named + GdhShapes.remedy(entry, value_type) + cost
 	return ""
 
 
@@ -168,6 +176,11 @@ func cannot_hold(
 ## Nothing here saves, so a refusal partway leaves the change in memory and the file as it was. The
 ## caller returns the refusal instead of saving.
 func write_all(target: Object, properties: Dictionary) -> String:
+	_also_changed = {}
+	var named: Dictionary = {}
+	for key: Variant in properties:
+		named[str(key).get_slice(":", 0)] = true
+	var before: Dictionary = _stored(target, named)
 	var given: Dictionary = {}
 	for key: Variant in properties:
 		var property: String = str(key)
@@ -197,9 +210,62 @@ func write_all(target: Object, properties: Dictionary) -> String:
 				)
 				% [target.get_class(), property, shown(given[property]), shown(held)]
 			)
+	for property: String in before:
+		var now: Variant = target.get(property)
+		if not same(now, before[property]):
+			_also_changed[property] = [before[property], now]
 	return ""
 
 
+## Puts under alsoChanged in [param answer] each property the last [method write_all] changed
+## without being given it, as {was, now}, when there are any. A node is named by its path from
+## [param relative_to], as a scene answer names one. Called before the scene is written, since the
+## write frees the nodes these values can hold.
+func note_also_changed(answer: Dictionary, relative_to: Node = null) -> void:
+	if _also_changed.is_empty():
+		return
+	var noted: Dictionary = {}
+	for property: Variant in _also_changed:
+		var pair: Array = _also_changed[property]
+		noted[property] = {"was": _readable(pair[0], relative_to), "now": _readable(pair[1], relative_to)}
+	answer["alsoChanged"] = noted
+
+
+func _readable(value: Variant, relative_to: Node) -> Variant:
+	if value is Node and relative_to != null:
+		var target: Node = value
+		return _values.serialize_value(relative_to.get_path_to(target))
+	if value is Array:
+		var items: Array = value
+		return items.map(func(item: Variant) -> Variant: return _readable(item, relative_to))
+	return _values.serialize_value(value)
+
+
+## What [param target] stores, by name, but its script and the properties in [param leave]. A list
+## or a map is copied, since a setter can change the one it holds in place.
+func _stored(target: Object, leave: Dictionary) -> Dictionary:
+	var held: Dictionary = {}
+	for entry: Dictionary in target.get_property_list():
+		var name: String = str(entry["name"])
+		var usage: int = GdhRead.as_int(entry["usage"])
+		if (
+			usage & PROPERTY_USAGE_STORAGE == 0
+			or usage & HEADINGS != 0
+			or name == "script"
+			or leave.has(name)
+		):
+			continue
+		var value: Variant = target.get(name)
+		if value is Array:
+			var listed: Array = value
+			value = listed.duplicate(true)
+		elif value is Dictionary:
+			var mapped: Dictionary = value
+			value = mapped.duplicate(true)
+		held[name] = value
+	return held
+
+
 ## What [param target] holds under [param key], a property or a colon path into one's components.
 func read_at(target: Object, key: String) -> Variant:
 	if ":" in key and declaration(target, key).is_empty():
@@ -228,9 +294,8 @@ func _component_slot(target: Object, path: String) -> Dictionary:
 	var walked: String = steps[0]
 	for index: int in range(1, steps.size()):
 		var step: String = steps[index]
-		var has: PackedStringArray = Serialisation.components_of(value)
-		var kind: String = type_string(typeof(value))
-		var sort: String = ("an " if kind.left(1).to_upper() in ["A", "E", "I", "O", "U"] else "a ") + kind
+		var has: PackedStringArray = GdhSerialisation.components_of(value)
+		var sort: String = GdhRead.with_article(type_string(typeof(value)))
 		if has.is_empty():
 			return {
 				"refused":
@@ -255,8 +320,8 @@ func _component_slot(target: Object, path: String) -> Dictionary:
 ## [param raw] as the value [param declared] takes, as [ok, value] or [false, why not].
 func value_for(target: Object, declared: Dictionary, raw: Variant) -> Array:
 	var property: String = str(declared.get("name", ""))
-	var expected_type: int = Read.as_int(declared.get("type", TYPE_NIL), TYPE_NIL)
-	var hint: int = Read.as_int(declared.get("hint", PROPERTY_HINT_NONE))
+	var expected_type: int = GdhRead.as_int(declared.get("type", TYPE_NIL), TYPE_NIL)
+	var hint: int = GdhRead.as_int(declared.get("hint", PROPERTY_HINT_NONE))
 	if expected_type == TYPE_OBJECT and hint == PROPERTY_HINT_NODE_TYPE:
 		return _node_reference(target, property, raw)
 
@@ -272,7 +337,7 @@ func value_for(target: Object, declared: Dictionary, raw: Variant) -> Array:
 		var elements: Array = elements_of(declared)
 		if _fraction(raw, expected_type, elements):
 			return [false, _fraction_refusal(target, property, raw)]
-		var rounded: String = Serialisation.inexact(raw, expected_type)
+		var rounded: String = GdhSerialisation.inexact(raw, expected_type)
 		if not rounded.is_empty():
 			return [false, "%s.%s holds int: %s." % [target.get_class(), property, rounded]]
 		_refused = ""
@@ -328,7 +393,7 @@ func _node_reference(target: Object, property: String, raw: Variant) -> Array:
 ## an object of the wrong class: measured on 4.7.2, a Sprite2D given a Material for its texture
 ## held nothing afterwards, and the scene was saved without the texture it had.
 func _wrong_class(value: Object, declared: Dictionary) -> String:
-	var hint: int = Read.as_int(declared.get("hint", PROPERTY_HINT_NONE))
+	var hint: int = GdhRead.as_int(declared.get("hint", PROPERTY_HINT_NONE))
 	var wanted: String = str(declared.get("hint_string", ""))
 	if hint != PROPERTY_HINT_RESOURCE_TYPE or wanted.is_empty():
 		return ""
@@ -354,8 +419,8 @@ func _wrong_class(value: Object, declared: Dictionary) -> String:
 ## behind a placeholder in the editor, and measured on 4.7.2 that placeholder stores [1.5, 2.0]
 ## as given, which the game then fails to load into the typed array.
 static func elements_of(declared: Dictionary) -> Array:
-	var type: int = Read.as_int(declared.get("type", TYPE_NIL), TYPE_NIL)
-	var hint: int = Read.as_int(declared.get("hint", PROPERTY_HINT_NONE))
+	var type: int = GdhRead.as_int(declared.get("type", TYPE_NIL), TYPE_NIL)
+	var hint: int = GdhRead.as_int(declared.get("hint", PROPERTY_HINT_NONE))
 	var wanted: String = str(declared.get("hint_string", ""))
 	if wanted.is_empty():
 		return []
@@ -397,21 +462,21 @@ func _fraction(value: Variant, type: int, elements: Array = []) -> bool:
 	if type == TYPE_INT:
 		var number: Variant = value
 		if typeof(value) == TYPE_STRING:
-			number = Read.json_or_null(str(value))
+			number = GdhRead.json_or_null(str(value))
 		if typeof(number) != TYPE_FLOAT:
 			return false
 		var whole: float = number
 		return is_finite(whole) and whole != floorf(whole)
-	var element: int = Read.as_int(PACKED_ELEMENTS.get(type, TYPE_NIL), TYPE_NIL)
+	var element: int = GdhRead.as_int(PACKED_ELEMENTS.get(type, TYPE_NIL), TYPE_NIL)
 	if type == TYPE_ARRAY and not elements.is_empty():
-		element = Read.as_int(elements[0], TYPE_NIL)
+		element = GdhRead.as_int(elements[0], TYPE_NIL)
 	if value is Array and element != TYPE_NIL:
 		var items: Array = value
 		return items.any(func(item: Variant) -> bool: return _fraction(item, element))
 	if type == TYPE_DICTIONARY and elements.size() == 2 and value is Dictionary:
 		var entries: Dictionary = value
-		var key_type: int = Read.as_int(elements[0], TYPE_NIL)
-		var value_type: int = Read.as_int(elements[1], TYPE_NIL)
+		var key_type: int = GdhRead.as_int(elements[0], TYPE_NIL)
+		var value_type: int = GdhRead.as_int(elements[1], TYPE_NIL)
 		for key: Variant in entries:
 			if _fraction(key, key_type) or _fraction(entries[key], value_type):
 				return true
@@ -463,7 +528,7 @@ func declaration(target: Object, property: String) -> Dictionary:
 	for declared: Dictionary in target.get_property_list():
 		if str(declared.get("name", "")) != property:
 			continue
-		if Read.as_int(declared.get("usage", 0)) & HEADINGS:
+		if GdhRead.as_int(declared.get("usage", 0)) & HEADINGS:
 			continue
 		return declared
 	if target is Theme:
@@ -503,13 +568,13 @@ static func same(held: Variant, given: Variant) -> bool:
 		return held_none == given_none
 	if held_type == TYPE_OBJECT or given_type == TYPE_OBJECT:
 		return _same_object(held, given)
-	if Serialisation.NUMBERS.has(held_type) and Serialisation.NUMBERS.has(given_type):
+	if GdhSerialisation.NUMBERS.has(held_type) and GdhSerialisation.NUMBERS.has(given_type):
 		if held_type == TYPE_BOOL or given_type == TYPE_BOOL:
 			return held_type == given_type and held == given
-		var held_number: float = Read.as_float(held)
-		var given_number: float = Read.as_float(given)
+		var held_number: float = GdhRead.as_float(held)
+		var given_number: float = GdhRead.as_float(given)
 		return (is_nan(held_number) and is_nan(given_number)) or is_equal_approx(held_number, given_number)
-	if Serialisation.TEXTS.has(held_type) and Serialisation.TEXTS.has(given_type):
+	if GdhSerialisation.TEXTS.has(held_type) and GdhSerialisation.TEXTS.has(given_type):
 		return str(held) == str(given)
 	if _listed(held_type) and _listed(given_type):
 		var held_items: Array = type_convert(held, TYPE_ARRAY)
@@ -675,7 +740,7 @@ func _parse_shaped_dictionary(value: Dictionary, expected_type: int, elements: A
 	if expected_type == TYPE_NIL or expected_type == TYPE_DICTIONARY:
 		return _parse_entries(value, elements)
 	var tag: String = type_string(expected_type)
-	if Serialisation.REQUIRED.has(tag):
+	if GdhShapes.REQUIRED.has(tag):
 		var tagged: Dictionary = value.duplicate()
 		tagged["_type"] = tag
 		var built: Variant = _values.deserialize_value(tagged)
@@ -690,8 +755,8 @@ func _parse_entries(value: Dictionary, elements: Array) -> Dictionary:
 	var key_type: int = TYPE_NIL
 	var value_type: int = TYPE_NIL
 	if elements.size() == 2:
-		key_type = Read.as_int(elements[0], TYPE_NIL)
-		value_type = Read.as_int(elements[1], TYPE_NIL)
+		key_type = GdhRead.as_int(elements[0], TYPE_NIL)
+		value_type = GdhRead.as_int(elements[1], TYPE_NIL)
 	var entries: Dictionary = {}
 	for key: Variant in value:
 		entries[_values.fitted(key, key_type)] = parse(value[key], value_type)
@@ -709,7 +774,7 @@ func _typed_dictionary(entries: Dictionary, key_type: int, value_type: int) -> D
 	for key: Variant in entries:
 		if key_type != TYPE_NIL and typeof(key) != key_type:
 			return entries
-		if not Serialisation.acceptable(entries[key], value_type):
+		if not GdhSerialisation.acceptable(entries[key], value_type):
 			return entries
 	var fitted: Dictionary = {}
 	for key: Variant in entries:
@@ -720,46 +785,48 @@ func _typed_dictionary(entries: Dictionary, key_type: int, value_type: int) -> D
 ## An array, either positional for a vector the property declares, or a list to parse per item.
 func _parse_array(value: Array, expected_type: int, elements: Array) -> Variant:
 	if PACKED_ELEMENTS.has(expected_type):
-		var element: int = Read.as_int(PACKED_ELEMENTS[expected_type], TYPE_NIL)
+		var element: int = GdhRead.as_int(PACKED_ELEMENTS[expected_type], TYPE_NIL)
 		return value.map(func(item: Variant) -> Variant: return parse(item, element))
 
 	match expected_type:
 		TYPE_VECTOR2:
 			if value.size() == 2:
-				return Vector2(Read.as_float(value[0]), Read.as_float(value[1]))
+				return Vector2(GdhRead.as_float(value[0]), GdhRead.as_float(value[1]))
 		TYPE_VECTOR2I:
 			if value.size() == 2:
-				return Vector2i(Read.as_int(value[0]), Read.as_int(value[1]))
+				return Vector2i(GdhRead.as_int(value[0]), GdhRead.as_int(value[1]))
 		TYPE_VECTOR3:
 			if value.size() == 3:
-				return Vector3(Read.as_float(value[0]), Read.as_float(value[1]), Read.as_float(value[2]))
+				return Vector3(
+					GdhRead.as_float(value[0]), GdhRead.as_float(value[1]), GdhRead.as_float(value[2])
+				)
 		TYPE_VECTOR3I:
 			if value.size() == 3:
-				return Vector3i(Read.as_int(value[0]), Read.as_int(value[1]), Read.as_int(value[2]))
+				return Vector3i(GdhRead.as_int(value[0]), GdhRead.as_int(value[1]), GdhRead.as_int(value[2]))
 		TYPE_VECTOR4:
 			if value.size() == 4:
 				return Vector4(
-					Read.as_float(value[0]),
-					Read.as_float(value[1]),
-					Read.as_float(value[2]),
-					Read.as_float(value[3])
+					GdhRead.as_float(value[0]),
+					GdhRead.as_float(value[1]),
+					GdhRead.as_float(value[2]),
+					GdhRead.as_float(value[3])
 				)
 		TYPE_COLOR:
 			if value.size() == 3 or value.size() == 4:
 				return Color(
-					Read.as_float(value[0]),
-					Read.as_float(value[1]),
-					Read.as_float(value[2]),
-					Read.as_float(value[3]) if value.size() == 4 else 1.0
+					GdhRead.as_float(value[0]),
+					GdhRead.as_float(value[1]),
+					GdhRead.as_float(value[2]),
+					GdhRead.as_float(value[3]) if value.size() == 4 else 1.0
 				)
 
 	var element_type: int = TYPE_NIL
 	if expected_type == TYPE_ARRAY and not elements.is_empty():
-		element_type = Read.as_int(elements[0], TYPE_NIL)
+		element_type = GdhRead.as_int(elements[0], TYPE_NIL)
 	var items: Array = value.map(func(item: Variant) -> Variant: return parse(item, element_type))
 	if element_type == TYPE_NIL or element_type == TYPE_OBJECT:
 		return items
-	if not items.all(func(item: Variant) -> bool: return Serialisation.acceptable(item, element_type)):
+	if not items.all(func(item: Variant) -> bool: return GdhSerialisation.acceptable(item, element_type)):
 		return items
 	var fitted: Array = items.map(func(item: Variant) -> Variant: return type_convert(item, element_type))
 	return Array(fitted, element_type, &"", null)

package/build/godot/addons/gdharness_editor/reading.gd

@@ -139,3 +139,31 @@ static func missing_below(
 			"its children are " + shown if not children.is_empty() else "it has no children",
 		]
 	)
+
+
+## [param said], the refusal for a [param kind] the scene does not have at [param node_path], with
+## what is there when the scene has a node there, [param found] its class, and [param holders], the
+## paths of the nodes in the scene that are one, so the caller has the path to pass. Names up to
+## [constant NAMED_CHILDREN] of them.
+static func not_of_kind(
+	said: String, node_path: String, found: String, kind: String, holders: PackedStringArray
+) -> String:
+	var told: String = said + ("" if said.ends_with(".") else ".")
+	if not found.is_empty():
+		told += ' The node at "%s" is %s, not %s.' % [node_path, with_article(found), with_article(kind)]
+	if holders.is_empty():
+		return told + " The scene holds no %s." % kind
+	var quoted: PackedStringArray = []
+	for holder: String in holders.slice(0, NAMED_CHILDREN):
+		var _quoted: bool = quoted.append('"%s"' % holder)
+	var shown: String = ", ".join(quoted)
+	if holders.size() > NAMED_CHILDREN:
+		shown += " and %d more" % (holders.size() - NAMED_CHILDREN)
+	if holders.size() == 1:
+		return told + " The scene's %s is at %s." % [kind, shown]
+	return told + " The scene's %ss are at %s." % [kind, shown]
+
+
+## [param word] after the article it takes, "an AnimationTree" or "a Node2D".
+static func with_article(word: String) -> String:
+	return ("an " if word.left(1).to_upper() in ["A", "E", "I", "O", "U"] else "a ") + word

package/build/godot/addons/gdharness_editor/scene_file.gd

@@ -23,14 +23,14 @@ extends RefCounted
 ## setter setting scale were both saved into the file by a write to another node, and a root whose
 ## script failed in [code]_init[/code] was saved without it. Outside the editor, then, what a node
 ## stores is put back to what the file holds wherever the tool did not ask for a change, before
-## anything is saved, and a write is refused when that does not hold. See [HeadlessCheck].
+## anything is saved, and a write is refused when that does not hold. See [GdhHeadlessCheck].
 
-const HeadlessCheck = preload("headless_check.gd")
+const GdhHeadlessCheck = preload("headless_check.gd")
 
 ## How many times what scripts changed is put back before a write is refused for it.
 const PUTTING_BACK_PASSES: int = 4
-const PropertyValues = preload("property_values.gd")
-const Read = preload("reading.gd")
+const GdhPropertyValues = preload("property_values.gd")
+const GdhRead = preload("reading.gd")
 ## The names Object.ConnectFlags gives each bit. The number alone left a reader guessing that 2 is
 ## the persistence every connection in a saved scene carries.
 const CONNECT_FLAG_NAMES: Dictionary[int, String] = {
@@ -135,12 +135,12 @@ func asked(node: Node, names: Array) -> void:
 	var id: int = node.get_instance_id()
 	var on: Dictionary = _asked.get_or_add(id, {})
 	if not _before.has(id):
-		_before[id] = HeadlessCheck.stored(node)
+		_before[id] = GdhHeadlessCheck.stored(node)
 	for name: Variant in names:
 		var property: String = str(name)
 		on[property] = true
 		on[property.get_slice(":", 0)] = true
-		_reached.merge(HeadlessCheck.reached(node, property))
+		_reached.merge(GdhHeadlessCheck.reached(node, property))
 
 
 ## Takes [param resource], built into the scene, as one the tool changed, which a write saves as it is.
@@ -199,7 +199,7 @@ func not_found(said: String, node_path: String) -> String:
 	if root == null:
 		return said
 	if not root.has_node(NodePath(node_path.get_slice("/", 0))):
-		var hinted: String = Read.from_the_root(said, node_path, str(root.name))
+		var hinted: String = GdhRead.from_the_root(said, node_path, str(root.name))
 		if hinted != said:
 			return hinted
 	var parts: PackedStringArray = node_path.trim_prefix("./").split("/", false)
@@ -216,7 +216,7 @@ func not_found(said: String, node_path: String) -> String:
 	var names: PackedStringArray = []
 	for child: Node in at.get_children():
 		var _named: bool = names.append(str(child.name))
-	return Read.missing_below(said, str(root.name), reached, parts[reached.size()], names)
+	return GdhRead.missing_below(said, str(root.name), reached, parts[reached.size()], names)
 
 
 func close() -> void:
@@ -477,7 +477,7 @@ func kept(saved: Node, loaded: Variant, given: Variant) -> bool:
 		var loaded_node: Node = loaded
 		var given_node: Node = given
 		return str(saved.get_path_to(loaded_node)) == str(root.get_path_to(given_node))
-	return PropertyValues.same(loaded, given)
+	return GdhPropertyValues.same(loaded, given)
 
 
 ## Packs [member root], has [param check] read the result as the file will hold it, and writes the
@@ -508,7 +508,7 @@ func write(check: Callable = Callable()) -> Dictionary:
 						)
 						% path
 					)
-					+ HeadlessCheck.REMEDY
+					+ GdhHeadlessCheck.REMEDY
 				)
 			)
 	if check.is_valid():
@@ -530,12 +530,14 @@ func write(check: Callable = Callable()) -> Dictionary:
 	var values: Array = []
 	for index: int in state.get_node_count():
 		values.append_array(_stored_at(state, index).values())
-	var unkept: String = HeadlessCheck.settle_saved(
+	var unkept: String = GdhHeadlessCheck.settle_saved(
 		path, _text, values, null, {}, _reached, func() -> Error: return save_keeping_uid(packed, path)
 	)
 	if unkept.is_empty():
 		return {}
-	return {"ok": false, "error": "Nothing was written: " + unkept + HeadlessCheck.put_back(path, previous)}
+	return {
+		"ok": false, "error": "Nothing was written: " + unkept + GdhHeadlessCheck.put_back(path, previous)
+	}
 
 
 func _holds_scripted_embedded() -> bool:
@@ -543,7 +545,7 @@ func _holds_scripted_embedded() -> bool:
 	var nodes: Array[Node] = [root]
 	while not nodes.is_empty():
 		var node: Node = nodes.pop_back()
-		if HeadlessCheck.holds_scripted_embedded(node, seen):
+		if GdhHeadlessCheck.holds_scripted_embedded(node, seen):
 			return true
 		nodes.append_array(node.get_children())
 	return false
@@ -742,7 +744,7 @@ func _settled(packed: PackedScene) -> Array:
 			var node: Node = found[0]
 			var before: Dictionary = _before[node.get_instance_id()]
 			for name: String in found[1]:
-				node.set(name, before.get(name, HeadlessCheck.default_of(node, name)))
+				node.set(name, before.get(name, GdhHeadlessCheck.default_of(node, name)))
 		current = PackedScene.new()
 		var packing: Error = current.pack(root)
 		if packing != OK:
@@ -766,10 +768,10 @@ func _moved_by_scripts() -> Array[Array]:
 		if node == null or not root.is_ancestor_of(node) and node != root:
 			continue
 		var on: Dictionary = _asked[id]
-		if not HeadlessCheck.through_script(node, on):
+		if not GdhHeadlessCheck.through_script(node, on):
 			continue
 		var before: Dictionary = _before[id]
-		var changed: Array[String] = HeadlessCheck.differing(node, before, on)
+		var changed: Array[String] = GdhHeadlessCheck.differing(node, before, on)
 		if not changed.is_empty():
 			moved.append([node, changed])
 	return moved
@@ -792,7 +794,10 @@ func _strays(state: SceneState) -> Array[Array]:
 		# changes is Godot's doing and the editor's pack does it too: a Control saved without its
 		# grow directions gets them back from anchors_preset's setter, and loses an anchors_preset
 		# its layout mode does not store.
-		if not HeadlessCheck.untooled(node.get_script()) and not HeadlessCheck.untooled(filed.get("script")):
+		if (
+			not GdhHeadlessCheck.untooled(node.get_script())
+			and not GdhHeadlessCheck.untooled(filed.get("script"))
+		):
 			continue
 		var stored: Dictionary = _stored_at(state, index)
 		var names: Dictionary = filed.duplicate()
@@ -800,9 +805,9 @@ func _strays(state: SceneState) -> Array[Array]:
 		for key: Variant in names:
 			var name: String = str(key)
 			var held: bool = filed.has(name)
-			if held == stored.has(name) and (not held or PropertyValues.same(stored[name], filed[name])):
+			if held == stored.has(name) and (not held or GdhPropertyValues.same(stored[name], filed[name])):
 				continue
-			if not held and HeadlessCheck.at_default(node, name):
+			if not held and GdhHeadlessCheck.at_default(node, name):
 				continue
 			stray.append([node, name, held, filed.get(name)])
 	return stray
@@ -819,7 +824,7 @@ func _stray_text(node: Node, name: String) -> String:
 				)
 				% [at, path]
 			)
-			+ HeadlessCheck.REMEDY
+			+ GdhHeadlessCheck.REMEDY
 		)
 	return (
 		(
@@ -830,7 +835,7 @@ func _stray_text(node: Node, name: String) -> String:
 			)
 			% [at, name, path]
 		)
-		+ HeadlessCheck.REMEDY
+		+ GdhHeadlessCheck.REMEDY
 	)
 
 
@@ -845,7 +850,7 @@ func _unset_value(node: Node, name: String) -> Variant:
 	while top != root and top.owner != root:
 		top = top.get_parent()
 	if top == root or top.scene_file_path.is_empty():
-		return HeadlessCheck.default_of(node, name)
+		return GdhHeadlessCheck.default_of(node, name)
 	if _base_paths.has(path_of(top)):
 		return _value_in(base, path_of(node), node, name)
 	var instanced: PackedScene = ResourceLoader.load(top.scene_file_path) as PackedScene
@@ -881,7 +886,7 @@ func _value_in(state: SceneState, at: String, node: Node, name: String) -> Varia
 			state = instanced.get_state()
 		else:
 			state = state.get_base_scene_state()
-	return HeadlessCheck.default_of(node, name)
+	return GdhHeadlessCheck.default_of(node, name)
 
 
 func _node_at(node_path: String) -> Node: