release 1.5.0

DataConfig/.gitignore

@@ -1,4 +1,5 @@
 /Resources/ClangTidy.lua*
+*.raddbg*
 
 # Visual Studio 2015 user specific files
 .vs/

DataConfig/Source/DataConfigCore/Private/DataConfig/Automation/DcAutomationUtils.cpp

@@ -77,10 +77,10 @@ FDcResult TestReadDatumEqual(const FDcPropertyDatum& LhsDatum, const FDcProperty
 			{
 				return DcOk();
 			}
-			case EDcDataEntry::Nil:
+			case EDcDataEntry::None:
 			{
-				DC_TRY(LhsReader.ReadNil());
-				DC_TRY(RhsReader.ReadNil());
+				DC_TRY(LhsReader.ReadNone());
+				DC_TRY(RhsReader.ReadNone());
 				break;
 			}
 			case EDcDataEntry::Bool:
@@ -232,6 +232,18 @@ FDcResult TestReadDatumEqual(const FDcPropertyDatum& LhsDatum, const FDcProperty
 				DC_TRY(RhsReader.ReadSetEnd());
 				break;
 			}
+			case EDcDataEntry::OptionalRoot:
+			{
+				DC_TRY(LhsReader.ReadOptionalRoot());
+				DC_TRY(RhsReader.ReadOptionalRoot());
+				break;
+			}
+			case EDcDataEntry::OptionalEnd:
+			{
+				DC_TRY(LhsReader.ReadOptionalEnd());
+				DC_TRY(RhsReader.ReadOptionalEnd());
+				break;
+			}
 			case EDcDataEntry::ObjectReference:
 			{
 				UObject* Lhs;

DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/DcDeserializerSetup.cpp

@@ -9,6 +9,10 @@
 #include "DataConfig/Deserialize/Handlers/MsgPack/DcMsgPackTransientDeserializers.h"
 #include "UObject/UnrealType.h"
 #include "UObject/TextProperty.h"
+#include "Misc/EngineVersionComparison.h"
+#if !UE_VERSION_OLDER_THAN(5, 4, 0)
+#include "UObject/PropertyOptional.h"
+#endif // !UE_VERSION_OLDER_THAN(5, 4, 0)
 
 void DcSetupJsonDeserializeHandlers(FDcDeserializer& Deserializer, EDcJsonDeserializeType Type)
 {
@@ -60,12 +64,16 @@ void DcSetupJsonDeserializeHandlers(FDcDeserializer& Deserializer, EDcJsonDeseri
 	//	Object
 	Deserializer.AddDirectHandler(FObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerObjectReferenceDeserialize));
 	Deserializer.AddDirectHandler(FClassProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerClassReferenceDeserialize));
-#if ENGINE_MAJOR_VERSION == 5
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 3
 	Deserializer.AddDirectHandler(FObjectPtrProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerObjectReferenceDeserialize));
 	Deserializer.AddDirectHandler(FClassPtrProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerClassReferenceDeserialize));
-#endif //ENGINE_MAJOR_VERSION == 5
+#endif //ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 3
 	Deserializer.AddDirectHandler(FWeakObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerWeakObjectReferenceDeserialize));
 
+#if !UE_VERSION_OLDER_THAN(5, 4, 0)
+	Deserializer.AddDirectHandler(FOptionalProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerOptionalDeserialize));
+#endif // !UE_VERSION_OLDER_THAN(5, 4, 0)
+
 	if (Type == EDcJsonDeserializeType::Default)
 	{
 		Deserializer.AddDirectHandler(FSoftObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerSoftObjectReferenceDeserialize));
@@ -99,9 +107,9 @@ void DcSetupPropertyPipeDeserializeHandlers(FDcDeserializer& Deserializer)
 	Deserializer.AddDirectHandler(UClass::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerClassDeserialize));
 
 	Deserializer.AddDirectHandler(FObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerClassDeserialize));
-#if ENGINE_MAJOR_VERSION == 5
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 3
 	Deserializer.AddDirectHandler(FObjectPtrProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerClassDeserialize));
-#endif //ENGINE_MAJOR_VERSION == 5
+#endif //ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 3
 
 	Deserializer.AddDirectHandler(UScriptStruct::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerStructDeserialize));
 	Deserializer.AddDirectHandler(FStructProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerStructDeserialize));
@@ -110,6 +118,10 @@ void DcSetupPropertyPipeDeserializeHandlers(FDcDeserializer& Deserializer)
 	Deserializer.AddDirectHandler(FSetProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerSetDeserialize));
 	Deserializer.AddDirectHandler(FMapProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerMapDeserialize));
 
