chore(golang): improve code formatting

Part of #9

Author: php-coder

examples/go/routes.go

@@ -95,9 +95,9 @@ func registerRoutes(r chi.Router, db *sqlx.DB) {
 		json.NewDecoder(r.Body).Decode(&dto)
 
 		args := map[string]interface{}{
-			"name": dto.Name,
+			"name":    dto.Name,
 			"name_ru": dto.NameRu,
-			"slug": dto.Slug,
+			"slug":    dto.Slug,
 			"user_id": dto.UserId,
 		}
 		_, err := db.NamedExec(
@@ -143,10 +143,10 @@ func registerRoutes(r chi.Router, db *sqlx.DB) {
 		json.NewDecoder(r.Body).Decode(&dto)
 
 		args := map[string]interface{}{
-			"name": dto.Name,
-			"name_ru": dto.NameRu,
-			"slug": dto.Slug,
-			"user_id": dto.UserId,
+			"name":       dto.Name,
+			"name_ru":    dto.NameRu,
+			"slug":       dto.Slug,
+			"user_id":    dto.UserId,
 			"categoryId": chi.URLParam(r, "categoryId"),
 		}
 		_, err := db.NamedExec(

src/cli.js

@@ -94,6 +94,15 @@ const snake2camelCase = (str) => str.replace(/_([a-z])/g, (match, group1) => gro
 // (used only with Golang's go-chi)
 const capitalize = (str) => str[0].toUpperCase() + str.slice(1);
 
+// ["a", "bb", "ccc"] => 3
+// (used only with Golang's go-chi)
+const lengthOfLongestString = (arr) => arr
+		.map(el => el.length)
+		.reduce(
+			(acc, val) => val > acc ? val : acc,
+			0 /* initial value */
+		);
+
 const createEndpoints = async (destDir, lang, config) => {
     const fileName = `routes.${lang}`
     console.log('Generate', fileName);
@@ -156,20 +165,25 @@ const createEndpoints = async (destDir, lang, config) => {
             "removePlaceholders": removePlaceholders,
             "snake2camelCase": snake2camelCase,
             "capitalize": capitalize,
+            "lengthOfLongestString": lengthOfLongestString,
 
             // [ "p.page", "b.num" ] => '"page": dto.Page),\n\t\t\t"num": dto.Num),'
             // (used only with Golang's go-chi)
             "formatParamsAsGolangMap": (params) => {
                 if (params.length === 0) {
                     return params;
                 }
+                const maxParamNameLength = lengthOfLongestString(params);
                 return Array.from(
                         new Set(params),
                         p => {
                             const bindTarget = p.substring(0, 1);
                             const paramName = p.substring(2);
                             const formatFunc = placeholdersMap['go'][bindTarget];
-                            return `"${paramName}": ${formatFunc(paramName)},`
+                            const quotedParam = '"' + paramName + '":';
+                            // We don't count quotes and colon because they are compensated by "p." prefix.
+                            // We do +1 because the longest parameter will also have an extra space as a delimiter.
+                            return `${quotedParam.padEnd(maxParamNameLength+1)} ${formatFunc(paramName)},`
                         }
                     ).join('\n\t\t\t');
             },

src/templates/routes.go.ejs

@@ -106,26 +106,14 @@ function query2dto(parser, method) {
 		"hasUserProvidedName": hasName,
 		"props": propsWithTypes,
 		// max length is needed for proper formatting
-		"maxFieldNameLength": lengthOfLongestString(props),
+		"maxFieldNameLength": lengthOfLongestString(props.map(el => el.indexOf('_') < 0 ? el : el.replace(/_/g, ''))),
 		// required for de-duplication
 		// [ {name:foo, type:int}, {name:bar, type:string} ] => "foo=int bar=string"
 		// TODO: sort before join
 		"signature": propsWithTypes.map(field => `${field.name}=${field.type}`).join(' ')
 	};
 }
 
-// ["a", "b__b", "ccc"] => 3
-// Note that it doesn't count underscores.
-function lengthOfLongestString(arr) {
-	return arr
-		.map(el => el.indexOf('_') < 0 ? el : el.replace(/_/g, ''))
-		.map(el => el.length)
-		.reduce(
-			(acc, val) => val > acc ? val : acc,
-			0 /* initial value */
-		);
-}
-
 function dto2struct(dto) {
 	let result = `type ${dto.name} struct {\n`;
 	dto.props.forEach(prop => {
@@ -225,7 +213,6 @@ endpoints.forEach(function(endpoint) {
 			// TODO: do we really need signature and cache?
 			const cacheKey = dto ? dto.signature : null;
 			const dataType = dtoInCache(dto) ? dtoCache[cacheKey] : dto.name;
-			// TODO: align args properly (like gofmt does)
 %>
 	r.Post("<%- path %>", func(w http.ResponseWriter, r *http.Request) {
 		var dto <%- dataType %>
@@ -253,7 +240,6 @@ endpoints.forEach(function(endpoint) {
 			// TODO: do we really need signature and cache?
 			const cacheKey = dto ? dto.signature : null;
 			const dataType = dtoInCache(dto) ? dtoCache[cacheKey] : dto.name;
-			// TODO: align args properly (like gofmt does)
 %>
 	r.Put("<%- path %>", func(w http.ResponseWriter, r *http.Request) {
 		var dto <%- dataType %>