expand Change description structure

Author: petar

form/form.go

@@ -11,6 +11,10 @@ import (
 
 type Form interface{}
 
+type Forms []Form
+
+type Map = map[string]Form
+
 type None struct{}
 
 func SprintJSON(form Form) string {

git/change.go

@@ -2,9 +2,32 @@ package git
 
 import "github.com/gov4git/lib4git/form"
 
-type Change[R any] struct {
-	Result R
-	Msg    string //commit msg
+type Change[Q any, R any] struct {
+	Msg    string     `json:"msg"`
+	Fn     string     `json:"fn"`
+	Query  Q          `json:"query"`
+	Result R          `json:"result"`
+	Steps  form.Forms `json:"steps"`
 }
 
-type ChangeNoResult = Change[form.None]
+func NewChange[Q any, R any](
+	msg string,
+	fn string,
+	query Q,
+	result R,
+	steps form.Forms,
+) Change[Q, R] {
+	return Change[Q, R]{
+		Msg:    msg,
+		Fn:     fn,
+		Query:  query,
+		Result: result,
+		Steps:  steps,
+	}
+}
+
+type ChangeNoResult = Change[form.None, form.None]
+
+func NewChangeNoResult(msg string, fn string) ChangeNoResult {
+	return NewChange(msg, fn, form.None{}, form.None{}, nil)
+}

id/init.go

@@ -3,14 +3,15 @@ package id
 import (
 	"context"
 
+	"github.com/gov4git/lib4git/form"
 	"github.com/gov4git/lib4git/git"
 	"github.com/gov4git/lib4git/must"
 )
 
 func Init(
 	ctx context.Context,
 	ownerAddr OwnerAddress,
-) git.Change[PrivateCredentials] {
+) git.Change[form.None, PrivateCredentials] {
 	ownerCloned := CloneOwner(ctx, ownerAddr)
 	privChg := InitLocal(ctx, ownerAddr, ownerCloned)
 
@@ -23,7 +24,7 @@ func InitLocal(
 	ctx context.Context,
 	ownerAddr OwnerAddress,
 	ownerCloned OwnerCloned,
-) git.Change[PrivateCredentials] {
+) git.Change[form.None, PrivateCredentials] {
 
 	privChg := initPrivateStageOnly(ctx, ownerCloned.Private.Tree(), ownerAddr)
 	pubChg := initPublicStageOnly(ctx, ownerCloned.Public.Tree(), privChg.Result.PublicCredentials)
@@ -32,25 +33,26 @@ func InitLocal(
 	return privChg
 }
 
-func initPrivateStageOnly(ctx context.Context, priv *git.Tree, ownerAddr OwnerAddress) git.Change[PrivateCredentials] {
+func initPrivateStageOnly(ctx context.Context, priv *git.Tree, ownerAddr OwnerAddress) git.Change[form.None, PrivateCredentials] {
 	if _, err := priv.Filesystem.Stat(PrivateCredentialsNS.Path()); err == nil {
 		must.Errorf(ctx, "private credentials file already exists")
 	}
 	cred, err := GenerateCredentials()
 	must.NoError(ctx, err)
 	git.ToFileStage(ctx, priv, PrivateCredentialsNS.Path(), cred)
-	return git.Change[PrivateCredentials]{
-		Result: cred,
-		Msg:    "Initialized private credentials.",
-	}
+	return git.NewChange(
+		"Initialized private credentials.",
+		"id_init_private",
+		form.None{},
+		cred,
+		nil,
+	)
 }
 
 func initPublicStageOnly(ctx context.Context, pub *git.Tree, cred PublicCredentials) git.ChangeNoResult {
 	if _, err := pub.Filesystem.Stat(PublicCredentialsNS.Path()); err == nil {
 		must.Errorf(ctx, "public credentials file already exists")
 	}
 	git.ToFileStage(ctx, pub, PublicCredentialsNS.Path(), cred)
-	return git.ChangeNoResult{
-		Msg: "Initialized public credentials.",
-	}
+	return git.NewChangeNoResult("Initialized public credentials.", "id_init_public")
 }