Version 1.0.40 (#1415)

* Handle Top Level Repair Error

* ChangeLog

* Version

Author: sinclairzx81

changelog/1.0.0.md

@@ -3,6 +3,8 @@
 ---
 
 ### Version Updates
+- [Revision 1.0.40](https://github.com/sinclairzx81/typebox/pull/1415)
+  - Support Top Level Value Recovery on Repair
 - [Revision 1.0.39](https://github.com/sinclairzx81/typebox/pull/1411)
   - Add IsAnchor, IsDynamicAnchor and IsDynamicRef Guards
 - [Revision 1.0.38](https://github.com/sinclairzx81/typebox/pull/1410)

src/value/repair/repair.ts

@@ -32,6 +32,8 @@ import { Arguments } from '../../system/arguments/index.ts'
 import type { TProperties, TSchema, Static } from '../../type/index.ts'
 import { FromType } from './from-type.ts'
 import { Assert } from '../assert/index.ts'
+import { Check } from '../check/index.ts'
+import { Create } from '../create/index.ts'
 
 /**
  * Repairs a value to match the provided type. This function is intended for data migration 
@@ -67,7 +69,8 @@ export function Repair(...args: unknown[]): unknown {
     3: (context, type, value) => [context, type, value],
     2: (type, value) => [{}, type, value],
   })
-  const result = FromType(context, type, value)
-  Assert(context, type, result) // ensure correct
-  return result
+  const repaired = FromType(context, type, value)
+  const checked = Check(context, type, repaired) ? repaired : Create(context, type)
+  Assert(context, type, checked) // ensure correct
+  return checked
 }

tasks.ts

@@ -8,7 +8,7 @@ import { Range } from './task/range/index.ts'
 import { Metrics } from './task/metrics/index.ts'
 import { Task } from 'tasksmith'
 
-const Version = '1.0.39'
+const Version = '1.0.40'
 
 // ------------------------------------------------------------------
 // Build

test/typebox/runtime/value/repair/~refine.ts

@@ -0,0 +1,61 @@
+import { Value } from 'typebox/value'
+import { Type } from 'typebox'
+import { Assert } from 'test'
+
+const Test = Assert.Context('Value.Repair.Refine')
+
+// ------------------------------------------------------------------
+// https://github.com/sinclairzx81/typebox/issues/1414
+// ------------------------------------------------------------------
+Test('Should Refine 1', () => {
+  const T = Type.Refine(
+    Type.Object({
+      greater: Type.Integer({ default: 10 }),
+      smaller: Type.Integer({ default: 5 })
+    }),
+    (data) => data.greater > data.smaller
+  )
+  const R = Value.Repair(T, { greater: 3, smaller: 7 })
+  Assert.IsEqual(R, {
+    greater: 10,
+    smaller: 5
+  })
+})
+Test('Should Refine 2', () => {
+  const T = Type.Refine(
+    Type.Object({
+      greater: Type.Integer(),
+      smaller: Type.Integer()
+    }, {
+      default: {
+        greater: 10,
+        smaller: 5
+      }
+    }),
+    (data) => data.greater > data.smaller
+  )
+  const R = Value.Repair(T, { greater: 3, smaller: 7 })
+  Assert.IsEqual(R, {
+    greater: 10,
+    smaller: 5
+  })
+})
+Test('Should Refine 3', () => {
+  const T = Type.Refine(
+    Type.Object({
+      greater: Type.Integer({ default: 10 }),
+      smaller: Type.Integer({ default: 5 })
+    }, {
+      default: { // top-level overrides subschema
+        greater: 100,
+        smaller: 50
+      }
+    }),
+    (data) => data.greater > data.smaller
+  )
+  const R = Value.Repair(T, { greater: 3, smaller: 7 })
+  Assert.IsEqual(R, {
+    greater: 100,
+    smaller: 50
+  })
+})