Add multi-module support for Unreal codgen

crates/cli/src/subcommands/generate.rs

@@ -25,7 +25,7 @@ use std::io::Read;
 pub fn cli() -> clap::Command {
     clap::Command::new("generate")
         .about("Generate client files for a spacetime module.")
-        .override_usage("spacetime generate --lang <LANG> --out-dir <DIR> [--project-path <DIR> | --bin-path <PATH> | --module-name <MODULE_NAME> | --uproject-dir <DIR>]")
+        .override_usage("spacetime generate --lang <LANG> --out-dir <DIR> [--project-path <DIR> | --bin-path <PATH> | --module-name <MODULE_NAME> | --uproject-dir <DIR> | --module-prefix <PREFIX>]")
         .arg(
             Arg::new("wasm_file")
                 .value_parser(clap::value_parser!(PathBuf))
@@ -93,6 +93,11 @@ pub fn cli() -> clap::Command {
                 .help("The module name that should be used for DLL export macros (required for lang unrealcpp)")
                 .required_if_eq("lang", "unrealcpp")
         )
+        .arg(
+            Arg::new("module_prefix")
+                .long("module-prefix")
+                .help("The module prefix to use for generated types (only used with --lang unrealcpp)")
+        )
         .arg(
             Arg::new("lang")
                 .required(true)
@@ -135,6 +140,7 @@ pub async fn exec_ex(
     let lang = *args.get_one::<Language>("lang").unwrap();
     let namespace = args.get_one::<String>("namespace").unwrap();
     let module_name = args.get_one::<String>("module_name");
+    let module_prefix = args.get_one::<String>("module_prefix");
     let force = args.get_flag("force");
     let build_options = args.get_one::<String>("build_options").unwrap();
 
@@ -186,6 +192,7 @@ pub async fn exec_ex(
             unreal_cpp_lang = UnrealCpp {
                 module_name: module_name.as_ref().unwrap(),
                 uproject_dir: out_dir,
+                module_prefix: module_prefix.as_ref().map(|s| s.as_str()).unwrap_or(""),
             };
             &unreal_cpp_lang as &dyn Lang
         }

crates/codegen/Cargo.toml

@@ -15,6 +15,7 @@ spacetimedb-schema.workspace = true
 anyhow.workspace = true
 convert_case.workspace = true
 itertools.workspace = true
+serde_json.workspace = true
 
 [dev-dependencies]
 fs-err.workspace = true

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Optionals/TestClientOptionalInt32.g.h

@@ -15,7 +15,7 @@ struct TESTCLIENT_API FTestClientOptionalInt32
     bool bHasValue = false;
 
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "SpacetimeDB", meta = (EditCondition = "bHasValue"))
-    int32 Value;
+    int32 Value = 0;
 
     FTestClientOptionalInt32() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Optionals/TestClientOptionalSimpleEnum.g.h

@@ -16,7 +16,7 @@ struct TESTCLIENT_API FTestClientOptionalSimpleEnum
     bool bHasValue = false;
 
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "SpacetimeDB", meta = (EditCondition = "bHasValue"))
-    ESimpleEnumType Value;
+    ESimpleEnumType Value = static_cast<ESimpleEnumType>(0);
 
     FTestClientOptionalSimpleEnum() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Optionals/TestClientOptionalVecOptionalInt32.g.h

@@ -4,6 +4,7 @@
 #pragma once
 #include "CoreMinimal.h"
 #include "BSATN/UESpacetimeDB.h"
+#include "ModuleBindings/Optionals/TestClientOptionalInt32.g.h"
 #include "TestClientOptionalVecOptionalInt32.g.generated.h"
 
 USTRUCT(BlueprintType)

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteLargeTable.g.h

@@ -21,16 +21,16 @@ struct TESTCLIENT_API FDeleteLargeTableArgs
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    uint8 A;
+    uint8 A = 0;
 
     // NOTE: uint16 field not exposed to Blueprint due to non-blueprintable elements
-    uint16 B;
+    uint16 B = 0;
 
     // NOTE: uint32 field not exposed to Blueprint due to non-blueprintable elements
-    uint32 C;
+    uint32 C = 0;
 
     // NOTE: uint64 field not exposed to Blueprint due to non-blueprintable elements
-    uint64 D;
+    uint64 D = 0;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
     FSpacetimeDBUInt128 E;
@@ -39,16 +39,16 @@ struct TESTCLIENT_API FDeleteLargeTableArgs
     FSpacetimeDBUInt256 F;
 
     // NOTE: int8 field not exposed to Blueprint due to non-blueprintable elements
-    int8 G;
+    int8 G = 0;
 
     // NOTE: int16 field not exposed to Blueprint due to non-blueprintable elements
-    int16 H;
+    int16 H = 0;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int32 I;
+    int32 I = 0;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int64 J;
+    int64 J = 0;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
     FSpacetimeDBInt128 K;
@@ -57,19 +57,19 @@ struct TESTCLIENT_API FDeleteLargeTableArgs
     FSpacetimeDBInt256 L;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    bool M;
+    bool M = false;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    float N;
+    float N = 0.0f;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    double O;
+    double O = 0.0;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
     FString P;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    ESimpleEnumType Q;
+    ESimpleEnumType Q = static_cast<ESimpleEnumType>(0);
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
     FEnumWithPayloadType R;

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkBool.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkBoolArgs
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    bool B;
+    bool B = false;
 
     FDeletePkBoolArgs() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkI16.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkI16Args
     GENERATED_BODY()
 
     // NOTE: int16 field not exposed to Blueprint due to non-blueprintable elements
-    int16 N;
+    int16 N = 0;
 
     FDeletePkI16Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkI32.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkI32Args
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int32 N;
+    int32 N = 0;
 
     FDeletePkI32Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkI64.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkI64Args
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int64 N;
+    int64 N = 0;
 
     FDeletePkI64Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkI8.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkI8Args
     GENERATED_BODY()
 
     // NOTE: int8 field not exposed to Blueprint due to non-blueprintable elements
-    int8 N;
+    int8 N = 0;
 
     FDeletePkI8Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkU16.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkU16Args
     GENERATED_BODY()
 
     // NOTE: uint16 field not exposed to Blueprint due to non-blueprintable elements
-    uint16 N;
+    uint16 N = 0;
 
     FDeletePkU16Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkU32.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkU32Args
     GENERATED_BODY()
 
     // NOTE: uint32 field not exposed to Blueprint due to non-blueprintable elements
-    uint32 N;
+    uint32 N = 0;
 
     FDeletePkU32Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkU32InsertPkU32Two.g.h

@@ -14,10 +14,10 @@ struct TESTCLIENT_API FDeletePkU32InsertPkU32TwoArgs
     GENERATED_BODY()
 
     // NOTE: uint32 field not exposed to Blueprint due to non-blueprintable elements
-    uint32 N;
+    uint32 N = 0;
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int32 Data;
+    int32 Data = 0;
 
     FDeletePkU32InsertPkU32TwoArgs() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkU32Two.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkU32TwoArgs
     GENERATED_BODY()
 
     // NOTE: uint32 field not exposed to Blueprint due to non-blueprintable elements
-    uint32 N;
+    uint32 N = 0;
 
     FDeletePkU32TwoArgs() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkU64.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkU64Args
     GENERATED_BODY()
 
     // NOTE: uint64 field not exposed to Blueprint due to non-blueprintable elements
-    uint64 N;
+    uint64 N = 0;
 
     FDeletePkU64Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeletePkU8.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeletePkU8Args
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    uint8 N;
+    uint8 N = 0;
 
     FDeletePkU8Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueBool.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueBoolArgs
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    bool B;
+    bool B = false;
 
     FDeleteUniqueBoolArgs() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueI16.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueI16Args
     GENERATED_BODY()
 
     // NOTE: int16 field not exposed to Blueprint due to non-blueprintable elements
-    int16 N;
+    int16 N = 0;
 
     FDeleteUniqueI16Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueI32.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueI32Args
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int32 N;
+    int32 N = 0;
 
     FDeleteUniqueI32Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueI64.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueI64Args
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int64 N;
+    int64 N = 0;
 
     FDeleteUniqueI64Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueI8.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueI8Args
     GENERATED_BODY()
 
     // NOTE: int8 field not exposed to Blueprint due to non-blueprintable elements
-    int8 N;
+    int8 N = 0;
 
     FDeleteUniqueI8Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueU16.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueU16Args
     GENERATED_BODY()
 
     // NOTE: uint16 field not exposed to Blueprint due to non-blueprintable elements
-    uint16 N;
+    uint16 N = 0;
 
     FDeleteUniqueU16Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueU32.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueU32Args
     GENERATED_BODY()
 
     // NOTE: uint32 field not exposed to Blueprint due to non-blueprintable elements
-    uint32 N;
+    uint32 N = 0;
 
     FDeleteUniqueU32Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueU64.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueU64Args
     GENERATED_BODY()
 
     // NOTE: uint64 field not exposed to Blueprint due to non-blueprintable elements
-    uint64 N;
+    uint64 N = 0;
 
     FDeleteUniqueU64Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/DeleteUniqueU8.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FDeleteUniqueU8Args
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    uint8 N;
+    uint8 N = 0;
 
     FDeleteUniqueU8Args() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/InsertCallerPkConnectionId.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FInsertCallerPkConnectionIdArgs
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int32 Data;
+    int32 Data = 0;
 
     FInsertCallerPkConnectionIdArgs() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/InsertCallerPkIdentity.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FInsertCallerPkIdentityArgs
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int32 Data;
+    int32 Data = 0;
 
     FInsertCallerPkIdentityArgs() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/InsertCallerUniqueConnectionId.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FInsertCallerUniqueConnectionIdArgs
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int32 Data;
+    int32 Data = 0;
 
     FInsertCallerUniqueConnectionIdArgs() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/InsertCallerUniqueIdentity.g.h

@@ -14,7 +14,7 @@ struct TESTCLIENT_API FInsertCallerUniqueIdentityArgs
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    int32 Data;
+    int32 Data = 0;
 
     FInsertCallerUniqueIdentityArgs() = default;
 

sdks/unreal/tests/TestClient/Source/TestClient/Public/ModuleBindings/Reducers/InsertIntoIndexedSimpleEnum.g.h

@@ -15,7 +15,7 @@ struct TESTCLIENT_API FInsertIntoIndexedSimpleEnumArgs
     GENERATED_BODY()
 
     UPROPERTY(BlueprintReadWrite, Category="SpacetimeDB")
-    ESimpleEnumType N;
+    ESimpleEnumType N = static_cast<ESimpleEnumType>(0);
 
     FInsertIntoIndexedSimpleEnumArgs() = default;