NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use kindof instead of typeof where appropriate.

Browse Source
This commit is contained in:
Julien Fontanet 2015-10-01 20:47:32 +02:00
parent c439daadad
commit 2071a7d308
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/xo-collection/package.json
View File

@ -23,6 +23,7 @@
], ],
"dependencies": { "dependencies": {
"babel-runtime": "^5.6.11", "babel-runtime": "^5.6.11",
"kindof": "^2.0.0",
"lodash.bind": "^3.1.0", "lodash.bind": "^3.1.0",
"lodash.callback": "^3.3.0", "lodash.callback": "^3.3.0",
"lodash.foreach": "^3.0.3", "lodash.foreach": "^3.0.3",

7
packages/xo-collection/src/collection.js
View File

@ -1,4 +1,5 @@
import forEach from 'lodash.foreach' import forEach from 'lodash.foreach'
import kindOf from 'kindof'
import {BaseError} from 'make-error' import {BaseError} from 'make-error'
import {EventEmitter} from 'events' import {EventEmitter} from 'events'
@ -33,13 +34,13 @@ export class DuplicateItem extends BaseError {
export class IllegalTouch extends BaseError { export class IllegalTouch extends BaseError {
constructor (value) { constructor (value) {
super('only an object value can be touched (found a ' + typeof value + ')') super('only an object value can be touched (found a ' + kindOf(value) + ')')
} }
} }
export class InvalidKey extends BaseError { export class InvalidKey extends BaseError {
constructor (key) { constructor (key) {
super('invalid key of type ' + typeof key) super('invalid key of type ' + kindOf(key))
} }
} }
@ -138,7 +139,7 @@ export default class Collection extends EventEmitter {
const [key] = this._resolveItem(keyOrObjectWithId) const [key] = this._resolveItem(keyOrObjectWithId)
this._assertHas(key) this._assertHas(key)
const value = this.get(key) const value = this.get(key)
if (typeof value !== 'object' || value === null) { if (kindOf(value) !== 'object') {
throw new IllegalTouch(value) throw new IllegalTouch(value)
} }