From 70dff37a2b9ae6b28e9936dcb770096939c7d1d4 Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:39:24 +0800
Subject: [PATCH 01/13] fix: std.log, std.log2, and std.log10 should reject
 negative and zero input (#940)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

`std.log`, `std.log2`, and `std.log10` produced generic downstream
errors for negative and zero inputs (e.g., "not a number" or "overflow")
instead of clear, function-specific error messages. go-jsonnet errors
with "Not a number" for NaN results from `math.log`.

## Modification

- Added NaN checks after `math.log`, `math.log2`, and `math.log10`
computations
- When the result is NaN, raises "[std.log] Not a number" (etc.) with
position info
- Added tests for `log(-1)`, `log2(-1)`, `log(0)`, `log2(0)`, and valid
inputs

## Result

`std.log(-1)` now errors with "[std.log] Not a number" instead of a
generic downstream error, providing clearer diagnostics.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `std.log(-1)` | ERROR: Not a number | ERROR: non-finite | ERROR: not a
number (generic) | ERROR: [std.log] Not a number ✅ |
| `std.log2(0)` | ERROR: Overflow | ERROR: non-finite | ERROR:
[std.log2] overflow | ERROR: [std.log2] overflow ✅ |
| `std.log(1)` | `0` | `0` | `0` ✅ | `0` ✅ |
| `std.log2(8)` | `3` | `3` | `3` ✅ | `3` ✅ |
---
 sjsonnet/src/sjsonnet/stdlib/MathModule.scala  | 13 +++++++++----
 .../go_test_suite/builtin_log7.jsonnet.golden  |  2 +-
 .../go_test_suite/builtin_log8.jsonnet.golden  |  2 +-
 sjsonnet/test/src/sjsonnet/StdMathTests.scala  | 18 ++++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/sjsonnet/src/sjsonnet/stdlib/MathModule.scala b/sjsonnet/src/sjsonnet/stdlib/MathModule.scala
index 16d6f5e4d..03d05149a 100644
--- a/sjsonnet/src/sjsonnet/stdlib/MathModule.scala
+++ b/sjsonnet/src/sjsonnet/stdlib/MathModule.scala
@@ -494,7 +494,9 @@ object MathModule extends AbstractFunctionModule {
      * The official docs list std.log(x) as a mathematical function.
      */
     builtin("log", "x") { (pos, ev, x: Double) =>
-      math.log(x)
+      val r = math.log(x)
+      if (java.lang.Double.isNaN(r)) Error.fail("Not a number", pos)(ev)
+      r
     },
     /**
      * [[https://jsonnet.org/ref/stdlib.html#math std.log2(x)]].
@@ -504,8 +506,9 @@ object MathModule extends AbstractFunctionModule {
      * The official docs list std.log2(x) as a mathematical function.
      */
     builtin("log2", "x") { (pos, ev, x: Double) =>
-      // no scala log2, do our best without getting fancy with numerics
-      math.log(x) / math.log(2.0)
+      val r = math.log(x) / math.log(2.0)
+      if (java.lang.Double.isNaN(r)) Error.fail("Not a number", pos)(ev)
+      r
     },
     /**
      * [[https://jsonnet.org/ref/stdlib.html#math std.log10(x)]].
@@ -515,7 +518,9 @@ object MathModule extends AbstractFunctionModule {
      * The official docs list std.log10(x) as a mathematical function.
      */
     builtin("log10", "x") { (pos, ev, x: Double) =>
-      math.log10(x)
+      val r = math.log10(x)
+      if (java.lang.Double.isNaN(r)) Error.fail("Not a number", pos)(ev)
+      r
     },
     /**
      * [[https://jsonnet.org/ref/stdlib.html#math std.exp(x)]].
diff --git a/sjsonnet/test/resources/go_test_suite/builtin_log7.jsonnet.golden b/sjsonnet/test/resources/go_test_suite/builtin_log7.jsonnet.golden
index fae964564..c23168160 100644
--- a/sjsonnet/test/resources/go_test_suite/builtin_log7.jsonnet.golden
+++ b/sjsonnet/test/resources/go_test_suite/builtin_log7.jsonnet.golden
@@ -1,3 +1,3 @@
-sjsonnet.Error: not a number
+sjsonnet.Error: [std.log] Not a number
     at [<root>].(builtin_log7.jsonnet:1:8)
 
diff --git a/sjsonnet/test/resources/go_test_suite/builtin_log8.jsonnet.golden b/sjsonnet/test/resources/go_test_suite/builtin_log8.jsonnet.golden
index 53dce4516..b2321a2d4 100644
--- a/sjsonnet/test/resources/go_test_suite/builtin_log8.jsonnet.golden
+++ b/sjsonnet/test/resources/go_test_suite/builtin_log8.jsonnet.golden
@@ -1,3 +1,3 @@
-sjsonnet.Error: not a number
+sjsonnet.Error: [std.log] Not a number
     at [<root>].(builtin_log8.jsonnet:1:8)
 
diff --git a/sjsonnet/test/src/sjsonnet/StdMathTests.scala b/sjsonnet/test/src/sjsonnet/StdMathTests.scala
index be9ae1a73..816a7d768 100644
--- a/sjsonnet/test/src/sjsonnet/StdMathTests.scala
+++ b/sjsonnet/test/src/sjsonnet/StdMathTests.scala
@@ -48,5 +48,23 @@ object StdMathTests extends TestSuite {
       eval("std.sqrt(0)") ==> ujson.Num(0.0)
       eval("std.sqrt(4)") ==> ujson.Num(2.0)
     }
+    test("log and log2 reject negative and zero input") {
+      // go-jsonnet: makeDoubleCheck returns "Not a number" for NaN, Val.Num catches Infinity as "overflow"
+      val errLog = evalErr("std.log(-1)")
+      assert(errLog.contains("Not a number"))
+      val errLog2 = evalErr("std.log2(-1)")
+      assert(errLog2.contains("Not a number"))
+      val errLog10 = evalErr("std.log10(-1)")
+      assert(errLog10.contains("Not a number"))
+      val errLog0 = evalErr("std.log(0)")
+      assert(errLog0.contains("overflow"))
+      val errLog2Zero = evalErr("std.log2(0)")
+      assert(errLog2Zero.contains("overflow"))
+      // log(positive) must still work
+      eval("std.log(1)") ==> ujson.Num(0.0)
+      eval("std.log2(1)") ==> ujson.Num(0.0)
+      eval("std.log2(8)") ==> ujson.Num(3.0)
+      eval("std.log10(100)") ==> ujson.Num(2.0)
+    }
   }
 }

From c24cdeb90f523fe1d8ea70d103f8c74b166e0d76 Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:39:59 +0800
Subject: [PATCH 02/13] fix: regexPartialMatch string field returns matched
 substring (#945)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

`std.regexPartialMatch` returned the full input string in the `string`
field instead of the matched substring. For
`std.regexPartialMatch("foo", "foobar")`, the `string` field was
`"foobar"` instead of `"foo"`.

Note: `std.regexPartialMatch` is sjsonnet-specific (not in go-jsonnet or
jrsonnet). The expected behavior follows Java's
`Matcher.start()`/`Matcher.end()` semantics.

## Modification

- Changed `Val.Str(pos.noOffset, str)` to `Val.Str(pos.noOffset,
str.substring(matcher.start(), matcher.end()))` in `NativeRegex.scala`
- Added tests for partial match at start, middle, and full match

## Result

`std.regexPartialMatch("foo", "foobar")` now correctly returns `{string:
"foo", captures: [], namedCaptures: {}}` instead of `{string: "foobar",
...}`.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `std.regexPartialMatch("foo", "foobar")` | N/A (no such function) |
N/A | `string: "foobar"` ❌ | `string: "foo"` ✅ |
| `std.regexPartialMatch("[0-9]+", "abc123def")` | N/A | N/A | `string:
"abc123def"` ❌ | `string: "123"` ✅ |
| `std.regexFullMatch("foo", "foo")` | N/A | N/A | `string: "foo"` ✅ |
`string: "foo"` ✅ |
---
 sjsonnet/src/sjsonnet/stdlib/NativeRegex.scala            | 6 +++++-
 sjsonnet/test/resources/new_test_suite/regex-js.jsonnet   | 6 +++---
 .../resources/new_test_suite/regex-jvm-native.jsonnet     | 6 +++---
 .../regex_partial_match_string_field.jsonnet              | 8 ++++++++
 .../regex_partial_match_string_field.jsonnet.golden       | 1 +
 5 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/regex_partial_match_string_field.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/regex_partial_match_string_field.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/stdlib/NativeRegex.scala b/sjsonnet/src/sjsonnet/stdlib/NativeRegex.scala
index df06fe2c0..e1777a01b 100644
--- a/sjsonnet/src/sjsonnet/stdlib/NativeRegex.scala
+++ b/sjsonnet/src/sjsonnet/stdlib/NativeRegex.scala
@@ -26,7 +26,11 @@ object NativeRegex extends AbstractFunctionModule {
 
       Val.Obj.mk(
         pos.noOffset,
-        "string" -> new Obj.ConstMember(true, Visibility.Normal, Val.Str(pos.noOffset, str)),
+        "string" -> new Obj.ConstMember(
+          true,
+          Visibility.Normal,
+          Val.Str(pos.noOffset, str.substring(matcher.start(), matcher.end()))
+        ),
         "captures" -> new Obj.ConstMember(
           true,
           Visibility.Normal,
diff --git a/sjsonnet/test/resources/new_test_suite/regex-js.jsonnet b/sjsonnet/test/resources/new_test_suite/regex-js.jsonnet
index 16150a256..dc7b90f35 100644
--- a/sjsonnet/test/resources/new_test_suite/regex-js.jsonnet
+++ b/sjsonnet/test/resources/new_test_suite/regex-js.jsonnet
@@ -34,7 +34,7 @@ std.assertEqual(std.native('regexPartialMatch')(@'world', 'hello'), null) &&
 std.assertEqual(
   std.native('regexPartialMatch')(@'e', 'hello'),
   {
-    string: 'hello',
+    string: 'e',
     captures: [],
     namedCaptures: {},
   }
@@ -43,7 +43,7 @@ std.assertEqual(
 std.assertEqual(
   std.native('regexPartialMatch')(@'e(.*)o', 'hello'),
   {
-    string: 'hello',
+    string: 'ello',
     captures: ['ll'],
     namedCaptures: {},
   }
@@ -52,7 +52,7 @@ std.assertEqual(
 std.assertEqual(
   std.native('regexPartialMatch')(@'e(?P<mid>.*)o', 'hello'),
   {
-    string: 'hello',
+    string: 'ello',
     captures: ['ll'],
     namedCaptures: {
       mid: 'll',
diff --git a/sjsonnet/test/resources/new_test_suite/regex-jvm-native.jsonnet b/sjsonnet/test/resources/new_test_suite/regex-jvm-native.jsonnet
index a5d599d15..adafd2432 100644
--- a/sjsonnet/test/resources/new_test_suite/regex-jvm-native.jsonnet
+++ b/sjsonnet/test/resources/new_test_suite/regex-jvm-native.jsonnet
@@ -34,7 +34,7 @@ std.assertEqual(std.native('regexPartialMatch')(@'world', 'hello'), null) &&
 std.assertEqual(
   std.native('regexPartialMatch')(@'e', 'hello'),
   {
-    string: 'hello',
+    string: 'e',
     captures: [],
     namedCaptures: {},
   }
@@ -43,7 +43,7 @@ std.assertEqual(
 std.assertEqual(
   std.native('regexPartialMatch')(@'e(.*)o', 'hello'),
   {
-    string: 'hello',
+    string: 'ello',
     captures: ['ll'],
     namedCaptures: {},
   }
@@ -52,7 +52,7 @@ std.assertEqual(
 std.assertEqual(
   std.native('regexPartialMatch')(@'e(?P<mid>.*)o', 'hello'),
   {
-    string: 'hello',
+    string: 'ello',
     captures: ['ll'],
     namedCaptures: {
       mid: 'll',
diff --git a/sjsonnet/test/resources/new_test_suite/regex_partial_match_string_field.jsonnet b/sjsonnet/test/resources/new_test_suite/regex_partial_match_string_field.jsonnet
new file mode 100644
index 000000000..bc6dc95c3
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/regex_partial_match_string_field.jsonnet
@@ -0,0 +1,8 @@
+// std.regexPartialMatch string field should return matched substring, not full input
+local r1 = std.regexPartialMatch("foo", "foobar");
+local r2 = std.regexPartialMatch("[0-9]+", "abc123def");
+local r3 = std.regexFullMatch("foo", "foo");
+assert r1.string == "foo" : "partial match substring";
+assert r2.string == "123" : "digit match substring";
+assert r3.string == "foo" : "full match substring";
+true
diff --git a/sjsonnet/test/resources/new_test_suite/regex_partial_match_string_field.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/regex_partial_match_string_field.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/regex_partial_match_string_field.jsonnet.golden
@@ -0,0 +1 @@
+true

From adce175498a4d58f63af7865151e7505e3d2e893 Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:40:28 +0800
Subject: [PATCH 03/13] fix: std.removeAt errors on invalid index instead of
 silently returning original array (#946)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

`std.removeAt` silently returned the original array when given an
invalid index (negative, out-of-bounds, or non-integer), instead of
producing a clear error. go-jsonnet crashes with an internal error for
negative indices; jrsonnet errors on non-integer indices but silently
ignores negative ones.

## Modification

- Added bounds checking: negative and out-of-range indices now error
with "idx out of bounds"
- Added integrality check: non-integer indices error with "idx must be
an integer"
- Added directional tests for valid and invalid indices

## Result

`std.removeAt([1,2,3], -1)` now produces a clear "idx out of bounds"
error instead of silently returning the original array.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `std.removeAt([1,2,3], 1)` | `[1,3]` | `[1,3]` | `[1,3]` ✅ | `[1,3]` ✅
|
| `std.removeAt([1,2,3], -1)` | CRASH (internal error) | `[1,2,3]`
(wrong) | `[1,2,3]` (wrong) ❌ | ERROR: idx out of bounds ✅ |
| `std.removeAt([1,2,3], 1.5)` | ERROR: Expected an integer | ERROR:
cannot convert | `[1,2,3]` (wrong) ❌ | ERROR: idx must be an integer ✅ |
| `std.removeAt([1,2,3], 10)` | CRASH (internal error) | `[1,2,3]`
(wrong) | `[1,2,3]` (wrong) ❌ | ERROR: idx out of bounds ✅ |
---
 sjsonnet/src/sjsonnet/stdlib/ArrayModule.scala     | 14 +++++++++-----
 .../error.removeAt_negative_index.jsonnet          |  1 +
 .../error.removeAt_negative_index.jsonnet.golden   |  1 +
 .../error.removeAt_non_integer.jsonnet             |  1 +
 .../error.removeAt_non_integer.jsonnet.golden      |  1 +
 .../error.removeAt_non_number.jsonnet              |  1 +
 .../error.removeAt_non_number.jsonnet.golden       |  1 +
 .../error.removeAt_out_of_bounds.jsonnet           |  1 +
 .../error.removeAt_out_of_bounds.jsonnet.golden    |  1 +
 .../new_test_suite/removeAt_valid.jsonnet          |  5 +++++
 .../new_test_suite/removeAt_valid.jsonnet.golden   |  1 +
 .../StdLibOfficialCompatibilityTests.scala         |  8 ++++----
 12 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.removeAt_negative_index.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.removeAt_negative_index.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.removeAt_non_integer.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.removeAt_non_integer.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.removeAt_non_number.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.removeAt_non_number.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.removeAt_out_of_bounds.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.removeAt_out_of_bounds.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/removeAt_valid.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/removeAt_valid.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/stdlib/ArrayModule.scala b/sjsonnet/src/sjsonnet/stdlib/ArrayModule.scala
index a472a28ea..a33042cf5 100644
--- a/sjsonnet/src/sjsonnet/stdlib/ArrayModule.scala
+++ b/sjsonnet/src/sjsonnet/stdlib/ArrayModule.scala
@@ -1076,15 +1076,19 @@ object ArrayModule extends AbstractFunctionModule {
      *
      * Remove element at idx index from arr.
      */
-    builtin("removeAt", "arr", "idx") { (_, _, arr: Val.Arr, idx: Val) =>
+    builtin("removeAt", "arr", "idx") { (pos, ev, arr: Val.Arr, idx: Val) =>
       val removeIdx = idx match {
         case n: Val.Num =>
           val d = n.asDouble
-          if (d.isWhole && d >= 0 && d < arr.length) d.toInt else -1
-        case _ => -1
+          if (!d.isWhole)
+            Error.fail("idx must be an integer, got " + d, pos)(ev)
+          if (d < 0 || d >= arr.length)
+            Error.fail("idx out of bounds", pos)(ev)
+          d.toInt
+        case _ =>
+          Error.fail("idx must be a number, got " + idx.value.prettyName, pos)(ev)
       }
-      if (removeIdx == -1) arr
-      else removeAtView(arr, removeIdx)
+      removeAtView(arr, removeIdx)
     },
     /**
      * [[https://jsonnet.org/ref/stdlib.html#std-sum std.sum(arr)]].
diff --git a/sjsonnet/test/resources/new_test_suite/error.removeAt_negative_index.jsonnet b/sjsonnet/test/resources/new_test_suite/error.removeAt_negative_index.jsonnet
new file mode 100644
index 000000000..93bcc85e3
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.removeAt_negative_index.jsonnet
@@ -0,0 +1 @@
+std.removeAt([1, 2, 3], -1)
diff --git a/sjsonnet/test/resources/new_test_suite/error.removeAt_negative_index.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.removeAt_negative_index.jsonnet.golden
new file mode 100644
index 000000000..80343aea6
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.removeAt_negative_index.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.removeAt] idx out of bounds
diff --git a/sjsonnet/test/resources/new_test_suite/error.removeAt_non_integer.jsonnet b/sjsonnet/test/resources/new_test_suite/error.removeAt_non_integer.jsonnet
new file mode 100644
index 000000000..287dbaa8b
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.removeAt_non_integer.jsonnet
@@ -0,0 +1 @@
+std.removeAt([1, 2, 3], 1.5)
diff --git a/sjsonnet/test/resources/new_test_suite/error.removeAt_non_integer.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.removeAt_non_integer.jsonnet.golden
new file mode 100644
index 000000000..53e6e28e3
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.removeAt_non_integer.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.removeAt] idx must be an integer, got 1.5
diff --git a/sjsonnet/test/resources/new_test_suite/error.removeAt_non_number.jsonnet b/sjsonnet/test/resources/new_test_suite/error.removeAt_non_number.jsonnet
new file mode 100644
index 000000000..50ceeb51a
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.removeAt_non_number.jsonnet
@@ -0,0 +1 @@
+std.removeAt([1, 2, 3], "a")
diff --git a/sjsonnet/test/resources/new_test_suite/error.removeAt_non_number.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.removeAt_non_number.jsonnet.golden
new file mode 100644
index 000000000..cb96b15f2
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.removeAt_non_number.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.removeAt] idx must be a number, got string
diff --git a/sjsonnet/test/resources/new_test_suite/error.removeAt_out_of_bounds.jsonnet b/sjsonnet/test/resources/new_test_suite/error.removeAt_out_of_bounds.jsonnet
new file mode 100644
index 000000000..19b4715e7
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.removeAt_out_of_bounds.jsonnet
@@ -0,0 +1 @@
+std.removeAt([1, 2, 3], 10)
diff --git a/sjsonnet/test/resources/new_test_suite/error.removeAt_out_of_bounds.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.removeAt_out_of_bounds.jsonnet.golden
new file mode 100644
index 000000000..80343aea6
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.removeAt_out_of_bounds.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.removeAt] idx out of bounds
diff --git a/sjsonnet/test/resources/new_test_suite/removeAt_valid.jsonnet b/sjsonnet/test/resources/new_test_suite/removeAt_valid.jsonnet
new file mode 100644
index 000000000..687727c2b
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/removeAt_valid.jsonnet
@@ -0,0 +1,5 @@
+// std.removeAt with valid index works correctly
+assert std.removeAt([1, 2, 3], 1) == [1, 3] : "remove middle element";
+assert std.removeAt([1, 2, 3], 0) == [2, 3] : "remove first element";
+assert std.removeAt([1, 2, 3], 2) == [1, 2] : "remove last element";
+true
diff --git a/sjsonnet/test/resources/new_test_suite/removeAt_valid.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/removeAt_valid.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/removeAt_valid.jsonnet.golden
@@ -0,0 +1 @@
+true
diff --git a/sjsonnet/test/src/sjsonnet/StdLibOfficialCompatibilityTests.scala b/sjsonnet/test/src/sjsonnet/StdLibOfficialCompatibilityTests.scala
index ea4ec97f0..4cac8cade 100644
--- a/sjsonnet/test/src/sjsonnet/StdLibOfficialCompatibilityTests.scala
+++ b/sjsonnet/test/src/sjsonnet/StdLibOfficialCompatibilityTests.scala
@@ -27,10 +27,10 @@ object StdLibOfficialCompatibilityTests extends TestSuite {
 
     test("removeAt filters by exact index equality") {
       eval("""std.removeAt([1, 2, 3], 1)""") ==> ujson.Arr(1, 3)
-      eval("""std.removeAt([1, 2, 3], 1.5)""") ==> ujson.Arr(1, 2, 3)
-      eval("""std.removeAt([1, 2, 3], -1)""") ==> ujson.Arr(1, 2, 3)
-      eval("""std.removeAt([1, 2, 3], 9)""") ==> ujson.Arr(1, 2, 3)
-      eval("""std.removeAt([1, 2, 3], "1")""") ==> ujson.Arr(1, 2, 3)
+      assert(evalErr("""std.removeAt([1, 2, 3], 1.5)""").contains("idx must be an integer"))
+      assert(evalErr("""std.removeAt([1, 2, 3], -1)""").contains("idx out of bounds"))
+      assert(evalErr("""std.removeAt([1, 2, 3], 9)""").contains("idx out of bounds"))
+      assert(evalErr("""std.removeAt([1, 2, 3], "1")""").contains("idx must be a number"))
     }
 
     test("isEmpty delegates to std.length") {

From 96201551e5be7b5a061f093ffef68ce42d3ee8fd Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:41:01 +0800
Subject: [PATCH 04/13] fix: object comprehension supports :: and :::
 visibility modifiers (#948)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

Object comprehensions always used `Visibility.Normal` regardless of the
field separator (`:`, `::`, `:::`), so `{[k]:: 1 for k in ["a"]}`
incorrectly exposed the field as visible. go-jsonnet rejects hidden
fields in comprehensions entirely; jrsonnet honors the visibility
modifier.

## Modification

- Parser now passes the visibility modifier through to `ObjComp`
expressions instead of hardcoding `Visibility.Normal`
- `ObjectScopeFactory` uses the propagated visibility instead of always
`Visibility.Normal`
- Updated `Expr`, `ExprTransform`, `ScopedExprTransform`, and
`Evaluator` to carry the visibility field
- Added tests for `::` (hidden), `:::` (forced), and `:` (normal)
visibility in comprehensions

## Result

`{[k]:: 1 for k in ["a", "b"]}` now correctly hides fields (empty
`std.objectFields` result), matching jrsonnet behavior.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `std.objectFields({[k]:: 1 for k in ["a","b"]})` | ERROR: cannot have
hidden fields | `[]` | ParseError ❌ | `[]` ✅ |
| `std.objectFields({[k]: 1 for k in ["a","b"]})` | `["a","b"]` |
`["a","b"]` | `["a","b"]` ✅ | `["a","b"]` ✅ |

> Note: go-jsonnet rejects hidden/forced fields in comprehisons.
sjsonnet follows jrsonnet's approach of honoring the visibility
modifier.
---
 sjsonnet/src/sjsonnet/Evaluator.scala                    | 4 +++-
 sjsonnet/src/sjsonnet/Expr.scala                         | 1 +
 sjsonnet/src/sjsonnet/ExprTransform.scala                | 4 ++--
 sjsonnet/src/sjsonnet/Parser.scala                       | 3 ++-
 sjsonnet/src/sjsonnet/ScopedExprTransform.scala          | 4 ++--
 .../object_comprehension_visibility.jsonnet              | 9 +++++++++
 .../object_comprehension_visibility.jsonnet.golden       | 1 +
 7 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/object_comprehension_visibility.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/object_comprehension_visibility.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/Evaluator.scala b/sjsonnet/src/sjsonnet/Evaluator.scala
index bb7632df9..97008db12 100644
--- a/sjsonnet/src/sjsonnet/Evaluator.scala
+++ b/sjsonnet/src/sjsonnet/Evaluator.scala
@@ -1916,6 +1916,7 @@ class Evaluator(
         case Val.Str(_, k) =>
           val member = new ObjCompMember(
             e.plus,
+            e.visibility,
             this,
             binds,
             s,
@@ -2240,11 +2241,12 @@ private[sjsonnet] final class ObjectScopeFactory(
  */
 private[sjsonnet] final class ObjCompMember(
     plus0: Boolean,
+    visibility0: Visibility,
     private val evaluator: Evaluator,
     private val binds: Array[Expr.Bind],
     private val compScope: ValScope,
     private val valueExpr: Expr)
-    extends Val.Obj.Member(plus0, Visibility.Normal, deprecatedSkipAsserts = true) {
+    extends Val.Obj.Member(plus0, visibility0, deprecatedSkipAsserts = true) {
   def invoke(self: Val.Obj, sup: Val.Obj, fs: FileScope, ev: EvalScope): Val = {
     evaluator.checkStackDepth(valueExpr.pos, "object comprehension")
     try {
diff --git a/sjsonnet/src/sjsonnet/Expr.scala b/sjsonnet/src/sjsonnet/Expr.scala
index 9a7cb53da..b4e4fe857 100644
--- a/sjsonnet/src/sjsonnet/Expr.scala
+++ b/sjsonnet/src/sjsonnet/Expr.scala
@@ -458,6 +458,7 @@ object Expr {
         key: Expr,
         value: Expr,
         plus: Boolean, // see https://jsonnet.org/ref/language.html#nested-field-inheritance
+        visibility: Member.Visibility,
         postLocals: Array[Bind],
         first: ForSpec,
         rest: List[CompSpec])
diff --git a/sjsonnet/src/sjsonnet/ExprTransform.scala b/sjsonnet/src/sjsonnet/ExprTransform.scala
index af56fba2f..2f2256d64 100644
--- a/sjsonnet/src/sjsonnet/ExprTransform.scala
+++ b/sjsonnet/src/sjsonnet/ExprTransform.scala
@@ -166,7 +166,7 @@ abstract class ExprTransform {
         if ((x2 eq x) && (y2 eq y)) expr
         else ObjExtend(superPos, x2, y2.asInstanceOf[ObjBody])
 
-      case ObjBody.ObjComp(pos, p, k, v, pl, o, f, r) =>
+      case ObjBody.ObjComp(pos, p, k, v, pl, vis, o, f, r) =>
         val p2 = transformBinds(p)
         val k2 = transform(k)
         val v2 = transform(v)
@@ -174,7 +174,7 @@ abstract class ExprTransform {
         val f2 = transform(f).asInstanceOf[ForSpec]
         val r2 = transformList(r).asInstanceOf[List[CompSpec]]
         if ((p2 eq p) && (k2 eq k) && (v2 eq v) && (o2 eq o) && (f2 eq f) && (r2 eq r)) expr
-        else ObjBody.ObjComp(pos, p2, k2, v2, pl, o2, f2, r2)
+        else ObjBody.ObjComp(pos, p2, k2, v2, pl, vis, o2, f2, r2)
 
       case Slice(pos, v, x, y, z) =>
         val v2 = transform(v)
diff --git a/sjsonnet/src/sjsonnet/Parser.scala b/sjsonnet/src/sjsonnet/Parser.scala
index 07987c6e8..a1589bd3f 100644
--- a/sjsonnet/src/sjsonnet/Parser.scala
+++ b/sjsonnet/src/sjsonnet/Parser.scala
@@ -887,7 +887,7 @@ class Parser(
                   Expr.FieldName.Dyn(lhs),
                   plus,
                   args,
-                  Visibility.Normal,
+                  visibility,
                   rhsBody
                 ) =>
               val rhs = if (args == null) {
@@ -920,6 +920,7 @@ class Parser(
                       lhs,
                       rhs,
                       plus,
+                      visibility,
                       postLocals.toArray,
                       comps._1,
                       comps._2.toList
diff --git a/sjsonnet/src/sjsonnet/ScopedExprTransform.scala b/sjsonnet/src/sjsonnet/ScopedExprTransform.scala
index 7a723400c..b26fd79fc 100644
--- a/sjsonnet/src/sjsonnet/ScopedExprTransform.scala
+++ b/sjsonnet/src/sjsonnet/ScopedExprTransform.scala
@@ -37,7 +37,7 @@ class ScopedExprTransform extends ExprTransform {
     case Function(pos, params, body) =>
       nestedNames(params.names)(rec(e))
 
-    case ObjComp(pos, preLocals, key, value, plus, postLocals, first, rest) =>
+    case ObjComp(pos, preLocals, key, value, plus, visibility, postLocals, first, rest) =>
       val (f2 :: r2, (k2, (pre2, post2, v2))) = compSpecs(
         first :: rest,
         { () =>
@@ -55,7 +55,7 @@ class ScopedExprTransform extends ExprTransform {
           rest
         ).zipped.forall(_ eq _): @nowarn
       ) e
-      else ObjComp(pos, pre2, k2, v2, plus, post2, f2.asInstanceOf[ForSpec], r2)
+      else ObjComp(pos, pre2, k2, v2, plus, visibility, post2, f2.asInstanceOf[ForSpec], r2)
 
     case Comp(pos, value, first, rest) =>
       val (f2 :: r2, v2) = compSpecs(first :: rest.toList, () => transform(value)): @unchecked
diff --git a/sjsonnet/test/resources/new_test_suite/object_comprehension_visibility.jsonnet b/sjsonnet/test/resources/new_test_suite/object_comprehension_visibility.jsonnet
new file mode 100644
index 000000000..92eb78d5f
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/object_comprehension_visibility.jsonnet
@@ -0,0 +1,9 @@
+// Object comprehension visibility modifiers: :: (hidden), ::: (forced), : (normal)
+// :: (hidden) - invisible to objectFields, visible to objectFieldsAll
+assert std.objectFields({[k]:: 1 for k in ["a", "b"]}) == [] : "hidden fields invisible to objectFields";
+assert std.objectFieldsAll({[k]:: 1 for k in ["a", "b"]}) == ["a", "b"] : "hidden fields visible to objectFieldsAll";
+// ::: (forced) - always visible
+assert std.objectFields({[k]::: 1 for k in ["a", "b"]}) == ["a", "b"] : "forced visibility";
+// : (normal) - standard visibility
+assert std.objectFields({[k]: 1 for k in ["a", "b"]}) == ["a", "b"] : "normal visibility";
+true
diff --git a/sjsonnet/test/resources/new_test_suite/object_comprehension_visibility.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/object_comprehension_visibility.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/object_comprehension_visibility.jsonnet.golden
@@ -0,0 +1 @@
+true

From 4dba50139995b59b82983b8a56f97371dea18566 Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:41:26 +0800
Subject: [PATCH 05/13] fix: tryEagerEval does not force unevaluated lazy
 thunks (#949)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

The `tryEagerEval` optimization forced evaluation of lazy thunks by
calling `binding.value` on scope bindings, violating Jsonnet's lazy
evaluation semantics. Unused bindings with side effects (e.g., `error`,
`std.trace`) were evaluated even when their results were never needed.

## Modification

- Changed `resolveAsDouble` to pattern-match on the binding directly
instead of forcing `.value`
- Only already-evaluated `Val.Num` bindings are used for eager
evaluation
- Unevaluated thunks return `Double.NaN` (skip optimization), preserving
lazy semantics
- Added test verifying unused error bindings are not forced through
eager eval paths

## Result

`local a = error "should not be evaluated"; local b = a + 1; if false
then b else 0` now correctly returns `0` without evaluating `a`,
matching go-jsonnet and jrsonnet lazy evaluation semantics.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `local f(x) = x; local y = f(error "boom"); if true then 42 else y` |
`42` | `42` | ERROR (forced thunk) ❌ | `42` ✅ |
| `local a = error "x"; if false then a + 1 else 0` | `0` | `0` | `0` ✅
| `0` ✅ |
---
 sjsonnet/src/sjsonnet/Evaluator.scala                       | 3 ++-
 .../new_test_suite/tryEagerEval_lazy_thunks.jsonnet         | 6 ++++++
 .../new_test_suite/tryEagerEval_lazy_thunks.jsonnet.golden  | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/tryEagerEval_lazy_thunks.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/tryEagerEval_lazy_thunks.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/Evaluator.scala b/sjsonnet/src/sjsonnet/Evaluator.scala
index 97008db12..738e69483 100644
--- a/sjsonnet/src/sjsonnet/Evaluator.scala
+++ b/sjsonnet/src/sjsonnet/Evaluator.scala
@@ -223,8 +223,9 @@ class Evaluator(
       val idx = v.nameIdx
       if (idx < scope.length) {
         val binding = scope.bindings(idx)
-        if (binding != null) binding.value match {
+        if (binding != null) binding match {
           case n: Val.Num => n.rawDouble
+          case _: Val     => Double.NaN
           case _          => Double.NaN
         }
         else Double.NaN
diff --git a/sjsonnet/test/resources/new_test_suite/tryEagerEval_lazy_thunks.jsonnet b/sjsonnet/test/resources/new_test_suite/tryEagerEval_lazy_thunks.jsonnet
new file mode 100644
index 000000000..1336ac49f
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/tryEagerEval_lazy_thunks.jsonnet
@@ -0,0 +1,6 @@
+// Test that tryEagerEval preserves lazy semantics: unused local bindings with side effects
+// should not be forced. This matches go-jsonnet and jrsonnet behavior.
+std.assertEqual(
+  (local a = error "should not be evaluated"; local b = a + 1; if false then b else 0),
+  0
+)
diff --git a/sjsonnet/test/resources/new_test_suite/tryEagerEval_lazy_thunks.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/tryEagerEval_lazy_thunks.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/tryEagerEval_lazy_thunks.jsonnet.golden
@@ -0,0 +1 @@
+true

From b558b28554c55a8c13b87eaad2ebcbb03b367afe Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:41:57 +0800
Subject: [PATCH 06/13] fix: std.asin, std.acos, and std.pow error on NaN
 results (#950)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

`std.asin`, `std.acos`, and `std.pow` silently returned `NaN` for
out-of-domain inputs. go-jsonnet's `makeDoubleCheck` errors with "not a
number" for NaN results from all math functions.

## Modification

- Added post-computation NaN checks to `std.asin`, `std.acos`, and
`std.pow`
- When the result is NaN, raises "[std.asin] not a number" (etc.) with
position info
- Added tests for error cases: `asin(2)`, `acos(2)`, `pow(-1, 0.5)` and
valid inputs
- Updated `pow4.jsonnet` golden file to match new error output

## Result

Out-of-domain math function calls now error clearly with
function-specific context instead of a generic downstream NaN error,
matching go-jsonnet's `makeDoubleCheck` behavior.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `std.asin(2)` | ERROR: Not a number | ERROR: non-finite | ERROR: not a
number (generic) | ERROR: [std.asin] not a number ✅ |
| `std.acos(2)` | ERROR: Not a number | ERROR: non-finite | ERROR: not a
number (generic) | ERROR: [std.acos] not a number ✅ |
| `std.pow(-1, 0.5)` | ERROR: Not a number | ERROR: non-finite | ERROR:
not a number (generic) | ERROR: [std.pow] not a number ✅ |
| `std.asin(0.5)` | `0.5236...` | `0.5236...` | `0.5236...` ✅ |
`0.5236...` ✅ |
---
 sjsonnet/src/sjsonnet/stdlib/MathModule.scala        | 12 +++++++++---
 .../test/resources/go_test_suite/pow4.jsonnet.golden |  3 +--
 .../new_test_suite/error.math_acos_nan.jsonnet       |  2 ++
 .../error.math_acos_nan.jsonnet.golden               |  1 +
 .../new_test_suite/error.math_asin_nan.jsonnet       |  2 ++
 .../error.math_asin_nan.jsonnet.golden               |  1 +
 .../new_test_suite/error.math_pow_nan.jsonnet        |  2 ++
 .../new_test_suite/error.math_pow_nan.jsonnet.golden |  1 +
 .../new_test_suite/math_nan_checks_success.jsonnet   |  5 +++++
 .../math_nan_checks_success.jsonnet.golden           |  1 +
 10 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.math_acos_nan.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.math_acos_nan.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.math_asin_nan.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.math_asin_nan.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.math_pow_nan.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.math_pow_nan.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/math_nan_checks_success.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/math_nan_checks_success.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/stdlib/MathModule.scala b/sjsonnet/src/sjsonnet/stdlib/MathModule.scala
index 03d05149a..a021074d2 100644
--- a/sjsonnet/src/sjsonnet/stdlib/MathModule.scala
+++ b/sjsonnet/src/sjsonnet/stdlib/MathModule.scala
@@ -292,7 +292,9 @@ object MathModule extends AbstractFunctionModule {
      * The official docs list std.pow(x, n) as a mathematical function.
      */
     builtin("pow", "x", "n") { (pos, ev, x: Double, n: Double) =>
-      math.pow(x, n)
+      val r = math.pow(x, n)
+      if (java.lang.Double.isNaN(r)) Error.fail("not a number", pos)(ev)
+      r
     },
     /**
      * [[https://jsonnet.org/ref/stdlib.html#math std.floor(x)]].
@@ -424,7 +426,9 @@ object MathModule extends AbstractFunctionModule {
      * The official docs list std.asin(x) as a mathematical function.
      */
     builtin("asin", "x") { (pos, ev, x: Double) =>
-      math.asin(x)
+      val r = math.asin(x)
+      if (java.lang.Double.isNaN(r)) Error.fail("not a number", pos)(ev)
+      r
     },
     /**
      * [[https://jsonnet.org/ref/stdlib.html#math std.acos(x)]].
@@ -434,7 +438,9 @@ object MathModule extends AbstractFunctionModule {
      * The official docs list std.acos(x) as a mathematical function.
      */
     builtin("acos", "x") { (pos, ev, x: Double) =>
-      math.acos(x)
+      val r = math.acos(x)
+      if (java.lang.Double.isNaN(r)) Error.fail("not a number", pos)(ev)
+      r
     },
     /**
      * [[https://jsonnet.org/ref/stdlib.html#math std.atan(x)]].
diff --git a/sjsonnet/test/resources/go_test_suite/pow4.jsonnet.golden b/sjsonnet/test/resources/go_test_suite/pow4.jsonnet.golden
index 447a0902b..b54116a47 100644
--- a/sjsonnet/test/resources/go_test_suite/pow4.jsonnet.golden
+++ b/sjsonnet/test/resources/go_test_suite/pow4.jsonnet.golden
@@ -1,3 +1,2 @@
-sjsonnet.Error: not a number
+sjsonnet.Error: [std.pow] not a number
     at [<root>].(pow4.jsonnet:1:8)
-
diff --git a/sjsonnet/test/resources/new_test_suite/error.math_acos_nan.jsonnet b/sjsonnet/test/resources/new_test_suite/error.math_acos_nan.jsonnet
new file mode 100644
index 000000000..07258bd60
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.math_acos_nan.jsonnet
@@ -0,0 +1,2 @@
+// std.acos out of domain should error with "not a number"
+std.acos(2)
diff --git a/sjsonnet/test/resources/new_test_suite/error.math_acos_nan.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.math_acos_nan.jsonnet.golden
new file mode 100644
index 000000000..08f406e01
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.math_acos_nan.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.acos] not a number
diff --git a/sjsonnet/test/resources/new_test_suite/error.math_asin_nan.jsonnet b/sjsonnet/test/resources/new_test_suite/error.math_asin_nan.jsonnet
new file mode 100644
index 000000000..0f9a8abde
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.math_asin_nan.jsonnet
@@ -0,0 +1,2 @@
+// std.asin out of domain should error with "not a number"
+std.asin(2)
diff --git a/sjsonnet/test/resources/new_test_suite/error.math_asin_nan.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.math_asin_nan.jsonnet.golden
new file mode 100644
index 000000000..91f57ec78
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.math_asin_nan.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.asin] not a number
diff --git a/sjsonnet/test/resources/new_test_suite/error.math_pow_nan.jsonnet b/sjsonnet/test/resources/new_test_suite/error.math_pow_nan.jsonnet
new file mode 100644
index 000000000..d758e76b4
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.math_pow_nan.jsonnet
@@ -0,0 +1,2 @@
+// std.pow with negative base and fractional exponent should error with "not a number"
+std.pow(-1, 0.5)
diff --git a/sjsonnet/test/resources/new_test_suite/error.math_pow_nan.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.math_pow_nan.jsonnet.golden
new file mode 100644
index 000000000..6de87c33c
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.math_pow_nan.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.pow] not a number
diff --git a/sjsonnet/test/resources/new_test_suite/math_nan_checks_success.jsonnet b/sjsonnet/test/resources/new_test_suite/math_nan_checks_success.jsonnet
new file mode 100644
index 000000000..1eda145de
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/math_nan_checks_success.jsonnet
@@ -0,0 +1,5 @@
+// std.asin, std.acos, and std.pow with valid inputs still work
+assert std.asin(0) == 0 : "std.asin(0) should be 0";
+assert std.acos(1) == 0 : "std.acos(1) should be 0";
+assert std.pow(2, 3) == 8 : "std.pow(2, 3) should be 8";
+true
diff --git a/sjsonnet/test/resources/new_test_suite/math_nan_checks_success.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/math_nan_checks_success.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/math_nan_checks_success.jsonnet.golden
@@ -0,0 +1 @@
+true

From 2fcb4a8729390e10d3ecf6bb5c27c995faf38103 Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:43:09 +0800
Subject: [PATCH 07/13] fix: std.isEmpty should reject non-string/array/object
 types (#952)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

`std.isEmpty` incorrectly accepted function values (treating zero-arity
as empty, multi-arity as non-empty) and the error message referenced
"length" instead of "isEmpty". go-jsonnet and jrsonnet reject non-string
types with a type error.

## Modification

- Removed `Val.Func` case from `isEmpty`, so function inputs now fall
through to the error case
- Fixed error message from "length operates on strings, objects, and
arrays" to "isEmpty operates on strings, objects, and arrays"
- Removed unnecessary `.value` call in error path (`Val.value` returns
`this`)
- Updated `builtinIsEmpty2.jsonnet.golden`,
`StdLibOfficialCompatibilityTests`, and `Std0150FunctionsTests`
- Added directional tests for valid types and error cases

## Result

`std.isEmpty` now rejects function inputs with a clear error message.
Non-string types still produce "isEmpty operates on strings, objects,
and arrays, got {type}".

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `std.isEmpty(function(x) x)` | ERROR: expected string | ERROR:
expected string | `false` ❌ | ERROR ✅ |
| `std.isEmpty(42)` | ERROR: expected string | ERROR: expected string |
ERROR: "length operates" ❌ | ERROR: "isEmpty operates" ✅ |
| `std.isEmpty("")` | `true` | `true` | `true` ✅ | `true` ✅ |
| `std.isEmpty([])` | ERROR: expected string | ERROR: expected string |
`true` (extension) | `true` (extension) |

> Note: sjsonnet extends `isEmpty` to accept arrays and objects, which
go-jsonnet and jrsonnet reject. This is a deliberate sjsonnet extension.
---
 sjsonnet/src/sjsonnet/stdlib/StringModule.scala           | 8 +++++---
 .../go_test_suite/builtinIsEmpty2.jsonnet.golden          | 2 +-
 .../new_test_suite/error.isEmpty_function_type.jsonnet    | 2 ++
 .../error.isEmpty_function_type.jsonnet.golden            | 1 +
 .../new_test_suite/error.isEmpty_number_type.jsonnet      | 2 ++
 .../error.isEmpty_number_type.jsonnet.golden              | 1 +
 .../resources/new_test_suite/isEmpty_valid_types.jsonnet  | 6 ++++++
 .../new_test_suite/isEmpty_valid_types.jsonnet.golden     | 1 +
 sjsonnet/test/src/sjsonnet/Std0150FunctionsTests.scala    | 2 +-
 .../src/sjsonnet/StdLibOfficialCompatibilityTests.scala   | 5 ++---
 10 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.isEmpty_function_type.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.isEmpty_function_type.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.isEmpty_number_type.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.isEmpty_number_type.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/isEmpty_valid_types.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/isEmpty_valid_types.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/stdlib/StringModule.scala b/sjsonnet/src/sjsonnet/stdlib/StringModule.scala
index 6c9e95a02..8215ebaf1 100644
--- a/sjsonnet/src/sjsonnet/stdlib/StringModule.scala
+++ b/sjsonnet/src/sjsonnet/stdlib/StringModule.scala
@@ -1314,14 +1314,16 @@ object StringModule extends AbstractFunctionModule {
      *
      * Returns true if the given string is of zero length.
      */
-    builtin("isEmpty", "str") { (_, _, value: Val) =>
+    builtin("isEmpty", "str") { (pos, ev, value: Val) =>
       value match {
         case Val.Str(_, s) => s.isEmpty
         case a: Val.Arr    => a.length == 0
         case o: Val.Obj    => o.visibleKeyNames.isEmpty
-        case f: Val.Func   => f.params.names.isEmpty
         case x             =>
-          Error.fail("length operates on strings, objects, and arrays, got " + x.prettyName)
+          Error.fail(
+            "isEmpty operates on strings, objects, and arrays, got " + x.prettyName,
+            pos
+          )(ev)
       }
     },
     /**
diff --git a/sjsonnet/test/resources/go_test_suite/builtinIsEmpty2.jsonnet.golden b/sjsonnet/test/resources/go_test_suite/builtinIsEmpty2.jsonnet.golden
index f38106a09..bf7c00b02 100644
--- a/sjsonnet/test/resources/go_test_suite/builtinIsEmpty2.jsonnet.golden
+++ b/sjsonnet/test/resources/go_test_suite/builtinIsEmpty2.jsonnet.golden
@@ -1,2 +1,2 @@
-sjsonnet.Error: [std.isEmpty] length operates on strings, objects, and arrays, got number
+sjsonnet.Error: [std.isEmpty] isEmpty operates on strings, objects, and arrays, got number
     at [<root>].(builtinIsEmpty2.jsonnet:1:12)
diff --git a/sjsonnet/test/resources/new_test_suite/error.isEmpty_function_type.jsonnet b/sjsonnet/test/resources/new_test_suite/error.isEmpty_function_type.jsonnet
new file mode 100644
index 000000000..c9fe4f38d
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.isEmpty_function_type.jsonnet
@@ -0,0 +1,2 @@
+// std.isEmpty should error on function type
+std.isEmpty(function() true)
diff --git a/sjsonnet/test/resources/new_test_suite/error.isEmpty_function_type.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.isEmpty_function_type.jsonnet.golden
new file mode 100644
index 000000000..4393a1a87
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.isEmpty_function_type.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.isEmpty] isEmpty operates on strings, objects, and arrays, got function
diff --git a/sjsonnet/test/resources/new_test_suite/error.isEmpty_number_type.jsonnet b/sjsonnet/test/resources/new_test_suite/error.isEmpty_number_type.jsonnet
new file mode 100644
index 000000000..1c5fe61ec
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.isEmpty_number_type.jsonnet
@@ -0,0 +1,2 @@
+// std.isEmpty should error on number type
+std.isEmpty(42)
diff --git a/sjsonnet/test/resources/new_test_suite/error.isEmpty_number_type.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.isEmpty_number_type.jsonnet.golden
new file mode 100644
index 000000000..53b0225ba
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.isEmpty_number_type.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: [std.isEmpty] isEmpty operates on strings, objects, and arrays, got number
diff --git a/sjsonnet/test/resources/new_test_suite/isEmpty_valid_types.jsonnet b/sjsonnet/test/resources/new_test_suite/isEmpty_valid_types.jsonnet
new file mode 100644
index 000000000..65fd5353d
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/isEmpty_valid_types.jsonnet
@@ -0,0 +1,6 @@
+// std.isEmpty should work for valid types and error on invalid types
+assert std.isEmpty("") == true : "empty string";
+assert std.isEmpty("hello") == false : "non-empty string";
+assert std.isEmpty([]) == true : "empty array";
+assert std.isEmpty({}) == true : "empty object";
+true
diff --git a/sjsonnet/test/resources/new_test_suite/isEmpty_valid_types.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/isEmpty_valid_types.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/isEmpty_valid_types.jsonnet.golden
@@ -0,0 +1 @@
+true
diff --git a/sjsonnet/test/src/sjsonnet/Std0150FunctionsTests.scala b/sjsonnet/test/src/sjsonnet/Std0150FunctionsTests.scala
index 5af4b51be..d808c3727 100644
--- a/sjsonnet/test/src/sjsonnet/Std0150FunctionsTests.scala
+++ b/sjsonnet/test/src/sjsonnet/Std0150FunctionsTests.scala
@@ -241,7 +241,7 @@ object Std0150FunctionsTests extends TestSuite {
       assert(
         evalErr("""std.isEmpty(10)""")
           .startsWith(
-            "sjsonnet.Error: [std.isEmpty] length operates on strings, objects, and arrays, got number"
+            "sjsonnet.Error: [std.isEmpty] isEmpty operates on strings, objects, and arrays, got number"
           )
       )
     }
diff --git a/sjsonnet/test/src/sjsonnet/StdLibOfficialCompatibilityTests.scala b/sjsonnet/test/src/sjsonnet/StdLibOfficialCompatibilityTests.scala
index 4cac8cade..cf065211f 100644
--- a/sjsonnet/test/src/sjsonnet/StdLibOfficialCompatibilityTests.scala
+++ b/sjsonnet/test/src/sjsonnet/StdLibOfficialCompatibilityTests.scala
@@ -37,9 +37,8 @@ object StdLibOfficialCompatibilityTests extends TestSuite {
       eval("""std.isEmpty("")""") ==> ujson.True
       eval("""std.isEmpty([])""") ==> ujson.True
       eval("""std.isEmpty({})""") ==> ujson.True
-      eval("""std.isEmpty(function() 1)""") ==> ujson.True
-      eval("""std.isEmpty(function(a, b) a)""") ==> ujson.False
-      assert(evalErr("""std.isEmpty(10)""").contains("length operates on strings"))
+      assert(evalErr("""std.isEmpty(function() 1)""").contains("isEmpty operates on strings"))
+      assert(evalErr("""std.isEmpty(10)""").contains("isEmpty operates on strings"))
     }
 
     test("escape string helpers stringify non-string inputs") {

From 860741c3b7f706041816180d960ebf90ba4fdce9 Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:45:01 +0800
Subject: [PATCH 08/13] fix: replace MatchError with descriptive error in +:
 nested field merge (#954)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

`mergeMember` threw a raw Scala `MatchError` when `+:` nested field
inheritance encountered incompatible type combinations (e.g., `{a: true}
+ {a+: 1}`), producing an unhelpful internal error instead of a
user-friendly message.

## Modification

- Replaced `throw new MatchError((l, r))` with `Error.fail("Cannot merge
" + l.prettyName + " with " + r.prettyName, pos)` in `Val.scala`
- Added directional tests: compatible types (string, number, array)
still merge correctly; incompatible types produce descriptive errors

## Result

`{a: true} + {a+: 1}` now produces "Cannot merge boolean with number"
instead of "Internal error: MatchError", matching go-jsonnet's
descriptive error style.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `{a: true} + {a+: 1}` | ERROR: Unexpected type boolean | ERROR: not
implemented | Internal error: MatchError ❌ | Cannot merge boolean with
number ✅ |
| `{a: "x"} + {a+: "y"}` | `{a: "xy"}` | `{a: "xy"}` | `{a: "xy"}` ✅ |
`{a: "xy"}` ✅ |
| `{a: 1} + {a+: 2}` | `{a: 3}` | `{a: 3}` | `{a: 3}` ✅ | `{a: 3}` ✅ |
---
 sjsonnet/src/sjsonnet/Val.scala                              | 2 +-
 .../error.plus_colon_merge_boolean_number.jsonnet            | 2 ++
 .../error.plus_colon_merge_boolean_number.jsonnet.golden     | 1 +
 .../error.plus_colon_merge_number_boolean.jsonnet            | 2 ++
 .../error.plus_colon_merge_number_boolean.jsonnet.golden     | 1 +
 .../new_test_suite/plus_colon_merge_type_success.jsonnet     | 5 +++++
 .../plus_colon_merge_type_success.jsonnet.golden             | 1 +
 7 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_boolean_number.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_boolean_number.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_number_boolean.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_number_boolean.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/plus_colon_merge_type_success.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/plus_colon_merge_type_success.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/Val.scala b/sjsonnet/src/sjsonnet/Val.scala
index fdd0b9dcc..65fbc557f 100644
--- a/sjsonnet/src/sjsonnet/Val.scala
+++ b/sjsonnet/src/sjsonnet/Val.scala
@@ -2287,7 +2287,7 @@ object Val {
         case (_, _: Val.Null) =>
           Error.fail("Cannot merge " + l.prettyName + " with null", pos)
         case _ =>
-          throw new MatchError((l, r))
+          Error.fail("Cannot merge " + l.prettyName + " with " + r.prettyName, pos)
       }
 
     def valueRaw(k: String, self: Obj, pos: Position, cacheOwner: Obj = null, cacheKey: Any = null)(
diff --git a/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_boolean_number.jsonnet b/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_boolean_number.jsonnet
new file mode 100644
index 000000000..e8cc29b4b
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_boolean_number.jsonnet
@@ -0,0 +1,2 @@
+// Incompatible types (boolean + number) should produce descriptive error, not MatchError
+({a: true} + {a+: 1}).a
diff --git a/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_boolean_number.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_boolean_number.jsonnet.golden
new file mode 100644
index 000000000..0dd4824dc
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_boolean_number.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: Cannot merge boolean with number
diff --git a/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_number_boolean.jsonnet b/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_number_boolean.jsonnet
new file mode 100644
index 000000000..8be7c3f04
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_number_boolean.jsonnet
@@ -0,0 +1,2 @@
+// Incompatible types (number + boolean) should produce descriptive error, not MatchError
+({a: 1} + {a+: true}).a
diff --git a/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_number_boolean.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_number_boolean.jsonnet.golden
new file mode 100644
index 000000000..bb3134ee7
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.plus_colon_merge_number_boolean.jsonnet.golden
@@ -0,0 +1 @@
+sjsonnet.Error: Cannot merge number with boolean
diff --git a/sjsonnet/test/resources/new_test_suite/plus_colon_merge_type_success.jsonnet b/sjsonnet/test/resources/new_test_suite/plus_colon_merge_type_success.jsonnet
new file mode 100644
index 000000000..642a68d26
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/plus_colon_merge_type_success.jsonnet
@@ -0,0 +1,5 @@
+// Test +: merge with compatible types
+assert ({a: "hello"} + {a+: " world"}).a == "hello world";
+assert ({a: 1} + {a+: 2}).a == 3;
+assert ({a: [1]} + {a+: [2]}).a == [1, 2];
+true
diff --git a/sjsonnet/test/resources/new_test_suite/plus_colon_merge_type_success.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/plus_colon_merge_type_success.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/plus_colon_merge_type_success.jsonnet.golden
@@ -0,0 +1 @@
+true

From b61b1c4810d9687b07572b4e99fdc66b7a7cc79e Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:45:25 +0800
Subject: [PATCH 09/13] fix: unify NaN checks across all arithmetic evaluation
 paths (#955)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

NaN handling was inconsistent across four arithmetic evaluation paths:
the main evaluator, comprehension fast path, inline optimizer, and
double-fast-path. Some paths detected NaN results and errored, while
others silently propagated NaN values.

## Modification

- Added NaN result checks to `OP_+`, `OP_-`, `OP_*` in all four
arithmetic paths
- Added NaN checks to `OP_%` and `OP_/` where they were previously
missing
- All paths now consistently report "not a number" when arithmetic
produces NaN (e.g., `Infinity + (-Infinity)`, `0 * Infinity`)
- Added directional tests for NaN-producing operations and regular
arithmetic

## Result

Arithmetic operations that produce NaN now consistently error across all
evaluation paths, eliminating the behavioral inconsistency between array
comprehension and top-level evaluation.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `local x = std.pow(2, 1024); x + (-x)` | ERROR: Overflow | ERROR:
non-finite | Inconsistent (varies by path) ❌ | ERROR: not a number ✅ |
| `local x = std.pow(2, 1024); 0 * x` | ERROR: Overflow | ERROR:
non-finite | Inconsistent ❌ | ERROR: not a number ✅ |
| `1 + 2` | `3` | `3` | `3` ✅ | `3` ✅ |
---
 sjsonnet/src/sjsonnet/Evaluator.scala         | 38 ++++++++++++++-----
 .../arithmetic_normal_operations.jsonnet      |  5 +++
 ...rithmetic_normal_operations.jsonnet.golden |  1 +
 ...error.arithmetic_overflow_addition.jsonnet |  2 +
 ...rithmetic_overflow_addition.jsonnet.golden |  2 +
 ...arithmetic_overflow_multiplication.jsonnet |  2 +
 ...tic_overflow_multiplication.jsonnet.golden |  2 +
 ...or.arithmetic_overflow_subtraction.jsonnet |  2 +
 ...hmetic_overflow_subtraction.jsonnet.golden |  2 +
 9 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/arithmetic_normal_operations.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/arithmetic_normal_operations.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_addition.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_addition.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_multiplication.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_multiplication.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_subtraction.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_subtraction.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/Evaluator.scala b/sjsonnet/src/sjsonnet/Evaluator.scala
index 738e69483..e41deda5d 100644
--- a/sjsonnet/src/sjsonnet/Evaluator.scala
+++ b/sjsonnet/src/sjsonnet/Evaluator.scala
@@ -241,7 +241,7 @@ class Evaluator(
   @inline private def tryInlineArith(op: Int, ld: Double, rd: Double, pos: Position): Val =
     (op: @switch) match {
       case Expr.BinaryOp.OP_* =>
-        val r = ld * rd; if (r.isInfinite) null else Val.cachedNum(pos, r)
+        val r = ld * rd; if (r.isNaN || r.isInfinite) null else Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_/ =>
         if (rd == 0) null
         else { val r = ld / rd; if (r.isNaN || r.isInfinite) null else Val.cachedNum(pos, r) }
@@ -249,9 +249,9 @@ class Evaluator(
         if (rd == 0) null
         else { val r = ld % rd; if (r.isNaN) null else Val.cachedNum(pos, r) }
       case Expr.BinaryOp.OP_+ =>
-        val r = ld + rd; if (r.isInfinite) null else Val.cachedNum(pos, r)
+        val r = ld + rd; if (r.isNaN || r.isInfinite) null else Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_- =>
-        val r = ld - rd; if (r.isInfinite) null else Val.cachedNum(pos, r)
+        val r = ld - rd; if (r.isNaN || r.isInfinite) null else Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_<< =>
         val ll = ld.toLong; val rl = rd.toLong
         if (ll.toDouble != ld || rl.toDouble != rd) null // not safe integers
@@ -707,23 +707,32 @@ class Evaluator(
     val ld = ln.asDouble
     val rd = rn.asDouble
     (op: @switch) match {
-      case Expr.BinaryOp.OP_+ => Val.cachedNum(pos, ld + rd)
+      case Expr.BinaryOp.OP_+ =>
+        val r = ld + rd
+        if (r.isNaN) Error.fail("not a number", pos)
+        if (r.isInfinite) Error.fail("overflow", pos)
+        Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_- =>
         val r = ld - rd
+        if (r.isNaN) Error.fail("not a number", pos)
         if (r.isInfinite) Error.fail("overflow", pos)
         Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_* =>
         val r = ld * rd
+        if (r.isNaN) Error.fail("not a number", pos)
         if (r.isInfinite) Error.fail("overflow", pos)
         Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_/ =>
         if (rd == 0) Error.fail("Division by zero.", pos)
         val r = ld / rd
+        if (r.isNaN) Error.fail("not a number", pos)
         if (r.isInfinite) Error.fail("overflow", pos)
         Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_% =>
         if (rd == 0) Error.fail("Division by zero.", pos)
-        Val.cachedNum(pos, ld % rd)
+        val r = ld % rd
+        if (r.isNaN) Error.fail("not a number", pos)
+        Val.cachedNum(pos, r)
       // Use position-free static singletons for boolean results — this method is only called
       // from comprehension fast paths where position info on boolean results is unnecessary.
       // Avoids 1 object allocation per comparison in inner loops (significant for 1M+ iterations).
@@ -858,23 +867,28 @@ class Evaluator(
     (e.op: @switch) match {
       case Expr.BinaryOp.OP_* =>
         val r = visitExprAsDouble(e.lhs) * visitExprAsDouble(e.rhs)
+        if (r.isNaN) Error.fail("not a number", pos)
         if (r.isInfinite) Error.fail("overflow", pos); r
       case Expr.BinaryOp.OP_/ =>
         val l = visitExprAsDouble(e.lhs)
         val r = visitExprAsDouble(e.rhs)
         if (r == 0) Error.fail("Division by zero.", pos)
         val result = l / r
+        if (result.isNaN) Error.fail("not a number", pos)
         if (result.isInfinite) Error.fail("overflow", pos); result
       case Expr.BinaryOp.OP_% =>
         val l = visitExprAsDouble(e.lhs)
         val r = visitExprAsDouble(e.rhs)
         if (r == 0) Error.fail("Division by zero.", pos)
-        l % r
+        val result = l % r
+        if (result.isNaN) Error.fail("not a number", pos); result
       case Expr.BinaryOp.OP_+ =>
         val r = visitExprAsDouble(e.lhs) + visitExprAsDouble(e.rhs)
+        if (r.isNaN) Error.fail("not a number", pos)
         if (r.isInfinite) Error.fail("overflow", pos); r
       case Expr.BinaryOp.OP_- =>
         val r = visitExprAsDouble(e.lhs) - visitExprAsDouble(e.rhs)
+        if (r.isNaN) Error.fail("not a number", pos)
         if (r.isInfinite) Error.fail("overflow", pos); r
       case Expr.BinaryOp.OP_<< =>
         val ll = visitExprAsDouble(e.lhs).toSafeLong(pos)
@@ -1335,10 +1349,12 @@ class Evaluator(
       // Pure numeric fast path: avoid intermediate Val.Num allocation
       case Expr.BinaryOp.OP_* =>
         val r = visitExprAsDouble(e.lhs) * visitExprAsDouble(e.rhs)
+        if (r.isNaN) Error.fail("not a number", pos)
         if (r.isInfinite) Error.fail("overflow", pos)
         Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_- =>
         val r = visitExprAsDouble(e.lhs) - visitExprAsDouble(e.rhs)
+        if (r.isNaN) Error.fail("not a number", pos)
         if (r.isInfinite) Error.fail("overflow", pos)
         Val.cachedNum(pos, r)
       case Expr.BinaryOp.OP_/ =>
@@ -1371,9 +1387,13 @@ class Evaluator(
         val l = visitExpr(e.lhs)
         val r = visitExpr(e.rhs)
         (l, r) match {
-          case (Val.Num(_, l), Val.Num(_, r)) => Val.cachedNum(pos, l + r)
-          case (l: Val.Str, r: Val.Str)       => Val.Str.concat(pos, l, r)
-          case (n: Val.Num, r: Val.Str)       =>
+          case (Val.Num(_, l), Val.Num(_, r)) =>
+            val result = l + r
+            if (result.isNaN) Error.fail("not a number", pos)
+            if (result.isInfinite) Error.fail("overflow", pos)
+            Val.cachedNum(pos, result)
+          case (l: Val.Str, r: Val.Str) => Val.Str.concat(pos, l, r)
+          case (n: Val.Num, r: Val.Str) =>
             Val.Str.concat(pos, Val.Str(pos, RenderUtils.renderDouble(n.asDouble)), r)
           case (l: Val.Str, n: Val.Num) =>
             Val.Str.concat(pos, l, Val.Str(pos, RenderUtils.renderDouble(n.asDouble)))
diff --git a/sjsonnet/test/resources/new_test_suite/arithmetic_normal_operations.jsonnet b/sjsonnet/test/resources/new_test_suite/arithmetic_normal_operations.jsonnet
new file mode 100644
index 000000000..bf389610e
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/arithmetic_normal_operations.jsonnet
@@ -0,0 +1,5 @@
+// Test that normal arithmetic operations still work correctly.
+assert 1 + 2 == 3;
+assert 3 * 4 == 12;
+assert 10 - 3 == 7;
+true
diff --git a/sjsonnet/test/resources/new_test_suite/arithmetic_normal_operations.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/arithmetic_normal_operations.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/arithmetic_normal_operations.jsonnet.golden
@@ -0,0 +1 @@
+true
diff --git a/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_addition.jsonnet b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_addition.jsonnet
new file mode 100644
index 000000000..872148202
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_addition.jsonnet
@@ -0,0 +1,2 @@
+// Test that addition overflow (Infinity) errors instead of silently propagating.
+1e308 + 1e308
diff --git a/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_addition.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_addition.jsonnet.golden
new file mode 100644
index 000000000..d6cfd6265
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_addition.jsonnet.golden
@@ -0,0 +1,2 @@
+sjsonnet.Error: overflow
+    at [<root>].(error.arithmetic_overflow_addition.jsonnet:2:7)
diff --git a/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_multiplication.jsonnet b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_multiplication.jsonnet
new file mode 100644
index 000000000..0ee10de98
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_multiplication.jsonnet
@@ -0,0 +1,2 @@
+// Test that multiplication overflow (Infinity) errors instead of silently propagating.
+1e308 * 1e308
diff --git a/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_multiplication.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_multiplication.jsonnet.golden
new file mode 100644
index 000000000..474000746
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_multiplication.jsonnet.golden
@@ -0,0 +1,2 @@
+sjsonnet.Error: overflow
+    at [<root>].(error.arithmetic_overflow_multiplication.jsonnet:2:7)
diff --git a/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_subtraction.jsonnet b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_subtraction.jsonnet
new file mode 100644
index 000000000..55906edaf
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_subtraction.jsonnet
@@ -0,0 +1,2 @@
+// Test that subtraction overflow (Infinity) errors instead of silently propagating.
+-1e308 - 1e308
diff --git a/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_subtraction.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_subtraction.jsonnet.golden
new file mode 100644
index 000000000..43eeae58e
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/error.arithmetic_overflow_subtraction.jsonnet.golden
@@ -0,0 +1,2 @@
+sjsonnet.Error: overflow
+    at [<root>].(error.arithmetic_overflow_subtraction.jsonnet:2:8)

From 56b348c603a5bec1e1458e77315eba16bcdec0b9 Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:45:42 +0800
Subject: [PATCH 10/13] fix: TomlRenderer large integers render as decimal not
 scientific notation (#956)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

`TomlRenderer.visitFloat64` rendered large integers like `1e20` as
`"1.0E20"` (scientific notation), which is invalid TOML integer format.
go-jsonnet renders `1e20` as `100000000000000000000`. The `Renderer` and
`BaseCharRenderer` had `BigDecimal` fallback logic, but `TomlRenderer`
was missing it.

## Modification

- Added `BigDecimal` fallback between the Long-range check and
`Double.toString`: when `math.round(d).toDouble != d` but `d % 1 == 0`,
uses `BigDecimal.toBigInt` for exact decimal output
- Added directional tests: large integer (1e20), regular integer (42),
and fraction (3.14)

## Result

`std.manifestToml({a: 1e20})` now renders `a = 100000000000000000000`
instead of `a = 1.0E20`, matching go-jsonnet and producing valid TOML
output.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `std.manifestToml({a: 1e20})` | `a = 100000000000000000000` | `a =
100000000000000000000` | `a = 1.0E20` ❌ | `a = 100000000000000000000` ✅
|
| `std.manifestToml({a: 42})` | `a = 42` | `a = 42` | `a = 42` ✅ | `a =
42` ✅ |
| `std.manifestToml({a: 3.14})` | `a = 3.14` | `a = 3.14` | `a = 3.14` ✅
| `a = 3.14` ✅ |
---
 sjsonnet/src/sjsonnet/TomlRenderer.scala                 | 4 +++-
 .../new_test_suite/toml_renderer_large_integer.jsonnet   | 9 +++++++++
 .../toml_renderer_large_integer.jsonnet.golden           | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/toml_renderer_large_integer.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/toml_renderer_large_integer.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/TomlRenderer.scala b/sjsonnet/src/sjsonnet/TomlRenderer.scala
index 92d88a5e6..a13256ce5 100644
--- a/sjsonnet/src/sjsonnet/TomlRenderer.scala
+++ b/sjsonnet/src/sjsonnet/TomlRenderer.scala
@@ -63,7 +63,9 @@ class TomlRenderer(
       case d if java.lang.Double.isNaN(d)              => out.write("nan")
       case d if java.lang.Double.compare(d, -0.0) == 0 => out.write("-0")
       case d if math.round(d).toDouble == d => out.write(java.lang.Long.toString(d.toLong))
-      case d                                => out.write(java.lang.Double.toString(d))
+      case d if d % 1 == 0                  =>
+        out.write(BigDecimal(d).setScale(0, BigDecimal.RoundingMode.HALF_EVEN).toBigInt.toString())
+      case d => out.write(java.lang.Double.toString(d))
     }
     flush
   }
diff --git a/sjsonnet/test/resources/new_test_suite/toml_renderer_large_integer.jsonnet b/sjsonnet/test/resources/new_test_suite/toml_renderer_large_integer.jsonnet
new file mode 100644
index 000000000..3735f470a
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/toml_renderer_large_integer.jsonnet
@@ -0,0 +1,9 @@
+// TomlRenderer renders large integers as decimal instead of scientific notation
+local large = std.manifestToml({a: 1e20});
+assert std.length(std.findSubstr("E", large)) == 0 : "Large integer must not contain scientific notation 'E'";
+assert std.length(std.findSubstr("100000000000000000000", large)) > 0 : "Large integer must render as decimal";
+// Regular integers still work
+assert std.manifestToml({a: 42}) == "a = 42" : "Regular integer must render correctly";
+// Fractions still render as floats
+assert std.manifestToml({a: 3.14}) == "a = 3.14" : "Float must render correctly";
+true
diff --git a/sjsonnet/test/resources/new_test_suite/toml_renderer_large_integer.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/toml_renderer_large_integer.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/toml_renderer_large_integer.jsonnet.golden
@@ -0,0 +1 @@
+true

From cef60c91d5758631074a2354bcb8311ddd7acbae Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 11:46:05 +0800
Subject: [PATCH 11/13] fix: YamlRenderer block scalar trailing newlines and
 leading whitespace (#957)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Motivation

`YamlRenderer` block scalar rendering had two bugs: (1) multiple
trailing newlines were lost because `Pattern.split` discards trailing
empty strings and the code always used `|` (clip) mode; (2) strings with
leading whitespace were missing the required YAML indent indicator
(e.g., `|2`), causing YAML parsers to misinterpret leading spaces as
structural indentation.

Additionally, `PrettyYamlRenderer` had an off-by-one bug (`len > 2`
instead of `len > 1`) that caused 2-character strings like `"\n\n"` to
use clip mode `|` instead of keep mode `|+`.

## Modification

- Changed `split(s.toString)` to `split(str, -1)` to preserve trailing
empty strings
- Added detection of multiple trailing newlines to use `|+` (keep) mode
instead of `|` (clip)
- Added `blockOffsetNumeral` for leading whitespace indent indicator
when first character is a space
- Used `appendString(blockStyle)` for the block style string (append
only accepts Char/Int)
- Fixed `PrettyYamlRenderer` off-by-one: `len > 2` → `len > 1`

## Result

YAML block scalars now correctly preserve multiple trailing newlines and
include indent indicators for leading whitespace, producing
spec-compliant YAML output.

## References

| Expression | go-jsonnet v0.22.0 | jrsonnet v0.5.0-pre98 | sjsonnet
(before) | sjsonnet (after) |
|---|---|---|---|---|
| `std.manifestYamlDoc({a: "hello\n\n\n"})` | `"a": \|+` with trailing
newlines | `"a": \|+` with trailing newlines | `"a": \|` truncated ❌ |
`"a": \|+` correct ✅ |
---
 sjsonnet/src/sjsonnet/PrettyYamlRenderer.scala      |  2 +-
 sjsonnet/src/sjsonnet/YamlRenderer.scala            | 13 +++++++++----
 ...renderer_block_scalar_leading_whitespace.jsonnet |  9 +++++++++
 ...r_block_scalar_leading_whitespace.jsonnet.golden |  1 +
 ..._renderer_block_scalar_trailing_newlines.jsonnet | 10 ++++++++++
 ...er_block_scalar_trailing_newlines.jsonnet.golden |  1 +
 6 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_leading_whitespace.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_leading_whitespace.jsonnet.golden
 create mode 100644 sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_trailing_newlines.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_trailing_newlines.jsonnet.golden

diff --git a/sjsonnet/src/sjsonnet/PrettyYamlRenderer.scala b/sjsonnet/src/sjsonnet/PrettyYamlRenderer.scala
index 8d387f884..743a8db53 100644
--- a/sjsonnet/src/sjsonnet/PrettyYamlRenderer.scala
+++ b/sjsonnet/src/sjsonnet/PrettyYamlRenderer.scala
@@ -278,7 +278,7 @@ object PrettyYamlRenderer {
     val splits = YamlRenderer.newlinePattern.split(str, -1)
     val blockOffsetNumeral = if (str.charAt(0) != ' ') "" else indent
     val (blockStyle, dropRight) =
-      (str.charAt(len - 1), if (len > 2) Some(str.charAt(len - 2)) else None) match {
+      (str.charAt(len - 1), if (len > 1) Some(str.charAt(len - 2)) else None) match {
         case ('\n', Some('\n')) => (s"|$blockOffsetNumeral+", 1)
         case ('\n', _)          => (s"|$blockOffsetNumeral", 1)
         case (_, _)             => (s"|$blockOffsetNumeral-", 0)
diff --git a/sjsonnet/src/sjsonnet/YamlRenderer.scala b/sjsonnet/src/sjsonnet/YamlRenderer.scala
index 07dff93bc..432559980 100644
--- a/sjsonnet/src/sjsonnet/YamlRenderer.scala
+++ b/sjsonnet/src/sjsonnet/YamlRenderer.scala
@@ -46,13 +46,18 @@ class YamlRenderer(
       elemBuilder.append('"')
       elemBuilder.append('"')
     } else if (s.charAt(len - 1) == '\n') {
-      val splits = YamlRenderer.newlinePattern.split(s.toString)
-      elemBuilder.append('|')
+      val str = s.toString
+      val splits = YamlRenderer.newlinePattern.split(str, -1)
+      val blockOffsetNumeral = if (str.charAt(0) != ' ') "" else indent
+      val (blockStyle, dropRight) =
+        if (len > 1 && str.charAt(len - 2) == '\n') (s"|${blockOffsetNumeral}+", 1)
+        else (s"|${blockOffsetNumeral}", 1)
+      appendString(blockStyle)
       depth += 1
-      splits.foreach { split =>
+      splits.dropRight(dropRight).foreach { split =>
         newlineBuffered = true
         flushBuffer()
-        appendString(split) // TODO escaping?
+        appendString(split)
       }
       depth -= 1
     } else {
diff --git a/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_leading_whitespace.jsonnet b/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_leading_whitespace.jsonnet
new file mode 100644
index 000000000..0999269a6
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_leading_whitespace.jsonnet
@@ -0,0 +1,9 @@
+// Test YAML block scalar leading whitespace handling.
+// Strings with leading whitespace require an indent indicator (e.g., |2).
+// Strings without leading whitespace should not have an indent indicator.
+local contains(haystack, needle) = std.length(std.findSubstr(needle, haystack)) > 0;
+local leading = std.manifestYamlDoc("  foo\n  bar\n");
+local noLeading = std.manifestYamlDoc("foo\nbar\n");
+assert contains(leading, "|2") : "leading whitespace requires indent indicator |2";
+assert !contains(noLeading, "|2") : "no leading whitespace means no indent indicator";
+true
diff --git a/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_leading_whitespace.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_leading_whitespace.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_leading_whitespace.jsonnet.golden
@@ -0,0 +1 @@
+true
diff --git a/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_trailing_newlines.jsonnet b/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_trailing_newlines.jsonnet
new file mode 100644
index 000000000..5ce187743
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_trailing_newlines.jsonnet
@@ -0,0 +1,10 @@
+// Test YAML block scalar trailing newline handling.
+// Single trailing newline should use clip mode (|), not keep mode (|+).
+// Multiple trailing newlines should use keep mode (|+).
+local contains(haystack, needle) = std.length(std.findSubstr(needle, haystack)) > 0;
+local singleNl = std.manifestYamlDoc("foo\nbar\n");
+local multiNl = std.manifestYamlDoc("foo\nbar\n\n");
+assert contains(singleNl, "|") : "single trailing newline should use clip mode |";
+assert !contains(singleNl, "|+") : "single trailing newline should not use keep mode |+";
+assert contains(multiNl, "|+") : "multiple trailing newlines should use keep mode |+";
+true
diff --git a/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_trailing_newlines.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_trailing_newlines.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/yaml_renderer_block_scalar_trailing_newlines.jsonnet.golden
@@ -0,0 +1 @@
+true

From 58d6d9c2bf548415c54485b4a5e5e238eb2f7b7d Mon Sep 17 00:00:00 2001
From: He-Pin <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 18:22:01 +0800
Subject: [PATCH 12/13] fix: std.parseYaml handles YAML 1.2 modern octal syntax
 (0o777)

Motivation:
SnakeYAML's SafeConstructor uses YAML 1.1 implicit type resolution which
does not recognize the 0o prefix for octal integers introduced in YAML 1.2.
This caused std.parseYaml to treat unquoted 0o777 as the string "0o777"
instead of the integer 511, diverging from go-jsonnet and jrsonnet.

Modification:
Replaced SafeConstructor-based parsing with composeAll() which gives access
to raw YAML nodes with scalar style information. Added yamlNodeToJson()
that handles YAML 1.2 octal (0o prefix) for plain (unquoted) scalars while
correctly preserving quoted values as strings. Also handles all other YAML
scalar types (int, float, bool, null) with full YAML 1.1 compatibility.

Result:
std.parseYaml now correctly parses both legacy (0777) and modern (0o777)
octal syntax for unquoted values, while quoted "0o777" remains a string,
matching go-jsonnet and jrsonnet behavior exactly.

| YAML input | go-jsonnet v0.22.0 | jrsonnet 0.5.0-pre99 | sjsonnet (before) | sjsonnet (after) |
|-----------|-------------------|---------------------|-------------------|-----------------|
| 0777      | 511               | 511                 | 511               | 511             |
| 0o777     | 511               | 511                 | "0o777" (bug)     | 511             |
| 0o10      | 8                 | 8                   | "0o10" (bug)      | 8               |
| -0o777    | -511              | -511                | "-0o777" (bug)    | -511            |
| "0o777"   | "0o777"           | "0o777"             | "0o777"           | "0o777"         |
---
 sjsonnet/src-jvm/sjsonnet/Platform.scala      | 125 +++++++++++++-----
 .../parseyaml_yaml12_octal.jsonnet            |  20 +++
 .../parseyaml_yaml12_octal.jsonnet.golden     |   1 +
 3 files changed, 114 insertions(+), 32 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/parseyaml_yaml12_octal.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/parseyaml_yaml12_octal.jsonnet.golden

diff --git a/sjsonnet/src-jvm/sjsonnet/Platform.scala b/sjsonnet/src-jvm/sjsonnet/Platform.scala
index 4ba3e07b7..51ca1cc33 100644
--- a/sjsonnet/src-jvm/sjsonnet/Platform.scala
+++ b/sjsonnet/src-jvm/sjsonnet/Platform.scala
@@ -10,8 +10,8 @@ import com.google.re2j.Pattern
 import net.jpountz.xxhash.{StreamingXXHash64, XXHashFactory}
 import org.tukaani.xz.LZMA2Options
 import org.tukaani.xz.XZOutputStream
-import org.yaml.snakeyaml.{LoaderOptions, Yaml}
-import org.yaml.snakeyaml.constructor.SafeConstructor
+import org.yaml.snakeyaml.{DumperOptions, LoaderOptions, Yaml}
+import org.yaml.snakeyaml.nodes.{MappingNode, Node, ScalarNode, SequenceNode, Tag}
 
 import scala.annotation.nowarn
 import scala.collection.compat.*
@@ -73,48 +73,109 @@ object Platform {
     xzBytes(s.getBytes(UTF_8), compressionLevel)
   }
 
-  private def nodeToJson(node: Any): ujson.Value = node match {
-    case m: java.util.List[?] =>
-      val buf = new mutable.ArrayBuffer[ujson.Value](m.size)
-      for (n <- m.asScala) {
-        buf += nodeToJson(n)
+  private val Yaml12OctalPattern = java.util.regex.Pattern.compile("[-+]?0o[0-7]+")
+
+  private def yamlNodeToJson(node: Node): ujson.Value = node match {
+    case sn: ScalarNode =>
+      val value = sn.getValue
+      val tag = sn.getTag
+      val isPlain = sn.getScalarStyle == DumperOptions.ScalarStyle.PLAIN
+
+      if (isPlain && Yaml12OctalPattern.matcher(value).matches()) {
+        val negative = value.charAt(0) == '-'
+        val octalPart =
+          if (negative || value.charAt(0) == '+') value.substring(3) else value.substring(2)
+        val result = java.lang.Long.parseUnsignedLong(octalPart, 8)
+        val signed = if (negative) -result else result
+        ujson.Num(signed.toDouble)
+      } else if (tag == Tag.INT) {
+        val cleaned = value.replace("_", "")
+        val result: Long =
+          if (cleaned.startsWith("0x") || cleaned.startsWith("-0x") || cleaned.startsWith("+0x")) {
+            val negative = cleaned.startsWith("-")
+            val hex =
+              if (negative || cleaned.startsWith("+")) cleaned.substring(3)
+              else cleaned.substring(2)
+            val v = java.lang.Long.parseUnsignedLong(hex, 16)
+            if (negative) -v else v
+          } else if (
+            cleaned.startsWith("0b") || cleaned.startsWith("-0b") || cleaned.startsWith("+0b")
+          ) {
+            val negative = cleaned.startsWith("-")
+            val bin =
+              if (negative || cleaned.startsWith("+")) cleaned.substring(3)
+              else cleaned.substring(2)
+            val v = java.lang.Long.parseUnsignedLong(bin, 2)
+            if (negative) -v else v
+          } else if (cleaned.length > 1 && cleaned.startsWith("0") && !cleaned.contains(".")) {
+            val negative = cleaned.startsWith("-")
+            val oct = if (negative || cleaned.startsWith("+")) cleaned.substring(1) else cleaned
+            val v = java.lang.Long.parseUnsignedLong(oct, 8)
+            if (negative) -v else v
+          } else if (cleaned.contains(":")) {
+            val parts = cleaned.split(":")
+            parts.foldLeft(0L)((acc, p) => acc * 60 + p.trim.toLong)
+          } else {
+            cleaned.toLong
+          }
+        ujson.Num(result.toDouble)
+      } else if (tag == Tag.FLOAT) {
+        val cleaned = value.replace("_", "")
+        val result = cleaned match {
+          case ".inf" | ".Inf" | ".INF"    => Double.PositiveInfinity
+          case "-.inf" | "-.Inf" | "-.INF" => Double.NegativeInfinity
+          case ".nan" | ".NaN" | ".NAN"    => Double.NaN
+          case s if s.contains(":")        =>
+            s.split(":").foldLeft(0.0)((acc, p) => acc * 60 + p.trim.toDouble)
+          case s => s.toDouble
+        }
+        ujson.Num(result)
+      } else if (tag == Tag.BOOL) {
+        ujson.Bool(value.toLowerCase match {
+          case "true" | "yes" | "on"  => true
+          case "false" | "no" | "off" => false
+          case _                      => Error.fail("Invalid YAML boolean: " + value)
+        })
+      } else if (tag == Tag.NULL) {
+        ujson.Null
+      } else {
+        ujson.Str(value)
       }
-      ujson.Arr(buf)
-    case m: java.util.Map[?, ?] =>
+
+    case mn: MappingNode =>
       val buf = upickle.core.LinkedHashMap[String, ujson.Value]()
-      buf.sizeHint(m.size)
-      for ((key, value) <- m.asScala) {
-        key match {
-          case k: String => buf(k) = nodeToJson(value)
-          case _ => Error.fail("Invalid YAML mapping key class: " + key.getClass.getSimpleName)
+      buf.sizeHint(mn.getValue.size)
+      for (tuple <- mn.getValue.asScala) {
+        val key = tuple.getKeyNode match {
+          case sn: ScalarNode => sn.getValue
+          case other          => Error.fail("Invalid YAML mapping key type: " + other.getTag)
         }
+        buf(key) = yamlNodeToJson(tuple.getValueNode)
       }
       ujson.Obj(buf)
-    case null          => ujson.Null
-    case v: String     => ujson.Str(v)
-    case v: Boolean    => ujson.Bool(v)
-    case v: Int        => ujson.Num(v.toDouble)
-    case v: Long       => ujson.Num(v.toDouble)
-    case v: Double     => ujson.Num(v)
-    case v: Float      => ujson.Num(v.toDouble)
-    case v: BigDecimal => ujson.Num(v.toDouble)
-    case v: BigInt     => ujson.Num(v.toDouble)
-    case v: Short      => ujson.Num(v.toDouble)
-    case _             =>
+
+    case sn: SequenceNode =>
+      val buf = new mutable.ArrayBuffer[ujson.Value](sn.getValue.size)
+      for (n <- sn.getValue.asScala) {
+        buf += yamlNodeToJson(n)
+      }
+      ujson.Arr(buf)
+
+    case _ =>
       Error.fail("Unsupported YAML node type: " + node.getClass.getSimpleName)
   }
 
   def yamlToJson(yamlString: String): ujson.Value = {
     try {
-      val yaml =
-        new Yaml(new SafeConstructor(new LoaderOptions())).loadAll(yamlString).asScala.toSeq
-      yaml.size match {
+      val yaml = new Yaml(new LoaderOptions())
+      val docs = yaml.composeAll(new java.io.StringReader(yamlString)).asScala.toSeq
+      docs.size match {
         case 0 => ujson.Null
-        case 1 => nodeToJson(yaml.head)
+        case 1 => yamlNodeToJson(docs.head)
         case _ =>
-          val buf = new mutable.ArrayBuffer[ujson.Value](yaml.size)
-          for (doc <- yaml) {
-            buf += nodeToJson(doc)
+          val buf = new mutable.ArrayBuffer[ujson.Value](docs.size)
+          for (doc <- docs) {
+            buf += yamlNodeToJson(doc)
           }
           ujson.Arr(buf)
       }
diff --git a/sjsonnet/test/resources/new_test_suite/parseyaml_yaml12_octal.jsonnet b/sjsonnet/test/resources/new_test_suite/parseyaml_yaml12_octal.jsonnet
new file mode 100644
index 000000000..e40a6d0f9
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/parseyaml_yaml12_octal.jsonnet
@@ -0,0 +1,20 @@
+// Test YAML 1.2 modern octal syntax (0o prefix) for unquoted scalars.
+// Quoted values must remain strings. Legacy octal (0 prefix) still works.
+local yaml = std.parseYaml(|||
+  a: 0777
+  b: 0o777
+  c: 0
+  d: 0o10
+  e: -0o777
+  f: "0o777"
+  g: '0o777'
+|||);
+
+std.assertEqual(yaml.a, 511) &&
+std.assertEqual(yaml.b, 511) &&
+std.assertEqual(yaml.c, 0) &&
+std.assertEqual(yaml.d, 8) &&
+std.assertEqual(yaml.e, -511) &&
+std.assertEqual(yaml.f, "0o777") &&
+std.assertEqual(yaml.g, "0o777") &&
+true
diff --git a/sjsonnet/test/resources/new_test_suite/parseyaml_yaml12_octal.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/parseyaml_yaml12_octal.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/parseyaml_yaml12_octal.jsonnet.golden
@@ -0,0 +1 @@
+true

From 5fe1494d492791ce352701978784c86297886990 Mon Sep 17 00:00:00 2001
From: He-Pin <hepin1989@gmail.com>
Date: Thu, 18 Jun 2026 18:23:51 +0800
Subject: [PATCH 13/13] fix: std.parseYaml wraps single-doc YAML with explicit
 --- in array

Motivation:
go-jsonnet treats YAML input containing an explicit document start marker
(---) as a multi-document stream, always returning an array even when
there is only one document. sjsonnet returned the single document
directly, diverging from go-jsonnet for inputs like "---", "---\n",
and "---\na: 1".

Note: jrsonnet 0.5.0-pre99 does NOT wrap single-doc YAML with --- in
an array (returns null for "---"), so this aligns sjsonnet with
go-jsonnet's stricter behavior.

Modification:
Added YamlDocStartPattern regex that detects --- followed by whitespace
or end-of-string (per YAML spec). When detected and composeAll returns
a single document, the result is wrapped in an array. Updated existing
ParseYaml tests and go_test_suite golden file to match go-jsonnet.

Result:
std.parseYaml now correctly handles YAML document start markers,
matching go-jsonnet behavior for all edge cases.

| YAML input | go-jsonnet v0.22.0 | jrsonnet 0.5.0-pre99 | sjsonnet (before) | sjsonnet (after) |
|-----------|-------------------|---------------------|-------------------|-----------------|
| "---"     | [null]            | null                | null (bug)        | [null]          |
| "---\n"   | [null]            | null                | null (bug)        | [null]          |
| "---\na:1"| [{a:1}]           | {a:1}               | {a:1} (bug)       | [{a:1}]         |
| "--- 3\n" | [3]               | 3                   | 3 (bug)           | [3]             |
| "a: 1"    | {a:1}             | {a:1}               | {a:1}             | {a:1}           |
---
 sjsonnet/src-jvm/sjsonnet/Platform.scala             | 10 +++++++---
 .../resources/go_test_suite/parseYaml.jsonnet.golden |  4 +++-
 .../new_test_suite/parseyaml_doc_marker.jsonnet      |  9 +++++++++
 .../parseyaml_doc_marker.jsonnet.golden              |  1 +
 sjsonnet/test/src/sjsonnet/ParseYamlTests.scala      | 12 ++++++------
 5 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 sjsonnet/test/resources/new_test_suite/parseyaml_doc_marker.jsonnet
 create mode 100644 sjsonnet/test/resources/new_test_suite/parseyaml_doc_marker.jsonnet.golden

diff --git a/sjsonnet/src-jvm/sjsonnet/Platform.scala b/sjsonnet/src-jvm/sjsonnet/Platform.scala
index 51ca1cc33..e1fdc250a 100644
--- a/sjsonnet/src-jvm/sjsonnet/Platform.scala
+++ b/sjsonnet/src-jvm/sjsonnet/Platform.scala
@@ -165,14 +165,18 @@ object Platform {
       Error.fail("Unsupported YAML node type: " + node.getClass.getSimpleName)
   }
 
+  private val YamlDocStartPattern =
+    java.util.regex.Pattern.compile("\\A\\s*---(?:[ \\t\\n\\r]|\\z)")
+
   def yamlToJson(yamlString: String): ujson.Value = {
     try {
       val yaml = new Yaml(new LoaderOptions())
       val docs = yaml.composeAll(new java.io.StringReader(yamlString)).asScala.toSeq
+      val hasExplicitDocStart = YamlDocStartPattern.matcher(yamlString).find()
       docs.size match {
-        case 0 => ujson.Null
-        case 1 => yamlNodeToJson(docs.head)
-        case _ =>
+        case 0                         => ujson.Null
+        case 1 if !hasExplicitDocStart => yamlNodeToJson(docs.head)
+        case _                         =>
           val buf = new mutable.ArrayBuffer[ujson.Value](docs.size)
           for (doc <- docs) {
             buf += yamlNodeToJson(doc)
diff --git a/sjsonnet/test/resources/go_test_suite/parseYaml.jsonnet.golden b/sjsonnet/test/resources/go_test_suite/parseYaml.jsonnet.golden
index 6082f3374..a5eb13dd6 100644
--- a/sjsonnet/test/resources/go_test_suite/parseYaml.jsonnet.golden
+++ b/sjsonnet/test/resources/go_test_suite/parseYaml.jsonnet.golden
@@ -52,5 +52,7 @@
       null,
       2
    ],
-   null
+   [
+      null
+   ]
 ]
diff --git a/sjsonnet/test/resources/new_test_suite/parseyaml_doc_marker.jsonnet b/sjsonnet/test/resources/new_test_suite/parseyaml_doc_marker.jsonnet
new file mode 100644
index 000000000..506bac3a0
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/parseyaml_doc_marker.jsonnet
@@ -0,0 +1,9 @@
+// Test that explicit --- document start markers cause single-doc YAML
+// to be wrapped in an array, matching go-jsonnet behavior.
+std.assertEqual(std.parseYaml("---"), [null]) &&
+std.assertEqual(std.parseYaml("---\n"), [null]) &&
+std.assertEqual(std.parseYaml("---\na: 1"), [{a: 1}]) &&
+std.assertEqual(std.parseYaml("--- 3\n"), [3]) &&
+std.assertEqual(std.parseYaml("---a: 1"), {"---a": 1}) &&
+std.assertEqual(std.parseYaml("a: 1"), {a: 1}) &&
+true
diff --git a/sjsonnet/test/resources/new_test_suite/parseyaml_doc_marker.jsonnet.golden b/sjsonnet/test/resources/new_test_suite/parseyaml_doc_marker.jsonnet.golden
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/sjsonnet/test/resources/new_test_suite/parseyaml_doc_marker.jsonnet.golden
@@ -0,0 +1 @@
+true
diff --git a/sjsonnet/test/src/sjsonnet/ParseYamlTests.scala b/sjsonnet/test/src/sjsonnet/ParseYamlTests.scala
index 880bc2854..bf9be541d 100644
--- a/sjsonnet/test/src/sjsonnet/ParseYamlTests.scala
+++ b/sjsonnet/test/src/sjsonnet/ParseYamlTests.scala
@@ -46,12 +46,12 @@ object ParseYamlTests extends TestSuite {
     }
     test {
       // Scalar documents can start on the same line as the document-start marker
-      // "--- 3" as standalone
-      eval("std.parseYaml('--- 3\\n')") ==> ujson.Value("""3""")
+      // "--- 3" as standalone (explicit doc start → always array)
+      eval("std.parseYaml('--- 3\\n')") ==> ujson.Value("""[3]""")
     }
     test {
-      // Folded scalar as document
-      eval("std.parseYaml('--- >\\n  hello\\n  world\\n')") ==> ujson.Value(""""hello world\n"""")
+      // Folded scalar as document (explicit doc start → always array)
+      eval("std.parseYaml('--- >\\n  hello\\n  world\\n')") ==> ujson.Value("""["hello world\n"]""")
     }
     test {
       // Combined: scalar docs on same line as marker
@@ -66,8 +66,8 @@ object ParseYamlTests extends TestSuite {
       )
     }
     test {
-      // Bare document separator
-      eval("""std.parseYaml("---")""") ==> ujson.Value("""null""")
+      // Bare document separator → explicit doc start, always returns array
+      eval("""std.parseYaml("---")""") ==> ujson.Value("""[null]""")
     }
     test {
       // Folded scalar without document marker (directly)