fix: don't return any for oneOf

ref #1675
jquense · Aug 23, 2022 · 74c5bc5 · 74c5bc5
1 parent c49fee8
commit 74c5bc5
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/src/boolean.ts b/src/boolean.ts
@@ -84,7 +84,6 @@ export default class BooleanSchema<
  return super.default(def);
  }
 
- // concat<TOther extends BooleanSchema<any, any>>(schema: TOther): TOther;
  defined(
  msg?: Message,
  ): BooleanSchema<Defined<TType>, TContext, TDefault, TFlags> {

diff --git a/src/schema.ts b/src/schema.ts
@@ -834,6 +834,14 @@ export default abstract class Schema<
  return next;
  }
 
+ oneOf<U extends TType>(
+ enums: ReadonlyArray<U | Reference>,
+ message?: Message<{ values: any }>,
+ ): this;
+ oneOf(
+ enums: ReadonlyArray<TType | Reference>,
+ message: Message<{ values: any }>,
+ ): any;
  oneOf<U extends TType>(
  enums: ReadonlyArray<U | Reference>,
  message = locale.oneOf,

diff --git a/src/string.ts b/src/string.ts
@@ -260,9 +260,13 @@ export default interface StringSchema<
  ): StringSchema<TType, TContext, D, ToggleDefault<TFlags, D>>;
 
  oneOf<U extends TType>(
- arrayOfValues: ReadonlyArray<U | Reference>,
+ arrayOfValues: ReadonlyArray<U | Reference<U>>,
  message?: MixedLocale['oneOf'],
  ): StringSchema<U | Optionals<TType>, TContext, TDefault, TFlags>;
+ oneOf(
+ enums: ReadonlyArray<TType | Reference>,
+ message?: Message<{ values: any }>,
+ ): this;
 
  concat<UType extends Maybe<string>, UContext, UDefault, UFlags extends Flags>(
  schema: StringSchema<UType, UContext, UDefault, UFlags>,

diff --git a/test/types/types.ts b/test/types/types.ts
@@ -16,6 +16,20 @@ import ObjectSchema, { create as object } from '../../src/object';
 
 import { _ } from '../../src/util/types';
 
+Base_methods: {
+ // $ExpectType boolean | undefined
+ bool().oneOf([true, ref('$foo')]).__outputType;
+
+ // $ExpectType "asf" | "foo" | undefined
+ string().oneOf(['asf', ref<'foo'>('$foo')]).__outputType;
+
+ // $ExpectType Date | undefined
+ date().oneOf([new Date(), ref('$now')]).__outputType;
+
+ // $ExpectType number | undefined
+ number().oneOf([1, ref('$foo')]).__outputType;
+}
+
 Mixed: {
  const mxRequired = mixed<string | number>().required();
 
@@ -218,7 +232,7 @@ Strings: {
  string().oneOf(['foo', 'bar']).__outputType;
 
  // $ExpectType "foo" | "bar" | null | undefined
- string().nullable().oneOf(['foo', 'bar', null]).__outputType;
+ string().nullable().oneOf(['foo', 'bar']).__outputType;
 }
 
 Numbers: {