difftreelog
perf move more stdlib functions to native
in: master
7 files changed
crates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -103,6 +103,15 @@
}
#[builtin]
+pub fn builtin_filter_map(
+ filter_func: FuncVal,
+ map_func: FuncVal,
+ arr: ArrValue,
+) -> Result<ArrValue> {
+ Ok(builtin_filter(filter_func, arr)?.map(map_func))
+}
+
+#[builtin]
pub fn builtin_foldl(func: FuncVal, arr: ArrValue, init: Val) -> Result<Val> {
let mut acc = init;
for i in arr.iter() {
@@ -274,3 +283,22 @@
}
Ok(arr)
}
+
+#[builtin]
+pub fn builtin_flatten_arrays(arrs: Vec<ArrValue>) -> ArrValue {
+ pub fn flatten_inner(values: &[ArrValue]) -> ArrValue {
+ if values.len() == 1 {
+ return values[0].clone();
+ } else if values.len() == 2 {
+ return ArrValue::extended(values[0].clone(), values[1].clone());
+ }
+ let (a, b) = values.split_at(values.len() / 2);
+ ArrValue::extended(flatten_inner(a), flatten_inner(b))
+ }
+ if arrs.is_empty() {
+ return ArrValue::empty();
+ } else if arrs.len() == 1 {
+ return arrs.into_iter().next().expect("single");
+ }
+ flatten_inner(&arrs)
+}
crates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -84,6 +84,8 @@
("avg", builtin_avg::INST),
("removeAt", builtin_remove_at::INST),
("remove", builtin_remove::INST),
+ ("flattenArrays", builtin_flatten_arrays::INST),
+ ("filterMap", builtin_filter_map::INST),
// Math
("abs", builtin_abs::INST),
("sign", builtin_sign::INST),
@@ -137,17 +139,22 @@
("base64DecodeBytes", builtin_base64_decode_bytes::INST),
// Objects
("objectFieldsEx", builtin_object_fields_ex::INST),
+ ("objectFields", builtin_object_fields::INST),
+ ("objectFieldsAll", builtin_object_fields_all::INST),
("objectValues", builtin_object_values::INST),
("objectValuesAll", builtin_object_values_all::INST),
("objectKeysValues", builtin_object_keys_values::INST),
("objectKeysValuesAll", builtin_object_keys_values_all::INST),
("objectHasEx", builtin_object_has_ex::INST),
+ ("objectHas", builtin_object_has::INST),
+ ("objectHasAll", builtin_object_has_all::INST),
("objectRemoveKey", builtin_object_remove_key::INST),
// Manifest
("escapeStringJson", builtin_escape_string_json::INST),
("manifestJsonEx", builtin_manifest_json_ex::INST),
("manifestYamlDoc", builtin_manifest_yaml_doc::INST),
("manifestTomlEx", builtin_manifest_toml_ex::INST),
+ ("toString", builtin_to_string::INST),
// Parsing
("parseJson", builtin_parse_json::INST),
("parseYaml", builtin_parse_yaml::INST),
@@ -167,6 +174,7 @@
("bigint", builtin_bigint::INST),
("parseOctal", builtin_parse_octal::INST),
("parseHex", builtin_parse_hex::INST),
+ ("stringChars", builtin_string_chars::INST),
// Misc
("length", builtin_length::INST),
("startsWith", builtin_starts_with::INST),
@@ -175,6 +183,7 @@
("setMember", builtin_set_member::INST),
("setInter", builtin_set_inter::INST),
("setDiff", builtin_set_diff::INST),
+ ("setUnion", builtin_set_union::INST),
// Compat
("__compare", builtin___compare::INST),
]
@@ -347,19 +356,15 @@
let mut std = ObjValueBuilder::new();
std.with_super(self.stdlib_obj.clone());
- std.field("thisFile".into())
+ std.field("thisFile")
.hide()
- .value(Val::string(match source.source_path().path() {
- Some(p) => self.settings().path_resolver.resolve(p).into(),
- None => source.source_path().to_string().into(),
- }))
- .expect("this object builder is empty");
+ .value(match source.source_path().path() {
+ Some(p) => self.settings().path_resolver.resolve(p),
+ None => source.source_path().to_string(),
+ });
let stdlib_with_this_file = std.build();
- builder.bind(
- "std".into(),
- Thunk::evaluated(Val::Obj(stdlib_with_this_file)),
- );
+ builder.bind("std", Thunk::evaluated(Val::Obj(stdlib_with_this_file)));
}
fn as_any(&self) -> &dyn std::any::Any {
self
crates/jrsonnet-stdlib/src/manifest/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/manifest/mod.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/mod.rs
@@ -60,3 +60,8 @@
preserve_order.unwrap_or(false),
))
}
+
+#[builtin]
+pub fn builtin_to_string(a: Val) -> Result<IStr> {
+ a.to_string()
+}
crates/jrsonnet-stdlib/src/objects.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/objects.rs
+++ b/crates/jrsonnet-stdlib/src/objects.rs
@@ -1,6 +1,6 @@
use jrsonnet_evaluator::{
function::builtin,
- val::{ArrValue, StrValue, Val},
+ val::{ArrValue, Val},
IStr, ObjValue, ObjValueBuilder,
};
@@ -17,12 +17,35 @@
#[cfg(feature = "exp-preserve-order")]
preserve_order,
);
- out.into_iter()
- .map(StrValue::Flat)
- .map(Val::Str)
- .collect::<Vec<_>>()
+ out.into_iter().map(Val::string).collect::<Vec<_>>()
+}
+
+#[builtin]
+pub fn builtin_object_fields(
+ o: ObjValue,
+ #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,
+) -> Vec<Val> {
+ builtin_object_fields_ex(
+ o,
+ false,
+ #[cfg(feature = "exp-preserve-order")]
+ preserve_order,
+ )
}
+#[builtin]
+pub fn builtin_object_fields_all(
+ o: ObjValue,
+ #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,
+) -> Vec<Val> {
+ builtin_object_fields_ex(
+ o,
+ true,
+ #[cfg(feature = "exp-preserve-order")]
+ preserve_order,
+ )
+}
+
pub fn builtin_object_values_ex(
o: ObjValue,
include_hidden: bool,
@@ -105,6 +128,16 @@
}
#[builtin]
+pub fn builtin_object_has(o: ObjValue, f: IStr) -> bool {
+ o.has_field(f)
+}
+
+#[builtin]
+pub fn builtin_object_has_all(o: ObjValue, f: IStr) -> bool {
+ o.has_field_include_hidden(f)
+}
+
+#[builtin]
pub fn builtin_object_remove_key(
obj: ObjValue,
key: IStr,
crates/jrsonnet-stdlib/src/sets.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/sets.rs
+++ b/crates/jrsonnet-stdlib/src/sets.rs
@@ -70,6 +70,7 @@
}
Ok(ArrValue::lazy(out))
}
+
#[builtin]
#[allow(non_snake_case, clippy::redundant_closure)]
pub fn builtin_set_diff(a: ArrValue, b: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {
@@ -115,3 +116,57 @@
}
Ok(ArrValue::lazy(out))
}
+
+#[builtin]
+#[allow(non_snake_case, clippy::redundant_closure)]
+pub fn builtin_set_union(a: ArrValue, b: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {
+ let mut a = a.iter_lazy();
+ let mut b = b.iter_lazy();
+
+ let keyF = keyF
+ .unwrap_or(FuncVal::identity())
+ .into_native::<((Thunk<Val>,), Val)>();
+ let keyF = |v| keyF(v);
+
+ let mut av = a.next();
+ let mut bv = b.next();
+ let mut ak = av.clone().map(keyF).transpose()?;
+ let mut bk = bv.clone().map(keyF).transpose()?;
+
+ let mut out = Vec::new();
+ while let (Some(ac), Some(bc)) = (&ak, &bk) {
+ match evaluate_compare_op(ac, bc, BinaryOpType::Lt)? {
+ Ordering::Less => {
+ out.push(av.clone().expect("ak != None"));
+ av = a.next();
+ ak = av.clone().map(keyF).transpose()?;
+ }
+ Ordering::Greater => {
+ out.push(bv.clone().expect("bk != None"));
+ bv = b.next();
+ bk = bv.clone().map(keyF).transpose()?;
+ }
+ Ordering::Equal => {
+ // NOTE: order matters, values in `a` win
+ out.push(av.clone().expect("ak != None"));
+ av = a.next();
+ ak = av.clone().map(keyF).transpose()?;
+ bv = b.next();
+ bk = bv.clone().map(keyF).transpose()?;
+ }
+ };
+ }
+ // a.len() > b.len()
+ while let Some(_ac) = &ak {
+ out.push(av.clone().expect("ak != None"));
+ av = a.next();
+ ak = av.clone().map(keyF).transpose()?;
+ }
+ // b.len() > a.len()
+ while let Some(_bc) = &bk {
+ out.push(bv.clone().expect("ak != None"));
+ bv = b.next();
+ bk = bv.clone().map(keyF).transpose()?;
+ }
+ Ok(ArrValue::lazy(out))
+}
crates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth1{2 local std = self,3 local id = std.id,45 thisFile:: error 'std.thisFile is deprecated, to enable its support in jrsonnet - recompile it with "legacy-this-file" support.\nThis will slow down stdlib caching a bit, though',67 toString(a):: '' + a,89 lstripChars(str, chars)::10 if std.length(str) > 0 && std.member(chars, str[0]) then11 std.lstripChars(str[1:], chars)12 else13 str,1415 rstripChars(str, chars)::16 local len = std.length(str);17 if len > 0 && std.member(chars, str[len - 1]) then18 std.rstripChars(str[:len - 1], chars)19 else20 str,2122 stripChars(str, chars)::23 std.lstripChars(std.rstripChars(str, chars), chars),2425 stringChars(str)::26 std.makeArray(std.length(str), function(i) str[i]),2728 splitLimitR(str, c, maxsplits)::29 if maxsplits == -1 then30 std.splitLimit(str, c, -1)31 else32 local revStr(str) = std.join('', std.reverse(std.stringChars(str)));33 std.map(function(e) revStr(e), std.reverse(std.splitLimit(revStr(str), revStr(c), maxsplits))),3435 split(str, c):: std.splitLimit(str, c, -1),3637 mapWithIndex(func, arr)::38 if !std.isFunction(func) then39 error ('std.mapWithIndex first param must be function, got ' + std.type(func))40 else if !std.isArray(arr) && !std.isString(arr) then41 error ('std.mapWithIndex second param must be array, got ' + std.type(arr))42 else43 std.makeArray(std.length(arr), function(i) func(i, arr[i])),4445 mapWithKey(func, obj)::46 if !std.isFunction(func) then47 error ('std.mapWithKey first param must be function, got ' + std.type(func))48 else if !std.isObject(obj) then49 error ('std.mapWithKey second param must be object, got ' + std.type(obj))50 else51 { [k]: func(k, obj[k]) for k in std.objectFields(obj) },5253 lines(arr)::54 std.join('\n', arr + ['']),5556 deepJoin(arr)::57 if std.isString(arr) then58 arr59 else if std.isArray(arr) then60 std.join('', [std.deepJoin(x) for x in arr])61 else62 error 'Expected string or array, got %s' % std.type(arr),6364 filterMap(filter_func, map_func, arr)::65 if !std.isFunction(filter_func) then66 error ('std.filterMap first param must be function, got ' + std.type(filter_func))67 else if !std.isFunction(map_func) then68 error ('std.filterMap second param must be function, got ' + std.type(map_func))69 else if !std.isArray(arr) then70 error ('std.filterMap third param must be array, got ' + std.type(arr))71 else72 std.map(map_func, std.filter(filter_func, arr)),7374 assertEqual(a, b)::75 if a == b then76 true77 else78 error 'Assertion failed. ' + a + ' != ' + b,7980 clamp(x, minVal, maxVal)::81 if x < minVal then minVal82 else if x > maxVal then maxVal83 else x,8485 flattenArrays(arrs)::86 std.foldl(function(a, b) a + b, arrs, []),8788 manifestIni(ini)::89 local body_lines(body) =90 std.join([], [91 local value_or_values = body[k];92 if std.isArray(value_or_values) then93 ['%s = %s' % [k, value] for value in value_or_values]94 else95 ['%s = %s' % [k, value_or_values]]9697 for k in std.objectFields(body)98 ]);99100 local section_lines(sname, sbody) = ['[%s]' % [sname]] + body_lines(sbody),101 main_body = if std.objectHas(ini, 'main') then body_lines(ini.main) else [],102 all_sections = [103 section_lines(k, ini.sections[k])104 for k in std.objectFields(ini.sections)105 ];106 std.join('\n', main_body + std.flattenArrays(all_sections) + ['']),107108 manifestToml(value):: std.manifestTomlEx(value, ' '),109110 escapeStringPython(str)::111 std.escapeStringJson(str),112113 escapeStringBash(str_)::114 local str = std.toString(str_);115 local trans(ch) =116 if ch == "'" then117 "'\"'\"'"118 else119 ch;120 "'%s'" % std.join('', [trans(ch) for ch in std.stringChars(str)]),121122 escapeStringDollars(str_)::123 local str = std.toString(str_);124 local trans(ch) =125 if ch == '$' then126 '$$'127 else128 ch;129 std.foldl(function(a, b) a + trans(b), std.stringChars(str), ''),130131 local xml_escapes = {132 '<': '<',133 '>': '>',134 '&': '&',135 '"': '"',136 "'": ''',137 },138139 escapeStringXML(str_)::140 local str = std.toString(str_);141 std.join('', [std.get(xml_escapes, ch, ch) for ch in std.stringChars(str)]),142143 manifestJson(value):: std.manifestJsonEx(value, ' ') tailstrict,144145 manifestJsonMinified(value):: std.manifestJsonEx(value, '', '', ':'),146147 manifestYamlStream(value, indent_array_in_object=false, c_document_end=true, quote_keys=true)::148 if !std.isArray(value) then149 error 'manifestYamlStream only takes arrays, got ' + std.type(value)150 else151 '---\n' + std.join(152 '\n---\n', [std.manifestYamlDoc(e, indent_array_in_object, quote_keys) for e in value]153 ) + if c_document_end then '\n...\n' else '\n',154155 manifestPython(v)::156 if std.isObject(v) then157 local fields = [158 '%s: %s' % [std.escapeStringPython(k), std.manifestPython(v[k])]159 for k in std.objectFields(v)160 ];161 '{%s}' % [std.join(', ', fields)]162 else if std.isArray(v) then163 '[%s]' % [std.join(', ', [std.manifestPython(v2) for v2 in v])]164 else if std.isString(v) then165 '%s' % [std.escapeStringPython(v)]166 else if std.isFunction(v) then167 error 'cannot manifest function'168 else if std.isNumber(v) then169 std.toString(v)170 else if v == true then171 'True'172 else if v == false then173 'False'174 else if v == null then175 'None',176177 manifestPythonVars(conf)::178 local vars = ['%s = %s' % [k, std.manifestPython(conf[k])] for k in std.objectFields(conf)];179 std.join('\n', vars + ['']),180181 manifestXmlJsonml(value)::182 if !std.isArray(value) then183 error 'Expected a JSONML value (an array), got %s' % std.type(value)184 else185 local aux(v) =186 if std.isString(v) then187 v188 else189 local tag = v[0];190 local has_attrs = std.length(v) > 1 && std.isObject(v[1]);191 local attrs = if has_attrs then v[1] else {};192 local children = if has_attrs then v[2:] else v[1:];193 local attrs_str =194 std.join('', [' %s="%s"' % [k, attrs[k]] for k in std.objectFields(attrs)]);195 std.deepJoin(['<', tag, attrs_str, '>', [aux(x) for x in children], '</', tag, '>']);196197 aux(value),198199 setUnion(a, b, keyF=id)::200 // NOTE: order matters, values in `a` win201 local aux(a, b, i, j, acc) =202 if i >= std.length(a) then203 acc + b[j:]204 else if j >= std.length(b) then205 acc + a[i:]206 else207 local ak = keyF(a[i]);208 local bk = keyF(b[j]);209 if ak == bk then210 aux(a, b, i + 1, j + 1, acc + [a[i]]) tailstrict211 else if ak < bk then212 aux(a, b, i + 1, j, acc + [a[i]]) tailstrict213 else214 aux(a, b, i, j + 1, acc + [b[j]]) tailstrict;215 aux(a, b, 0, 0, []),216217 mergePatch(target, patch)::218 if std.isObject(patch) then219 local target_object =220 if std.isObject(target) then target else {};221222 local target_fields =223 if std.isObject(target_object) then std.objectFields(target_object) else [];224225 local null_fields = [k for k in std.objectFields(patch) if patch[k] == null];226 local both_fields = std.setUnion(target_fields, std.objectFields(patch));227228 {229 [k]:230 if !std.objectHas(patch, k) then231 target_object[k]232 else if !std.objectHas(target_object, k) then233 std.mergePatch(null, patch[k]) tailstrict234 else235 std.mergePatch(target_object[k], patch[k]) tailstrict236 for k in std.setDiff(both_fields, null_fields)237 }238 else239 patch,240241 get(o, f, default=null, inc_hidden=true)::242 if std.objectHasEx(o, f, inc_hidden) then o[f] else default,243244 objectFields(o)::245 std.objectFieldsEx(o, false),246247 objectFieldsAll(o)::248 std.objectFieldsEx(o, true),249250 objectHas(o, f)::251 std.objectHasEx(o, f, false),252253 objectHasAll(o, f)::254 std.objectHasEx(o, f, true),255256 resolvePath(f, r)::257 local arr = std.split(f, '/');258 std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),259260 prune(a)::261 local isContent(b) =262 if b == null then263 false264 else if std.isArray(b) then265 std.length(b) > 0266 else if std.isObject(b) then267 std.length(b) > 0268 else269 true;270 if std.isArray(a) then271 [std.prune(x) for x in a if isContent($.prune(x))]272 else if std.isObject(a) then {273 [x]: $.prune(a[x])274 for x in std.objectFields(a)275 if isContent(std.prune(a[x]))276 } else277 a,278279 find(value, arr)::280 if !std.isArray(arr) then281 error 'find second parameter should be an array, got ' + std.type(arr)282 else283 std.filter(function(i) arr[i] == value, std.range(0, std.length(arr) - 1)),284285 // Compat286 __compare_array(arr1, arr2)::287 assert std.isArray(arr1) && std.isArray(arr2);288 std.__compare(arr1, arr2),289 __array_less(arr1, arr2):: std.__compare_array(arr1, arr2) == -1,290 __array_greater(arr1, arr2):: std.__compare_array(arr1, arr2) == 1,291 __array_less_or_equal(arr1, arr2):: std.__compare_array(arr1, arr2) <= 0,292 __array_greater_or_equal(arr1, arr2):: std.__compare_array(arr1, arr2) >= 0,293}crates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -198,3 +198,8 @@
assert_eq!(parse_nat::<16>("BbC").unwrap(), 0xBBC as f64);
}
}
+
+#[builtin]
+pub fn builtin_string_chars(str: IStr) -> ArrValue {
+ ArrValue::chars(str.chars())
+}