Version 1.0.81 (#1527)

* Instantitate Intersect in Value

* ChangeLog

* Version

Author: sinclairzx81

changelog/1.0.0.md

@@ -3,6 +3,8 @@
 ---
 
 ### Version Updates
+- [Revision 1.0.81](https://github.com/sinclairzx81/typebox/pull/1527)
+  - Instantiate Intersect with Context in Value Operations
 - [Revision 1.0.80](https://github.com/sinclairzx81/typebox/pull/1524)
   - Retain Ref Options on Instantiate
 - [Revision 1.0.79](https://github.com/sinclairzx81/typebox/pull/1518)

src/value/clean/from-intersect.ts

@@ -28,20 +28,21 @@ THE SOFTWARE.
 
 // deno-fmt-ignore-file
 
-import { type TProperties, type TSchema, type TIntersect, Evaluate, IsObject, Options } from '../../type/index.ts'
+import { type TProperties, type TSchema, type TIntersect, Evaluate, Instantiate, IsObject, Options } from '../../type/index.ts'
 import { Guard } from '../../guard/index.ts'
 import { FromType } from './from-type.ts'
 
 // ------------------------------------------------------------------
 // EvaluateIntersection
 // ------------------------------------------------------------------
-function EvaluateIntersection(type: TIntersect): TSchema {
+function EvaluateIntersection(context: TProperties, type: TIntersect): TSchema {
   // Note: reinterpret unevaluatedProperties as additionalProperties
   const additionalProperties = 
     Guard.HasPropertyKey(type, 'unevaluatedProperties')
       ? { additionalProperties: type.unevaluatedProperties }
       : {}
-  const evaluated = Evaluate(type)
+  const instantiated = Instantiate(context, type)
+  const evaluated = Evaluate(instantiated)
   return IsObject(evaluated)
     ? Options(evaluated, additionalProperties)
     : evaluated
@@ -51,7 +52,7 @@ function EvaluateIntersection(type: TIntersect): TSchema {
 // ------------------------------------------------------------------
 export function FromIntersect(context: TProperties, type: TIntersect, value: unknown): unknown {
   // Note: Evaluate and route back to FromType in evaluated form (likely an Object)
-  const evaluated = EvaluateIntersection(type)
+  const evaluated = EvaluateIntersection(context, type)
   return FromType(context, evaluated, value)
 }
 

src/value/convert/from-intersect.ts

@@ -28,10 +28,11 @@ THE SOFTWARE.
 
 // deno-fmt-ignore-file
 
-import { type TIntersect, type TProperties, Evaluate } from '../../type/index.ts'
+import { type TIntersect, type TProperties, Evaluate, Instantiate } from '../../type/index.ts'
 import { FromType } from './from-type.ts'
 
 export function FromIntersect(context: TProperties, type: TIntersect, value: unknown): unknown {
-  const evaluatedType = Evaluate(type)
-  return FromType(context, evaluatedType, value)
+  const instantiated = Instantiate(context, type)
+  const evaluated = Evaluate(instantiated)
+  return FromType(context, evaluated, value)
 }

src/value/create/from-intersect.ts

@@ -28,9 +28,11 @@ THE SOFTWARE.
 
 // deno-fmt-ignore-file
 
-import { type TProperties, type TIntersect, Evaluate } from '../../type/index.ts'
+import { type TProperties, type TIntersect, Evaluate, Instantiate } from '../../type/index.ts'
 import { FromType } from './from-type.ts'
 
 export function FromIntersect(context: TProperties, type: TIntersect): unknown {
-  return FromType(context, Evaluate(type))
+  const instantiated = Instantiate(context, type)
+  const evaluated = Evaluate(instantiated)
+  return FromType(context, evaluated)
 }

src/value/default/from-intersect.ts

@@ -29,10 +29,11 @@ THE SOFTWARE.
 // deno-fmt-ignore-file
 // deno-lint-ignore-file
 
-import { TProperties, TIntersect, Evaluate } from '../../type/index.ts'
+import { TProperties, TIntersect, Evaluate, Instantiate } from '../../type/index.ts'
 import { FromType } from './from-type.ts'
 
 export function FromIntersect(context: TProperties, type: TIntersect, value: unknown): unknown {
-  const evaluted = Evaluate(type)
-  return FromType(context, evaluted, value)
+  const instantiated = Instantiate(context, type)
+  const evaluated = Evaluate(instantiated)
+  return FromType(context, evaluated, value)
 }

src/value/repair/from-intersect.ts

@@ -28,10 +28,11 @@ THE SOFTWARE.
 
 // deno-fmt-ignore-file
 
-import { type TProperties, type TIntersect, Evaluate } from '../../type/index.ts'
+import { type TProperties, type TIntersect, Instantiate, Evaluate } from '../../type/index.ts'
 import { FromType } from './from-type.ts'
 
 export function FromIntersect(context: TProperties, type: TIntersect, value: unknown): unknown {
-  const evaluated = Evaluate(type)
+  const instantiated = Instantiate(context, type)
+  const evaluated = Evaluate(instantiated)
   return FromType(context, evaluated, value)
 }

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.80'
+const Version = '1.0.81'
 
 // ------------------------------------------------------------------
 // Build

test/typebox/runtime/value/default/module.ts

@@ -0,0 +1,35 @@
+import { Value } from 'typebox/value'
+import { Type } from 'typebox'
+import { Assert } from 'test'
+
+const Test = Assert.Context('Value.Default.Module')
+
+// ------------------------------------------------------------------
+// https://github.com/sinclairzx81/typebox/issues/1526
+// ------------------------------------------------------------------
+Test('Should Module 1', () => {
+  const { Event } = Type.Module({
+    base: Type.Object({
+      id: Type.Optional(Type.String()),
+      blocking: Type.Optional(Type.Boolean({ default: true }))
+    }),
+    Event: Type.Union([
+      Type.Intersect([
+        Type.Ref('base'),
+        Type.Object({
+          type: Type.Literal('audio'),
+          src: Type.String()
+        })
+      ]),
+      Type.Intersect([
+        Type.Ref('base'),
+        Type.Object({
+          type: Type.Literal('for'),
+          do: Type.Ref('Event')
+        })
+      ])
+    ])
+  })
+  const Result = Value.Default(Event, { type: 'audio', src: 'test.mp3' })
+  Assert.IsEqual(Result, { type: 'audio', src: 'test.mp3', blocking: true })
+})