git.delta.rocks / jrsonnet / refs/commits / 71fb4e2830f5

--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -609,7 +609,7 @@
 				tmp_out.push(
 					std::char::from_u32(n as u32)
 						.ok_or_else(|| InvalidUnicodeCodepointGot(n as u32))?,
-				)
+				);
 			}
 			Val::Str(s) => {
 				let s = s.into_flat();

--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -215,6 +215,7 @@
 		("startsWith", builtin_starts_with::INST),
 		("endsWith", builtin_ends_with::INST),
 		("assertEqual", builtin_assert_equal::INST),
+		("mergePatch", builtin_merge_patch::INST),
 		// Sets
 		("setMember", builtin_set_member::INST),
 		("setInter", builtin_set_inter::INST),

1use std::{cell::RefCell, rc::Rc};1use std::{cell::RefCell, collections::BTreeSet, rc::Rc};
22
3use jrsonnet_evaluator::{3use jrsonnet_evaluator::{
4	bail,4	bail,
7	manifest::JsonFormat,7	manifest::JsonFormat,
8	typed::{Either2, Either4},8	typed::{Either2, Either4},
9	val::{equals, ArrValue},9	val::{equals, ArrValue},
10	Context, Either, IStr, ObjValue, ResultExt, Thunk, Val,10	Context, Either, IStr, ObjValue, ObjValueBuilder, ResultExt, Thunk, Val,
11};11};
1212
13use crate::{extvar_source, Settings};13use crate::{extvar_source, Settings};
153	bail!("assertion failed: A != B\nA: {a}\nB: {b}")153	bail!("assertion failed: A != B\nA: {a}\nB: {b}")
154}154}
155
156#[builtin]
157pub fn builtin_merge_patch(target: Val, patch: Val) -> Result<Val> {
158	let Some(patch) = patch.as_obj() else {
159		return Ok(patch);
160	};
161	let Some(target) = target.as_obj() else {
162		return Ok(Val::Obj(patch));
163	};
164	let target_fields = target.fields().into_iter().collect::<BTreeSet<IStr>>();
165	let patch_fields = patch.fields().into_iter().collect::<BTreeSet<IStr>>();
166
167	let mut out = ObjValueBuilder::new();
168	for field in target_fields.union(&patch_fields) {
169		let Some(field_patch) = patch.get(field.clone())? else {
170			out.field(field.clone()).value(target.get(field.clone())?.expect("we're iterating over fields union, if field is missing in patch - it exists in target"));
171			continue;
172		};
173		if matches!(field_patch, Val::Null) {
174			continue;
175		}
176		let Some(field_target) = target.get(field.clone())? else {
177			out.field(field.clone()).value(field_patch);
178			continue;
179		};
180		out.field(field.clone())
181			.value(builtin_merge_patch(field_target, field_patch)?);
182	}
183	Ok(out.build().into())
184}
155185

--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -11,30 +11,6 @@
     else
       { [k]: func(k, obj[k]) for k in std.objectFields(obj) },
 
-  mergePatch(target, patch)::
-    if std.isObject(patch) then
-      local target_object =
-        if std.isObject(target) then target else {};
-
-      local target_fields =
-        if std.isObject(target_object) then std.objectFields(target_object) else [];
-
-      local null_fields = [k for k in std.objectFields(patch) if patch[k] == null];
-      local both_fields = std.setUnion(target_fields, std.objectFields(patch));
-
-      {
-        [k]:
-          if !std.objectHas(patch, k) then
-            target_object[k]
-          else if !std.objectHas(target_object, k) then
-            std.mergePatch(null, patch[k]) tailstrict
-          else
-            std.mergePatch(target_object[k], patch[k]) tailstrict
-        for k in std.setDiff(both_fields, null_fields)
-      }
-    else
-      patch,
-
   resolvePath(f, r)::
     local arr = std.split(f, '/');
     std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),