Improve ability to add model specific methods

Makefile

@@ -17,7 +17,7 @@ gofmt:
 	gofmt -l -s -w .
 
 gogenertate:
-	go generate ./... && goimports -w .
+	go generate ./...
 
 build-web-assets:
 	esbuild web/projector.js web/projector.css web/slide/*.css web/slide/*.js --outdir=static/ --external:*.woff --bundle --minify --sourcemap --target=chrome58,firefox57,safari11,edge16

cmd/modelgen/imports.go.tmpl

@@ -0,0 +1,11 @@
+package models
+
+import (
+	"encoding/json"
+	"fmt"
+	"slices"
+	"strconv"
+	"strings"
+
+	"github.com/rs/zerolog/log"
+)

cmd/modelgen/main.go

@@ -24,16 +24,19 @@ import (
 
 //go:generate sh -c "go run main.go"
 
+//go:embed imports.go.tmpl
+var importsTmpl []byte
+
 //go:embed model_struct.go.tmpl
 var modelStructTmpl string
 
 func main() {
-	if err := run(os.Stdout); err != nil {
+	if err := run(); err != nil {
 		log.Fatalf("Error: %v", err)
 	}
 }
 
-func run(w io.Writer) error {
+func run() error {
 	if err := genStrutcts(); err != nil {
 		return fmt.Errorf("generate field methods: %w", err)
 	}
@@ -58,6 +61,11 @@ func genStrutcts() error {
 		return fmt.Errorf("parsing template: %w", err)
 	}
 
+	allModels := importsTmpl
+	sort.Slice(collections, func(i, j int) bool {
+		return collections[i].CollectionName < collections[j].CollectionName
+	})
+
 	for _, coll := range collections {
 		buf := new(bytes.Buffer)
 
@@ -70,9 +78,11 @@ func genStrutcts() error {
 			return fmt.Errorf("formating code: %w", err)
 		}
 
-		if err := os.WriteFile("../../pkg/models/"+coll.CollectionName+".go", formated, 0o644); err != nil {
-			return fmt.Errorf("writing output: %w", err)
-		}
+		allModels = append(allModels, formated...)
+	}
+
+	if err := os.WriteFile("../../pkg/models/gen_models.go", allModels, 0o644); err != nil {
+		return fmt.Errorf("writing output: %w", err)
 	}
 
 	return nil

cmd/modelgen/model_struct.go.tmpl

@@ -1,14 +1,3 @@
-package models
-
-import (
-	"encoding/json"
-	"fmt"
-	"slices"
-	"strconv"
-	"strings"
-
-	"github.com/rs/zerolog/log"
-)
 
 type {{.GoName}} struct { {{range .Fields}}
 	{{.GoName}} {{.ValueType}} `json:"{{.FieldName}}"`{{end}}

pkg/datastore/subscribe.go

@@ -124,7 +124,6 @@ func (q *query[T, PT]) SubscribeOne(model PT) (*subscription[<-chan []string], e
 			}
 
 			for field, subQuery := range q.subquerys {
-				println(field)
 				update, err := q.recursiveUpdateSubqueries(model.GetRelatedModelsAccessor(), field, subQuery, update)
 				updatedAny = updatedAny || update
 				if err != nil {