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

[Breaking Change] Make 'is' type-safe.

Browse source
This commit is contained in:
Bjorn Stromberg 2020-06-21 01:08:36 +09:00
parent 1ffe2fb6a7
commit b0b33a07d6
2 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
source/index.ts
View file

@ -66,6 +66,10 @@ const objectTypeNames = [
type ObjectTypeName = typeof objectTypeNames[number]; type ObjectTypeName = typeof objectTypeNames[number];
function isObjectTypeName(name: unknown): name is ObjectTypeName {
return objectTypeNames.includes(name as ObjectTypeName);
}
const primitiveTypeNames = [ const primitiveTypeNames = [
'null', 'null',
'undefined', 'undefined',
@ -100,9 +104,14 @@ function isOfType<T extends Primitive | Function>(type: PrimitiveTypeName | 'fun
const {toString} = Object.prototype; const {toString} = Object.prototype;
const getObjectType = (value: unknown): ObjectTypeName | undefined => { const getObjectType = (value: unknown): ObjectTypeName | undefined => {
const objectName = toString.call(value).slice(8, -1); const objectTypeName = toString.call(value).slice(8, -1);
if (objectName) {
return objectName as ObjectTypeName; if (/HTML\w+Element/.test(objectTypeName) && is.domElement(value)) {
return 'HTMLElement';
}
if (isObjectTypeName(objectTypeName)) {
return objectTypeName;
} }
return undefined; return undefined;

22
test/test.ts
View file

@ -1275,19 +1275,19 @@ test('is.domElement', t => {
assert.domElement({nodeType: 1, nodeName: 'div'}); assert.domElement({nodeType: 1, nodeName: 'div'});
}); });
const htmlTagNameToTypeName = { const tagNames = [
div: 'HTMLDivElement', 'div',
input: 'HTMLInputElement', 'input',
span: 'HTMLSpanElement', 'span',
img: 'HTMLImageElement', 'img',
canvas: 'HTMLCanvasElement', 'canvas',
script: 'HTMLScriptElement' 'script'
}; ];
for (const [tagName, typeName] of Object.entries(htmlTagNameToTypeName)) { tagNames.forEach(tagName => {
const domElement = createDomElement(tagName); const domElement = createDomElement(tagName);
t.is(is(domElement), typeName); t.is(is(domElement), 'HTMLElement');
} });
}); });
test('is.observable', t => { test('is.observable', t => {