Skip to content

Commit

Permalink
Fix type guard for isWhitespaceString and `isEmptyStringOrWhitespac…
Browse files Browse the repository at this point in the history
…e` (#207)
  • Loading branch information
marlun78 authored Jun 26, 2024
1 parent 8cbcaee commit 25a3768
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
9 changes: 5 additions & 4 deletions source/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type {
Primitive,
TypedArray,
WeakRef,
Whitespace,
} from './types.js';

const typedArrayTypeNames = [
Expand Down Expand Up @@ -435,7 +436,7 @@ export function isEmptyString(value: unknown): value is '' {
return isString(value) && value.length === 0;
}

export function isEmptyStringOrWhitespace(value: unknown): value is string {
export function isEmptyStringOrWhitespace(value: unknown): value is '' | Whitespace {
return isEmptyString(value) || isWhitespaceString(value);
}

Expand Down Expand Up @@ -777,7 +778,7 @@ export function isWeakSet(value: unknown): value is WeakSet<object> {
return getObjectType(value) === 'WeakSet';
}

export function isWhitespaceString(value: unknown): value is string {
export function isWhitespaceString(value: unknown): value is Whitespace {
return isString(value) && /^\s+$/.test(value);
}

Expand Down Expand Up @@ -893,7 +894,7 @@ type Assert = {
emptyArray: (value: unknown, message?: string) => asserts value is never[];
nonEmptyArray: <T = unknown, Item = unknown>(value: T | Item[], message?: string) => asserts value is [Item, ...Item[]];
emptyString: (value: unknown, message?: string) => asserts value is '';
emptyStringOrWhitespace: (value: unknown, message?: string) => asserts value is string;
emptyStringOrWhitespace: (value: unknown, message?: string) => asserts value is '' | Whitespace;
nonEmptyString: (value: unknown, message?: string) => asserts value is string;
nonEmptyStringAndNotWhitespace: (value: unknown, message?: string) => asserts value is string;
emptyObject: <Key extends keyof any = string>(value: unknown, message?: string) => asserts value is Record<Key, never>;
Expand Down Expand Up @@ -1277,7 +1278,7 @@ export function assertEmptyString(value: unknown, message?: string): asserts val
}
}

export function assertEmptyStringOrWhitespace(value: unknown, message?: string): asserts value is string {
export function assertEmptyStringOrWhitespace(value: unknown, message?: string): asserts value is '' | Whitespace {
if (!isEmptyStringOrWhitespace(value)) {
throw new TypeError(message ?? typeErrorMessage('empty string or whitespace', value));
}
Expand Down
2 changes: 2 additions & 0 deletions source/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,5 @@ export type NodeStream = {
export type Predicate = (value: unknown) => boolean;

export type NonEmptyString = string & {0: string};

export type Whitespace = ' ';
7 changes: 7 additions & 0 deletions test/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1793,6 +1793,13 @@ test('is.emptyStringOrWhitespace', t => {
t.throws(() => {
assert.emptyStringOrWhitespace('unicorn');
});

let value = 'test'; // eslint-disable-line prefer-const -- can't use `const` here because then it will be inferred as `never` in the `if` block
if (is.emptyStringOrWhitespace(value)) {
value.charAt(0); // Should be inferred as `'' | Whitespace` and not `never`
} else {
value.charAt(0); // Should be inferred as `string` and not `never`
}
});

test('is.nonEmptyString', t => {
Expand Down

0 comments on commit 25a3768

Please sign in to comment.