chore: formatting

Author: ashish10alex

cmd/utils.go

@@ -61,70 +61,71 @@ func formatSqlCode(sqlxFileMetaData *sqlxParserMeta, pythonScriptPath string, sq
 	err := cmd.Run()
 	if err != nil {
 		logger.Error(stderr.String(), slog.String("file", sqlxFileMetaData.filepath), "error", err.Error())
-        sqlxFileMetaData.sqlBlocksMeta.formattedSqlBlockContent = string(queryString)
+		sqlxFileMetaData.sqlBlocksMeta.formattedSqlBlockContent = string(queryString)
 		return ErrorFormattingSqlxFile
 	}
 	output := stdout.String()
 	sql_fluff_not_installed := (strings.TrimSpace(output) == "sqlfluff is not installed")
 	if sql_fluff_not_installed {
 		log.Fatal(color.RedString("sqlfluff not installed. Please install sqlfluff using 'pip install sqlfluff'"))
 	}
-    sqlxFileMetaData.sqlBlocksMeta.formattedSqlBlockContent = output
+	sqlxFileMetaData.sqlBlocksMeta.formattedSqlBlockContent = output
 	return nil
 }
 
 func finalFormmatedSqlxFileContents(sqlxFileMetaData *sqlxParserMeta) string {
-    spaceBetweenBlocks := "\n\n"
-    spaceBetweenSameOps := "\n"
-
-    formattedQuery := ""
-    prePostOpBlock := ""
-
-    preOpsBlocks := sqlxFileMetaData.preOpsBlocksMeta
-    postOpsBlocks := sqlxFileMetaData.postOpsBlocksMeta
-
-    preOpsBlockContent := ""
-    if len(preOpsBlocks) > 0 {
-        for _, preOpsBlock := range preOpsBlocks {
-            preOpsBlockContent += preOpsBlock.preOpsBlockContent + spaceBetweenSameOps
-        }
-    }
-
-    postOpsBlockContent := ""
-    if len(postOpsBlocks) > 0 {
-        for _, postOpsBlock := range postOpsBlocks {
-            postOpsBlockContent += postOpsBlock.postOpsBlockContent + spaceBetweenSameOps
-        }
-    }
-
-    if preOpsBlockContent == "" && postOpsBlockContent == "" {
-        prePostOpBlock = ""
-    } else {
-        prePostOpBlock = spaceBetweenBlocks + preOpsBlockContent + spaceBetweenBlocks + postOpsBlockContent
-    }
-
-    formattedQuery = sqlxFileMetaData.configBlockMeta.configBlockContent +
-                                                        prePostOpBlock +
-                                                        spaceBetweenBlocks +
-                                                        sqlxFileMetaData.sqlBlocksMeta.formattedSqlBlockContent
-    return formattedQuery
+	spaceBetweenBlocks := "\n\n"
+	// NOTE: Dataform at the time of writing this does not really have multiple preOpsBlocks or postOpsBlocks in its compiled json although it does not throw a compilation error if you put one
+	spaceBetweenSameOps := "\n"
+
+	formattedQuery := ""
+	prePostOpBlock := ""
+
+	preOpsBlocks := sqlxFileMetaData.preOpsBlocksMeta
+	postOpsBlocks := sqlxFileMetaData.postOpsBlocksMeta
+
+	preOpsBlockContent := ""
+	if len(preOpsBlocks) > 0 {
+		for _, preOpsBlock := range preOpsBlocks {
+			preOpsBlockContent += preOpsBlock.preOpsBlockContent + spaceBetweenSameOps
+		}
+	}
+
+	postOpsBlockContent := ""
+	if len(postOpsBlocks) > 0 {
+		for _, postOpsBlock := range postOpsBlocks {
+			postOpsBlockContent += postOpsBlock.postOpsBlockContent + spaceBetweenSameOps
+		}
+	}
+
+	if preOpsBlockContent == "" && postOpsBlockContent == "" {
+		prePostOpBlock = ""
+	} else {
+		prePostOpBlock = spaceBetweenBlocks + preOpsBlockContent + spaceBetweenBlocks + postOpsBlockContent
+	}
+
+	formattedQuery = sqlxFileMetaData.configBlockMeta.configBlockContent +
+		prePostOpBlock +
+		spaceBetweenBlocks +
+		sqlxFileMetaData.sqlBlocksMeta.formattedSqlBlockContent
+	return formattedQuery
 }
 
 func writeContentsToFile(sqlxFileMetaData *sqlxParserMeta, formattingError error) {
 
 	yellow := color.New(color.FgYellow).SprintFunc()
 	red := color.New(color.FgRed).SprintFunc()
 
-    filPathSeparator := string(os.PathSeparator)
-    _definitions := "definitions" + filPathSeparator
+	filPathSeparator := string(os.PathSeparator)
+	_definitions := "definitions" + filPathSeparator
 	baseFilepath := strings.Split(sqlxFileMetaData.filepath, _definitions)
-    formattedFilePath := filepath.Join("formatted", "definitions", baseFilepath[1])
+	formattedFilePath := filepath.Join("formatted", "definitions", baseFilepath[1])
 
 	dirToCreate := formattedFilePath[:strings.LastIndex(formattedFilePath, filPathSeparator)]
 
 	os.MkdirAll(dirToCreate, 0755) // TODO: make this configurable
 
-    formattedQuery := finalFormmatedSqlxFileContents(sqlxFileMetaData)
+	formattedQuery := finalFormmatedSqlxFileContents(sqlxFileMetaData)
 
 	err := os.WriteFile(formattedFilePath, []byte(formattedQuery), 0664)
 	if err != nil {
@@ -145,7 +146,7 @@ func writeContentsToFileInPlace(sqlxFileMetaData *sqlxParserMeta, formattingErro
 	yellow := color.New(color.FgYellow).SprintFunc()
 	red := color.New(color.FgRed).SprintFunc()
 
-    formattedQuery := finalFormmatedSqlxFileContents(sqlxFileMetaData)
+	formattedQuery := finalFormmatedSqlxFileContents(sqlxFileMetaData)
 
 	err := os.WriteFile(sqlxFileMetaData.filepath, []byte(formattedQuery), 0664)
 	if err != nil {
@@ -162,13 +163,13 @@ func writeContentsToFileInPlace(sqlxFileMetaData *sqlxParserMeta, formattingErro
 }
 
 func formatSqlxFile(sqlxFilePath string, inplace bool, sqlfluffConfigPath string, pythonExecutable string, logger *slog.Logger) {
-    sqlxFileMetaData, err := sqlxParser(sqlxFilePath)
-    // fmt.Printf("%+v\n", sqlxFileMetaData)
+	sqlxFileMetaData, err := sqlxParser(sqlxFilePath)
+	// fmt.Printf("%+v\n", sqlxFileMetaData)
 
 	if err != nil {
 		fmt.Println("Error finding config blocks:", err)
 	} else {
-        pythonScriptPath := filepath.Join(".formatdataform", "sqlfluff_formatter.py")
+		pythonScriptPath := filepath.Join(".formatdataform", "sqlfluff_formatter.py")
 		formattingError := formatSqlCode(&sqlxFileMetaData, pythonScriptPath, sqlfluffConfigPath, pythonExecutable, logger)
 		if inplace {
 			writeContentsToFileInPlace(&sqlxFileMetaData, formattingError)
@@ -197,7 +198,7 @@ func createFileFromText(text string, filepath string) error {
 		return err
 	} else {
 		f.WriteString(text)
-		fmt.Printf("file created at: `%s` \n",  filepath)
+		fmt.Printf("file created at: `%s` \n", filepath)
 		f.Close()
 	}
 	return nil