Merge pull request #1 from brucechen7274/main

feat: Add support for datetime type

Author: ostafen

go.mod

@@ -14,4 +14,7 @@ require (
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	golang.org/x/mod v0.27.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/tools v0.36.0 // indirect
 )

go.sum

@@ -21,6 +21,12 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

pkg/gen/gogen.go

@@ -19,9 +19,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"go/format"
 	"strings"
 
+	"golang.org/x/tools/imports"
+
 	"github.com/ostafen/suricata/pkg/spec"
 )
 
@@ -43,14 +44,6 @@ func (gen *CodeGenerator) Generate(spec *spec.Spec) ([]byte, error) {
 	gen.write("// Code generated by suricata-gen; DO NOT EDIT.\n\n")
 	gen.write("package %s\n\n", packageName(spec.Package))
 
-	gen.write(`import (
-	"context"
-	"fmt"
-	"github.com/ostafen/suricata/runtime"
-	"github.com/xeipuuv/gojsonschema"
-)
-` + "\n")
-
 	if len(spec.Messages) > 0 {
 		if err := gen.generateMessageSchemas(spec.Messages); err != nil {
 			return nil, err
@@ -63,7 +56,8 @@ func (gen *CodeGenerator) Generate(spec *spec.Spec) ([]byte, error) {
 		gen.generateAgent(name, &svc, spec.Tools)
 	}
 
-	src, err := format.Source(gen.buf.Bytes())
+	// Use imports.Process to organize imports and format code
+	src, err := imports.Process("", gen.buf.Bytes(), nil)
 	if err != nil {
 		return gen.buf.Bytes(), err
 	}
@@ -270,6 +264,8 @@ func goTypeForField(f spec.Field) string {
 		goType = "float64"
 	case "bool":
 		goType = "bool"
+	case "datetime":
+		goType = "time.Time" // RFC3339 format
 	default:
 		// Custom message type
 		goType = f.Type

pkg/gen/jsonschema.go

@@ -92,6 +92,8 @@ func (gen *JSONSchemaGenerator) fieldToSchema(field spec.Field, allMessages map[
 		baseSchema = map[string]any{"type": "number"}
 	case "bool":
 		baseSchema = map[string]any{"type": "boolean"}
+	case "datetime":
+		baseSchema = map[string]any{"type": "string", "format": "date-time"} // RFC3339
 	default:
 		// Custom type - lookup in allMessages
 		msg, ok := allMessages[field.Type]

pkg/spec/spec.go

@@ -76,6 +76,16 @@ func LoadSpec(path string) (*Spec, error) {
 	return &spec, spec.Validate()
 }
 
+// isPrimitiveType checks if the given type is a built-in primitive type
+func isPrimitiveType(t string) bool {
+	switch t {
+	case "string", "int", "int32", "int64", "float", "float32", "float64", "bool", "datetime":
+		return true
+	default:
+		return false
+	}
+}
+
 func (spec *Spec) Validate() error {
 	if spec.Version == "" {
 		return fmt.Errorf("spec: version is required")
@@ -106,6 +116,12 @@ func (spec *Spec) validateMessages() error {
 			if field.Type == "" {
 				return fmt.Errorf("spec: field %q in message %q has empty type", field.Name, name)
 			}
+			// Validate field type existence
+			if !isPrimitiveType(field.Type) {
+				if _, ok := spec.Messages[field.Type]; !ok {
+					return fmt.Errorf("spec: field %q in message %q references undefined type %q", field.Name, name, field.Type)
+				}
+			}
 		}
 	}
 	return nil