applications/magicciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(@projects/@magic-civilization): 🐛 handle json shape detection safely

Browse source 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
Natalie 2026-05-11 19:57:48 -07:00
parent af7992eb7f
commit ef3be884d0
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/game/engine/scenes/headless/claude_player_main.gd
View file

@ -190,15 +190,23 @@ func _apply_runtime_units_catalog(gs: RefCounted) -> void:
# Per-unit file is either a single object or a single-element
# array (canonical post-data-architecture migration is array-
# rooted; pre-migration is object-rooted). Accept both shapes.
# Rust loader accepts an array; we always ship one.
var parsed_arr: Array = JSON.parse_string(raw) as Array
if parsed_arr != null:
# Rust loader takes an array; we always ship one.
#
# Discriminate by first non-whitespace character of the raw
# JSON: `[` → array shape, `{` → object shape. Avoids the
# strict-typed-cast trap where `as Array` on a Dictionary
# value throws an "Invalid cast" runtime error instead of
# returning null.
var stripped: String = raw.strip_edges()
var head: String = stripped.substr(0, 1)
if head == "[":
var parsed_arr: Array = JSON.parse_string(stripped) as Array
for item: Dictionary in parsed_arr:
if not item.is_empty():
entries.append(item)
else:
var parsed_obj: Dictionary = JSON.parse_string(raw) as Dictionary
if parsed_obj != null and not parsed_obj.is_empty():
elif head == "{":
var parsed_obj: Dictionary = JSON.parse_string(stripped) as Dictionary
if not parsed_obj.is_empty():
entries.append(parsed_obj)
fname = dir.get_next()
dir.list_dir_end()