bugfix: gen: file/shadow removal, mod: undo symlinks / error in dirha…

…sh calc
hofstadter-io · Oct 29, 2020 · b8b7317 · b8b7317
1 parent e912d9a
commit b8b7317
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/gen/file.go b/lib/gen/file.go
@@ -226,7 +226,7 @@ func (F *File) RenderTemplate() error {
 
 	err = F.FormatRendered()
 	if err != nil {
-		fmt.Println("---- Rendering error for", F.TemplateName, F.Filepath)
+		fmt.Printf("---- Rendering error for template: %q output: %q content:\n", F.TemplateName, F.Filepath)
 		fmt.Println(string(F.RenderContent))
 		fmt.Println("----")
 		return err

diff --git a/lib/mod/langs/cue.go b/lib/mod/langs/cue.go
@@ -8,7 +8,7 @@ cue: {
 	SumFile:     string | * "cue.sums"
 	ModsDir:     string | * "cue.mod/pkg"
 	MappingFile: string | * "cue.mod/modules.txt"
-	SymlinkLocalReplaces: bool | *true,
+	SymlinkLocalReplaces?: bool,
 	InitTemplates: {...} | *{
 		"cue.mod/module.cue": """
 		module: "{{ .Module }}"

diff --git a/lib/runtime.go b/lib/runtime.go
@@ -223,9 +223,9 @@ func (R *Runtime) RunGenerators() []error {
 			errs = append(errs, errsG...)
 			continue
 		}
-
 	}
 
+
 	return errs
 }
 
@@ -338,23 +338,28 @@ func (R *Runtime) WriteOutput() []error {
 		// Cleanup File & Shadow
 		// fmt.Println("Clean Shadow", G.Name)
 		for f, _ := range G.Shadow {
-			// fmt.Println("  -", G.Name, f, strings.TrimPrefix(f, G.Name + "/"))
-			err := os.Remove(f)
+			genFilename := strings.TrimPrefix(f, G.Name + "/")
+			shadowFilename := path.Join(gen.SHADOW_DIR, f)
+			fmt.Println("  -", G.Name, f, genFilename, shadowFilename)
+
+			err := os.Remove(genFilename)
 			if err != nil {
 				if strings.Contains(err.Error(), "no such file or directory") {
 					continue
 				}
 				errs = append(errs, err)
 				continue
 			}
-			err = os.Remove(path.Join(gen.SHADOW_DIR, f))
+
+			err = os.Remove(shadowFilename)
 			if err != nil {
 				if strings.Contains(err.Error(), "no such file or directory") {
 					continue
 				}
 				errs = append(errs, err)
 				continue
 			}
+
 			G.Stats.NumDeleted += 1
 		}
 
@@ -363,6 +368,7 @@ func (R *Runtime) WriteOutput() []error {
 
 	}
 
+	// TODO, remove this? do we even have global shadow files? The section to load them is commented out
 	// Clean global shadow, incase any generators were removed
 	for f, _ := range R.Shadow {
 		// deal with leading shadow dir name?