fix: exposed data types so they can be accessed via cpp calls externally (#82)

YermekG · web-flow · commit f03e62d5d477 · 2024-04-24T14:42:08.000+12:00
diff --git a/Source/Immutable/Immutable.Build.cs b/Source/Immutable/Immutable.Build.cs
@@ -34,6 +34,7 @@ public Immutable(ReadOnlyTargetRules Target) : base(Target)
             new string[]
             {
                 "Core",
+                "JsonUtilities",
 				// ... add other public dependencies that you statically link with here ...
 			}
         );
@@ -47,7 +48,6 @@ public Immutable(ReadOnlyTargetRules Target) : base(Target)
                 "Slate",
                 "SlateCore",
                 "Json",
-                "JsonUtilities",
                 "UMG",
                 "Projects", 
 				// ... add private dependencies that you statically link with here ...
diff --git a/Source/Immutable/Private/Immutable/ImmutablePassport.cpp b/Source/Immutable/Private/Immutable/ImmutablePassport.cpp
@@ -4,7 +4,7 @@
 
 #include "Immutable/Misc/ImtblLogging.h"
 #include "Immutable/ImmutableResponses.h"
-#include "ImtblJSConnector.h"
+#include "Immutable/ImtblJSConnector.h"
 #include "JsonObjectConverter.h"
 #include "Immutable/ImmutableSaveGame.h"
 #include "Kismet/GameplayStatics.h"
diff --git a/Source/Immutable/Private/Immutable/ImmutableRequests.cpp b/Source/Immutable/Private/Immutable/ImmutableRequests.cpp
@@ -8,6 +8,24 @@
 #include "Policies/CondensedJsonPrintPolicy.h"
 
 
