@sinclair/typebox 0.32.20 → 0.32.22

package/build/import/type/composite/composite.d.mts

@@ -6,9 +6,9 @@ import { type TKeyOfPropertyKeys } from '../keyof/index.mjs';
 import { type TNever } from '../never/index.mjs';
 import { type TObject, type TProperties, type ObjectOptions } from '../object/index.mjs';
 import { TSetDistinct } from '../sets/index.mjs';
-type TCompositeKeys<T extends TSchema[], Acc extends PropertyKey[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TCompositeKeys<R, TSetDistinct<[...Acc, ...TKeyOfPropertyKeys<L>]>> : Acc);
-type TFilterNever<T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TNever ? Acc : TFilterNever<R, [...Acc, L]> : Acc);
-type TCompositeProperty<T extends TSchema[], K extends PropertyKey, Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TCompositeProperty<R, K, TFilterNever<[...Acc, ...TIndexFromPropertyKeys<L, [K]>]>> : Acc);
+type TCompositeKeys<T extends TSchema[], Acc extends PropertyKey[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TCompositeKeys<R, [...Acc, ...TKeyOfPropertyKeys<L>]> : TSetDistinct<Acc>);
+type TFilterNever<T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TNever ? TFilterNever<R, [...Acc]> : TFilterNever<R, [...Acc, L]> : Acc);
+type TCompositeProperty<T extends TSchema[], K extends PropertyKey, Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TCompositeProperty<R, K, [...Acc, ...TIndexFromPropertyKeys<L, [K]>]> : TFilterNever<Acc>);
 type TCompositeProperties<T extends TSchema[], K extends PropertyKey[], Acc = {}> = (K extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? TCompositeProperties<T, R, Acc & {
     [_ in L]: TIntersectEvaluated<TCompositeProperty<T, L>>;
 }> : Acc);

package/build/import/type/composite/composite.mjs

