Generated code for user defined type has function Distinct

Author: Sah, Nandeshwar

gofp/gofp.go

@@ -81,6 +81,8 @@ var (
 	setStr      = flag.String("set", "", "generate 'set' functions(union, intersection, difference, subset, superset) for user defined type. format- <StructName>:<FieldName> eg. Employee:Name, Employee:Salary")
 
 	onlyList []string
+
+	switchTemplateDistinct = false
 )
 
 func main() {
@@ -125,7 +127,10 @@ func main() {
 			onlyList = strings.Split(*only, ",")
 			onlyList = fp.MapStr(strings.TrimSpace, onlyList)
 		}
-		generatedCode, err := generateFPCode(*pkgName, *types, *imports)
+
+		structToFieldsMap, structToFieldsMapUnExpected := findStructNamesAndFieldsGivenInGoGenerate()
+
+		generatedCode, err := generateFPCode(*pkgName, *types, *imports, structToFieldsMapUnExpected)
 		if err != nil {
 			usage()
 			log.Fatalf("Failed code generation: %v", err)
@@ -173,7 +178,6 @@ import "sync"`, -1)
 
 		// Generate set and sort functions for all the types of struct
 		if *sortStr == "" || *setStr == "" {
-			structToFieldsMap := findStructNamesAndFieldsGivenInGoGenerate()
 
 			// 2nd condition is ignoring auto generation of sort functions for `all fp in 1 place strategy"
 			// Can be done in future : change the logic to find struct name(employee.Teacher) current logic is not checking .
@@ -201,6 +205,9 @@ import "time"`, -1)
 			}
 		}
 
+		if switchTemplateDistinct {
+			generatedCode = strings.Replace(generatedCode, `import _ "reflect"`, `import "reflect"`, -1)
+		}
 		f.Write([]byte(generatedCode + "\n" + generatedCodeIO + "\n" + generatedCodeII + sortingCode + setCode))
 		defer f.Close()
 
@@ -220,14 +227,15 @@ func removeFirstPartOfDot(str string) string {
 	return str
 }
 
-func generateFPCode(pkg, dataTypes, imports string) (string, error) {
+func generateFPCode(pkg, dataTypes, imports string, structToFieldsMapUnexpected map[string][]string) (string, error) {
 	basicTypes := "int, int64, int32, int16, int8, uint, uint64, uint32, uint16, uint8, float64, float32, string, bool"
 	conditionalType := ""
 	types := strings.Split(dataTypes, ",")
 	types = fp.DistinctStrIgnoreCase(types)
 
 	template := "// Code generated by 'gofp'. DO NOT EDIT.\n"
 	template += "package <PACKAGE>\n"
+	template += "import _ \"reflect\" \n"
 	template += "import \"sync\" \n"
 
 	if imports != "" {
@@ -255,6 +263,9 @@ func generateFPCode(pkg, dataTypes, imports string) (string, error) {
 
 		template = r.Replace(template)
 
+		// it collects info of members of struct other than basic types
+		unexpectedFieldsForDistinct := structToFieldsMapUnexpected[t]
+
 		if len(onlyList) > 0 {
 			// Always include these functions
 
@@ -474,7 +485,30 @@ func generateFPCode(pkg, dataTypes, imports string) (string, error) {
 				template = r2.Replace(template)
 			}
 
-			/*
+			if len(unexpectedFieldsForDistinct) > 1 {
+				switchTemplateDistinct = true
+
+				if fp.ExistsStrIgnoreCase("DistinctP", onlyList) {
+					template += basic.DistinctP2()
+					template = r2.Replace(template)
+				}
+
+				if fp.ExistsStrIgnoreCase("DistinctPPtr", onlyList) {
+					template += basic.DistinctPPtr2()
+					template = r2.Replace(template)
+				}
+
+				if fp.ExistsStrIgnoreCase("Distinct", onlyList) {
+					template += basic.Distinct2()
+					template = r2.Replace(template)
+				}
+
+				if fp.ExistsStrIgnoreCase("DistinctPtr", onlyList) {
+					template += basic.DistinctPtr2()
+					template = r2.Replace(template)
+				}
+
+			} else {
 				if fp.ExistsStrIgnoreCase("DistinctP", onlyList) {
 					template += basic.DistinctP()
 					template = r2.Replace(template)
@@ -494,8 +528,7 @@ func generateFPCode(pkg, dataTypes, imports string) (string, error) {
 					template += basic.DistinctPtr()
 					template = r2.Replace(template)
 				}
-
-			*/
+			}
 
 		} else {
 			template += template2.Map()
@@ -641,7 +674,23 @@ func generateFPCode(pkg, dataTypes, imports string) (string, error) {
 
 			template += basic.TakePtr()
 			template = r2.Replace(template)
-			/*
+
+			if len(unexpectedFieldsForDistinct) > 1 {
+				switchTemplateDistinct = true
+
+				template += basic.DistinctP2()
+				template = r2.Replace(template)
+
+				template += basic.DistinctPPtr2()
+				template = r2.Replace(template)
+
+				template += basic.Distinct2()
+				template = r2.Replace(template)
+
+				template += basic.DistinctPtr2()
+				template = r2.Replace(template)
+
+			} else {
 				template += basic.DistinctP()
 				template = r2.Replace(template)
 
@@ -653,10 +702,8 @@ func generateFPCode(pkg, dataTypes, imports string) (string, error) {
 
 				template += basic.DistinctPtr()
 				template = r2.Replace(template)
-
-			*/
+			}
 		}
-
 	}
 	return template, nil
 }
@@ -1128,7 +1175,7 @@ func listDir(dirName string) ([]string, error) {
 	return files, nil
 }
 
-func findStructNamesAndFieldsGivenInGoGenerate() map[string][]string {
+func findStructNamesAndFieldsGivenInGoGenerate() (map[string][]string, map[string][]string) {
 	allTypesInGoGenerate := strings.Split(*types, ",")
 
 	isUserDefinedType := func(dataType string) bool {
@@ -1141,6 +1188,7 @@ func findStructNamesAndFieldsGivenInGoGenerate() map[string][]string {
 	userDefinedTypesInGoGenerate := fp.MapStr(strings.TrimSpace, fp.FilterStr(isUserDefinedType, allTypesInGoGenerate))
 
 	structToFieldsMap := make(map[string][]string, len(userDefinedTypesInGoGenerate))
+	structToFieldsMapUnExpected := make(map[string][]string, len(userDefinedTypesInGoGenerate))
 	structToFieldsMapIndex := 0
 
 	path, err := os.Getwd()
@@ -1150,7 +1198,7 @@ func findStructNamesAndFieldsGivenInGoGenerate() map[string][]string {
 	files, err := listDir(path)
 	if err != nil {
 		fmt.Printf("\n error scanning current folder=%v, error=%v. sort and set methods will be skipped", path, err)
-		return nil
+		return nil, nil
 	}
 
 	onlyGoFiles := fp.FilterStr(func(str string) bool {
@@ -1167,14 +1215,15 @@ func findStructNamesAndFieldsGivenInGoGenerate() map[string][]string {
 		file, err := os.Open(fileStr)
 		if err != nil {
 			fmt.Printf("\n error reading file=%s to generate sort and set methods. skipping set and sort functions", fileStr)
-			return nil
+			return nil, nil
 		}
 		defer file.Close()
 
 		scanner := bufio.NewScanner(file)
 		packageFound := false
 		startCollectingStructInfo := false
 		var structFields []string
+		var structFieldsUnExpected []string
 
 		for scanner.Scan() {
 			txtLine := scanner.Text()
@@ -1199,9 +1248,15 @@ func findStructNamesAndFieldsGivenInGoGenerate() map[string][]string {
 					for i, v := range structFields {
 						newStructFieldsArr[i] = v
 					}
+
+					newStructFieldsArrUnExpected := make([]string, len(structFieldsUnExpected))
+					copy(newStructFieldsArrUnExpected, structFieldsUnExpected)
+
 					structToFieldsMap[userDefinedTypesInGoGenerate[structToFieldsMapIndex]] = newStructFieldsArr
+					structToFieldsMapUnExpected[userDefinedTypesInGoGenerate[structToFieldsMapIndex]] = newStructFieldsArrUnExpected
 					structToFieldsMapIndex++
 					structFields = make([]string, 0)
+					structFieldsUnExpected = make([]string, 0)
 				}
 
 				if startCollectingStructInfo {
@@ -1212,6 +1267,8 @@ func findStructNamesAndFieldsGivenInGoGenerate() map[string][]string {
 						switch dataType {
 						case "int", "int64", "int32", "int16", "int8", "uint", "uint64", "uint32", "uint16", "uint8", "float64", "float32", "string", "time.Time", "*time.Time", "*int", "*int64", "*int32", "*int16", "*int8", "*uint", "*uint64", "*uint32", "*uint16", "*uint8", "*float64", "*float32", "*string":
 							structFields = append(structFields, field+" "+dataType)
+						default:
+							structFieldsUnExpected = append(structFieldsUnExpected, field+" "+dataType)
 						}
 					}
 				}
@@ -1220,108 +1277,9 @@ func findStructNamesAndFieldsGivenInGoGenerate() map[string][]string {
 
 		if err := scanner.Err(); err != nil {
 			fmt.Printf("\n error scanning data from file %s. skipping generation of sort and set functions", fileStr)
-			return nil
-		}
-	}
-
-	return structToFieldsMap
-}
-
-func allFeildsInStruct() map[string][]string {
-	allTypesInGoGenerate := strings.Split(*types, ",")
-
-	isUserDefinedType := func(dataType string) bool {
-		switch strings.ToLower(strings.TrimSpace(dataType)) {
-		case "int", "int64", "int32", "int16", "int8", "uint", "uint64", "uint32", "uint16", "uint8", "float64", "float32", "string", "bool":
-			return false
-		}
-		return true
-	}
-	userDefinedTypesInGoGenerate := fp.MapStr(strings.TrimSpace, fp.FilterStr(isUserDefinedType, allTypesInGoGenerate))
-
-	structToFieldsMap := make(map[string][]string, len(userDefinedTypesInGoGenerate))
-	structToFieldsMapIndex := 0
-
-	path, err := os.Getwd()
-	if err != nil {
-		fmt.Println(err)
-	}
-	files, err := listDir(path)
-	if err != nil {
-		fmt.Printf("\n error scanning current folder=%v, error=%v. sort and set methods will be skipped", path, err)
-		return nil
-	}
-
-	onlyGoFiles := fp.FilterStr(func(str string) bool {
-		return strings.Contains(str, ".go")
-	}, files)
-
-	totalStructCount := 0
-	for _, fileStr := range onlyGoFiles {
-
-		if totalStructCount == len(userDefinedTypesInGoGenerate) {
-			break
-		}
-
-		file, err := os.Open(fileStr)
-		if err != nil {
-			fmt.Printf("\n error reading file=%s to generate sort and set methods. skipping set and sort functions", fileStr)
-			return nil
-		}
-		defer file.Close()
-
-		scanner := bufio.NewScanner(file)
-		packageFound := false
-		startCollectingStructInfo := false
-		var structFields []string
-
-		for scanner.Scan() {
-			txtLine := scanner.Text()
-			if len(txtLine) > 0 && strings.Contains(txtLine, *pkgName) {
-				packageFound = true
-			}
-			// reading lines of file of package mentioned in go:generate
-			if packageFound {
-
-				words := strings.Fields(txtLine)
-
-				// Found struct
-				if len(words) == 4 && strings.Contains(words[0], "type") && fp.ExistsStr(words[1], userDefinedTypesInGoGenerate) && strings.Contains(words[2], "struct") && strings.Contains(words[3], "{") {
-					startCollectingStructInfo = true
-					totalStructCount++
-				}
-
-				if startCollectingStructInfo && strings.TrimSpace(txtLine) == "}" {
-					startCollectingStructInfo = false
-
-					newStructFieldsArr := make([]string, len(structFields))
-					for i, v := range structFields {
-						newStructFieldsArr[i] = v
-					}
-					structToFieldsMap[userDefinedTypesInGoGenerate[structToFieldsMapIndex]] = newStructFieldsArr
-					structToFieldsMapIndex++
-					structFields = make([]string, 0)
-				}
-
-				if startCollectingStructInfo {
-					if len(words) >= 2 {
-						field := strings.TrimSpace(words[0])
-						dataType := strings.TrimSpace(words[1])
-
-						//switch dataType {
-						//case "int", "int64", "int32", "int16", "int8", "uint", "uint64", "uint32", "uint16", "uint8", "float64", "float32", "string", "time.Time", "*time.Time", "*int", "*int64", "*int32", "*int16", "*int8", "*uint", "*uint64", "*uint32", "*uint16", "*uint8", "*float64", "*float32", "*string":
-						structFields = append(structFields, field+" "+dataType)
-						//}
-					}
-				}
-			}
-		}
-
-		if err := scanner.Err(); err != nil {
-			fmt.Printf("\n error scanning data from file %s. skipping generation of sort and set functions", fileStr)
-			return nil
+			return nil, nil
 		}
 	}
 
-	return structToFieldsMap
+	return structToFieldsMap, structToFieldsMapUnExpected
 }