Merge pull request #125 from codacy/default-eslint-8.57

fix eslint config creation and using default 8.57.0 instead 9.3.0 (when init without token)

Author: franciscoovazevedo

README.md

@@ -31,7 +31,7 @@ The tool is invoked using the `codacy-cli` command, and provides two main comman
   runtimes:
       - [email protected]
   tools:
-      - eslint@9.3.0
+      - eslint@8.57.0
 
 - **`codacy-cli install`**: Command to install the specified node and eslint versions before running analysis.
 

cmd/init.go

@@ -138,7 +138,7 @@ func configFileTemplate(tools []tools.Tool) string {
 
 	// Default versions
 	defaultVersions := map[string]string{
-		ESLint:       "9.3.0",
+		ESLint:       "8.57.0",
 		Trivy:        "0.59.1",
 		PyLint:       "3.3.6",
 		PMD:          "6.55.0",

cmd/init_test.go

@@ -24,7 +24,7 @@ func TestConfigFileTemplate(t *testing.T) {
 			expected: []string{
 				"[email protected]",
 				"[email protected]",
-				"eslint@9.3.0",
+				"eslint@8.57.0",
 				"[email protected]",
 				"[email protected]",
 				"[email protected]",

cmd/root.go

@@ -129,7 +129,7 @@ Use "{{.CommandPath}} [command] --help" for more information about a command.{{e
   runtimes:
     - [email protected]
   tools:
-    - eslint@9.3.0
+    - eslint@8.57.0
 
 ` + color.New(color.FgCyan).Sprint("For more information and examples, visit:") + `
 https://github.com/codacy/codacy-cli-v2

integration-tests/init-without-token/expected/codacy.yaml

@@ -4,7 +4,7 @@ runtimes:
     - [email protected]
     - [email protected]
 tools:
-    - eslint@9.3.0
+    - eslint@8.57.0
     - [email protected]
     - [email protected]
     - [email protected]

tools/eslintConfigCreator.go

@@ -53,22 +53,66 @@ func CreateEslintConfig(configuration []domain.PatternConfiguration) string {
 
 		parametersString := ""
 
+		// Find default value for unnamedParam if needed
+		defaultUnnamedParamValue := ""
+		for _, paramDef := range patternConfiguration.PatternDefinition.Parameters {
+			if paramDef.Name == "unnamedParam" {
+				defaultUnnamedParamValue = paramDef.Default
+				break
+			}
+		}
+
+		// Process parameters
+		foundUnnamedParam := false
 		for _, parameter := range patternConfiguration.Parameters {
 			if parameter.Name == "unnamedParam" {
-				parametersString += quoteWhenIsNotJson(parameter.Value)
+				foundUnnamedParam = true
+				// If value is empty but we have a default, use the default
+				if parameter.Value == "" && defaultUnnamedParamValue != "" {
+					parametersString += quoteWhenIsNotJson(defaultUnnamedParamValue)
+				} else if parameter.Value != "" {
+					parametersString += quoteWhenIsNotJson(parameter.Value)
+				}
 			}
 		}
 
+		// If we found an unnamed param with empty value but have a default, use it
+		if foundUnnamedParam && parametersString == "" && defaultUnnamedParamValue != "" {
+			parametersString += quoteWhenIsNotJson(defaultUnnamedParamValue)
+		}
+
 		// build named parameters json object
 		namedParametersString := ""
 		for _, parameter := range patternConfiguration.Parameters {
 			if parameter.Name != "unnamedParam" {
+				paramValue := parameter.Value
+
+				// If value is empty, look for default in pattern definition
+				if paramValue == "" {
+					for _, paramDef := range patternConfiguration.PatternDefinition.Parameters {
+						if paramDef.Name == parameter.Name && paramDef.Default != "" {
+							paramValue = paramDef.Default
+							break
+						}
+					}
+				}
+
+				// Skip only if both value and default are empty
+				if paramValue == "" {
+					continue
+				}
+
 				if len(namedParametersString) == 0 {
 					namedParametersString += "{"
 				} else {
 					namedParametersString += ", "
 				}
-				namedParametersString += fmt.Sprintf("\"%s\": %s", parameter.Name, quoteWhenIsNotJson(parameter.Value))
+
+				if paramValue == "true" || paramValue == "false" {
+					namedParametersString += fmt.Sprintf("\"%s\": %s", parameter.Name, paramValue)
+				} else {
+					namedParametersString += fmt.Sprintf("\"%s\": %s", parameter.Name, quoteWhenIsNotJson(paramValue))
+				}
 			}
 		}
 		if len(namedParametersString) > 0 {
@@ -84,7 +128,7 @@ func CreateEslintConfig(configuration []domain.PatternConfiguration) string {
 		result += "          "
 
 		if parametersString == "" {
-			result += fmt.Sprintf(`"%s": "error",`, rule)
+			result += fmt.Sprintf(`"%s": ["error"],`, rule)
 			result += "\n"
 		} else {
 			result += fmt.Sprintf(`"%s": ["error", %s],`, rule, parametersString)

tools/eslintConfigCreator_test.go

@@ -35,7 +35,7 @@ func TestCreateEslintConfigConfig1(t *testing.T) {
 		`export default [
     {
         rules: {
-          "semi": "error",
+          "semi": ["error"],
         }
     }
 ];`)
@@ -133,3 +133,71 @@ func TestCreateEslintConfigDoNotSupportPlugins(t *testing.T) {
     }
 ];`)
 }
+
+func TestCreateEslintConfigWithDefaultValues(t *testing.T) {
+	testConfig(t,
+		[]domain.PatternConfiguration{
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "ESLint8_no-fallthrough",
+					Parameters: []domain.ParameterConfiguration{
+						{
+							Name:    "commentPattern",
+							Default: "",
+						},
+						{
+							Name:    "allowEmptyCase",
+							Default: "false",
+						},
+					},
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "commentPattern",
+						Value: "", // Empty value with empty default - should be skipped
+					},
+					{
+						Name:  "allowEmptyCase",
+						Value: "", // Empty value with default "false" - should use default
+					},
+				},
+			},
+		},
+		`export default [
+    {
+        rules: {
+          "no-fallthrough": ["error", {"allowEmptyCase": false}],
+        }
+    }
+];`)
+}
+
+func TestCreateEslintConfigWithUnnamedDefaultValues(t *testing.T) {
+	testConfig(t,
+		[]domain.PatternConfiguration{
+			{
+				PatternDefinition: domain.PatternDefinition{
+					Id: "ESLint8_no-inner-declarations",
+					Parameters: []domain.ParameterConfiguration{
+						{
+							Name:    "unnamedParam",
+							Default: "functions",
+						},
+					},
+				},
+				Parameters: []domain.ParameterConfiguration{
+					{
+						Name:  "unnamedParam",
+						Value: "", // Empty value with default "functions" - should use default
+					},
+				},
+			},
+		},
+		`export default [
+    {
+        rules: {
+          "no-inner-declarations": ["error", "functions"],
+        }
+    }
+];`)
+}