release 1.6.0

Author: jagt

.editorconfig

@@ -1,6 +1,9 @@
 root=true
 
-[*.{cpp,h,inl}]
+[*]
+tab_width = 4
+
+[*.{cpp,h,inl,cs}]
 indent_style = tab
 trim_trailing_whitespace = true
 charset = utf-8

DataConfig/Content/DcFixture/DcTestBlueprintClassAlpha.uasset

@@ -13,31 +13,36 @@
 	"Modules": [
 		{
 			"Name": "DataConfigCore",
-			"Type": "Editor",
+			"Type": "Runtime",
 			"LoadingPhase": "None"
 		},
 		{
 			"Name": "DataConfigExtra",
-			"Type": "Editor",
+			"Type": "Runtime",
 	    	"LoadingPhase": "Default"
 		},
 		{
-			"Name": "DataConfigTests",
+			"Name": "DataConfigEngineExtra",
+			"Type": "Runtime",
+	    	"LoadingPhase": "Default"
+		},
+		{
+			"Name": "DataConfigEngineExtra5",
 			"Type": "Editor",
 	    	"LoadingPhase": "Default"
 		},
 		{
-			"Name": "DataConfigEditorExtra",
+			"Name": "DataConfigTests",
 			"Type": "Editor",
 	    	"LoadingPhase": "Default"
 		},
 		{
-			"Name": "DataConfigTests5",
+			"Name": "DataConfigEditorExtra",
 			"Type": "Editor",
 	    	"LoadingPhase": "Default"
 		},
 		{
-			"Name": "DataConfigEditorExtra5",
+			"Name": "DataConfigTests5",
 			"Type": "Editor",
 	    	"LoadingPhase": "Default"
 		}

DataConfig/Content/DcFixture/DcTestBlueprintClassBeta.uasset

@@ -13,12 +13,17 @@
 	"Modules": [
 		{
 			"Name": "DataConfigCore",
-			"Type": "Editor",
+			"Type": "Runtime",
 			"LoadingPhase": "None"
 		},
 		{
 			"Name": "DataConfigExtra",
-			"Type": "Editor",
+			"Type": "Runtime",
+	    	"LoadingPhase": "Default"
+		},
+		{
+			"Name": "DataConfigEngineExtra",
+			"Type": "Runtime",
 	    	"LoadingPhase": "Default"
 		},
 		{

DataConfig/DataConfig.uplugin

@@ -5,9 +5,9 @@ public class DataConfigCore : ModuleRules
 	public DataConfigCore(ReadOnlyTargetRules Target) : base(Target)
 	{
 		//	source type module, pay extra attention to api boundry
-	    bRequiresImplementModule = false;
+		bRequiresImplementModule = false;
 
-	    Type = ModuleType.CPlusPlus;
+		Type = ModuleType.CPlusPlus;
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 
 #if UE_5_2_OR_LATER
@@ -16,7 +16,7 @@ public DataConfigCore(ReadOnlyTargetRules Target) : base(Target)
 		bEnforceIWYU = true;
 #endif
 
-        PublicDependencyModuleNames.AddRange(
+		PublicDependencyModuleNames.AddRange(
 			new string[] {
 			"Core",
 			"CoreUObject",
@@ -32,6 +32,6 @@ public DataConfigCore(ReadOnlyTargetRules Target) : base(Target)
 		}
 
 		//	toggle for debug unity
-        //bUseUnity = false;
+		//bUseUnity = false;
 	}
 }

DataConfig/DataConfig4.uplugin

@@ -75,7 +75,7 @@ bool FDcAutomationBase::TestDiagnosticImpl(const TCHAR* Description, const FDcRe
 	if (Diag.Code.CategoryID != Category
 		|| Diag.Code.ErrorID != Code)
 	{
-		AddError(FString::Printf(TEXT("%s: Last diag unmatch, Expect: (%d, %d), Actual, (%d, %d)"), 
+		AddError(FString::Printf(TEXT("%s: Last diag unmatch, Expect: (%d, %d), Actual, (%d, %d)"),
 			Description, Category, Code, Diag.Code.CategoryID, Diag.Code.ErrorID
 		), 1);
 		return false;
@@ -134,7 +134,7 @@ FDcAutomationConsoleRunner::FArgs FDcAutomationConsoleRunner::FromCommandlineTok
 	{
 		//	default filter
 		//	ends with `.` to filter out DataConfigBenchmark
-		Args.Filters.Add(TEXT("DataConfig."));	
+		Args.Filters.Add(TEXT("DataConfig."));
 	}
 
 	int ParametersSplitIx = -1;
@@ -215,10 +215,10 @@ int32 RunTestsBody(FDcAutomationConsoleRunner* Self)
 
 		for (const FAutomationTestInfo& TestInfo: Self->SelectedTests)
 		{
-			FString TestCommand = FString::Printf(TEXT("%s %s"), *TestInfo.GetTestName(), *Self->ParametersJoined);	
+			FString TestCommand = FString::Printf(TEXT("%s %s"), *TestInfo.GetTestName(), *Self->ParametersJoined);
 			FAutomationTestExecutionInfo CurExecutionInfo;
 
-			int32 RoleIndex = 0; 
+			int32 RoleIndex = 0;
 			Framework.StartTestByName(TestCommand, RoleIndex);
 			const bool CurTestSuccessful = Framework.StopTest(CurExecutionInfo);
 

DataConfig/Source/DataConfigCore/DataConfigCore.Build.cs

@@ -708,7 +708,7 @@ int DebugGetEnumPropertyIndex(const FDcPropertyDatum& Datum, const FName& Name)
 	UEnum* Enum = nullptr;
 	FNumericProperty* UnderlyingProperty = nullptr;
 	bool bIsEnum = DcPropertyUtils::IsEnumAndTryUnwrapEnum(EnumProperty, Enum, UnderlyingProperty);
-	if (!bIsEnum	
+	if (!bIsEnum
 		|| Enum == nullptr
 		|| UnderlyingProperty == nullptr)
 		return INDEX_NONE;
@@ -734,7 +734,7 @@ double DebugGetRealPropertyValue(const FDcPropertyDatum& Datum, const FName& Nam
 
 	FProperty* Property = PropertyAccessUtil::FindPropertyByName(Name, Struct);
 	if (!Property)
-		return NaNRet; 
+		return NaNRet;
 
 	if (FFloatProperty* FloatProperty = CastField<FFloatProperty>(Property))
 		return FloatProperty->GetPropertyValue(Property->ContainerPtrToValuePtr<void*>(Datum.DataPtr));
@@ -745,7 +745,7 @@ double DebugGetRealPropertyValue(const FDcPropertyDatum& Datum, const FName& Nam
 }
 
 FDcResult DeserializeFrom(FDcReader* Reader, FDcPropertyDatum Datum,
-                          TFunctionRef<void(FDcDeserializeContext&)> Func, EDefaultSetupType SetupType)
+						  TFunctionRef<void(FDcDeserializeContext&)> Func, EDefaultSetupType SetupType)
 {
 	FDcDeserializer Deserializer;
 	if (SetupType == EDefaultSetupType::SetupJSONHandlers)

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

@@ -6,7 +6,7 @@
 
 FDcResult FDcDeserializeContext::Prepare()
 {
-	DC_TRY(DcExpect(State == EState::Uninitialized, [&]{ 
+	DC_TRY(DcExpect(State == EState::Uninitialized, [&]{
 		return DC_FAIL(DcDSerDe, ContextInvalidState) << (int)State;
 	}));
 

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

@@ -25,9 +25,9 @@ FDcResult RecursiveDeserialize(FDcDeserializeContext& Ctx)
 EDcDeserializePredicateResult PredicateIsRootProperty(FDcDeserializeContext& Ctx)
 {
 	check(Ctx.Properties.Num() > 0);
-    return Ctx.TopProperty() == Ctx.Properties[0]
-        ? EDcDeserializePredicateResult::Process
-        : EDcDeserializePredicateResult::Pass;
+	return Ctx.TopProperty() == Ctx.Properties[0]
+		? EDcDeserializePredicateResult::Process
+		: EDcDeserializePredicateResult::Pass;
 }
 
 } // namespace DcDeserializeUtils