@@ -9,9 +9,9 @@ import { SetDistinct } from '../sets/index.mjs';
 import { IsNever } from '../guard/type.mjs';
 // prettier-ignore
 function CompositeKeys(T) {
-    return T.reduce((Acc, L) => {
-        return SetDistinct([...Acc, ...KeyOfPropertyKeys(L)]);
-    }, []);
+    return SetDistinct(T.reduce((Acc, L) => {
+        return ([...Acc, ...KeyOfPropertyKeys(L)]);
+    }, []));
 }
 // prettier-ignore
 function FilterNever(T) {
@@ -19,9 +19,9 @@ function FilterNever(T) {
 }
 // prettier-ignore
 function CompositeProperty(T, K) {
-    return T.reduce((Acc, L) => {
-        return FilterNever([...Acc, ...IndexFromPropertyKeys(L, [K])]);
-    }, []);
+    return FilterNever(T.reduce((Acc, L) => {
+        return [...Acc, ...IndexFromPropertyKeys(L, [K])];
+    }, []));
 }
 // prettier-ignore
 function CompositeProperties(T, K) {

package/build/import/type/constructor/constructor.d.mts

@@ -1,13 +1,19 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import type { Static } from '../static/index.mjs';
 import type { Ensure } from '../helpers/index.mjs';
+import type { TReadonlyOptional } from '../readonly-optional/index.mjs';
+import type { TReadonly } from '../readonly/index.mjs';
+import type { TOptional } from '../optional/index.mjs';
 import { Kind } from '../symbols/index.mjs';
-type ConstructorStaticReturnType<T extends TSchema, P extends unknown[]> = Static<T, P>;
-type ConstructorStaticParameters<T extends TSchema[], P extends unknown[], Acc extends unknown[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? ConstructorStaticParameters<R, P, [...Acc, Static<L, P>]> : Acc;
-type ConstructorStatic<T extends TSchema[], U extends TSchema, P extends unknown[]> = (Ensure<new (...param: ConstructorStaticParameters<T, P>) => ConstructorStaticReturnType<U, P>>);
+type StaticReturnType<U extends TSchema, P extends unknown[]> = Static<U, P>;
+type StaticParameter<T extends TSchema, P extends unknown[]> = T extends TReadonlyOptional<T> ? [Readonly<Static<T, P>>?] : T extends TReadonly<T> ? [Readonly<Static<T, P>>] : T extends TOptional<T> ? [Static<T, P>?] : [
+    Static<T, P>
+];
+type StaticParameters<T extends TSchema[], P extends unknown[], Acc extends unknown[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? StaticParameters<R, P, [...Acc, ...StaticParameter<L, P>]> : Acc);
+type StaticConstructor<T extends TSchema[], U extends TSchema, P extends unknown[]> = Ensure<new (...params: StaticParameters<T, P>) => StaticReturnType<U, P>>;
 export interface TConstructor<T extends TSchema[] = TSchema[], U extends TSchema = TSchema> extends TSchema {
     [Kind]: 'Constructor';
-    static: ConstructorStatic<T, U, this['params']>;
+    static: StaticConstructor<T, U, this['params']>;
     type: 'Constructor';
     parameters: T;
     returns: U;

package/build/import/type/function/function.d.mts

@@ -1,13 +1,19 @@
 import type { TSchema, SchemaOptions } from '../schema/index.mjs';
 import type { Static } from '../static/index.mjs';
 import type { Ensure } from '../helpers/index.mjs';
+import type { TReadonlyOptional } from '../readonly-optional/index.mjs';
+import type { TReadonly } from '../readonly/index.mjs';
+import type { TOptional } from '../optional/index.mjs';
 import { Kind } from '../symbols/index.mjs';
-type FunctionStaticReturnType<T extends TSchema, P extends unknown[]> = Static<T, P>;
-type FunctionStaticParameters<T extends TSchema[], P extends unknown[], Acc extends unknown[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? FunctionStaticParameters<R, P, [...Acc, Static<L, P>]> : Acc;
-type FunctionStatic<T extends TSchema[], U extends TSchema, P extends unknown[]> = (Ensure<(...param: FunctionStaticParameters<T, P>) => FunctionStaticReturnType<U, P>>);
+type StaticReturnType<U extends TSchema, P extends unknown[]> = Static<U, P>;
+type StaticParameter<T extends TSchema, P extends unknown[]> = T extends TReadonlyOptional<T> ? [Readonly<Static<T, P>>?] : T extends TReadonly<T> ? [Readonly<Static<T, P>>] : T extends TOptional<T> ? [Static<T, P>?] : [
+    Static<T, P>
+];
+type StaticParameters<T extends TSchema[], P extends unknown[], Acc extends unknown[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? StaticParameters<R, P, [...Acc, ...StaticParameter<L, P>]> : Acc);
+type StaticFunction<T extends TSchema[], U extends TSchema, P extends unknown[]> = Ensure<(...params: StaticParameters<T, P>) => StaticReturnType<U, P>>;
 export interface TFunction<T extends TSchema[] = TSchema[], U extends TSchema = TSchema> extends TSchema {
     [Kind]: 'Function';
-    static: FunctionStatic<T, U, this['params']>;
+    static: StaticFunction<T, U, this['params']>;
     type: 'Function';
     parameters: T;
     returns: U;

package/build/import/value/convert/convert.mjs

@@ -110,10 +110,8 @@ function Default(value) {
 // Convert
 // ------------------------------------------------------------------
 function FromArray(schema, references, value) {
-    if (IsArray(value)) {
-        return value.map((value) => Visit(schema.items, references, value));
-    }
-    return value;
+    const elements = IsArray(value) ? value : [value];
+    return elements.map((element) => Visit(schema.items, references, element));
 }
 function FromBigInt(schema, references, value) {
     return TryConvertBigInt(value);

package/build/require/type/composite/composite.d.ts

@@ -6,9 +6,9 @@ import { type TKeyOfPropertyKeys } from '../keyof/index';
 import { type TNever } from '../never/index';
 import { type TObject, type TProperties, type ObjectOptions } from '../object/index';
 import { TSetDistinct } from '../sets/index';
-type TCompositeKeys<T extends TSchema[], Acc extends PropertyKey[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TCompositeKeys<R, TSetDistinct<[...Acc, ...TKeyOfPropertyKeys<L>]>> : Acc);
-type TFilterNever<T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TNever ? Acc : TFilterNever<R, [...Acc, L]> : Acc);
-type TCompositeProperty<T extends TSchema[], K extends PropertyKey, Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TCompositeProperty<R, K, TFilterNever<[...Acc, ...TIndexFromPropertyKeys<L, [K]>]>> : Acc);
+type TCompositeKeys<T extends TSchema[], Acc extends PropertyKey[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TCompositeKeys<R, [...Acc, ...TKeyOfPropertyKeys<L>]> : TSetDistinct<Acc>);
+type TFilterNever<T extends TSchema[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? L extends TNever ? TFilterNever<R, [...Acc]> : TFilterNever<R, [...Acc, L]> : Acc);
+type TCompositeProperty<T extends TSchema[], K extends PropertyKey, Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TCompositeProperty<R, K, [...Acc, ...TIndexFromPropertyKeys<L, [K]>]> : TFilterNever<Acc>);
 type TCompositeProperties<T extends TSchema[], K extends PropertyKey[], Acc = {}> = (K extends [infer L extends PropertyKey, ...infer R extends PropertyKey[]] ? TCompositeProperties<T, R, Acc & {
     [_ in L]: TIntersectEvaluated<TCompositeProperty<T, L>>;
 }> : Acc);

package/build/require/type/composite/composite.js

@@ -13,9 +13,9 @@ const index_5 = require("../sets/index");
 const type_1 = require("../guard/type");
 // prettier-ignore
 function CompositeKeys(T) {
-    return T.reduce((Acc, L) => {
-        return (0, index_5.SetDistinct)([...Acc, ...(0, index_3.KeyOfPropertyKeys)(L)]);
-    }, []);
+    return (0, index_5.SetDistinct)(T.reduce((Acc, L) => {
+        return ([...Acc, ...(0, index_3.KeyOfPropertyKeys)(L)]);
+    }, []));
 }
 // prettier-ignore
 function FilterNever(T) {
@@ -23,9 +23,9 @@ function FilterNever(T) {
 }
 // prettier-ignore
 function CompositeProperty(T, K) {
-    return T.reduce((Acc, L) => {
-        return FilterNever([...Acc, ...(0, index_2.IndexFromPropertyKeys)(L, [K])]);
-    }, []);
+    return FilterNever(T.reduce((Acc, L) => {
+        return [...Acc, ...(0, index_2.IndexFromPropertyKeys)(L, [K])];
+    }, []));
 }
 // prettier-ignore
 function CompositeProperties(T, K) {

package/build/require/type/constructor/constructor.d.ts

@@ -1,13 +1,19 @@
 import type { TSchema, SchemaOptions } from '../schema/index';
 import type { Static } from '../static/index';
 import type { Ensure } from '../helpers/index';
+import type { TReadonlyOptional } from '../readonly-optional/index';
+import type { TReadonly } from '../readonly/index';
+import type { TOptional } from '../optional/index';
 import { Kind } from '../symbols/index';
-type ConstructorStaticReturnType<T extends TSchema, P extends unknown[]> = Static<T, P>;
-type ConstructorStaticParameters<T extends TSchema[], P extends unknown[], Acc extends unknown[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? ConstructorStaticParameters<R, P, [...Acc, Static<L, P>]> : Acc;
-type ConstructorStatic<T extends TSchema[], U extends TSchema, P extends unknown[]> = (Ensure<new (...param: ConstructorStaticParameters<T, P>) => ConstructorStaticReturnType<U, P>>);
+type StaticReturnType<U extends TSchema, P extends unknown[]> = Static<U, P>;
+type StaticParameter<T extends TSchema, P extends unknown[]> = T extends TReadonlyOptional<T> ? [Readonly<Static<T, P>>?] : T extends TReadonly<T> ? [Readonly<Static<T, P>>] : T extends TOptional<T> ? [Static<T, P>?] : [
+    Static<T, P>
+];
+type StaticParameters<T extends TSchema[], P extends unknown[], Acc extends unknown[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? StaticParameters<R, P, [...Acc, ...StaticParameter<L, P>]> : Acc);
+type StaticConstructor<T extends TSchema[], U extends TSchema, P extends unknown[]> = Ensure<new (...params: StaticParameters<T, P>) => StaticReturnType<U, P>>;
 export interface TConstructor<T extends TSchema[] = TSchema[], U extends TSchema = TSchema> extends TSchema {
     [Kind]: 'Constructor';
-    static: ConstructorStatic<T, U, this['params']>;
+    static: StaticConstructor<T, U, this['params']>;
     type: 'Constructor';
     parameters: T;
     returns: U;

package/build/require/type/function/function.d.ts

@@ -1,13 +1,19 @@
 import type { TSchema, SchemaOptions } from '../schema/index';
 import type { Static } from '../static/index';
 import type { Ensure } from '../helpers/index';
+import type { TReadonlyOptional } from '../readonly-optional/index';
+import type { TReadonly } from '../readonly/index';
+import type { TOptional } from '../optional/index';
 import { Kind } from '../symbols/index';
-type FunctionStaticReturnType<T extends TSchema, P extends unknown[]> = Static<T, P>;
-type FunctionStaticParameters<T extends TSchema[], P extends unknown[], Acc extends unknown[] = []> = T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? FunctionStaticParameters<R, P, [...Acc, Static<L, P>]> : Acc;
-type FunctionStatic<T extends TSchema[], U extends TSchema, P extends unknown[]> = (Ensure<(...param: FunctionStaticParameters<T, P>) => FunctionStaticReturnType<U, P>>);
+type StaticReturnType<U extends TSchema, P extends unknown[]> = Static<U, P>;
+type StaticParameter<T extends TSchema, P extends unknown[]> = T extends TReadonlyOptional<T> ? [Readonly<Static<T, P>>?] : T extends TReadonly<T> ? [Readonly<Static<T, P>>] : T extends TOptional<T> ? [Static<T, P>?] : [
+    Static<T, P>
+];
+type StaticParameters<T extends TSchema[], P extends unknown[], Acc extends unknown[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? StaticParameters<R, P, [...Acc, ...StaticParameter<L, P>]> : Acc);
+type StaticFunction<T extends TSchema[], U extends TSchema, P extends unknown[]> = Ensure<(...params: StaticParameters<T, P>) => StaticReturnType<U, P>>;
 export interface TFunction<T extends TSchema[] = TSchema[], U extends TSchema = TSchema> extends TSchema {
     [Kind]: 'Function';
-    static: FunctionStatic<T, U, this['params']>;
+    static: StaticFunction<T, U, this['params']>;
     type: 'Function';
     parameters: T;
     returns: U;

package/build/require/value/convert/convert.js

@@ -114,10 +114,8 @@ function Default(value) {
 // Convert
 // ------------------------------------------------------------------
 function FromArray(schema, references, value) {
-    if ((0, index_5.IsArray)(value)) {
-        return value.map((value) => Visit(schema.items, references, value));
-    }
-    return value;
+    const elements = (0, index_5.IsArray)(value) ? value : [value];
+    return elements.map((element) => Visit(schema.items, references, element));
 }
 function FromBigInt(schema, references, value) {
     return TryConvertBigInt(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.32.20",
+  "version": "0.32.22",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",

package/readme.md

@@ -1693,6 +1693,7 @@ The following is a list of community packages that offer general tooling, extend
 | [h3-typebox](https://github.com/kevinmarrec/h3-typebox) | Schema validation utilities for h3 using TypeBox & Ajv |
 | [http-wizard](https://github.com/flodlc/http-wizard) | Type safe http client library for Fastify |
 | [openapi-box](https://github.com/geut/openapi-box) | Generate TypeBox types from OpenApi IDL + Http client library |
+| [prismabox](https://github.com/m1212e/prismabox) | Converts a prisma.schema to typebox schema matching the database models |
 | [schema2typebox](https://github.com/xddq/schema2typebox)  | Creating TypeBox code from Json Schemas |
 | [sveltekit-superforms](https://github.com/ciscoheat/sveltekit-superforms)  | A comprehensive SvelteKit form library for server and client validation |
 | [ts2typebox](https://github.com/xddq/ts2typebox) | Creating TypeBox code from Typescript types |