refactor: data/table/sheet: rename TestColLettersToNumber() from TestColLettersToIndex()

Author: grokify

data/table/column.go

@@ -71,14 +71,14 @@ func (cols Columns) CellString(colName string, row []string, defaultIfEmpty bool
 
 // CellStringByLetters returns a single row value by column letters.
 func (cols Columns) CellStringByLetters(colLetters string, row []string, defaultIfEmpty bool, def string) (string, error) {
-	if colIdx, err := sheet.ColLettersToIndex(colLetters); err != nil {
+	if colNum, err := sheet.ColLettersToNumber(colLetters); err != nil {
 		return "", err
-	} else if int(colIdx) < len(row) {
-		return row[colIdx], nil
+	} else if int(colNum) <= len(row) {
+		return row[colNum-1], nil
 	} else if defaultIfEmpty {
 		return def, nil
 	} else {
-		return "", fmt.Errorf("index out of range (%d)", colIdx)
+		return "", fmt.Errorf("index out of range (%d)", colNum-1)
 	}
 }
 

data/table/sheet/columns.go

@@ -18,15 +18,15 @@ func SliceReplaceValueAtLettersMap(s []string, m map[string]string) ([]string, e
 }
 
 func SliceReplaceValueAtLetters(s []string, letters, v string) ([]string, error) {
-	idx, err := ColLettersToIndex(letters)
+	num, err := ColLettersToNumber(letters)
 	if err != nil {
 		return []string{}, err
 	}
-	if int(idx) >= len(s) {
+	if int(num) > len(s) {
 		return []string{}, fmt.Errorf("index out of bounds index letter (%s) index int (%d) len input (%d)",
-			letters, idx, len(s))
+			letters, num-1, len(s))
 	}
 	out := slices.Clone(s)
-	out[idx] = v
+	out[num-1] = v
 	return out, nil
 }

data/table/sheet/coordinates.go

@@ -1,6 +1,7 @@
 package sheet
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -98,9 +99,12 @@ func ColIndexToLetters(colIndex uint32) string {
 	return strings.TrimSpace(prefix) + strings.TrimSpace(suffix)
 }
 
-func ColLettersToIndex(letters string) (uint32, error) {
+func ColLettersToNumber(letters string) (uint32, error) {
 	letters = strings.ToUpper(strings.TrimSpace(letters))
-	var result uint32 = 0
+	result := uint32(0)
+	if letters == "" {
+		return result, errors.New("letters string cannot be empty")
+	}
 	for i := range len(letters) {
 		c := letters[i]
 		if c < 'A' || c > 'Z' {

data/table/sheet/coordinates_test.go

@@ -95,7 +95,7 @@ func TestColNumberToLetters(t *testing.T) {
 	}
 }
 
-func TestColLettersToIndex(t *testing.T) {
+func TestColLettersToNumber(t *testing.T) {
 	tests := map[string]uint32{
 		"A":       1,
 		"Z":       26,
@@ -109,7 +109,7 @@ func TestColLettersToIndex(t *testing.T) {
 	}
 
 	for col, expected := range tests {
-		got, err := ColLettersToIndex(col)
+		got, err := ColLettersToNumber(col)
 		if err != nil {
 			t.Errorf("ColumnLetterToIndexUint32(%q); error (%s)", col, err.Error())
 		}