refactor: remove multiple loops

remove multiple loops in recursive token

Author: evilmonkeyinc

token/recursive.go

@@ -20,81 +20,65 @@ func (token *recursiveToken) Type() string {
 }
 
 func (token *recursiveToken) Apply(root, current interface{}, next []Token) (interface{}, error) {
+	return token.recursiveApply(root, current, next), nil
+}
 
-	elements := flatten(current)
-
-	if len(next) > 0 {
-		nextToken := next[0]
-		futureTokens := next[1:]
+func (token *recursiveToken) recursiveApply(root, current interface{}, next []Token) []interface{} {
 
-		results := make([]interface{}, 0)
+	slice := make([]interface{}, 0)
 
-		for _, item := range elements {
-			result, _ := nextToken.Apply(root, item, futureTokens)
-			objType, objVal := getTypeAndValue(result)
-			if objType == nil {
-				continue
-			}
+	objType, objVal := getTypeAndValue(current)
+	if objType == nil {
+		return slice
+	}
 
+	if len(next) > 0 {
+		result, _ := next[0].Apply(root, objVal.Interface(), next[1:])
+		objType, objVal := getTypeAndValue(result)
+		if objType != nil {
 			switch objType.Kind() {
 			case reflect.Array, reflect.Slice:
 				length := objVal.Len()
 				for i := 0; i < length; i++ {
-					results = append(results, objVal.Index(i).Interface())
+					slice = append(slice, objVal.Index(i).Interface())
 				}
 				break
 			default:
-				results = append(results, result)
+				slice = append(slice, objVal.Interface())
 				break
 			}
-
 		}
-
-		return results, nil
+	} else {
+		slice = append(slice, objVal.Interface())
 	}
-	return elements, nil
-}
 
-func flatten(obj interface{}) []interface{} {
-	slice := make([]interface{}, 0)
-
-	objType, objVal := getTypeAndValue(obj)
-	if objType == nil {
-		return slice
-	}
-
-	slice = append(slice, objVal.Interface())
-
-	elements := make([]interface{}, 0)
 	switch objType.Kind() {
 	case reflect.Map:
 		keys := objVal.MapKeys()
 		sortMapKeys(keys)
 		for _, kv := range keys {
 			value := objVal.MapIndex(kv).Interface()
-			elements = append(elements, value)
+			result := token.recursiveApply(root, value, next)
+			slice = append(slice, result...)
 		}
 	case reflect.Array, reflect.Slice:
 		length := objVal.Len()
 		for i := 0; i < length; i++ {
 			value := objVal.Index(i).Interface()
-			elements = append(elements, value)
+			result := token.recursiveApply(root, value, next)
+			slice = append(slice, result...)
 		}
 	case reflect.Struct:
 		fields := getStructFields(objVal, true)
 		for _, field := range fields {
 			value := objVal.FieldByName(field.Name).Interface()
-			elements = append(elements, value)
+			result := token.recursiveApply(root, value, next)
+			slice = append(slice, result...)
+
 		}
 	default:
 		break
 	}
 
-	if len(elements) > 0 {
-		for _, sObj := range elements {
-			slice = append(slice, flatten(sObj)...)
-		}
-	}
-
 	return slice
 }