Release 0.17.0

google · Nov 22, 2020 · ed11b01 · ed11b01
1 parent 2e3df82
commit ed11b01
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 20 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -15,7 +15,7 @@ add_dependencies(libjsonnet++ jsonnet)
 # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without
 # this step the output would be |liblibjsonnet|.
 set_target_properties(libjsonnet++ PROPERTIES OUTPUT_NAME jsonnet++
-	VERSION     "0.16.0"
+	VERSION     "0.17.0"
 	SOVERSION   "0"
 	PUBLIC_HEADER "${LIB_HEADER}")
 install(TARGETS libjsonnet++

diff --git a/doc/_stdlib_gen/stdlib-content.jsonnet b/doc/_stdlib_gen/stdlib-content.jsonnet
@@ -83,6 +83,7 @@ local html = import 'html.libsonnet';
         {
           name: 'objectValues',
           params: ['o'],
+          availableSince: '0.17.0',
           description: |||
             Returns an array of the values in the given object. Does not include hidden fields.
           |||,
@@ -104,6 +105,7 @@ local html = import 'html.libsonnet';
         {
           name: 'objectValuesAll',
           params: ['o'],
+          availableSince: '0.17.0',
           description: |||
             As <code>std.objectValues</code> but also includes hidden fields.
           |||,
@@ -944,10 +946,17 @@ local html = import 'html.libsonnet';
         {
           name: 'flatMap',
           params: ['func', 'arr'],
-          description: |||
-            Apply the given function to every element of the array to form a new array then flatten the result.
-            It can be thought of as a generalized map, where each element can get mapped to 0, 1 or more elements.
-          |||,
+          description: html.paragraphs([
+            |||
+              Apply the given function to every element of <code>arr</code> to form a new array then flatten the result.
+              The argument <code>arr</code> must be an array or a string. If <code>arr</code> is an array, function <code>func</code> must return an array.
+              If <code>arr</code> is a string, function <code>func</code> must return an string.
+            |||,
+            |||
+              The <code>std.flatMap</code> function can be thought of as a generalized <code>std.map</code>,
+              with each element mapped to 0, 1 or more elements.
+            |||
+          ]),
           examples: [
             {
               input: 'std.flatMap(function(x) [x, x], [1, 2, 3])',
@@ -961,6 +970,10 @@ local html = import 'html.libsonnet';
               input: 'std.flatMap(function(x) if x == 2 then [] else [x * 3, x * 2], [1, 2, 3])',
               output: std.flatMap(function(x) if x == 2 then [] else [x * 3, x * 2], [1, 2, 3]),
             },
+            {
+              input: 'std.flatMap(function(x) x+x, "foo")',
+              output: std.flatMap(function(x) x+x, "foo")
+            },
           ],
         },
         {

diff --git a/doc/ref/stdlib.html b/doc/ref/stdlib.html
@@ -217,6 +217,11 @@ <h4 id="objectValues">
 <div class="hgroup">
   <div class="hgroup-inline">
     <div class="panel">
+      <p>
+        <em>
+          Available since version 0.17.0.
+        </em>
+      </p>
       <p>
         Returns an array of the values in the given object. Does not include hidden fields.
       </p>
@@ -283,6 +288,11 @@ <h4 id="objectValuesAll">
 <div class="hgroup">
   <div class="hgroup-inline">
     <div class="panel">
+      <p>
+        <em>
+          Available since version 0.17.0.
+        </em>
+      </p>
       <p>
         As <code>std.objectValues</code> but also includes hidden fields.
       </p>
@@ -1733,8 +1743,13 @@ <h4 id="flatMap">
   <div class="hgroup-inline">
     <div class="panel">
       <p>
-        Apply the given function to every element of the array to form a new array then flatten the result.
-        It can be thought of as a generalized map, where each element can get mapped to 0, 1 or more elements.
+        Apply the given function to every element of <code>arr</code> to form a new array then flatten the result.
+        The argument <code>arr</code> must be an array or a string. If <code>arr</code> is an array, function <code>func</code> must return an array.
+        If <code>arr</code> is a string, function <code>func</code> must return an string.
+      </p>
+      <p>
+        The <code>std.flatMap</code> function can be thought of as generalized map,
+        where each element is mapped to 0, 1 or more elements.
       </p>
       <p>
         Example: <code>std.flatMap(function(x) [x, x], [1, 2, 3])</code> yields <code>[ 1, 1, 2, 2, 3, 3 ]</code>.
@@ -1745,6 +1760,9 @@ <h4 id="flatMap">
       <p>
         Example: <code>std.flatMap(function(x) if x == 2 then [] else [x * 3, x * 2], [1, 2, 3])</code> yields <code>[ 3, 2, 9, 6 ]</code>.
       </p>
+      <p>
+        Example: <code>std.flatMap(function(x) x+x, "foo")</code> yields <code>"ffoooo"</code>.
+      </p>
     </div>
     <div style="clear: both"></div>
   </div>

diff --git a/include/libjsonnet.h b/include/libjsonnet.h
@@ -31,7 +31,7 @@ limitations under the License.
  *
  * If this isn't the sae as jsonnet_version() then you've got a mismatched binary / header.
  */
-#define LIB_JSONNET_VERSION "v0.16.0"
+#define LIB_JSONNET_VERSION "v0.17.0"
 
 /** Return the version string of the Jsonnet interpreter.  Conforms to semantic versioning
  * http://semver.org/ If this does not match LIB_JSONNET_VERSION then there is a mismatch between

diff --git a/test_cmd/fmt_help.golden.stdout b/test_cmd/fmt_help.golden.stdout
@@ -1,4 +1,4 @@
-Jsonnet reformatter v0.16.0
+Jsonnet reformatter v0.17.0
 
 jsonnetfmt {<option>} { <filename> }
 

diff --git a/test_cmd/fmt_help.golden.stdout.golang b/test_cmd/fmt_help.golden.stdout.golang
@@ -1,4 +1,4 @@
-Jsonnet reformatter v0.16.0
+Jsonnet reformatter v0.17.0
 
 jsonnetfmt {<option>} { <filename> }
 

diff --git a/test_cmd/fmt_no_args.golden.stderr b/test_cmd/fmt_no_args.golden.stderr
@@ -1,6 +1,6 @@
 ERROR: must give filename
 
-Jsonnet reformatter v0.16.0
+Jsonnet reformatter v0.17.0
 
 jsonnetfmt {<option>} { <filename> }
 

diff --git a/test_cmd/fmt_no_args.golden.stderr.golang b/test_cmd/fmt_no_args.golden.stderr.golang
@@ -1,6 +1,6 @@
 ERROR: must give filename
 
-Jsonnet reformatter v0.16.0
+Jsonnet reformatter v0.17.0
 
 jsonnetfmt {<option>} { <filename> }
 

diff --git a/test_cmd/fmt_version1.golden.stdout b/test_cmd/fmt_version1.golden.stdout
@@ -1 +1 @@
-Jsonnet reformatter v0.16.0
+Jsonnet reformatter v0.17.0
diff --git a/test_cmd/fmt_version2.golden.stdout b/test_cmd/fmt_version2.golden.stdout
@@ -1 +1 @@
-Jsonnet reformatter v0.16.0
+Jsonnet reformatter v0.17.0
diff --git a/test_cmd/help.golden.stdout.cpp b/test_cmd/help.golden.stdout.cpp
@@ -1,4 +1,4 @@
-Jsonnet commandline interpreter v0.16.0
+Jsonnet commandline interpreter v0.17.0
 
 jsonnet {<option>} <filename>
 

diff --git a/test_cmd/help.golden.stdout.golang b/test_cmd/help.golden.stdout.golang
@@ -1,4 +1,4 @@
-Jsonnet commandline interpreter v0.16.0
+Jsonnet commandline interpreter v0.17.0
 
 jsonnet {<option>} <filename>
 

diff --git a/test_cmd/no_args.golden.stderr.cpp b/test_cmd/no_args.golden.stderr.cpp
@@ -1,6 +1,6 @@
 ERROR: must give filename
 
-Jsonnet commandline interpreter v0.16.0
+Jsonnet commandline interpreter v0.17.0
 
 jsonnet {<option>} <filename>
 

diff --git a/test_cmd/no_args.golden.stderr.golang b/test_cmd/no_args.golden.stderr.golang
@@ -1,6 +1,6 @@
 ERROR: must give filename
 
-Jsonnet commandline interpreter v0.16.0
+Jsonnet commandline interpreter v0.17.0
 
 jsonnet {<option>} <filename>
 

diff --git a/test_cmd/version1.golden.stdout b/test_cmd/version1.golden.stdout
@@ -1 +1 @@
-Jsonnet commandline interpreter v0.16.0
+Jsonnet commandline interpreter v0.17.0
diff --git a/test_cmd/version2.golden.stdout b/test_cmd/version2.golden.stdout
@@ -1 +1 @@
-Jsonnet commandline interpreter v0.16.0
+Jsonnet commandline interpreter v0.17.0