From 0e56c3534ad94264c18c8c1d3b2ae4332ee92912 Mon Sep 17 00:00:00 2001 From: gogacoder Date: Sun, 16 Mar 2025 21:03:40 +0700 Subject: [PATCH] fix: module path --- generation/scheme.go | 20 ++++++++------------ generation/service.go | 2 -- generation/templates/scheme.tmpl | 2 +- generation/templates/service.tmpl | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/generation/scheme.go b/generation/scheme.go index 2ff017c..8065227 100644 --- a/generation/scheme.go +++ b/generation/scheme.go @@ -15,8 +15,6 @@ import ( //go:embed templates/scheme.tmpl var SchemeTemplate string -const GolangServicesPath = "../../bindings/app/internal/services" - type Dependency struct { ImportName string ServiceName string @@ -25,20 +23,18 @@ type Dependency struct { } type TemplateData struct { - StructName string - LowerName string - GolangServicesPath string - Fields []model.Field - Dependencies []Dependency + StructName string + LowerName string + Fields []model.Field + Dependencies []Dependency } func GenerateScheme(model *model.Model, mkPath string) { data := TemplateData{ - StructName: model.Name, - LowerName: strings.ToLower(model.Name), - GolangServicesPath: GolangServicesPath, - Fields: model.Fields, - Dependencies: processDependencies(model.Fields), + StructName: model.Name, + LowerName: strings.ToLower(model.Name), + Fields: model.Fields, + Dependencies: processDependencies(model.Fields), } schemeFilename := strings.ToUpper(model.Name[:1]) + strings.ToLower(model.Name[1:]) + "Scheme.vue" diff --git a/generation/service.go b/generation/service.go index 2a4c414..d1202a0 100644 --- a/generation/service.go +++ b/generation/service.go @@ -18,7 +18,6 @@ var ServiceTemplate string type ServiceTemplateContext struct { LowerModelName string ModelName string - ServicesPath string } func GenerateService(model *model.Model, mkPath string) { @@ -38,7 +37,6 @@ func GenerateService(model *model.Model, mkPath string) { context := ServiceTemplateContext{ LowerModelName: strings.ToLower(model.Name), ModelName: model.Name, - ServicesPath: GolangServicesPath, } serviceTemplate, err := template.New("service").Parse(ServiceTemplate) diff --git a/generation/templates/scheme.tmpl b/generation/templates/scheme.tmpl index 9249ba7..927f118 100644 --- a/generation/templates/scheme.tmpl +++ b/generation/templates/scheme.tmpl @@ -4,7 +4,7 @@ import { onMounted, reactive } from 'vue' import { getDefaultValues } from '../utils/structs/defaults.util' import Service from './{{.LowerName}}.service' import type { Scheme } from '../types/scheme.type' -import { {{.StructName}} } from '{{.GolangServicesPath}}' +import { {{.StructName}} } from '../../bindings/github.com/kuzgoga/nto-boilerplate/internal/services' import { ref } from 'vue' import type { Validate } from "../types/validate.type"; import { getDefaultSortOptions } from "../utils/structs/default-sort-options.util"; diff --git a/generation/templates/service.tmpl b/generation/templates/service.tmpl index 96ab790..ed4680b 100644 --- a/generation/templates/service.tmpl +++ b/generation/templates/service.tmpl @@ -1,5 +1,5 @@ -import { GetAll, Create, Delete, GetById, Update, Count, SortedByOrder, SearchByAllTextFields } from "../../bindings/app/internal/services/{{.LowerModelName}}service" -import type { {{.ModelName}} } from "{{.ServicesPath}}" +import { GetAll, Create, Delete, GetById, Update, Count, SortedByOrder, SearchByAllTextFields } from "../../bindings/github.com/kuzgoga/nto-boilerplate/internal/services/{{.LowerModelName}}service" +import type { {{.ModelName}} } from "../../bindings/github.com/kuzgoga/nto-boilerplate/internal/services" import type { IService } from "../types/service.type" import type { SortOptions } from "../types/sort-options.type";