Change object types to be non-pointers during codegen

.gitignore

@@ -14,3 +14,4 @@ build/
 .out
 .cicd/
 test-results/
+.pkl-lsp

cmd/internal/gen-snippets/gen-snippets.go

@@ -55,7 +55,12 @@ func makeGoCode(evaluator pkl.Evaluator, snippetsDir string) {
 		panic(err)
 	}
 	codegenDir := filepath.Join(snippetsDir, "..")
-	settings, err := generatorsettings.LoadFromPath(context.Background(), "codegen/snippet-tests/generator-settings.pkl")
+
+	_, filename, _, ok := runtime.Caller(0)
+	if !ok {
+		panic("Can't find runtime caller")
+	}
+	settings, err := generatorsettings.LoadFromPath(context.Background(), filepath.Join(filename, "../../../../codegen/snippet-tests/generator-settings.pkl"))
 	if err != nil {
 		panic(err)
 	}
@@ -72,6 +77,7 @@ func makeGoCode(evaluator pkl.Evaluator, snippetsDir string) {
 			basename := strings.TrimSuffix(filepath.Base(file.Name()), ".pkl")
 			errContents := strings.ReplaceAll(err.Error(), codegenDir, "<codegen_dir>")
 			errContents = stripLineNumbers(errContents)
+			os.MkdirAll(outputDir, os.ModePerm)
 			if err = os.WriteFile(filepath.Join(outputDir, basename), []byte(errContents), 0o666); err != nil {
 				panic(err)
 			}

cmd/pkl-gen-go/pkg/generate.go

@@ -43,7 +43,7 @@ var (
 )
 
 type TemplateValues struct {
-	*generatorsettings.GeneratorSettings
+	generatorsettings.GeneratorSettings
 	PklModulePath string
 }
 
@@ -78,7 +78,7 @@ func doFormat(src string) ([]byte, string, error) {
 	return formatted, cmp.Diff(src, strFormatted), nil
 }
 
-func generateDryRun(evaluator pkl.Evaluator, tmpFile *os.File, outputPath string, settings *generatorsettings.GeneratorSettings) error {
+func generateDryRun(evaluator pkl.Evaluator, tmpFile *os.File, outputPath string, settings generatorsettings.GeneratorSettings) error {
 	var filenames []string
 	err := evaluator.EvaluateExpression(context.Background(), pkl.FileSource(tmpFile.Name()), "output.files.toMap().keys.toList()", &filenames)
 	if err != nil {
@@ -105,7 +105,7 @@ func log(format string, a ...any) {
 func GenerateGo(
 	evaluator pkl.Evaluator,
 	pklModulePath string,
-	settings *generatorsettings.GeneratorSettings,
+	settings generatorsettings.GeneratorSettings,
 	silent bool,
 	outputPath string,
 ) error {
@@ -124,7 +124,7 @@ func GenerateGo(
 		}
 		log("Using custom generator script: \033[36m%s\033[0m\n", settings.GeneratorScriptPath)
 	}
-	if err = determineBasePath(settings); err != nil {
+	if err = determineBasePath(&settings); err != nil {
 		return err
 	}
 	tmpFile, err := os.CreateTemp(os.TempDir(), "pkl-gen-go.*.pkl")

cmd/pkl-gen-go/pkl-gen-go.go

@@ -121,7 +121,7 @@ func evaluatorOptions(opts *pkl.EvaluatorOptions) {
 }
 
 var (
-	settings         *generatorsettings.GeneratorSettings
+	settings         generatorsettings.GeneratorSettings
 	suppressWarnings bool
 	outputPath       string
 	printVersion     bool
@@ -189,7 +189,7 @@ 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, cacheDirFlag 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
@@ -216,7 +216,7 @@ func loadGeneratorSettings(generatorSettingsPath string, projectDirFlag string,
 	}
 	s, err := generatorsettings.Load(context.Background(), evaluator, source)
 	if err != nil {
-		return nil, err
+		return s, err
 	}
 	settingsFilePath := path.Dir(source.Uri.Path)
 	if s.ProjectDir != nil && !path.IsAbs(*s.ProjectDir) {

codegen/snippet-tests/input/CyclicModule.pkl

@@ -25,5 +25,5 @@ class Cyclic {
 
   b: Int
 
-  myself: Cyclic
+  myself: Cyclic?
 }

codegen/snippet-tests/input/ModuleType.pkl

@@ -21,10 +21,10 @@ import ".../src/go.pkl"
 
 myStr: String
 
-foo: module
+foo: module?
 
 lib: lib4.MyLib4
 
-fooAgain: Myself
+fooAgain: Myself?
 
 typealias Myself = module