src/rougail/output_json/__init__.py

@@ -22,63 +22,30 @@ from json import dumps
 
 from tiramisu import undefined
 from tiramisu.error import PropertiesOptionError, ConfigError
-from rougail.error import ExtentionError
 
 from .i18n import _
 
 
 class RougailOutputJson:
-    output_name = 'json'
-
     def __init__(
         self,
         config: "Config",
-        *,
         rougailconfig: "RougailConfig" = None,
         user_data_errors: Optional[list] = None,
         user_data_warnings: Optional[list] = None,
     ) -> None:
         if rougailconfig is None:
             from rougail import RougailConfig
+
             rougailconfig = RougailConfig
-            rougailconfig["step.output"] = self.output_name
-        if rougailconfig["step.output"] != self.output_name:
-            raise ExtentionError(_('the "step.output" is not set to "{0}"').format(self.output_name))
         self.rougailconfig = rougailconfig
         self.config = config
-        if user_data_errors:
+        self.errors = []
-            self.errors = user_data_errors
+        self.warnings = []
-        else:
-            self.errors = []
-        if user_data_warnings:
-            self.warnings = user_data_warnings
-        else:
-            self.warnings = []
         self.read_write = self.rougailconfig["json.read_write"]
         self.is_mandatory = self.rougailconfig["json.mandatory"]
         self.dico = {}
 
-    def run(self) -> None:
-        self.exporter()
-        return dumps(self.dico, ensure_ascii=False, indent=2) + '\n'
-
-    def print(self) -> str:
-        print(self.run())
-
-    def exporter(self) -> None:
-        self.config.property.read_write()
-        self.mandatory()
-        self.manage_warnings()
-        self.config.property.read_only()
-        if self.manage_errors():
-            return
-        if self.read_write:
-            self.config.property.read_write()
-        self.parse_family(
-            self.config,
-            self.dico,
-        )
-
     def mandatory(self):
         if not self.is_mandatory:
             return
@@ -112,15 +79,32 @@ class RougailOutputJson:
                     )
                 self.errors.append(f"  - {option.description()}")
 
-    def manage_warnings(self) -> None:
+    def exporter(self) -> None:
-        if self.warnings:
+        self.config.property.read_write()
-            self.dico["_warnings"] = self.warnings
+        self.mandatory()
+        if self.read_write:
+            self.config.property.read_write()
+        else:
+            self.config.property.read_only()
+#        errors = self.user_data_errors + self.errors
+#        if errors:
+#            self.display_errors(errors)
+#        if self.errors:
+#            return False
+#        warnings = self.user_data_warnings + self.warnings
+#        if warnings:
+#            self.display_warnings(warnings)
+        self.parse_family(
+            self.config,
+            self.dico,
+        )
 
