@robsun/create-keystone-app 0.2.11 → 0.2.13

package/template/apps/server/go.mod

@@ -4,7 +4,7 @@ go 1.24.3
 
 require (
 	github.com/gin-gonic/gin v1.11.0
-	github.com/robsuncn/keystone v0.2.0
+	github.com/robsuncn/keystone v0.2.1
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
 	github.com/swaggo/swag v1.16.2

package/template/apps/server/go.sum

@@ -146,8 +146,8 @@ github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00=
 github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
-github.com/robsuncn/keystone v0.2.0 h1:6h+u0fTYi33Uj6vsCHnj31LFX/CaWNXissdfUbpzomE=
-github.com/robsuncn/keystone v0.2.0/go.mod h1:qIpuWlWXmuwy+lEuyMDLy5FLzjRWki/oJ3nGO5jyIFc=
+github.com/robsuncn/keystone v0.2.1 h1:hFaSdhrGawevwRIOZzcXHF6q2tGymzapdSWr2SzHgU4=
+github.com/robsuncn/keystone v0.2.1/go.mod h1:qIpuWlWXmuwy+lEuyMDLy5FLzjRWki/oJ3nGO5jyIFc=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=

package/template/apps/server/internal/modules/example/api/handler/item_handler.go

@@ -1,165 +1,165 @@
-package handler
-
-import (
-	"errors"
-
-	"github.com/gin-gonic/gin"
-	hcommon "github.com/robsuncn/keystone/api/handler/common"
-	"github.com/robsuncn/keystone/api/response"
-	"github.com/robsuncn/keystone/infra/i18n"
-
-	examplei18n "__APP_NAME__/apps/server/internal/modules/example/i18n"
-	"__APP_NAME__/apps/server/internal/modules/example/domain/models"
-	"__APP_NAME__/apps/server/internal/modules/example/domain/service"
-)
-
-type ItemHandler struct {
-	items *service.ItemService
-}
-
-func NewItemHandler(items *service.ItemService) *ItemHandler {
-	if items == nil {
-		return nil
-	}
-	return &ItemHandler{items: items}
-}
-
-type itemInput struct {
-	Title       string            `json:"title"`
-	Description string            `json:"description"`
-	Status      models.ItemStatus `json:"status"`
-}
-
-type itemUpdateInput struct {
-	Title       *string            `json:"title"`
-	Description *string            `json:"description"`
-	Status      *models.ItemStatus `json:"status"`
-}
-
-const defaultTenantID uint = 1
-
-func (h *ItemHandler) List(c *gin.Context) {
-	if h == nil || h.items == nil {
-		response.ServiceUnavailableI18n(c, examplei18n.MsgServiceUnavailable)
-		return
-	}
-	tenantID := resolveTenantID(c)
-
-	items, err := h.items.List(c.Request.Context(), tenantID)
-	if err != nil {
-		response.InternalErrorI18n(c, examplei18n.MsgItemLoadFailed)
-		return
-	}
-
-	response.Success(c, gin.H{"items": items})
-}
-
-func (h *ItemHandler) Create(c *gin.Context) {
-	if h == nil || h.items == nil {
-		response.ServiceUnavailableI18n(c, examplei18n.MsgServiceUnavailable)
-		return
-	}
-	tenantID := resolveTenantID(c)
-
-	var input itemInput
-	if err := c.ShouldBindJSON(&input); err != nil {
-		response.BadRequestI18n(c, examplei18n.MsgInvalidPayload)
-		return
-	}
-
-	item, err := h.items.Create(c.Request.Context(), tenantID, service.ItemInput{
-		Title:       input.Title,
-		Description: input.Description,
-		Status:      input.Status,
-	})
-	if err != nil {
-		var i18nErr *i18n.I18nError
-		if errors.As(err, &i18nErr) {
-			response.BadRequestI18n(c, i18nErr.Key)
-			return
-		}
-		response.InternalErrorI18n(c, examplei18n.MsgItemCreateFailed)
-		return
-	}
-
-	response.CreatedI18n(c, examplei18n.MsgItemCreated, item)
-}
-
-func (h *ItemHandler) Update(c *gin.Context) {
-	if h == nil || h.items == nil {
-		response.ServiceUnavailableI18n(c, examplei18n.MsgServiceUnavailable)
-		return
-	}
-	tenantID := resolveTenantID(c)
-
-	id, err := hcommon.ParseUintParam(c, "id")
-	if err != nil || id == 0 {
-		response.BadRequestI18n(c, examplei18n.MsgInvalidID)
-		return
-	}
-
-	var input itemUpdateInput
-	if err := c.ShouldBindJSON(&input); err != nil {
-		response.BadRequestI18n(c, examplei18n.MsgInvalidPayload)
-		return
-	}
-
-	item, err := h.items.Update(c.Request.Context(), tenantID, id, service.ItemUpdateInput{
-		Title:       input.Title,
-		Description: input.Description,
-		Status:      input.Status,
-	})
-	if err != nil {
-		var i18nErr *i18n.I18nError
-		if errors.As(err, &i18nErr) {
-			if i18nErr.Key == examplei18n.MsgItemNotFound {
-				response.NotFoundI18n(c, i18nErr.Key)
-			} else {
-				response.BadRequestI18n(c, i18nErr.Key)
-			}
-			return
-		}
-		response.InternalErrorI18n(c, examplei18n.MsgItemUpdateFailed)
-		return
-	}
-
-	response.SuccessI18n(c, examplei18n.MsgItemUpdated, item)
-}
-
-func (h *ItemHandler) Delete(c *gin.Context) {
-	if h == nil || h.items == nil {
-		response.ServiceUnavailableI18n(c, examplei18n.MsgServiceUnavailable)
-		return
-	}
-	tenantID := resolveTenantID(c)
-
-	id, err := hcommon.ParseUintParam(c, "id")
-	if err != nil || id == 0 {
-		response.BadRequestI18n(c, examplei18n.MsgInvalidID)
-		return
-	}
-
-	if err := h.items.Delete(c.Request.Context(), tenantID, id); err != nil {
-		var i18nErr *i18n.I18nError
-		if errors.As(err, &i18nErr) {
-			if i18nErr.Key == examplei18n.MsgItemNotFound {
-				response.NotFoundI18n(c, i18nErr.Key)
-				return
-			}
-		}
-		response.InternalErrorI18n(c, examplei18n.MsgItemDeleteFailed)
-		return
-	}
-
-	response.SuccessI18n(c, examplei18n.MsgItemDeleted, gin.H{"id": id})
-}
-
-func resolveTenantID(c *gin.Context) uint {
-	if c == nil {
-		return defaultTenantID
-	}
-	if tenantID, ok := hcommon.GetTenantID(c); ok && tenantID > 0 {
-		return tenantID
-	}
-	return defaultTenantID
-}
+package handler
+
+import (
+	"errors"
+
+	"github.com/gin-gonic/gin"
+	hcommon "github.com/robsuncn/keystone/api/handler/common"
+	"github.com/robsuncn/keystone/api/response"
+	"github.com/robsuncn/keystone/infra/i18n"
+
+	examplei18n "__APP_NAME__/apps/server/internal/modules/example/i18n"
+	"__APP_NAME__/apps/server/internal/modules/example/domain/models"
+	"__APP_NAME__/apps/server/internal/modules/example/domain/service"
+)
+
+type ItemHandler struct {
+	items *service.ItemService
+}
+
+func NewItemHandler(items *service.ItemService) *ItemHandler {
+	if items == nil {
+		return nil
+	}
+	return &ItemHandler{items: items}
+}
+
+type itemInput struct {
+	Title       string            `json:"title"`
+	Description string            `json:"description"`
+	Status      models.ItemStatus `json:"status"`
+}
+
+type itemUpdateInput struct {
+	Title       *string            `json:"title"`
+	Description *string            `json:"description"`
+	Status      *models.ItemStatus `json:"status"`
+}
+
+const defaultTenantID uint = 1
+
+func (h *ItemHandler) List(c *gin.Context) {
+	if h == nil || h.items == nil {
+		response.ServiceUnavailableI18n(c, examplei18n.MsgServiceUnavailable)
+		return
+	}
+	tenantID := resolveTenantID(c)
+
+	items, err := h.items.List(c.Request.Context(), tenantID)
+	if err != nil {
+		response.InternalErrorI18n(c, examplei18n.MsgItemLoadFailed)
+		return
+	}
+
+	response.Success(c, gin.H{"items": items})
+}
+
+func (h *ItemHandler) Create(c *gin.Context) {
+	if h == nil || h.items == nil {
+		response.ServiceUnavailableI18n(c, examplei18n.MsgServiceUnavailable)
+		return
+	}
+	tenantID := resolveTenantID(c)
+
+	var input itemInput
+	if err := c.ShouldBindJSON(&input); err != nil {
+		response.BadRequestI18n(c, examplei18n.MsgInvalidPayload)
+		return
+	}
+
+	item, err := h.items.Create(c.Request.Context(), tenantID, service.ItemInput{
+		Title:       input.Title,
+		Description: input.Description,
+		Status:      input.Status,
+	})
+	if err != nil {
+		var i18nErr *i18n.I18nError
+		if errors.As(err, &i18nErr) {
+			response.BadRequestI18n(c, i18nErr.Key)
+			return
+		}
+		response.InternalErrorI18n(c, examplei18n.MsgItemCreateFailed)
+		return
+	}
+
+	response.CreatedI18n(c, examplei18n.MsgItemCreated, item)
+}
+
+func (h *ItemHandler) Update(c *gin.Context) {
+	if h == nil || h.items == nil {
+		response.ServiceUnavailableI18n(c, examplei18n.MsgServiceUnavailable)
+		return
+	}
+	tenantID := resolveTenantID(c)
+
+	id, err := hcommon.ParseUintParam(c, "id")
+	if err != nil || id == 0 {
+		response.BadRequestI18n(c, examplei18n.MsgInvalidID)
+		return
+	}
+
+	var input itemUpdateInput
+	if err := c.ShouldBindJSON(&input); err != nil {
+		response.BadRequestI18n(c, examplei18n.MsgInvalidPayload)
+		return
+	}
+
+	item, err := h.items.Update(c.Request.Context(), tenantID, id, service.ItemUpdateInput{
+		Title:       input.Title,
+		Description: input.Description,
+		Status:      input.Status,
+	})
+	if err != nil {
+		var i18nErr *i18n.I18nError
+		if errors.As(err, &i18nErr) {
+			if i18nErr.Key == examplei18n.MsgItemNotFound {
+				response.NotFoundI18n(c, i18nErr.Key)
+			} else {
+				response.BadRequestI18n(c, i18nErr.Key)
+			}
+			return
+		}
+		response.InternalErrorI18n(c, examplei18n.MsgItemUpdateFailed)
+		return
+	}
+
+	response.SuccessI18n(c, examplei18n.MsgItemUpdated, item)
+}
+
+func (h *ItemHandler) Delete(c *gin.Context) {
+	if h == nil || h.items == nil {
+		response.ServiceUnavailableI18n(c, examplei18n.MsgServiceUnavailable)
+		return
+	}
+	tenantID := resolveTenantID(c)
+
+	id, err := hcommon.ParseUintParam(c, "id")
+	if err != nil || id == 0 {
+		response.BadRequestI18n(c, examplei18n.MsgInvalidID)
+		return
+	}
+
+	if err := h.items.Delete(c.Request.Context(), tenantID, id); err != nil {
+		var i18nErr *i18n.I18nError
+		if errors.As(err, &i18nErr) {
+			if i18nErr.Key == examplei18n.MsgItemNotFound {
+				response.NotFoundI18n(c, i18nErr.Key)
+				return
+			}
+		}
+		response.InternalErrorI18n(c, examplei18n.MsgItemDeleteFailed)
+		return
+	}
+
+	response.SuccessI18n(c, examplei18n.MsgItemDeleted, gin.H{"id": id})
+}
+
+func resolveTenantID(c *gin.Context) uint {
+	if c == nil {
+		return defaultTenantID
+	}
+	if tenantID, ok := hcommon.GetTenantID(c); ok && tenantID > 0 {
+		return tenantID
+	}
+	return defaultTenantID
+}

package/template/apps/server/internal/modules/example/domain/service/errors.go

@@ -1,22 +1,22 @@
-package service
-
-import "errors"
-
-var (
-	ErrItemNotFound  = errors.New("item not found")
-	ErrTitleRequired = errors.New("title is required")
-	ErrStatusInvalid = errors.New("status is invalid")
-)
-
-// I18n version (uncomment when using keystone with i18n support):
-//
-// import (
-// 	"github.com/robsuncn/keystone/infra/i18n"
-// 	examplei18n "your-app/apps/server/internal/modules/example/i18n"
-// )
-//
-// var (
-// 	ErrItemNotFound  = &i18n.I18nError{Key: examplei18n.MsgItemNotFound}
-// 	ErrTitleRequired = &i18n.I18nError{Key: examplei18n.MsgTitleRequired}
-// 	ErrStatusInvalid = &i18n.I18nError{Key: examplei18n.MsgStatusInvalid}
-// )
+package service
+
+import "errors"
+
+var (
+	ErrItemNotFound  = errors.New("item not found")
+	ErrTitleRequired = errors.New("title is required")
+	ErrStatusInvalid = errors.New("status is invalid")
+)
+
+// I18n version (uncomment when using keystone with i18n support):
+//
+// import (
+// 	"github.com/robsuncn/keystone/infra/i18n"
+// 	examplei18n "your-app/apps/server/internal/modules/example/i18n"
+// )
+//
+// var (
+// 	ErrItemNotFound  = &i18n.I18nError{Key: examplei18n.MsgItemNotFound}
+// 	ErrTitleRequired = &i18n.I18nError{Key: examplei18n.MsgTitleRequired}
+// 	ErrStatusInvalid = &i18n.I18nError{Key: examplei18n.MsgStatusInvalid}
+// )

package/template/apps/server/internal/modules/example/module.go

@@ -1,97 +1,97 @@
-package example
-
-import (
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-
-	"github.com/robsuncn/keystone/domain/permissions"
-	"github.com/robsuncn/keystone/infra/jobs"
-
-	examplehandler "__APP_NAME__/apps/server/internal/modules/example/api/handler"
-	examplemigrations "__APP_NAME__/apps/server/internal/modules/example/bootstrap/migrations"
-	exampleseeds "__APP_NAME__/apps/server/internal/modules/example/bootstrap/seeds"
-	examplemodels "__APP_NAME__/apps/server/internal/modules/example/domain/models"
-	exampleservice "__APP_NAME__/apps/server/internal/modules/example/domain/service"
-	examplei18n "__APP_NAME__/apps/server/internal/modules/example/i18n"
-	examplerepository "__APP_NAME__/apps/server/internal/modules/example/infra/repository"
-)
-
-type Module struct {
-	items *exampleservice.ItemService
-}
-
-func NewModule() *Module {
-	return &Module{}
-}
-
-func (m *Module) Name() string {
-	return "example"
-}
-
-func (m *Module) RegisterRoutes(rg *gin.RouterGroup) {
-	if rg == nil || m == nil {
-		return
-	}
-	handler := examplehandler.NewItemHandler(m.items)
-	if handler == nil {
-		return
-	}
-	group := rg.Group("/example")
-	group.GET("/items", handler.List)
-	group.POST("/items", handler.Create)
-	group.PATCH("/items/:id", handler.Update)
-	group.DELETE("/items/:id", handler.Delete)
-}
-
-func (m *Module) RegisterModels() []interface{} {
-	return []interface{}{&examplemodels.ExampleItem{}}
-}
-
-func (m *Module) RegisterPermissions(reg *permissions.Registry) error {
-	if reg == nil {
-		return nil
-	}
-	// Use NameKey for i18n support
-	if err := reg.CreateMenuI18n("example:item", "Example Items", "permission.example.item", "example", 10); err != nil {
-		return err
-	}
-	if err := reg.CreateActionI18n("example:item:view", "View Items", "permission.example.item.view", "example", "example:item"); err != nil {
-		return err
-	}
-	if err := reg.CreateActionI18n("example:item:manage", "Manage Items", "permission.example.item.manage", "example", "example:item"); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *Module) RegisterI18n() error {
-	return examplei18n.RegisterLocales()
-}
-
-func (m *Module) RegisterJobs(_ *jobs.Registry) error {
-	return nil
-}
-
-func (m *Module) Migrate(db *gorm.DB) error {
-	if db == nil {
-		return nil
-	}
-	m.ensureServices(db)
-	return examplemigrations.Migrate(db)
-}
-
-func (m *Module) Seed(db *gorm.DB) error {
-	if db == nil {
-		return nil
-	}
-	m.ensureServices(db)
-	return exampleseeds.Seed(db)
-}
-
-func (m *Module) ensureServices(db *gorm.DB) {
-	if m == nil || db == nil || m.items != nil {
-		return
-	}
-	repo := examplerepository.NewItemRepository(db)
-	m.items = exampleservice.NewItemService(repo)
-}
+package example
+
+import (
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+
+	"github.com/robsuncn/keystone/domain/permissions"
+	"github.com/robsuncn/keystone/infra/jobs"
+
+	examplehandler "__APP_NAME__/apps/server/internal/modules/example/api/handler"
+	examplemigrations "__APP_NAME__/apps/server/internal/modules/example/bootstrap/migrations"
+	exampleseeds "__APP_NAME__/apps/server/internal/modules/example/bootstrap/seeds"
+	examplemodels "__APP_NAME__/apps/server/internal/modules/example/domain/models"
+	exampleservice "__APP_NAME__/apps/server/internal/modules/example/domain/service"
+	examplei18n "__APP_NAME__/apps/server/internal/modules/example/i18n"
+	examplerepository "__APP_NAME__/apps/server/internal/modules/example/infra/repository"
+)
+
+type Module struct {
+	items *exampleservice.ItemService
+}
+
+func NewModule() *Module {
+	return &Module{}
+}
+
+func (m *Module) Name() string {
+	return "example"
+}
+
+func (m *Module) RegisterRoutes(rg *gin.RouterGroup) {
+	if rg == nil || m == nil {
+		return
+	}
+	handler := examplehandler.NewItemHandler(m.items)
+	if handler == nil {
+		return
+	}
+	group := rg.Group("/example")
+	group.GET("/items", handler.List)
+	group.POST("/items", handler.Create)
+	group.PATCH("/items/:id", handler.Update)
+	group.DELETE("/items/:id", handler.Delete)
+}
+
+func (m *Module) RegisterModels() []interface{} {
+	return []interface{}{&examplemodels.ExampleItem{}}
+}
+
+func (m *Module) RegisterPermissions(reg *permissions.Registry) error {
+	if reg == nil {
+		return nil
+	}
+	// Use NameKey for i18n support
+	if err := reg.CreateMenuI18n("example:item", "Example Items", "permission.example.item", "example", 10); err != nil {
+		return err
+	}
+	if err := reg.CreateActionI18n("example:item:view", "View Items", "permission.example.item.view", "example", "example:item"); err != nil {
+		return err
+	}
+	if err := reg.CreateActionI18n("example:item:manage", "Manage Items", "permission.example.item.manage", "example", "example:item"); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (m *Module) RegisterI18n() error {
+	return examplei18n.RegisterLocales()
+}
+
+func (m *Module) RegisterJobs(_ *jobs.Registry) error {
+	return nil
+}
+
+func (m *Module) Migrate(db *gorm.DB) error {
+	if db == nil {
+		return nil
+	}
+	m.ensureServices(db)
+	return examplemigrations.Migrate(db)
+}
+
+func (m *Module) Seed(db *gorm.DB) error {
+	if db == nil {
+		return nil
+	}
+	m.ensureServices(db)
+	return exampleseeds.Seed(db)
+}
+
+func (m *Module) ensureServices(db *gorm.DB) {
+	if m == nil || db == nil || m.items != nil {
+		return
+	}
+	repo := examplerepository.NewItemRepository(db)
+	m.items = exampleservice.NewItemService(repo)
+}