From 72c98709197aa7a99e1dbfaee45159541935255e Mon Sep 17 00:00:00 2001
From: Blake Embrey <hello@blakeembrey.com>
Date: Thu, 2 Nov 2017 15:56:01 -0700
Subject: [PATCH] Keep property overloads together before sorting

---
 src/free-style.spec.ts | 26 ++++++++++++++++++++++++++
 src/free-style.ts      | 36 ++++++++++--------------------------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/free-style.spec.ts b/src/free-style.spec.ts
index e5376c6..1423f9b 100644
--- a/src/free-style.spec.ts
+++ b/src/free-style.spec.ts
@@ -184,6 +184,20 @@ test('free style', (t) => {
     t.end()
   })
 
+  t.test('sort keys by property name', t => {
+    const Style = create()
+
+    const className = Style.registerStyle({
+      border: '5px solid red',
+      borderWidth: 10,
+      borderColor: 'blue'
+    })
+
+    t.equal(Style.getStyles(), `.${className}{border:5px solid red;border-color:blue;border-width:10px}`)
+
+    t.end()
+  })
+
   t.test('sort keys alphabetically after hyphenating', t => {
     const Style = create()
 
@@ -197,6 +211,18 @@ test('free style', (t) => {
     t.end()
   })
 
+  t.test('overloaded keys should sort in insertion order', t => {
+    const Style = create()
+
+    const className = Style.registerStyle({
+      foo: [15, 13, 11, 9, 7, 5, 3, 1, 14, 12, 10, 8, 6, 4, 2]
+    })
+
+    t.equal(Style.getStyles(), `.${className}{foo:15px;foo:13px;foo:11px;foo:9px;foo:7px;foo:5px;foo:3px;foo:1px;foo:14px;foo:12px;foo:10px;foo:8px;foo:6px;foo:4px;foo:2px}`)
+
+    t.end()
+  })
+
   t.test('merge duplicate nested styles', t => {
     const Style = create()
 
diff --git a/src/free-style.ts b/src/free-style.ts
index 4accd3e..c7b01b5 100644
--- a/src/free-style.ts
+++ b/src/free-style.ts
@@ -25,9 +25,6 @@ export type HashFunction = (str: string) => string
  */
 export const IS_UNIQUE = '__DO_NOT_DEDUPE_STYLE__'
 
-type Properties = Array<[string, PropertyValue]>
-type NestedStyles = Array<[string, Styles]>
-
 const upperCasePattern = /[A-Z]/g
 const msPattern = /^ms-/
 const interpolatePattern = /&/g
@@ -107,7 +104,7 @@ export function stringHash (str: string): string {
 /**
  * Transform a style string to a CSS string.
  */
-function styleToString (key: string, value: string | number | boolean) {
+function styleToString (key: string, value: PropertyValue) {
   if (typeof value === 'number' && value !== 0 && !CSS_NUMBER[key]) {
     return `${key}:${value}px`
   }
@@ -126,8 +123,8 @@ function sortTuples <T extends any[]> (value: T[]): T[] {
  * Categorize user styles.
  */
 function parseStyles (styles: Styles, hasNestedStyles: boolean) {
-  const properties: Properties = []
-  const nestedStyles: NestedStyles = []
+  const properties: Array<[string, PropertyValue | PropertyValue[]]> = []
+  const nestedStyles: Array<[string, Styles]> = []
   let isUnique = false
 
   // Sort keys before adding to styles.
@@ -137,16 +134,8 @@ function parseStyles (styles: Styles, hasNestedStyles: boolean) {
     if (value !== null && value !== undefined) {
       if (key === IS_UNIQUE) {
         isUnique = true
-      } else if (typeof value === 'object') {
-        if (Array.isArray(value)) {
-          const prop = hyphenate(key.trim())
-
-          for (let i = 0; i < value.length; i++) {
-            properties.push([prop, value[i]])
-          }
-        } else {
-          nestedStyles.push([key.trim(), value])
-        }
+      } else if (typeof value === 'object' && !Array.isArray(value)) {
+        nestedStyles.push([key.trim(), value])
       } else {
         properties.push([hyphenate(key.trim()), value])
       }
@@ -163,17 +152,12 @@ function parseStyles (styles: Styles, hasNestedStyles: boolean) {
 /**
  * Stringify an array of property tuples.
  */
-function stringifyProperties (properties: Properties) {
-  const end = properties.length - 1
-  let result = ''
-
-  for (let i = 0; i < properties.length; i++) {
-    const [name, value] = properties[i]
-
-    result += styleToString(name, value) + (i === end ? '' : ';')
-  }
+function stringifyProperties (properties: Array<[string, PropertyValue | PropertyValue[]]>) {
+  return properties.map(([name, value]) => {
+    if (!Array.isArray(value)) return styleToString(name, value)
 
-  return result
+    return value.map(x => styleToString(name, x)).join(';')
+  }).join(';')
 }
 
 /**