Merge pull request #43 from magiccodingman/magiccodingman/CallJsSerializationRefactor

Attributes Respected By Serializer

Author: magiccodingman

E2eTestWebApp/TestPages/SingleRecordBasicTestPage.cs

@@ -59,7 +59,7 @@ public async Task<string> Add()
         {
             Name = "SingleRecordBasic.Add",
             Version = 1,
-            StoreSchemas = [SchemaHelper.GetStoreSchema<Record>(null, false)]
+            StoreSchemas = [SchemaHelper.GetStoreSchema(typeof(Record))]
         });
         var id = await database.AddAsync<Record, int>(NewSample);
         return id.ToString();
@@ -71,7 +71,7 @@ public async Task<string> Delete()
         {
             Name = "SingleRecordBasic.Delete",
             Version = 1,
-            StoreSchemas = [SchemaHelper.GetStoreSchema<Record>(null, false)]
+            StoreSchemas = [SchemaHelper.GetStoreSchema(typeof(Record))]
         });
         _ = await database.AddAsync<Record, int>(NewSample);
         await database.DeleteAsync(NewSample);
@@ -84,7 +84,7 @@ public async Task<string> Update()
         {
             Name = "SingleRecordBasic.Update",
             Version = 1,
-            StoreSchemas = [SchemaHelper.GetStoreSchema<Record>(null, false)]
+            StoreSchemas = [SchemaHelper.GetStoreSchema(typeof(Record))]
         });
         _ = await database.AddAsync<Record, int>(NewSample);
 
@@ -100,7 +100,7 @@ public async Task<string> GetById()
         {
             Name = "SingleRecordBasic.GetById",
             Version = 1,
-            StoreSchemas = [SchemaHelper.GetStoreSchema<Record>(null, false)]
+            StoreSchemas = [SchemaHelper.GetStoreSchema(typeof(Record))]
         });
         var id = await database.AddAsync<Record, int>(NewSample);
         var result = await database.GetByIdAsync<Record>(id);
@@ -113,7 +113,7 @@ public async Task<string> GetAll()
         {
             Name = "SingleRecordBasic.GetAll",
             Version = 1,
-            StoreSchemas = [SchemaHelper.GetStoreSchema<Record>(null, false)]
+            StoreSchemas = [SchemaHelper.GetStoreSchema(typeof(Record))]
         });
         _ = await database.AddAsync<Record, int>(NewSample);
         var result = await database.GetAllAsync<Record>();

