Skip to content

Commit 0c3ff5b

Browse files
sparkprimesparkprime
authored
Merge branch 'master' into feat/jsonml
2 parents 471d4ab + a5fefdb commit 0c3ff5b

File tree

6 files changed

+181
-5
lines changed

6 files changed

+181
-5
lines changed

‎.github/workflows/create_archive_and_notes.sh‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#!/usr/bin/env bash
2+
# Copyright 2023 The Bazel Authors. All rights reserved.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
set -o errexit -o nounset -o pipefail
17+
18+
# Set by GH actions, see
19+
# https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
20+
TAG=${GITHUB_REF_NAME}
21+
# A prefix is added to better match the GitHub generated archives.
22+
PREFIX="jsonnet-${TAG}"
23+
ARCHIVE="jsonnet-$TAG.tar.gz"
24+
git archive --format=tar --prefix=${PREFIX}/ ${TAG} | gzip > $ARCHIVE
25+
SHA=$(shasum -a 256 $ARCHIVE | awk '{print $1}')
26+
27+
cat > release_notes.txt << EOF
28+
### Importing Jsonnet in a project that uses Bazel
29+
30+
#### Using Bzlmod with Bazel 6
31+
32+
Add to your \`MODULE.bazel\` file:
33+
34+
\`\`\`starlark
35+
bazel_dep(name = "jsonnet", version = "${TAG}")
36+
\`\`\`
37+
38+
#### Using WORKSPACE
39+
40+
Paste this snippet into your \`WORKSPACE\` file:
41+
42+
\`\`\`starlark
43+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44+
45+
http_archive(
46+
name = "jsonnet",
47+
sha256 = "${SHA}",
48+
strip_prefix = "${PREFIX}",
49+
url = "https://github.com/google/jsonnet/releases/download/${TAG}/jsonnet-${TAG}.tar.gz",
50+
)
51+
\`\`\`
52+
53+
EOF

‎.github/workflows/release.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Copyright 2023 The Bazel Authors. All rights reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Cut a release whenever a new tag is pushed to the repo.
16+
name: Release
17+
18+
on:
19+
push:
20+
tags:
21+
- "*.*.*"
22+
23+
jobs:
24+
build:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@v2
29+
- name: Create release archive and notes
30+
run: .github/workflows/create_archive_and_notes.sh
31+
- name: Release
32+
uses: softprops/action-gh-release@v1
33+
with:
34+
# Use GH feature to populate the changelog automatically
35+
generate_release_notes: true
36+
body_path: release_notes.txt
37+
fail_on_unmatched_files: true
38+
files: jsonnet-*.tar.gz

‎MODULE.bazel‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module(name = "jsonnet", version = "0.0.0")
22

3+
bazel_dep(name = "googletest", version = "1.11.0", repo_name = "com_google_googletest")
4+
35
build_defs = use_extension("//tools/build_defs:extensions.bzl", "build_defs")
46
use_repo(
57
build_defs,
@@ -8,7 +10,3 @@ use_repo(
810
)
911

1012
register_toolchains("//platform_defs:default_python3_toolchain")
11-
12-
# Dev dependencies
13-
14-
bazel_dep(name = "googletest", version = "1.11.0", repo_name = "com_google_googletest", dev_dependency = True)

‎doc/_stdlib_gen/stdlib-content.jsonnet‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,20 @@ local html = import 'html.libsonnet';
110110
<ul><code>std.acos(x)</code></ul>
111111
<ul><code>std.atan(x)</code></ul>
112112
<ul><code>std.round(x)</code></ul>
113+
<ul><code>std.isEven(x)</code></ul>
114+
<ul><code>std.isOdd(x)</code></ul>
115+
<ul><code>std.isInteger(x)</code></ul>
116+
<ul><code>std.isDecimal(x)</code></ul>
113117
</ul>
114118
<p>
115119
The function <code>std.mod(a, b)</code> is what the % operator is desugared to. It performs
116120
modulo arithmetic if the left hand side is a number, or if the left hand side is a string,
117121
it does Python-style string formatting with <code>std.format()</code>.
118122
</p>
123+
<p>
124+
The functions <code>std.isEven(x)</code> and <code>std.isOdd(x)</code> use integral part of a
125+
floating number to test for even or odd.
126+
</p>
119127
|||,
120128
],
121129
fields: [
@@ -371,6 +379,14 @@ local html = import 'html.libsonnet';
371379
Returns true if the the given string is of zero length.
372380
|||,
373381
},
382+
{
383+
name: 'trim',
384+
params: ['str'],
385+
availableSince: 'upcoming',
386+
description: |||
387+
Returns a copy of string after eliminating leading and trailing whitespaces.
388+
|||,
389+
},
374390
{
375391
name: 'equalsIgnoreCase',
376392
params: ['str1', 'str2'],
@@ -1303,6 +1319,20 @@ local html = import 'html.libsonnet';
13031319
},
13041320
],
13051321
},
1322+
{
1323+
name: 'flattenDeepArray',
1324+
params: ['value'],
1325+
availableSince: 'upcoming',
1326+
description: |||
1327+
Concatenate an array containing values and arrays into a single flattened array.
1328+
|||,
1329+
examples: [
1330+
{
1331+
input: 'std.flattenDeepArray([[1, 2], [], [3, [4]], [[5, 6, [null]], [7, 8]]])',
1332+
output: std.flattenDeepArray([[1, 2], [], [3, [4]], [[5, 6, [null]], [7, 8]]]),
1333+
},
1334+
],
1335+
},
13061336
{
13071337
name: 'reverse',
13081338
params: ['arrs'],
@@ -1382,6 +1412,8 @@ local html = import 'html.libsonnet';
13821412
description: html.paragraphs([
13831413
|||
13841414
Return the min of all element in <code>arr</code>.
1415+
|||,
1416+
]),
13851417
},
13861418
{
13871419
name: 'maxArray',
@@ -1390,6 +1422,8 @@ local html = import 'html.libsonnet';
13901422
description: html.paragraphs([
13911423
|||
13921424
Return the max of all element in <code>arr</code>.
1425+
|||,
1426+
]),
13931427
},
13941428
{
13951429
name: 'contains',
@@ -1401,6 +1435,16 @@ local html = import 'html.libsonnet';
14011435
|||,
14021436
]),
14031437
},
1438+
{
1439+
name: 'avg',
1440+
params: ['arr'],
1441+
availableSince: '0.20.0',
1442+
description: html.paragraphs([
1443+
|||
1444+
Return average of all element in <code>arr</code>.
1445+
|||,
1446+
]),
1447+
},
14041448
{
14051449
name: 'remove',
14061450
params: ['arr', 'elem'],

‎stdlib/std.jsonnet‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,12 @@ limitations under the License.
867867
flattenArrays(arrs)::
868868
std.foldl(function(a, b) a + b, arrs, []),
869869

870+
flattenDeepArray(value)::
871+
if std.isArray(value) then
872+
[y for x in value for y in std.flattenDeepArray(x)]
873+
else
874+
[value],
875+
870876
manifestIni(ini)::
871877
local body_lines(body) =
872878
std.join([], [
@@ -1705,6 +1711,12 @@ limitations under the License.
17051711

17061712
sum(arr):: std.foldl(function(a, b) a + b, arr, 0),
17071713

1714+
avg(arr)::
1715+
if std.length(arr) == 0 then
1716+
error 'Cannot calculate average of an empty array.'
1717+
else
1718+
std.sum(arr)/std.length(arr),
1719+
17081720
minArray(arr, keyF=id, onEmpty=error 'Expected at least one element in array. Got none')::
17091721
if std.length(arr) == 0 then
17101722
onEmpty
@@ -1740,6 +1752,11 @@ limitations under the License.
17401752
contains(arr, elem):: std.any([e == elem for e in arr]),
17411753

17421754
equalsIgnoreCase(str1, str2):: std.asciiLower(str1) == std.asciiLower(str2),
1755+
1756+
isEven(x):: std.round(x) % 2 == 0,
1757+
isOdd(x):: std.round(x) % 2 != 0,
1758+
isInteger(x):: std.round(x) == x,
1759+
isDecimal(x):: std.round(x) != x,
17431760

17441761
removeAt(arr, at):: [
17451762
arr[i],
@@ -1767,4 +1784,6 @@ limitations under the License.
17671784
sha512(str):: go_only_function,
17681785
sha3(str):: go_only_function,
17691786
parseXmlJsonml(str):: go_only_function,
1787+
1788+
trim(str):: std.stripChars(str, ' \t\n\f\r\u0085\u00A0'),
17701789
}

‎test_suite/stdlib.jsonnet‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,11 @@ std.assertEqual(std.lines(['a', null, 'b']), 'a\nb\n') &&
313313

314314
std.assertEqual(std.flattenArrays([[1, 2, 3], [4, 5, 6], []]), [1, 2, 3, 4, 5, 6]) &&
315315

316+
std.assertEqual(std.flattenDeepArray([]), []) &&
317+
std.assertEqual(std.flattenDeepArray([1, 2, 3]), [1, 2, 3]) &&
318+
std.assertEqual(std.flattenDeepArray([1, [2, 3]]), [1, 2, 3]) &&
319+
std.assertEqual(std.flattenDeepArray([[1], [2, 3], [[null]]]), [1, 2, 3, null]) &&
320+
316321
std.assertEqual(
317322
std.manifestIni({
318323
main: { a: '1', b: '2' },
@@ -1544,6 +1549,10 @@ std.assertEqual(std.all([]), true) &&
15441549

15451550
std.assertEqual(std.sum([1, 2, 3]), 6) &&
15461551

1552+
std.assertEqual(std.avg([1, 2, 3]), 2) &&
1553+
std.assertEqual(std.avg([0, 0, 0]), 0) &&
1554+
std.assertEqual(std.avg([1, 1, 2.5]), 1.5) &&
1555+
15471556
std.assertEqual(std.minArray([1, 2, 3]), 1) &&
15481557
std.assertEqual(std.minArray(['1', '2', '3']), '1') &&
15491558

@@ -1565,14 +1574,29 @@ std.assertEqual(std.isEmpty(''), true) &&
15651574
std.assertEqual(std.isEmpty('non-empty string'), false) &&
15661575

15671576
std.assertEqual(std.contains([1, 2, 3], 2), true) &&
1568-
std.assertEqual(std.contains([1, 2, 3], "foo"), false) &&
1577+
std.assertEqual(std.contains([1, 2, 3], 'foo'), false) &&
15691578

15701579
std.assertEqual(std.equalsIgnoreCase('foo', 'FOO'), true) &&
15711580
std.assertEqual(std.equalsIgnoreCase('foo', 'bar'), false) &&
15721581

1582+
std.assertEqual(std.isEven(10), true) &&
1583+
std.assertEqual(std.isEven(5), false) &&
1584+
std.assertEqual(std.isOdd(5), true) &&
1585+
std.assertEqual(std.isOdd(10), false) &&
1586+
std.assertEqual(std.isInteger(1), true) &&
1587+
std.assertEqual(std.isInteger(1.1), false) &&
1588+
std.assertEqual(std.isDecimal(1.1), true) &&
1589+
std.assertEqual(std.isDecimal(1), false) &&
1590+
15731591
std.assertEqual(std.remove([1, 2, 3], 2), [1, 3]) &&
15741592
std.assertEqual(std.removeAt([1, 2, 3], 1), [1, 3]) &&
15751593

15761594
std.assertEqual(std.objectRemoveKey({ foo: 1, bar: 2, baz: 3 }, 'foo'), { bar: 2, baz: 3 }) &&
15771595

1596+
std.assertEqual(std.trim('already trimmed string'), 'already trimmed string') &&
1597+
std.assertEqual(std.trim(' string with spaces on both ends '), 'string with spaces on both ends') &&
1598+
std.assertEqual(std.trim('string with newline character at end\n'), 'string with newline character at end') &&
1599+
std.assertEqual(std.trim('string with tabs at end\t\t'), 'string with tabs at end') &&
1600+
std.assertEqual(std.trim('string with other special whitespaces at end\f\r\u0085\u00A0'), 'string with carriage return at end') &&
1601+
15781602
true

0 commit comments

Comments
 (0)