Skip to content

High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.

refactor: move the nth selector grammar to its owning package

Luigi Agosti4e419b2f9939
diff --git a/internal/bridge/action_resolve.go b/internal/bridge/action_resolve.go
index f110a460..63a5ce8c 100644
--- a/internal/bridge/action_resolve.go
+++ b/internal/bridge/action_resolve.go
@@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
- "strconv"
"strings"
"time"
@@ -782,23 +781,6 @@ func resolveSelectorAtWithinNode(ctx context.Context, scopeBackendNodeID int64,
return nid, nil
}
-func parseNthSelectorValue(value string) (int, string, error) {
- rawIndex, rawSelector, ok := strings.Cut(value, ":")
- if !ok {
- return 0, "", fmt.Errorf("nth selector requires nth:<index>:<selector>")
- }
- rawIndex = strings.TrimSpace(rawIndex)
- rawSelector = strings.TrimSpace(rawSelector)
- if rawSelector == "" {
- return 0, "", fmt.Errorf("nth selector requires a nested selector")
- }
- index, err := strconv.Atoi(rawIndex)
- if err != nil || index < 0 {
- return 0, "", fmt.Errorf("nth selector index must be a zero-based non-negative integer")
- }
- return index, rawSelector, nil
-}
-
func resolveNestedSelectorAtInFrame(ctx context.Context, frameID string, raw string, refCache *RefCache, index int, fromEnd bool) (int64, error) {
inner := selector.Parse(raw)
switch inner.Kind {
@@ -807,7 +789,7 @@ func resolveNestedSelectorAtInFrame(ctx context.Context, frameID string, raw str
case selector.KindLast:
return resolveNestedSelectorAtInFrame(ctx, frameID, inner.Value, refCache, 0, true)
case selector.KindNth:
- nth, nestedRaw, err := parseNthSelectorValue(inner.Value)
+ nth, nestedRaw, err := selector.ParseNth(inner.Value)
if err != nil {
return 0, err
}
@@ -832,7 +814,7 @@ func resolveNestedSelectorWithinNode(ctx context.Context, scopeBackendNodeID int
case selector.KindLast:
return resolveNestedSelectorWithinNode(ctx, scopeBackendNodeID, inner.Value, refCache, 0, true)
case selector.KindNth:
- nth, nestedRaw, err := parseNthSelectorValue(inner.Value)
+ nth, nestedRaw, err := selector.ParseNth(inner.Value)
if err != nil {
return 0, err
}
@@ -952,7 +934,7 @@ func ResolveUnifiedSelectorInFrame(ctx context.Context, sel selector.Selector, r
return resolveNestedSelectorAtInFrame(ctx, frameID, sel.Value, refCache, 0, true)
case selector.KindNth:
- index, rawSelector, err := parseNthSelectorValue(sel.Value)
+ index, rawSelector, err := selector.ParseNth(sel.Value)
if err != nil {
return 0, err
}
@@ -1007,7 +989,7 @@ func ResolveUnifiedSelectorWithinNode(ctx context.Context, sel selector.Selector
return resolveNestedSelectorWithinNode(ctx, scopeBackendNodeID, sel.Value, refCache, 0, true)
case selector.KindNth:
- index, rawSelector, err := parseNthSelectorValue(sel.Value)
+ index, rawSelector, err := selector.ParseNth(sel.Value)
if err != nil {
return 0, err
}
diff --git a/internal/bridge/action_resolve_test.go b/internal/bridge/action_resolve_test.go
index 1fe8b7c5..d6a6618e 100644
--- a/internal/bridge/action_resolve_test.go
+++ b/internal/bridge/action_resolve_test.go
@@ -37,25 +37,6 @@ func TestResolveSelectorAtFnSearchesOpenShadowRoots(t *testing.T) {
}
}
-func TestParseNthSelectorValue(t *testing.T) {
- index, raw, err := parseNthSelectorValue("2:role:button Save")
- if err != nil {
- t.Fatalf("parseNthSelectorValue returned error: %v", err)
- }
- if index != 2 || raw != "role:button Save" {
- t.Fatalf("got index=%d raw=%q, want 2 role selector", index, raw)
- }
-}
-
-func TestParseNthSelectorValueRejectsInvalidIndex(t *testing.T) {
- if _, _, err := parseNthSelectorValue("-1:button"); err == nil {
- t.Fatal("expected negative index to fail")
- }
- if _, _, err := parseNthSelectorValue("button"); err == nil {
- t.Fatal("expected missing nested selector to fail")
- }
-}
-
func TestResolveUnifiedSelector_FirstRef(t *testing.T) {
cache := &RefCache{Refs: map[string]int64{"e5": 42}}
got, err := ResolveUnifiedSelectorInFrame(context.Background(), selector.Parse("first:e5"), cache, "")
diff --git a/internal/selector/selector.go b/internal/selector/selector.go
index 8f170810..3ab0c85a 100644
--- a/internal/selector/selector.go
+++ b/internal/selector/selector.go
@@ -272,8 +272,8 @@ func (s Selector) SemanticQuery() (string, bool) {
return s.String(), true
}
case KindNth:
- _, raw, ok := splitNthSelectorValue(s.Value)
- if ok && rawSelectorCanUseSemantic(raw) {
+ _, raw, err := ParseNth(s.Value)
+ if err == nil && rawSelectorCanUseSemantic(raw) {
return s.String(), true
}
}
@@ -290,20 +290,24 @@ func rawSelectorCanUseSemantic(raw string) bool {
}
}
-func splitNthSelectorValue(value string) (int, string, bool) {
+// ParseNth splits the value of an "nth:" selector into its zero-based index and
+// the nested selector. This package owns the selector grammar, so resolvers must
+// use this rather than re-deriving the split: the eligibility checks here and
+// the resolution path must agree on what a valid nth selector is.
+func ParseNth(value string) (index int, nested string, err error) {
rawIndex, rawSelector, ok := strings.Cut(value, ":")
if !ok {
- return 0, "", false
+ return 0, "", fmt.Errorf("nth selector requires nth:<index>:<selector>")
}
rawSelector = strings.TrimSpace(rawSelector)
if rawSelector == "" {
- return 0, "", false
+ return 0, "", fmt.Errorf("nth selector requires a nested selector")
}
- index, err := strconv.Atoi(strings.TrimSpace(rawIndex))
- if err != nil || index < 0 {
- return 0, "", false
+ index, convErr := strconv.Atoi(strings.TrimSpace(rawIndex))
+ if convErr != nil || index < 0 {
+ return 0, "", fmt.Errorf("nth selector index must be a zero-based non-negative integer")
}
- return index, rawSelector, true
+ return index, rawSelector, nil
}
func cutPrefix(s, prefix string) (string, bool) {
diff --git a/internal/selector/selector_test.go b/internal/selector/selector_test.go
index d55f37b5..7502d24e 100644
--- a/internal/selector/selector_test.go
+++ b/internal/selector/selector_test.go
@@ -483,3 +483,28 @@ func TestParse_PrefixPriority(t *testing.T) {
t.Errorf("Parse(\"xpath:e5\").Kind = %q, want xpath", s.Kind)
}
}
+
+// The nth grammar is owned here; the bridge resolver and SemanticQuery both
+// depend on this split agreeing.
+func TestParseNth(t *testing.T) {
+ index, raw, err := ParseNth("2:role:button Save")
+ if err != nil {
+ t.Fatalf("ParseNth returned error: %v", err)
+ }
+ if index != 2 || raw != "role:button Save" {
+ t.Fatalf("got index=%d raw=%q, want 2 and a role selector", index, raw)
+ }
+
+ if _, _, err := ParseNth("0:button"); err != nil {
+ t.Errorf("zero index should be valid, got %v", err)
+ }
+ if _, _, err := ParseNth("-1:button"); err == nil {
+ t.Error("expected negative index to fail")
+ }
+ if _, _, err := ParseNth("button"); err == nil {
+ t.Error("expected missing nested selector to fail")
+ }
+ if _, _, err := ParseNth("2: "); err == nil {
+ t.Error("expected blank nested selector to fail")
+ }
+}