parser: fix result type for data sources

blackstork-io · Feb 20, 2024 · 375015e · 375015e
1 parent 7ce5063
commit 375015e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/cmd/data.go b/cmd/data.go
@@ -19,7 +19,7 @@ import (
 
 var dataTgtRe = regexp.MustCompile(`(?:document\.([^.]+)\.data\.([^.]+)\.([^.\n]+))|(?:data\.([^.]+)\.([^.]+))`)
 
-func Data(ctx context.Context, blocks *parser.DefinedBlocks, caller *parser.Caller, target string) (result plugin.MapData, diags diagnostics.Diag) {
+func Data(ctx context.Context, blocks *parser.DefinedBlocks, caller *parser.Caller, target string) (result plugin.Data, diags diagnostics.Diag) {
 	// docName, pluginName, blockName
 	// target: document.<doc-name>.data.<plugin-name>.<data-name>
 	tgt := dataTgtRe.FindStringSubmatch(target)

diff --git a/examples/templates/openai/example.fabric b/examples/templates/openai/example.fabric
@@ -22,7 +22,7 @@ document "example" {
         absolute_title_size = 2
     }
     content table {
-        query = ".data.csv.csv_file.result"
+        query = ".data.csv.csv_file"
         columns = [
             {
                 "header" = "ID"
@@ -50,7 +50,7 @@ document "example" {
         config {
             api_key = "<API-KEY>"
         }
-        query = ".data.csv.csv_file.result"
+        query = ".data.csv.csv_file"
         model = "gpt-3.5-turbo"
         prompt = "Decribe each user in a sentence"
     }

diff --git a/parser/caller.go b/parser/caller.go
@@ -161,14 +161,14 @@ func (c *Caller) CallContent(ctx context.Context, name string, config evaluation
 	return
 }
 
-func (c *Caller) CallData(ctx context.Context, name string, config evaluation.Configuration, invocation evaluation.Invocation) (result plugin.MapData, diag diagnostics.Diag) {
+func (c *Caller) CallData(ctx context.Context, name string, config evaluation.Configuration, invocation evaluation.Invocation) (result plugin.Data, diag diagnostics.Diag) {
 	var ok bool
 	var res any
 	res, diag = c.callPlugin(ctx, definitions.BlockKindData, name, config, invocation, nil)
 	if diag.HasErrors() {
 		return
 	}
-	result, ok = res.(plugin.MapData)
+	result, ok = res.(plugin.Data)
 	if !ok {
 		panic("Incorrect plugin result type")
 	}

diff --git a/parser/definitions/config.go b/parser/definitions/config.go
@@ -112,4 +112,4 @@ func DefineConfig(block *hclsyntax.Block) (config *Config, diags diagnostics.Dia
 	return
 }
 
-type ConfigResolver func(pluginKind string, pluginName string) (config *Config)
+type ConfigResolver func(pluginKind, pluginName string) (config *Config)
diff --git a/parser/evaluation/plugincaller.go b/parser/evaluation/plugincaller.go
@@ -8,7 +8,7 @@ import (
 )
 
 type DataCaller interface {
-	CallData(ctx context.Context, name string, config Configuration, invocation Invocation) (result plugin.MapData, diag diagnostics.Diag)
+	CallData(ctx context.Context, name string, config Configuration, invocation Invocation) (result plugin.Data, diag diagnostics.Diag)
 }
 
 type ContentCaller interface {

diff --git a/test/e2e/data_test.go b/test/e2e/data_test.go
@@ -34,7 +34,7 @@ func dataTest(t *testing.T, testName string, files []string, target string, expe
 			eval.Cleanup(nil)
 		}()
 
-		var res plugin.MapData
+		var res plugin.Data
 		diags := eval.ParseFabricFiles(sourceDir)
 		if !diags.HasErrors() {
 			if !diags.Extend(eval.LoadRunner()) {
-Original file line number
+Diff line change
@@ Expand Up @@
     	return
     }
-    type ConfigResolver func(pluginKind string, pluginName string) (config *Config)
+    type ConfigResolver func(pluginKind, pluginName string) (config *Config)