added external params source

cmd/builder.go

@@ -943,8 +943,8 @@ func (s *Builder) loadSQL(ctx context.Context, builder *routeBuilder, location s
 }
 
 func (s *Builder) parseDSQL(ctx context.Context, builder *routeBuilder, SQL []byte) (err error) {
-	if envURL := s.options.EnvURL; envURL != "" {
-		envContent, err := s.fs.DownloadWithURL(ctx, envURL)
+	if embedURL := s.options.EmbedURL; embedURL != "" {
+		envContent, err := s.fs.DownloadWithURL(ctx, embedURL)
 		if err != nil {
 			return err
 		}
@@ -955,7 +955,7 @@ func (s *Builder) parseDSQL(ctx context.Context, builder *routeBuilder, SQL []by
 		}
 
 		env := rdata.NewMap()
-		env.SetValue("env", aMap)
+		env.SetValue("Embed", aMap)
 
 		templateContent := env.ExpandWithoutUDF(string(SQL))
 		SQL = []byte(templateContent)

cmd/command/translate.go

@@ -11,7 +11,7 @@ func (s *Service) ensureTranslator(opts *options.Options) error {
 	if s.translator != nil {
 		return nil
 	}
-	aTranslator := translator.New(translator.NewConfig(opts.Repository()))
+	aTranslator := translator.New(translator.NewConfig(opts.Repository()), s.fs)
 	err := aTranslator.Init(context.Background())
 	if err == nil {
 		s.translator = aTranslator
@@ -47,10 +47,14 @@ func (s *Service) translate(ctx context.Context, opts *options.Options) error {
 	}
 	rule := opts.Rule()
 	for rule.Index = 0; rule.Index < len(rule.Source); rule.Index++ {
-		dSQL, err := opts.Rule().LoadSource(ctx, s.fs)
+		currRule := opts.Rule()
+		sourceURL := currRule.SourceURL()
+
+		dSQL, err := currRule.LoadSource(ctx, s.fs, sourceURL)
 		if err != nil {
 			return err
 		}
+
 		if err = s.translateDSQL(ctx, rule, dSQL); err != nil {
 			return err
 		}
@@ -63,7 +67,7 @@ func (s *Service) translateDSQL(ctx context.Context, rule *options.Rule, dSQL st
 		return err
 	}
 	if err := s.translator.Translate(ctx, rule, dSQL); err != nil {
-		fmt.Printf("failed to translate: %v: %w", err)
+		fmt.Printf("failed to translate: %v", err)
 	}
 	return nil
 }

cmd/option.go

@@ -63,7 +63,7 @@ type (
 		ConstURL  string `long:"constURL" description:"path where const files are stored"`
 		Legacy    bool   `short:"l"`
 		cache     *view.Cache
-		EnvURL    string `long:"envURL" description:"environment url, expands template before processing"`
+		EmbedURL  string `long:"embedURL" description:"embed url, expands template before processing"`
 	}
 
 	Package struct {

cmd/options/rule.go

@@ -112,8 +112,8 @@ func (r *Rule) SourceURL() string {
 	return r.Source[r.Index]
 }
 
-func (r *Rule) LoadSource(ctx context.Context, fs afs.Service) (string, error) {
-	data, err := fs.DownloadWithURL(ctx, r.SourceURL())
+func (r *Rule) LoadSource(ctx context.Context, fs afs.Service, URL string) (string, error) {
+	data, err := fs.DownloadWithURL(ctx, URL)
 	if err != nil {
 		return "", err
 	}

config/init.go

@@ -6,6 +6,7 @@ import (
 	"github.com/viant/scy/auth/jwt"
 	"github.com/viant/sqlx/types"
 	_ "github.com/viant/xdatly/extension" //go mod level placeholder replacement
+	"github.com/viant/xdatly/predicate"
 	"github.com/viant/xdatly/types/core"
 	_ "github.com/viant/xdatly/types/custom"
 	"github.com/viant/xreflect"
@@ -44,11 +45,13 @@ var Config = &Registry{
 		&VeltyCriteriaFactory{},
 		&CriteriaBuilderFactory{},
 	),
-	Predicates: PredicateRegistry{
-		PredicateEqual:    NewEqualPredicate(),
-		PredicateNotEqual: NewNotEqualPredicate(),
-		PredicateNotIn:    NewNotInPredicate(),
-		PredicateIn:       NewInPredicate(),
+	Predicates: &PredicateRegistry{
+		registry: map[string]*predicate.Template{
+			PredicateEqual:    NewEqualPredicate(),
+			PredicateNotEqual: NewNotEqualPredicate(),
+			PredicateNotIn:    NewNotInPredicate(),
+			PredicateIn:       NewInPredicate(),
+		},
 	},
 }
 

config/predicates.go

@@ -11,8 +11,11 @@ const PredicateIn = "in"
 const PredicateNotIn = "not_in"
 
 type (
-	PredicateRegistry map[string]*predicate.Template
-	PredicateConfig   struct {
+	PredicateRegistry struct {
+		parent   *PredicateRegistry
+		registry map[string]*predicate.Template
+	}
+	PredicateConfig struct {
 		Parent  string
 		Name    string
 		Context int
@@ -25,22 +28,34 @@ type (
 	}
 )
 
-func (r PredicateRegistry) Lookup(name string) (*predicate.Template, error) {
-	result, ok := r[name]
-	if !ok {
-		return nil, fmt.Errorf("not found template %v", name)
+func (r *PredicateRegistry) Lookup(name string) (*predicate.Template, error) {
+	result, ok := r.registry[name]
+	if ok {
+		return result, nil
+	}
+
+	if r.parent != nil {
+		return r.parent.Lookup(name)
 	}
 
-	return result, nil
+	return nil, fmt.Errorf("not found template %v", name)
 }
 
-func (r PredicateRegistry) Clone() PredicateRegistry {
-	result := PredicateRegistry{}
-	for key, template := range r {
-		result[key] = template
-	}
+func (r *PredicateRegistry) Scope() *PredicateRegistry {
+	registry := NewPredicates()
+	registry.parent = r
+	return registry
+}
+
+func (r *PredicateRegistry) Add(template *predicate.Template) {
+	r.registry[template.Name] = template
+}
 
-	return result
+func NewPredicates() *PredicateRegistry {
+	return &PredicateRegistry{
+		parent:   nil,
+		registry: map[string]*predicate.Template{},
+	}
 }
 
 func NewEqualPredicate() *predicate.Template {

config/registry.go

@@ -10,15 +10,15 @@ type Registry struct {
 	sync.Mutex
 	Types      *xreflect.Types
 	Codecs     CodecsRegistry
-	Predicates PredicateRegistry
+	Predicates *PredicateRegistry
 }
 
 func NewRegistry() *Registry {
 	return &Registry{
 		Mutex:      sync.Mutex{},
 		Types:      xreflect.NewTypes(xreflect.WithRegistry(Config.Types)),
 		Codecs:     CodecsRegistry{},
-		Predicates: PredicateRegistry{},
+		Predicates: NewPredicates(),
 	}
 }
 

e2e/local/regression/cases/062_predicates/test.yaml

@@ -5,24 +5,24 @@ pipeline:
   test:
     action: http/runner:send
     requests:
-#      - Method: GET
-#        URL: http://127.0.0.1:8080/v1/api/dev/vendors-predicate?ID=1
-#        Expect:
-#          Code: 200
-#          JSONBody: $LoadJSON('${parentPath}/expect.json')
-#
-#      - Method: GET
-#        URL: http://127.0.0.1:8080/v1/api/dev/vendors-predicate?ID=1&UserCreated=19273
-#        Expect:
-#          Code: 200
-#          JSONBody: $LoadJSON('${parentPath}/expect2.json')
-#
-#
-#      - Method: GET
-#        URL: http://127.0.0.1:8080/v1/api/dev/vendors-predicate?ID=1&UserCreated=19273&Name=Vendor%202
-#        Expect:
-#          Code: 200
-#          JSONBody: $LoadJSON('${parentPath}/expect3.json')
+      - Method: GET
+        URL: http://127.0.0.1:8080/v1/api/dev/vendors-predicate?ID=1
+        Expect:
+          Code: 200
+          JSONBody: $LoadJSON('${parentPath}/expect.json')
+
+      - Method: GET
+        URL: http://127.0.0.1:8080/v1/api/dev/vendors-predicate?ID=1&UserCreated=19273
+        Expect:
+          Code: 200
+          JSONBody: $LoadJSON('${parentPath}/expect2.json')
+
+
+      - Method: GET
+        URL: http://127.0.0.1:8080/v1/api/dev/vendors-predicate?ID=1&UserCreated=19273&Name=Vendor%202
+        Expect:
+          Code: 200
+          JSONBody: $LoadJSON('${parentPath}/expect3.json')
 
       - Method: GET
         URL: http://127.0.0.1:8080/v1/api/dev/vendors-predicate?ID=1&UserCreated=19273&Name=Vendor%202&AccountID=100

e2e/local/regression/cases/063_external_parameters/custom_predicate.sql

@@ -0,0 +1,15 @@
+/* {
+    "URI":"vendors-custom-predicate",
+    "Method": "GET",
+    "Include": ["./parameters.sql"]
+   } */
+
+
+SELECT vendor.*
+FROM (SELECT *
+      FROM VENDOR t
+      WHERE 1 = 1 ${predicate.Builder().CombineOr(
+        $predicate.Ctx(0, "AND"),
+        $predicate.Ctx(1, "OR" )
+      ).Build("AND")}
+    ) vendor

e2e/local/regression/cases/063_external_parameters/expect.json

@@ -0,0 +1,6 @@
+[
+  {
+    "id": 1,
+    "name": "Vendor 1"
+  }
+]

e2e/local/regression/cases/063_external_parameters/expect2.json

@@ -0,0 +1 @@
+[]

e2e/local/regression/cases/063_external_parameters/expect3.json

@@ -0,0 +1,7 @@
+[
+  {
+    "id": 2,
+    "name": "Vendor 2",
+    "userUpdated": 0
+  }
+]

e2e/local/regression/cases/063_external_parameters/expect4.json

@@ -0,0 +1,17 @@
+[
+  {
+    "id": 1,
+    "name": "Vendor 1",
+    "accountId": 100
+  },
+  {
+    "id": 2,
+    "name": "Vendor 2",
+    "accountId": 101
+  },
+  {
+    "id": 3,
+    "name": "Vendor 3",
+    "accountId": 100
+  }
+]

e2e/local/regression/cases/063_external_parameters/gen.json

@@ -0,0 +1,5 @@
+{
+  "Name": "$tagId",
+  "URL": "$path/custom_predicate.sql",
+  "Args": ""
+}

e2e/local/regression/cases/063_external_parameters/parameters.sql

@@ -0,0 +1,4 @@
+#set($_ = $ID<int>(query/ID).WithPredicate(0, "equal", "t", "ID").Optional())
+#set($_ = $UserCreated<int>(query/UserCreated).WithPredicate(0, "equal", "t", "USER_CREATED").Optional())
+#set($_ = $Name<string>(query/Name).WithPredicate(1, "equal", "t", "NAME").Optional())
+#set($_ = $AccountID<int>(query/AccountID).WithPredicate(1, "equal", "t", "ACCOUNT_ID").Optional())

e2e/local/regression/cases/063_external_parameters/test.yaml

@@ -0,0 +1,31 @@
+init:
+  parentPath: $parent.path
+pipeline:
+
+  test:
+    action: http/runner:send
+    requests:
+      - Method: GET
+        URL: http://127.0.0.1:8080/v1/api/dev/vendors-custom-predicate?ID=1
+        Expect:
+          Code: 200
+          JSONBody: $LoadJSON('${parentPath}/expect.json')
+
+      - Method: GET
+        URL: http://127.0.0.1:8080/v1/api/dev/vendors-custom-predicate?ID=1&UserCreated=19273
+        Expect:
+          Code: 200
+          JSONBody: $LoadJSON('${parentPath}/expect2.json')
+
+
+      - Method: GET
+        URL: http://127.0.0.1:8080/v1/api/dev/vendors-custom-predicate?ID=1&UserCreated=19273&Name=Vendor%202
+        Expect:
+          Code: 200
+          JSONBody: $LoadJSON('${parentPath}/expect3.json')
+
+      - Method: GET
+        URL: http://127.0.0.1:8080/v1/api/dev/vendors-custom-predicate?ID=1&UserCreated=19273&Name=Vendor%202&AccountID=100
+        Expect:
+          Code: 200
+          JSONBody: $LoadJSON('${parentPath}/expect4.json')

e2e/local/regression/regression.yaml

@@ -28,7 +28,7 @@ pipeline:
         '[]gen': '@gen'
 
       subPath: 'cases/${index}_*'
-      range: 1..062
+      range: 1..063
       template:
         checkSkip:
           action: nop