orbit-oss/is
5
5
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Inline Predicate[] types, simplify array conditional check

Browse source
This commit is contained in:
Dave Cohen 2020-02-16 12:48:14 -06:00
parent 9b89df2393
commit 9a277dae3c
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
source/index.ts
View file

@ -373,7 +373,6 @@ is.emptyMap = (value: unknown): value is Map<never, never> => is.map(value) && v
is.nonEmptyMap = <Key = unknown, Value = unknown>(value: unknown): value is Map<Key, Value> => is.map(value) && value.size > 0; is.nonEmptyMap = <Key = unknown, Value = unknown>(value: unknown): value is Map<Key, Value> => is.map(value) && value.size > 0;
export type Predicate = (value: unknown) => boolean; export type Predicate = (value: unknown) => boolean;
export type OverloadedPredicate = Predicate | Predicate[];
type ArrayMethod = (fn: (value: unknown, index: number, array: unknown[]) => boolean, thisArg?: unknown) => boolean; type ArrayMethod = (fn: (value: unknown, index: number, array: unknown[]) => boolean, thisArg?: unknown) => boolean;
@ -389,14 +388,11 @@ const predicateOnArray = (method: ArrayMethod, predicate: Predicate, values: unk
return method.call(values, predicate); return method.call(values, predicate);
}; };
is.any = (predicate: OverloadedPredicate, ...values: unknown[]): boolean => { is.any = (predicate: Predicate | Predicate[], ...values: unknown[]): boolean => {
if (is.array(predicate) === true) { const predicates = is.array(predicate) ? predicate : [predicate];
return (predicate as Predicate[]).some((singlePredicate: Predicate) => return predicates.some(singlePredicate =>
predicateOnArray(Array.prototype.some, singlePredicate, values) predicateOnArray(Array.prototype.some, singlePredicate, values)
); );
}
return predicateOnArray(Array.prototype.some, predicate as Predicate, values);
}; };
is.all = (predicate: Predicate, ...values: unknown[]): boolean => predicateOnArray(Array.prototype.every, predicate, values); is.all = (predicate: Predicate, ...values: unknown[]): boolean => predicateOnArray(Array.prototype.every, predicate, values);
@ -536,7 +532,7 @@ interface Assert {
inRange: (value: number, range: number | number[]) => asserts value is number; inRange: (value: number, range: number | number[]) => asserts value is number;
// Variadic functions. // Variadic functions.
any: (predicate: OverloadedPredicate, ...values: unknown[]) => void | never; any: (predicate: Predicate | Predicate[], ...values: unknown[]) => void | never;
all: (predicate: Predicate, ...values: unknown[]) => void | never; all: (predicate: Predicate, ...values: unknown[]) => void | never;
} }
@ -626,7 +622,7 @@ export const assert: Assert = {
inRange: (value: number, range: number | number[]): asserts value is number => assertType(is.inRange(value, range), AssertionTypeDescription.inRange, value), inRange: (value: number, range: number | number[]): asserts value is number => assertType(is.inRange(value, range), AssertionTypeDescription.inRange, value),
// Variadic functions. // Variadic functions.
any: (predicate: OverloadedPredicate, ...values: unknown[]): void | never => assertType(is.any(predicate, ...values), AssertionTypeDescription.any, values), any: (predicate: Predicate | Predicate[], ...values: unknown[]): void | never => assertType(is.any(predicate, ...values), AssertionTypeDescription.any, values),
all: (predicate: Predicate, ...values: unknown[]): void | never => assertType(is.all(predicate, ...values), AssertionTypeDescription.all, values) all: (predicate: Predicate, ...values: unknown[]): void | never => assertType(is.all(predicate, ...values), AssertionTypeDescription.all, values)
}; };