Handling hyphens in field names

mholt · mholt · commit 6b0191cc93b6 · 2015-03-05T10:01:55.000-07:00
diff --git a/json-to-go.js b/json-to-go.js
@@ -104,7 +104,7 @@ function jsonToGo(json, typename)
 				'8': "Eight_", '9': "Nine_"};
 			str = numbers[str.charAt(0)] + str.substr(1);
 		}
-		return toProperCase(str).replace(/\s|_/g, "");
+		return toProperCase(str).replace(/\s|_|-/g, "");
 	}
 
 	function goType(val)
@@ -159,7 +159,7 @@ function jsonToGo(json, typename)
 		
 		str = str.charAt(0).toUpperCase() + str.substr(1);
 
-		return str.replace(/[\s_][a-z]+/g, function(txt)
+		return str.replace(/[\s_-][a-z]+/g, function(txt)
 		{
 			return txt.charAt(0)
 					+ txt.charAt(1).toUpperCase()

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ function jsonToGo(json, typename)`
`104`	`104`	`'8': "Eight_", '9': "Nine_"};`
`105`	`105`	`str = numbers[str.charAt(0)] + str.substr(1);`
`106`	`106`	`}`
`107`		`- return toProperCase(str).replace(/\s\|_/g, "");`
	`107`	`+ return toProperCase(str).replace(/\s\|_\|-/g, "");`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`function goType(val)`
`@@ -159,7 +159,7 @@ function jsonToGo(json, typename)`
`159`	`159`
`160`	`160`	`str = str.charAt(0).toUpperCase() + str.substr(1);`
`161`	`161`
`162`		`- return str.replace(/[\s_][a-z]+/g, function(txt)`
	`162`	`+ return str.replace(/[\s_-][a-z]+/g, function(txt)`
`163`	`163`	`{`
`164`	`164`	`return txt.charAt(0)`
`165`	`165`	`+ txt.charAt(1).toUpperCase()`