-    def manage_errors(self) -> bool:
+    def run(self) -> None:
-        if not self.errors:
+        self.exporter()
-            return False
+        return dumps(self.dico, ensure_ascii=False, indent=2)
-        self.dico = {"_errors": self.errors}
+
-        return True
+    def print(self) -> str:
+        print(self.run())
 
     def parse_family(
         self,

tests/results/test/00_0empty.json

@@ -1 +0,0 @@
-{}

tests/results/test/00_0version_underscore.json

@@ -1,3 +0,0 @@
-{
-  "version": "string1"
-}

tests/results/test/00_1empty_variable.json

@@ -1,3 +0,0 @@
-{
-  "empty": "string1"
-}

tests/results/test/00_2default_calculated.json

@@ -1,8 +0,0 @@
-{
-  "var1": "string1",
-  "var2": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/00_2default_calculated_multi.json

@@ -1,12 +0,0 @@
-{
-  "var1": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "var2": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/00_2default_calculated_variable_transitive.json

@@ -1,10 +0,0 @@
-{
-  "var1": [
-    "domain1.lan",
-    "domain2.lan"
-  ],
-  "var2": [
-    "domain1.lan",
-    "domain2.lan"
-  ]
-}

tests/results/test/00_4load_subfolder.json

@@ -1,4 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1"
-}

tests/results/test/00_5load_notype.json

@@ -1,3 +0,0 @@
-{
-  "without_type": "string1"
-}

tests/results/test/00_6boolean.json

@@ -1,8 +0,0 @@
-{
-  "var1": true,
-  "var2": true,
-  "var3": true,
-  "var4": true,
-  "var5": true,
-  "var6": true
-}

tests/results/test/00_6boolean_no_mandatory.json

@@ -1,3 +0,0 @@
-{
-  "variable": true
-}

tests/results/test/00_6choice.json

@@ -1,8 +0,0 @@
-{
-  "var1": "a",
-  "var2": "a",
-  "var3": "a",
-  "var4": null,
-  "var5": "a",
-  "var6": 1
-}

tests/results/test/00_6choice_calculation.json

@@ -1,3 +0,0 @@
-{
-  "var": 0
-}

tests/results/test/00_6choice_variable.json

@@ -1,8 +0,0 @@
-{
-  "var1": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "var2": "string1"
-}

tests/results/test/00_6custom.json

@@ -1,4 +0,0 @@
-{
-  "custom1": "string1",
-  "custom2": "string1"
-}

tests/results/test/00_6domainname.json

@@ -1,3 +0,0 @@
-{
-  "variable": "domain1.lan"
-}

tests/results/test/00_6domainname_params.json

@@ -1,3 +0,0 @@
-{
-  "variable": "domain1.lan"
-}

tests/results/test/00_6float.json

@@ -1,8 +0,0 @@
-{
-  "var1": 1.1,
-  "var2": 1.1,
-  "var3": 1.1,
-  "var4": 1.1,
-  "var5": 1.1,
-  "var6": 1.1
-}

tests/results/test/00_6number.json

@@ -1,8 +0,0 @@
-{
-  "var1": 1,
-  "var2": 1,
-  "var3": 1,
-  "var4": 1,
-  "var5": 1,
-  "var6": 1
-}

tests/results/test/00_6port.json

@@ -1,5 +0,0 @@
-{
-  "variable1": "80",
-  "variable2": "80",
-  "variable3": "80"
-}

tests/results/test/00_6regexp.json

@@ -1,3 +0,0 @@
-{
-  "var": "#b1b1b1"
-}

tests/results/test/00_6string.json

@@ -1,8 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1",
-  "var3": "string1",
-  "var4": "string1",
-  "var5": "string1",
-  "var6": "string1"
-}

tests/results/test/00_7choice_quote.json

@@ -1,3 +0,0 @@
-{
-  "var": "quote'"
-}

tests/results/test/00_7help_quote.json

@@ -1,4 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1"
-}

tests/results/test/00_7value_doublequote.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/00_7value_doublequote2.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/00_7value_doublequote3.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/00_7value_quote.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/00_8calculation_information.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/00_8test.json

@@ -1,11 +0,0 @@
-{
-  "var1": "test",
-  "var2": "test",
-  "var3": "test1",
-  "var4": null,
-  "var5": false,
-  "var6": [
-    "test1",
-    "test2"
-  ]
-}

tests/results/test/00_9choice_variable_multi.json

@@ -1,10 +0,0 @@
-{
-  "variable1": [
-    "val1",
-    "val2"
-  ],
-  "variable2": [
-    "val1",
-    "val2"
-  ]
-}

tests/results/test/00_9choice_variables.json

@@ -1,5 +0,0 @@
-{
-  "source_variable_1": "string1",
-  "source_variable_2": "string1",
-  "my_variable": "string1"
-}

tests/results/test/00_9default_calculation.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/00_9default_calculation_information.json

@@ -1,3 +0,0 @@
-{
-  "var": "string1"
-}

tests/results/test/00_9default_calculation_information_other_variable.json

@@ -1,4 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1"
-}

tests/results/test/00_9default_calculation_multi_optional.json