Magic.IndexedDb.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 17.5.33502.453
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magic.IndexedDb", "Magic.IndexedDb\Magic.IndexedDb.csproj", "{A92429BE-E180-4150-BFC7-6C09558978D0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IndexDb.Example", "IndexDb.Example\IndexDb.Example.csproj", "{4607CA8C-3AE3-4288-A52A-B3887B254657}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWasm", "TestWasm\TestWasm.csproj", "{711DC6B6-9F00-4359-A046-9C5865B527C2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "E2eTestWebApp", "E2eTestWebApp\E2eTestWebApp.csproj", "{D2025B3E-E14F-48E8-8B0E-3BA21762FB92}"
 EndProject
@@ -33,6 +33,10 @@ Global
 		{BCC4F889-502A-43FF-B5C6-21C345E3EB2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BCC4F889-502A-43FF-B5C6-21C345E3EB2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BCC4F889-502A-43FF-B5C6-21C345E3EB2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{711DC6B6-9F00-4359-A046-9C5865B527C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{711DC6B6-9F00-4359-A046-9C5865B527C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{711DC6B6-9F00-4359-A046-9C5865B527C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{711DC6B6-9F00-4359-A046-9C5865B527C2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Magic.IndexedDb/Factories/EncryptionFactory.cs

@@ -1,4 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
+using Magic.IndexedDb.Interfaces;
+using Magic.IndexedDb.Models;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
 using System;
 using System.Collections.Generic;
@@ -9,24 +11,31 @@
 
 namespace Magic.IndexedDb.Factories
 {
+    [Obsolete("The old encryption system no longer works. It's being depreciated.")]
     public sealed class EncryptionFactory(IndexedDbManager indexDbManager) : IEncryptionFactory
     {
+        [Obsolete("The old encryption system no longer works. It's being depreciated.")]
         public Task<string> EncryptAsync(
             string data, string key, 
             CancellationToken cancellationToken = default)
         {
+            
+
             return indexDbManager.CallJsAsync<string>(
                 "encryptString", cancellationToken,
-                [data, key]);
+                new ITypedArgument[] { new TypedArgument<string>(data), new TypedArgument<string>(key) }
+                );
         }
 
+        [Obsolete("The old encryption system no longer works. It's being depreciated.")]
         public Task<string> DecryptAsync(
             string encryptedData, string key, 
             CancellationToken cancellationToken = default)
         {
             return indexDbManager.CallJsAsync<string>(
                 "decryptString", cancellationToken,
-                [encryptedData, key]);
+                new ITypedArgument[] { new TypedArgument<string>(encryptedData), new TypedArgument<string>(key) }
+                );
         }
     }
 }

Magic.IndexedDb/Helpers/AttributeHelpers.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Magic.IndexedDb.Helpers
+{
+    public static class AttributeHelpers
+    {
+        private static readonly ConcurrentDictionary<Type, PropertyInfo?> _primaryKeyCache = new();
+
+        public static object? GetPrimaryKeyValue<T>(T item)
+        {
+            if (item == null)
+                throw new ArgumentNullException(nameof(item));
+
+            var primaryKeyProperty = GetPrimaryKeyProperty(typeof(T));
+            return primaryKeyProperty?.GetValue(item);
+        }
+
+        public static Type GetPrimaryKeyType<T>() where T : class
+        {
+            var primaryKeyProperty = GetPrimaryKeyProperty(typeof(T));
+            if (primaryKeyProperty == null)
+                throw new InvalidOperationException($"Type '{typeof(T).Name}' does not have a primary key with [MagicPrimaryKeyAttribute].");
+
+            return primaryKeyProperty.PropertyType;
+        }
+
+        public static void ValidatePrimaryKey<T>(object key) where T : class
+        {
+            var expectedType = GetPrimaryKeyType<T>();
+
+            if (key == null || !expectedType.IsInstanceOfType(key))
+            {
+                throw new ArgumentException($"Invalid key type. Expected: {expectedType}, received: {key?.GetType()}.");
+            }
+        }
+
+        private static PropertyInfo? GetPrimaryKeyProperty(Type type)
+        {
+            return _primaryKeyCache.GetOrAdd(type, t =>
+                t.GetProperties().FirstOrDefault(prop => Attribute.IsDefined(prop, typeof(MagicPrimaryKeyAttribute))));
+        }
+    }
+}

Magic.IndexedDb/Helpers/MagicSerializationHelper.cs

@@ -1,4 +1,6 @@
-using Magic.IndexedDb.Models;
+using Magic.IndexedDb.Interfaces;
+using Magic.IndexedDb.Models;
+using System.Linq;
 using System.Text.Json;
 
 namespace Magic.IndexedDb.Helpers
@@ -9,6 +11,28 @@ namespace Magic.IndexedDb.Helpers
     /// </summary>
     public static class MagicSerializationHelper
     {
+
+        public static object[] SerializeObjects(ITypedArgument[] objs, MagicJsonSerializationSettings? settings = null)
+        {
+            return objs.Select(arg => arg.SerializeToJsonElement(settings)).Cast<object>().ToArray();
+        }
+
+        public static JsonElement SerializeObjectToJsonElement<T>(T value, MagicJsonSerializationSettings? settings = null)
+        {
+            if (settings == null)
+                settings = new MagicJsonSerializationSettings();
+
+            if (value == null)
+                throw new ArgumentNullException(nameof(value), "Object cannot be null");
+
+            var options = settings.GetOptionsWithResolver<T>(); // Ensure the correct resolver is applied
+            string jsonString = JsonSerializer.Serialize(value, options); // Serialize using your settings
+
+            // Convert the string to a JsonElement so that Blazor treats it as a structured object
+            using JsonDocument doc = JsonDocument.Parse(jsonString);
+            return doc.RootElement.Clone(); // Clone to prevent disposal issues
+        }
+
         public static string SerializeObject<T>(T value, MagicJsonSerializationSettings? settings = null)
         {
             if (settings == null)