diff --git a/internal/jennies/golang/rawtypes.go b/internal/jennies/golang/rawtypes.go index b02d8d0be..4096f6b37 100644 --- a/internal/jennies/golang/rawtypes.go +++ b/internal/jennies/golang/rawtypes.go @@ -29,8 +29,6 @@ func (jenny RawTypes) JennyName() string { func (jenny RawTypes) Generate(context languages.Context) (codejen.Files, error) { files := make(codejen.Files, 0, len(context.Schemas)) - jenny.tmpl = jenny.tmpl.Funcs(common.TypeResolvingTemplateHelpers(context)) - for _, schema := range context.Schemas { output, err := jenny.generateSchema(context, schema) if err != nil { @@ -60,6 +58,16 @@ func (jenny RawTypes) generateSchema(context languages.Context, schema *ast.Sche return imports.Add(pkg, jenny.config.importPath(pkg)) } + + jenny.tmpl = jenny.tmpl. + Funcs(common.TypeResolvingTemplateHelpers(context)). + Funcs(map[string]any{ + "importPkg": jenny.packageMapper, + "importStdPkg": func(pkg string) string { + return imports.Add(pkg, pkg) + }, + }) + jenny.typeFormatter = defaultTypeFormatter(jenny.config, context, imports, jenny.packageMapper) unmarshallerGenerator := newJSONMarshalling(jenny.config, jenny.tmpl, imports, jenny.packageMapper, jenny.typeFormatter, jenny.apiRefCollector) strictUnmarshallerGenerator := newStrictJSONUnmarshal(jenny.config, jenny.tmpl, imports, jenny.packageMapper, jenny.typeFormatter, jenny.apiRefCollector)