gdharness 1.2.36 → 1.2.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cli.js +314 -68
- package/build/godot/addons/gdharness_editor/headless_check.gd +374 -0
- package/build/godot/addons/gdharness_editor/headless_check.gd.uid +1 -0
- package/build/godot/addons/gdharness_editor/property_values.gd +3 -0
- package/build/godot/addons/gdharness_editor/scene_file.gd +345 -10
- package/build/godot/addons/gdharness_editor/serialisation.gd +103 -5
- package/build/godot/addons/gdharness_editor/tools/resource_tools.gd +68 -18
- package/build/godot/addons/gdharness_editor/tools/scene_tools.gd +24 -13
- package/build/godot/addons/gdharness_runtime/runtime_changes.gd +9 -0
- package/build/godot/addons/gdharness_runtime/runtime_values.gd +5 -0
- package/build/godot/addons/gdharness_runtime/runtime_waits.gd +3 -0
- package/build/godot/addons/gdharness_runtime/serialisation.gd +103 -5
- package/build/godot/operations/editor_tools.gd +57 -0
- package/build/godot/operations/gdscript_analysis.gd +26 -2
- package/build/godot/operations/gdscript_authoring.gd +5 -2
- package/build/godot/operations/godot_operations.gd +51 -1
- package/build/godot/operations/property_values.gd +3 -0
- package/build/godot/operations/serialisation.gd +103 -5
- package/build/index.js +304 -58
- package/package.json +1 -1
|
@@ -4,6 +4,7 @@ extends Node
|
|
|
4
4
|
## Resource files, shaders, tilesets and themes, written through the open editor.
|
|
5
5
|
|
|
6
6
|
const FileReads = preload("../file_reads.gd")
|
|
7
|
+
const HeadlessCheck = preload("../headless_check.gd")
|
|
7
8
|
const PropertyValues = preload("../property_values.gd")
|
|
8
9
|
const Read = preload("../reading.gd")
|
|
9
10
|
const SceneFile = preload("../scene_file.gd")
|
|
@@ -118,9 +119,12 @@ func _load_theme(theme_path: String) -> Theme:
|
|
|
118
119
|
## Read back because a property can be set and still not be saved: one without storage, a
|
|
119
120
|
## script variable that is not exported. Both were answered as changed.
|
|
120
121
|
func _save_checked(resource: Resource, path: String, names: Array, previous: Variant) -> String:
|
|
121
|
-
var saving: Error =
|
|
122
|
+
var saving: Error = SceneFile.save_keeping_uid(resource, path)
|
|
122
123
|
if saving != OK:
|
|
123
124
|
return "Failed to save %s: %s" % [path, error_string(saving)]
|
|
125
|
+
var unkept: String = _unkept_headless(resource, path, names, previous)
|
|
126
|
+
if not unkept.is_empty():
|
|
127
|
+
return "Nothing was written: " + unkept + HeadlessCheck.put_back(path, previous)
|
|
124
128
|
var loaded: Resource = ResourceLoader.load(path, "", ResourceLoader.CACHE_MODE_IGNORE)
|
|
125
129
|
var lost: String = ""
|
|
126
130
|
if loaded == null:
|
|
@@ -141,14 +145,50 @@ func _save_checked(resource: Resource, path: String, names: Array, previous: Var
|
|
|
141
145
|
if lost.is_empty():
|
|
142
146
|
_written(path)
|
|
143
147
|
return ""
|
|
148
|
+
return lost + HeadlessCheck.put_back(path, previous)
|
|
149
|
+
|
|
150
|
+
|
|
151
|
+
## Outside the editor, puts back in the file just saved at [param path] what a script that is not a
|
|
152
|
+
## tool changed and the call did not ask for, [param names] being what it asked for, and answers ""
|
|
153
|
+
## or why that did not hold. See [HeadlessCheck].
|
|
154
|
+
func _unkept_headless(resource: Resource, path: String, names: Array, previous: Variant) -> String:
|
|
155
|
+
if Engine.is_editor_hint():
|
|
156
|
+
return ""
|
|
157
|
+
var script: Script = resource.get_script()
|
|
158
|
+
var scripted: bool = script != null and not script.is_tool()
|
|
159
|
+
if not path.ends_with(".tres"):
|
|
160
|
+
if scripted or HeadlessCheck.holds_scripted_embedded(resource, {}):
|
|
161
|
+
return (
|
|
162
|
+
(
|
|
163
|
+
(
|
|
164
|
+
"%s is a binary resource with a script that is not a tool, and what that script "
|
|
165
|
+
+ "changed when a headless engine loaded it cannot be told apart from the file here. "
|
|
166
|
+
)
|
|
167
|
+
% path
|
|
168
|
+
)
|
|
169
|
+
+ HeadlessCheck.REMEDY
|
|
170
|
+
)
|
|
171
|
+
return ""
|
|
172
|
+
var before: String = ""
|
|
144
173
|
if previous is PackedByteArray:
|
|
145
174
|
var bytes: PackedByteArray = previous
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
175
|
+
before = bytes.get_string_from_utf8()
|
|
176
|
+
var asked: Dictionary = {"script": true}
|
|
177
|
+
var reached: Dictionary = {}
|
|
178
|
+
for key: Variant in names:
|
|
179
|
+
var property: String = str(key)
|
|
180
|
+
asked[property] = true
|
|
181
|
+
asked[property.get_slice(":", 0)] = true
|
|
182
|
+
reached.merge(HeadlessCheck.reached(resource, property))
|
|
183
|
+
return HeadlessCheck.settle_saved(
|
|
184
|
+
path,
|
|
185
|
+
before,
|
|
186
|
+
HeadlessCheck.stored(resource).values(),
|
|
187
|
+
resource if scripted else null,
|
|
188
|
+
asked,
|
|
189
|
+
reached,
|
|
190
|
+
func() -> Error: return SceneFile.save_keeping_uid(resource, path)
|
|
191
|
+
)
|
|
152
192
|
|
|
153
193
|
|
|
154
194
|
func create_resource(args: Dictionary) -> Dictionary:
|
|
@@ -321,7 +361,7 @@ func create_tileset(args: Dictionary) -> Dictionary:
|
|
|
321
361
|
var folder: String = SceneFile.make_folder_for(tileset_path)
|
|
322
362
|
if not folder.is_empty():
|
|
323
363
|
return {"ok": false, "error": folder}
|
|
324
|
-
var saving: Error =
|
|
364
|
+
var saving: Error = SceneFile.save_keeping_uid(tileset, tileset_path)
|
|
325
365
|
if saving != OK:
|
|
326
366
|
return {"ok": false, "error": "Failed to save %s: %s" % [tileset_path, error_string(saving)]}
|
|
327
367
|
|
|
@@ -443,6 +483,7 @@ func set_tilemap_cells(args: Dictionary) -> Dictionary:
|
|
|
443
483
|
# reports placing tiles and a scene that shows none.
|
|
444
484
|
var tile_set: TileSet = layered.tile_set if layered != null else single.tile_set
|
|
445
485
|
|
|
486
|
+
scene.asked(node, ["layer_%d/tile_data" % layer if layered != null else "tile_map_data"])
|
|
446
487
|
var wanted: Array = []
|
|
447
488
|
for index: int in placed.size():
|
|
448
489
|
var cell: Array = _cell(placed[index], index, tile_set)
|
|
@@ -621,6 +662,19 @@ func _cell_at(node: Node, layer: int, at: Vector2i) -> Array:
|
|
|
621
662
|
return []
|
|
622
663
|
|
|
623
664
|
|
|
665
|
+
## Saves [param theme] over [param theme_path] with [param item] changed, answering "" or why not.
|
|
666
|
+
func _save_theme(theme: Theme, theme_path: String, item: String) -> String:
|
|
667
|
+
var previous: PackedByteArray = FileAccess.get_file_as_bytes(theme_path)
|
|
668
|
+
var saving: Error = SceneFile.save_keeping_uid(theme, theme_path)
|
|
669
|
+
if saving != OK:
|
|
670
|
+
return "Failed to save %s: %s" % [theme_path, error_string(saving)]
|
|
671
|
+
var unkept: String = _unkept_headless(theme, theme_path, [item], previous)
|
|
672
|
+
if not unkept.is_empty():
|
|
673
|
+
return "Nothing was written: " + unkept + HeadlessCheck.put_back(theme_path, previous)
|
|
674
|
+
_written(theme_path)
|
|
675
|
+
return ""
|
|
676
|
+
|
|
677
|
+
|
|
624
678
|
func set_theme_color(args: Dictionary) -> Dictionary:
|
|
625
679
|
var theme_path: String = _ensure_res_path(str(args.get("themePath", "")))
|
|
626
680
|
if theme_path == "res://":
|
|
@@ -644,11 +698,9 @@ func set_theme_color(args: Dictionary) -> Dictionary:
|
|
|
644
698
|
)
|
|
645
699
|
theme.set_color(color_name, control_type, color)
|
|
646
700
|
|
|
647
|
-
var
|
|
648
|
-
if
|
|
649
|
-
return {"ok": false, "error":
|
|
650
|
-
|
|
651
|
-
_written(theme_path)
|
|
701
|
+
var unsaved: String = _save_theme(theme, theme_path, "%s/colors/%s" % [control_type, color_name])
|
|
702
|
+
if not unsaved.is_empty():
|
|
703
|
+
return {"ok": false, "error": unsaved}
|
|
652
704
|
|
|
653
705
|
var saved: Theme = _load_theme(theme_path)
|
|
654
706
|
if saved == null or not saved.has_color(color_name, control_type):
|
|
@@ -680,11 +732,9 @@ func set_theme_font_size(args: Dictionary) -> Dictionary:
|
|
|
680
732
|
|
|
681
733
|
theme.set_font_size(font_size_name, control_type, Read.as_int(args.get("size", 0)))
|
|
682
734
|
|
|
683
|
-
var
|
|
684
|
-
if
|
|
685
|
-
return {"ok": false, "error":
|
|
686
|
-
|
|
687
|
-
_written(theme_path)
|
|
735
|
+
var unsaved: String = _save_theme(theme, theme_path, "%s/font_sizes/%s" % [control_type, font_size_name])
|
|
736
|
+
if not unsaved.is_empty():
|
|
737
|
+
return {"ok": false, "error": unsaved}
|
|
688
738
|
|
|
689
739
|
var saved: Theme = _load_theme(theme_path)
|
|
690
740
|
if saved == null or not saved.has_font_size(font_size_name, control_type):
|
|
@@ -90,7 +90,7 @@ func _missing_on(node: Node, missing: String) -> String:
|
|
|
90
90
|
if probe.reload() == OK:
|
|
91
91
|
return missing
|
|
92
92
|
return (
|
|
93
|
-
"%s. Its script, %s, does not compile, so
|
|
93
|
+
"%s. Its script, %s, does not compile, so none of what it declares is known here."
|
|
94
94
|
% [missing, script.resource_path]
|
|
95
95
|
)
|
|
96
96
|
|
|
@@ -213,6 +213,10 @@ func create_scene(args: Dictionary) -> Dictionary:
|
|
|
213
213
|
|
|
214
214
|
var root: Node = ClassDB.instantiate(root_node_type)
|
|
215
215
|
root.name = root_node_name
|
|
216
|
+
var scene: SceneFile = SceneFile.new()
|
|
217
|
+
scene.root = root
|
|
218
|
+
scene.path = scene_path
|
|
219
|
+
scene.asked(root, ["script"])
|
|
216
220
|
|
|
217
221
|
if not script_path.is_empty():
|
|
218
222
|
var full_script_path: String = _to_scene_res_path(project_path, script_path)
|
|
@@ -238,9 +242,6 @@ func create_scene(args: Dictionary) -> Dictionary:
|
|
|
238
242
|
if not folder.is_empty():
|
|
239
243
|
root.free()
|
|
240
244
|
return {"ok": false, "error": folder}
|
|
241
|
-
var scene: SceneFile = SceneFile.new()
|
|
242
|
-
scene.root = root
|
|
243
|
-
scene.path = scene_path
|
|
244
245
|
var written: Dictionary = scene.write()
|
|
245
246
|
if not written.is_empty():
|
|
246
247
|
return written
|
|
@@ -307,6 +308,10 @@ func add_node(args: Dictionary) -> Dictionary:
|
|
|
307
308
|
parent.add_child(new_node)
|
|
308
309
|
Placing.place(new_node, place)
|
|
309
310
|
Placing.own(new_node, root)
|
|
311
|
+
var unsettled: String = scene.settle()
|
|
312
|
+
if not unsettled.is_empty():
|
|
313
|
+
return scene.refuse("Nothing was written: " + unsettled)
|
|
314
|
+
scene.asked(new_node, properties.keys())
|
|
310
315
|
var refused_property: String = _properties.write_all(new_node, properties)
|
|
311
316
|
if not refused_property.is_empty():
|
|
312
317
|
return scene.refuse(refused_property)
|
|
@@ -415,6 +420,7 @@ func duplicate_node(args: Dictionary) -> Dictionary:
|
|
|
415
420
|
target_parent.add_child(duplicated_node)
|
|
416
421
|
Placing.own(duplicated_node, root)
|
|
417
422
|
Placing.reconnect(copies, source)
|
|
423
|
+
scene.copied(copies)
|
|
418
424
|
|
|
419
425
|
var new_path: String = scene.path_of(duplicated_node)
|
|
420
426
|
var written: Dictionary = scene.write(
|
|
@@ -530,6 +536,7 @@ func set_node_properties(args: Dictionary) -> Dictionary:
|
|
|
530
536
|
if not unusable.is_empty():
|
|
531
537
|
return scene.refuse(unusable)
|
|
532
538
|
|
|
539
|
+
scene.asked(node, properties.keys())
|
|
533
540
|
var refused_property: String = _properties.write_all(node, properties)
|
|
534
541
|
if not refused_property.is_empty():
|
|
535
542
|
return scene.refuse(_missing_on(node, refused_property))
|
|
@@ -570,12 +577,10 @@ func get_node_properties(args: Dictionary) -> Dictionary:
|
|
|
570
577
|
var props: Dictionary = _properties_of(node, include_defaults, scene.set_here(node))
|
|
571
578
|
var cells: Dictionary = ResourceTools.cells_of(node)
|
|
572
579
|
scene.close()
|
|
573
|
-
var answer: Dictionary = {
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
"
|
|
577
|
-
"unsavedInEditor": SceneFile.unsaved(scene_path)
|
|
578
|
-
}
|
|
580
|
+
var answer: Dictionary = {"ok": true, "nodePath": node_path, "properties": props}
|
|
581
|
+
# Only an editor holds anything unsaved; a headless engine answering false would say it looked.
|
|
582
|
+
if Engine.is_editor_hint():
|
|
583
|
+
answer["unsavedInEditor"] = SceneFile.unsaved(scene_path)
|
|
579
584
|
answer.merge(cells)
|
|
580
585
|
# An empty answer read as a node with nothing on it, rather than one with nothing changed.
|
|
581
586
|
if props.is_empty() and not include_defaults:
|
|
@@ -600,7 +605,10 @@ func save_scene(args: Dictionary) -> Dictionary:
|
|
|
600
605
|
return {"ok": false, "error": unsaved}
|
|
601
606
|
|
|
602
607
|
var open_root: Node = null
|
|
603
|
-
|
|
608
|
+
var open_roots: Array[Node] = []
|
|
609
|
+
if Engine.is_editor_hint():
|
|
610
|
+
open_roots = EditorInterface.get_open_scene_roots()
|
|
611
|
+
for open: Node in open_roots:
|
|
604
612
|
if open.scene_file_path == scene_path:
|
|
605
613
|
open_root = open
|
|
606
614
|
if open_root != null and target_path == scene_path:
|
|
@@ -618,7 +626,7 @@ func save_scene(args: Dictionary) -> Dictionary:
|
|
|
618
626
|
written = SceneFile.save_packed(packed, target_path)
|
|
619
627
|
else:
|
|
620
628
|
var scene: SceneFile = SceneFile.new()
|
|
621
|
-
var refused: Dictionary = scene.open(scene_path,
|
|
629
|
+
var refused: Dictionary = scene.open(scene_path, true)
|
|
622
630
|
if not refused.is_empty():
|
|
623
631
|
return refused
|
|
624
632
|
scene.path = target_path
|
|
@@ -897,4 +905,7 @@ func list_connections(args: Dictionary) -> Dictionary:
|
|
|
897
905
|
)
|
|
898
906
|
|
|
899
907
|
scene.close()
|
|
900
|
-
|
|
908
|
+
var listed: Dictionary = {"ok": true, "connections": connections}
|
|
909
|
+
if Engine.is_editor_hint():
|
|
910
|
+
listed["unsavedInEditor"] = SceneFile.unsaved(scene_path)
|
|
911
|
+
return listed
|
|
@@ -168,6 +168,12 @@ func _argument_for(
|
|
|
168
168
|
% [called, named, type_string(wants), index + 1, JSON.stringify(sent)]
|
|
169
169
|
)
|
|
170
170
|
}
|
|
171
|
+
var rounded: String = Values.inexact(sent, wants)
|
|
172
|
+
if not rounded.is_empty():
|
|
173
|
+
return {
|
|
174
|
+
"type": "error",
|
|
175
|
+
"message": "%s.%s takes int as argument %d: %s." % [called, named, index + 1, rounded]
|
|
176
|
+
}
|
|
171
177
|
var given: Variant = _values.fitted(sent, wants)
|
|
172
178
|
if not Values.acceptable(given, wants):
|
|
173
179
|
return {
|
|
@@ -242,6 +248,9 @@ func _value_for(
|
|
|
242
248
|
"message": "%s.%s holds an object: %s" % [called, named, named_object["message"]]
|
|
243
249
|
}
|
|
244
250
|
return {"value": named_object["object"]}
|
|
251
|
+
var rounded: String = Values.inexact(value, wanted)
|
|
252
|
+
if not rounded.is_empty():
|
|
253
|
+
return {"type": "error", "message": "%s.%s holds int: %s." % [called, named, rounded]}
|
|
245
254
|
var as_sent: Variant = _values.fitted(value, TYPE_NIL)
|
|
246
255
|
var cut: bool = Values.cuts(value, wanted)
|
|
247
256
|
var given: Variant = as_sent
|
|
@@ -156,6 +156,11 @@ static func cuts(given: Variant, type: int) -> bool:
|
|
|
156
156
|
return not (whole and (value == 0.0 or value == 1.0))
|
|
157
157
|
|
|
158
158
|
|
|
159
|
+
## Why [param given] may not be the whole number sent, or "": see [method Serialisation.inexact].
|
|
160
|
+
static func inexact(given: Variant, type: int) -> String:
|
|
161
|
+
return Serialisation.inexact(given, type)
|
|
162
|
+
|
|
163
|
+
|
|
159
164
|
## How a value of [param type] is written to be read as one, or empty when it is not built from fields.
|
|
160
165
|
static func written_as(type: int) -> String:
|
|
161
166
|
return Serialisation.written_as(type)
|
|
@@ -255,6 +255,9 @@ func wait_until(params: Dictionary) -> Dictionary:
|
|
|
255
255
|
var refused: String = _not_comparable(current, wanted, node_path, property)
|
|
256
256
|
if refused.is_empty():
|
|
257
257
|
refused = _cut_to_fit(params["value"], typeof(current), node_path, property)
|
|
258
|
+
var rounded: String = Values.inexact(params["value"], typeof(current))
|
|
259
|
+
if refused.is_empty() and not rounded.is_empty():
|
|
260
|
+
refused = "%s.%s holds int: %s." % [node_path, property, rounded]
|
|
258
261
|
var never_held: bool = typeof(wanted) != TYPE_NIL and typeof(wanted) != TYPE_OBJECT
|
|
259
262
|
if refused.is_empty() and declared == TYPE_OBJECT and never_held:
|
|
260
263
|
refused = (
|
|
@@ -16,6 +16,10 @@ const Read = preload("reading.gd")
|
|
|
16
16
|
const NUMBERS: Array[int] = [TYPE_BOOL, TYPE_INT, TYPE_FLOAT]
|
|
17
17
|
const TEXTS: Array[int] = [TYPE_STRING, TYPE_STRING_NAME, TYPE_NODE_PATH]
|
|
18
18
|
|
|
19
|
+
# 2^53. A JSON number is a double, and every whole number below this one in size has a double of
|
|
20
|
+
# its own; from here on two or more share each double, so one arriving tells nobody which was sent.
|
|
21
|
+
const EXACT: int = 9007199254740992
|
|
22
|
+
|
|
19
23
|
# The types that cross as a plain JSON list and have to be built back into themselves. A list is
|
|
20
24
|
# what a caller can write by hand and what the serialiser answers with, and the parameter or
|
|
21
25
|
# property being written is the only thing that knows which of these it wanted.
|
|
@@ -53,6 +57,8 @@ const LIST_TYPES: Array[int] = [
|
|
|
53
57
|
# type it wanted.
|
|
54
58
|
const SERIALISERS: Dictionary = {
|
|
55
59
|
TYPE_NIL: "_serialize_nil",
|
|
60
|
+
TYPE_INT: "_serialize_int",
|
|
61
|
+
TYPE_PACKED_INT64_ARRAY: "_serialize_ints",
|
|
56
62
|
TYPE_FLOAT: "_serialize_float",
|
|
57
63
|
TYPE_PACKED_FLOAT32_ARRAY: "_serialize_floats",
|
|
58
64
|
TYPE_PACKED_FLOAT64_ARRAY: "_serialize_floats",
|
|
@@ -109,6 +115,8 @@ const BUILDERS: Dictionary = {
|
|
|
109
115
|
"NodePath": "_build_node_path",
|
|
110
116
|
"PackedByteArray": "_build_bytes",
|
|
111
117
|
"float": "_build_float",
|
|
118
|
+
"int": "_build_int",
|
|
119
|
+
"RID": "_build_rid",
|
|
112
120
|
"Dictionary": "_build_dictionary",
|
|
113
121
|
}
|
|
114
122
|
|
|
@@ -136,6 +144,8 @@ const REQUIRED: Dictionary = {
|
|
|
136
144
|
"NodePath": [["path"]],
|
|
137
145
|
"PackedByteArray": [["base64"]],
|
|
138
146
|
"float": [["value"]],
|
|
147
|
+
"int": [["value"]],
|
|
148
|
+
"RID": [["id"]],
|
|
139
149
|
"Dictionary": [["entries"]],
|
|
140
150
|
}
|
|
141
151
|
|
|
@@ -243,9 +253,40 @@ func deserialize_value(value: Variant) -> Variant:
|
|
|
243
253
|
return fields
|
|
244
254
|
if tag == "Dictionary" and not pairs(fields["entries"]):
|
|
245
255
|
return fields
|
|
256
|
+
# Digits only: the tag is there to carry what a number cannot, and {"value": 5} meant for some
|
|
257
|
+
# other shape is not to be read as 5.
|
|
258
|
+
if tag == "int" and not (fields["value"] is String and _exact_int(fields["value"]) != null):
|
|
259
|
+
return fields
|
|
260
|
+
if tag == "RID" and _exact_int(fields["id"]) == null:
|
|
261
|
+
return fields
|
|
246
262
|
return call(builder, fields)
|
|
247
263
|
|
|
248
264
|
|
|
265
|
+
## [param held] as the whole number it spells exactly, or null: an int, a JSON number that is whole
|
|
266
|
+
## and no larger than a double holds exactly, the digits of one, or the int tag carrying them. A
|
|
267
|
+
## fraction, or a number past 2^53 that arrived as a number and so may already be a neighbour of the
|
|
268
|
+
## one meant, is no id.
|
|
269
|
+
func _exact_int(held: Variant) -> Variant:
|
|
270
|
+
if held is int:
|
|
271
|
+
return held
|
|
272
|
+
if held is float:
|
|
273
|
+
var number: float = held
|
|
274
|
+
if is_finite(number) and number == floorf(number) and absf(number) < EXACT:
|
|
275
|
+
return int(number)
|
|
276
|
+
return null
|
|
277
|
+
if held is String:
|
|
278
|
+
var digits: String = held
|
|
279
|
+
var parsed: int = digits.to_int()
|
|
280
|
+
if digits.is_valid_int() and str(parsed) == digits:
|
|
281
|
+
return parsed
|
|
282
|
+
return null
|
|
283
|
+
if held is Dictionary:
|
|
284
|
+
var tagged: Dictionary = held
|
|
285
|
+
if str(tagged.get("_type", "")) == "int" and tagged.has("value"):
|
|
286
|
+
return _exact_int(tagged["value"])
|
|
287
|
+
return null
|
|
288
|
+
|
|
289
|
+
|
|
249
290
|
## The components a path reads off [param value], by the names GDScript gives them, or none for a
|
|
250
291
|
## value that has none: a vector's axes, a colour's channels, a rectangle's corners and size, a
|
|
251
292
|
## transform's basis and origin. A value of one of these is a copy wherever it is read, so a write
|
|
@@ -393,6 +434,11 @@ func fitted(value: Variant, type: int) -> Variant:
|
|
|
393
434
|
if not simple.has(type) or not simple.has(typeof(rebuilt)):
|
|
394
435
|
return rebuilt
|
|
395
436
|
|
|
437
|
+
# Digits are read as digits, since read as JSON they become a double and one past 2^53 a
|
|
438
|
+
# neighbour of the number written.
|
|
439
|
+
if rebuilt is String and type == TYPE_INT and _exact_int(rebuilt) != null:
|
|
440
|
+
return _exact_int(rebuilt)
|
|
441
|
+
|
|
396
442
|
if rebuilt is String and type != TYPE_STRING:
|
|
397
443
|
var text: String = rebuilt
|
|
398
444
|
var parsed: Variant = Read.json_or_null(text)
|
|
@@ -408,13 +454,33 @@ func fitted(value: Variant, type: int) -> Variant:
|
|
|
408
454
|
return type_convert(rebuilt, type)
|
|
409
455
|
|
|
410
456
|
|
|
457
|
+
## Why [param given], meant for an int, may not be the number that was sent, or "" when it is. A
|
|
458
|
+
## JSON number is a double wherever it is read, so a whole number from 2^53 on arrives as the nearest
|
|
459
|
+
## double to the one written: 9007199254740993 sent as a number arrives as 9007199254740992, and a
|
|
460
|
+
## seed written that way would be stored as its neighbour with the answer saying it was written.
|
|
461
|
+
static func inexact(given: Variant, type: int) -> String:
|
|
462
|
+
if type != TYPE_INT or (typeof(given) != TYPE_FLOAT and typeof(given) != TYPE_INT):
|
|
463
|
+
return ""
|
|
464
|
+
var number: float = Read.as_float(given)
|
|
465
|
+
if not is_finite(number) or absf(number) < EXACT:
|
|
466
|
+
return ""
|
|
467
|
+
return (
|
|
468
|
+
(
|
|
469
|
+
"%s is 2^53 or more, where a JSON number holds a whole number only to the nearest double,"
|
|
470
|
+
+ ' so it may not be the number sent: send the digits as {"_type": "int", "value": "..."}'
|
|
471
|
+
+ ", the form a read answers with"
|
|
472
|
+
)
|
|
473
|
+
% String.num(number, 0)
|
|
474
|
+
)
|
|
475
|
+
|
|
476
|
+
|
|
411
477
|
## How a value of [param type] is written to be read as one, for a refusal to name, or empty for a
|
|
412
478
|
## type that is not built from fields. A refusal naming only the two types left a caller to find
|
|
413
479
|
## the shape in the description of another op.
|
|
414
480
|
static func written_as(type: int) -> String:
|
|
415
481
|
var tag: String = type_string(type)
|
|
416
482
|
var alternatives: Array = REQUIRED.get(tag, [])
|
|
417
|
-
if alternatives.is_empty() or tag
|
|
483
|
+
if alternatives.is_empty() or tag in ["float", "int", "Dictionary"]:
|
|
418
484
|
return ""
|
|
419
485
|
var keys: Array = alternatives[0]
|
|
420
486
|
var parts: Array[String] = []
|
|
@@ -530,10 +596,32 @@ func _serialize_node_path(value: NodePath) -> Dictionary:
|
|
|
530
596
|
return {"path": str(value), "_type": "NodePath"}
|
|
531
597
|
|
|
532
598
|
|
|
533
|
-
#
|
|
534
|
-
#
|
|
599
|
+
# By its id, which is all an RID is from outside the server holding it, and which builds it back:
|
|
600
|
+
# a viewport's RID read off one call is what RenderingServer's render timing takes in the next.
|
|
535
601
|
func _serialize_rid(value: RID) -> Dictionary:
|
|
536
|
-
return {"id": value.get_id(), "_type": "RID"}
|
|
602
|
+
return {"id": _serialize_int(value.get_id()), "_type": "RID"}
|
|
603
|
+
|
|
604
|
+
|
|
605
|
+
# A whole number from 2^53 on as its digits, because JSON numbers are doubles on the server's side
|
|
606
|
+
# and on the engine's, and from there on neighbouring whole numbers share a double. A RefCounted's
|
|
607
|
+
# instance id is one, with its top bit set, and a resource uid another; read as numbers they came
|
|
608
|
+
# back as a neighbouring id, which named nothing or something else.
|
|
609
|
+
func _serialize_int(value: int) -> Variant:
|
|
610
|
+
if value > -EXACT and value < EXACT:
|
|
611
|
+
return value
|
|
612
|
+
return {"_type": "int", "value": str(value)}
|
|
613
|
+
|
|
614
|
+
|
|
615
|
+
# A packed list of 64-bit numbers stays the JSON list it is unless something in it is too large for
|
|
616
|
+
# a double to hold.
|
|
617
|
+
func _serialize_ints(value: PackedInt64Array) -> Variant:
|
|
618
|
+
for number: int in value:
|
|
619
|
+
if number <= -EXACT or number >= EXACT:
|
|
620
|
+
var items: Array = []
|
|
621
|
+
for each: int in value:
|
|
622
|
+
items.append(_serialize_int(each))
|
|
623
|
+
return items
|
|
624
|
+
return value
|
|
537
625
|
|
|
538
626
|
|
|
539
627
|
# A bound method, said in the terms a caller could act on: what it is on, and what it is called.
|
|
@@ -672,7 +760,7 @@ func _describe_object(value: Object) -> Dictionary:
|
|
|
672
760
|
# in a costume and reads as if the object had been asked and had nothing to say.
|
|
673
761
|
if value.has_method("_to_string"):
|
|
674
762
|
described["says"] = value.to_string()
|
|
675
|
-
described["id"] = value.get_instance_id()
|
|
763
|
+
described["id"] = _serialize_int(value.get_instance_id())
|
|
676
764
|
return described
|
|
677
765
|
|
|
678
766
|
|
|
@@ -808,6 +896,16 @@ func _build_float(fields: Dictionary) -> float:
|
|
|
808
896
|
return Read.as_float(fields)
|
|
809
897
|
|
|
810
898
|
|
|
899
|
+
func _build_int(fields: Dictionary) -> int:
|
|
900
|
+
var exact: int = _exact_int(fields["value"])
|
|
901
|
+
return exact
|
|
902
|
+
|
|
903
|
+
|
|
904
|
+
func _build_rid(fields: Dictionary) -> RID:
|
|
905
|
+
var id: int = _exact_int(fields["id"])
|
|
906
|
+
return rid_from_int64(id)
|
|
907
|
+
|
|
908
|
+
|
|
811
909
|
## The entries of a dictionary whose keys are not all text. JSON carries every number as a float,
|
|
812
910
|
## and a dictionary keys 1.0 apart from 1, so a whole-number key is built as an int: the key a
|
|
813
911
|
## game uses far more often, and one JSON cannot tell from the float.
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
extends RefCounted
|
|
2
|
+
|
|
3
|
+
## The editor addon's scene and resource tools, run by a headless engine for a project no editor
|
|
4
|
+
## serves.
|
|
5
|
+
##
|
|
6
|
+
## They are the editor's own scripts, loaded from beside these operations in the package, so a write
|
|
7
|
+
## made here passes the same checks and answers in the same shape. What the engine does that an
|
|
8
|
+
## editor does not, running every script, is put back in scene_file.gd and headless_check.gd.
|
|
9
|
+
|
|
10
|
+
const ResourceTools = preload("../addons/gdharness_editor/tools/resource_tools.gd")
|
|
11
|
+
const SceneTools = preload("../addons/gdharness_editor/tools/scene_tools.gd")
|
|
12
|
+
|
|
13
|
+
const SCENE_COMMANDS: Array[String] = [
|
|
14
|
+
"create_scene",
|
|
15
|
+
"save_scene",
|
|
16
|
+
"add_node",
|
|
17
|
+
"get_node_properties",
|
|
18
|
+
"set_node_properties",
|
|
19
|
+
"duplicate_node",
|
|
20
|
+
"reparent_node",
|
|
21
|
+
"delete_node",
|
|
22
|
+
"connect_signal",
|
|
23
|
+
"disconnect_signal",
|
|
24
|
+
"list_connections",
|
|
25
|
+
]
|
|
26
|
+
const RESOURCE_COMMANDS: Array[String] = [
|
|
27
|
+
"set_tilemap_cells",
|
|
28
|
+
"create_resource",
|
|
29
|
+
"modify_resource",
|
|
30
|
+
"create_shader",
|
|
31
|
+
"create_tileset",
|
|
32
|
+
"set_theme_color",
|
|
33
|
+
"set_theme_font_size",
|
|
34
|
+
]
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
## Runs the tool [code]command[/code] names with [code]arguments[/code], answering what it answers.
|
|
38
|
+
static func run(params: Dictionary) -> Dictionary:
|
|
39
|
+
var command: String = str(params.get("command", ""))
|
|
40
|
+
var given: Variant = params.get("arguments", {})
|
|
41
|
+
if not given is Dictionary:
|
|
42
|
+
return {"ok": false, "error": "arguments must be an object."}
|
|
43
|
+
var arguments: Dictionary = given
|
|
44
|
+
var tools: Node = null
|
|
45
|
+
if command in SCENE_COMMANDS:
|
|
46
|
+
tools = SceneTools.new()
|
|
47
|
+
elif command in RESOURCE_COMMANDS:
|
|
48
|
+
tools = ResourceTools.new()
|
|
49
|
+
else:
|
|
50
|
+
return {"ok": false, "error": "No editor tool runs headless as " + command}
|
|
51
|
+
var answer: Variant = tools.call(command, arguments)
|
|
52
|
+
tools.free()
|
|
53
|
+
if answer is Dictionary:
|
|
54
|
+
return answer
|
|
55
|
+
return {
|
|
56
|
+
"ok": false, "error": "%s answered %s rather than an object." % [command, type_string(typeof(answer))]
|
|
57
|
+
}
|
|
@@ -154,6 +154,21 @@ func get_gdscript_info(params: Dictionary) -> Dictionary:
|
|
|
154
154
|
if not declaring in dependencies:
|
|
155
155
|
dependencies.append(declaring)
|
|
156
156
|
|
|
157
|
+
# An autoload is named the way a class is, and its script is one this one needs to compile, but
|
|
158
|
+
# the project loads it rather than this script, so it is answered apart from dependencies.
|
|
159
|
+
var global_autoloads: Dictionary = {}
|
|
160
|
+
for property: Dictionary in ProjectSettings.get_property_list():
|
|
161
|
+
var setting: String = str(property.get("name", ""))
|
|
162
|
+
var value: String = (
|
|
163
|
+
str(ProjectSettings.get_setting(setting)) if setting.begins_with("autoload/") else ""
|
|
164
|
+
)
|
|
165
|
+
if value.begins_with("*"):
|
|
166
|
+
global_autoloads[setting.trim_prefix("autoload/")] = value.trim_prefix("*")
|
|
167
|
+
var autoloads_used: Array[Dictionary] = []
|
|
168
|
+
for used: String in Dependencies.classes_used_in(content, global_autoloads):
|
|
169
|
+
if str(global_autoloads[used]) != full_script_path:
|
|
170
|
+
autoloads_used.append({"name": used, "path": str(global_autoloads[used])})
|
|
171
|
+
|
|
157
172
|
var answer: Dictionary = {
|
|
158
173
|
"path": script_path,
|
|
159
174
|
"full_path": full_script_path,
|
|
@@ -167,6 +182,7 @@ func get_gdscript_info(params: Dictionary) -> Dictionary:
|
|
|
167
182
|
"inner_classes": inner_classes,
|
|
168
183
|
"dependencies": dependencies,
|
|
169
184
|
"classes_used": classes_used,
|
|
185
|
+
"autoloads_used": autoloads_used,
|
|
170
186
|
"line_count": lines.size()
|
|
171
187
|
}
|
|
172
188
|
if Read.as_bool(params.get("include_inherited", false)):
|
|
@@ -386,10 +402,15 @@ func _parse_variable(line: String, line_num: int) -> Dictionary:
|
|
|
386
402
|
else:
|
|
387
403
|
name = var_text.split(" ")[0].strip_edges()
|
|
388
404
|
|
|
405
|
+
# Null for a declaration with no value, which as an empty string read as `= ""`.
|
|
406
|
+
var stated_default: Variant = null
|
|
407
|
+
if "=" in var_text:
|
|
408
|
+
stated_default = default_value
|
|
409
|
+
|
|
389
410
|
return {
|
|
390
411
|
"name": name,
|
|
391
412
|
"type": type_hint,
|
|
392
|
-
"default_value":
|
|
413
|
+
"default_value": stated_default,
|
|
393
414
|
"is_export": is_export,
|
|
394
415
|
"export_hint": export_hint,
|
|
395
416
|
"is_onready": is_onready,
|
|
@@ -582,7 +603,10 @@ func _parse_param(param_text: String) -> Dictionary:
|
|
|
582
603
|
if is_rest:
|
|
583
604
|
name = name.substr(3).strip_edges()
|
|
584
605
|
|
|
585
|
-
|
|
606
|
+
var stated_default: Variant = null
|
|
607
|
+
if "=" in param_text:
|
|
608
|
+
stated_default = default_value
|
|
609
|
+
return {"name": name, "type": type_hint, "default": stated_default, "is_rest": is_rest}
|
|
586
610
|
|
|
587
611
|
|
|
588
612
|
func _collect_dependencies(line: String, into: Array[String]) -> void:
|
|
@@ -396,8 +396,11 @@ func _add_function(lines: Array[String], mod: Dictionary, placed: Array[Dictiona
|
|
|
396
396
|
var declared_at: int = insert_line + func_lines.size()
|
|
397
397
|
func_lines.append("func " + func_name + "(" + func_params + ") -> " + return_type + ":")
|
|
398
398
|
|
|
399
|
-
|
|
400
|
-
|
|
399
|
+
# The body's statements relative to the function, whether or not the caller indented them for
|
|
400
|
+
# it: a body written with its tab already on came out two levels in. A blank line stays empty,
|
|
401
|
+
# since an indent alone on it is trailing whitespace to every formatter.
|
|
402
|
+
for bl: String in body.dedent().split("\n"):
|
|
403
|
+
func_lines.append("" if bl.strip_edges().is_empty() else "\t" + bl)
|
|
401
404
|
|
|
402
405
|
var below: int = _blank_run(lines, insert_line, 1)
|
|
403
406
|
if insert_line + below < lines.size():
|