diff --git a/source/index.ts b/source/index.ts index f819d82..8e206cb 100644 --- a/source/index.ts +++ b/source/index.ts @@ -185,7 +185,16 @@ is.symbol = isOfType('symbol'); is.numericString = (value: unknown): value is string => is.string(value) && !is.emptyStringOrWhitespace(value) && !Number.isNaN(Number(value)); -is.array = Array.isArray; +is.array = (value: any, assertion?: (value: T) => void): value is T[] => { + if (!Array.isArray(value)) { + return false; + } + if (!assertion) { + return true; + } + return value.every(assertion); +}; + is.buffer = (value: unknown): value is Buffer => (value as any)?.constructor?.isBuffer?.(value) ?? false; is.nullOrUndefined = (value: unknown): value is null | undefined => is.null_(value) || is.undefined(value); @@ -463,7 +472,7 @@ interface Assert { boolean: (value: unknown) => asserts value is boolean; symbol: (value: unknown) => asserts value is symbol; numericString: (value: unknown) => asserts value is string; - array: (value: unknown) => asserts value is T[]; + array: (value: unknown, assertion?: (element: unknown) => void) => asserts value is T[]; buffer: (value: unknown) => asserts value is Buffer; nullOrUndefined: (value: unknown) => asserts value is null | undefined; object: (value: unknown) => asserts value is Record; @@ -553,7 +562,7 @@ export const assert: Assert = { boolean: (value: unknown): asserts value is boolean => assertType(is.boolean(value), 'boolean', value), symbol: (value: unknown): asserts value is symbol => assertType(is.symbol(value), 'symbol', value), numericString: (value: unknown): asserts value is string => assertType(is.numericString(value), AssertionTypeDescription.numericString, value), - array: (value: unknown): asserts value is T[] => assertType(is.array(value), 'Array', value), + array: (value: unknown, assertion?: (element: unknown) => asserts element is T): asserts value is T[] => assertType(is.array(value, assertion), 'Array', value), buffer: (value: unknown): asserts value is Buffer => assertType(is.buffer(value), 'Buffer', value), nullOrUndefined: (value: unknown): asserts value is null | undefined => assertType(is.nullOrUndefined(value), AssertionTypeDescription.nullOrUndefined, value), object: (value: unknown): asserts value is object => assertType(is.object(value), 'Object', value), diff --git a/test/test.ts b/test/test.ts index 31bfa2a..a48319b 100644 --- a/test/test.ts +++ b/test/test.ts @@ -641,6 +641,17 @@ test('is.numericString', t => { test('is.array', t => { testType(t, 'array', ['emptyArray']); + + t.true(is.array([1, 2, 3], is.number)); + t.false(is.array([1, '2', 3], is.number)); + + t.notThrows(() => { + assert.array([1, 2], is.number); + }); + + t.throws(() => { + assert.array([1, '2'], is.number); + }); }); test('is.function', t => {