Fix some go linter warnings

2025-11-15 16:42:46 +01:00
parent 4fb25d0463
commit 5f1fdfa6c1
8 changed files with 84 additions and 99 deletions
--- a/processor/json.go
+++ b/processor/json.go
@@ -1,3 +1,5 @@
+// Package processor provides JSON processing and Lua script execution capabilities
+// for data transformation and manipulation.
 package processor

 import (
@@ -19,9 +21,9 @@ var jsonLogger = logger.Default.WithPrefix("processor/json")

 // ProcessJSON applies Lua processing to JSON content
 func ProcessJSON(content string, command utils.ModifyCommand, filename string) ([]utils.ReplaceCommand, error) {
-	processJsonLogger := jsonLogger.WithPrefix("ProcessJSON").WithField("commandName", command.Name).WithField("file", filename)
-	processJsonLogger.Debug("Starting JSON processing for file")
-	processJsonLogger.Trace("Initial file content length: %d", len(content))
+	processJSONLogger := jsonLogger.WithPrefix("ProcessJSON").WithField("commandName", command.Name).WithField("file", filename)
+	processJSONLogger.Debug("Starting JSON processing for file")
+	processJSONLogger.Trace("Initial file content length: %d", len(content))

 	var commands []utils.ReplaceCommand
 	startTime := time.Now()
@@ -30,15 +32,15 @@ func ProcessJSON(content string, command utils.ModifyCommand, filename string) (
 	var jsonData interface{}
 	err := json.Unmarshal([]byte(content), &jsonData)
 	if err != nil {
-		processJsonLogger.Error("Failed to parse JSON content: %v", err)
+		processJSONLogger.Error("Failed to parse JSON content: %v", err)
 		return commands, fmt.Errorf("failed to parse JSON: %v", err)
 	}
-	processJsonLogger.Debug("Successfully parsed JSON content")
+	processJSONLogger.Debug("Successfully parsed JSON content")

 	// Create Lua state
 	L, err := NewLuaState()
 	if err != nil {
-		processJsonLogger.Error("Error creating Lua state: %v", err)
+		processJSONLogger.Error("Error creating Lua state: %v", err)
 		return commands, fmt.Errorf("error creating Lua state: %v", err)
 	}
 	defer L.Close()
@@ -49,70 +51,58 @@ func ProcessJSON(content string, command utils.ModifyCommand, filename string) (
 	// Convert JSON data to Lua table
 	luaTable, err := ToLuaTable(L, jsonData)
 	if err != nil {
-		processJsonLogger.Error("Failed to convert JSON to Lua table: %v", err)
+		processJSONLogger.Error("Failed to convert JSON to Lua table: %v", err)
 		return commands, fmt.Errorf("failed to convert JSON to Lua table: %v", err)
 	}

 	// Set the JSON data as a global variable
 	L.SetGlobal("data", luaTable)
-	processJsonLogger.Debug("Set JSON data as Lua global 'data'")
+	processJSONLogger.Debug("Set JSON data as Lua global 'data'")

 	// Build and execute Lua script for JSON mode
 	luaExpr := BuildJSONLuaScript(command.Lua)
-	processJsonLogger.Debug("Built Lua script from expression: %q", command.Lua)
-	processJsonLogger.Trace("Full Lua script: %q", utils.LimitString(luaExpr, 200))
+	processJSONLogger.Debug("Built Lua script from expression: %q", command.Lua)
+	processJSONLogger.Trace("Full Lua script: %q", utils.LimitString(luaExpr, 200))

 	if err := L.DoString(luaExpr); err != nil {
-		processJsonLogger.Error("Lua script execution failed: %v\nScript: %s", err, utils.LimitString(luaExpr, 200))
+		processJSONLogger.Error("Lua script execution failed: %v\nScript: %s", err, utils.LimitString(luaExpr, 200))
 		return commands, fmt.Errorf("lua script execution failed: %v", err)
 	}
-	processJsonLogger.Debug("Lua script executed successfully")
+	processJSONLogger.Debug("Lua script executed successfully")

 	// Check if modification flag is set
 	modifiedVal := L.GetGlobal("modified")
 	if modifiedVal.Type() != lua.LTBool || !lua.LVAsBool(modifiedVal) {
-		processJsonLogger.Debug("Skipping - no modifications indicated by Lua script")
+		processJSONLogger.Debug("Skipping - no modifications indicated by Lua script")
 		return commands, nil
 	}

 	// Get the modified data from Lua
 	modifiedData := L.GetGlobal("data")
 	if modifiedData.Type() != lua.LTTable {
-		processJsonLogger.Error("Expected 'data' to be a table after Lua processing, got %s", modifiedData.Type().String())
+		processJSONLogger.Error("Expected 'data' to be a table after Lua processing, got %s", modifiedData.Type().String())
 		return commands, fmt.Errorf("expected 'data' to be a table after Lua processing")
 	}

 	// Convert back to Go interface
 	goData, err := FromLua(L, modifiedData)
 	if err != nil {
-		processJsonLogger.Error("Failed to convert Lua table back to Go: %v", err)
+		processJSONLogger.Error("Failed to convert Lua table back to Go: %v", err)
 		return commands, fmt.Errorf("failed to convert Lua table back to Go: %v", err)
 	}

-	processJsonLogger.Debug("About to call applyChanges with original data and modified data")
+	processJSONLogger.Debug("About to call applyChanges with original data and modified data")
 	commands, err = applyChanges(content, jsonData, goData)
 	if err != nil {
-		processJsonLogger.Error("Failed to apply surgical JSON changes: %v", err)
+		processJSONLogger.Error("Failed to apply surgical JSON changes: %v", err)
 		return commands, fmt.Errorf("failed to apply surgical JSON changes: %v", err)
 	}

-	processJsonLogger.Debug("Total JSON processing time: %v", time.Since(startTime))
-	processJsonLogger.Debug("Generated %d total modifications", len(commands))
+	processJSONLogger.Debug("Total JSON processing time: %v", time.Since(startTime))
+	processJSONLogger.Debug("Generated %d total modifications", len(commands))
 	return commands, nil
 }

-// applyJSONChanges compares original and modified data and applies changes surgically
-func applyJSONChanges(content string, originalData, modifiedData interface{}) ([]utils.ReplaceCommand, error) {
-	var commands []utils.ReplaceCommand
-
-	appliedCommands, err := applyChanges(content, originalData, modifiedData)
-	if err == nil && len(appliedCommands) > 0 {
-		return appliedCommands, nil
-	}
-
-	return commands, fmt.Errorf("failed to make any changes to the json")
-}
-
 // applyChanges attempts to make surgical changes while preserving exact formatting
 func applyChanges(content string, originalData, modifiedData interface{}) ([]utils.ReplaceCommand, error) {
 	var commands []utils.ReplaceCommand
@@ -199,12 +189,10 @@ func applyChanges(content string, originalData, modifiedData interface{}) ([]uti

 		// Convert the new value to JSON string
 		newValueStr := convertValueToJSONString(newValue)
-		
-		
+
 		// Insert the new field with pretty-printed formatting
 		// Format: ,"fieldName": { ... }
 		insertText := fmt.Sprintf(`,"%s": %s`, fieldName, newValueStr)
-		

 		commands = append(commands, utils.ReplaceCommand{
 			From: startPos,
@@ -437,8 +425,6 @@ func findDeepChanges(basePath string, original, modified interface{}) map[string
 						}
 						changes[currentPath] = nil // Mark for removal
 					}
-				} else {
-					// Elements added - more complex, skip for now
 				}
 			} else {
 				// Same length - check individual elements for value changes
--- a/processor/processor.go
+++ b/processor/processor.go
@@ -229,8 +229,8 @@ func BuildLuaScript(luaExpr string) string {

 // BuildJSONLuaScript prepares a Lua expression for JSON mode
 func BuildJSONLuaScript(luaExpr string) string {
-	buildJsonLuaScriptLogger := processorLogger.WithPrefix("BuildJSONLuaScript").WithField("inputLuaExpr", luaExpr)
-	buildJsonLuaScriptLogger.Debug("Building full Lua script for JSON mode from expression")
+	buildJSONLuaScriptLogger := processorLogger.WithPrefix("BuildJSONLuaScript").WithField("inputLuaExpr", luaExpr)
+	buildJSONLuaScriptLogger.Debug("Building full Lua script for JSON mode from expression")

 	// Perform $var substitutions from globalVariables
 	luaExpr = replaceVariables(luaExpr)
@@ -242,7 +242,7 @@ func BuildJSONLuaScript(luaExpr string) string {
 		local res = run()
 		modified = res == nil or res
 	`, luaExpr)
-	buildJsonLuaScriptLogger.Trace("Generated full JSON Lua script: %q", utils.LimitString(fullScript, 200))
+	buildJSONLuaScriptLogger.Trace("Generated full JSON Lua script: %q", utils.LimitString(fullScript, 200))

 	return fullScript
 }
--- a/processor/regex.go
+++ b/processor/regex.go
@@ -22,9 +22,9 @@ type CaptureGroup struct {
 	Range   [2]int
 }

-// ProcessContent applies regex replacement with Lua processing
-// The filename here exists ONLY so we can pass it to the lua environment
-// It's not used for anything else
+// ProcessRegex applies regex replacement with Lua processing.
+// The filename here exists ONLY so we can pass it to the lua environment.
+// It's not used for anything else.
 func ProcessRegex(content string, command utils.ModifyCommand, filename string) ([]utils.ReplaceCommand, error) {
 	processRegexLogger := regexLogger.WithPrefix("ProcessRegex").WithField("commandName", command.Name).WithField("file", filename)
 	processRegexLogger.Debug("Starting regex processing for file")
@@ -216,9 +216,6 @@ func ProcessRegex(content string, command utils.ModifyCommand, filename string)
 		}

 		if replacement == "" {
-			// Apply the modifications to the original match
-			replacement = matchContent
-
 			// Count groups that were actually modified
 			modifiedGroupsCount := 0
 			for _, capture := range updatedCaptureGroups {
--- a/processor/regex_test.go
+++ b/processor/regex_test.go
@@ -30,7 +30,7 @@ func normalizeWhitespace(s string) string {
 	return re.ReplaceAllString(strings.TrimSpace(s), " ")
 }

-func ApiAdaptor(content string, regex string, lua string) (string, int, int, error) {
+func APIAdaptor(content string, regex string, lua string) (string, int, int, error) {
 	command := utils.ModifyCommand{
 		Regex:    regex,
 		Lua:      lua,
@@ -79,7 +79,7 @@ func TestSimpleValueMultiplication(t *testing.T) {
    </item>
 </config>`

-	result, mods, matches, err := ApiAdaptor(content, `(?s)<value>(\d+)</value>`, "v1 = v1*1.5")
+	result, mods, matches, err := APIAdaptor(content, `(?s)<value>(\d+)</value>`, "v1 = v1*1.5")

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 1, matches, "Expected 1 match, got %d", matches)
@@ -100,7 +100,7 @@ func TestShorthandNotation(t *testing.T) {
    </item>
 </config>`

-	result, mods, matches, err := ApiAdaptor(content, `(?s)<value>(\d+)</value>`, "v1*1.5")
+	result, mods, matches, err := APIAdaptor(content, `(?s)<value>(\d+)</value>`, "v1*1.5")

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 1, matches, "Expected 1 match, got %d", matches)
@@ -121,7 +121,7 @@ func TestShorthandNotationFloats(t *testing.T) {
    </item>
 </config>`

-	result, mods, matches, err := ApiAdaptor(content, `(?s)<value>(\d+\.\d+)</value>`, "v1*1.5")
+	result, mods, matches, err := APIAdaptor(content, `(?s)<value>(\d+\.\d+)</value>`, "v1*1.5")

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 1, matches, "Expected 1 match, got %d", matches)
@@ -146,7 +146,7 @@ func TestArrayNotation(t *testing.T) {
    </prices>
 </config>`

-	result, mods, matches, err := ApiAdaptor(content, `(?s)<price>(\d+)</price>`, "v1*2")
+	result, mods, matches, err := APIAdaptor(content, `(?s)<price>(\d+)</price>`, "v1*2")

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 3, matches, "Expected 3 matches, got %d", matches)
@@ -167,7 +167,7 @@ func TestMultipleNumericMatches(t *testing.T) {
    <entry>400</entry>
 </data>`

-	result, mods, matches, err := ApiAdaptor(content, `<entry>(\d+)</entry>`, "v1*2")
+	result, mods, matches, err := APIAdaptor(content, `<entry>(\d+)</entry>`, "v1*2")

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 3, matches, "Expected 3 matches, got %d", matches)
@@ -186,7 +186,7 @@ func TestMultipleStringMatches(t *testing.T) {
    <name>Mary_modified</name>
 </data>`

-	result, mods, matches, err := ApiAdaptor(content, `<name>([A-Za-z]+)</name>`, `s1 = s1 .. "_modified"`)
+	result, mods, matches, err := APIAdaptor(content, `<name>([A-Za-z]+)</name>`, `s1 = s1 .. "_modified"`)

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 2, matches, "Expected 2 matches, got %d", matches)
@@ -205,7 +205,7 @@ func TestStringUpperCase(t *testing.T) {
    <user>MARY</user>
 </users>`

-	result, mods, matches, err := ApiAdaptor(content, `<user>([A-Za-z]+)</user>`, `s1 = string.upper(s1)`)
+	result, mods, matches, err := APIAdaptor(content, `<user>([A-Za-z]+)</user>`, `s1 = string.upper(s1)`)

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 2, matches, "Expected 2 matches, got %d", matches)
@@ -224,7 +224,7 @@ func TestStringConcatenation(t *testing.T) {
    <product>Banana_fruit</product>
 </products>`

-	result, mods, matches, err := ApiAdaptor(content, `<product>([A-Za-z]+)</product>`, `s1 = s1 .. "_fruit"`)
+	result, mods, matches, err := APIAdaptor(content, `<product>([A-Za-z]+)</product>`, `s1 = s1 .. "_fruit"`)

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 2, matches, "Expected 2 matches, got %d", matches)
@@ -254,7 +254,7 @@ func TestDecimalValues(t *testing.T) {
 	regex := regexp.MustCompile(`(?s)<value>([0-9.]+)</value>.*?<multiplier>([0-9.]+)</multiplier>`)
 	luaExpr := BuildLuaScript("v1 = v1 * v2")

-	result, _, _, err := ApiAdaptor(content, regex.String(), luaExpr)
+	result, _, _, err := APIAdaptor(content, regex.String(), luaExpr)
 	assert.NoError(t, err, "Error processing content: %v", err)

 	normalizedModified := normalizeWhitespace(result)
@@ -282,7 +282,7 @@ func TestLuaMathFunctions(t *testing.T) {
 	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>`)
 	luaExpr := BuildLuaScript("v1 = math.sqrt(v1)")

-	modifiedContent, _, _, err := ApiAdaptor(content, regex.String(), luaExpr)
+	modifiedContent, _, _, err := APIAdaptor(content, regex.String(), luaExpr)
 	assert.NoError(t, err, "Error processing content: %v", err)

 	normalizedModified := normalizeWhitespace(modifiedContent)
@@ -310,7 +310,7 @@ func TestDirectAssignment(t *testing.T) {
 	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>`)
 	luaExpr := BuildLuaScript("=0")

-	modifiedContent, _, _, err := ApiAdaptor(content, regex.String(), luaExpr)
+	modifiedContent, _, _, err := APIAdaptor(content, regex.String(), luaExpr)
 	assert.NoError(t, err, "Error processing content: %v", err)

 	normalizedModified := normalizeWhitespace(modifiedContent)
@@ -369,7 +369,7 @@ func TestStringAndNumericOperations(t *testing.T) {
 			luaExpr := BuildLuaScript(tt.luaExpression)

 			// Process with our function
-			result, modCount, _, err := ApiAdaptor(tt.input, pattern, luaExpr)
+			result, modCount, _, err := APIAdaptor(tt.input, pattern, luaExpr)
 			assert.NoError(t, err, "Process function failed: %v", err)

 			// Check results
@@ -430,7 +430,7 @@ func TestEdgeCases(t *testing.T) {
 			luaExpr := BuildLuaScript(tt.luaExpression)

 			// Process with our function
-			result, modCount, _, err := ApiAdaptor(tt.input, pattern, luaExpr)
+			result, modCount, _, err := APIAdaptor(tt.input, pattern, luaExpr)
 			assert.NoError(t, err, "Process function failed: %v", err)

 			// Check results
@@ -453,7 +453,7 @@ func TestNamedCaptureGroups(t *testing.T) {
    </item>
 </config>`

-	result, mods, matches, err := ApiAdaptor(content, `(?s)<value>(?<amount>\d+)</value>`, "amount = amount * 2")
+	result, mods, matches, err := APIAdaptor(content, `(?s)<value>(?<amount>\d+)</value>`, "amount = amount * 2")

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 1, matches, "Expected 1 match, got %d", matches)
@@ -474,7 +474,7 @@ func TestNamedCaptureGroupsNum(t *testing.T) {
    </item>
 </config>`

-	result, mods, matches, err := ApiAdaptor(content, `(?s)<value>(?<amount>!num)</value>`, "amount = amount * 2")
+	result, mods, matches, err := APIAdaptor(content, `(?s)<value>(?<amount>!num)</value>`, "amount = amount * 2")

 	assert.NoError(t, err, "Error processing content: %v", err)
 	assert.Equal(t, 1, matches, "Expected 1 match, got %d", matches)
@@ -495,7 +495,7 @@ func TestMultipleNamedCaptureGroups(t *testing.T) {
    <quantity>15</quantity>
 </product>`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`(?s)<name>(?<prodName>[^<]+)</name>.*?<price>(?<prodPrice>\d+\.\d+)</price>.*?<quantity>(?<prodQty>\d+)</quantity>`,
 		`prodName = string.upper(prodName)
 		 prodPrice = round(prodPrice + 8, 2)
@@ -518,7 +518,7 @@ func TestMixedIndexedAndNamedCaptures(t *testing.T) {
    <data>VALUE</data>
 </entry>`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`(?s)<id>(\d+)</id>.*?<data>(?<dataField>[^<]+)</data>`,
 		`v1 = v1 * 2
 		 dataField = string.upper(dataField)`)
@@ -550,7 +550,7 @@ func TestComplexNestedNamedCaptures(t *testing.T) {
 		</contact>
 	</person>`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`(?s)<details>.*?<name>(?<fullName>[^<]+)</name>.*?<age>(?<age>\d+)</age>`,
 		`fullName = string.upper(fullName) .. " (" .. age .. ")"`)

@@ -571,7 +571,7 @@ func TestNamedCaptureWithVariableReadback(t *testing.T) {
    <mana>300</mana>
 </stats>`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`(?s)<health>(?<hp>\d+)</health>.*?<mana>(?<mp>\d+)</mana>`,
 		`hp = hp * 1.5
 		 mp = mp * 1.5`)
@@ -587,7 +587,7 @@ func TestNamedCaptureWithSpecialCharsInName(t *testing.T) {

 	expected := `<data value="84" min="10" max="100" />`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<data value="(?<val_1>\d+)"`,
 		`val_1 = val_1 * 2`)

@@ -602,7 +602,7 @@ func TestEmptyNamedCapture(t *testing.T) {

 	expected := `<tag attr="default" />`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`attr="(?<value>.*?)"`,
 		`value = value == "" and "default" or value`)

@@ -617,7 +617,7 @@ func TestMultipleNamedCapturesInSameLine(t *testing.T) {

 	expected := `<rect x="20" y="40" width="200" height="100" />`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`x="(?<x>\d+)" y="(?<y>\d+)" width="(?<w>\d+)" height="(?<h>\d+)"`,
 		`x = x * 2
 		 y = y * 2
@@ -641,7 +641,7 @@ func TestConditionalNamedCapture(t *testing.T) {
 	<item status="inactive" count="10" />
 	`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<item status="(?<status>[^"]+)" count="(?<count>\d+)"`,
 		`count = status == "active" and count * 2 or count`)

@@ -662,7 +662,7 @@ func TestLuaFunctionsOnNamedCaptures(t *testing.T) {
 	<user name="JANE SMITH" role="admin" />
 	`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<user name="(?<name>[^"]+)" role="(?<role>[^"]+)"`,
 		`-- Capitalize first letters for regular users
 		 if role == "user" then
@@ -692,7 +692,7 @@ func TestNamedCaptureWithMath(t *testing.T) {
 	<item price="19.99" quantity="3" total="59.97" />
 	`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<item price="(?<price>\d+\.\d+)" quantity="(?<qty>\d+)"!any$`,
 		`-- Calculate and add total
 		 replacement = string.format('<item price="%s" quantity="%s" total="%.2f" />',
@@ -712,7 +712,7 @@ func TestNamedCaptureWithGlobals(t *testing.T) {

 	expected := `<temp unit="F">77</temp>`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<temp unit="(?<unit>[CF]?)">(?<value>\d+)</temp>`,
 		`if unit == "C" then
 		  value = value * 9/5 + 32
@@ -739,7 +739,7 @@ func TestMixedDynamicAndNamedCaptures(t *testing.T) {
 	<color rgb="0,255,0" name="GREEN" hex="#00FF00" />
 	`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<color rgb="(?<r>\d+),(?<g>\d+),(?<b>\d+)" name="(?<colorName>[^"]+)" />`,
 		`-- Uppercase the name
 		 colorName = string.upper(colorName)
@@ -765,7 +765,7 @@ func TestNamedCapturesWithMultipleReferences(t *testing.T) {

 	expected := `<text format="uppercase" length="11">HELLO WORLD</text>`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<text>(?<content>[^<]+)</text>`,
 		`local uppercaseContent = string.upper(content)
 		 local contentLength = string.len(content)
@@ -783,7 +783,7 @@ func TestNamedCaptureWithJsonData(t *testing.T) {

 	expected := `<data>{"name":"JOHN","age":30}</data>`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<data>(?<json>\{.*?\})</data>`,
 		`-- Parse JSON (simplified, assumes valid JSON)
 		 local name = json:match('"name":"([^"]+)"')
@@ -813,7 +813,7 @@ func TestNamedCaptureInXML(t *testing.T) {
 	</product>
 	`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`(?s)<price currency="(?<currency>[^"]+)">(?<price>\d+\.\d+)</price>.*?<stock>(?<stock>\d+)</stock>`,
 		`-- Add 20% to price if USD
 		 if currency == "USD" then
@@ -870,7 +870,7 @@ func TestComprehensiveNamedCaptures(t *testing.T) {
 	</products>
 	`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`(?s)<product sku="(?<sku>[^"]+)" status="(?<status>[^"]+)"[^>]*>\s*<name>(?<product_name>[^<]+)</name>\s*<price currency="(?<currency>[^"]+)">(?<price>\d+\.\d+)</price>\s*<quantity>(?<qty>\d+)</quantity>`,
 		`-- Only process in-stock items
 		if status == "in-stock" then
@@ -924,7 +924,7 @@ func TestVariousNamedCaptureFormats(t *testing.T) {
 	</data>
 	`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`<entry id="(?<id_num>\d+)" value="(?<val>\d+)"(?: status="(?<status>[^"]*)")? />`,
 		`-- Prefix the ID with "ID-"
 		id_num = "ID-" .. id_num
@@ -963,7 +963,7 @@ func TestSimpleNamedCapture(t *testing.T) {

 	expected := `<product name="WIDGET" price="19.99"/>`

-	result, mods, matches, err := ApiAdaptor(content,
+	result, mods, matches, err := APIAdaptor(content,
 		`name="(?<product_name>[^"]+)"`,
 		`product_name = string.upper(product_name)`)