selftest and documentation extensions

JsonPreprocessor/CJsonPreprocessor.py

@@ -184,6 +184,16 @@ def __init__(self, syntax: CSyntaxType = CSyntaxType.json , currentCfg : dict =
         self.lNestedParams = []
         self.lDotInParamName = []
 
+    def __reset(self) -> None:
+        '''
+   Reset initial variables which are set in constructor method after master Json file is loaded.
+        '''
+        self.lImportedFiles = []
+        self.recursive_level = 0
+        self.lUpdatedParams = {}
+        self.lNestedParams = []
+        self.lDotInParamName = []
+
     def __sNormalizePath(self, sPath : str) -> str:
         """
    Python struggles with
@@ -664,6 +674,18 @@ def __handleStrNoneTrueFalse(objJson):
                 else:
                     oJson[k] = v
             return oJson
+
+        def __handleListElements(sInput : str) -> str:
+            items = re.split("\s*,\s*", sInput)
+            j=0
+            newItem = ""
+            for item in items:
+                j+=1
+                if j<len(items):
+                    newItem = newItem + self.__checkAndUpdateKeyValue(item) + ","
+                else:
+                    newItem = newItem + self.__checkAndUpdateKeyValue(item)
+            return newItem
 
         jFile=jFile.strip()
 
@@ -699,15 +721,28 @@ def __handleStrNoneTrueFalse(objJson):
                 for item in items:
                     i+=1
                     newSubItem = ""
-                    if re.search("\s*\[[^\[\]]*\]\s*,*\s*", item):
-                        subItems = re.split("\s*,\s*", item)
-                        j=0
-                        for subItem in subItems:
-                            j+=1
-                            if j<len(subItems):
-                                newSubItem = newSubItem + self.__checkAndUpdateKeyValue(subItem) + ","
-                            else:
-                                newSubItem = newSubItem + self.__checkAndUpdateKeyValue(subItem)
+                    if re.search("^\s*\[.+\]\s*,*\s*$", item) and item.count('[')==item.count(']'):
+                        item = item.strip()
+                        bLastElement = True
+                        if item.endswith(","):
+                            bLastElement = False
+                        item = re.sub("^\[", "", item)
+                        item = re.sub("\s*\]\s*,*$", "", item)
+                        newSubItem = __handleListElements(item)
+                        newSubItem = "[" + newSubItem + "]" if bLastElement else "[" + newSubItem + "],"
+                    elif re.search("^\s*\[.*\${.+", item):
+                        item = item.strip()
+                        item = re.sub("^\[", "", item)
+                        newSubItem = __handleListElements(item)
+                        newSubItem = "[" + newSubItem
+                    elif re.search("]\s*,*\s*", item) and item.count('[') < item.count(']'):
+                        item = item.rstrip()
+                        bLastElement = True
+                        if item.endswith(","):
+                            bLastElement = False
+                        item = re.sub("\s*\]\s*,*$", "", item)
+                        newSubItem = __handleListElements(item)
+                        newSubItem = newSubItem + "]" if bLastElement else newSubItem + "],"
                     else:
                         newSubItem = self.__checkAndUpdateKeyValue(item)
                     if i<len(items):
@@ -778,5 +813,7 @@ def __handleStrNoneTrueFalse(objJson):
                     exec(sExec, globals(), ldict)
                 except:
                     raise Exception(f"The variable '{parseNestedParam[0]}' is not available!")
+
+            self.__reset()
 
         return oJson