fix(jsonschema): allow string as tags type

evilmartians · Jan 9, 2025 · 8ba7eaa · 8ba7eaa
1 parent cfa688f
commit 8ba7eaa
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/cmd/validate.go b/cmd/validate.go
@@ -8,9 +8,6 @@ import (
 	"github.com/evilmartians/lefthook/internal/lefthook"
 )
 
-////go:embed schema.json
-// var jsonSchema []byte
-
 type validate struct{}
 
 func (validate) New(opts *lefthook.Options) *cobra.Command {

diff --git a/internal/config/command.go b/internal/config/command.go
@@ -10,10 +10,10 @@ type Command struct {
 	Run   string `json:"run"             mapstructure:"run"   toml:"run"             yaml:"run"`
 	Files string `json:"files,omitempty" mapstructure:"files" toml:"files,omitempty" yaml:",omitempty"`
 
-	Skip interface{}       `json:"skip,omitempty" jsonschema:"oneof_type=boolean;array" mapstructure:"skip"   toml:"skip,omitempty,inline" yaml:",omitempty"`
-	Only interface{}       `json:"only,omitempty" jsonschema:"oneof_type=boolean;array" mapstructure:"only"   toml:"only,omitempty,inline" yaml:",omitempty"`
-	Tags []string          `json:"tags,omitempty" mapstructure:"tags"                   toml:"tags,omitempty" yaml:",omitempty"`
-	Env  map[string]string `json:"env,omitempty"  mapstructure:"env"                    toml:"env,omitempty"  yaml:",omitempty"`
+	Skip interface{}       `json:"skip,omitempty" jsonschema:"oneof_type=boolean;array" mapstructure:"skip"  toml:"skip,omitempty,inline" yaml:",omitempty"`
+	Only interface{}       `json:"only,omitempty" jsonschema:"oneof_type=boolean;array" mapstructure:"only"  toml:"only,omitempty,inline" yaml:",omitempty"`
+	Tags []string          `json:"tags,omitempty" jsonschema:"oneof_type=string;array"  mapstructure:"tags"  toml:"tags,omitempty"        yaml:",omitempty"`
+	Env  map[string]string `json:"env,omitempty"  mapstructure:"env"                    toml:"env,omitempty" yaml:",omitempty"`
 
 	FileTypes []string `json:"file_types,omitempty" koanf:"file_types" mapstructure:"file_types" toml:"file_types,omitempty" yaml:"file_types,omitempty"`
 

diff --git a/internal/config/job.go b/internal/config/job.go
@@ -11,8 +11,8 @@ type Job struct {
 	Files    string `json:"files,omitempty"     mapstructure:"files" toml:"files,omitempty"   yaml:",omitempty"`
 	FailText string `json:"fail_text,omitempty" koanf:"fail_text"    mapstructure:"fail_text" toml:"fail_text,omitempty" yaml:"fail_text,omitempty"`
 
-	Tags      []string `json:"tags,omitempty"       mapstructure:"tags" toml:"tags,omitempty"     yaml:",omitempty"`
-	FileTypes []string `json:"file_types,omitempty" koanf:"file_types"  mapstructure:"file_types" toml:"file_types,omitempty" yaml:"file_types,omitempty"`
+	Tags      []string `json:"tags,omitempty"       jsonschema:"oneof_type=array" mapstructure:"tags"       toml:"tags,omitempty"       yaml:",omitempty"`
+	FileTypes []string `json:"file_types,omitempty" koanf:"file_types"            mapstructure:"file_types" toml:"file_types,omitempty" yaml:"file_types,omitempty"`
 
 	Env map[string]string `json:"env,omitempty" mapstructure:"env" toml:"env,omitempty" yaml:",omitempty"`
 

diff --git a/schema.json b/schema.json
@@ -31,10 +31,17 @@
           ]
         },
         "tags": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array"
+            }
+          ],
           "items": {
             "type": "string"
-          },
-          "type": "array"
+          }
         },
         "env": {
           "additionalProperties": {
@@ -219,10 +226,14 @@
           "type": "string"
         },
         "tags": {
+          "oneOf": [
+            {
+              "type": "array"
+            }
+          ],
           "items": {
             "type": "string"
-          },
-          "type": "array"
+          }
         },
         "file_types": {
           "items": {