release 1.3.0

Author: jagt

DataConfig/DataConfig.uplugin

@@ -36,6 +36,10 @@
 		{
 			"Name": "GameplayAbilities",
 			"Enabled": true
+		},
+		{
+			"Name": "SQLiteCore",
+			"Enabled": true
 		}
 	]
 }

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

@@ -25,6 +25,12 @@ struct FDcAutomationFeedbackContext : public FFeedbackContextAnsi
 	}
 };
 
+FString FDcAutomationBase::CheckUniqueName(const FString& InName)
+{
+	check(!FAutomationTestFramework::Get().ContainsTest(InName));
+	return InName;
+}
+
 uint32 FDcAutomationBase::GetTestFlags() const
 {
 	return FLAGS;
@@ -157,7 +163,7 @@ void FDcAutomationConsoleRunner::Prepare(const FArgs& Args)
 	TArray<FAutomationTestInfo> TestInfos;
 	Framework.GetValidTestNames(TestInfos);
 
-	TestInfos.RemoveAll([&Args](FAutomationTestInfo& TestInfo) {
+	TestInfos.RemoveAllSwap([&Args](FAutomationTestInfo& TestInfo) {
 		for (const FString& Filter : Args.Filters)
 			if (!TestInfo.GetDisplayName().Contains(Filter, ESearchCase::IgnoreCase))
 				return true;

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

@@ -7,6 +7,7 @@
 #include "DataConfig/Misc/DcPipeVisitor.h"
 #include "DataConfig/Diagnostic/DcDiagnosticReadWrite.h"
 #include "DataConfig/DcCorePrivate.h"
+#include "DataConfig/Source/DcSourceUtils.h"
 
 namespace DcAutomationUtils
 {
@@ -690,8 +691,8 @@ int DebugGetEnumPropertyIndex(const FDcPropertyDatum& Datum, const FName& Name)
 	FFieldVariant EnumProperty = PropertyAccessUtil::FindPropertyByName(Name, Struct);
 	UEnum* Enum = nullptr;
 	FNumericProperty* UnderlyingProperty = nullptr;
-	FDcResult Result = DcPropertyUtils::GetEnumProperty(EnumProperty, Enum, UnderlyingProperty);
-	if (!Result.Ok()
+	bool bIsEnum = DcPropertyUtils::IsEnumAndTryUnwrapEnum(EnumProperty, Enum, UnderlyingProperty);
+	if (!bIsEnum	
 		|| Enum == nullptr
 		|| UnderlyingProperty == nullptr)
 		return INDEX_NONE;
@@ -745,6 +746,7 @@ FDcResult DeserializeFrom(FDcReader* Reader, FDcPropertyDatum Datum,
 	Ctx.Reader = Reader;
 	Ctx.Writer = &Writer;
 	Ctx.Deserializer = &Deserializer;
+	Ctx.Properties.Add(Datum.Property);
 	Func(Ctx);
 	DC_TRY(Ctx.Prepare());
 
@@ -753,7 +755,6 @@ FDcResult DeserializeFrom(FDcReader* Reader, FDcPropertyDatum Datum,
 
 FDcResult SerializeInto(FDcWriter* Writer, FDcPropertyDatum Datum,
 	TFunctionRef<void(FDcSerializeContext&)> Func, EDefaultSetupType SetupType)
-{
 {
 	FDcSerializer Serializer;
 	if (SetupType == EDefaultSetupType::SetupJSONHandlers)
@@ -770,14 +771,89 @@ FDcResult SerializeInto(FDcWriter* Writer, FDcPropertyDatum Datum,
 	Ctx.Reader = &Reader;
 	Ctx.Writer = Writer;
 	Ctx.Serializer = &Serializer;
+	Ctx.Properties.Add(Datum.Property);
 	Func(Ctx);
 	DC_TRY(Ctx.Prepare());
 
 	return Serializer.Serialize(Ctx);
 }
 
-}
+//	Trim and reindent a string literal to the first non empty indent level
+FString DcReindentStringLiteral(FString Str, FString* Prefix)
+{
+	TArray<FString> Lines;
+	Str.ParseIntoArrayLines(Lines);
+
+	int MinIndent = TNumericLimits<int>::Max();
+
+	auto _IsWhitespaceLine = [](const FString& Str)
+	{
+		for (TCHAR Ch : Str)
+		{
+			if (!FChar::IsWhitespace(Ch))
+				return false;
+		}
+
+		return true;
+	};
 
+	int LineCount = Lines.Num();
+	int FirstNonEmptyIx = 0;
+	int LastNonEmptyIx = LineCount;
+	{
+		for (int Ix = 0; Ix < LineCount; Ix++)
+		{
+			if (!_IsWhitespaceLine(Lines[Ix]))
+			{
+				FirstNonEmptyIx = Ix;
+				break;
+			}
+		}
+
+		for (int Ix = 0; Ix < LineCount; Ix++)
+		{
+			if (!_IsWhitespaceLine(Lines[LineCount- Ix - 1]))
+			{
+				LastNonEmptyIx = LineCount-Ix;
+				break;
+			}
+		}
+	}
+
+	TDcCSourceUtils<TCHAR>::StringBuilder Sb;
+	{
+		for (int Ix = FirstNonEmptyIx; Ix < LastNonEmptyIx; Ix++)
+		{
+			FString& Line = Lines[Ix];
+
+			Line.ConvertTabsToSpacesInline(4);
+			Line.TrimEndInline();
+			int Spaces = 0;
+			for (TCHAR Char : Line)
+			{
+				if (Char == ' ')
+					Spaces++;
+				else
+					break;
+			}
+
+			if (Spaces < MinIndent)
+				MinIndent = Spaces;
+		}
+
+		for (int Ix = FirstNonEmptyIx; Ix < LastNonEmptyIx; Ix++)
+		{
+			FString& Line = Lines[Ix];
+
+			Line.RightChopInline(MinIndent);
+			if (Prefix) Sb.Append(*Prefix);
+			Sb.Append(Line);
+			Sb << TCHAR('\n');
+		}
+	}
+
+	return Sb.ToString();
+}
 
 }	// namespace DcAutomationUtils
 

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

@@ -22,28 +22,6 @@ FDcResult RecursiveDeserialize(FDcDeserializeContext& Ctx)
 	return DcOk();
 }
 
-EDcDeserializePredicateResult PredicateIsEnumProperty(FDcDeserializeContext& Ctx)
-{
-	UEnum* Enum;
-	FNumericProperty* UnderlyingProperty;
-	bool bFoundEnum = DcPropertyUtils::TryGetEnumPropertyOut(Ctx.TopProperty(), Enum, UnderlyingProperty);
-	
-	return bFoundEnum
-		? EDcDeserializePredicateResult::Process
-		: EDcDeserializePredicateResult::Pass;
-}
-
-EDcDeserializePredicateResult PredicateIsSubObjectProperty(FDcDeserializeContext& Ctx)
-{
-	if (Ctx.TopProperty().IsUObject())
-		return EDcDeserializePredicateResult::Pass;
-
-	FObjectProperty* ObjectProperty = CastField<FObjectProperty>(Ctx.TopProperty().ToFieldUnsafe());
-	return ObjectProperty && DcPropertyUtils::IsSubObjectProperty(ObjectProperty)
-		? EDcDeserializePredicateResult::Process
-		: EDcDeserializePredicateResult::Pass;
-}
-
 } // namespace DcDeserializeUtils