@tstdl/base 0.91.0-beta7 → 0.91.0-beta8

package/package.json

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

package/schema/schemas/function.d.ts

@@ -1,8 +1,8 @@
-import type { JsonPath } from '../../json-path/json-path.js';
 import { type SchemaPropertyDecorator, type SchemaPropertyDecoratorOptions } from '../decorators/index.js';
-import { Schema, type SchemaTestOptions, type SchemaTestResult } from '../schema.js';
-export declare class FunctionSchema extends Schema<Function> {
-    _test(value: any, path: JsonPath, options: SchemaTestOptions): SchemaTestResult<Function>;
+import { SimpleSchema, type SimpleSchemaOptions } from './simple.js';
+export type FunctionSchemaOptions = SimpleSchemaOptions;
+export declare class FunctionSchema extends SimpleSchema<Function> {
+    constructor(options?: FunctionSchemaOptions);
 }
 export declare function func(): FunctionSchema;
 export declare function Function(options?: SchemaPropertyDecoratorOptions): SchemaPropertyDecorator;

package/schema/schemas/function.js

@@ -1,14 +1,9 @@
-import { SchemaError } from '../../schema/schema.error.js';
 import { isFunction } from '../../utils/type-guards.js';
-import { typeOf } from '../../utils/type-of.js';
 import { Property } from '../decorators/index.js';
-import { Schema } from '../schema.js';
-export class FunctionSchema extends Schema {
-    _test(value, path, options) {
-        if (isFunction(value)) {
-            return { valid: true, value };
-        }
-        return { valid: false, error: SchemaError.expectedButGot('Function', typeOf(value), path, { fast: options.fastErrors }) };
+import { SimpleSchema } from './simple.js';
+export class FunctionSchema extends SimpleSchema {
+    constructor(options) {
+        super('function', isFunction, options);
     }
 }
 export function func() {

package/schema/testable.js

@@ -2,6 +2,7 @@ import { isFunction } from '../utils/type-guards.js';
 import { Schema } from './schema.js';
 import { bigint } from './schemas/bigint.js';
 import { boolean } from './schemas/boolean.js';
+import { func } from './schemas/function.js';
 import { number } from './schemas/number.js';
 import { getSchemaFromReflection } from './schemas/object.js';
 import { string } from './schemas/string.js';
@@ -21,6 +22,8 @@ export function schemaTestableToSchema(testable) {
             return bigint();
         case Symbol:
             return symbol();
+        case Function:
+            return func();
         default:
             return getSchemaFromReflection(testable);
     }

package/templates/resolvers/string.template-resolver.js

@@ -8,14 +8,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { Singleton } from '../../injector/decorators.js';
-import { func, Union } from '../../schema/index.js';
+import { Union } from '../../schema/index.js';
 import { TemplateField } from '../template.model.js';
 import { TemplateResolver } from '../template.resolver.js';
 export class StringTemplateField extends TemplateField {
     template;
 }
 __decorate([
-    Union(String, func()),
+    Union(String, Function),
     __metadata("design:type", Object)
 ], StringTemplateField.prototype, "template", void 0);
 let StringTemplateResolver = class StringTemplateResolver extends TemplateResolver {