Merge tag '5.5.0' into develop

maximkhatskevich · maximkhatskevich · commit 46fc3149ccd2 · 2023-03-13T02:48:08.000+01:00
[SIMPLIFY] `ValueStorage `
diff --git a/Sources/Core/0_Validatable/Errors.swift b/Sources/Core/0_Validatable/Errors.swift
@@ -31,7 +31,7 @@ enum ValidationError: Error
         source: DisplayNamedInfo
     )
     
-    case requiredValueIsEmptyCollection(
+    case requiredValueIsEmpty(
         source: DisplayNamedInfo
     )
     
diff --git a/Sources/Core/2_ValueWrappers/*Persistence.swift b/Sources/Core/2_ValueWrappers/*Persistence.swift
@@ -48,8 +48,7 @@ extension SomeStorageKey
 public
 enum ValueStorage
 {
-    case none
-    case appStorageDefault(key: SomeStorageKey)
+    case appStorageStandard(key: SomeStorageKey)
     case appStorage(key: SomeStorageKey, storageName: String)
     //case keychain(key: SomeStorageKey)
 }
@@ -63,11 +62,7 @@ extension ValueStorage
     {
         switch self
         {
-            case .none:
-                
-                return defaultValue
-                
-            case .appStorageDefault(key: let key):
+            case .appStorageStandard(let key):
                 
                 if
                     ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil
@@ -97,11 +92,7 @@ extension ValueStorage
     {
         switch self
         {
-            case .none:
-                
-                break
-                
-            case .appStorageDefault(key: let key):
+            case .appStorageStandard(let key):
                 
                 if
                     ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil
diff --git a/Sources/Core/2_ValueWrappers/*SomeRequiredValueWrapper.swift b/Sources/Core/2_ValueWrappers/*SomeRequiredValueWrapper.swift
@@ -54,7 +54,7 @@ extension SomeRequiredValueWrapper
             if
                 Value.isEmpty(rawValue: rawValue)
             {
-                throw ValidationError.requiredValueIsEmptyCollection(
+                throw ValidationError.requiredValueIsEmpty(
                     source: Self.info
                 )
             }
diff --git a/Sources/Core/2_ValueWrappers/NonRequired.swift b/Sources/Core/2_ValueWrappers/NonRequired.swift
@@ -40,23 +40,23 @@ struct NonRequired<T: SomeValidatableValue>: SomeNonRequiredValueWrapper
     {
         didSet
         {
-            storage.store(value: rawValue)
+            storage?.store(value: rawValue)
         }
     }
     
     public
-    let storage: ValueStorage
+    let storage: ValueStorage?
     
     public
     init(_ rawValue: T.Raw)
     {
-        self.init(rawValue, storage: .none)
+        self.init(rawValue, storage: nil)
     }
     
     public
-    init(_ defaultValue: T.Raw, storage: ValueStorage)
+    init(_ defaultValue: T.Raw, storage: ValueStorage?)
     {
-        self.rawValue = storage.fetchValue(default: defaultValue)
+        self.rawValue = storage?.fetchValue(default: defaultValue) ?? defaultValue
         self.storage = storage
     }
 }
diff --git a/Sources/Core/2_ValueWrappers/Required.swift b/Sources/Core/2_ValueWrappers/Required.swift
@@ -40,23 +40,23 @@ struct Required<T: SomeValidatableValue>: SomeRequiredValueWrapper
     {
         didSet
         {
-            storage.store(value: rawValue)
+            storage?.store(value: rawValue)
         }
     }
     
     public
-    let storage: ValueStorage
+    let storage: ValueStorage?
     
     public
     init(_ rawValue: T.Raw)
     {
-        self.init(rawValue, storage: .none)
+        self.init(rawValue, storage: nil)
     }
     
     public
-    init(_ defaultValue: T.Raw, storage: ValueStorage)
+    init(_ defaultValue: T.Raw, storage: ValueStorage?)
     {
-        self.rawValue = storage.fetchValue(default: defaultValue)
+        self.rawValue = storage?.fetchValue(default: defaultValue) ?? defaultValue
         self.storage = storage
     }
 }
diff --git a/Tests/AllTests/WrapperTests.swift b/Tests/AllTests/WrapperTests.swift
@@ -69,7 +69,7 @@ extension WrapperTests
         XCTAssertThrowsError(try wrapper.validValue) {
             
             guard
-                case ValidationError.requiredValueIsEmptyCollection = $0
+                case ValidationError.requiredValueIsEmpty = $0
             else
             {
                 return XCTFail("Unexpected error: \($0)")
@@ -112,7 +112,7 @@ extension WrapperTests
         XCTAssertThrowsError(try wrapperMaybe.validValue) {
             
             guard
-                case ValidationError.requiredValueIsEmptyCollection = $0
+                case ValidationError.requiredValueIsEmpty = $0
             else
             {
                 return XCTFail("Unexpected error: \($0)")
@@ -203,7 +203,7 @@ extension WrapperTests
         XCTAssertThrowsError(try wrapper.validValue) {
             
             guard
-                case ValidationError.requiredValueIsEmptyCollection = $0
+                case ValidationError.requiredValueIsEmpty = $0
             else
             {
                 return XCTFail("Unexpected error: \($0)")
@@ -246,7 +246,7 @@ extension WrapperTests
         XCTAssertThrowsError(try wrapperMaybe.validValue) {
             
             guard
-                case ValidationError.requiredValueIsEmptyCollection = $0
+                case ValidationError.requiredValueIsEmpty = $0
             else
             {
                 return XCTFail("Unexpected error: \($0)")

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ enum ValidationError: Error`
`31`	`31`	`source: DisplayNamedInfo`
`32`	`32`	`)`
`33`	`33`
`34`		`- case requiredValueIsEmptyCollection(`
	`34`	`+ case requiredValueIsEmpty(`
`35`	`35`	`source: DisplayNamedInfo`
`36`	`36`	`)`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ extension SomeStorageKey`
`48`	`48`	`public`
`49`	`49`	`enum ValueStorage`
`50`	`50`	`{`
`51`		`- case none`
`52`		`- case appStorageDefault(key: SomeStorageKey)`
	`51`	`+ case appStorageStandard(key: SomeStorageKey)`
`53`	`52`	`case appStorage(key: SomeStorageKey, storageName: String)`
`54`	`53`	`//case keychain(key: SomeStorageKey)`
`55`	`54`	`}`
`@@ -63,11 +62,7 @@ extension ValueStorage`
`63`	`62`	`{`
`64`	`63`	`switch self`
`65`	`64`	`{`
`66`		`- case .none:`
`67`		`-`
`68`		`- return defaultValue`
`69`		`-`
`70`		`- case .appStorageDefault(key: let key):`
	`65`	`+ case .appStorageStandard(let key):`
`71`	`66`
`72`	`67`	`if`
`73`	`68`	`ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil`
`@@ -97,11 +92,7 @@ extension ValueStorage`
`97`	`92`	`{`
`98`	`93`	`switch self`
`99`	`94`	`{`
`100`		`- case .none:`
`101`		`-`
`102`		`- break`
`103`		`-`
`104`		`- case .appStorageDefault(key: let key):`
	`95`	`+ case .appStorageStandard(let key):`
`105`	`96`
`106`	`97`	`if`
`107`	`98`	`ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ extension SomeRequiredValueWrapper`
`54`	`54`	`if`
`55`	`55`	`Value.isEmpty(rawValue: rawValue)`
`56`	`56`	`{`
`57`		`- throw ValidationError.requiredValueIsEmptyCollection(`
	`57`	`+ throw ValidationError.requiredValueIsEmpty(`
`58`	`58`	`source: Self.info`
`59`	`59`	`)`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,23 +40,23 @@ struct NonRequired<T: SomeValidatableValue>: SomeNonRequiredValueWrapper`
`40`	`40`	`{`
`41`	`41`	`didSet`
`42`	`42`	`{`
`43`		`- storage.store(value: rawValue)`
	`43`	`+ storage?.store(value: rawValue)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public`
`48`		`- let storage: ValueStorage`
	`48`	`+ let storage: ValueStorage?`
`49`	`49`
`50`	`50`	`public`
`51`	`51`	`init(_ rawValue: T.Raw)`
`52`	`52`	`{`
`53`		`- self.init(rawValue, storage: .none)`
	`53`	`+ self.init(rawValue, storage: nil)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public`
`57`		`- init(_ defaultValue: T.Raw, storage: ValueStorage)`
	`57`	`+ init(_ defaultValue: T.Raw, storage: ValueStorage?)`
`58`	`58`	`{`
`59`		`- self.rawValue = storage.fetchValue(default: defaultValue)`
	`59`	`+ self.rawValue = storage?.fetchValue(default: defaultValue) ?? defaultValue`
`60`	`60`	`self.storage = storage`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,23 +40,23 @@ struct Required<T: SomeValidatableValue>: SomeRequiredValueWrapper`
`40`	`40`	`{`
`41`	`41`	`didSet`
`42`	`42`	`{`
`43`		`- storage.store(value: rawValue)`
	`43`	`+ storage?.store(value: rawValue)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public`
`48`		`- let storage: ValueStorage`
	`48`	`+ let storage: ValueStorage?`
`49`	`49`
`50`	`50`	`public`
`51`	`51`	`init(_ rawValue: T.Raw)`
`52`	`52`	`{`
`53`		`- self.init(rawValue, storage: .none)`
	`53`	`+ self.init(rawValue, storage: nil)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public`
`57`		`- init(_ defaultValue: T.Raw, storage: ValueStorage)`
	`57`	`+ init(_ defaultValue: T.Raw, storage: ValueStorage?)`
`58`	`58`	`{`
`59`		`- self.rawValue = storage.fetchValue(default: defaultValue)`
	`59`	`+ self.rawValue = storage?.fetchValue(default: defaultValue) ?? defaultValue`
`60`	`60`	`self.storage = storage`
`61`	`61`	`}`
`62`	`62`	`}`