gitbase, function: change order of uast_mode params

Now uses (mode, blob, lang). This way we can make language optional
without breaking back compatibiliy.

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

docs/using-gitbase/functions.md

@@ -10,7 +10,7 @@ To make some common tasks easier for the user, there are some functions to inter
 |is_tag(reference_name)bool| check if the given reference name is a tag                                                                         |
 |language(path, [blob])text| gets the language of a file given its path and the optional content of the file                                    |
 |uast(blob, [lang, [xpath]])json_blob| returns an array of UAST nodes as blobs in semantic mode                                                 |
-|uast_mode(blob, lang, mode)json_blob| returns an array of UAST nodes as blobs specifying its language and mode (semantic, annotated or native) |
+|uast_mode(mode, blob, lang)json_blob| returns an array of UAST nodes as blobs specifying its language and mode (semantic, annotated or native) |
 |uast_xpath(json_blob, xpath)| performs an XPath query over the given UAST nodes                                                                |
 
 ## Standard functions

integration_test.go

@@ -274,19 +274,19 @@ func TestUastQueries(t *testing.T) {
 		INNER JOIN blobs b
 		ON b.blob_hash = te.blob_hash
 		WHERE te.tree_entry_name = 'example.go'`, 1},
-		{`SELECT uast_xpath(uast_mode(blob_content, language(tree_entry_name, blob_content), 'semantic'), '//Identifier') as uast,
+		{`SELECT uast_xpath(uast_mode('semantic', blob_content, language(tree_entry_name, blob_content)), '//Identifier') as uast,
 			tree_entry_name
 		FROM tree_entries te
 		INNER JOIN blobs b
 		ON b.blob_hash = te.blob_hash
 		WHERE te.tree_entry_name = 'example.go'`, 1},
-		{`SELECT uast_xpath(uast_mode(blob_content, language(tree_entry_name, blob_content), 'annotated'), '//*[@roleIdentifier]') as uast,
+		{`SELECT uast_xpath(uast_mode('annotated', blob_content, language(tree_entry_name, blob_content)), '//*[@roleIdentifier]') as uast,
 			tree_entry_name
 		FROM tree_entries te
 		INNER JOIN blobs b
 		ON b.blob_hash = te.blob_hash
 		WHERE te.tree_entry_name = 'example.go'`, 1},
-		{`SELECT uast_xpath(uast_mode(blob_content, language(tree_entry_name, blob_content), 'native'), '//*[@ast_type=\'FunctionDef\']') as uast,
+		{`SELECT uast_xpath(uast_mode('native', blob_content, language(tree_entry_name, blob_content)), '//*[@ast_type=\'FunctionDef\']') as uast,
 			tree_entry_name
 		FROM tree_entries te
 		INNER JOIN blobs b

internal/function/uast.go

@@ -159,14 +159,14 @@ func (f UAST) Eval(ctx *sql.Context, row sql.Row) (out interface{}, err error) {
 
 // UASTMode returns an array of UAST nodes as blobs.
 type UASTMode struct {
+	Mode sql.Expression
 	Blob sql.Expression
 	Lang sql.Expression
-	Mode sql.Expression
 }
 
 // NewUASTMode creates a new UASTMode UDF.
-func NewUASTMode(blob, lang, xpath sql.Expression) sql.Expression {
-	return &UASTMode{blob, lang, xpath}
+func NewUASTMode(mode, blob, lang sql.Expression) sql.Expression {
+	return &UASTMode{mode, blob, lang}
 }
 
 // IsNullable implements the Expression interface.
@@ -219,7 +219,7 @@ func (f UASTMode) TransformUp(fn sql.TransformExprFunc) (sql.Expression, error)
 
 // String implements the Expression interface.
 func (f UASTMode) String() string {
-	return fmt.Sprintf("uast_mode(%s, %s, %s)", f.Blob, f.Lang, f.Mode)
+	return fmt.Sprintf("uast_mode(%s, %s, %s)", f.Mode, f.Blob, f.Lang)
 }
 
 // Eval implements the Expression interface.

internal/function/uast_test.go

@@ -34,9 +34,9 @@ func TestUASTMode(t *testing.T) {
 	defer cleanup()
 
 	mode := &UASTMode{
-		Blob: expression.NewGetField(0, sql.Blob, "", false),
-		Lang: expression.NewGetField(1, sql.Text, "", false),
-		Mode: expression.NewGetField(2, sql.Text, "", false),
+		Mode: expression.NewGetField(0, sql.Text, "", false),
+		Blob: expression.NewGetField(1, sql.Blob, "", false),
+		Lang: expression.NewGetField(2, sql.Text, "", false),
 	}
 
 	u, _ := bblfshFixtures(t, ctx)
@@ -47,9 +47,9 @@ func TestUASTMode(t *testing.T) {
 		row      sql.Row
 		expected interface{}
 	}{
-		{"annotated", mode, sql.NewRow([]byte(testCode), "Python", "annotated"), u["annotated"]},
-		{"semantic", mode, sql.NewRow([]byte(testCode), "Python", "semantic"), u["semantic"]},
-		{"native", mode, sql.NewRow([]byte(testCode), "Python", "native"), u["native"]},
+		{"annotated", mode, sql.NewRow("annotated", []byte(testCode), "Python"), u["annotated"]},
+		{"semantic", mode, sql.NewRow("semantic", []byte(testCode), "Python"), u["semantic"]},
+		{"native", mode, sql.NewRow("native", []byte(testCode), "Python"), u["native"]},
 	}
 
 	for _, tt := range testCases {