Skip to content

Commit c027bd6

Browse files
author
Steve Thompson
committed
added isString(), notString(), and notFiniteNumber(). Also changed the error messages slightly
1 parent 46c1a0f commit c027bd6

13 files changed

+321
-94
lines changed

.idea/workspace.xml

Lines changed: 167 additions & 73 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ This a super-simple package. Sorry, there's no index.js file, but you really don
22
To use any one of the functions in your files, just include its import statement (commented on the
33
right of each function).
44
All the files in this package are clearly named for what functions they contain.
5-
Everything is in TypeScript, with transpiled JavaScript files included.
65

76
Contains these functions:
87

@@ -22,8 +21,16 @@ errorIfNotFunction(variable) // import {errorIfNotFunction} from 'basic-data-han
2221

2322
errorIfNotInteger(variable) // import {errorIfNotInteger} from 'basic-data-handling/errorIfNotInteger'
2423

24+
errorIfNotIntegerZeroOrGreater(variable) // import {errorIfNotIntegerZeroOrGreater} from
25+
'basic-data-handling/errorIfNotIntegerZeroOrGreater'
26+
27+
-
28+
// This errors if variable is not finite number:
29+
2530
errorIfNotNumber(variable) // import {errorIfNotNumber} from 'basic-data-handling/errorIfNotNumber'
2631

32+
-
33+
2734
errorIfNotObject(variable) // import {errorIfNotObject} from 'basic-data-handling/errorIfNotObject'
2835

2936
errorIfNotPrimitive(variable) // import {errorIfNotPrimitive} from 'basic-data-handling/errorIfNotPrimitive'
@@ -34,17 +41,23 @@ errorIfNotString(variable) // import {errorIfNotString} from 'basic-data-handlin
3441

3542
// All these return boolean:
3643

37-
isArray(data) // import {isArray} from 'basic-data-handling/isArray_notArray'
44+
isArray(variable) // import {isArray} from 'basic-data-handling/isArray_notArray'
45+
46+
notArray(variable) // import {notArray} from 'basic-data-handling/isArray_notArray'
47+
48+
isString(variable) // import {isString} from 'basic-data-handling/isString_notString'
49+
50+
notString(variable) // import {notString} from 'basic-data-handling/isString_notString'
3851

39-
notArray(data) // import {notArray} from 'basic-data-handling/isArray_notArray'
52+
isFiniteNumber(variable) // import {isFiniteNumber} from 'basic-data-handling/isFiniteNumber'
4053

41-
isFiniteNumber(data) // import {isFiniteNumber} from 'basic-data-handling/isFiniteNumber'
54+
notFiniteNumber(variable) // import {notFiniteNumber} from 'basic-data-handling/isFiniteNumber'
4255

43-
isInteger(data) // import {isInteger} from 'basic-data-handling/isInteger_isFloat'
56+
isInteger(variable) // import {isInteger} from 'basic-data-handling/isInteger_isFloat'
4457

45-
notInteger(data) // import {notInteger} from 'basic-data-handling/isInteger_isFloat'
58+
notInteger(variable) // import {notInteger} from 'basic-data-handling/isInteger_isFloat'
4659

47-
isFloat(data) // import {isFloat} from 'basic-data-handling/isInteger_isFloat'
60+
isFloat(variable) // import {isFloat} from 'basic-data-handling/isInteger_isFloat'
4861

4962
isEmpty(arrayOrString) // import {isEmpty} from 'basic-data-handling/isEmpty_notEmpty'
5063

errorIfNotNumber.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
Object.defineProperty(exports, "__esModule", { value: true });
33
var isFiniteNumber_1 = require("./isFiniteNumber");
44
function errorIfNotNumber(variable) {
5-
if (isFiniteNumber_1.isFiniteNumber(variable))
6-
return;
7-
else
8-
throw new Error('Input must be number');
5+
if (isFiniteNumber_1.notFiniteNumber(variable))
6+
throw new Error('Input must be a finite number');
97
}
108
exports.errorIfNotNumber = errorIfNotNumber;

errorIfNotNumber.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import {isFiniteNumber} from './isFiniteNumber';
1+
import { notFiniteNumber } from './isFiniteNumber';
22

3-
export function errorIfNotNumber(variable): void{
4-
if (isFiniteNumber(variable)) return;
5-
6-
else throw new Error('Input must be number');
3+
4+
export function errorIfNotNumber(variable): void {
5+
if (notFiniteNumber(variable)) throw new Error('Input must be a finite number');
76
}

errorIfNotPrimitive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function errorIfNotPrimitive(variable) {
77
var primitives = ['number', 'string', 'boolean'];
88
// @ts-ignore
99
if (!(primitives.includes(typeof variable))) {
10-
throw new Error('Input must be a primitive type.');
10+
throw new Error('Input must be either a number, string, or boolean');
1111
}
1212
}
1313
exports.errorIfNotPrimitive = errorIfNotPrimitive;

errorIfNotPrimitive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ export function errorIfNotPrimitive(variable): void {
77
let primitives = ['number', 'string', 'boolean'];
88
// @ts-ignore
99
if (!(primitives.includes(typeof variable))) {
10-
throw new Error('Input must be a primitive type.');
10+
throw new Error('Input must be either a number, string, or boolean');
1111
}
1212
}

isFiniteNumber.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ function isFiniteNumber(variable) {
44
return (typeof variable === 'number' && (variable - variable === 0));
55
}
66
exports.isFiniteNumber = isFiniteNumber;
7+
function notFiniteNumber(variable) {
8+
return !(isFiniteNumber(variable));
9+
}
10+
exports.notFiniteNumber = notFiniteNumber;

isFiniteNumber.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

22
export function isFiniteNumber(variable): boolean {
33
return (typeof variable === 'number' && (variable - variable === 0));
4-
}
4+
}
5+
6+
7+
export function notFiniteNumber(variable): boolean {
8+
return !(isFiniteNumber(variable));
9+
}

isString_notString.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
3+
function isString(variable) {
4+
return (typeof variable === 'string');
5+
}
6+
exports.isString = isString;
7+
function notString(variable) {
8+
return !(isString(variable));
9+
}
10+
exports.notString = notString;

isString_notString.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export function isString(variable): boolean {
2+
return (typeof variable === 'string');
3+
}
4+
5+
6+
export function notString(variable): boolean {
7+
return !(isString(variable));
8+
}

0 commit comments

Comments
 (0)