typebox 1.1.17 → 1.1.19

package/build/value/assert/assert.d.mts

@@ -9,6 +9,6 @@ export declare class AssertError extends Error {
     constructor(source: string, value: unknown, errors: TLocalizedValidationError[]);
 }
 /** Asserts the a value matches the given type. This function returns a TypeScript type asserts predicate and will throw AssertError if value does not match. */
-export declare function Assert<Context extends TProperties, const Type extends TSchema, Result extends unknown = Static<Type, Context>>(context: Context, type: Type, value: unknown): asserts value is Result;
+export declare function Assert<const Type extends TSchema>(type: Type, value: unknown): asserts value is Static<Type>;
 /** Asserts the a value matches the given type. This function returns a TypeScript type asserts predicate and will throw AssertError if value does not match. */
-export declare function Assert<const Type extends TSchema, Result extends unknown = Static<Type>>(type: Type, value: unknown): asserts value is Result;
+export declare function Assert<Context extends TProperties, const Type extends TSchema>(context: Context, type: Type, value: unknown): asserts value is Static<Type, Context>;

package/build/value/assert/assert.mjs

@@ -1,3 +1,4 @@
+// deno-fmt-ignore-file
 import { Arguments } from '../../system/arguments/index.mjs';
 import { Check } from '../check/index.mjs';
 import { Errors } from '../errors/index.mjs';

package/build/value/check/check.d.mts

@@ -1,5 +1,5 @@
 import type { Static, TProperties, TSchema } from '../../type/index.mjs';
 /** Checks a value matches the provided type. */
-export declare function Check<const Type extends TSchema, Result extends unknown = Static<Type>>(type: Type, value: unknown): value is Result;
+export declare function Check<const Type extends TSchema>(type: Type, value: unknown): value is Static<Type>;
 /** Checks a value matches the provided type. */
-export declare function Check<Context extends TProperties, const Type extends TSchema, Result extends unknown = Static<Type, Context>>(context: Context, type: Type, value: unknown): value is Result;
+export declare function Check<Context extends TProperties, const Type extends TSchema>(context: Context, type: Type, value: unknown): value is Static<Type, Context>;

package/build/value/codec/decode.d.mts

@@ -6,17 +6,7 @@ export declare class DecodeError extends AssertError {
 }
 /** Executes Decode callbacks only */
 export declare function DecodeUnsafe(context: TProperties, type: TSchema, value: unknown): unknown;
-/**
- * Decodes a value against the given type by applying a sequence of Clone,
- * Default, Convert, and Clone operations, then executing any embedded Decode
- * callbacks. If the processing sequence fails to produce a value matching the
- * provided type, a DecodeError is thrown.
- */
-export declare function Decode<const Type extends TSchema, Result extends unknown = StaticDecode<Type>>(type: Type, value: unknown): Result;
-/**
- * Decodes a value against the given type by applying a sequence of Clone,
- * Default, Convert, and Clone operations, then executing any embedded Decode
- * callbacks. If the processing sequence fails to produce a value matching the
- * provided type, a DecodeError is thrown.
- */
-export declare function Decode<Context extends TProperties, const Type extends TSchema, Result extends unknown = StaticDecode<Type, Context>>(context: Context, type: Type, value: unknown): Result;
+/** Decodes a value with the given type. */
+export declare function Decode<const Type extends TSchema>(type: Type, value: unknown): StaticDecode<Type>;
+/** Decodes a value with the given type. */
+export declare function Decode<Context extends TProperties, const Type extends TSchema>(context: Context, type: Type, value: unknown): StaticDecode<Type, Context>;

package/build/value/codec/decode.mjs

@@ -40,12 +40,7 @@ const Decoder = Pipeline([
     (context, type, value) => Assert(context, type, value),
     (context, type, value) => DecodeUnsafe(context, type, value)
 ]);
