Dump all properties to JSON

john-kurkowski · Nov 6, 2023 · bb75a7b · bb75a7b
1 parent f0320ae
commit bb75a7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/tests/cli_test.py b/tests/cli_test.py
@@ -81,5 +81,8 @@ def test_cli_json_output(
         "domain": "bbc",
         "suffix": "co.uk",
         "fqdn": "www.bbc.co.uk",
+        "ipv4": "",
+        "ipv6": "",
+        "is_private": False,
         "registered_domain": "bbc.co.uk",
     }
diff --git a/tldextract/cli.py b/tldextract/cli.py
@@ -1,7 +1,7 @@
 """tldextract CLI."""
 
-
 import argparse
+import dataclasses
 import json
 import logging
 import os.path
@@ -98,14 +98,12 @@ def main() -> None:
     for i in args.input:
         ext = tld_extract(i)
         if args.json:
+            properties = ("fqdn", "ipv4", "ipv6", "registered_domain")
             print(
                 json.dumps(
                     {
-                        "subdomain": ext.subdomain,
-                        "domain": ext.domain,
-                        "suffix": ext.suffix,
-                        "fqdn": ext.fqdn,
-                        "registered_domain": ext.registered_domain,
+                        **dataclasses.asdict(ext),
+                        **{prop: getattr(ext, prop) for prop in properties},
                     }
                 )
             )