From f035e3198dcf4d5b7324a6ebae3fc8041ddafee2 Mon Sep 17 00:00:00 2001
From: Sebastiano Bellinzis <sebastiano.bellinzis@outlook.com>
Date: Mon, 29 Jan 2024 23:39:58 +0100
Subject: [PATCH] add textarea

---
 README.md      |  5 ++++
 fields.go      |  5 ++--
 transformer.go | 64 ++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index df69b92..cb0a292 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,8 @@ There is currently only one template file for all the currently supported templa
             <option value="{{$option.Id}}">{{$option.Name}}</option>
             {{ end }}
         </select>
+        {{ else if eq .Field.Type "textarea" }}
+        <textarea {{with .Field.Id}}id="{{.}}"{{end}} name="{{.Field.Name}}" {{with .Field.Id}}rows="{{.}}"{{end}} {{with .Field.Cols}}cols="{{.}}"{{end}} placeholder="{{.Field.Placeholder}}" {{ if eq .Field.Required true }}required{{end}} class="block w-full shadow-sm sm:text-sm border-gray-300 rounded-md"></textarea>
         {{ else if eq .Field.Type "dropdownmapped" }}
         <select {{with .Field.Id}}id="{{.}}"{{end}} name="{{.Field.Name}}" class="text-gray-700 dark:text-gray-200 dark:bg-gray-700 bg-white block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm">
             {{ $value := .Field.Value }}
@@ -152,6 +154,9 @@ supported tags
 - placeholder
 - name
 - required
+- cols
+- rows
+- step
 
 
 ## TODO 
diff --git a/fields.go b/fields.go
index ff24a50..5a64b23 100644
--- a/fields.go
+++ b/fields.go
@@ -12,7 +12,7 @@ const (
 	FieldTypeDropdown       FieldType = "dropdown"
 	FieldTypeDropdownMapped FieldType = "dropdownmapped"
 	FieldTypeSubmit         FieldType = "submit"
-	FieldTypeTextArea       FieldType = "textArea"
+	FieldTypeTextArea       FieldType = "textarea"
 )
 
 type InputFieldType string
@@ -23,7 +23,6 @@ const (
 	InputFieldTypeEmail    InputFieldType = "email"
 	InputFieldTypeTel      InputFieldType = "tel"
 	InputFieldTypeNumber   InputFieldType = "number"
-	InputFieldTypeDate     InputFieldType = "date"
 	InputFieldTypeNone     InputFieldType = ""
 )
 