+#if !UE_VERSION_OLDER_THAN(5, 4, 0)
+	Deserializer.AddDirectHandler(FOptionalProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerOptionalDeserialize));
+#endif // !UE_VERSION_OLDER_THAN(5, 4, 0)
+
 	DcPropertyUtils::VisitAllEffectivePropertyClass([&](FFieldClass* FieldClass) {
 		if (!Deserializer.FieldClassDeserializerMap.Contains(FieldClass))
 			Deserializer.AddDirectHandler(FieldClass, FDcDeserializeDelegate::CreateStatic(DcCommonHandlers::HandlerPipeScalarDeserialize));
@@ -136,6 +148,10 @@ void DcSetupMsgPackDeserializeHandlers(FDcDeserializer& Deserializer, EDcMsgPack
 	Deserializer.AddDirectHandler(FArrayProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerArrayDeserialize));
 	Deserializer.AddDirectHandler(FSetProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerArrayToSetDeserialize));
 	Deserializer.AddDirectHandler(FMapProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(DcMsgPackHandlers::HandlerMapDeserialize));
+
+#if !UE_VERSION_OLDER_THAN(5, 4, 0)
+	Deserializer.AddDirectHandler(FOptionalProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerOptionalDeserialize));
+#endif // !UE_VERSION_OLDER_THAN(5, 4, 0)
 
 	//	Struct
 	Deserializer.AddDirectHandler(UScriptStruct::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerMapToStructDeserialize));
@@ -168,10 +184,10 @@ void DcSetupMsgPackDeserializeHandlers(FDcDeserializer& Deserializer, EDcMsgPack
 		Deserializer.AddDirectHandler(FFieldPathProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerStringToFieldPathDeserialize));
 		Deserializer.AddDirectHandler(FObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerObjectReferenceDeserialize));
 		Deserializer.AddDirectHandler(FClassProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerClassReferenceDeserialize));
-#if ENGINE_MAJOR_VERSION == 5
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 3
 		Deserializer.AddDirectHandler(FObjectPtrProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerObjectReferenceDeserialize));
 		Deserializer.AddDirectHandler(FClassPtrProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerClassReferenceDeserialize));
-#endif //ENGINE_MAJOR_VERSION == 5
+#endif //ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 3
 
 		Deserializer.AddDirectHandler(FWeakObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerWeakObjectReferenceDeserialize));
 
@@ -195,10 +211,10 @@ void DcSetupMsgPackDeserializeHandlers(FDcDeserializer& Deserializer, EDcMsgPack
 		Deserializer.AddDirectHandler(FTextProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerTransientTextDeserialize));
 		Deserializer.AddDirectHandler(FObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerTransientObjectDeserialize));
 		Deserializer.AddDirectHandler(FClassProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerTransientClassDeserialize));
-#if ENGINE_MAJOR_VERSION == 5
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 3
 		Deserializer.AddDirectHandler(FObjectPtrProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerTransientObjectDeserialize));
 		Deserializer.AddDirectHandler(FClassPtrProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerTransientClassDeserialize));
-#endif //ENGINE_MAJOR_VERSION == 5
+#endif //ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION <= 3
 		Deserializer.AddDirectHandler(FSoftObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerTransientSoftObjectDeserialize));
 		Deserializer.AddDirectHandler(FSoftClassProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerTransientSoftClassDeserialize));
 		Deserializer.AddDirectHandler(FWeakObjectProperty::StaticClass(), FDcDeserializeDelegate::CreateStatic(HandlerTransientWeakObjectDeserialize));

DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/Common/DcCommonDeserializers.cpp

@@ -317,6 +317,25 @@ FDcResult HandlerMapOrArrayOfKeyValueDeserialize(FDcDeserializeContext& Ctx)
 	return DcOk();
 }
 
+FDcResult HandlerOptionalDeserialize(FDcDeserializeContext& Ctx)
+{
+	DC_TRY(Ctx.Writer->WriteOptionalRoot());
+
+	EDcDataEntry Next;
+	DC_TRY(Ctx.Reader->PeekRead(&Next));
+	if (Next == EDcDataEntry::None)
+	{
+		DC_TRY(Ctx.Reader->ReadNone());
+		DC_TRY(Ctx.Writer->WriteNone());
+	}
+	else
+	{
+		DC_TRY(DcDeserializeUtils::RecursiveDeserialize(Ctx));
+	}
+
+	DC_TRY(Ctx.Writer->WriteOptionalEnd());
+	return DcOk();
+}
 
 } // namespace DcCommonHandlers
 

DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/MsgPack/DcMsgPackTransientDeserializers.cpp

@@ -26,14 +26,14 @@ static FORCEINLINE_DEBUGGABLE FDcResult ReadPointerRaw(FDcReader* Reader, void*&
 	return DcOk();
 }
 
-static FORCEINLINE_DEBUGGABLE FDcResult ReadPointerOrNil(FDcReader* Reader, void*& OutPtr)
+static FORCEINLINE_DEBUGGABLE FDcResult ReadPointerOrNone(FDcReader* Reader, void*& OutPtr)
 {
 	EDcDataEntry Next;
 	DC_TRY(Reader->PeekRead(&Next));
 
-	if (Next == EDcDataEntry::Nil)
+	if (Next == EDcDataEntry::None)
 	{
-		DC_TRY(Reader->ReadNil());
+		DC_TRY(Reader->ReadNone());
 		OutPtr = nullptr;
 	}
 #if PLATFORM_64BITS
@@ -44,7 +44,7 @@ static FORCEINLINE_DEBUGGABLE FDcResult ReadPointerOrNil(FDcReader* Reader, void
 	else
 	{
 		return DC_FAIL(DcDReadWrite, DataTypeMismatch2)
-			<< EDcDataEntry::Nil << EDcDataEntry::UInt64 << Next;
+			<< EDcDataEntry::None << EDcDataEntry::UInt64 << Next;
 	}
 #else
 	else if (Next == EDcDataEntry::UInt32)
@@ -54,7 +54,7 @@ static FORCEINLINE_DEBUGGABLE FDcResult ReadPointerOrNil(FDcReader* Reader, void
 	else
 	{
 		return DC_FAIL(DcDReadWrite, DataTypeMismatch2)
-			<< EDcDataEntry::Nil << EDcDataEntry::UInt32 << Next;
+			<< EDcDataEntry::None << EDcDataEntry::UInt32 << Next;
 	}
 #endif
 
@@ -192,14 +192,14 @@ FDcResult HandlerTransientTextDeserialize(FDcDeserializeContext& Ctx)
 
 FDcResult HandlerTransientObjectDeserialize(FDcDeserializeContext& Ctx)
 {
-	FDcClassAccess Access{FDcClassAccess::EControl::ReferenceOrNil};
+	FDcClassAccess Access{FDcClassAccess::EControl::ReferenceOrNone};
 	DC_TRY(Ctx.Writer->WriteClassRootAccess(Access));
 
 	void* Ptr;
-	DC_TRY(DcMsgPackHandlersDetails::ReadPointerOrNil(Ctx.Reader, Ptr));
+	DC_TRY(DcMsgPackHandlersDetails::ReadPointerOrNone(Ctx.Reader, Ptr));
 	if (Ptr == nullptr)
 	{
-		DC_TRY(Ctx.Writer->WriteNil());
+		DC_TRY(Ctx.Writer->WriteNone());
 	}
 	else
 	{
@@ -214,7 +214,7 @@ FDcResult HandlerTransientObjectDeserialize(FDcDeserializeContext& Ctx)
 FDcResult HandlerTransientClassDeserialize(FDcDeserializeContext& Ctx)
 {
 	void* Ptr;
-	DC_TRY(DcMsgPackHandlersDetails::ReadPointerOrNil(Ctx.Reader, Ptr));
+	DC_TRY(DcMsgPackHandlersDetails::ReadPointerOrNone(Ctx.Reader, Ptr));
 	DC_TRY(DcPropertyUtils::HeuristicVerifyPointer(Ptr));
 	DC_TRY(Ctx.Writer->WriteClassReference((UClass*)Ptr));
 

DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/Property/DcPropertyPipeDeserializers.cpp

@@ -52,6 +52,16 @@ FDcResult HandlerClassDeserialize(FDcDeserializeContext& Ctx)
 	>(Ctx);
 }
 
+FDcResult HandlerOptionalDeserialize(FDcDeserializeContext& Ctx)
+{
+	return DcHandlerPipeOptional<
+		FDcDeserializeContext,
+		FDcReader,
+		FDcPropertyWriter,
+		&DcDeserializeUtils::RecursiveDeserialize
+	>(Ctx);
+}
+
 } // namespace DcPropertyPipeHandlers
 
 

DataConfig/Source/DataConfigCore/Private/DataConfig/Diagnostic/DcDiagnostic.cpp

@@ -59,7 +59,7 @@ FStringFormatArg DcConvertArg(FDcDataVariant& Var)
 	{
 		return FStringFormatArg(Var.GetValue<bool>());
 	}
-	else if (Var.DataType == EDcDataEntry::Nil)
+	else if (Var.DataType == EDcDataEntry::None)
 	{
 		return FStringFormatArg(TEXT("<null>"));
 	}

DataConfig/Source/DataConfigCore/Private/DataConfig/Diagnostic/DcDiagnosticReadWrite.cpp

@@ -34,7 +34,8 @@ static FDcDiagnosticDetail _ReadWriteDetails[] = {
 	{ ReaderCastExpect, TEXT("Reader cast failed. Expected '{0}, Actual '{1}'") },
 	{ WriterCastExpect, TEXT("Writer cast failed. Expected '{0}, Actual '{1}'") },
 	{ PeekNoContainerProperty, TEXT("Property Reader/Writer has no container property, Actual: '{0}'"), },
-	{ WriteObjectReferenceDoNotAcceptNull, TEXT("FPropertyWriter::WriteObjectReference() don't accept nullptr. You should use WriteNil() instead."), },
+	{ PropertyNotSupportedUEVersion, TEXT("Property not supported by this Unreal Engine version: '{0}'"), },
+	{ WriteObjectReferenceDoNotAcceptNull, TEXT("FPropertyWriter::WriteObjectReference() don't accept nullptr. You should use WriteNone() instead."), },
 
 	//	putback reader
 	{ CantUsePutbackValue, TEXT("Cannot use putback value in '{0}'") },

DataConfig/Source/DataConfigCore/Private/DataConfig/Json/DcJsonReader.cpp

@@ -126,21 +126,21 @@ static FORCEINLINE EDcDataEntry TokenTypeToDataEntry(ETokenType TokenType)
 {
 	static EDcDataEntry _Mapping[(int)ETokenType::_Count] = {
 		EDcDataEntry::Ended,
-		EDcDataEntry::Nil,
+		EDcDataEntry::None,
 		EDcDataEntry::MapRoot,
 		EDcDataEntry::MapEnd,
 		EDcDataEntry::ArrayRoot,
 		EDcDataEntry::ArrayEnd,
-		EDcDataEntry::Nil,
+		EDcDataEntry::None,
 		EDcDataEntry::String,
 		EDcDataEntry::Double,
 		EDcDataEntry::Bool,
 		EDcDataEntry::Bool,
-		EDcDataEntry::Nil,
+		EDcDataEntry::None,
 
-		EDcDataEntry::Nil,
-		EDcDataEntry::Nil,
-		EDcDataEntry::Nil,
+		EDcDataEntry::None,
+		EDcDataEntry::None,
+		EDcDataEntry::None,
 	};
 
 	return _Mapping[(int)TokenType];
@@ -377,9 +377,9 @@ FDcResult TDcJsonReader<CharType>::PeekRead(EDcDataEntry* OutPtr)
 }
 
 template<typename CharType>
-FDcResult TDcJsonReader<CharType>::ReadNil()
+FDcResult TDcJsonReader<CharType>::ReadNone()
 {
-	DC_TRY(CheckConsumeToken(EDcDataEntry::Nil));
+	DC_TRY(CheckConsumeToken(EDcDataEntry::None));
 	if (Token.Type == ETokenType::Null)
 	{
 		DC_TRY(CheckNotObjectKey());
@@ -389,7 +389,7 @@ FDcResult TDcJsonReader<CharType>::ReadNil()
 	else
 	{
 		return DC_FAIL(DcDJSON, ReadTypeMismatch)
-			<< EDcDataEntry::Nil << FDcJsonReaderDetails<CharType>::TokenTypeToDataEntry(Token.Type)
+			<< EDcDataEntry::None << FDcJsonReaderDetails<CharType>::TokenTypeToDataEntry(Token.Type)
 			<< FormatHighlight(Token.Ref);
 	}
 }

DataConfig/Source/DataConfigCore/Private/DataConfig/Json/DcJsonWriter.cpp

@@ -20,7 +20,7 @@ FORCEINLINE bool IsValidWriteScalar(EDcDataEntry Entry)
 {
 	switch (Entry)
 	{
-		case EDcDataEntry::Nil:
+		case EDcDataEntry::None:
 		case EDcDataEntry::Bool:
 		case EDcDataEntry::Name:
 		case EDcDataEntry::String:
@@ -345,7 +345,7 @@ TDcJsonWriter<CharType>::TDcJsonWriter(ConfigType InConfig)
 }
 
 template<typename CharType>
-FDcResult TDcJsonWriter<CharType>::WriteNil()
+FDcResult TDcJsonWriter<CharType>::WriteNone()
 {
 	using Details = FDcJsonWriterDetails<CharType>;