@tstdl/base 0.93.57 → 0.93.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.57",
+  "version": "0.93.58",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

package/schema/converters/zod-converter.js

@@ -83,7 +83,7 @@ function convertToZodSchemaBase(schema, options) {
         const propertyEntries = objectEntries(s.properties);
         // Handle generic records (no specific properties, but has unknownProperties/Key)
         if ((propertyEntries.length == 0) && (isNotNull(s.unknownPropertiesKey) || isNotNull(s.unknownProperties))) {
-            return z.record(convertToZodSchema(s.unknownPropertiesKey ?? any()), convertToZodSchema(s.unknownProperties ?? any()));
+            return z.record(convertToZodSchemaBase(s.unknownPropertiesKey ?? any(), options), convertToZodSchemaBase(s.unknownProperties ?? any(), options));
         }
         const shape = {};
         for (const [key, propertySchema] of propertyEntries) {
@@ -147,11 +147,11 @@ function convertToZodSchemaBase(schema, options) {
         .with(P.instanceOf(FunctionSchema), (s) => {
         let zodSchema = z.function();
         if (isNotNull(s.parameterSchemas)) {
-            const args = s.parameterSchemas.map((parameterSchema) => convertToZodSchema(parameterSchema, options));
+            const args = s.parameterSchemas.map((parameterSchema) => convertToZodSchemaBase(parameterSchema, options));
             zodSchema = zodSchema.input(...args);
         }
         if (isNotNull(s.returnValueSchema)) {
-            zodSchema = zodSchema.output(convertToZodSchema(s.returnValueSchema, options));
+            zodSchema = zodSchema.output(convertToZodSchemaBase(s.returnValueSchema, options));
         }
         return zodSchema;
     })

package/schema/converters/zod-v3-converter.js

@@ -82,7 +82,7 @@ function convertToZodSchemaBase(schema, options) {
         const propertyEntries = objectEntries(s.properties);
         // Handle generic records (no specific properties, but has unknownProperties/Key)
         if ((propertyEntries.length == 0) && (isNotNull(s.unknownPropertiesKey) || isNotNull(s.unknownProperties))) {
-            return z.record(convertToZodV3Schema(s.unknownPropertiesKey ?? any()), convertToZodV3Schema(s.unknownProperties ?? any()));
+            return z.record(convertToZodSchemaBase(s.unknownPropertiesKey ?? any(), options), convertToZodSchemaBase(s.unknownProperties ?? any(), options));
         }
         const shape = {};
         for (const [key, propertySchema] of propertyEntries) {

package/schema/schemas/function.d.ts

@@ -8,16 +8,19 @@ export type FunctionSchemaOptions<T extends Function> = SimpleSchemaOptions<T> &
 type MappedParameters<T> = {
     [I in keyof T]: SchemaTestable<T[I]>;
 };
-export declare class FunctionSchema<T extends (...args: any[]) => any> extends SimpleSchema<T> {
+type NormalizedMappedParameters<T> = {
+    [I in keyof T]: Schema<T[I]>;
+};
+export declare class FunctionSchema<T extends Function> extends SimpleSchema<T> {
     readonly name = "function";
-    readonly parameterSchemas: MappedParameters<Parameters<T>> | null;
+    readonly parameterSchemas: NormalizedMappedParameters<Parameters<T>> | null;
     readonly parameterNames: (string | null)[];
-    readonly returnValueSchema: SchemaTestable<ReturnType<T>> | null;
+    readonly returnValueSchema: Schema<ReturnType<T>> | null;
     constructor(parameterSchemas: MappedParameters<Parameters<T>> | null, returnValueSchema: SchemaTestable<ReturnType<T>> | null, options?: FunctionSchemaOptions<T>);
 }
-export declare function func<T extends (...args: any[]) => any>(parameterSchemas: MappedParameters<Parameters<T>> | null, returnValueSchema: SchemaTestable<ReturnType<T>> | null, options?: FunctionSchemaOptions<T>): FunctionSchema<T>;
-export declare function Method<T extends (...args: any[]) => any>(options?: FunctionSchemaOptions<T> & SchemaDecoratorOptions): CombinedSchemaDecorator;
-export declare function Method<T extends (...args: any[]) => any>(parameterSchemas: MappedParameters<Parameters<T>> | null, returnValueSchema: SchemaTestable<ReturnType<T>> | null, options?: FunctionSchemaOptions<T> & SchemaDecoratorOptions): CombinedSchemaDecorator;
-export declare function getFunctionSchemaFromReflection(type: AbstractConstructor, method: string | symbol): Schema<Function> | FunctionSchema<(...args: any[]) => any>;
-export declare function tryGetFunctionSchemaFromReflection(type: AbstractConstructor, method: string | symbol): Schema<Function> | FunctionSchema<(...args: any[]) => any> | null;
+export declare function func<T extends Function>(parameterSchemas: MappedParameters<Parameters<T>> | null, returnValueSchema: SchemaTestable<ReturnType<T>> | null, options?: FunctionSchemaOptions<T>): FunctionSchema<T>;
+export declare function Method<T extends Function>(options?: FunctionSchemaOptions<T> & SchemaDecoratorOptions): CombinedSchemaDecorator;
+export declare function Method<T extends Function>(parameterSchemas: MappedParameters<Parameters<T>> | null, returnValueSchema: SchemaTestable<ReturnType<T>> | null, options?: FunctionSchemaOptions<T> & SchemaDecoratorOptions): CombinedSchemaDecorator;
+export declare function getFunctionSchemaFromReflection(type: AbstractConstructor, method: string | symbol): Schema<Function> | FunctionSchema<Function>;
+export declare function tryGetFunctionSchemaFromReflection(type: AbstractConstructor, method: string | symbol): Schema<Function> | FunctionSchema<Function> | null;
 export {};

package/schema/schemas/function.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-function-type */
 import { reflectionRegistry } from '../../reflection/registry.js';
 import { createMethodDecorator } from '../../reflection/utils.js';
-import { isArray, isDefined, isFunction, isNull, isUndefined } from '../../utils/type-guards.js';
+import { isArray, isDefined, isFunction, isNotNull, isNull, isUndefined } from '../../utils/type-guards.js';
 import { createSchemaDecorator, Property } from '../decorators/index.js';
 import { schemaReflectionDataToSchema } from '../decorators/utils.js';
 import { schemaTestableToSchema } from '../testable.js';
@@ -15,9 +15,9 @@ export class FunctionSchema extends SimpleSchema {
     returnValueSchema;
     constructor(parameterSchemas, returnValueSchema, options) {
         super('function', isFunction, options);
-        this.parameterSchemas = parameterSchemas;
+        this.parameterSchemas = (parameterSchemas?.map((schema) => schemaTestableToSchema(schema)) ?? null);
         this.parameterNames = options?.parameterNames ?? [];
-        this.returnValueSchema = returnValueSchema;
+        this.returnValueSchema = isNotNull(returnValueSchema) ? schemaTestableToSchema(returnValueSchema) : null;
     }
 }
 export function func(parameterSchemas, returnValueSchema, options) {