fix current tracking for unadressable data (#40)

Author: Dean Karn

.github/workflows/workflow.yml

@@ -8,20 +8,20 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.15.x, 1.16.x]
+        go-version: [1.20.x, 1.19.x, 1.18.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Restore Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-v1-go-${{ hashFiles('**/go.sum') }}
@@ -32,7 +32,7 @@ jobs:
         run: go test -race -covermode=atomic -coverprofile="profile.cov" ./...
 
       - name: Send Coverage
-        if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.16.x'
+        if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.20.x'
         uses: shogo82148/actions-goveralls@v1
         with:
           path-to-profile: profile.cov
@@ -41,8 +41,8 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.41.1
+          version: latest

README.md

@@ -1,6 +1,6 @@
 Package mold
 ============
-![Project status](https://img.shields.io/badge/version-4.2.0-green.svg)
+![Project status](https://img.shields.io/badge/version-4.2.1-green.svg)
 [![Build Status](https://travis-ci.org/go-playground/mold.svg?branch=v2)](https://travis-ci.org/go-playground/mold)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/mold/badge.svg?branch=v2)](https://coveralls.io/github/go-playground/mold?branch=v2)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/mold)](https://goreportcard.com/report/github.com/go-playground/mold)
@@ -11,6 +11,10 @@ Package mold is a general library to help modify or set data within data structu
 
 How can this help me you ask, please see the examples [here](_examples/full/main.go)
 
+Requirements
+------------
+- Go 1.18+
+
 Installation
 ------------
 

go.mod

@@ -1,10 +1,17 @@
 module github.com/go-playground/mold/v4
 
-go 1.15
+go 1.18
 
 require (
 	github.com/go-playground/assert/v2 v2.0.1
 	github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734
 	github.com/segmentio/go-snakecase v1.2.0
 	github.com/stretchr/testify v1.7.0
+	golang.org/x/text v0.6.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )

go.sum

@@ -11,6 +11,8 @@ github.com/segmentio/go-snakecase v1.2.0/go.mod h1:jk1miR5MS7Na32PZUykG89Arm+1BU
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

modifiers/string.go

@@ -3,6 +3,8 @@ package modifiers
 import (
 	"bytes"
 	"context"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 	"reflect"
 	"regexp"
 	"strings"
@@ -90,7 +92,7 @@ func snakeCase(ctx context.Context, fl mold.FieldLevel) error {
 func titleCase(ctx context.Context, fl mold.FieldLevel) error {
 	switch fl.Field().Kind() {
 	case reflect.String:
-		fl.Field().SetString(strings.Title(fl.Field().String()))
+		fl.Field().SetString(cases.Title(language.Und, cases.NoLower).String(fl.Field().String()))
 	}
 	return nil
 }
@@ -112,7 +114,7 @@ var nameRegex = regexp.MustCompile(`[\p{L}]([\p{L}|[:space:]\-']*[\p{L}])*`)
 func nameCase(ctx context.Context, fl mold.FieldLevel) error {
 	switch fl.Field().Kind() {
 	case reflect.String:
-		fl.Field().SetString(strings.Title(nameRegex.FindString(onlyOne(strings.ToLower(fl.Field().String())))))
+		fl.Field().SetString(cases.Title(language.Und, cases.NoLower).String(nameRegex.FindString(onlyOne(strings.ToLower(fl.Field().String())))))
 	}
 	return nil
 }

modifiers/string_test.go

@@ -22,6 +22,16 @@ import (
 // go test -coverprofile cover.out && go tool cover -html=cover.out -o cover.html
 //
 
+func TestMultiple(t *testing.T) {
+	assert := require.New(t)
+	conform := New()
+	s := interface{}("JOEYBLOGGS ")
+
+	err := conform.Field(context.Background(), &s, "trim,lcase")
+	assert.NoError(err)
+	assert.Equal("joeybloggs", s)
+}
+
 func TestEnumType(t *testing.T) {
 	assert := require.New(t)
 

mold.go

@@ -25,18 +25,14 @@ type Transform interface {
 // Func defines a transform function for use.
 type Func func(ctx context.Context, fl FieldLevel) error
 
-//
 // StructLevelFunc accepts all values needed for struct level manipulation.
 //
 // Why does this exist? For structs for which you may not have access or rights to add tags too,
 // from other packages your using.
-//
 type StructLevelFunc func(ctx context.Context, sl StructLevel) error
 
-//
 // InterceptorFunc is a way to intercept custom types to redirect the functions to be applied to an inner typ/value.
 // eg. sql.NullString, the manipulation should be done on the inner string.
-//
 type InterceptorFunc func(current reflect.Value) (inner reflect.Value)
 
 // Transformer is the base controlling object which contains
@@ -135,13 +131,11 @@ func (t *Transformer) RegisterStructLevel(fn StructLevelFunc, types ...interface
 	}
 }
 
-//
 // RegisterInterceptor registers a new interceptor functions agains one or more types.
 // This InterceptorFunc allows one to intercept the incoming to to redirect the application of modifications
 // to an inner type/value.
 //
 // eg. sql.NullString
-//
 func (t *Transformer) RegisterInterceptor(fn InterceptorFunc, types ...interface{}) {
 	for _, typ := range types {
 		t.interceptors[reflect.TypeOf(typ)] = fn
@@ -263,6 +257,7 @@ func (t *Transformer) setByField(ctx context.Context, orig reflect.Value, ct *cT
 						return
 					}
 					orig.Set(reflect.Indirect(newVal))
+					current, kind = t.extractType(orig)
 				} else {
 					if err = ct.fn(ctx, fieldLevel{
 						transformer: t,