@ringozz/react-godot 4.7.2-570 → 4.7.2-583

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ringozz/react-godot",
   "author": "Vladimir Davidovich",
-  "version": "4.7.2-570",
+  "version": "4.7.2-583",
   "description": "A React renderer for Godot Engine via @ringozz/godot",
   "publishConfig": {
     "access": "public"
@@ -23,7 +23,7 @@
     "*.md"
   ],
   "dependencies": {
-    "@ringozz/godot": "^4.7.2-570",
+    "@ringozz/godot": "^4.7.2-583",
     "@types/react-reconciler": "^0.33.0",
     "react-reconciler": "^0.33.0"
   },

package/src/react-types.ts

@@ -4,7 +4,7 @@
 
 import type React from 'react';
 import type { Object } from '@ringozz/godot/Object';
-import type { Signal, ValueTypes } from '@ringozz/godot';
+import type { Signal, ValueTypes, GodotDictionary } from '@ringozz/godot';
 import type { PackedScene } from '@ringozz/godot/PackedScene';
 
 // Identity check sensitive to readonly (deferred-conditional trick; the
@@ -37,15 +37,33 @@ type SettableKey<T, K extends keyof T> =
     ? (T[K] extends Function ? never : K)
     : never;
 
-// JSX props are settable instance members, typed as the setter accepts them:
-// ValueTypes also accept JSX arrays, and signals (getter `Signal<CB>`, setter
-// `CB | null`) take the callback directly. Maps over `keyof T` (homomorphic)
-// so optional/readonly modifiers survive.
+// Container props accept plain JS forms: JSX values flow through
+// `Instance.assign` (`napi_to_variant_typed`), which builds packed arrays,
+// Godot `Array`s, and `Dictionary`s from JS arrays/objects. Only gen heap
+// containers (10 packed + `GodotArray` + `GodotDictionary`) implement
+// `Iterable`, so that is the gate; `get(index: number)` recovers the concrete
+// element type (packed class getters return it even though the class generic
+// defaults to `any`). Scalar-packed -> `number[]`/`string[]`; element-packed
+// -> `(E | number[])[]` (instances or value-type tuples); `GodotArray<E>` ->
+// `(E | number[])[]`; `GodotDictionary<K,V>` -> `Record<string, V>`.
+type ContainerForm<T> =
+    T extends GodotDictionary<any, infer V> ? Record<string, V>
+    : T extends { get(index: number): infer E } ? (E extends number | string ? E[] : (E | number[])[])
+    : T extends Iterable<infer E> ? E[]
+    : never;
+
+// JSX props are settable instance members, typed as the reconciler's
+// `Instance.assign` accepts them: ValueTypes also accept JSX arrays, signals
+// (getter `Signal<CB>`, setter `CB | null`) take the callback directly, and
+// containers accept plain JS arrays/objects. Maps over `keyof T`
+// (homomorphic) so optional/readonly modifiers survive.
 type Properties<T> = {
-  [K in keyof T as SettableKey<T, K>]:
-    T[K] extends ValueTypes ? T[K] | number[]
-    : T[K] extends Signal<infer CB> ? CB | null
-    : T[K];
+    [K in keyof T as SettableKey<T, K>]:
+        T[K] extends ValueTypes ? T[K] | number[]
+        : T[K] extends Signal<infer CB> ? CB | null
+        : T[K] extends GodotDictionary<any, any> ? T[K] | ContainerForm<T[K]>
+        : T[K] extends Iterable<unknown> ? T[K] | ContainerForm<T[K]>
+        : T[K];
 };
 
 export type ComponentProps<T extends GodotConstructor, P extends Instance = InstanceType<T>> =