Remove UnknownIfNever

decs · Oct 14, 2024 · c732153 · c732153
1 parent a5c728d
commit c732153
Show file tree

Hide file tree

Showing 48 changed files with 141 additions and 346 deletions.
diff --git a/packages/all/src/index.ts b/packages/all/src/index.ts
diff --git a/packages/arktype/src/index.ts b/packages/arktype/src/index.ts
diff --git a/packages/arktype/src/resolver.ts b/packages/arktype/src/resolver.ts
@@ -5,6 +5,8 @@ export interface AdapterResolver extends Resolver {
   base: IfDefined<Type, 'arktype'>;
   input: this['schema'] extends this['base']
     ? this['schema']['inferIn']
-    : never;
-  output: this['schema'] extends this['base'] ? this['schema']['infer'] : never;
+    : unknown;
+  output: this['schema'] extends this['base']
+    ? this['schema']['infer']
+    : unknown;
 }
diff --git a/packages/class-validator/src/index.ts b/packages/class-validator/src/index.ts
diff --git a/packages/class-validator/src/resolver.ts b/packages/class-validator/src/resolver.ts
@@ -12,11 +12,11 @@ export interface AdapterResolver extends Resolver {
   input: this['schema'] extends this['base']
     ? this['schema'] extends {prototype: unknown}
       ? Attributes<this['schema']['prototype']>
-      : never
-    : never;
+      : unknown
+    : unknown;
   output: this['schema'] extends this['base']
     ? this['schema'] extends {prototype: unknown}
       ? Attributes<this['schema']['prototype']>
-      : never
-    : never;
+      : unknown
+    : unknown;
 }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -4,13 +4,7 @@ export {
   SerializationAdapter,
   ToJSONSchema,
 } from './serialization';
