Merge pull request #573 from samalba/fix-inputs-list

Fix inputs / outputs list

cmd/dagger/cmd/common/common.go

@@ -112,6 +112,10 @@ func FormatValue(val *compiler.Value) string {
 	if val.IsConcreteR() != nil {
 		return val.IncompleteKindString()
 	}
+	if val.IncompleteKindString() == "struct" {
+		return "struct"
+	}
+
 	// value representation in Cue
 	valStr := fmt.Sprintf("%v", val.Cue())
 	// escape \n

cmd/dagger/cmd/doc.go

@@ -149,7 +149,6 @@ func loadCode(packageName string) (*compiler.Value, error) {
 
 // printValuesText (text) formats an array of Values on stdout
 func printValuesText(iw io.Writer, libName string, values []*compiler.Value) {
-	fmt.Fprintf(iw, "\n%sInputs:\n", textPadding)
 	w := tabwriter.NewWriter(iw, 0, 4, len(textPadding), ' ', 0)
 	for _, i := range values {
 		docStr := terminalTrim(common.ValueDocString(i))
@@ -261,6 +260,7 @@ func PrintDoc(ctx context.Context, w io.Writer, packageName string, val *compile
 				fmt.Fprintf(w, "\n%sInputs: none\n", textPadding)
 				break
 			}
+			fmt.Fprintf(w, "\n%sInputs:\n", textPadding)
 			printValuesText(w, name, inp)
 		case markdownFormat:
 			fmt.Fprintf(w, "#### %s Inputs\n\n", mdEscape(name))
@@ -281,6 +281,7 @@ func PrintDoc(ctx context.Context, w io.Writer, packageName string, val *compile
 				fmt.Fprintf(w, "\n%sOutputs: none\n", textPadding)
 				break
 			}
+			fmt.Fprintf(w, "\n%sOutputs:\n", textPadding)
 			printValuesText(w, name, out)
 		case markdownFormat:
 			fmt.Fprintf(w, "#### %s Outputs\n\n", mdEscape(name))

stdlib/js/yarn/yarn.cue

@@ -17,16 +17,16 @@ import (
 
 	// Extra alpine packages to install
 	package: {
-		[string]: true | false | string @dagger(input)
-	}
+		[string]: true | false | string
+	} @dagger(input)
 
 	// working directory to use
 	cwd: *"." | string @dagger(input)
 
 	// Environment variables
 	env: {
-		[string]: string @dagger(input)
-	}
+		[string]: string
+	} @dagger(input)
 
 	// Write the contents of `environment` to this file,
 	// in the "envfile" format.