@@ -1,8 +0,0 @@
-{
-  "my_variable": "string1",
-  "my_calculated_variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/00_9default_calculation_multi_optional2.json

@@ -1,8 +0,0 @@
-{
-  "my_variable": "string1",
-  "my_calculated_variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/00_9default_calculation_optional.json

@@ -1,7 +0,0 @@
-{
-  "my_calculated_variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/00_9default_calculation_optional_exists.json

@@ -1,12 +0,0 @@
-{
-  "my_variable": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "my_calculated_variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/00_9default_calculation_param_optional.json

@@ -1,4 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1"
-}

tests/results/test/00_9default_information_other_variable.json

@@ -1,4 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1"
-}

tests/results/test/00_9default_integer.json

@@ -1,3 +0,0 @@
-{
-  "var": 0
-}

tests/results/test/01_6boolean_multi.json

@@ -1,26 +0,0 @@
-{
-  "var1": [
-    true
-  ],
-  "var2": [
-    true
-  ],
-  "var3": [
-    true
-  ],
-  "var4": [
-    true
-  ],
-  "var5": [
-    true
-  ],
-  "var6": [
-    true
-  ],
-  "var7": [
-    true
-  ],
-  "var8": [
-    true
-  ]
-}

tests/results/test/01_6custom_multi.json

@@ -1,12 +0,0 @@
-{
-  "custom1": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "custom2": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/01_6float_multi.json

@@ -1,42 +0,0 @@
-{
-  "var1": [
-    1.1,
-    2.2,
-    3.3
-  ],
-  "var2": [
-    1.1,
-    2.2,
-    3.3
-  ],
-  "var3": [
-    1.1,
-    2.2,
-    3.3
-  ],
-  "var4": [
-    1.1,
-    2.2,
-    3.3
-  ],
-  "var5": [
-    1.1,
-    2.2,
-    3.3
-  ],
-  "var6": [
-    1.1,
-    2.2,
-    3.3
-  ],
-  "var7": [
-    1.1,
-    2.2,
-    3.3
-  ],
-  "var8": [
-    1.1,
-    2.2,
-    3.3
-  ]
-}

tests/results/test/01_6number_multi.json

@@ -1,42 +0,0 @@
-{
-  "var1": [
-    1,
-    2,
-    3
-  ],
-  "var2": [
-    1,
-    2,
-    3
-  ],
-  "var3": [
-    1,
-    2,
-    3
-  ],
-  "var4": [
-    1,
-    2,
-    3
-  ],
-  "var5": [
-    1,
-    2,
-    3
-  ],
-  "var6": [
-    1,
-    2,
-    3
-  ],
-  "var7": [
-    1,
-    2,
-    3
-  ],
-  "var8": [
-    1,
-    2,
-    3
-  ]
-}

tests/results/test/01_6string_empty.json

@@ -1,7 +0,0 @@
-{
-  "var1": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/01_6string_multi.json

@@ -1,38 +0,0 @@
-{
-  "var1": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "var2": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "var3": "string1",
-  "var4": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "var5": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "var6": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "var7": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "var8": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/01_7value_multi_doublequote.json

@@ -1,7 +0,0 @@
-{
-  "variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/01_7value_multi_doublequote2.json

@@ -1,7 +0,0 @@
-{
-  "variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/01_7value_multi_quote.json

@@ -1,7 +0,0 @@
-{
-  "variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/01_8calculation_information_multi.json

@@ -1,7 +0,0 @@
-{
-  "variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/01_9choice_variable_multi.json

@@ -1,8 +0,0 @@
-{
-  "variable1": [
-    "string1",
-    "string2",
-    "string3"
-  ],
-  "variable2": "string1"
-}

tests/results/test/04_0type_param.json

@@ -1,3 +0,0 @@
-{
-  "int": 1
-}

tests/results/test/04_1auto_save.json

@@ -1,3 +0,0 @@
-{
-  "variable": "no"
-}

tests/results/test/04_1auto_save_and_calculated.json

@@ -1,4 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "no"
-}

tests/results/test/04_1auto_save_and_calculated_hidden.json

@@ -1,4 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "yes"
-}

tests/results/test/04_1auto_save_and_hidden.json

@@ -1,3 +0,0 @@
-{
-  "var": "yes"
-}

tests/results/test/04_1default_calculation_hidden.json

@@ -1,5 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1",
-  "var3": "string1"
-}

tests/results/test/04_1default_calculation_hidden_2.json

@@ -1,5 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1",
-  "var3": "string1"
-}

tests/results/test/04_5disabled_calculation_optional.json

@@ -1,5 +0,0 @@
-{
-  "condition": "string1",
-  "var1": null,
-  "var2": "string1"
-}

tests/results/test/04_5disabled_calculation_variable.json

@@ -1,3 +0,0 @@
-{
-  "condition": true
-}

tests/results/test/04_5disabled_calculation_variable2.json

@@ -1,3 +0,0 @@
-{
-  "condition": true
-}

tests/results/test/04_5disabled_calculation_variable3.json

@@ -1,4 +0,0 @@
-{
-  "condition": "string1",
-  "variable": "string1"
-}

tests/results/test/04_5disabled_calculation_variable4.json

@@ -1,3 +0,0 @@
-{
-  "condition": "string1"
-}

tests/results/test/04_5validators.json

@@ -1,3 +0,0 @@
-{
-  "int": 1
-}

tests/results/test/04_5validators_differ.json

@@ -1,4 +0,0 @@
-{
-  "var1": "another_value",
-  "var2": "string1"
-}

tests/results/test/04_5validators_multi.json

@@ -1,7 +0,0 @@
-{
-  "var1": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/04_5validators_multi2.json

@@ -1,6 +0,0 @@
-{
-  "var1": [
-    "val1",
-    "val2"
-  ]
-}

tests/results/test/05_0multi_not_uniq.json

@@ -1,7 +0,0 @@
-{
-  "var1": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/05_0multi_uniq.json

@@ -1,7 +0,0 @@
-{
-  "variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/12_1auto_save_expert.json

@@ -1,3 +0,0 @@
-{
-  "var": "no"
-}

tests/results/test/16_0redefine_description.json

@@ -1,3 +0,0 @@
-{
-  "var": "string1"
-}

tests/results/test/16_2family_redefine_calculation.json

@@ -1 +0,0 @@
-{}

tests/results/test/16_2family_redefine_disabled.json

@@ -1 +0,0 @@
-{}

tests/results/test/16_5exists_nonexists.json

@@ -1,4 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1"
-}

tests/results/test/16_5exists_redefine.json

@@ -1,3 +0,0 @@
-{
-  "var1": "yes"
-}

tests/results/test/16_5redefine_calculation.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/16_5redefine_choice.json

@@ -1,3 +0,0 @@
-{
-  "variable": "a"
-}

tests/results/test/16_5redefine_default.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/16_5redefine_default_calculation.json

@@ -1,3 +0,0 @@
-{
-  "variable": "string1"
-}

tests/results/test/16_5redefine_family.json

@@ -1,5 +0,0 @@
-{
-  "family": {
-    "variable": "string1"
-  }
-}

tests/results/test/16_5redefine_help.json

@@ -1,5 +0,0 @@
-{
-  "family": {
-    "variable": "string1"
-  }
-}

tests/results/test/16_5redefine_hidden.json

@@ -1,3 +0,0 @@
-{
-  "variable": "no"
-}

tests/results/test/16_5redefine_multi.json

@@ -1,7 +0,0 @@
-{
-  "variable": [
-    "string1",
-    "string2",
-    "string3"
-  ]
-}

tests/results/test/16_5redefine_remove_disable_calculation.json

@@ -1,4 +0,0 @@
-{
-  "condition": "string1",
-  "variable": "string1"
-}

tests/results/test/16_5test_redefine.json

@@ -1,5 +0,0 @@
-{
-  "var1": "test1",
-  "var2": "test1",
-  "var3": "string1"
-}

tests/results/test/16_6choice_redefine.json

@@ -1,3 +0,0 @@
-{
-  "var": "a"
-}

tests/results/test/16_6exists_redefine_family.json

@@ -1,8 +0,0 @@
-{
-  "family1": {
-    "variable1": "string1"
-  },
-  "family2": {
-    "variable2": "string1"
-  }
-}

tests/results/test/16exists_exists.json

@@ -1,3 +0,0 @@
-{
-  "var": "string1"
-}

tests/results/test/17_5redefine_leadership.json

@@ -1,3 +0,0 @@
-{
-  "leader": []
-}

tests/results/test/20_0empty_family.json

@@ -1 +0,0 @@
-{}

tests/results/test/20_0family_append.json

@@ -1,6 +0,0 @@
-{
-  "family": {
-    "var1": "string1",
-    "var2": "string1"
-  }
-}

tests/results/test/20_0family_underscore.json

@@ -1 +0,0 @@
-{}

tests/results/test/20_0multi_family.json

@@ -1,7 +0,0 @@
-{
-  "family": {
-    "subfamily": {
-      "variable": "string1"
-    }
-  }
-}

tests/results/test/20_0multi_family_basic.json

@@ -1,7 +0,0 @@
-{
-  "family": {
-    "subfamily": {
-      "variable": "string1"
-    }
-  }
-}

tests/results/test/20_0multi_family_expert.json

@@ -1,7 +0,0 @@
-{
-  "family": {
-    "subfamily": {
-      "variable": "string1"
-    }
-  }
-}

tests/results/test/20_0multi_family_order.json

@@ -1,10 +0,0 @@
-{
-  "variable": "string1",
-  "family": {
-    "variable1": "string1",
-    "subfamily": {
-      "variable": "string1"
-    },
-    "variable2": "string1"
-  }
-}

tests/results/test/20_0validators_differ_redefine.json

@@ -1,5 +0,0 @@
-{
-  "var1": "string1",
-  "var2": "string1",
-  "var3": "yes"
-}