Merge pull request #229 from JedWatson/cleanup

Minor cleanup
JedWatson · Apr 1, 2021 · 1432ad1 · 1432ad1
2 parents c866e9b + 6c684f8
commit 1432ad1
Show file tree

Hide file tree

Showing 7 changed files with 2,889 additions and 509 deletions.
diff --git a/bind.js b/bind.js
@@ -10,7 +10,7 @@
 
 	var hasOwn = {}.hasOwnProperty;
 
-	function classNames() {
+	function classNames () {
 		var classes = [];
 
 		for (var i = 0; i < arguments.length; i++) {
@@ -24,14 +24,14 @@
 			} else if (Array.isArray(arg)) {
 				classes.push(classNames.apply(this, arg));
 			} else if (argType === 'object') {
-				if (arg.toString !== Object.prototype.toString) {
-					classes.push(arg.toString());
-				} else {
+				if (arg.toString === Object.prototype.toString) {
 					for (var key in arg) {
 						if (hasOwn.call(arg, key) && arg[key]) {
 							classes.push(this && this[key] || key);
 						}
 					}
+				} else {
+					classes.push(arg.toString());
 				}
 			}
 		}

diff --git a/dedupe.js b/dedupe.js
@@ -28,17 +28,17 @@
 			resultSet[num] = true;
 		}
 
-		function _parseObject(resultSet, object) {
-			if(object.toString !== Object.prototype.toString) {
-				resultSet[object.toString()] = true;
-			} else {
+		function _parseObject (resultSet, object) {
+			if (object.toString === Object.prototype.toString) {
 				for (var k in object) {
 					if (hasOwn.call(object, k)) {
 						// set value to false instead of deleting it to avoid changing object structure
 						// https://www.smashingmagazine.com/2012/11/writing-fast-memory-efficient-javascript/#de-referencing-misconceptions
 						resultSet[k] = !!object[k];
 					}
 				}
+			} else {
+				resultSet[object.toString()] = true;
 			}
 		}
 

diff --git a/index.d.ts b/index.d.ts
@@ -8,15 +8,10 @@
 //   Michal Adamczyk <https://github.com/mradamczyk>
 //   Marvin Hagemeister <https://github.com/marvinhagemeister>
 
-export type ClassValue = string | number | ClassDictionary | ClassArray | undefined | null | boolean;
+export type Value = string | number | boolean | undefined | null;
+export type Mapping = { [key: string]: Value };
+export type Argument = Value | Mapping | Argument[];
 
-export interface ClassDictionary
-{
-	[id: string]: boolean | undefined | null;
-}
-
-export interface ClassArray extends Array<ClassValue> {}
-
-export function classNames(...args: ClassArray): string;
+export function classNames(...args: Argument[]): string;
 
 export default classNames;
diff --git a/index.js b/index.js
@@ -22,21 +22,21 @@
 			if (argType === 'string' || argType === 'number') {
 				classes.push(arg);
 			} else if (Array.isArray(arg)) {
-				if(arg.length) {
+				if (arg.length) {
 					var inner = classNames.apply(null, arg);
 					if (inner) {
 						classes.push(inner);
 					}
 				}
 			} else if (argType === 'object') {
-				if (arg.toString !== Object.prototype.toString) {
-					classes.push(arg.toString());
-				} else {
+				if (arg.toString === Object.prototype.toString) {
 					for (var key in arg) {
 						if (hasOwn.call(arg, key) && arg[key]) {
 							classes.push(key);
 						}
 					}
+				} else {
+					classes.push(arg.toString());
 				}
 			}
 		}