-/**
- * Decodes a value against the given type by applying a sequence of Clone,
- * Default, Convert, and Clone operations, then executing any embedded Decode
- * callbacks. If the processing sequence fails to produce a value matching the
- * provided type, a DecodeError is thrown.
- */
+/** Decodes a value with the given type. */
 export function Decode(...args) {
     const [context, type, value] = Arguments.Match(args, {
         3: (context, type, value) => [context, type, value],

package/build/value/codec/encode.d.mts

@@ -6,7 +6,7 @@ export declare class EncodeError extends AssertError {
 }
 /** Executes Encode callbacks only */
 export declare function EncodeUnsafe(context: TProperties, type: TSchema, value: unknown): unknown;
-/** Encodes a value. */
-export declare function Encode<const Type extends TSchema, Result extends unknown = StaticEncode<Type>>(type: Type, value: unknown): Result;
-/** Encodes a value. */
-export declare function Encode<Context extends TProperties, const Type extends TSchema, Result extends unknown = StaticEncode<Type, Context>>(context: Context, type: Type, value: unknown): Result;
+/** Encodes a value with the given type. */
+export declare function Encode<const Type extends TSchema>(type: Type, value: unknown): StaticEncode<Type>;
+/** Encodes a value with the given type. */
+export declare function Encode<Context extends TProperties, const Type extends TSchema>(context: Context, type: Type, value: unknown): StaticEncode<Type, Context>;

package/build/value/codec/encode.mjs

@@ -40,7 +40,7 @@ const Encoder = Pipeline([
     (context, type, value) => Clean(context, type, value),
     (context, type, value) => Assert(context, type, value),
 ]);
-/** Encodes a value. */
+/** Encodes a value with the given type. */
 export function Encode(...args) {
     const [context, type, value] = Arguments.Match(args, {
         3: (context, type, value) => [context, type, value],

package/build/value/codec/from-intersect.mjs

@@ -2,27 +2,57 @@
 import { Guard } from '../../guard/index.mjs';
 import { FromType } from './from-type.mjs';
 import { Callback } from './callback.mjs';
+import { Clone } from '../clone/index.mjs';
+import { Clean } from '../clean/index.mjs';
+// ------------------------------------------------------------------
+// MergeInteriors
+//
+// Merges all interior operand results into a single object. Each
+// subsequent operand's properties override those of prior operands.
+//
+// ------------------------------------------------------------------
+function MergeInteriors(interiors) {
+    return interiors.reduce((results, interior) => ({ ...results, ...interior }), {});
+}
+// ------------------------------------------------------------------
+// NonMatchingInterior
+//
+// Used when Intersect operands do not all produce Objects. Returns
+// the first interior result that differs from the original value,
+// indicating a Codec has transformed the data. If no operand
+// produced a change, defaults to the first interior result.
+//
+// ------------------------------------------------------------------
+function NonMatchingInterior(value, interiors) {
+    for (const interior of interiors)
+        if (!Guard.IsDeepEqual(value, interior))
+            return interior;
+    return value; // value-unchanged
+}
 // ------------------------------------------------------------------
 // Decode
 // ------------------------------------------------------------------
 function Decode(direction, context, type, value) {
-    for (const schema of type.allOf) {
-        value = FromType(direction, context, schema, value);
-    }
-    return Callback(direction, context, type, value);
+    if (Guard.IsEqual(type.allOf.length, 0))
+        return Callback(direction, context, type, value);
+    const interiors = type.allOf.map((schema) => FromType(direction, context, schema, Clean(schema, Clone(value))));
+    const structural = interiors.every((result) => Guard.IsObject(result));
+    const exterior = structural ? MergeInteriors(interiors) : NonMatchingInterior(value, interiors);
+    return Callback(direction, context, type, exterior);
 }
 // ------------------------------------------------------------------
 // Encode
 // ------------------------------------------------------------------
 function Encode(direction, context, type, value) {
-    let exterior = Callback(direction, context, type, value);
-    for (const schema of type.allOf) {
-        exterior = FromType(direction, context, schema, exterior);
-    }
-    return exterior;
+    if (Guard.IsEqual(type.allOf.length, 0))
+        return Callback(direction, context, type, value);
+    const exterior = Callback(direction, context, type, value);
+    const interiors = type.allOf.map((schema) => FromType(direction, context, schema, Clean(schema, Clone(exterior))));
+    const structural = interiors.every((result) => Guard.IsObject(result));
+    if (structural)
+        return MergeInteriors(interiors);
+    return NonMatchingInterior(exterior, interiors);
 }
 export function FromIntersect(direction, context, type, value) {
-    return Guard.IsEqual(direction, 'Decode')
-        ? Decode(direction, context, type, value)
-        : Encode(direction, context, type, value);
+    return Guard.IsEqual(direction, 'Decode') ? Decode(direction, context, type, value) : Encode(direction, context, type, value);
 }

package/build/value/create/create.d.mts

@@ -1,5 +1,5 @@
 import type { TProperties, TSchema, Static } from '../../type/index.mjs';
 /** Creates a value from the provided type. This function will use `default` annotations if present. */
-export declare function Create<const Type extends TSchema, Result extends unknown = Static<Type>>(type: Type): Result;
+export declare function Create<const Type extends TSchema>(type: Type): Static<Type>;
 /** Creates a value from the provided type. This function will use `default` annotations if present. */
-export declare function Create<const Context extends TProperties, Type extends TSchema, Result extends unknown = Static<Type, Context>>(context: Context, type: Type): Result;
+export declare function Create<const Context extends TProperties, Type extends TSchema>(context: Context, type: Type): Static<Type, Context>;

package/build/value/parse/parse.d.mts

@@ -6,6 +6,6 @@ export declare class ParseError extends AssertError {
 }
 export declare const Parser: import("../pipeline/pipeline.mjs").PipelineInterface;
 /**  Parses a value with the given type. */
-export declare function Parse<const Type extends TSchema, Result extends unknown = StaticParse<Type>>(type: Type, value: unknown): Result;
+export declare function Parse<const Type extends TSchema>(type: Type, value: unknown): StaticParse<Type>;
 /**  Parses a value with the given type. */
-export declare function Parse<Context extends TProperties, const Type extends TSchema, Result extends unknown = StaticParse<Type, Context>>(context: Context, type: Type, value: unknown): Result;
+export declare function Parse<Context extends TProperties, const Type extends TSchema>(context: Context, type: Type, value: unknown): StaticParse<Type, Context>;

package/build/value/repair/repair.d.mts

@@ -6,7 +6,7 @@ import type { TProperties, TSchema, Static } from '../../type/index.mjs';
  * default structures derived from the type. If the value already conforms to the type, no
  * action is performed.
  */
-export declare function Repair<const Type extends TSchema, Result extends unknown = Static<Type>>(type: Type, value: unknown): Result;
+export declare function Repair<const Type extends TSchema>(type: Type, value: unknown): Static<Type>;
 /**
  * Repairs a value to match the provided type. This function is intended for data migration
  * scenarios where existing values need to be migrating to an updated type. This function will
@@ -14,4 +14,4 @@ export declare function Repair<const Type extends TSchema, Result extends unknow
  * default structures derived from the type. If the value already conforms to the type, no
  * action is performed.
  */
-export declare function Repair<Context extends TProperties, const Type extends TSchema, Result extends unknown = Static<Type, Context>>(context: Context, type: Type, value: unknown): Result;
+export declare function Repair<Context extends TProperties, const Type extends TSchema>(context: Context, type: Type, value: unknown): Static<Type, Context>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typebox",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "keywords": [
     "typescript",
     "jsonschema"