@tstdl/base 0.91.0-beta10 → 0.91.0-beta11

package/authentication/authentication.api.d.ts

@@ -1,5 +1,5 @@
 import { type ApiDefinition } from '../api/types.js';
-import { type ObjectSchema, type ObjectSchemaOrType } from '../schema/index.js';
+import { ObjectSchema, type ObjectSchemaOrType } from '../schema/index.js';
 import type { SchemaTestable } from '../schema/schema.js';
 import type { Record } from '../types.js';
 import type { TokenPayload } from './index.js';

package/package.json

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

package/schema/schema.d.ts

@@ -19,10 +19,11 @@ export type SchemaTestResult<T> = {
     error: SchemaError;
 };
 type NormalizePrimitiveToConstructor<T> = Or<IsEqual<T, string>, IsEqual<T, String>> extends true ? typeof String : Or<IsEqual<T, number>, IsEqual<T, Number>> extends true ? typeof Number : Or<IsEqual<T, boolean>, IsEqual<T, Boolean>> extends true ? typeof Boolean : Or<IsEqual<T, bigint>, IsEqual<T, BigInt>> extends true ? typeof BigInt : Or<IsEqual<T, symbol>, IsEqual<T, Symbol>> extends true ? typeof Symbol : never;
-type NormalizeConstructorToPrimitve<T> = T extends String ? string : T extends Number ? number : T extends Boolean ? boolean : T extends BigInt ? bigint : T extends Symbol ? symbol : T;
 export type SchemaTestable<T = unknown> = Schema<T> | AbstractConstructor<T> | NormalizePrimitiveToConstructor<T>;
-export type SchemaOutput<T extends SchemaTestable> = T extends SchemaTestable<infer U> ? NormalizeConstructorToPrimitve<U> : never;
+export type SchemaOutput<T extends SchemaTestable> = T extends SchemaTestable<infer U> ? U : never;
+export declare const OPTIONAL: unique symbol;
 export declare abstract class Schema<T = unknown> {
+    readonly [OPTIONAL]: boolean;
     /**
      * Test an unknown value to see whether it corresponds to the schema.
      * @param schema schema to test against

package/schema/schemas/object.d.ts

@@ -1,10 +1,9 @@
 import type { EmptyObject, Merge } from 'type-fest';
 import type { JsonPath } from '../../json-path/json-path.js';
-import type { AbstractConstructor, OneOrMany, PartialProperty, PropertiesOfType, Record as RecordType, SimplifyObject, Type, TypedOmit } from '../../types.js';
+import type { AbstractConstructor, OneOrMany, PartialProperty, Record as RecordType, SimplifyObject, Type, TypedOmit } from '../../types.js';
 import { type SchemaPropertyDecoratorOptions } from '../decorators/index.js';
 import type { SchemaPropertyDecorator } from '../decorators/types.js';
-import { Schema, type SchemaOutput, type SchemaTestable, type SchemaTestOptions, type SchemaTestResult } from '../schema.js';
-import { type OptionalSchema } from './optional.js';
+import { type OPTIONAL, Schema, type SchemaOutput, type SchemaTestable, type SchemaTestOptions, type SchemaTestResult } from '../schema.js';
 export type Record<K extends PropertyKey = PropertyKey, V = any> = RecordType<K, V>;
 export type ObjectSchemaFactoryFunction<T> = (data: T) => T;
 export type ObjectSchemaFactory<T> = {
@@ -23,8 +22,13 @@ export type ObjectSchemaOptions<T extends Record = Record, K extends PropertyKey
     factory?: ObjectSchemaFactory<T> | null;
 };
 export type ObjectSchemaOrType<T extends Record = any> = ObjectSchema<T> | AbstractConstructor<T>;
+export type OptionalProperties<T> = {
+    [P in keyof T]: T[P] extends {
+        [OPTIONAL]: true;
+    } ? P : never;
+}[keyof T];
 export type ObjectSchemaPropertiesType<TP extends ObjectSchemaProperties> = SimplifyObject<{
-    [P in keyof PartialProperty<TP, PropertiesOfType<TP, OptionalSchema<any>>>]: SchemaOutput<TP[P]>;
+    [P in keyof PartialProperty<TP, OptionalProperties<TP>>]: SchemaOutput<TP[P]>;
 }>;
 export declare const tryGetSchemaFromReflection: typeof _tryGetSchemaFromReflection;
 export declare class ObjectSchema<T extends Record = Record> extends Schema<T> {

package/schema/schemas/optional.d.ts

@@ -1,8 +1,9 @@
 import type { JsonPath } from '../../json-path/json-path.js';
 import type { TypedOmit } from '../../types.js';
 import { type SchemaPropertyDecorator, type SchemaPropertyDecoratorOptions } from '../decorators/index.js';
-import { Schema, type SchemaTestable, type SchemaTestOptions, type SchemaTestResult } from '../schema.js';
+import { type OPTIONAL, Schema, type SchemaTestable, type SchemaTestOptions, type SchemaTestResult } from '../schema.js';
 export declare class OptionalSchema<T> extends Schema<T | undefined> {
+    readonly [OPTIONAL]: true;
     readonly schema: Schema<T>;
     constructor(schema: SchemaTestable<T>);
     _test(value: any, path: JsonPath, options: SchemaTestOptions): SchemaTestResult<T | undefined>;