refactor(config): Default returns new config

conventionalcommit · Feb 6, 2022 · b74a2d2 · b74a2d2
1 parent f0fffde
commit b74a2d2
Show file tree

Hide file tree

Showing 3 changed files with 143 additions and 144 deletions.
diff --git a/config/config.go b/config/config.go
@@ -94,7 +94,7 @@ func LookupAndParse() (*lint.Config, error) {
 	}
 
 	if confType == internal.DefaultConfig {
-		return defConf, nil
+		return Default(), nil
 	}
 
 	conf, err := Parse(confFilePath)

diff --git a/config/default.go b/config/default.go
@@ -7,149 +7,146 @@ import (
 	"github.com/conventionalcommit/commitlint/rule"
 )
 
-var defConf = &lint.Config{
-	MinVersion: internal.Version(),
-
-	Formatter: (&formatter.DefaultFormatter{}).Name(),
-
-	Rules: defRuleConf,
-}
-
-var defRuleConf = map[string]lint.RuleConfig{
-	// Header Min Len Rule
-	(&rule.HeadMinLenRule{}).Name(): {
-		Enabled:  true,
-		Severity: lint.SeverityError,
-		Argument: 10,
-	},
-
-	// Header Max Len Rule
-	(&rule.HeadMaxLenRule{}).Name(): {
-		Enabled:  true,
-		Severity: lint.SeverityError,
-		Argument: 50,
-	},
-
-	// Body Max Line Rule
-	(&rule.BodyMaxLineLenRule{}).Name(): {
-		Enabled:  true,
-		Severity: lint.SeverityError,
-		Argument: 72,
-	},
-
-	// Footer Max Line Rule
-	(&rule.FooterMaxLineLenRule{}).Name(): {
-		Enabled:  true,
-		Severity: lint.SeverityError,
-		Argument: 72,
-	},
-
-	// Types Enum Rule
-	(&rule.TypeEnumRule{}).Name(): {
-		Enabled:  true,
-		Severity: lint.SeverityError,
-		Argument: []interface{}{
-			"feat", "fix", "docs", "style", "refactor", "perf",
-			"test", "build", "ci", "chore", "revert", "merge",
-		},
-	},
-
-	// Scope Enum Rule
-	(&rule.ScopeEnumRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: []interface{}{},
-		Flags: map[string]interface{}{
-			"allow-empty": true,
-		},
-	},
-
-	// Body Min Len Rule
-	(&rule.BodyMinLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: 0,
-	},
-
-	// Body Max Len Rule
-	(&rule.BodyMaxLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: -1,
-	},
-
-	// Footer Min Len Rule
-	(&rule.FooterMinLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: 0,
-	},
-
-	// Footer Max Len Rule
-	(&rule.FooterMaxLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: -1,
-	},
-
-	// Type Min Len Rule
-	(&rule.TypeMinLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: 0,
-	},
-
-	// Type Max Len Rule
-	(&rule.TypeMaxLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: -1,
-	},
-
-	// Scope Min Len Rule
-	(&rule.ScopeMinLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: 0,
-	},
-
-	// Scope Max Len Rule
-	(&rule.ScopeMaxLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: -1,
-	},
-
-	// Description Min Len Rule
-	(&rule.DescriptionMinLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: 0,
-	},
-
-	// Description Max Len Rule
-	(&rule.DescriptionMaxLenRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: -1,
-	},
-
-	// Type Charset Rule
-	(&rule.TypeCharsetRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
-	},
-
-	// Scope Charset Rule
-	(&rule.ScopeCharsetRule{}).Name(): {
-		Enabled:  false,
-		Severity: lint.SeverityError,
-		Argument: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/,",
-	},
-}
-
 // Default returns default config
 func Default() *lint.Config {
-	return defConf
+	def := &lint.Config{
+		MinVersion: internal.Version(),
+
+		Formatter: (&formatter.DefaultFormatter{}).Name(),
+
+		Rules: map[string]lint.RuleConfig{
+			// Header Min Len Rule
+			(&rule.HeadMinLenRule{}).Name(): {
+				Enabled:  true,
+				Severity: lint.SeverityError,
+				Argument: 10,
+			},
+
+			// Header Max Len Rule
+			(&rule.HeadMaxLenRule{}).Name(): {
+				Enabled:  true,
+				Severity: lint.SeverityError,
+				Argument: 50,
+			},
+
+			// Body Max Line Rule
+			(&rule.BodyMaxLineLenRule{}).Name(): {
+				Enabled:  true,
+				Severity: lint.SeverityError,
+				Argument: 72,
+			},
+
+			// Footer Max Line Rule
+			(&rule.FooterMaxLineLenRule{}).Name(): {
+				Enabled:  true,
+				Severity: lint.SeverityError,
+				Argument: 72,
+			},
+
+			// Types Enum Rule
+			(&rule.TypeEnumRule{}).Name(): {
+				Enabled:  true,
+				Severity: lint.SeverityError,
+				Argument: []interface{}{
+					"feat", "fix", "docs", "style", "refactor", "perf",
+					"test", "build", "ci", "chore", "revert", "merge",
+				},
+			},
+
+			// Scope Enum Rule
+			(&rule.ScopeEnumRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: []interface{}{},
+				Flags: map[string]interface{}{
+					"allow-empty": true,
+				},
+			},
+
+			// Body Min Len Rule
+			(&rule.BodyMinLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: 0,
+			},
+
+			// Body Max Len Rule
+			(&rule.BodyMaxLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: -1,
+			},
+
+			// Footer Min Len Rule
+			(&rule.FooterMinLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: 0,
+			},
+
+			// Footer Max Len Rule
+			(&rule.FooterMaxLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: -1,
+			},
+
+			// Type Min Len Rule
+			(&rule.TypeMinLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: 0,
+			},
+
+			// Type Max Len Rule
+			(&rule.TypeMaxLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: -1,
+			},
+
+			// Scope Min Len Rule
+			(&rule.ScopeMinLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: 0,
+			},
+
+			// Scope Max Len Rule
+			(&rule.ScopeMaxLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: -1,
+			},
+
+			// Description Min Len Rule
+			(&rule.DescriptionMinLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: 0,
+			},
+
+			// Description Max Len Rule
+			(&rule.DescriptionMaxLenRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: -1,
+			},
+
+			// Type Charset Rule
+			(&rule.TypeCharsetRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+			},
+
+			// Scope Charset Rule
+			(&rule.ScopeCharsetRule{}).Name(): {
+				Enabled:  false,
+				Severity: lint.SeverityError,
+				Argument: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/,",
+			},
+		},
+	}
+	return def
 }
diff --git a/config/default_test.go b/config/default_test.go
@@ -7,6 +7,7 @@ import (
 )
 
 func TestDefaultLint(t *testing.T) {
+	defConf := Default()
 	_, err := NewLinter(defConf)
 	if err != nil {
 		t.Error("default lint creation failed", err)
@@ -15,6 +16,7 @@ func TestDefaultLint(t *testing.T) {
 }
 
 func TestDefaultConf(t *testing.T) {
+	defConf := Default()
 	rules := registry.Rules()
 	if len(rules) != len(defConf.Rules) {
 		t.Error("default conf does not have all rules", len(rules), len(defConf.Rules))