Skip to content

Use cacheDir from CLI flags in loading of generator-settings.pkl #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
holzensp merged 1 commit into from
Jul 4, 2024
Merged

Use cacheDir from CLI flags in loading of generator-settings.pkl #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions cmd/pkl-gen-go/pkl-gen-go.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,19 @@ func findProjectDir(projectDirFlag string) string {

// Loads the settings for controlling codegen.
// Uses a Pkl evaluator that is separate from what's used for actually running codegen.
func loadGeneratorSettings(generatorSettingsPath string, projectDirFlag string) (*generatorsettings.GeneratorSettings, error) {
func loadGeneratorSettings(generatorSettingsPath string, projectDirFlag string, cacheDirFlag string) (*generatorsettings.GeneratorSettings, error) {
projectDir := findProjectDir(projectDirFlag)
var evaluator pkl.Evaluator
var err error
opts := func(opts *pkl.EvaluatorOptions) {
if cacheDirFlag != "" {
opts.CacheDir = cacheDirFlag
}
}
if projectDir != "" {
evaluator, err = pkl.NewProjectEvaluator(context.Background(), projectDir, pkl.PreconfiguredOptions)
evaluator, err = pkl.NewProjectEvaluator(context.Background(), projectDir, pkl.PreconfiguredOptions, opts)
} else {
evaluator, err = pkl.NewEvaluator(context.Background(), pkl.PreconfiguredOptions)
evaluator, err = pkl.NewEvaluator(context.Background(), pkl.PreconfiguredOptions, opts)
}
if err != nil {
panic(err)
Expand Down Expand Up @@ -258,7 +263,7 @@ func init() {
panic(err)
}
}
settings, err = loadGeneratorSettings(generatorSettingsPath, projectDir)
settings, err = loadGeneratorSettings(generatorSettingsPath, projectDir, cacheDir)
if err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkl/evaluator_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func NewProjectEvaluator(ctx context.Context, projectDir string, opts ...func(op
// because it lessens the overhead of each successive evaluator.
func NewProjectEvaluatorWithCommand(ctx context.Context, projectDir string, pklCmd []string, opts ...func(options *EvaluatorOptions)) (Evaluator, error) {
manager := NewEvaluatorManagerWithCommand(pklCmd)
projectEvaluator, err := manager.NewEvaluator(ctx, PreconfiguredOptions)
projectEvaluator, err := manager.NewEvaluator(ctx, opts...)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkl/evaluator_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (m *evaluatorManager) NewEvaluator(ctx context.Context, opts ...func(option
}

func (m *evaluatorManager) NewProjectEvaluator(ctx context.Context, projectDir string, opts ...func(options *EvaluatorOptions)) (Evaluator, error) {
projectEvaluator, err := NewEvaluator(ctx, PreconfiguredOptions)
projectEvaluator, err := NewEvaluator(ctx, opts...)
if err != nil {
return nil, err
}
Expand Down