Add new mixed test, update benchmarks, minor tweaks.

Author: jorgebucaran

bench/README.md

@@ -13,23 +13,23 @@ npm i && node .
 Please be aware that results may vary across browsers and Node.js runtimes. All tests run on a 2.4GHz Intel Core i7 CPU with 16 GB memory.
 
 <pre>
-<b>Classcat – Strings × 31,836,467 ops/sec</b>
-classNames – Strings × 3,751,299 ops/sec
+<p>Classcat – Strings × 20,162,778 ops/sec</p>
+classNames – Strings × 3,911,263 ops/sec
 Fastest is Classcat – Strings
 
-<b>Classcat – Objects × 6,385,707 ops/sec</b>
-classNames – Objects × 3,260,164 ops/sec
+<p>Classcat – Objects × 6,270,420 ops/sec</p>
+classNames – Objects × 3,294,519 ops/sec
 Fastest is Classcat – Objects
 
-<b>Classcat – Strings & Objects × 31,213,754 ops/sec</b>
-classNames – Strings & Objects × 3,000,682 ops/sec
+<p>Classcat – Strings & Objects × 19,211,576 ops/sec</p>
+classNames – Strings & Objects × 3,055,944 ops/sec
 Fastest is Classcat – Strings & Objects
 
-<b>Classcat – Mixed × 29,953,843 ops/sec</b>
-classNames – Mixed × 2,126,420 ops/sec
+<p>Classcat – Mixed × 7,062,106 ops/sec</p>
+classNames – Mixed × 2,145,534 ops/sec
 Fastest is Classcat – Mixed
 
-<b>Classcat – Arrays × 3,628,801 ops/sec</b>
-classNames – Arrays × 915,020 ops/sec
+<p>Classcat – Arrays × 2,381,984 ops/sec</p>
+classNames – Arrays × 951,920 ops/sec
 Fastest is Classcat – Arrays
 </pre>

bench/index.js

@@ -12,9 +12,9 @@ require("./fixtures").map((fixed, index, { length }) => {
     )
     .on("complete", function() {
       console.log(
-        `Fastest is ${this.filter("fastest").map("name")}${index + 1 < length
-          ? "\n"
-          : ""}`
+        `Fastest is ${this.filter("fastest").map("name")}${
+          index + 1 < length ? "\n" : ""
+        }`
       )
     })
     .run()

package.json

@@ -1,7 +1,7 @@
 {
   "name": "classcat",
   "description": "0.3 KB JavaScript function for conditionally concatenating CSS class names.",
-  "version": "2.0.0",
+  "version": "1.1.3",
   "main": "dist/classcat.js",
   "jsnext:main": "src/index.js",
   "module": "src/index.js",

src/index.js

@@ -1,6 +1,6 @@
 export default function cc(classes, prefix) {
   var value
-  var className = ""
+  var classNames = ""
   var type = typeof classes
 
   prefix = prefix || ""
@@ -9,23 +9,33 @@ export default function cc(classes, prefix) {
     return classes ? prefix : ""
   }
 
-  if ((classes && type === "string") || type === "number") {
-    return classes
+  if (type === "string" || type === "number") {
+    return prefix + (classes || "")
   }
 
-  if (Array.isArray(classes) && classes.length) {
+  if (Array.isArray(classes) && classes.length > 0) {
     for (var i = 0, len = classes.length; i < len; i++) {
       if ((value = cc(classes[i], prefix))) {
-        className += (className && " ") + prefix + value
+        classNames += (classNames && " ") + value
       }
     }
-  } else {
-    for (var i in classes) {
-      if (classes.hasOwnProperty(i) && (value = classes[i])) {
-        className += (className && " ") + cc(value, prefix + i)
+  } else if (type === "object") {
+    for (var key in classes) {
+      if ((value = cc(classes[key], prefix + key))) {
+        classNames += (classNames && " ") + value
       }
     }
   }
 
-  return className
+  return classNames
 }
+
+/*
+    case "object":
+      for (var key in classes) {
+        if (next = cc(classes[key], prefix + (isNaN(key) ? key : ""))) {
+          classNames += (classNames ? " " : "") + next;
+        }
+      }
+      return classNames;
+      */

tests/index.test.js

@@ -1,6 +1,6 @@
 import cc from "../src"
 
-test("falsy", () => {
+test("falsey", () => {
   expect(cc({})).toBe("")
   expect(cc([])).toBe("")
   expect(cc(["", null, false, undefined, 0, NaN])).toBe("")
@@ -34,6 +34,21 @@ test("mixed", () => {
   ).toBe("foo foo-bar foo-baz")
 })
 
+test("mixed #2", () => {
+  expect(
+    cc({
+      foo: {
+        "--bar": [
+          "--baz",
+          {
+            "--qux": true
+          }
+        ]
+      }
+    })
+  ).toEqual("foo--bar--baz foo--bar--qux")
+})
+
 test("prefix", () => {
   expect(
     cc(