Change: NavigationOptions/Context to Immutable

nuskey8 · nuskey8 · commit c04d2bb6c40b · 2024-08-27T16:30:58.000+09:00
diff --git a/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationSheetCore.cs b/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationSheetCore.cs
@@ -61,8 +61,10 @@ public UniTask RemoveAllAsync(CancellationToken cancellationToken = default)
 
         public async UniTask ShowAsync(INavigation navigation, int index, NavigationContext context, CancellationToken cancellationToken = default)
         {
-            var copiedContext = context.CreateCopy();
-            copiedContext.Options = context.Options ?? navigation.DefaultOptions;
+            var copiedContext = context with
+            { 
+                Options = context.Options ?? navigation.DefaultOptions
+            };
 
             if (isRunning)
             {
@@ -101,8 +103,10 @@ public async UniTask ShowAsync(INavigation navigation, int index, NavigationCont
 
         public async UniTask HideAsync(INavigation navigation, NavigationContext context, CancellationToken cancellationToken = default)
         {
-            var copiedContext = context.CreateCopy();
-            copiedContext.Options = context.Options ?? navigation.DefaultOptions;
+            var copiedContext = context with
+            {
+                Options = context.Options ?? navigation.DefaultOptions
+            };
 
             if (activePage == null)
             {
diff --git a/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationStackCore.cs b/src/NavStack/Assets/NavStack/Runtime/Internal/NavigationStackCore.cs
@@ -21,8 +21,10 @@ public sealed class NavigationStackCore
 
         public async UniTask PopAsync(INavigation navigation, NavigationContext context, CancellationToken cancellationToken = default)
         {
-            var copiedContext = context.CreateCopy();
-            copiedContext.Options = context.Options ?? navigation.DefaultOptions;
+            var copiedContext = context with
+            {
+                Options = context.Options ?? navigation.DefaultOptions
+            };
 
             if (isRunning)
             {
@@ -69,8 +71,10 @@ public async UniTask PopAsync(INavigation navigation, NavigationContext context,
 
         public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> pageFactory, NavigationContext context, CancellationToken cancellationToken = default)
         {
-            var copiedContext = context.CreateCopy();
-            copiedContext.Options = context.Options ?? navigation.DefaultOptions;
+            var copiedContext = context with
+            {
+                Options = context.Options ?? navigation.DefaultOptions
+            };
 
             if (isRunning)
             {
diff --git a/src/NavStack/Assets/NavStack/Runtime/NavigationContext.cs b/src/NavStack/Assets/NavStack/Runtime/NavigationContext.cs
@@ -2,25 +2,9 @@
 
 namespace NavStack
 {
-    public class NavigationContext
+    public record NavigationContext
     {
-        public NavigationOptions Options { get; set; }
-        public IDictionary<object, object> Parameters { get; set; } = new Dictionary<object, object>();
-
-        public virtual NavigationContext CreateCopy()
-        {
-            var context = new NavigationContext()
-            {
-                Options = new(Options),
-                Parameters = new Dictionary<object, object>()
-            };
-
-            foreach (var kv in Parameters)
-            {
-                context.Parameters.Add(kv);
-            }
-
-            return context;
-        }
+        public NavigationOptions Options { get; init; }
+        public IDictionary<object, object> Parameters { get; init; } = new Dictionary<object, object>();
     }
 }
diff --git a/src/NavStack/Assets/NavStack/Runtime/NavigationOptions.cs b/src/NavStack/Assets/NavStack/Runtime/NavigationOptions.cs
@@ -1,33 +1,8 @@
-using System;
-using UnityEngine;
-
 namespace NavStack
 {
-    [Serializable]
-    public sealed class NavigationOptions
+    public record NavigationOptions
     {
-        public NavigationOptions() { }
-        public NavigationOptions(NavigationOptions source)
-        {
-            if (source == null) return;
-            
-            animated = source.animated;
-            awaitOperation = source.awaitOperation;
-        }
-
-        [SerializeField] bool animated = true;
-        [SerializeField] NavigationAwaitOperation awaitOperation = NavigationAwaitOperation.Error;
-
-        public bool Animated
-        {
-            get => animated;
-            set => animated = value;
-        }
-
-        public NavigationAwaitOperation AwaitOperation
-        {
-            get => awaitOperation;
-            set => awaitOperation = value;
-        }
+        public bool Animated { get; init; } = true;
+        public NavigationAwaitOperation AwaitOperation { get; init; } = NavigationAwaitOperation.Error; 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,10 @@ public UniTask RemoveAllAsync(CancellationToken cancellationToken = default)`
`61`	`61`
`62`	`62`	`public async UniTask ShowAsync(INavigation navigation, int index, NavigationContext context, CancellationToken cancellationToken = default)`
`63`	`63`	`{`
`64`		`- var copiedContext = context.CreateCopy();`
`65`		`- copiedContext.Options = context.Options ?? navigation.DefaultOptions;`
	`64`	`+ var copiedContext = context with`
	`65`	`+ {`
	`66`	`+ Options = context.Options ?? navigation.DefaultOptions`
	`67`	`+ };`
`66`	`68`
`67`	`69`	`if (isRunning)`
`68`	`70`	`{`
`@@ -101,8 +103,10 @@ public async UniTask ShowAsync(INavigation navigation, int index, NavigationCont`
`101`	`103`
`102`	`104`	`public async UniTask HideAsync(INavigation navigation, NavigationContext context, CancellationToken cancellationToken = default)`
`103`	`105`	`{`
`104`		`- var copiedContext = context.CreateCopy();`
`105`		`- copiedContext.Options = context.Options ?? navigation.DefaultOptions;`
	`106`	`+ var copiedContext = context with`
	`107`	`+ {`
	`108`	`+ Options = context.Options ?? navigation.DefaultOptions`
	`109`	`+ };`
`106`	`110`
`107`	`111`	`if (activePage == null)`
`108`	`112`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,10 @@ public sealed class NavigationStackCore`
`21`	`21`
`22`	`22`	`public async UniTask PopAsync(INavigation navigation, NavigationContext context, CancellationToken cancellationToken = default)`
`23`	`23`	`{`
`24`		`- var copiedContext = context.CreateCopy();`
`25`		`- copiedContext.Options = context.Options ?? navigation.DefaultOptions;`
	`24`	`+ var copiedContext = context with`
	`25`	`+ {`
	`26`	`+ Options = context.Options ?? navigation.DefaultOptions`
	`27`	`+ };`
`26`	`28`
`27`	`29`	`if (isRunning)`
`28`	`30`	`{`
`@@ -69,8 +71,10 @@ public async UniTask PopAsync(INavigation navigation, NavigationContext context,`
`69`	`71`
`70`	`72`	`public async UniTask PushAsync(INavigation navigation, Func<UniTask<IPage>> pageFactory, NavigationContext context, CancellationToken cancellationToken = default)`
`71`	`73`	`{`
`72`		`- var copiedContext = context.CreateCopy();`
`73`		`- copiedContext.Options = context.Options ?? navigation.DefaultOptions;`
	`74`	`+ var copiedContext = context with`
	`75`	`+ {`
	`76`	`+ Options = context.Options ?? navigation.DefaultOptions`
	`77`	`+ };`
`74`	`78`
`75`	`79`	`if (isRunning)`
`76`	`80`	`{`