Type Fixes

toreda · Jun 10, 2024 · ff6eb17 · ff6eb17
1 parent cd95195
commit ff6eb17
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/src/custom/schema/verify.ts b/src/custom/schema/verify.ts
@@ -28,6 +28,7 @@ import {type SchemaVerifyInit} from '../../schema/verify/init';
 /**
  * @category		Schema – Custom Type
  */
-export interface CustomSchemaVerify<DataT = unknown> extends SchemaVerifyInit<DataT> {
+export interface CustomSchemaVerify<InputT = unknown, DataT = unknown>
+	extends SchemaVerifyInit<InputT, DataT> {
 	typeId: string;
 }
diff --git a/src/custom/types.ts b/src/custom/types.ts
@@ -35,8 +35,7 @@ import {type Resettable} from '@toreda/types';
 import {type CustomSchemaType} from './schema/type';
 import {Schema} from '../schema';
 import {type VerifiedSchema} from '../verified/schema';
-import {type VerifiedField} from '../verified/field';
-import {VerifiedMap} from '../verified/map';
+import {type VerifiedMap} from '../verified/map';
 
 /**
  * Registry of a single schema's registered custom types.
@@ -203,8 +202,8 @@ export class CustomTypes<DataT, InputT extends SchemaData<DataT>, VerifiedT = In
 		return fate;
 	}
 
-	public async verifyOnly(init: CustomSchemaVerify): Promise<Fate<VerifiedSchema<DataT>>> {
-		const fate = new Fate<VerifiedSchema<DataT>>();
+	public async verifyOnly(init: CustomSchemaVerify<InputT, DataT>): Promise<Fate<VerifiedMap<DataT>>> {
+		const fate = new Fate<VerifiedMap<DataT>>();
 
 		const schema = this.getSchema(init.typeId);
 

diff --git a/src/schema.ts b/src/schema.ts
@@ -45,7 +45,6 @@ import {type SchemaVerifyInit} from './schema/verify/init';
 import {type SchemaVerifyValue} from './schema/verify/value';
 import {type VerifiedField} from './verified/field';
 import {type VerifiedMap} from './verified/map';
-import {type VerifiedSchema} from './verified/schema';
 
 /**
  * @category Schema
@@ -177,8 +176,8 @@ export class Schema<DataT, InputT extends SchemaData<DataT>, TransformedT = Inpu
 		value: InputT | SchemaData<InputT>,
 		tracer: Tracer,
 		base: Log
-	): Promise<Fate<VerifiedField<DataT>>> {
-		const fate = new Fate<VerifiedField<DataT>>();
+	): Promise<Fate<VerifiedField<DataT> | VerifiedField<DataT>[]>> {
+		const fate = new Fate<VerifiedField<DataT> | VerifiedField<DataT>[]>();
 
 		if (value === null) {
 			if (field.types.includes('null')) {
@@ -278,9 +277,9 @@ export class Schema<DataT, InputT extends SchemaData<DataT>, TransformedT = Inpu
 	 * the expected range or format (if any).
 	 */
 	public async verifyValue(
-		init: SchemaVerifyValue<DataT, InputT>
-	): Promise<Fate<DataT | VerifiedField<DataT>>> {
-		const fate = new Fate<DataT | VerifiedField<DataT>>();
+		init: SchemaVerifyValue<InputT, DataT>
+	): Promise<Fate<DataT | VerifiedMap<DataT>>> {
+		const fate = new Fate<DataT | VerifiedMap<DataT>>();
 
 		if (this.isBuiltIn(init.fieldType)) {
 			if (this.valueHasBuiltinType(init.fieldType, init.value)) {
@@ -318,7 +317,7 @@ export class Schema<DataT, InputT extends SchemaData<DataT>, TransformedT = Inpu
 		);
 	}
 
-	public async verify(init: SchemaVerifyInit): Promise<Fate<TransformedT | null>> {
+	public async verify(init: SchemaVerifyInit<InputT, DataT>): Promise<Fate<TransformedT | null>> {
 		const fate = new Fate<TransformedT | null>();
 
 		if (!init) {
@@ -386,8 +385,8 @@ export class Schema<DataT, InputT extends SchemaData<DataT>, TransformedT = Inpu
 	 * Verify provided data object's structure, content, and types against this schema.
 	 * @param init
 	 */
-	public async verifyOnly(init: SchemaVerifyInit): Promise<Fate<VerifiedSchema<DataT>>> {
-		const fate = new Fate<VerifiedSchema<DataT>>();
+	public async verifyOnly(init: SchemaVerifyInit<InputT, DataT>): Promise<Fate<VerifiedMap<DataT>>> {
+		const fate = new Fate<VerifiedMap<DataT>>();
 
 		const currPath = init.tracer ? init.tracer : new Tracer();
 		// Root schemas (no parent) use their schema name as the first path item. Child schemas DO NOT

diff --git a/src/schema/field/type.ts b/src/schema/field/type.ts
@@ -28,7 +28,7 @@
  *
  * @category		Schema – Field
  */
-export type SchemaFieldType<InputT = unknown> =
+export type SchemaFieldType<DataT = unknown> =
 	| 'bigint[]'
 	| 'bigint'
 	| 'BigInt'
@@ -65,4 +65,4 @@ export type SchemaFieldType<InputT = unknown> =
 	| 'url[]'
 	| 'time'
 	| 'time[]'
-	| Extract<keyof InputT, string>;
+	| Extract<keyof DataT, string>;
diff --git a/src/schema/verify/value.ts b/src/schema/verify/value.ts
@@ -31,7 +31,7 @@ import {type SchemaData} from '../data';
 /**
  * @category		Schema
  */
-export interface SchemaVerifyValue<DataT = unknown, InputT = unknown> {
+export interface SchemaVerifyValue<InputT = unknown, DataT = unknown> {
 	fieldId: string;
 	fieldType: SchemaFieldType<DataT>;
 	tracer: Tracer;

diff --git a/src/verified/map.ts b/src/verified/map.ts
@@ -30,4 +30,4 @@ import {type VerifiedField} from './field';
  *
  * @category		Schema – Transform Output
  */
-export type VerifiedMap<DataT> = Map<string, VerifiedField<DataT> | null>;
+export type VerifiedMap<DataT> = Map<string, VerifiedField<DataT> | VerifiedField<DataT>[] | null>;