rename scope WithDefinitions to WithValues

sonalys · sonalys · commit 986df6d2e085 · 2025-11-21T09:55:06.000+01:00
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ func Example_ageVerification() {
 
 	scope, err := gon.
 		NewScope().
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"person": gon.Literal(person),
 		})
 	if err != nil {
diff --git a/definition_store.go b/definition_store.go
@@ -9,9 +9,9 @@ import (
 )
 
 type (
-	// Definitions defines how scope definitions are configured.
+	// Values defines how scope definitions are configured.
 	// The key must be an alphanumeric+underscore+dash string from length 1 to 50, starting with a letter.
-	Definitions map[string]adapters.Value
+	Values map[string]adapters.Value
 
 	definitionStore struct {
 		store map[string]adapters.Value
diff --git a/examples/age-verification/example_test.go b/examples/age-verification/example_test.go
@@ -17,7 +17,7 @@ func Example_ageVerification() {
 
 	scope, err := gon.
 		NewScope().
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"person": gon.Literal(person),
 		})
 	if err != nil {
diff --git a/examples/custom-node/example_test.go b/examples/custom-node/example_test.go
@@ -79,7 +79,7 @@ func Example_customNode() {
 
 	scope, err := gon.
 		NewScope().
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"var": gon.Literal("my-var"),
 		})
 	if err != nil {
diff --git a/examples/dates/example_test.go b/examples/dates/example_test.go
@@ -17,7 +17,7 @@ func Example_dates() {
 
 	scope, err := gon.
 		NewScope().
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"person": gon.Literal(person),
 		})
 	if err != nil {
diff --git a/examples/dynamic-comparison/example_test.go b/examples/dynamic-comparison/example_test.go
@@ -21,7 +21,7 @@ func Example_dynamicComparison() {
 
 	scope, err := gon.
 		NewScope().
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"person":     gon.Literal(person),
 			"age_config": gon.Literal(config),
 		})
diff --git a/examples/functions/example_test.go b/examples/functions/example_test.go
@@ -22,7 +22,7 @@ func Example_functions() {
 
 	scope, err := gon.
 		NewScope().
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"friend": gon.Literal(person),
 			"greet": gon.Literal(func(name string, birthday time.Time) string {
 
diff --git a/examples/lazy-value/example_test.go b/examples/lazy-value/example_test.go
@@ -12,7 +12,7 @@ func Example_lazyValue() {
 
 	scope, err := gon.
 		NewScope().
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"lazy": gon.Literal(func(ctx context.Context) int {
 				called = true
 				return 5
diff --git a/examples/object-access-rule/example_test.go b/examples/object-access-rule/example_test.go
@@ -23,7 +23,7 @@ func Example_objectAccessRule() {
 
 	scope, err := gon.
 		NewScope().
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"file": gon.Literal(file),
 		})
 	if err != nil {
diff --git a/examples_test.go b/examples_test.go
@@ -23,7 +23,7 @@ func Test_Expression(t *testing.T) {
 		// Context cancellation
 		WithContext(t.Context()).
 		// Dynamic, decoupled scope for your rules.
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			// Support for static variables of any type.
 			"myName": gon.Literal("friendName"),
 			// Support for structs and maps for children attributes.
diff --git a/internal/nodes/call_test.go b/internal/nodes/call_test.go
@@ -29,7 +29,7 @@ func Test_Call(t *testing.T) {
 	t.Run("definition not callable", func(t *testing.T) {
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(1),
 			})
 		require.NoError(t, err)
@@ -48,7 +48,7 @@ func Test_Call(t *testing.T) {
 	t.Run("should call func without context", func(t *testing.T) {
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(func() int {
 					return 5
 				}),
@@ -64,7 +64,7 @@ func Test_Call(t *testing.T) {
 	t.Run("should call func with context", func(t *testing.T) {
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(func(ctx context.Context) int {
 					require.NotNil(t, ctx)
 					return 5
diff --git a/internal/nodes/literal_test.go b/internal/nodes/literal_test.go
@@ -19,7 +19,7 @@ func Test_Literal_Definition(t *testing.T) {
 
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(&str{
 					Value: 5,
 				}),
@@ -41,7 +41,7 @@ func Test_Literal_Definition(t *testing.T) {
 
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(str{
 					Value: &expected,
 				}),
@@ -67,7 +67,7 @@ func Test_Literal_Definition(t *testing.T) {
 
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(str{
 					Attribute: attribute{
 						Value: expected,
@@ -95,7 +95,7 @@ func Test_Literal_Definition(t *testing.T) {
 
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(str{
 					Attribute: &attribute{
 						Value: expected,
@@ -115,7 +115,7 @@ func Test_Literal_Definition(t *testing.T) {
 
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(&str{
 					"value": 5,
 				}),
@@ -135,7 +135,7 @@ func Test_Literal_Definition(t *testing.T) {
 
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(str{
 					"value": &expected,
 				}),
@@ -153,7 +153,7 @@ func Test_Literal_Definition(t *testing.T) {
 
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(map[string]map[string]int{
 					"attribute": {
 						"value": expected,
@@ -173,7 +173,7 @@ func Test_Literal_Definition(t *testing.T) {
 
 		scope, err := gon.
 			NewScope().
-			WithDefinitions(gon.Definitions{
+			WithValues(gon.Values{
 				"var": nodes.Literal(map[string]*map[string]int{
 					"attribute": {
 						"value": expected,
@@ -202,7 +202,7 @@ func Test_Literal_Call(t *testing.T) {
 		valued := node.Call(t.Context(), "attribute.value")
 		require.Equal(t, expected, valued.Value())
 
-		scope, err := gon.NewScope().WithDefinitions(gon.Definitions{
+		scope, err := gon.NewScope().WithValues(gon.Values{
 			"var": node,
 		})
 		require.NoError(t, err)
diff --git a/internal/nodes/nodes_test.go b/internal/nodes/nodes_test.go
@@ -40,7 +40,7 @@ func Test_Banner(t *testing.T) {
 func Benchmark_Equal(b *testing.B) {
 	scope, _ := gon.NewScope().
 		WithContext(b.Context()).
-		WithDefinitions(gon.Definitions{
+		WithValues(gon.Values{
 			"var1": nodes.Literal(1),
 			"var2": nodes.Literal(1),
 		})
diff --git a/scope.go b/scope.go
@@ -31,7 +31,7 @@ func (s *scope) WithContext(ctx context.Context) *scope {
 	return s
 }
 
-func (s *scope) WithDefinitions(source Definitions) (*scope, error) {
+func (s *scope) WithValues(source Values) (*scope, error) {
 	for key, value := range source {
 		if !keyValidationRegex.MatchString(key) {
 			return nil, adapters.InvalidDefinitionKey{
