feat: bug fixes and general improvements

ReneSchwarzer · ReneSchwarzer · commit 59b8fecc090b · 2025-04-18T10:25:55.000+02:00
diff --git a/src/WebExpress.WebIndex.Test/WebExpress.WebIndex.Test.csproj b/src/WebExpress.WebIndex.Test/WebExpress.WebIndex.Test.csproj
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/WebExpress.WebIndex.WiUI/Model/MainViewModel.cs b/src/WebExpress.WebIndex.WiUI/Model/MainViewModel.cs
@@ -47,14 +47,21 @@ public Project? SelectedProject
             {
                 _selectedProject = value; OnPropertyChanged();
 
+                if (_selectedProject?.IndexPath != null && !Directory.Exists(_selectedProject?.IndexPath))
+                {
+                    Indexes = new ObservableCollection<Index>();
+
+                    return;
+                }
+
                 Indexes = Directory
-               .GetFiles(SelectedProject?.IndexPath ?? Environment.CurrentDirectory)
-               .Where(x => x.EndsWith(".ws"))
-               .Select(x => new Index()
-               {
-                   Name = Path.GetFileNameWithoutExtension(x),
-                   FileNameWithPath = x
-               }).ToObservableCollection();
+                   .GetFiles(_selectedProject?.IndexPath ?? Environment.CurrentDirectory)
+                   .Where(x => x.EndsWith(".ws"))
+                   .Select(x => new Index()
+                   {
+                       Name = Path.GetFileNameWithoutExtension(x),
+                       FileNameWithPath = x
+                   }).ToObservableCollection();
             }
         }
 
diff --git a/src/WebExpress.WebIndex.WiUI/WebExpress.WebIndex.WiUI.csproj b/src/WebExpress.WebIndex.WiUI/WebExpress.WebIndex.WiUI.csproj
@@ -59,8 +59,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.30" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.60" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.4" />
 		<PackageReference Include="CommunityToolkit.Maui" Version="*" />
 	</ItemGroup>
 
diff --git a/src/WebExpress.WebIndex/Memory/IndexMemorySchema.cs b/src/WebExpress.WebIndex/Memory/IndexMemorySchema.cs
@@ -85,12 +85,15 @@ private static IEnumerable<IndexFieldData> GetFieldData(Type type, string prefix
             {
                 string propertyName = string.IsNullOrEmpty(prefix) ? property.Name : $"{prefix}.{property.Name}";
 
-                yield return new IndexFieldData
+                if (!property.PropertyType.IsClass || property.PropertyType == typeof(string))
                 {
-                    Name = propertyName,
-                    Type = property.PropertyType,
-                    PropertyInfo = property
-                };
+                    yield return new IndexFieldData
+                    {
+                        Name = propertyName,
+                        Type = property.PropertyType,
+                        PropertyInfo = property
+                    };
+                }
 
                 if (property.PropertyType.IsClass && property.PropertyType != typeof(string))
                 {
diff --git a/src/WebExpress.WebIndex/Storage/IndexStorageSchema.cs b/src/WebExpress.WebIndex/Storage/IndexStorageSchema.cs
@@ -196,14 +196,17 @@ private static IEnumerable<IndexFieldData> GetFieldData(Type type, string prefix
 
             foreach (var property in type.GetProperties())
             {
-                string propertyName = string.IsNullOrEmpty(prefix) ? property.Name : $"{prefix}.{property.Name}";
+                var propertyName = string.IsNullOrEmpty(prefix) ? property.Name : $"{prefix}.{property.Name}";
 
-                yield return new IndexFieldData
+                if (!property.PropertyType.IsClass || property.PropertyType == typeof(string))
                 {
-                    Name = propertyName,
-                    Type = property.PropertyType,
-                    PropertyInfo = property
-                };
+                    yield return new IndexFieldData
+                    {
+                        Name = propertyName,
+                        Type = property.PropertyType,
+                        PropertyInfo = property
+                    };
+                }
 
                 if (property.PropertyType.IsClass && property.PropertyType != typeof(string))
                 {

Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,15 @@ private static IEnumerable<IndexFieldData> GetFieldData(Type type, string prefix`
`85`	`85`	`{`
`86`	`86`	`string propertyName = string.IsNullOrEmpty(prefix) ? property.Name : $"{prefix}.{property.Name}";`
`87`	`87`
`88`		`- yield return new IndexFieldData`
	`88`	`+ if (!property.PropertyType.IsClass \|\| property.PropertyType == typeof(string))`
`89`	`89`	`{`
`90`		`- Name = propertyName,`
`91`		`- Type = property.PropertyType,`
`92`		`- PropertyInfo = property`
`93`		`- };`
	`90`	`+ yield return new IndexFieldData`
	`91`	`+ {`
	`92`	`+ Name = propertyName,`
	`93`	`+ Type = property.PropertyType,`
	`94`	`+ PropertyInfo = property`
	`95`	`+ };`
	`96`	`+ }`
`94`	`97`
`95`	`98`	`if (property.PropertyType.IsClass && property.PropertyType != typeof(string))`
`96`	`99`	`{`