git.delta.rocks / jrsonnet / refs/commits / 88907d8b259a

difftreelog

perf move ini manifestification to native

Yaroslav Bolyukin2024-05-19parent: #0ef9787.patch.diff
in: master

5 files changed

modifiedcrates/jrsonnet-cli/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -4,7 +4,7 @@
 use jrsonnet_evaluator::manifest::{
 	JsonFormat, ManifestFormat, StringFormat, ToStringFormat, YamlStreamFormat,
 };
-use jrsonnet_stdlib::{TomlFormat, XmlJsonmlFormat, YamlFormat};
+use jrsonnet_stdlib::{IniFormat, TomlFormat, XmlJsonmlFormat, YamlFormat};
 
 #[derive(Clone, Copy, ValueEnum)]
 pub enum ManifestFormatName {
@@ -14,6 +14,7 @@
 	Yaml,
 	Toml,
 	XmlJsonml,
+	Ini,
 }
 
 #[derive(Parser)]
@@ -72,6 +73,10 @@
 					preserve_order,
 				)),
 				ManifestFormatName::XmlJsonml => Box::new(XmlJsonmlFormat::cli()),
+				ManifestFormatName::Ini => Box::new(IniFormat::cli(
+					#[cfg(feature = "exp-preserve-order")]
+					preserve_order,
+				)),
 			}
 		};
 		if self.yaml_stream {
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -179,6 +179,7 @@
 		("manifestPython", builtin_manifest_python::INST),
 		("manifestPythonVars", builtin_manifest_python_vars::INST),
 		("manifestXmlJsonml", builtin_manifest_xml_jsonml::INST),
+		("manifestIni", builtin_manifest_ini::INST),
 		// Parse
 		("parseJson", builtin_parse_json::INST),
 		("parseYaml", builtin_parse_yaml::INST),
modifiedcrates/jrsonnet-stdlib/src/manifest/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/mod.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/mod.rs
@@ -1,8 +1,10 @@
+mod ini;
 mod python;
 mod toml;
 mod xml;
 mod yaml;
 
+pub use ini::IniFormat;
 use jrsonnet_evaluator::{
 	function::builtin,
 	manifest::{escape_string_json, JsonFormat, YamlStreamFormat},
@@ -190,3 +192,17 @@
 pub fn builtin_manifest_xml_jsonml(value: Val) -> Result<String> {
 	value.manifest(XmlJsonmlFormat::std_to_xml())
 }
+
+#[builtin]
+pub fn builtin_manifest_ini(
+	ini: Val,
+
+	#[default(false)]
+	#[cfg(feature = "exp-preserve-order")]
+	preserve_order: bool,
+) -> Result<String> {
+	ini.manifest(IniFormat::std(
+		#[cfg(feature = "exp-preserve-order")]
+		preserve_order,
+	))
+}
modifiedcrates/jrsonnet-stdlib/src/manifest/toml.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/toml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/toml.rs
@@ -196,7 +196,7 @@
 		#[cfg(feature = "exp-preserve-order")]
 		options.preserve_order,
 	) {
-		let value = value?;
+		let value = value.with_description(|| format!("field <{key}> evaluation"))?;
 		if is_section(&value)? {
 			sections.push((key, value));
 		} else {
modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth
before · crates/jrsonnet-stdlib/src/std.jsonnet
1{2  local std = self,34  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',56  mapWithKey(func, obj)::7    if !std.isFunction(func) then8      error ('std.mapWithKey first param must be function, got ' + std.type(func))9    else if !std.isObject(obj) then10      error ('std.mapWithKey second param must be object, got ' + std.type(obj))11    else12      { [k]: func(k, obj[k]) for k in std.objectFields(obj) },1314  deepJoin(arr)::15    if std.isString(arr) then16      arr17    else if std.isArray(arr) then18      std.join('', [std.deepJoin(x) for x in arr])19    else20      error 'Expected string or array, got %s' % std.type(arr),2122  assertEqual(a, b)::23    if a == b then24      true25    else26      error 'Assertion failed. ' + a + ' != ' + b,2728  manifestIni(ini)::29    local body_lines(body) =30      std.join([], [31        local value_or_values = body[k];32        if std.isArray(value_or_values) then33          ['%s = %s' % [k, value] for value in value_or_values]34        else35          ['%s = %s' % [k, value_or_values]]3637        for k in std.objectFields(body)38      ]);3940    local section_lines(sname, sbody) = ['[%s]' % [sname]] + body_lines(sbody),41          main_body = if std.objectHas(ini, 'main') then body_lines(ini.main) else [],42          all_sections = [43      section_lines(k, ini.sections[k])44      for k in std.objectFields(ini.sections)45    ];46    std.join('\n', main_body + std.flattenArrays(all_sections) + ['']),4748  mergePatch(target, patch)::49    if std.isObject(patch) then50      local target_object =51        if std.isObject(target) then target else {};5253      local target_fields =54        if std.isObject(target_object) then std.objectFields(target_object) else [];5556      local null_fields = [k for k in std.objectFields(patch) if patch[k] == null];57      local both_fields = std.setUnion(target_fields, std.objectFields(patch));5859      {60        [k]:61          if !std.objectHas(patch, k) then62            target_object[k]63          else if !std.objectHas(target_object, k) then64            std.mergePatch(null, patch[k]) tailstrict65          else66            std.mergePatch(target_object[k], patch[k]) tailstrict67        for k in std.setDiff(both_fields, null_fields)68      }69    else70      patch,7172  resolvePath(f, r)::73    local arr = std.split(f, '/');74    std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),7576  find(value, arr)::77    if !std.isArray(arr) then78      error 'find second parameter should be an array, got ' + std.type(arr)79    else80      std.filter(function(i) arr[i] == value, std.range(0, std.length(arr) - 1)),81}
after · crates/jrsonnet-stdlib/src/std.jsonnet
1{2  local std = self,34  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',56  mapWithKey(func, obj)::7    if !std.isFunction(func) then8      error ('std.mapWithKey first param must be function, got ' + std.type(func))9    else if !std.isObject(obj) then10      error ('std.mapWithKey second param must be object, got ' + std.type(obj))11    else12      { [k]: func(k, obj[k]) for k in std.objectFields(obj) },1314  deepJoin(arr)::15    if std.isString(arr) then16      arr17    else if std.isArray(arr) then18      std.join('', [std.deepJoin(x) for x in arr])19    else20      error 'Expected string or array, got %s' % std.type(arr),2122  assertEqual(a, b)::23    if a == b then24      true25    else26      error 'Assertion failed. ' + a + ' != ' + b,2728  mergePatch(target, patch)::29    if std.isObject(patch) then30      local target_object =31        if std.isObject(target) then target else {};3233      local target_fields =34        if std.isObject(target_object) then std.objectFields(target_object) else [];3536      local null_fields = [k for k in std.objectFields(patch) if patch[k] == null];37      local both_fields = std.setUnion(target_fields, std.objectFields(patch));3839      {40        [k]:41          if !std.objectHas(patch, k) then42            target_object[k]43          else if !std.objectHas(target_object, k) then44            std.mergePatch(null, patch[k]) tailstrict45          else46            std.mergePatch(target_object[k], patch[k]) tailstrict47        for k in std.setDiff(both_fields, null_fields)48      }49    else50      patch,5152  resolvePath(f, r)::53    local arr = std.split(f, '/');54    std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),5556  find(value, arr)::57    if !std.isArray(arr) then58      error 'find second parameter should be an array, got ' + std.type(arr)59    else60      std.filter(function(i) arr[i] == value, std.range(0, std.length(arr) - 1)),61}