-export {
-  IfDefined,
-  memoize,
-  memoizeWithKey,
-  UnknownIfNever,
-  unsupportedAdapter,
-} from './utils';
+export {IfDefined, memoize, memoizeWithKey, unsupportedAdapter} from './utils';
 export {
   Assert,
   createAssert,

diff --git a/packages/core/src/resolver.ts b/packages/core/src/resolver.ts
@@ -1,22 +1,16 @@
-import type {IfDefined} from './utils';
-
 export interface Resolver<TSchema = unknown> {
   schema: TSchema;
   input: unknown;
   output: unknown;
   base: unknown;
 }
 
-export type SchemaFrom<TResolver extends Resolver> = IfDefined<
-  TResolver['base']
->;
+export type SchemaFrom<TResolver extends Resolver> = TResolver['base'];
 
-export type InputFrom<TResolver extends Resolver, TSchema> =
-  TSchema extends SchemaFrom<TResolver>
-    ? IfDefined<(TResolver & {schema: TSchema})['input']>
-    : never;
+export type InputFrom<TResolver extends Resolver, TSchema> = (TResolver & {
+  schema: TSchema;
+})['input'];
 
-export type OutputFrom<TResolver extends Resolver, TSchema> =
-  TSchema extends SchemaFrom<TResolver>
-    ? IfDefined<(TResolver & {schema: TSchema})['output']>
-    : never;
+export type OutputFrom<TResolver extends Resolver, TSchema> = (TResolver & {
+  schema: TSchema;
+})['output'];
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -1,13 +1,14 @@
 import type {Resolver, SchemaFrom} from './resolver';
 
-export type IfDefined<TValue, TModule extends string = ''> = unknown extends TValue
+export type IfDefined<
+  TValue,
+  TModule extends string = '',
+> = unknown extends TValue
   ? TModule extends ''
     ? never
     : `Cannot find module '${TModule}'`
   : TValue;
 
-export type UnknownIfNever<T> = [T] extends [never] ? unknown : T;
-
 /* @__NO_SIDE_EFFECTS__ */
 export function memoize<TValue>(
   fn: () => Promise<TValue>,

diff --git a/packages/core/src/validation.ts b/packages/core/src/validation.ts
@@ -1,5 +1,4 @@
 import type {OutputFrom, Resolver, SchemaFrom} from './resolver';
-import type {UnknownIfNever} from './utils';
 
 import {memoizeWithKey} from './utils';
 
@@ -17,17 +16,15 @@ export type ValidationAdapter<TResolver extends Resolver> = <
 >(
   schema: TSchema,
 ) => Promise<
-  (
-    data: unknown,
-  ) => Promise<ValidationResult<UnknownIfNever<OutputFrom<TResolver, TSchema>>>>
+  (data: unknown) => Promise<ValidationResult<OutputFrom<TResolver, TSchema>>>
 >;
 
 export type Validate<TResolver extends Resolver> = <
   TSchema extends SchemaFrom<TResolver>,
 >(
   schema: TSchema,
   data: unknown,
-) => Promise<ValidationResult<UnknownIfNever<OutputFrom<TResolver, TSchema>>>>;
+) => Promise<ValidationResult<OutputFrom<TResolver, TSchema>>>;
 
 /* @__NO_SIDE_EFFECTS__ */
 export function createValidate<TResolver extends Resolver>(
@@ -47,7 +44,7 @@ export type Assert<TResolver extends Resolver> = <
 >(
   schema: TSchema,
   data: unknown,
-) => Promise<UnknownIfNever<OutputFrom<TResolver, TSchema>>>;
+) => Promise<OutputFrom<TResolver, TSchema>>;
 
 /* @__NO_SIDE_EFFECTS__ */
 export function createAssert<TResolver extends Resolver>(

diff --git a/packages/core/src/wrap.ts b/packages/core/src/wrap.ts
@@ -1,5 +1,4 @@
 import type {InputFrom, OutputFrom, Resolver, SchemaFrom} from './resolver';
-import type {UnknownIfNever} from './utils';
 import type {Assert, Validate, ValidationIssue} from './validation';
 
 export type TypeSchema<TOutput, TInput = TOutput> = {
@@ -16,10 +15,7 @@ export type Wrap<TResolver extends Resolver> = <
   TSchema extends SchemaFrom<TResolver>,
 >(
   schema: TSchema,
-) => TypeSchema<
-  UnknownIfNever<OutputFrom<TResolver, TSchema>>,
-  UnknownIfNever<InputFrom<TResolver, TSchema>>
->;
+) => TypeSchema<OutputFrom<TResolver, TSchema>, InputFrom<TResolver, TSchema>>;
 
 /* @__NO_SIDE_EFFECTS__ */
 export function createWrap<TResolver extends Resolver>(

diff --git a/packages/deepkit/src/index.ts b/packages/deepkit/src/index.ts
diff --git a/packages/deepkit/src/resolver.ts b/packages/deepkit/src/resolver.ts
@@ -3,6 +3,6 @@ import type {IfDefined, Resolver} from '@typeschema/core';
 
 export interface AdapterResolver extends Resolver {
   base: IfDefined<Type, '@deepkit/type'>;
-  input: this['schema'] extends this['base'] ? unknown : never;
-  output: this['schema'] extends this['base'] ? unknown : never;
+  input: unknown;
+  output: unknown;
 }
diff --git a/packages/effect/src/index.ts b/packages/effect/src/index.ts
diff --git a/packages/effect/src/resolver.ts b/packages/effect/src/resolver.ts
@@ -5,8 +5,8 @@ export interface AdapterResolver extends Resolver {
   base: IfDefined<Schema.AnyNoContext, '@effect/schema'>;
   input: this['schema'] extends this['base']
     ? Schema.Encoded<this['schema']>
-    : never;
+    : unknown;
   output: this['schema'] extends this['base']
     ? Schema.Type<this['schema']>
-    : never;
+    : unknown;
 }
diff --git a/packages/fastest-validator/src/index.ts b/packages/fastest-validator/src/index.ts
diff --git a/packages/fastest-validator/src/resolver.ts b/packages/fastest-validator/src/resolver.ts
@@ -3,6 +3,6 @@ import type {ValidationSchema} from 'fastest-validator';
 
 export interface AdapterResolver extends Resolver {
   base: IfDefined<ValidationSchema, 'fastest-validator'>;
-  input: this['schema'] extends this['base'] ? unknown : never;
-  output: this['schema'] extends this['base'] ? unknown : never;
+  input: unknown;
+  output: unknown;
 }
diff --git a/packages/function/src/index.ts b/packages/function/src/index.ts
diff --git a/packages/function/src/resolver.ts b/packages/function/src/resolver.ts
@@ -8,11 +8,11 @@ export interface AdapterResolver extends Resolver {
   input: this['schema'] extends this['base']
     ? keyof this['schema'] extends never
       ? Awaited<ReturnType<this['schema']>>
-      : never
-    : never;
+      : unknown
+    : unknown;
   output: this['schema'] extends this['base']
     ? keyof this['schema'] extends never
       ? Awaited<ReturnType<this['schema']>>
-      : never
-    : never;
+      : unknown
+    : unknown;
 }