Merge pull request #498 from mcarmonaa/improvement/uast-extract-flatten

internal/funciton: made uast_extract return a flattened array

Author: ajnavarro

internal/function/uast.go

@@ -421,7 +421,7 @@ func (u *UASTExtract) String() string {
 
 // Type implements the sql.Expression interface.
 func (u *UASTExtract) Type() sql.Type {
-	return sql.Array(sql.Array(sql.Text))
+	return sql.Array(sql.Text)
 }
 
 // Eval implements the sql.Expression interface.
@@ -458,9 +458,12 @@ func (u *UASTExtract) Eval(ctx *sql.Context, row sql.Row) (out interface{}, err
 		return nil, nil
 	}
 
-	extracted := make([]interface{}, len(nodes))
-	for i, n := range nodes {
-		extracted[i] = extractInfo(n, key)
+	extracted := []interface{}{}
+	for _, n := range nodes {
+		info := extractInfo(n, key)
+		if len(info) > 0 {
+			extracted = append(extracted, info...)
+		}
 	}
 
 	return extracted, nil
@@ -474,25 +477,34 @@ const (
 	keyEndPos   = "@endpos"
 )
 
-func extractInfo(n *uast.Node, key string) []string {
-
-	info := []string{}
+func extractInfo(n *uast.Node, key string) []interface{} {
+	var info []interface{}
 	switch key {
 	case keyType:
-		info = append(info, n.InternalType)
+		if n.InternalType != "" {
+			info = append(info, n.InternalType)
+		}
 	case keyToken:
-		info = append(info, n.Token)
-	case keyRoles:
-		roles := make([]string, len(n.Roles))
-		for i, rol := range n.Roles {
-			roles[i] = rol.String()
+		if n.Token != "" {
+			info = append(info, n.Token)
 		}
+	case keyRoles:
+		if len(n.Roles) > 0 {
+			roles := make([]interface{}, len(n.Roles))
+			for i, rol := range n.Roles {
+				roles[i] = rol.String()
+			}
 
-		info = append(info, roles...)
+			info = append(info, roles...)
+		}
 	case keyStartPos:
-		info = append(info, n.StartPosition.String())
+		if n.StartPosition != nil {
+			info = append(info, n.StartPosition.String())
+		}
 	case keyEndPos:
-		info = append(info, n.EndPosition.String())
+		if n.StartPosition != nil {
+			info = append(info, n.EndPosition.String())
+		}
 	default:
 		v, ok := n.Properties[key]
 		if ok {

internal/function/uast_test.go

@@ -162,89 +162,67 @@ func TestUASTExtract(t *testing.T) {
 			name: "key_" + keyType,
 			key:  keyType,
 			expected: []interface{}{
-				[]string{"FunctionDef"},
-				[]string{"Name"},
-				[]string{"Name"},
-				[]string{"Name"},
-				[]string{"Name"},
+				"FunctionDef", "Name", "Name", "Name", "Name",
 			},
 		},
 		{
 			name: "key_" + keyToken,
 			key:  keyToken,
 			expected: []interface{}{
-				[]string{"sum"},
-				[]string{"a"},
-				[]string{"b"},
-				[]string{"print"},
-				[]string{"sum"},
+				"sum", "a", "b", "print", "sum",
 			},
 		},
 		{
 			name: "key_" + keyRoles,
 			key:  keyRoles,
 			expected: []interface{}{
-				[]string{"Unannotated", "Function", "Declaration", "Name", "Identifier"},
-				[]string{"Unannotated", "Identifier", "Expression", "Binary", "Left"},
-				[]string{"Unannotated", "Identifier", "Expression", "Binary", "Right"},
-				[]string{"Unannotated", "Identifier", "Expression", "Call", "Callee"},
-				[]string{"Unannotated", "Identifier", "Expression", "Call", "Callee"},
+				"Unannotated", "Function", "Declaration", "Name", "Identifier",
+				"Unannotated", "Identifier", "Expression", "Binary", "Left",
+				"Unannotated", "Identifier", "Expression", "Binary", "Right",
+				"Unannotated", "Identifier", "Expression", "Call", "Callee",
+				"Unannotated", "Identifier", "Expression", "Call", "Callee",
 			},
 		},
 		{
 			name: "key_" + keyStartPos,
 			key:  keyStartPos,
 			expected: []interface{}{
-				[]string{"Offset:28 Line:4 Col:5 "},
-				[]string{"Offset:47 Line:5 Col:9 "},
-				[]string{"Offset:51 Line:5 Col:13 "},
-				[]string{"Offset:54 Line:7 Col:1 "},
-				[]string{"Offset:60 Line:7 Col:7 "},
+				"Offset:28 Line:4 Col:5 ",
+				"Offset:47 Line:5 Col:9 ",
+				"Offset:51 Line:5 Col:13 ",
+				"Offset:54 Line:7 Col:1 ",
+				"Offset:60 Line:7 Col:7 ",
 			},
 		},
 		{
 			name: "key_" + keyEndPos,
 			key:  keyEndPos,
 			expected: []interface{}{
-				[]string{"Offset:31 Line:4 Col:8 "},
-				[]string{"Offset:48 Line:5 Col:10 "},
-				[]string{"Offset:52 Line:5 Col:14 "},
-				[]string{"Offset:59 Line:7 Col:6 "},
-				[]string{"Offset:63 Line:7 Col:10 "},
+				"Offset:31 Line:4 Col:8 ",
+				"Offset:48 Line:5 Col:10 ",
+				"Offset:52 Line:5 Col:14 ",
+				"Offset:59 Line:7 Col:6 ",
+				"Offset:63 Line:7 Col:10 ",
 			},
 		},
 		{
 			name: "key_internalRole",
 			key:  "internalRole",
 			expected: []interface{}{
-				[]string{"body"},
-				[]string{"left"},
-				[]string{"right"},
-				[]string{"func"},
-				[]string{"func"},
+				"body", "left", "right", "func", "func",
 			},
 		},
 		{
 			name: "key_ctx",
 			key:  "ctx",
 			expected: []interface{}{
-				[]string{},
-				[]string{"Load"},
-				[]string{"Load"},
-				[]string{"Load"},
-				[]string{"Load"},
+				"Load", "Load", "Load", "Load",
 			},
 		},
 		{
-			name: "key_foo",
-			key:  "foo",
-			expected: []interface{}{
-				[]string{},
-				[]string{},
-				[]string{},
-				[]string{},
-				[]string{},
-			},
+			name:     "key_foo",
+			key:      "foo",
+			expected: nil,
 		},
 	}