diff --git a/changelog/1.0.0.md b/changelog/1.0.0.md index 4b06cd29f..ca911d2a7 100644 --- a/changelog/1.0.0.md +++ b/changelog/1.0.0.md @@ -3,6 +3,8 @@ --- ### Version Updates +- [Revision 1.0.22](https://github.com/sinclairzx81/typebox/pull/1375) + - Resolve Socket.Dev False Positive - [Revision 1.0.21](https://github.com/sinclairzx81/typebox/pull/1374) - Enable Trusted Publishing: No Functional Changes - [Revision 1.0.20](https://github.com/sinclairzx81/typebox/pull/1372) diff --git a/src/type/engine/cyclic/extends.ts b/src/type/engine/cyclic/extends.ts index 418ed5590..e732a6b71 100644 --- a/src/type/engine/cyclic/extends.ts +++ b/src/type/engine/cyclic/extends.ts @@ -36,7 +36,7 @@ import { type TArray, Array, IsArray, ArrayOptions } from '../../types/array.ts' import { type TAsyncIterator, AsyncIterator, IsAsyncIterator } from '../../types/async-iterator.ts' import { type TConstructor, Constructor, IsConstructor } from '../../types/constructor.ts' import { type TCyclic } from '../../types/cyclic.ts' -import { type TFunction, Function, IsFunction } from '../../types/function.ts' +import { type TFunction, Function as _Function, IsFunction } from '../../types/function.ts' import { type TIntersect, Intersect, IsIntersect } from '../../types/intersect.ts' import { type TIterator, Iterator, IsIterator } from '../../types/iterator.ts' import { type TObject, Object, IsObject } from '../../types/object.ts' @@ -106,7 +106,7 @@ function FromType(type: Type): TFromType { IsArray(type) ? Array(FromType(type.items), ArrayOptions(type)) : IsAsyncIterator(type) ? AsyncIterator(FromType(type.iteratorItems)) : IsConstructor(type) ? Constructor(FromTypes(type.parameters), FromType(type.instanceType)) : - IsFunction(type) ? Function(FromTypes(type.parameters), FromType(type.returnType)) : + IsFunction(type) ? _Function(FromTypes(type.parameters), FromType(type.returnType)) : IsIntersect(type) ? Intersect(FromTypes(type.allOf)) : IsIterator(type) ? Iterator(FromType(type.iteratorItems)) : IsObject(type) ? Object(FromProperties(type.properties)) : diff --git a/src/type/engine/instantiate.ts b/src/type/engine/instantiate.ts index 732b10dc0..ccc09e750 100644 --- a/src/type/engine/instantiate.ts +++ b/src/type/engine/instantiate.ts @@ -45,7 +45,7 @@ import { type TArray, Array, IsArray, ArrayOptions } from '../types/array.ts' import { type TAsyncIterator, AsyncIterator, IsAsyncIterator, AsyncIteratorOptions } from '../types/async-iterator.ts' import { type TConstructor, Constructor, IsConstructor, ConstructorOptions } from '../types/constructor.ts' import { type TDeferred, Deferred, IsDeferred } from '../types/deferred.ts' -import { type TFunction, Function, IsFunction, FunctionOptions } from '../types/function.ts' +import { type TFunction, Function as _Function, IsFunction, FunctionOptions } from '../types/function.ts' import { type TCall, IsCall } from '../types/call.ts' import { type TIdentifier } from '../types/identifier.ts' import { type TIntersect, Intersect, IsIntersect, IntersectOptions } from '../types/intersect.ts' @@ -369,7 +369,7 @@ export function InstantiateType