Added list + bracket notation support to sns.from_dict(), used in json.read()

Author: adamlui

remove-json-keys/src/remove_json_keys/lib/data/json.py

@@ -3,11 +3,11 @@
 
 import json5
 
-from . import file
+from . import file, sns
 
 def read(file_path, encoding='utf-8'):
     with open(file_path, 'r', encoding=encoding) as file:
-        return json5.load(file)
+        return sns.from_dict(json5.load(file))
 
 def remove_keys(json_dir, keys):
     keys_removed, keys_skipped, files_processed_cnt = [], [], 0

remove-json-keys/src/remove_json_keys/lib/data/sns.py

@@ -1,7 +1,18 @@
 from types import SimpleNamespace as sn
 
+class flex_ns(sn): # to access by dot or bracket
+    def __getitem__(self, key):
+        return getattr(self, key)
+    def __setitem__(self, key, val):
+        setattr(self, key, val)
+    def __contains__(self, key):
+        return hasattr(self, key)
+    def items(self):
+        return self.__dict__.items()
+
 def from_dict(obj):
-    for key, val in obj.items():
-        if isinstance(val, dict):
-            obj[key] = from_dict(val)
-    return sn(**obj)
+    if isinstance(obj, dict):
+        return flex_ns(**{key: from_dict(val) for key, val in obj.items()})
+    if isinstance(obj, list):
+        return [from_dict(item) for item in obj]
+    return obj

remove-json-keys/src/remove_json_keys/lib/init.py

@@ -3,7 +3,7 @@
 from . import data, language, log, settings
 
 def cli(caller_file):
-    cli = data.sns.from_dict(data.json.read(Path(__file__).parent.parent / 'assets/data/package_data.json'))
+    cli = data.json.read(Path(__file__).parent.parent / 'assets/data/package_data.json')
     cli.msgs = language.get_msgs()
     settings.load(cli, caller_file)
     return cli

remove-json-keys/src/remove_json_keys/lib/language.py

@@ -5,4 +5,4 @@
 
 def get_msgs():
     msgs_path = Path(__file__).parent.parent / 'assets' / 'data' / 'messages.json'
-    return sn(**{ key:val['message'] for key,val in data.json.read(msgs_path).items() })
+    return sn(**{ key: val.message for key, val in data.json.read(msgs_path).items() })

remove-json-keys/src/remove_json_keys/lib/settings.py

@@ -47,7 +47,7 @@ def load(cli, caller_file):
         config_path = Path(cli.project_root) / filename
         if config_path.exists():
             cli.config_filepath = str(config_path)
-            cli.config = data.sns.from_dict(data.json.read(cli.config_filepath))
+            cli.config = data.json.read(cli.config_filepath)
             cli.config_filename = filename
             break
     if hasattr(cli, 'config_filename'):

remove-json-keys/utils/bump.py

@@ -12,7 +12,7 @@
 
 from remove_json_keys.lib import data, log # type: ignore
 
-msgs = sn(**{ key:val['message'] for key,val in data.json.read(paths.msgs)['bump'].items() })
+msgs = sn(**{ key: val.message for key, val in data.json.read(paths.msgs).bump.items() })
 
 def parse_args():
     argp = argparse.ArgumentParser(description=msgs.app_DESC, add_help=False)

remove-json-keys/utils/clean.py

@@ -9,7 +9,7 @@ def main():
 
     from remove_json_keys.lib import data, log # type: ignore
 
-    msgs = sn(**{ key:val['message'] for key,val in data.json.read(paths.msgs)['clean'].items() })
+    msgs = sn(**{ key: val.message for key, val in data.json.read(paths.msgs).clean.items() })
 
     for target in ['dist', 'build', '*_cache', '__pycache__', '*.egg-info']:
         for path in Path('.').rglob(target):

translate-messages/src/translate_messages/lib/data/json.py

@@ -3,9 +3,11 @@
 
 import json5
 
+from . import sns
+
 def read(file_path, encoding='utf-8'):
     with open(file_path, 'r', encoding=encoding) as file:
-        return json5.load(file)
+        return sns.from_dict(json5.load(file))
 
 def write(file_path, data, encoding='utf-8'):
     Path(file_path).parent.mkdir(parents=True, exist_ok=True)

translate-messages/src/translate_messages/lib/data/sns.py

@@ -1,7 +1,18 @@
 from types import SimpleNamespace as sn
 
+class flex_ns(sn): # to access by dot or bracket
+    def __getitem__(self, key):
+        return getattr(self, key)
+    def __setitem__(self, key, val):
+        setattr(self, key, val)
+    def __contains__(self, key):
+        return hasattr(self, key)
+    def items(self):
+        return self.__dict__.items()
+
 def from_dict(obj):
-    for key, val in obj.items():
-        if isinstance(val, dict):
-            obj[key] = from_dict(val)
-    return sn(**obj)
+    if isinstance(obj, dict):
+        return flex_ns(**{key: from_dict(val) for key, val in obj.items()})
+    if isinstance(obj, list):
+        return [from_dict(item) for item in obj]
+    return obj

translate-messages/src/translate_messages/lib/init.py

@@ -4,7 +4,7 @@
 from . import data, language, log, settings
 
 def cli(caller_file):
-    cli = data.sns.from_dict(data.json.read(Path(__file__).parent.parent / 'assets/data/package_data.json'))
+    cli = data.json.read(Path(__file__).parent.parent / 'assets/data/package_data.json')
     cli.msgs = language.get_msgs()
     settings.load(cli, caller_file)
     return cli