From ac68a837c02ad5178bbe3b9e04cfd16abb9bead4 Mon Sep 17 00:00:00 2001
From: Riley Todd <rileyatodd@gmail.com>
Date: Sat, 18 Jul 2015 16:43:06 -0500
Subject: [PATCH 1/7] Added sequence numbers to generated keys so that they
 will always be unique

---
 jsnox.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/jsnox.js b/jsnox.js
index 17185b8..e6acb59 100644
--- a/jsnox.js
+++ b/jsnox.js
@@ -20,6 +20,13 @@ ParseError.prototype.name = 'JSnoXParseError'
 // from this cache for an increase in performance.
 var specCache = {}
 
+//An object to hold the count of how many times each key is used
+//so far in order to append the count to the key and therefore
+//make each key unique. This avoids any 
+// flattenchildren encountered two children with the same key react
+//type of errors
+var keyCount = {}
+
 // Convert a tag specification string into an object
 // eg. 'input:checkbox#foo.bar[name=asdf]' produces the output:
 // {
@@ -42,7 +49,9 @@ function parseTagSpec(specString) {
     // Provide the specString as a default key, which can always be overridden
     // by the props hash (for when two siblings have the same specString)
     var tagName = tagMatch[1]
-    var props = { key: specString }
+    keyCount[specString] = keyCount[specString] ? keyCount[specString] + 1 : 1;
+    var uniqueKey = specString + keyCount[specString]
+    var props = { key: uniqueKey }
     var classes = []
     if (tagMatch[2]) props.type = tagMatch[2]
     else if (tagName === 'button') props.type = 'button' // Saner default for <button>
@@ -118,6 +127,8 @@ function jsnox(React) {
             // siblings of the same type. Provide a displayName for your custom
             // components to make this more useful (and help with debugging).
             var fakeKey = componentType.displayName || 'customElement'
+            keyCount[fakeKey] = keyCount[fakeKey] ? keyCount[fakeKey] + 1 : 1
+            fakeKey = fakeKey + keyCount[fakeKey]
             props = props || {}
             if (!props.key) props.key = fakeKey
         } else {

From 1e026f779d7ae6d4d4c646c63fba6ac38f7ec4c9 Mon Sep 17 00:00:00 2001
From: Riley Todd <rileyatodd@gmail.com>
Date: Sat, 18 Jul 2015 16:44:35 -0500
Subject: [PATCH 2/7] removed a semicolon so that style would match that of
 original author

---
 jsnox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsnox.js b/jsnox.js
index e6acb59..f25234b 100644
--- a/jsnox.js
+++ b/jsnox.js
@@ -49,7 +49,7 @@ function parseTagSpec(specString) {
     // Provide the specString as a default key, which can always be overridden
     // by the props hash (for when two siblings have the same specString)
     var tagName = tagMatch[1]
-    keyCount[specString] = keyCount[specString] ? keyCount[specString] + 1 : 1;
+    keyCount[specString] = keyCount[specString] ? keyCount[specString] + 1 : 1
     var uniqueKey = specString + keyCount[specString]
     var props = { key: uniqueKey }
     var classes = []

From 4e166afb9cfc21e8ea176803c065ee72e4f2f9fa Mon Sep 17 00:00:00 2001
From: Riley Todd <rileyatodd@gmail.com>
Date: Sun, 19 Jul 2015 11:01:23 -0500
Subject: [PATCH 3/7] Removed everything regarding setting keys.

---
 jsnox.js | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/jsnox.js b/jsnox.js
index f25234b..276af21 100644
--- a/jsnox.js
+++ b/jsnox.js
@@ -20,13 +20,6 @@ ParseError.prototype.name = 'JSnoXParseError'
 // from this cache for an increase in performance.
 var specCache = {}
 
-//An object to hold the count of how many times each key is used
-//so far in order to append the count to the key and therefore
-//make each key unique. This avoids any 
-// flattenchildren encountered two children with the same key react
-//type of errors
-var keyCount = {}
-
 // Convert a tag specification string into an object
 // eg. 'input:checkbox#foo.bar[name=asdf]' produces the output:
 // {
@@ -46,12 +39,7 @@ function parseTagSpec(specString) {
     var tagMatch = specString.match(tagNameRegex)
     if (!tagMatch) throw new ParseError(specString)
 
-    // Provide the specString as a default key, which can always be overridden
-    // by the props hash (for when two siblings have the same specString)
-    var tagName = tagMatch[1]
-    keyCount[specString] = keyCount[specString] ? keyCount[specString] + 1 : 1
-    var uniqueKey = specString + keyCount[specString]
-    var props = { key: uniqueKey }
+    var props = {}
     var classes = []
     if (tagMatch[2]) props.type = tagMatch[2]
     else if (tagName === 'button') props.type = 'button' // Saner default for <button>
@@ -120,18 +108,7 @@ function jsnox(React) {
             props = null
         }
 
-        if (typeof componentType === 'function') {
-            // For custom components, attempt to provide a default "key" prop.
-            // This can prevent the "Each child in an array should have a
-            // unique key prop" warning when the element doesn't have any
-            // siblings of the same type. Provide a displayName for your custom
-            // components to make this more useful (and help with debugging).
-            var fakeKey = componentType.displayName || 'customElement'
-            keyCount[fakeKey] = keyCount[fakeKey] ? keyCount[fakeKey] + 1 : 1
-            fakeKey = fakeKey + keyCount[fakeKey]
-            props = props || {}
-            if (!props.key) props.key = fakeKey
-        } else {
+        if (typeof componentType !== 'function') {
             // Parse the provided string into a hash of props
             // If componentType is invalid (undefined, empty string, etc),
             // parseTagSpec should throw.

From fd064f38b11585bba293ed83ea8a9e46784db4f6 Mon Sep 17 00:00:00 2001
From: Riley Todd <rileyatodd@gmail.com>
Date: Sun, 19 Jul 2015 11:21:02 -0500
Subject: [PATCH 4/7] Bug fix

---
 jsnox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsnox.js b/jsnox.js
index 276af21..df7f6bf 100644
--- a/jsnox.js
+++ b/jsnox.js
@@ -38,7 +38,7 @@ function parseTagSpec(specString) {
     // Parse tagName, and optional type attribute
     var tagMatch = specString.match(tagNameRegex)
     if (!tagMatch) throw new ParseError(specString)
-
+    var tagName = tagMatch[1]
     var props = {}
     var classes = []
     if (tagMatch[2]) props.type = tagMatch[2]

From 6d509854dbe1d2370b5e427bf7a1d852117c4859 Mon Sep 17 00:00:00 2001
From: Riley Todd <rileyatodd@gmail.com>
Date: Tue, 21 Jul 2015 19:41:51 -0500
Subject: [PATCH 5/7] Added a tag to the constructor for enabling the old
 automagic key generation functionality

---
 jsnox.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/jsnox.js b/jsnox.js
index df7f6bf..c01b3fa 100644
--- a/jsnox.js
+++ b/jsnox.js
@@ -5,7 +5,6 @@ var tagNameRegex = /^([a-z1-6]+)(?:\:([a-z]+))?/    // matches 'input' or 'input
 var propsRegex = /((?:#|\.|@)[\w-]+)|(\[.*?\])/g    // matches all further properties
 var attrRegex = /\[([\w-]+)(?:=([^\]]+))?\]/        // matches '[foo=bar]' or '[foo]'
 
-
 // Error subclass to throw for parsing errors
 function ParseError(input) {
     this.message = input
@@ -31,7 +30,7 @@ var specCache = {}
 //     name: 'asdf'
 //   }
 // }
-function parseTagSpec(specString) {
+function parseTagSpec(specString, autoKeyGen) {
     if (!specString || !specString.match) throw new ParseError(specString)
     if (specCache[specString]) return specCache[specString]
 
@@ -41,6 +40,9 @@ function parseTagSpec(specString) {
     var tagName = tagMatch[1]
     var props = {}
     var classes = []
+    if (autoKeyGen) {
+        props.key = specString
+    }
     if (tagMatch[2]) props.type = tagMatch[2]
     else if (tagName === 'button') props.type = 'button' // Saner default for <button>
 
@@ -93,7 +95,7 @@ function extend(obj1, obj2) {
 // Main exported function.
 // Returns a "client", which is a function that can be used to compose
 // ReactElement trees directly.
-function jsnox(React) {
+function jsnox(React, autoKeyGen) {
     var client = function(componentType, props, children) {
         // Throw an error if too many arguments were passed in
         // (this can happen if you forget to wrap children in an array literal):
@@ -108,11 +110,15 @@ function jsnox(React) {
             props = null
         }
 
-        if (typeof componentType !== 'function') {
+        if (typeof componentType === 'function' && autoKeyGen) {
+            var fakeKey = componentType.displayName || 'customElement'
+            props = props || {}
+            if (!props.key) props.key = fakeKey
+        } else {
             // Parse the provided string into a hash of props
             // If componentType is invalid (undefined, empty string, etc),
             // parseTagSpec should throw.
-            var spec = parseTagSpec(componentType)
+            var spec = parseTagSpec(componentType, autoKeyGen)
             componentType = spec.tagName
             props = extend(spec.props, props)
         }

From eb7f696e74e42d3bc2d59fe5e156fef6509adbbd Mon Sep 17 00:00:00 2001
From: Riley Todd <rileyatodd@gmail.com>
Date: Tue, 21 Jul 2015 19:49:43 -0500
Subject: [PATCH 6/7] Bugfix

---
 jsnox.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jsnox.js b/jsnox.js
index c01b3fa..103aa25 100644
--- a/jsnox.js
+++ b/jsnox.js
@@ -110,10 +110,12 @@ function jsnox(React, autoKeyGen) {
             props = null
         }
 
-        if (typeof componentType === 'function' && autoKeyGen) {
-            var fakeKey = componentType.displayName || 'customElement'
-            props = props || {}
-            if (!props.key) props.key = fakeKey
+        if (typeof componentType === 'function') {
+            if (autoKeyGen) {
+                var fakeKey = componentType.displayName || 'customElement'
+                props = props || {}
+                if (!props.key) props.key = fakeKey
+            }
         } else {
             // Parse the provided string into a hash of props
             // If componentType is invalid (undefined, empty string, etc),

From 45b9b474d402a1d0c1022b47186fbaeec8d07d64 Mon Sep 17 00:00:00 2001
From: Riley Todd <rileyatodd@gmail.com>
Date: Wed, 22 Jul 2015 22:35:33 -0500
Subject: [PATCH 7/7] Added ability to enable auto key generation by adding a
 trailing ^ to the specString. Removed auto key generation entirely from
 custom components. Left in ability to trigger auto key generation for all
 specString declared components at construction-time to ease migration.

---
 jsnox.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/jsnox.js b/jsnox.js
index 103aa25..1eb37c4 100644
--- a/jsnox.js
+++ b/jsnox.js
@@ -4,6 +4,7 @@
 var tagNameRegex = /^([a-z1-6]+)(?:\:([a-z]+))?/    // matches 'input' or 'input:text'
 var propsRegex = /((?:#|\.|@)[\w-]+)|(\[.*?\])/g    // matches all further properties
 var attrRegex = /\[([\w-]+)(?:=([^\]]+))?\]/        // matches '[foo=bar]' or '[foo]'
+var autoKeyGenRegex = /\^$/                         // matches 'anything^' 
 
 // Error subclass to throw for parsing errors
 function ParseError(input) {
@@ -40,7 +41,7 @@ function parseTagSpec(specString, autoKeyGen) {
     var tagName = tagMatch[1]
     var props = {}
     var classes = []
-    if (autoKeyGen) {
+    if (autoKeyGen || specString.match(autoKeyGenRegex)) {
         props.key = specString
     }
     if (tagMatch[2]) props.type = tagMatch[2]
@@ -110,13 +111,7 @@ function jsnox(React, autoKeyGen) {
             props = null
         }
 
-        if (typeof componentType === 'function') {
-            if (autoKeyGen) {
-                var fakeKey = componentType.displayName || 'customElement'
-                props = props || {}
-                if (!props.key) props.key = fakeKey
-            }
-        } else {
+        if (typeof componentType !== 'function') {
             // Parse the provided string into a hash of props
             // If componentType is invalid (undefined, empty string, etc),
             // parseTagSpec should throw.