@@ -56,6 +55,8 @@ type FormField struct {
 	InputType   InputFieldType `json:"inputType,omitempty"`
 	Label       string         `json:"label,omitempty"`
 	Step        string         `json:"step,omitempty"`
+	Rows        string         `json:"rows,omitempty"`
+	Cols        string         `json:"cols,omitempty"`
 	Values      []FieldValue   `json:"values,omitempty"`
 	Required    bool           `json:"required"`
 	Fields      []FormField    `json:"fields,omitempty"`
diff --git a/transformer.go b/transformer.go
index 91b6631..27e770d 100644
--- a/transformer.go
+++ b/transformer.go
@@ -7,6 +7,19 @@ import (
 	"strings"
 )
 
+const (
+	tagName        = "name"
+	tagLabel       = "label"
+	tagPlaceholder = "placeholder"
+	tagRequired    = "required"
+	tagInputType   = "inputType"
+	tagLegend      = "legend"
+	tagType        = "type"
+	tagStep        = "step"
+	tagRows        = "rows"
+	tagCols        = "cols"
+)
+
 type (
 	Enumerator interface{ Enum() []any }
 	Mapper     interface {
@@ -56,6 +69,8 @@ func NewTransformer(model interface{}) (*Transformer, error) {
 
 	tr.Fields = fields
 
+	fmt.Printf("tr: %+v\n", tr.Fields)
+
 	return tr, nil
 }
 
@@ -72,7 +87,7 @@ func (t *Transformer) scanModel(rValue reflect.Value, rType reflect.Type, names
 	for i := 0; i < rType.NumField(); i++ {
 		tags := rType.Field(i).Tag
 
-		name := tags.Get("name")
+		name := tags.Get(tagName)
 		if name == "" {
 			name = rType.Field(i).Name
 		}
@@ -80,8 +95,8 @@ func (t *Transformer) scanModel(rValue reflect.Value, rType reflect.Type, names
 		nname := append(names, name)
 
 		field := FormField{
-			Label:       tags.Get("label"),
-			Placeholder: tags.Get("placeholder"),
+			Label:       tags.Get(tagLabel),
+			Placeholder: tags.Get(tagPlaceholder),
 			Name:        strings.Join(nname, "."),
 			Value:       rValue.Field(i).Interface(),
 		}
@@ -90,7 +105,7 @@ func (t *Transformer) scanModel(rValue reflect.Value, rType reflect.Type, names
 			field.Label = name
 		}
 
-		if tags.Get("required") == "true" {
+		if tags.Get(tagRequired) == "true" {
 			field.Required = true
 		}
 
@@ -150,7 +165,7 @@ func (t *Transformer) scanModel(rValue reflect.Value, rType reflect.Type, names
 			continue
 		}
 
-		inputType := InputFieldType(tags.Get("inputType"))
+		inputType := InputFieldType(tags.Get(tagInputType))
 
 		fType := rType.Field(i).Type
 		fValue := rValue.Field(i)
@@ -167,14 +182,23 @@ func (t *Transformer) scanModel(rValue reflect.Value, rType reflect.Type, names
 
 		switch fType.Kind() {
 		case reflect.String:
-
 			if inputType == "" {
 				inputType = InputFieldTypeText
 			}
 
-			field.Type = FieldTypeInput
-			field.InputType = inputType
+			typ := FieldType(tags.Get(tagType))
+			if typ == "" {
+				typ = FieldTypeInput
+			}
 
+			field.Type = typ
+			field.InputType = inputType
+			if tags.Get(tagRows) != "" {
+				field.Rows = tags.Get(tagRows)
+			}
+			if tags.Get(tagCols) != "" {
+				field.Cols = tags.Get(tagCols)
+			}
 		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
 			reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
 
@@ -184,8 +208,12 @@ func (t *Transformer) scanModel(rValue reflect.Value, rType reflect.Type, names
 
 			field.Type = FieldTypeInput
 			field.InputType = inputType
-			field.Step = "1"
 
+			if tags.Get(tagStep) != "" {
+				field.Step = tags.Get(tagStep)
+			} else {
+				field.Step = "1"
+			}
 		case reflect.Float32, reflect.Float64:
 			if inputType == "" {
 				inputType = InputFieldTypeNumber
@@ -193,27 +221,27 @@ func (t *Transformer) scanModel(rValue reflect.Value, rType reflect.Type, names
 
 			field.Type = FieldTypeInput
 			field.InputType = inputType
-			field.Step = "any"
 
-		case reflect.Bool:
-			fieldType := FieldTypeCheckbox
-			if len(names) > 0 && names[len(names)-1] == name {
-				// radio-options use the same 'name' as their parent for grouping
-				fieldType = FieldTypeRadios
+			if tags.Get(tagStep) != "" {
+				field.Step = tags.Get(tagStep)
+			} else {
+				field.Step = "any"
 			}
-
-			field.Type = fieldType
+		case reflect.Bool:
+			field.Type = FieldTypeCheckbox
 		case reflect.Slice, reflect.Array:
 		case reflect.Map:
 		case reflect.Struct:
 			field.Type = FieldTypeGroup
-			field.Legend = tags.Get("legend")
+			field.Legend = tags.Get(tagLegend)
 
 			var err error
 			field.Fields, err = t.scanModel(fValue, fType, nname...)
 			if err != nil {
 				return nil, err
 			}
+		default:
+			return nil, fmt.Errorf("unsupported type: %s", fType.Kind())
 		}
 
 		fields = append(fields, field)