Make ... optional in YAML output

Author: sparkprime

doc/ref/stdlib.html

@@ -1112,11 +1112,12 @@ <h4 id="manifestYamlDoc">std.manifestYamlDoc(value)</h4>
       </p>
 
       <pre>std.manifestYamlDoc(
-{
+  {
     x: [1, 2, 3, true, false, null,
         "string\nstring\n"],
     y: { a: 1, b: 2, c: [1, 2] },
-})</pre>
+  },
+  indent_array_in_object=false)</pre>
 
       <p>Yields a string containing this YAML:</p>
 
@@ -1136,6 +1137,10 @@ <h4 id="manifestYamlDoc">std.manifestYamlDoc(value)</h4>
   "c": 
     - 1
     - 2</pre>
+
+      <p>The <code>indent_array_in_object</code> param adds additional indentation which some people
+      may find easier to read.</p>
+
     </div>
     <div style="clear: both"></div>
   </div>
@@ -1156,10 +1161,13 @@ <h4 id="manifestYamlStream">std.manifestYamlStream(value)</h4>
     <div class="panel">
       <p>
         Given an array of values, emit a YAML "stream", which is a sequence of documents separated
-        by <code>---</code>.
+        by <code>---</code> and ending with <code>...</code>.
       </p>
 
-      <code>std.manifestYamlStream(['a', 1, []])</code>
+      <pre>std.manifestYamlStream(
+  ['a', 1, []],
+  indent_array_in_object=false,
+  c_document_end=true)</pre>
 
       <p>Yields this string:</p>
 
@@ -1170,6 +1178,9 @@ <h4 id="manifestYamlStream">std.manifestYamlStream(value)</h4>
 ---
 []
 ...</pre>
+
+      <p>The <code>indent_array_in_object</code> param is the same as in <code>manifestYamlDoc</code>.</p>
+      <p>The <code>c_document_end</code> param adds the optional terminating <code>...</code>.</p>
     </div>
     <div style="clear: both"></div>
   </div>

stdlib/std.jsonnet

@@ -1004,13 +1004,13 @@ limitations under the License.
           std.join('\n' + cindent, lines);
     aux(value, [], ''),
 
-  manifestYamlStream(value, indent_array_in_object=false)::
+  manifestYamlStream(value, indent_array_in_object=false, c_document_end=true)::
     if std.type(value) != 'array' then
       error 'manifestYamlStream only takes arrays, got ' + std.type(value)
     else
       '---\n' + std.join(
         '\n---\n', [std.manifestYamlDoc(e, indent_array_in_object) for e in value]
-      ) + '\n...\n',
+      ) + if c_document_end then '\n...\n' else '\n',
 
 
   manifestPython(o)::
@@ -1134,7 +1134,7 @@ limitations under the License.
 
   // Merge-sort for long arrays and naive quicksort for shorter ones
   sort(arr, keyF=id)::
-    local quickSort(arr, keyF=id) = 
+    local quickSort(arr, keyF=id) =
       local l = std.length(arr);
       if std.length(arr) <= 1 then
         arr
@@ -1148,23 +1148,23 @@ limitations under the License.
 
     local merge(a, b) =
       local la = std.length(a), lb = std.length(b);
-      local aux(i, j, prefix) = 
-      if i == la then
-        prefix + b[j:]
-      else if j == lb then
-        prefix + a[i:]
-      else
-        if keyF(a[i]) <= keyF(b[j]) then
-          aux(i + 1, j, prefix + [a[i]]) tailstrict
+      local aux(i, j, prefix) =
+        if i == la then
+          prefix + b[j:]
+        else if j == lb then
+          prefix + a[i:]
         else
-          aux(i, j + 1, prefix + [b[j]]) tailstrict;
+          if keyF(a[i]) <= keyF(b[j]) then
+            aux(i + 1, j, prefix + [a[i]]) tailstrict
+          else
+            aux(i, j + 1, prefix + [b[j]]) tailstrict;
       aux(0, 0, []);
 
     local l = std.length(arr);
     if std.length(arr) <= 30 then
       quickSort(arr, keyF=keyF)
     else
-      local mid = std.floor(l/ 2);
+      local mid = std.floor(l / 2);
       local left = arr[:mid], right = arr[mid:];
       merge(std.sort(left, keyF=keyF), std.sort(right, keyF=keyF)),
 

test_suite/stdlib.jsonnet

@@ -822,6 +822,20 @@ std.assertEqual(
   |||
 ) &&
 
+std.assertEqual(
+  std.manifestYamlStream([{}, [], 3, '"'], c_document_end=false),
+  |||
+    ---
+    {}
+    ---
+    []
+    ---
+    3
+    ---
+    "\""
+  |||
+) &&
+
 std.assertEqual(std.parseInt('01234567890'), 1234567890) &&
 std.assertEqual(std.parseInt('-01234567890'), -1234567890) &&
 std.assertEqual(std.parseOctal('755'), 493) &&