+FString FImxTransferRequest::ToJsonString() const
+{
+	FString OutString;
+	FJsonObjectWrapper Wrapper;
+	Wrapper.JsonObject = MakeShared<FJsonObject>();
+	FJsonObjectConverter::UStructToJsonObject(StaticStruct(), this, Wrapper.JsonObject.ToSharedRef(), 0, 0);
+
+	if (!Wrapper.JsonObject.IsValid())
+	{
+		IMTBL_ERR("Could not convert FImxTransferRequest to JSON")
+		return "";
+	}
+
+	Wrapper.JsonObjectToString(OutString);
+	
+	return OutString;
+}
+
 FString FImxBatchNftTransferRequest::ToJsonString() const
 {
 	FString OutString;
diff --git a/Source/Immutable/Private/Immutable/ImmutableSubsystem.cpp b/Source/Immutable/Private/Immutable/ImmutableSubsystem.cpp
@@ -7,7 +7,7 @@
 #include "Immutable/Misc/ImtblLogging.h"
 #include "ImtblBlui.h"
 #include "ImtblBrowserUserWidget.h"
-#include "ImtblJSConnector.h"
+#include "Immutable/ImtblJSConnector.h"
 
 UImmutableSubsystem::UImmutableSubsystem() { IMTBL_LOG_FUNCSIG }
 
diff --git a/Source/Immutable/Private/Immutable/ImtblBlui.cpp b/Source/Immutable/Private/Immutable/ImtblBlui.cpp
@@ -3,7 +3,7 @@
 #include "ImtblBlui.h"
 #include "Immutable/Assets/ImtblSDKResource.h"
 #include "Immutable/Misc/ImtblLogging.h"
-#include "ImtblJSConnector.h"
+#include "Immutable/ImtblJSConnector.h"
 #include <utility>
 
 #if USING_BLUI_CEF
diff --git a/Source/Immutable/Private/Immutable/ImtblBrowserUserWidget.cpp b/Source/Immutable/Private/Immutable/ImtblBrowserUserWidget.cpp
@@ -10,7 +10,7 @@
 #include "Components/ScaleBoxSlot.h"
 #include "Immutable/Misc/ImtblLogging.h"
 #include "ImtblBrowserWidget.h"
-#include "ImtblJSConnector.h"
+#include "Immutable/ImtblJSConnector.h"
 
 TSharedRef<SWidget> UImtblBrowserUserWidget::RebuildWidget()
 {
diff --git a/Source/Immutable/Private/Immutable/ImtblBrowserWidget.cpp b/Source/Immutable/Private/Immutable/ImtblBrowserWidget.cpp
@@ -3,7 +3,7 @@
 #include "ImtblBrowserWidget.h"
 
 #include "Immutable/Misc/ImtblLogging.h"
-#include "ImtblJSConnector.h"
+#include "Immutable/ImtblJSConnector.h"
 #if USING_BUNDLED_CEF
 #include "SWebBrowser.h"
 #endif
diff --git a/Source/Immutable/Private/Immutable/ImtblJSConnector.cpp b/Source/Immutable/Private/Immutable/ImtblJSConnector.cpp
@@ -1,10 +1,10 @@
 ﻿// Fill out your copyright notice in the Description page of Project Settings.
 
-#include "ImtblJSConnector.h"
+#include "Immutable/ImtblJSConnector.h"
 
 #include "Immutable/Misc/ImtblLogging.h"
 #include "ImtblBrowserWidget.h"
-#include "ImtblJSMessages.h"
+#include "Immutable/ImtblJSMessages.h"
 
 UImtblJSConnector::UImtblJSConnector() { IMTBL_LOG_FUNCSIG }
 
diff --git a/Source/Immutable/Public/Immutable/ImmutableDataTypes.h b/Source/Immutable/Public/Immutable/ImmutableDataTypes.h
@@ -33,7 +33,7 @@ struct FImmutableEngineVersionData
 };
 
 USTRUCT()
-struct FImmutablePassportInitData
+struct IMMUTABLE_API FImmutablePassportInitData
 {
 	GENERATED_BODY()
 
@@ -104,7 +104,7 @@ struct FImmutablePassportZkEvmRequestAccountsData
 };
 
 USTRUCT()
-struct FImmutablePassportZkEvmGetBalanceData
+struct IMMUTABLE_API FImmutablePassportZkEvmGetBalanceData
 {
 	GENERATED_BODY()
 
@@ -145,7 +145,7 @@ struct FImmutablePassportConnectPKCEData
 };
 
 USTRUCT()
-struct FImmutablePassportResult
+struct IMMUTABLE_API FImmutablePassportResult
 {
 	GENERATED_BODY()
 
diff --git a/Source/Immutable/Public/Immutable/ImmutableRequests.h b/Source/Immutable/Public/Immutable/ImmutableRequests.h
@@ -5,7 +5,7 @@
 
 
 USTRUCT(BlueprintType)
-struct FImtblTransactionRequest
+struct IMMUTABLE_API FImtblTransactionRequest
 {
 	GENERATED_BODY()
 
@@ -20,7 +20,7 @@ struct FImtblTransactionRequest
 };
 
 USTRUCT()
-struct FImxTransferRequest
+struct IMMUTABLE_API FImxTransferRequest
 {
 	GENERATED_BODY()
 
@@ -43,7 +43,7 @@ struct FImxTransferRequest
 };
 
 USTRUCT()
-struct FImxBatchNftTransferRequest
+struct IMMUTABLE_API FImxBatchNftTransferRequest
 {
 	GENERATED_BODY()
 
diff --git a/Source/Immutable/Public/Immutable/ImtblJSConnector.h b/Source/Immutable/Public/Immutable/ImtblJSConnector.h
diff --git a/Source/Immutable/Public/Immutable/ImtblJSMessages.h b/Source/Immutable/Public/Immutable/ImtblJSMessages.h
@@ -25,7 +25,7 @@ enum class EImtblPassportError : int8
 };
 
 USTRUCT()
-struct FImtblResponseError
+struct IMMUTABLE_API FImtblResponseError
 {
 	GENERATED_BODY()
 
@@ -43,7 +43,7 @@ struct FImtblResponseError
 };
 
 USTRUCT()
-struct FImtblJSRequest
+struct IMMUTABLE_API FImtblJSRequest
 {
 	GENERATED_BODY()
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#include "Components/ScaleBoxSlot.h"`
`11`	`11`	`#include "Immutable/Misc/ImtblLogging.h"`
`12`	`12`	`#include "ImtblBrowserWidget.h"`
`13`		`-#include "ImtblJSConnector.h"`
	`13`	`+#include "Immutable/ImtblJSConnector.h"`
`14`	`14`
`15`	`15`	`TSharedRef<SWidget> UImtblBrowserUserWidget::RebuildWidget()`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ struct FImmutableEngineVersionData`
`33`	`33`	`};`
`34`	`34`
`35`	`35`	`USTRUCT()`
`36`		`-struct FImmutablePassportInitData`
	`36`	`+struct IMMUTABLE_API FImmutablePassportInitData`
`37`	`37`	`{`
`38`	`38`	`GENERATED_BODY()`
`39`	`39`
`@@ -104,7 +104,7 @@ struct FImmutablePassportZkEvmRequestAccountsData`
`104`	`104`	`};`
`105`	`105`
`106`	`106`	`USTRUCT()`
`107`		`-struct FImmutablePassportZkEvmGetBalanceData`
	`107`	`+struct IMMUTABLE_API FImmutablePassportZkEvmGetBalanceData`
`108`	`108`	`{`
`109`	`109`	`GENERATED_BODY()`
`110`	`110`
`@@ -145,7 +145,7 @@ struct FImmutablePassportConnectPKCEData`
`145`	`145`	`};`
`146`	`146`
`147`	`147`	`USTRUCT()`
`148`		`-struct FImmutablePassportResult`
	`148`	`+struct IMMUTABLE_API FImmutablePassportResult`
`149`	`149`	`{`
`150`	`150`	`GENERATED_BODY()`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`
`7`	`7`	`USTRUCT(BlueprintType)`
`8`		`-struct FImtblTransactionRequest`
	`8`	`+struct IMMUTABLE_API FImtblTransactionRequest`
`9`	`9`	`{`
`10`	`10`	`GENERATED_BODY()`
`11`	`11`
`@@ -20,7 +20,7 @@ struct FImtblTransactionRequest`
`20`	`20`	`};`
`21`	`21`
`22`	`22`	`USTRUCT()`
`23`		`-struct FImxTransferRequest`
	`23`	`+struct IMMUTABLE_API FImxTransferRequest`
`24`	`24`	`{`
`25`	`25`	`GENERATED_BODY()`
`26`	`26`
`@@ -43,7 +43,7 @@ struct FImxTransferRequest`
`43`	`43`	`};`
`44`	`44`
`45`	`45`	`USTRUCT()`
`46`		`-struct FImxBatchNftTransferRequest`
	`46`	`+struct IMMUTABLE_API FImxBatchNftTransferRequest`
`47`	`47`	`{`
`48`	`48`	`GENERATED_BODY()`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ enum class EImtblPassportError : int8`
`25`	`25`	`};`
`26`	`26`
`27`	`27`	`USTRUCT()`
`28`		`-struct FImtblResponseError`
	`28`	`+struct IMMUTABLE_API FImtblResponseError`
`29`	`29`	`{`
`30`	`30`	`GENERATED_BODY()`
`31`	`31`
`@@ -43,7 +43,7 @@ struct FImtblResponseError`
`43`	`43`	`};`
`44`	`44`
`45`	`45`	`USTRUCT()`
`46`		`-struct FImtblJSRequest`
	`46`	`+struct IMMUTABLE_API FImtblJSRequest`
`47`	`47`	`{`
`48`	`48`	`GENERATED_BODY()`
`49`	`49`