From ad16a6110deb0f534d69f350d90ea7b08e2b9c04 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Wed, 2 Aug 2023 08:49:47 -0400
Subject: [PATCH 01/17] Added unit test for Pandas Timestamp serialization.

---
 highcharts_core/metaclasses.py |  2 +-
 tests/test_metaclasses.py      | 39 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/highcharts_core/metaclasses.py b/highcharts_core/metaclasses.py
index a2187fdb..1389bcf2 100644
--- a/highcharts_core/metaclasses.py
+++ b/highcharts_core/metaclasses.py
@@ -275,7 +275,7 @@ def trim_dict(untrimmed: dict,
                 as_dict[key] = value.timestamp()
             # other truthy -> str / number
             elif value:
-                trimmed_value = HighchartsMeta.trim_iterable(value, 
+                trimmed_value = HighchartsMeta.trim_iterable(value,
                                                              to_json = to_json,
                                                              context = context)
                 if trimmed_value:
diff --git a/tests/test_metaclasses.py b/tests/test_metaclasses.py
index 0dd09726..1316cb86 100644
--- a/tests/test_metaclasses.py
+++ b/tests/test_metaclasses.py
@@ -333,3 +333,42 @@ def test_from_js_literal(cls, as_str, error):
     else:
         with pytest.raises(error):
             result = cls.from_js_literal(as_str)
+
+@pytest.mark.parametrize('error', [
+    (None),
+])
+def test_to_json_with_timestamp(error):
+    from datetime import datetime
+    import json
+    
+    try:
+        from pandas import Timestamp
+        import_successful = True
+    except ImportError:
+        import_successful = False
+        
+    if import_successful:
+        class ClassWithTimestamp(HighchartsMeta):
+            @property
+            def timestamp_value(self):
+                return Timestamp(datetime.utcnow())
+            
+            def _to_untrimmed_dict(self, in_cls=None) -> dict:
+                return {
+                    'timestamp_value': self.timestamp_value
+                }
+                
+            @classmethod
+            def _get_kwargs_from_dict(cls, as_dict):
+                return {}
+
+        if not error:
+            obj = ClassWithTimestamp()
+            result = obj.to_json()
+            assert 'timestamp_value' in result
+            as_dict = json.loads(result)
+            assert 'timestamp_value' in as_dict
+            assert checkers.is_numeric(as_dict['timestamp_value']) is True
+        else:
+            with pytest.raises(error):
+                obj = ClassWithTimestamp()

From 03c6872150c16dfee68457ffe06e5a875dd1b55a Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Wed, 2 Aug 2023 20:19:27 -0400
Subject: [PATCH 02/17] Added __repr__ method.

---
 highcharts_core/constants.py   |  3 +++
 highcharts_core/metaclasses.py |  3 +++
 tests/test_metaclasses.py      | 12 +++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/highcharts_core/constants.py b/highcharts_core/constants.py
index 37c0e525..0e340a4c 100644
--- a/highcharts_core/constants.py
+++ b/highcharts_core/constants.py
@@ -28,6 +28,9 @@
 class EnforcedNullType:
     def __eq__(self, other):
         return isinstance(other, self.__class__)
+    
+    def __repr__(self):
+        return "EnforcedNullType()"
 
 
 EnforcedNull = EnforcedNullType()
diff --git a/highcharts_core/metaclasses.py b/highcharts_core/metaclasses.py
index 1389bcf2..f0c91649 100644
--- a/highcharts_core/metaclasses.py
+++ b/highcharts_core/metaclasses.py
@@ -41,6 +41,9 @@ def __eq__(self, other):
 
         return self_js_literal == other_js_literal
 
+    def __repr__(self):
+        return f'{self.__class__.__name__}.from_dict({self.to_dict()})'
+
     @property
     def _dot_path(self) -> Optional[str]:
         """The dot-notation path to the options key for the current class.
diff --git a/tests/test_metaclasses.py b/tests/test_metaclasses.py
index 1316cb86..7ed378cd 100644
--- a/tests/test_metaclasses.py
+++ b/tests/test_metaclasses.py
@@ -36,7 +36,7 @@ def _to_untrimmed_dict(self, in_cls = None) -> dict:
 
 test_class_instance = TestClass(item1 = 123, item2 = 456)
 test_class_trimmed_instance = TestClass(item1 = 123)
-test_class_iterable = TestClass(item1 = [1, 2, constants.EnforcedNullType], item2 = 456)
+test_class_iterable = TestClass(item1 = [1, 2, constants.EnforcedNull], item2 = 456)
 test_class_none_iterable = TestClass(item1 = [1, None, 3], item2 = 456)
 
 @pytest.mark.parametrize('kwargs, error', [
@@ -372,3 +372,13 @@ def _get_kwargs_from_dict(cls, as_dict):
         else:
             with pytest.raises(error):
                 obj = ClassWithTimestamp()
+
+
+@pytest.mark.parametrize('instance, expected', [
+    (test_class_instance, "TestClass.from_dict({'item1': 123, 'item2': 456})"),
+    (constants.EnforcedNull, "EnforcedNullType()"),
+    (test_class_iterable, "TestClass.from_dict({'item1': [1, 2, 'null'], 'item2': 456})"),
+])
+def test__repr(instance, expected):
+    result = repr(instance)
+    assert result == expected
\ No newline at end of file

From 3a844615ee4463d6524653025c19ad1110a656f2 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Wed, 2 Aug 2023 20:19:46 -0400
Subject: [PATCH 03/17] Bumped version number.

---
 CHANGES.rst                    | 7 +++++++
 highcharts_core/__version__.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3f3c99ec..64951b75 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Release 1.2.7
+=========================================
+
+* **ENHANCEMENT:** Custom ``__repr__()`` method for Highcharts Core for Python classes.
+
+------------------
+
 Release 1.2.6
 =========================================
 
diff --git a/highcharts_core/__version__.py b/highcharts_core/__version__.py
index 3fd380a7..d50b1386 100644
--- a/highcharts_core/__version__.py
+++ b/highcharts_core/__version__.py
@@ -1 +1 @@
-__version__ = '1.2.6'
\ No newline at end of file
+__version__ = '1.2.7'
\ No newline at end of file

From f5b3d4cc45baa87793eb8dcfd924f4301c27d939 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Fri, 4 Aug 2023 11:52:16 -0400
Subject: [PATCH 04/17] Implemented Chart.get_script_tags(). Closes #78.

---
 highcharts_core/chart.py       |  37 +++++++--
 highcharts_core/metaclasses.py |   7 +-
 tests/test_chart.py            | 147 +++++++++++++++++++++++++++++++++
 3 files changed, 182 insertions(+), 9 deletions(-)

diff --git a/highcharts_core/chart.py b/highcharts_core/chart.py
index 632e24f8..6e809de2 100644
--- a/highcharts_core/chart.py
+++ b/highcharts_core/chart.py
@@ -1,3 +1,4 @@
+import os
 from typing import Optional, List
 from collections import UserDict
 
@@ -30,7 +31,9 @@ def __init__(self, **kwargs):
         self.container = kwargs.get('container', None)
         self.options = kwargs.get('options', None)
         self.variable_name = kwargs.get('variable_name', None)
-        self.module_url = kwargs.get('module_url', 'https://code.highcharts.com/')
+        self.module_url = kwargs.get('module_url',
+                                     None) or os.environ.get('HIGHCHARTS_MODULE_URL',
+                                                             'https://code.highcharts.com/')
 
         super().__init__(**kwargs)
 
@@ -152,15 +155,36 @@ def _repr_html_(self):
         """
         return self.display()
 
-    def get_required_modules(self, include_extension = False) -> List[str]:
+    def get_script_tags(self, as_str = False) -> List[str] | str:
+        """Return the collection of ``<script/>`` tags needed to load the modules
+        for the chart to render.
+        
+        :param as_str: if ``True``, will return the result as a 
+          :class:`str <python:str>` instance, rather than a :class:`list <python:list>`
+          of :class:`str <python:str>`. Defaults to ``False``.
+        :type as_str: :class:`bool <python:bool>`
+
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>` or 
+          :class:`str <python:str>`
+        """
+        scripts = [f'<script src="{self.module_url}{x}"></script>' 
+                   for x in self.get_required_modules(include_extension = True)]
+
+        if as_str:
+            return '\n'.join(scripts)
+            
+        return scripts
+
+    def get_required_modules(self, 
+                             include_extension = False) -> List[str]:
         """Return the list of URLs from which the Highcharts JavaScript modules
         needed to render the chart can be retrieved.
         
         :param include_extension: if ``True``, will return script names with the 
           ``'.js'`` extension included. Defaults to ``False``.
         :type include_extension: :class:`bool <python:bool>`
-
-        :rtype: :class:`list <python:list>`
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
         """
         initial_scripts = ['highcharts']
         scripts = self._process_required_modules(initial_scripts, include_extension)
@@ -189,8 +213,9 @@ def callback(self, value):
     @property
     def module_url(self) -> str:
         """The URL from which Highcharts modules should be downloaded when 
-        generating the ``<script/>`` tags. Defaults to 
-        ``'https://code.highcharts.com/'``.
+        generating the ``<script/>`` tags. Will default to the
+        ``HIGHCHARTS_MODULE_URL`` environment variable if available, and 
+        otherwise defaults to ``'https://code.highcharts.com/'``.
         
         .. tip::
         
diff --git a/highcharts_core/metaclasses.py b/highcharts_core/metaclasses.py
index f0c91649..0c6ec965 100644
--- a/highcharts_core/metaclasses.py
+++ b/highcharts_core/metaclasses.py
@@ -118,15 +118,16 @@ def get_required_modules(self, include_extension = False) -> List[str]:
           ``'.js'`` extension included. Defaults to ``False``.
         :type include_extension: :class:`bool <python:bool>`
 
-        :rtype: :class:`list <python:list>`
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
         """
         initial_scripts = constants.MODULE_REQUIREMENTS.get(self._dot_path, [])
-        prelim_scripts = self._process_required_modules(initial_scripts, include_extension = include_extension)
+        prelim_scripts = self._process_required_modules(initial_scripts, 
+                                                        include_extension = include_extension)
         scripts = []
         
         has_all_indicators = False
         for script in prelim_scripts:
-            if script.endswith('indicators-all.js'):
+            if script.endswith('indicators-all.js') or script.endswith('indicators-all'):
                 has_all_indicators = True
         
         for script in prelim_scripts:
diff --git a/tests/test_chart.py b/tests/test_chart.py
index adbabb9f..2577c4a5 100644
--- a/tests/test_chart.py
+++ b/tests/test_chart.py
@@ -144,3 +144,150 @@ def test_get_required_modules(json_str, expected_modules, error):
     else:
         with pytest.raises(error):
             result = chart.get_required_modules()
+
+
+@pytest.mark.parametrize('options_str, as_str, expected, error', [
+    ("""{
+        "chart": {
+            "type": "column"
+        },
+        "colors": null,
+        "credits": false,
+        "exporting": {
+            "scale": 1
+        },
+        "series": [{
+            "baseSeries": 1,
+            "color": "#434343",
+            "name": "Pareto",
+            "tooltip": {
+                "valueDecimals": 2,
+                "valueSuffix": "%"
+            },
+            "type": "pareto",
+            "yAxis": 1,
+            "zIndex": 10
+        }, {
+            "color": "#7cb5ec",
+            "data": [1, 23, 45, 54, 84, 13, 8, 7, 23, 1, 34, 6, 8, 99, 85, 23, 3, 3, 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1],
+            "name": "random-name",
+            "type": "column",
+            "zIndex": 2
+        }],
+        "title": {
+            "text": "Random Name Pareto"
+        },
+        "tooltip": {
+            "shared": true
+        },
+        "xAxis": {
+            "categories": ["Something", "Something", "Something", "Something", "Something", "Something", "Hypovolemia", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something"],
+            "crosshair": true,
+            "labels": {
+                "rotation": 90
+            }
+        },
+        "yAxis": [{
+            "title": {
+                "text": "count"
+            }
+        }, {
+            "labels": {
+                "format": "{value}%"
+            },
+            "max": 100,
+            "maxPadding": 0,
+            "min": 0,
+            "minPadding": 0,
+            "opposite": true,
+            "title": {
+                "text": "accum percent"
+            }
+        }]
+    }""",
+    False,
+    [
+        '<script src="https://code.highcharts.com/highcharts.js"></script>',
+        '<script src="https://code.highcharts.com/modules/exporting.js"></script>',
+        '<script src="https://code.highcharts.com/modules/pareto.js"></script>'
+    ], None),
+    ("""{
+        "chart": {
+            "type": "column"
+        },
+        "colors": null,
+        "credits": false,
+        "exporting": {
+            "scale": 1
+        },
+        "series": [{
+            "baseSeries": 1,
+            "color": "#434343",
+            "name": "Pareto",
+            "tooltip": {
+                "valueDecimals": 2,
+                "valueSuffix": "%"
+            },
+            "type": "pareto",
+            "yAxis": 1,
+            "zIndex": 10
+        }, {
+            "color": "#7cb5ec",
+            "data": [1, 23, 45, 54, 84, 13, 8, 7, 23, 1, 34, 6, 8, 99, 85, 23, 3, 3, 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1],
+            "name": "random-name",
+            "type": "column",
+            "zIndex": 2
+        }],
+        "title": {
+            "text": "Random Name Pareto"
+        },
+        "tooltip": {
+            "shared": true
+        },
+        "xAxis": {
+            "categories": ["Something", "Something", "Something", "Something", "Something", "Something", "Hypovolemia", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something", "Something"],
+            "crosshair": true,
+            "labels": {
+                "rotation": 90
+            }
+        },
+        "yAxis": [{
+            "title": {
+                "text": "count"
+            }
+        }, {
+            "labels": {
+                "format": "{value}%"
+            },
+            "max": 100,
+            "maxPadding": 0,
+            "min": 0,
+            "minPadding": 0,
+            "opposite": true,
+            "title": {
+                "text": "accum percent"
+            }
+        }]
+    }""",
+    True,
+    """<script src="https://code.highcharts.com/highcharts.js"></script>\n<script src="https://code.highcharts.com/modules/exporting.js"></script>\n<script src="https://code.highcharts.com/modules/pareto.js"></script>""", None),
+])
+def test_get_script_tags(options_str, as_str, expected, error):
+    from highcharts_core.options import HighchartsOptions
+    options = HighchartsOptions.from_json(options_str)
+    chart = cls.from_options(options)
+
+    if not error:
+        result = chart.get_script_tags(as_str = as_str)
+        if isinstance(expected, list):
+            assert isinstance(result, list) is True
+            assert len(result) == len(expected)
+            for item in expected:
+                assert item in result
+        elif result:
+            assert result == expected
+        else:
+            assert result is None or len(result) == 0
+    else:
+        with pytest.raises(error):
+            result = chart.get_script_tags(as_str = as_str)
\ No newline at end of file

From e6a59a24d14500b10bbef29929f2ef65839af211 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Fri, 4 Aug 2023 11:52:44 -0400
Subject: [PATCH 05/17] Bumped version to 1.3.0 and updated changelog.

---
 CHANGES.rst                    | 5 +++--
 highcharts_core/__version__.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 64951b75..764c03a8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,8 @@
-Release 1.2.7
+Release 1.3.0
 =========================================
 
-* **ENHANCEMENT:** Custom ``__repr__()`` method for Highcharts Core for Python classes.
+* **ENHANCEMENT:** Added a complete ``__repr__()`` method for Highcharts Core for Python classes.
+* **ENHANCEMENT:** Added ``Chart.get_script_tags()`` to retrieve Javascript ``<script>`` tags (#78).
 
 ------------------
 
diff --git a/highcharts_core/__version__.py b/highcharts_core/__version__.py
index d50b1386..f94ba41e 100644
--- a/highcharts_core/__version__.py
+++ b/highcharts_core/__version__.py
@@ -1 +1 @@
-__version__ = '1.2.7'
\ No newline at end of file
+__version__ = '1.3.0'
\ No newline at end of file

From ccd7b612612e1abca830baf22ccde0a281b3a7fc Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Fri, 4 Aug 2023 12:07:28 -0400
Subject: [PATCH 06/17] Implemented utility_functions.to_snake_case().

---
 CHANGES.rst                          |  1 +
 docs/api.rst                         |  1 +
 docs/api/internals.rst               |  5 +++++
 highcharts_core/utility_functions.py | 29 ++++++++++++++++++++++++++++
 tests/test_utility_functions.py      | 16 ++++++++++++++-
 5 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 764c03a8..8b5da6c6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,6 +3,7 @@ Release 1.3.0
 
 * **ENHANCEMENT:** Added a complete ``__repr__()`` method for Highcharts Core for Python classes.
 * **ENHANCEMENT:** Added ``Chart.get_script_tags()`` to retrieve Javascript ``<script>`` tags (#78).
+* **ENHANCEMENT:** Added ``utility_functions.to_snake_case()`` function.
 
 ------------------
 
diff --git a/docs/api.rst b/docs/api.rst
index 502594e7..802f01ef 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -713,6 +713,7 @@ familiarize yourself with these internals.
       :func:`mro__to_untrimmed_dict() <highcharts_core.utility_functions.mro__to_untrimmed_dict>`
       :func:`validate_color() <highcharts_core.utility_functions.validate_color>`
       :func:`to_camelCase() <highcharts_core.utility_functions.to_camelCase>`
+      :func:`to_snake_case() <highcharts_core.utility_functions.to_snake_case>`
       :func:`parse_csv() <highcharts_core.utility_functions.parse_csv>`
 
 .. target-notes::
diff --git a/docs/api/internals.rst b/docs/api/internals.rst
index 7f40ada2..fe7d8677 100644
--- a/docs/api/internals.rst
+++ b/docs/api/internals.rst
@@ -165,6 +165,11 @@ function:: :func:`to_camelCase() <highcharts_core.utility_functions.to_camelCase
 
 .. autofunction:: to_camelCase
 
+function:: :func:`to_snake_case() <highcharts_core.utility_functions.to_snake_case>`
+=====================================================================================================
+
+.. autofunction:: to_snake_case
+
 function:: :func:`parse_csv() <highcharts_core.utility_functions.parse_csv>`
 =====================================================================================================
 
diff --git a/highcharts_core/utility_functions.py b/highcharts_core/utility_functions.py
index 010a1b94..b42dddf0 100644
--- a/highcharts_core/utility_functions.py
+++ b/highcharts_core/utility_functions.py
@@ -248,6 +248,35 @@ def to_camelCase(snake_case):
     return camel_case
 
 
+def to_snake_case(camel_case) -> str:
+    """Convert ``camelCase`` to ``snake_case``.
+
+    :param camel_case: A :class:`str <python:str>` which is likely to contain
+      ``camelCase``.
+    :type camel_case: :class:`str <python:str>`
+
+    :returns: A ``snake_case`` representation of ``camel_case``.
+    :rtype: :class:`str <python:str>`
+    """
+    camel_case = validators.string(camel_case)
+
+    snake_case = ''
+    previous_character = ''
+    for character in camel_case:
+        if character.isupper() and not previous_character.isupper():
+            snake_case += f'_{character.lower()}'
+        elif character.isupper() and previous_character.isupper():
+            snake_case += character.lower()
+        elif character.isupper() and not previous_character:
+            snake_case += character.lower()
+        else:
+            snake_case += character
+
+        previous_character = character
+
+    return snake_case
+
+
 def parse_csv(csv_data,
               has_header_row = True,
               delimiter = ',',
diff --git a/tests/test_utility_functions.py b/tests/test_utility_functions.py
index e7f47d76..8c6cdc50 100644
--- a/tests/test_utility_functions.py
+++ b/tests/test_utility_functions.py
@@ -22,4 +22,18 @@ def test_parse_csv(kwargs, expected_column_names, expected_records, error):
         assert len(records_as_dicts) == expected_records
     else:
         with pytest.raises(error):
-            result = utility_functions.parse_csv(**kwargs)
\ No newline at end of file
+            result = utility_functions.parse_csv(**kwargs)
+            
+
+@pytest.mark.parametrize('camelCase, expected, error', [
+    ('camelCase', 'camel_case', None),
+    ('camelCaseURL', 'camel_case_url', None),
+    ('camel123Case', 'camel123_case', None),
+])
+def test_to_snake_case(camelCase, expected, error):
+    if not error:
+        result = utility_functions.to_snake_case(camelCase)
+        assert result == expected
+    else:
+        with pytest.raises(error):
+            result = utility_functions.to_snake_case(camelCase)

From dbcd20ebeea4501f900eb4d19b48502c9c0848dc Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Fri, 4 Aug 2023 12:18:39 -0400
Subject: [PATCH 07/17] Refactored __repr__ method.

---
 highcharts_core/metaclasses.py |  9 ++++++++-
 tests/test_metaclasses.py      | 37 +++++++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/highcharts_core/metaclasses.py b/highcharts_core/metaclasses.py
index 0c6ec965..3dd9b80f 100644
--- a/highcharts_core/metaclasses.py
+++ b/highcharts_core/metaclasses.py
@@ -42,7 +42,14 @@ def __eq__(self, other):
         return self_js_literal == other_js_literal
 
     def __repr__(self):
-        return f'{self.__class__.__name__}.from_dict({self.to_dict()})'
+        as_dict = self.to_dict()
+
+        kwargs = {utility_functions.to_snake_case(key): as_dict[key]
+                  for key in as_dict}
+        kwargs_as_str = ', '.join([f'{key} = {repr(kwargs[key])}'
+                                   for key in kwargs])
+
+        return f'{self.__class__.__name__}({kwargs_as_str})'
 
     @property
     def _dot_path(self) -> Optional[str]:
diff --git a/tests/test_metaclasses.py b/tests/test_metaclasses.py
index 7ed378cd..4fa005a0 100644
--- a/tests/test_metaclasses.py
+++ b/tests/test_metaclasses.py
@@ -39,6 +39,37 @@ def _to_untrimmed_dict(self, in_cls = None) -> dict:
 test_class_iterable = TestClass(item1 = [1, 2, constants.EnforcedNull], item2 = 456)
 test_class_none_iterable = TestClass(item1 = [1, None, 3], item2 = 456)
 
+
+class TestClassCamelCase(TestClass):
+    def __init__(self, **kwargs):
+        self.camel_case_item = kwargs.get('camel_case_item', None)
+
+        super().__init__(**kwargs)
+
+    @classmethod
+    def _get_kwargs_from_dict(cls, as_dict):
+        kwargs = {
+            'item1': as_dict.get('item1', None),
+            'item2': as_dict.get('item2', None),
+            'camel_case_item': as_dict.get('camelCaseItem', None),
+        }
+
+        return kwargs
+
+    def _to_untrimmed_dict(self, in_cls = None) -> dict:
+        return {
+            'item1': self.item1,
+            'item2': self.item2,
+            'camelCaseItem': self.camel_case_item
+        }
+
+test_class_camel_case_instance = TestClassCamelCase(item1 = 123, item2 = 456, camel_case_item = 'test')
+test_class_camel_case_trimmed_instance = TestClassCamelCase(item1 = 123, camel_case_item = 'test')
+test_class_camel_case_iterable = TestClassCamelCase(item1 = [1, 2, constants.EnforcedNull], item2 = 456, camel_case_item = 'test')
+test_class_camel_case__none_iterable = TestClassCamelCase(item1 = [1, None, 3], item2 = 456, camel_case_item = 'test')
+
+
+
 @pytest.mark.parametrize('kwargs, error', [
     ({'item1': 123,
       'item2': 456},
@@ -375,10 +406,10 @@ def _get_kwargs_from_dict(cls, as_dict):
 
 
 @pytest.mark.parametrize('instance, expected', [
-    (test_class_instance, "TestClass.from_dict({'item1': 123, 'item2': 456})"),
+    (test_class_camel_case_instance, "TestClassCamelCase(item1 = 123, item2 = 456, camel_case_item = 'test')"),
     (constants.EnforcedNull, "EnforcedNullType()"),
-    (test_class_iterable, "TestClass.from_dict({'item1': [1, 2, 'null'], 'item2': 456})"),
+    (test_class_camel_case_iterable, "TestClassCamelCase(item1 = [1, 2, 'null'], item2 = 456, camel_case_item = 'test')"),
 ])
-def test__repr(instance, expected):
+def test__repr__(instance, expected):
     result = repr(instance)
     assert result == expected
\ No newline at end of file

From 415908f1fb94dc93d21a36da17a34a76cdc555bf Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Fri, 4 Aug 2023 16:54:01 -0400
Subject: [PATCH 08/17] Implemented __str__ and methods with docs and tests.
 Updated changelog. Closes #76.

---
 CHANGES.rst                                 |  3 +-
 docs/api/chart.rst                          |  1 +
 docs/api/options/index.rst                  |  2 +
 docs/api/options/series/arcdiagram.rst      |  3 +-
 docs/api/options/series/area.rst            |  6 ++
 docs/api/options/series/bar.rst             | 10 +++
 docs/api/options/series/base.rst            |  1 +
 docs/api/options/series/bellcurve.rst       |  1 +
 docs/api/options/series/boxplot.rst         |  2 +
 docs/api/options/series/bubble.rst          |  1 +
 docs/api/options/series/bullet.rst          |  1 +
 docs/api/options/series/dependencywheel.rst |  1 +
 docs/api/options/series/dumbbell.rst        |  2 +
 docs/api/options/series/funnel.rst          |  2 +
 docs/api/options/series/gauge.rst           |  2 +
 docs/api/options/series/heatmap.rst         |  2 +
 docs/api/options/series/histogram.rst       |  1 +
 docs/api/options/series/item.rst            |  1 +
 docs/api/options/series/networkgraph.rst    |  1 +
 docs/api/options/series/organization.rst    |  1 +
 docs/api/options/series/packedbubble.rst    |  1 +
 docs/api/options/series/pareto.rst          |  1 +
 docs/api/options/series/pictorial.rst       |  2 +
 docs/api/options/series/pie.rst             |  2 +
 docs/api/options/series/polygon.rst         |  1 +
 docs/api/options/series/pyramid.rst         |  2 +
 docs/api/options/series/sankey.rst          |  1 +
 docs/api/options/series/scatter.rst         |  2 +
 docs/api/options/series/spline.rst          |  1 +
 docs/api/options/series/sunburst.rst        |  1 +
 docs/api/options/series/timeline.rst        |  1 +
 docs/api/options/series/treegraph.rst       |  1 +
 docs/api/options/series/treemap.rst         |  1 +
 docs/api/options/series/vector.rst          |  1 +
 docs/api/options/series/venn.rst            |  1 +
 docs/api/options/series/wordcloud.rst       |  1 +
 highcharts_core/chart.py                    | 41 +++++++++++
 highcharts_core/metaclasses.py              |  7 ++
 highcharts_core/options/__init__.py         | 30 ++++++++
 highcharts_core/options/series/base.py      | 31 ++++++++
 tests/options/series/test_base.py           | 26 ++++++-
 tests/options/test_options.py               | 79 +++++++++++++++++++++
 tests/test_chart.py                         | 49 ++++++++++++-
 43 files changed, 323 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8b5da6c6..19ef09ca 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,8 @@
 Release 1.3.0
 =========================================
 
-* **ENHANCEMENT:** Added a complete ``__repr__()`` method for Highcharts Core for Python classes.
+* **ENHANCEMENT:** Added ``__repr__()`` method for Highcharts Core for Python classes (#76).
+* **ENHANCEMENT:** Added ``__str__()`` method with special handling for difficult-to-read classes (#76).
 * **ENHANCEMENT:** Added ``Chart.get_script_tags()`` to retrieve Javascript ``<script>`` tags (#78).
 * **ENHANCEMENT:** Added ``utility_functions.to_snake_case()`` function.
 
diff --git a/docs/api/chart.rst b/docs/api/chart.rst
index 4548fc83..5eff3afc 100644
--- a/docs/api/chart.rst
+++ b/docs/api/chart.rst
@@ -18,6 +18,7 @@ class: :class:`Chart <highcharts_core.chart.Chart>`
 .. autoclass:: Chart
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/index.rst b/docs/api/options/index.rst
index c7513994..973d95e9 100644
--- a/docs/api/options/index.rst
+++ b/docs/api/options/index.rst
@@ -46,6 +46,7 @@ class: :class:`HighchartsOptions <highcharts_core.options.HighchartsOptions>`
 .. autoclass:: HighchartsOptions
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
 -----------------------
 
@@ -56,6 +57,7 @@ class: :class:`Options <highcharts_core.options.Options>`
 .. autoclass:: Options
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
 -----------------------
 
diff --git a/docs/api/options/series/arcdiagram.rst b/docs/api/options/series/arcdiagram.rst
index ba18647f..4417d413 100644
--- a/docs/api/options/series/arcdiagram.rst
+++ b/docs/api/options/series/arcdiagram.rst
@@ -17,7 +17,8 @@ class: :class:`ArcDiagramSeries <highcharts_core.options.series.arcdiagram.ArcDi
 
 .. autoclass:: ArcDiagramSeries
   :members:
-  :inherited-members:
+    :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/area.rst b/docs/api/options/series/area.rst
index 86d0ef31..5672dff7 100644
--- a/docs/api/options/series/area.rst
+++ b/docs/api/options/series/area.rst
@@ -18,6 +18,7 @@ class: :class:`AreaSeries <highcharts_core.options.series.area.AreaSeries>`
 .. autoclass:: AreaSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`AreaRangeSeries <highcharts_core.options.series.area.AreaRangeSer
 .. autoclass:: AreaRangeSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -54,6 +56,7 @@ class: :class:`AreaSplineSeries <highcharts_core.options.series.area.AreaSplineS
 .. autoclass:: AreaSplineSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -72,6 +75,7 @@ class: :class:`AreaSplineRangeSeries <highcharts_core.options.series.area.AreaSp
 .. autoclass:: AreaSplineRangeSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -90,6 +94,7 @@ class: :class:`LineSeries <highcharts_core.options.series.area.LineSeries>`
 .. autoclass:: LineSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -108,6 +113,7 @@ class: :class:`StreamGraphSeries <highcharts_core.options.series.area.StreamGrap
 .. autoclass:: StreamGraphSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/bar.rst b/docs/api/options/series/bar.rst
index abbcdb67..d60f31b3 100644
--- a/docs/api/options/series/bar.rst
+++ b/docs/api/options/series/bar.rst
@@ -18,6 +18,7 @@ class: :class:`BarSeries <highcharts_core.options.series.bar.BarSeries>`
 .. autoclass:: BarSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`ColumnSeries <highcharts_core.options.series.bar.ColumnSeries>`
 .. autoclass:: ColumnSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -54,6 +56,7 @@ class: :class:`ColumnPyramidSeries <highcharts_core.options.series.bar.ColumnPyr
 .. autoclass:: ColumnPyramidSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -72,6 +75,7 @@ class: :class:`ColumnRangeSeries <highcharts_core.options.series.bar.ColumnRange
 .. autoclass:: ColumnRangeSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -90,6 +94,7 @@ class: :class:`CylinderSeries <highcharts_core.options.series.bar.CylinderSeries
 .. autoclass:: CylinderSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -108,6 +113,7 @@ class: :class:`VariwideSeries <highcharts_core.options.series.bar.VariwideSeries
 .. autoclass:: VariwideSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -126,6 +132,7 @@ class: :class:`WaterfallSeries <highcharts_core.options.series.bar.WaterfallSeri
 .. autoclass:: WaterfallSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -144,6 +151,7 @@ class: :class:`WindBarbSeries <highcharts_core.options.series.bar.WindBarbSeries
 .. autoclass:: WindBarbSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -180,6 +188,8 @@ class: :class:`BaseBarSeries <highcharts_core.options.series.bar.BaseBarSeries>`
 .. autoclass:: BaseBarSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/base.rst b/docs/api/options/series/base.rst
index b25fc334..68b3b002 100644
--- a/docs/api/options/series/base.rst
+++ b/docs/api/options/series/base.rst
@@ -18,6 +18,7 @@ class: :class:`SeriesBase <highcharts_core.options.series.base.SeriesBase>`
 .. autoclass:: SeriesBase
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/bellcurve.rst b/docs/api/options/series/bellcurve.rst
index 60f04262..e2e39015 100644
--- a/docs/api/options/series/bellcurve.rst
+++ b/docs/api/options/series/bellcurve.rst
@@ -18,6 +18,7 @@ class: :class:`BellCurveSeries <highcharts_core.options.series.bellcurve.BellCur
 .. autoclass:: BellCurveSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/boxplot.rst b/docs/api/options/series/boxplot.rst
index 7f2b04cc..b3d16b91 100644
--- a/docs/api/options/series/boxplot.rst
+++ b/docs/api/options/series/boxplot.rst
@@ -18,6 +18,7 @@ class: :class:`BoxPlotSeries <highcharts_core.options.series.boxplot.BoxPlotSeri
 .. autoclass:: BoxPlotSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`ErrorBarSeries <highcharts_core.options.series.boxplot.ErrorBarSe
 .. autoclass:: ErrorBarSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/bubble.rst b/docs/api/options/series/bubble.rst
index 22fb5482..72933f45 100644
--- a/docs/api/options/series/bubble.rst
+++ b/docs/api/options/series/bubble.rst
@@ -18,6 +18,7 @@ class: :class:`BubbleSeries <highcharts_core.options.series.bubble.BubbleSeries>
 .. autoclass:: BubbleSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/bullet.rst b/docs/api/options/series/bullet.rst
index 52b424b5..8e5c8cc5 100644
--- a/docs/api/options/series/bullet.rst
+++ b/docs/api/options/series/bullet.rst
@@ -18,6 +18,7 @@ class: :class:`BulletSeries <highcharts_core.options.series.bullet.BulletSeries>
 .. autoclass:: BulletSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/dependencywheel.rst b/docs/api/options/series/dependencywheel.rst
index b859f715..88395d0a 100644
--- a/docs/api/options/series/dependencywheel.rst
+++ b/docs/api/options/series/dependencywheel.rst
@@ -18,6 +18,7 @@ class: :class:`DependencyWheelSeries <highcharts_core.options.series.dependencyw
 .. autoclass:: DependencyWheelSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/dumbbell.rst b/docs/api/options/series/dumbbell.rst
index 6b764636..9d1f24a0 100644
--- a/docs/api/options/series/dumbbell.rst
+++ b/docs/api/options/series/dumbbell.rst
@@ -18,6 +18,7 @@ class: :class:`DumbbellSeries <highcharts_core.options.series.dumbbell.DumbbellS
 .. autoclass:: DumbbellSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`LollipopSeries <highcharts_core.options.series.dumbbell.LollipopS
 .. autoclass:: LollipopSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/funnel.rst b/docs/api/options/series/funnel.rst
index 8c63228f..fcaf4f25 100644
--- a/docs/api/options/series/funnel.rst
+++ b/docs/api/options/series/funnel.rst
@@ -18,6 +18,7 @@ class: :class:`FunnelSeries <highcharts_core.options.series.funnel.FunnelSeries>
 .. autoclass:: FunnelSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`Funnel3DSeries <highcharts_core.options.series.funnel.Funnel3DSer
 .. autoclass:: Funnel3DSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/gauge.rst b/docs/api/options/series/gauge.rst
index 7a9aa3d0..cd3f32cf 100644
--- a/docs/api/options/series/gauge.rst
+++ b/docs/api/options/series/gauge.rst
@@ -18,6 +18,7 @@ class: :class:`GaugeSeries <highcharts_core.options.series.gauge.GaugeSeries>`
 .. autoclass:: GaugeSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`SolidGaugeSeries <highcharts_core.options.series.gauge.SolidGauge
 .. autoclass:: SolidGaugeSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/heatmap.rst b/docs/api/options/series/heatmap.rst
index 57856212..1cdd4041 100644
--- a/docs/api/options/series/heatmap.rst
+++ b/docs/api/options/series/heatmap.rst
@@ -18,6 +18,7 @@ class: :class:`HeatmapSeries <highcharts_core.options.series.heatmap.HeatmapSeri
 .. autoclass:: HeatmapSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`TilemapSeries <highcharts_core.options.series.heatmap.TilemapSeri
 .. autoclass:: TilemapSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/histogram.rst b/docs/api/options/series/histogram.rst
index 7ce28ca3..5e9ea4a7 100644
--- a/docs/api/options/series/histogram.rst
+++ b/docs/api/options/series/histogram.rst
@@ -18,6 +18,7 @@ class: :class:`HistogramSeries <highcharts_core.options.series.histogram.Histogr
 .. autoclass:: HistogramSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/item.rst b/docs/api/options/series/item.rst
index bb6736de..9fb676aa 100644
--- a/docs/api/options/series/item.rst
+++ b/docs/api/options/series/item.rst
@@ -18,6 +18,7 @@ class: :class:`ItemSeries <highcharts_core.options.series.item.ItemSeries>`
 .. autoclass:: ItemSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/networkgraph.rst b/docs/api/options/series/networkgraph.rst
index 63185bb3..3d77b70a 100644
--- a/docs/api/options/series/networkgraph.rst
+++ b/docs/api/options/series/networkgraph.rst
@@ -18,6 +18,7 @@ class: :class:`NetworkGraphSeries <highcharts_core.options.series.networkgraph.N
 .. autoclass:: NetworkGraphSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/organization.rst b/docs/api/options/series/organization.rst
index a2b28b3c..3e4b328b 100644
--- a/docs/api/options/series/organization.rst
+++ b/docs/api/options/series/organization.rst
@@ -18,6 +18,7 @@ class: :class:`OrganizationSeries <highcharts_core.options.series.organization.O
 .. autoclass:: OrganizationSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/packedbubble.rst b/docs/api/options/series/packedbubble.rst
index 44ad2085..695db9cd 100644
--- a/docs/api/options/series/packedbubble.rst
+++ b/docs/api/options/series/packedbubble.rst
@@ -18,6 +18,7 @@ class: :class:`PackedBubbleSeries <highcharts_core.options.series.packedbubble.P
 .. autoclass:: PackedBubbleSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/pareto.rst b/docs/api/options/series/pareto.rst
index 8c22321b..36dbaf3b 100644
--- a/docs/api/options/series/pareto.rst
+++ b/docs/api/options/series/pareto.rst
@@ -18,6 +18,7 @@ class: :class:`ParetoSeries <highcharts_core.options.series.pareto.ParetoSeries>
 .. autoclass:: ParetoSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/pictorial.rst b/docs/api/options/series/pictorial.rst
index dbd7ba4a..f03ae42a 100644
--- a/docs/api/options/series/pictorial.rst
+++ b/docs/api/options/series/pictorial.rst
@@ -18,6 +18,7 @@ class: :class:`PictorialSeries <highcharts_core.options.series.pictorial.Pictori
 .. autoclass:: PictorialSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -38,6 +39,7 @@ class: :class:`PictorialPaths <highcharts_core.options.series.pictorial.Pictoria
 .. autoclass:: PictorialPaths
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/pie.rst b/docs/api/options/series/pie.rst
index 1d3dc73c..c6fb5e74 100644
--- a/docs/api/options/series/pie.rst
+++ b/docs/api/options/series/pie.rst
@@ -18,6 +18,7 @@ class: :class:`PieSeries <highcharts_core.options.series.pie.PieSeries>`
 .. autoclass:: PieSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -37,6 +38,7 @@ class: :class:`VariablePieSeries <highcharts_core.options.series.pie.VariablePie
 .. autoclass:: VariablePieSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/polygon.rst b/docs/api/options/series/polygon.rst
index 5843080a..d0f088de 100644
--- a/docs/api/options/series/polygon.rst
+++ b/docs/api/options/series/polygon.rst
@@ -18,6 +18,7 @@ class: :class:`PolygonSeries <highcharts_core.options.series.polygon.PolygonSeri
 .. autoclass:: PolygonSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/pyramid.rst b/docs/api/options/series/pyramid.rst
index d9377000..9ac94b3f 100644
--- a/docs/api/options/series/pyramid.rst
+++ b/docs/api/options/series/pyramid.rst
@@ -18,6 +18,7 @@ class: :class:`PyramidSeries <highcharts_core.options.series.pyramid.PyramidSeri
 .. autoclass:: PyramidSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`Pyramid3DSeries <highcharts_core.options.series.pyramid.Pyramid3D
 .. autoclass:: Pyramid3DSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/sankey.rst b/docs/api/options/series/sankey.rst
index 29a605d4..9b5afc14 100644
--- a/docs/api/options/series/sankey.rst
+++ b/docs/api/options/series/sankey.rst
@@ -18,6 +18,7 @@ class: :class:`SankeySeries <highcharts_core.options.series.sankey.SankeySeries>
 .. autoclass:: SankeySeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/scatter.rst b/docs/api/options/series/scatter.rst
index 11e6b3b6..e42c3d5c 100644
--- a/docs/api/options/series/scatter.rst
+++ b/docs/api/options/series/scatter.rst
@@ -18,6 +18,7 @@ class: :class:`ScatterSeries <highcharts_core.options.series.scatter.ScatterSeri
 .. autoclass:: ScatterSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
@@ -36,6 +37,7 @@ class: :class:`Scatter3DSeries <highcharts_core.options.series.scatter.Scatter3D
 .. autoclass:: Scatter3DSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/spline.rst b/docs/api/options/series/spline.rst
index bf9f388d..4cf8eec7 100644
--- a/docs/api/options/series/spline.rst
+++ b/docs/api/options/series/spline.rst
@@ -18,6 +18,7 @@ class: :class:`SplineSeries <highcharts_core.options.series.spline.SplineSeries>
 .. autoclass:: SplineSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/sunburst.rst b/docs/api/options/series/sunburst.rst
index dceee4af..3d32f710 100644
--- a/docs/api/options/series/sunburst.rst
+++ b/docs/api/options/series/sunburst.rst
@@ -18,6 +18,7 @@ class: :class:`SunburstSeries <highcharts_core.options.series.sunburst.SunburstS
 .. autoclass:: SunburstSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/timeline.rst b/docs/api/options/series/timeline.rst
index 3e9d3f38..99b01825 100644
--- a/docs/api/options/series/timeline.rst
+++ b/docs/api/options/series/timeline.rst
@@ -18,6 +18,7 @@ class: :class:`TimelineSeries <highcharts_core.options.series.timeline.TimelineS
 .. autoclass:: TimelineSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/treegraph.rst b/docs/api/options/series/treegraph.rst
index ee30a17c..b1e6474d 100644
--- a/docs/api/options/series/treegraph.rst
+++ b/docs/api/options/series/treegraph.rst
@@ -18,6 +18,7 @@ class: :class:`TreegraphSeries <highcharts_core.options.series.treegraph.Treegra
 .. autoclass:: TreegraphSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/treemap.rst b/docs/api/options/series/treemap.rst
index 0f93c94e..52519d71 100644
--- a/docs/api/options/series/treemap.rst
+++ b/docs/api/options/series/treemap.rst
@@ -18,6 +18,7 @@ class: :class:`TreemapSeries <highcharts_core.options.series.treemap.TreemapSeri
 .. autoclass:: TreemapSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/vector.rst b/docs/api/options/series/vector.rst
index fa1824e1..3df47930 100644
--- a/docs/api/options/series/vector.rst
+++ b/docs/api/options/series/vector.rst
@@ -18,6 +18,7 @@ class: :class:`VectorSeries <highcharts_core.options.series.vector.VectorSeries>
 .. autoclass:: VectorSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/venn.rst b/docs/api/options/series/venn.rst
index a8f05e12..3532b55e 100644
--- a/docs/api/options/series/venn.rst
+++ b/docs/api/options/series/venn.rst
@@ -18,6 +18,7 @@ class: :class:`VennSeries <highcharts_core.options.series.venn.VennSeries>`
 .. autoclass:: VennSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/docs/api/options/series/wordcloud.rst b/docs/api/options/series/wordcloud.rst
index f380f40c..d0d8a996 100644
--- a/docs/api/options/series/wordcloud.rst
+++ b/docs/api/options/series/wordcloud.rst
@@ -18,6 +18,7 @@ class: :class:`WordcloudSeries <highcharts_core.options.series.wordcloud.Wordclo
 .. autoclass:: WordcloudSeries
   :members:
   :inherited-members:
+  :special-members: __str__, __repr__
 
   .. collapse:: Class Inheritance
 
diff --git a/highcharts_core/chart.py b/highcharts_core/chart.py
index 6e809de2..cd8e29e1 100644
--- a/highcharts_core/chart.py
+++ b/highcharts_core/chart.py
@@ -37,6 +37,47 @@ def __init__(self, **kwargs):
 
         super().__init__(**kwargs)
 
+    def __str__(self):
+        """Return a human-readable :class:`str <python:str>` representation of the chart.
+
+        .. warning::
+        
+          To ensure that the result is human-readable, the chart's ``options`` property will 
+          be rendered *without* its ``plot_options`` and ``series`` sub-properties. 
+        
+          .. tip::
+        
+            If you would like a *complete* and *unambiguous* :class:`str <python:str>` 
+            representation, then you can:
+            
+            * use the :meth:`__repr__() <highcharts_core.chart.Chart.__repr__>` method,
+            * call ``repr(my_chart)``, or
+            * serialize the chart to JSON using ``my_chart.to_json()``.
+            
+        :returns: A :class:`str <python:str>` representation of the chart.
+        :rtype: :class:`str <python:str>`
+        """
+        as_dict = self.to_dict()
+
+        kwargs = {utility_functions.to_snake_case(key): as_dict[key]
+                  for key in as_dict if key not in ['options', 'userOptions']}
+
+        if 'options' in as_dict:
+            kwargs['options'] = str(as_dict['options'])
+        elif 'userOptions' in as_dict:
+            kwargs['options'] = str(as_dict['userOptions'])
+
+        kwargs_as_str = ''
+        for index, key in enumerate(kwargs):
+            if index > 0:
+                kwargs_as_str += ', '
+            if key == 'options':
+                kwargs_as_str += f'options = {kwargs[key]}'
+            else:
+                kwargs_as_str += f'{key} = {repr(kwargs[key])}'
+            
+        return f'{self.__class__.__name__}({kwargs_as_str})'
+
     def _jupyter_include_scripts(self):
         """Return the JavaScript code that is used to load the Highcharts JS libraries.
 
diff --git a/highcharts_core/metaclasses.py b/highcharts_core/metaclasses.py
index 3dd9b80f..350b5943 100644
--- a/highcharts_core/metaclasses.py
+++ b/highcharts_core/metaclasses.py
@@ -42,6 +42,13 @@ def __eq__(self, other):
         return self_js_literal == other_js_literal
 
     def __repr__(self):
+        """Generate an unambiguous and complete :class:`str <python:str>` representation
+        of the object.
+        
+        :returns: An unambiguous and complete :class:`str <python:str>` representation
+          of the object (which may have varying degrees of readability).
+        :rtype: :class:`str <python:str>`
+        """
         as_dict = self.to_dict()
 
         kwargs = {utility_functions.to_snake_case(key): as_dict[key]
diff --git a/highcharts_core/options/__init__.py b/highcharts_core/options/__init__.py
index e3fae433..166ec06c 100644
--- a/highcharts_core/options/__init__.py
+++ b/highcharts_core/options/__init__.py
@@ -96,6 +96,36 @@ def __init__(self, **kwargs):
 
         self.series = kwargs.get('series', None)
 
+    def __str__(self):
+        """Return a human-readable :class:`str <python:str>` representation of the chart
+        configuration.
+
+        .. warning::
+        
+          To ensure that the result is human-readable, the result will be rendered
+          *without* its ``plot_options`` and ``series`` sub-properties. 
+        
+          .. tip::
+        
+            If you would like a *complete* and *unambiguous* :class:`str <python:str>` 
+            representation, then you can:
+            
+            * use the :meth:`__repr__() <highcharts_core.options.Options.__repr__>` method,
+            * call ``repr(my_options)``, or
+            * serialize the chart to JSON using ``my_options.to_json()``.
+            
+        :returns: A :class:`str <python:str>` representation of the chart configuration.
+        :rtype: :class:`str <python:str>`
+        """
+        as_dict = self.to_dict()
+
+        kwargs = {utility_functions.to_snake_case(key): as_dict[key]
+                  for key in as_dict if key not in ['series', 'plotOptions']}
+        kwargs_as_str = ', '.join([f'{key} = {repr(kwargs[key])}'
+                                   for key in kwargs])
+
+        return f'{self.__class__.__name__}({kwargs_as_str})'
+
     @property
     def accessibility(self) -> Optional[Accessibility]:
         """Options for configuring accessibility for the chart.
diff --git a/highcharts_core/options/series/base.py b/highcharts_core/options/series/base.py
index f3fe48bf..38740c65 100644
--- a/highcharts_core/options/series/base.py
+++ b/highcharts_core/options/series/base.py
@@ -46,6 +46,37 @@ def __init__(self, **kwargs):
 
         super().__init__(**kwargs)
 
+    def __str__(self):
+        """Return a human-readable :class:`str <python:str>` representation of the series.
+
+        .. warning::
+        
+          To ensure that the result is human-readable, the string representation
+          will be generated *without* its 
+          :meth:`.data <highcharts_core.options.series.base.SeriesBase.data>` 
+          property.
+        
+          .. tip::
+        
+            If you would like a *complete* and *unambiguous* :class:`str <python:str>` 
+            representation, then you can:
+            
+            * use the :meth:`__repr__() <highcharts_core.options.series.base.SeriesBase.__repr__>` method,
+            * call ``repr(my_series)``, or
+            * serialize the series to JSON using ``my_series.to_json()``.
+            
+        :returns: A :class:`str <python:str>` representation of the chart.
+        :rtype: :class:`str <python:str>`
+        """
+        as_dict = self.to_dict()
+
+        kwargs = {utility_functions.to_snake_case(key): as_dict[key]
+                  for key in as_dict if key != 'data'}
+        kwargs_as_str = ', '.join([f'{key} = {repr(kwargs[key])}'
+                                   for key in kwargs])
+
+        return f'{self.__class__.__name__}({kwargs_as_str})'
+
     @property
     def _dot_path(self) -> Optional[str]:
         """The dot-notation path to the options key for the current class.
diff --git a/tests/options/series/test_base.py b/tests/options/series/test_base.py
index 4553d86a..9dbef12c 100644
--- a/tests/options/series/test_base.py
+++ b/tests/options/series/test_base.py
@@ -683,4 +683,28 @@ def test_load_from_pandas(input_files, filename, property_map, error):
                 assert getattr(item, key) is not None
     else:
         with pytest.raises(error):
-            instance.load_from_pandas(df, property_map = property_map)
\ No newline at end of file
+            instance.load_from_pandas(df, property_map = property_map)
+            
+
+@pytest.mark.parametrize('kwargs, error', STANDARD_PARAMS)
+def test__repr__(kwargs, error):
+    obj = cls(**kwargs)
+    if not error:
+        result = repr(obj)
+        if 'data' in kwargs:
+            assert 'data = ' in result
+    else:
+        with pytest.raises(error):
+            result = repr(obj)
+
+
+@pytest.mark.parametrize('kwargs, error', STANDARD_PARAMS)
+def test__str__(kwargs, error):
+    obj = cls(**kwargs)
+    if not error:
+        result = str(obj)
+        print(result)
+        assert 'data = ' not in result
+    else:
+        with pytest.raises(error):
+            result = str(obj)
\ No newline at end of file
diff --git a/tests/options/test_options.py b/tests/options/test_options.py
index 2c4d045c..c1653bc5 100644
--- a/tests/options/test_options.py
+++ b/tests/options/test_options.py
@@ -42,3 +42,82 @@ def test_to_dict(kwargs, error):
 ])
 def test_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls, input_files, filename, as_file, error)
+
+
+@pytest.mark.parametrize('kwargs, error', [
+    ({}, None),
+    ({
+        'title': {
+            'text': 'My Chart'
+        }
+    }, None),
+    ({
+        'plot_options': {
+            'series': {
+                'crisp': True
+            }
+        }
+    }, None),
+    ({
+        'series': [
+            {
+                'crisp': True,
+                'type': 'bar'
+            },
+            {
+                'crisp': False,
+                'type': 'bar'
+            }
+        ]
+    }, None),
+])
+def test__repr__(kwargs, error):
+    obj = cls(**kwargs)
+    if not error:
+        result = repr(obj)
+        if 'plot_options' in kwargs:
+            assert 'plot_options = ' in result
+        if 'series' in kwargs:
+            assert 'series = ' in result
+    else:
+        with pytest.raises(error):
+            result = repr(obj)
+
+
+@pytest.mark.parametrize('kwargs, error', [
+    ({}, None),
+    ({
+        'title': {
+            'text': 'My Chart'
+        }
+    }, None),
+    ({
+        'plot_options': {
+            'series': {
+                'crisp': True
+            }
+        }
+    }, None),
+    ({
+        'series': [
+            {
+                'crisp': True,
+                'type': 'bar'
+            },
+            {
+                'crisp': False,
+                'type': 'bar'
+            }
+        ]
+    }, None),
+])
+def test__str__(kwargs, error):
+    obj = cls(**kwargs)
+    if not error:
+        result = str(obj)
+        print(result)
+        assert 'plot_options = ' not in result
+        assert 'series = ' not in result
+    else:
+        with pytest.raises(error):
+            result = str(obj)
\ No newline at end of file
diff --git a/tests/test_chart.py b/tests/test_chart.py
index 2577c4a5..30eb7564 100644
--- a/tests/test_chart.py
+++ b/tests/test_chart.py
@@ -290,4 +290,51 @@ def test_get_script_tags(options_str, as_str, expected, error):
             assert result is None or len(result) == 0
     else:
         with pytest.raises(error):
-            result = chart.get_script_tags(as_str = as_str)
\ No newline at end of file
+            result = chart.get_script_tags(as_str = as_str)
+            
+
+@pytest.mark.parametrize('kwargs, error', [
+    ({}, None),
+    ({
+        'container': 'my-container-name', 
+        'module_url': 'https://mycustomurl.com/', 
+        'options': {
+            'title': {
+                'text': 'My Chart'
+            }
+        }
+    }, None),
+])
+def test__repr__(kwargs, error):
+    obj = cls(**kwargs)
+    if not error:
+        result = repr(obj)
+        if 'options' in kwargs:
+            assert 'options = ' in result
+    else:
+        with pytest.raises(error):
+            result = repr(obj)
+
+
+@pytest.mark.parametrize('kwargs, error', [
+    ({}, None),
+    ({
+        'container': 'my-container-name', 
+        'module_url': 'https://mycustomurl.com/', 
+        'options': {
+            'title': {
+                'text': 'My Chart'
+            }
+        }
+    }, None),
+])
+def test__str__(kwargs, error):
+    obj = cls(**kwargs)
+    if not error:
+        result = str(obj)
+        print(result)
+        if 'options' in kwargs:
+            assert 'options = ' in result
+    else:
+        with pytest.raises(error):
+            result = str(obj)
\ No newline at end of file

From 2ce289aa99b481cda67018642b12392d5f52c949 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Fri, 4 Aug 2023 18:19:31 -0400
Subject: [PATCH 09/17] Fixed bugs in .to_dict() and .to_json(). Closes #74 and
 #75.

---
 CHANGES.rst                    |  2 ++
 highcharts_core/metaclasses.py | 27 ++++++++++++---
 tests/test_metaclasses.py      | 63 +++++++++++++++++++++++++++++++++-
 3 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 19ef09ca..a433a73a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,8 @@
 Release 1.3.0
 =========================================
 
+* **BUGFIX:** Fixed incorrect serialization of datetime and Pandas ``Timestamp`` objects in ``.to_dict()`` and ``.to_json()`` (#74).
+* **BUGFIX:** Fixed incorrect serialization of ``EnforcedNull`` in ``.to_dict()`` and ``.to_json()`` (#75).
 * **ENHANCEMENT:** Added ``__repr__()`` method for Highcharts Core for Python classes (#76).
 * **ENHANCEMENT:** Added ``__str__()`` method with special handling for difficult-to-read classes (#76).
 * **ENHANCEMENT:** Added ``Chart.get_script_tags()`` to retrieve Javascript ``<script>`` tags (#78).
diff --git a/highcharts_core/metaclasses.py b/highcharts_core/metaclasses.py
index 350b5943..61ea9537 100644
--- a/highcharts_core/metaclasses.py
+++ b/highcharts_core/metaclasses.py
@@ -273,7 +273,10 @@ def trim_dict(untrimmed: dict,
                     as_dict[key] = trimmed_value
             # Enforced null
             elif isinstance(value, constants.EnforcedNullType):
-                as_dict[key] = 'null'
+                if to_json:
+                    as_dict[key] = None
+                else:
+                    as_dict[key] = value
             # dict -> object
             elif isinstance(value, dict):
                 trimmed_value = HighchartsMeta.trim_dict(value,
@@ -288,9 +291,23 @@ def trim_dict(untrimmed: dict,
                                                              context = context)
                 if trimmed_value:
                     as_dict[key] = trimmed_value
-            # Pandas Timestamp
-            elif checkers.is_type(value, 'Timestamp'):
-                as_dict[key] = value.timestamp()
+            # Datetime or Datetime-like
+            elif checkers.is_datetime(value):
+                trimmed_value = value
+                if to_json:
+                    if not value.tzinfo:
+                        trimmed_value = value.replace(tzinfo = datetime.timezone.utc)
+                    as_dict[key] = trimmed_value.timestamp() * 1000
+                elif hasattr(trimmed_value, 'to_pydatetime'):
+                    as_dict[key] = trimmed_value.to_pydatetime()
+                else:
+                    as_dict[key] = trimmed_value
+            # Date or Time
+            elif checkers.is_date(value) or checkers.is_time(value):
+                if to_json:
+                    as_dict[key] = value.isoformat()
+                else:
+                    as_dict[key] = value
             # other truthy -> str / number
             elif value:
                 trimmed_value = HighchartsMeta.trim_iterable(value,
@@ -440,7 +457,7 @@ def to_json(self,
                                  context = self.__class__.__name__)
 
         for key in as_dict:
-            if as_dict[key] == constants.EnforcedNull or as_dict[key] == 'null':
+            if as_dict[key] == constants.EnforcedNull or as_dict[key] is None:
                 as_dict[key] = None
         try:
             as_json = json.dumps(as_dict, encoding = encoding)
diff --git a/tests/test_metaclasses.py b/tests/test_metaclasses.py
index 4fa005a0..fbba1126 100644
--- a/tests/test_metaclasses.py
+++ b/tests/test_metaclasses.py
@@ -405,6 +405,39 @@ def _get_kwargs_from_dict(cls, as_dict):
                 obj = ClassWithTimestamp()
 
 
+@pytest.mark.parametrize('error', [
+    (None),
+])
+def test_to_json_with_date(error):
+    from datetime import datetime, date
+    import json
+    
+    class ClassWithDate(HighchartsMeta):
+        @property
+        def date_value(self):
+            return date.today()
+        
+        def _to_untrimmed_dict(self, in_cls=None) -> dict:
+            return {
+                'date_value': self.date_value
+            }
+            
+        @classmethod
+        def _get_kwargs_from_dict(cls, as_dict):
+            return {}
+
+    if not error:
+        obj = ClassWithDate()
+        result = obj.to_json()
+        assert 'date_value' in result
+        as_dict = json.loads(result)
+        assert 'date_value' in as_dict
+        assert checkers.is_string(as_dict['date_value']) is True
+    else:
+        with pytest.raises(error):
+            obj = ClassWithDate()
+
+
 @pytest.mark.parametrize('instance, expected', [
     (test_class_camel_case_instance, "TestClassCamelCase(item1 = 123, item2 = 456, camel_case_item = 'test')"),
     (constants.EnforcedNull, "EnforcedNullType()"),
@@ -412,4 +445,32 @@ def _get_kwargs_from_dict(cls, as_dict):
 ])
 def test__repr__(instance, expected):
     result = repr(instance)
-    assert result == expected
\ No newline at end of file
+    assert result == expected
+
+
+class ClassWithEnforcedNull(HighchartsMeta):
+    @property
+    def enforced_null_value(self):
+        return constants.EnforcedNull
+    
+    def _to_untrimmed_dict(self, in_cls=None) -> dict:
+        return {
+            'enforced_null_value': self.enforced_null_value
+        }
+        
+    @classmethod
+    def _get_kwargs_from_dict(cls, as_dict):
+        return {}
+    
+    
+def test_enforced_null_to_dict():
+    obj = ClassWithEnforcedNull()
+    result = obj.to_dict()
+    assert 'enforced_null_value' in result
+    assert isinstance(result['enforced_null_value'], constants.EnforcedNullType) is True
+
+
+def test_enforced_null_to_json():
+    obj = ClassWithEnforcedNull()
+    result = obj.to_json()
+    assert result == '{"enforced_null_value": null}'
\ No newline at end of file

From 1d12b86578878d3f44741f68427c90c12d43ffc2 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Fri, 4 Aug 2023 18:30:59 -0400
Subject: [PATCH 10/17] Fixed error-generating duplicate value storage in x and
 name properties. Closes #67.

---
 highcharts_core/options/series/data/bar.py       |  1 +
 highcharts_core/options/series/data/boxplot.py   |  3 ++-
 highcharts_core/options/series/data/bullet.py    |  3 ++-
 highcharts_core/options/series/data/cartesian.py | 13 +++++++++----
 highcharts_core/options/series/data/range.py     |  3 ++-
 highcharts_core/options/series/data/sunburst.py  |  2 +-
 highcharts_core/options/series/data/vector.py    |  3 +++
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/highcharts_core/options/series/data/bar.py b/highcharts_core/options/series/data/bar.py
index 86263e71..7d6b8840 100644
--- a/highcharts_core/options/series/data/bar.py
+++ b/highcharts_core/options/series/data/bar.py
@@ -365,6 +365,7 @@ def from_array(cls, value):
                 as_obj = cls.from_dict(as_dict)
                 if checkers.is_string(as_obj.x):
                     as_obj.name = as_obj.x
+                    as_obj.x = None
             else:
                 raise errors.HighchartsValueError(f'each data point supplied must either '
                                                   f'be a WindBarb Data Point or be '
diff --git a/highcharts_core/options/series/data/boxplot.py b/highcharts_core/options/series/data/boxplot.py
index 82caecfa..22fbe413 100644
--- a/highcharts_core/options/series/data/boxplot.py
+++ b/highcharts_core/options/series/data/boxplot.py
@@ -278,8 +278,9 @@ def from_array(cls, value):
                                                       f'had {len(item)} dimensions.')
 
                 as_obj = cls.from_dict(as_dict)
-                if checkers.is_string(as_obj.x):
+                if checkers.is_string(as_obj.x) and not as_obj.name:
                     as_obj.name = as_obj.x
+                    as_obj.x = None
             else:
                 raise errors.HighchartsValueError(f'each data point supplied must either '
                                                   f'be a BoxPlot Data Point or be '
diff --git a/highcharts_core/options/series/data/bullet.py b/highcharts_core/options/series/data/bullet.py
index 22ce6fa3..badc7fc3 100644
--- a/highcharts_core/options/series/data/bullet.py
+++ b/highcharts_core/options/series/data/bullet.py
@@ -87,8 +87,9 @@ def from_array(cls, value):
                                                       f'had {len(item)} dimensions.')
                     
                 as_obj = cls.from_dict(as_dict)
-                if checkers.is_string(as_obj.x):
+                if checkers.is_string(as_obj.x) and not as_obj.name:
                     as_obj.name = as_obj.x
+                    as_obj.x = None
             else:
                 raise errors.HighchartsValueError(f'each data point supplied must either '
                                                   f'be a Bullet Data Point or be '
diff --git a/highcharts_core/options/series/data/cartesian.py b/highcharts_core/options/series/data/cartesian.py
index 991ba26b..74f30e15 100644
--- a/highcharts_core/options/series/data/cartesian.py
+++ b/highcharts_core/options/series/data/cartesian.py
@@ -171,8 +171,6 @@ def from_array(cls, value):
             elif checkers.is_iterable(item):
                 if len(item) == 2:
                     as_obj = cls(x = item[0], y = item[1])
-                    if checkers.is_string(as_obj.x):
-                        as_obj.name = as_obj.x
                 elif len(item) == 1:
                     as_obj = cls(y = item[0])
                 else:
@@ -184,6 +182,9 @@ def from_array(cls, value):
                                                   f'be a Cartesian Data Point or be '
                                                   f'coercable to one. Could not coerce: '
                                                   f'{item}')
+            if checkers.is_string(as_obj.x) and not as_obj.name:
+                as_obj.name = as_obj.x
+                as_obj.x = None
             collection.append(as_obj)
 
         return collection
@@ -324,6 +325,9 @@ def from_array(cls, value):
                                                   f'coercable to one. Could not coerce: '
                                                   f'{item}')
 
+            if checkers.is_string(as_obj.x) and not as_obj.name:
+                as_obj.name = as_obj.x
+                as_obj.x = None
             collection.append(as_obj)
 
         return collection
@@ -475,14 +479,15 @@ def from_array(cls, value):
                                                       f'collection. Collection received '
                                                       f'had {len(item)} dimensions.')
                 as_obj = cls.from_dict(as_dict)
-                if checkers.is_string(as_obj.x):
-                    as_obj.name = as_obj.x
             else:
                 raise errors.HighchartsValueError(f'each data point supplied must either '
                                                   f'be a Cartesian Value Data Point or be'
                                                   f' coercable to one. Could not coerce: '
                                                   f'{item}')
 
+            if checkers.is_string(as_obj.x) and not as_obj.name:
+                as_obj.name = as_obj.x
+                as_obj.x = None
             collection.append(as_obj)
 
         return collection
diff --git a/highcharts_core/options/series/data/range.py b/highcharts_core/options/series/data/range.py
index bfddaffa..12af2736 100644
--- a/highcharts_core/options/series/data/range.py
+++ b/highcharts_core/options/series/data/range.py
@@ -204,8 +204,9 @@ def from_array(cls, value):
                                                       f'had {len(item)} dimensions.')
 
                 as_obj = cls.from_dict(as_dict)
-                if checkers.is_string(as_obj.x):
+                if checkers.is_string(as_obj.x) and not as_obj.name:
                     as_obj.name = as_obj.x
+                    as_obj.x = None
             else:
                 raise errors.HighchartsValueError(f'each data point supplied must either '
                                                   f'be an AreaRangeData Point or be '
diff --git a/highcharts_core/options/series/data/sunburst.py b/highcharts_core/options/series/data/sunburst.py
index 012052db..1ee63df9 100644
--- a/highcharts_core/options/series/data/sunburst.py
+++ b/highcharts_core/options/series/data/sunburst.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from validator_collection import checkers
+from validator_collection import checkers, validators
 
 from highcharts_core import constants, errors
 from highcharts_core.decorators import class_sensitive
diff --git a/highcharts_core/options/series/data/vector.py b/highcharts_core/options/series/data/vector.py
index df0ed6c4..97cdf956 100644
--- a/highcharts_core/options/series/data/vector.py
+++ b/highcharts_core/options/series/data/vector.py
@@ -86,6 +86,9 @@ def from_array(cls, value):
                                                   f'coercable to one. Could not coerce: '
                                                   f'{item}')
 
+            if checkers.is_string(as_obj.x) and not as_obj.name:
+                as_obj.name = as_obj.x
+                as_obj.x = None
             collection.append(as_obj)
 
         return collection

From 1e58948cf452844472c831d3432a3f28c012286c Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Fri, 4 Aug 2023 21:49:30 -0400
Subject: [PATCH 11/17] Updated unit tests for fix to #67.

---
 tests/input_files/series/area/01.js           |  4 +-
 tests/input_files/series/area/02.js           |  4 +-
 tests/input_files/series/area/03.js           |  4 +-
 tests/input_files/series/area/04.js           |  4 +-
 tests/input_files/series/area/05.js           |  3 +-
 tests/input_files/series/area/06.js           |  3 +-
 tests/input_files/series/bar/01.js            |  4 +-
 tests/input_files/series/bar/02.js            |  8 +-
 tests/input_files/series/bar/03.js            |  4 +-
 tests/input_files/series/bar/04.js            |  8 +-
 tests/input_files/series/bar/06.js            |  8 +-
 tests/input_files/series/boxplot/01.js        |  4 +-
 tests/input_files/series/boxplot/02.js        |  2 +-
 tests/input_files/series/bubble/01.js         |  4 +-
 tests/input_files/series/bullet/01.js         |  8 +-
 tests/input_files/series/data/bar/01.js       |  4 +-
 tests/input_files/series/data/bar/02.js       |  4 +-
 tests/input_files/series/data/bar/03.js       |  4 +-
 tests/input_files/series/data/boxplot/01.js   |  4 +-
 tests/input_files/series/data/bullet/01.js    |  4 +-
 tests/input_files/series/data/cartesian/01.js |  4 +-
 tests/input_files/series/data/cartesian/06.js |  4 +-
 tests/input_files/series/data/cartesian/08.js |  4 +-
 tests/input_files/series/data/range/01.js     |  2 +-
 tests/input_files/series/data/vector/01.js    |  4 +-
 tests/input_files/series/dumbbell/01.js       |  1 -
 tests/input_files/series/heatmap/01.js        |  4 +-
 tests/input_files/series/heatmap/02.js        |  4 +-
 tests/input_files/series/polygon/01.js        |  1 -
 tests/input_files/series/polygon/02.js        |  1 -
 tests/input_files/series/scatter/01.js        |  4 +-
 tests/input_files/series/scatter/02.js        |  4 +-
 tests/input_files/series/spline/01.js         |  4 +-
 tests/input_files/series/spline/02.js         |  4 +-
 tests/options/series/data/test_bar.py         | 19 ++---
 tests/options/series/data/test_boxplot.py     |  5 +-
 tests/options/series/data/test_bullet.py      |  5 +-
 tests/options/series/data/test_cartesian.py   | 10 +--
 tests/options/series/data/test_range.py       |  6 +-
 tests/options/series/data/test_vector.py      |  4 +-
 tests/options/series/test_area.py             | 21 +++--
 tests/options/series/test_bar.py              | 77 +++++++++----------
 tests/options/series/test_boxplot.py          |  6 +-
 tests/options/series/test_bubble.py           | 16 ++--
 tests/options/series/test_dumbbell.py         | 12 +--
 tests/options/series/test_heatmap.py          |  7 --
 tests/options/series/test_pictorial.py        |  8 +-
 tests/options/series/test_polygon.py          |  3 -
 tests/options/series/test_scatter.py          | 16 ++--
 tests/options/series/test_spline.py           | 12 +--
 50 files changed, 168 insertions(+), 196 deletions(-)

diff --git a/tests/input_files/series/area/01.js b/tests/input_files/series/area/01.js
index 581883b8..8e71aa29 100644
--- a/tests/input_files/series/area/01.js
+++ b/tests/input_files/series/area/01.js
@@ -97,8 +97,8 @@
           symbol: 'circle',
           width: 48
         },
-        x: 'some category',
-        y: 123
+        y: 123,
+        name: 'some category'
       },
       {
         dataLabels: {
diff --git a/tests/input_files/series/area/02.js b/tests/input_files/series/area/02.js
index 5f33aafd..26053980 100644
--- a/tests/input_files/series/area/02.js
+++ b/tests/input_files/series/area/02.js
@@ -97,8 +97,8 @@
           symbol: 'circle',
           width: 48
         },
-        x: 'some category',
-        y: 123
+        y: 123,
+        name: 'some category'
       },
       {
         dataLabels: {
diff --git a/tests/input_files/series/area/03.js b/tests/input_files/series/area/03.js
index e63edbbb..627dea5d 100644
--- a/tests/input_files/series/area/03.js
+++ b/tests/input_files/series/area/03.js
@@ -97,8 +97,8 @@
           symbol: 'circle',
           width: 48
         },
-        x: 'some category',
-        y: 123
+        y: 123,
+        name: 'some category'
       },
       {
         dataLabels: {
diff --git a/tests/input_files/series/area/04.js b/tests/input_files/series/area/04.js
index a306bbb1..2881e907 100644
--- a/tests/input_files/series/area/04.js
+++ b/tests/input_files/series/area/04.js
@@ -99,7 +99,7 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category'
+      name: 'some category'
     },
     {
       dataLabels: {
@@ -200,8 +200,6 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-
       accessibility: {
           description: 'Some description goes here',
           enabled: true
diff --git a/tests/input_files/series/area/05.js b/tests/input_files/series/area/05.js
index 968184ce..1c66a646 100644
--- a/tests/input_files/series/area/05.js
+++ b/tests/input_files/series/area/05.js
@@ -99,7 +99,7 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category'
+      name: 'some category'
     },
     {
       dataLabels: {
@@ -200,7 +200,6 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
 
       accessibility: {
           description: 'Some description goes here',
diff --git a/tests/input_files/series/area/06.js b/tests/input_files/series/area/06.js
index 0c34b815..e3d06147 100644
--- a/tests/input_files/series/area/06.js
+++ b/tests/input_files/series/area/06.js
@@ -99,7 +99,7 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category'
+      name: 'some category'
     },
     {
       dataLabels: {
@@ -200,7 +200,6 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
 
       accessibility: {
           description: 'Some description goes here',
diff --git a/tests/input_files/series/bar/01.js b/tests/input_files/series/bar/01.js
index e036ae10..2f4d24c2 100644
--- a/tests/input_files/series/bar/01.js
+++ b/tests/input_files/series/bar/01.js
@@ -108,8 +108,8 @@
           symbol: 'circle',
           width: 48
         },
-        x: 'some category',
-        y: 123
+        y: 123,
+        name: 'some category'
       }
   ],
   id: 'some-id-goes-here',
diff --git a/tests/input_files/series/bar/02.js b/tests/input_files/series/bar/02.js
index f72af2d5..0e20db7a 100644
--- a/tests/input_files/series/bar/02.js
+++ b/tests/input_files/series/bar/02.js
@@ -97,8 +97,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     },
     {
       dataLabels: {
@@ -197,8 +197,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   id: 'some-id-goes-here',
diff --git a/tests/input_files/series/bar/03.js b/tests/input_files/series/bar/03.js
index a0bc1155..90910614 100644
--- a/tests/input_files/series/bar/03.js
+++ b/tests/input_files/series/bar/03.js
@@ -99,7 +99,7 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category'
+      name: 'some category'
     },
     {
       dataLabels: {
@@ -200,7 +200,7 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category'
+      name: 'some category'
     }
   ],
   id: 'some-id-goes-here',
diff --git a/tests/input_files/series/bar/04.js b/tests/input_files/series/bar/04.js
index 4371a03f..d79c2867 100644
--- a/tests/input_files/series/bar/04.js
+++ b/tests/input_files/series/bar/04.js
@@ -99,8 +99,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     },
     {
       z: 456,
@@ -201,8 +201,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   id: 'some-id-goes-here',
diff --git a/tests/input_files/series/bar/06.js b/tests/input_files/series/bar/06.js
index a2fe38e5..3cc86c26 100644
--- a/tests/input_files/series/bar/06.js
+++ b/tests/input_files/series/bar/06.js
@@ -100,8 +100,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     },
     {
       direction: 45,
@@ -203,8 +203,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   id: 'some-id-goes-here',
diff --git a/tests/input_files/series/boxplot/01.js b/tests/input_files/series/boxplot/01.js
index c0c88632..6a78afea 100644
--- a/tests/input_files/series/boxplot/01.js
+++ b/tests/input_files/series/boxplot/01.js
@@ -107,8 +107,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   id: 'some-id-goes-here',
diff --git a/tests/input_files/series/boxplot/02.js b/tests/input_files/series/boxplot/02.js
index 9c20f098..813882aa 100644
--- a/tests/input_files/series/boxplot/02.js
+++ b/tests/input_files/series/boxplot/02.js
@@ -99,7 +99,7 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category'
+      name: 'some category'
     }
   ],
   id: 'some-id-goes-here',
diff --git a/tests/input_files/series/bubble/01.js b/tests/input_files/series/bubble/01.js
index ceb74614..53010ad7 100644
--- a/tests/input_files/series/bubble/01.js
+++ b/tests/input_files/series/bubble/01.js
@@ -99,8 +99,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   
diff --git a/tests/input_files/series/bullet/01.js b/tests/input_files/series/bullet/01.js
index 534acbe6..3cb7c689 100644
--- a/tests/input_files/series/bullet/01.js
+++ b/tests/input_files/series/bullet/01.js
@@ -111,8 +111,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     },
     {
       target: 123,
@@ -225,8 +225,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   targetOptions: {
diff --git a/tests/input_files/series/data/bar/01.js b/tests/input_files/series/data/bar/01.js
index 948790c3..75cd1a36 100644
--- a/tests/input_files/series/data/bar/01.js
+++ b/tests/input_files/series/data/bar/01.js
@@ -100,6 +100,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/bar/02.js b/tests/input_files/series/data/bar/02.js
index 5da7071c..21f9e1be 100644
--- a/tests/input_files/series/data/bar/02.js
+++ b/tests/input_files/series/data/bar/02.js
@@ -98,6 +98,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/bar/03.js b/tests/input_files/series/data/bar/03.js
index 39f881be..34033a0d 100644
--- a/tests/input_files/series/data/bar/03.js
+++ b/tests/input_files/series/data/bar/03.js
@@ -98,6 +98,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/boxplot/01.js b/tests/input_files/series/data/boxplot/01.js
index 8a454f07..85916f70 100644
--- a/tests/input_files/series/data/boxplot/01.js
+++ b/tests/input_files/series/data/boxplot/01.js
@@ -105,6 +105,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/bullet/01.js b/tests/input_files/series/data/bullet/01.js
index db7ba687..6a2249f6 100644
--- a/tests/input_files/series/data/bullet/01.js
+++ b/tests/input_files/series/data/bullet/01.js
@@ -109,6 +109,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/cartesian/01.js b/tests/input_files/series/data/cartesian/01.js
index 4073d5f0..911e6fc3 100644
--- a/tests/input_files/series/data/cartesian/01.js
+++ b/tests/input_files/series/data/cartesian/01.js
@@ -95,6 +95,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/cartesian/06.js b/tests/input_files/series/data/cartesian/06.js
index 0a3b8669..2fac1af1 100644
--- a/tests/input_files/series/data/cartesian/06.js
+++ b/tests/input_files/series/data/cartesian/06.js
@@ -97,6 +97,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/cartesian/08.js b/tests/input_files/series/data/cartesian/08.js
index 8daec479..6524417c 100644
--- a/tests/input_files/series/data/cartesian/08.js
+++ b/tests/input_files/series/data/cartesian/08.js
@@ -98,6 +98,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/range/01.js b/tests/input_files/series/data/range/01.js
index 06a4f35f..a203e2db 100644
--- a/tests/input_files/series/data/range/01.js
+++ b/tests/input_files/series/data/range/01.js
@@ -97,5 +97,5 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category'
+  name: 'some category'
 }
diff --git a/tests/input_files/series/data/vector/01.js b/tests/input_files/series/data/vector/01.js
index 2d1bbb4a..8f4bf595 100644
--- a/tests/input_files/series/data/vector/01.js
+++ b/tests/input_files/series/data/vector/01.js
@@ -98,6 +98,6 @@
     symbol: 'circle',
     width: 48
   },
-  x: 'some category',
-  y: 123
+  y: 123,
+  name: 'some category'
 }
diff --git a/tests/input_files/series/dumbbell/01.js b/tests/input_files/series/dumbbell/01.js
index 7a91bb80..a0498ab0 100644
--- a/tests/input_files/series/dumbbell/01.js
+++ b/tests/input_files/series/dumbbell/01.js
@@ -101,7 +101,6 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
       y: 123,
 
       accessibility: {
diff --git a/tests/input_files/series/heatmap/01.js b/tests/input_files/series/heatmap/01.js
index 0bff47db..da19fe0f 100644
--- a/tests/input_files/series/heatmap/01.js
+++ b/tests/input_files/series/heatmap/01.js
@@ -100,8 +100,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
 
diff --git a/tests/input_files/series/heatmap/02.js b/tests/input_files/series/heatmap/02.js
index 0a42195e..28d15e64 100644
--- a/tests/input_files/series/heatmap/02.js
+++ b/tests/input_files/series/heatmap/02.js
@@ -100,8 +100,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
 
diff --git a/tests/input_files/series/polygon/01.js b/tests/input_files/series/polygon/01.js
index c04cecb2..d0dbf767 100644
--- a/tests/input_files/series/polygon/01.js
+++ b/tests/input_files/series/polygon/01.js
@@ -97,7 +97,6 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
       y: 123,
 
       accessibility: {
diff --git a/tests/input_files/series/polygon/02.js b/tests/input_files/series/polygon/02.js
index 0e23b52b..4bb02f05 100644
--- a/tests/input_files/series/polygon/02.js
+++ b/tests/input_files/series/polygon/02.js
@@ -97,7 +97,6 @@
           symbol: 'circle',
           width: 48
         },
-        x: 'some category',
         y: 123,
 
         accessibility: {
diff --git a/tests/input_files/series/scatter/01.js b/tests/input_files/series/scatter/01.js
index fca2ceb8..b22d4790 100644
--- a/tests/input_files/series/scatter/01.js
+++ b/tests/input_files/series/scatter/01.js
@@ -97,8 +97,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   jitter: {
diff --git a/tests/input_files/series/scatter/02.js b/tests/input_files/series/scatter/02.js
index 6680e32a..6a2ce89d 100644
--- a/tests/input_files/series/scatter/02.js
+++ b/tests/input_files/series/scatter/02.js
@@ -97,8 +97,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   jitter: {
diff --git a/tests/input_files/series/spline/01.js b/tests/input_files/series/spline/01.js
index 51730b3d..79a0dd47 100644
--- a/tests/input_files/series/spline/01.js
+++ b/tests/input_files/series/spline/01.js
@@ -97,8 +97,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   colorAxis: 1,
diff --git a/tests/input_files/series/spline/02.js b/tests/input_files/series/spline/02.js
index 45f49fc8..566fa9a0 100644
--- a/tests/input_files/series/spline/02.js
+++ b/tests/input_files/series/spline/02.js
@@ -97,8 +97,8 @@
         symbol: 'circle',
         width: 48
       },
-      x: 'some category',
-      y: 123
+      y: 123,
+      name: 'some category'
     }
   ],
   colorAxis: 1,
diff --git a/tests/options/series/data/test_bar.py b/tests/options/series/data/test_bar.py
index 9d4d5419..542726e6 100644
--- a/tests/options/series/data/test_bar.py
+++ b/tests/options/series/data/test_bar.py
@@ -125,8 +125,8 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # + DataBase options
     # Categorical X Value
@@ -232,7 +232,6 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
       'y': 123,
 
       'accessibility': {
@@ -308,8 +307,8 @@ def test_BarData_from_js_literal(input_files, filename, as_file, error):
 
 
 @pytest.mark.parametrize('array, expected, error', [
-    ([['A', 123]], {'name': 'A', 'x': 'A', 'y': 123}, None),
-    ([{'x': 'A', 'y': 123, 'name': 'A'}], {'name': 'A', 'x': 'A', 'y': 123}, None)
+    ([['A', 123]], {'name': 'A', 'y': 123}, None),
+    ([{'x': 'A', 'y': 123, 'name': 'A'}], {'name': 'A', 'y': 123}, None)
 ])
 def test_BarData_from_array(array, expected, error):
     if not expected:
@@ -434,8 +433,8 @@ def test_BarData_from_array(array, expected, error):
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # + DataBase options
     # Categorical X Value
@@ -539,7 +538,6 @@ def test_BarData_from_array(array, expected, error):
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
       'y': 123,
 
       'accessibility': {
@@ -706,8 +704,8 @@ def test_WaterfallData_from_js_literal(input_files, filename, as_file, error):
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # + DataBase options
     # Categorical X Value
@@ -811,7 +809,6 @@ def test_WaterfallData_from_js_literal(input_files, filename, as_file, error):
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
       'y': 123,
 
       'accessibility': {
diff --git a/tests/options/series/data/test_boxplot.py b/tests/options/series/data/test_boxplot.py
index 5dace449..396dafc2 100644
--- a/tests/options/series/data/test_boxplot.py
+++ b/tests/options/series/data/test_boxplot.py
@@ -132,8 +132,8 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # Datetime X Value
     ({
@@ -466,7 +466,6 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
       'y': 123,
 
       'accessibility': {
diff --git a/tests/options/series/data/test_bullet.py b/tests/options/series/data/test_bullet.py
index 28977a9f..fb2db83e 100644
--- a/tests/options/series/data/test_bullet.py
+++ b/tests/options/series/data/test_bullet.py
@@ -142,8 +142,8 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # + DataBase options
     # Categorical X Value
@@ -259,7 +259,6 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
       'y': 123,
 
       'accessibility': {
diff --git a/tests/options/series/data/test_cartesian.py b/tests/options/series/data/test_cartesian.py
index 352295b4..9708e1ba 100644
--- a/tests/options/series/data/test_cartesian.py
+++ b/tests/options/series/data/test_cartesian.py
@@ -113,7 +113,7 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
+      'name': 'some category',
       'y': 123
     }, None),
     # Datetime X Value
@@ -853,8 +853,8 @@ def test_CartesianData_from_js_literal(input_files, filename, as_file, error):
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # + DataBase options
     # Categorical X Value
@@ -1142,8 +1142,8 @@ def test_Cartesian3DData_from_js_literal(input_files, filename, as_file, error):
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # + DataBase options
     # Categorical X Value
diff --git a/tests/options/series/data/test_range.py b/tests/options/series/data/test_range.py
index 56a57e4d..9e512cdc 100644
--- a/tests/options/series/data/test_range.py
+++ b/tests/options/series/data/test_range.py
@@ -112,7 +112,7 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category'
+      'name': 'some category'
     }, None),
     # + DataBase Options
     ({
@@ -401,8 +401,8 @@ def test_RangeData_from_js_literal(input_files, filename, as_file, error):
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # + DataBase Options
     ({
diff --git a/tests/options/series/data/test_vector.py b/tests/options/series/data/test_vector.py
index 18a97329..161993ae 100644
--- a/tests/options/series/data/test_vector.py
+++ b/tests/options/series/data/test_vector.py
@@ -117,8 +117,8 @@
         'symbol': 'circle',
         'width': 48
       },
-      'x': 'some category',
-      'y': 123
+      'y': 123,
+      'name': 'some category'
     }, None),
     # Datetime X Value
     ({
diff --git a/tests/options/series/test_area.py b/tests/options/series/test_area.py
index 125afc61..55802229 100644
--- a/tests/options/series/test_area.py
+++ b/tests/options/series/test_area.py
@@ -119,8 +119,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -432,8 +432,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -762,8 +762,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -1501,7 +1501,7 @@ def test_AreaSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category'
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -1602,7 +1602,6 @@ def test_AreaSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
 
             'accessibility': {
                 'description': 'Some description goes here',
@@ -1840,7 +1839,6 @@ def test_AreaSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
 
             'accessibility': {
                 'description': 'Some description goes here',
@@ -1994,7 +1992,7 @@ def test_AreaSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category'
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -2095,7 +2093,6 @@ def test_AreaSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
 
             'accessibility': {
                 'description': 'Some description goes here',
@@ -2786,7 +2783,7 @@ def test_bugfix32_LineSeries_from_csv(kwargs, error):
         assert result.data is not None
         assert isinstance(result.data, list) is True
         for item in result.data:
-            assert item.x is not None
+            assert item.name is not None
             assert item.y is not None
 
 
diff --git a/tests/options/series/test_bar.py b/tests/options/series/test_bar.py
index a7db164d..a77e7a7e 100644
--- a/tests/options/series/test_bar.py
+++ b/tests/options/series/test_bar.py
@@ -132,8 +132,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -256,8 +256,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -425,8 +425,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -1055,8 +1055,8 @@ def test_ColumnSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -1155,8 +1155,8 @@ def test_ColumnSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -1268,8 +1268,8 @@ def test_ColumnSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -1368,8 +1368,8 @@ def test_ColumnSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -1486,8 +1486,8 @@ def test_ColumnSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -1586,8 +1586,8 @@ def test_ColumnSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -1749,8 +1749,8 @@ def test_ColumnSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'data_labels': {
@@ -1849,8 +1849,8 @@ def test_ColumnSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -2374,7 +2374,7 @@ def test_ColumnPyramidSeries_from_js_literal(input_files, filename, as_file, err
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category'
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -2475,7 +2475,6 @@ def test_ColumnPyramidSeries_from_js_literal(input_files, filename, as_file, err
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
 
             'accessibility': {
                 'description': 'Some description goes here',
@@ -2617,7 +2616,7 @@ def test_ColumnPyramidSeries_from_js_literal(input_files, filename, as_file, err
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category'
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -2718,7 +2717,6 @@ def test_ColumnPyramidSeries_from_js_literal(input_files, filename, as_file, err
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
 
             'accessibility': {
                 'description': 'Some description goes here',
@@ -2905,7 +2903,7 @@ def test_ColumnPyramidSeries_from_js_literal(input_files, filename, as_file, err
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category'
+            'name': 'some category'
           },
           {
             'dataLabels': {
@@ -3006,7 +3004,6 @@ def test_ColumnPyramidSeries_from_js_literal(input_files, filename, as_file, err
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
 
             'accessibility': {
                 'description': 'Some description goes here',
@@ -3601,8 +3598,8 @@ def test_CylinderSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'z': 456,
@@ -3703,8 +3700,8 @@ def test_CylinderSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -3818,8 +3815,8 @@ def test_CylinderSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'z': 456,
@@ -3920,8 +3917,8 @@ def test_CylinderSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
@@ -4080,8 +4077,8 @@ def test_CylinderSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'z': 456,
@@ -4182,8 +4179,8 @@ def test_CylinderSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
       'id': 'some-id-goes-here',
diff --git a/tests/options/series/test_boxplot.py b/tests/options/series/test_boxplot.py
index 84ceb61a..8aaea371 100644
--- a/tests/options/series/test_boxplot.py
+++ b/tests/options/series/test_boxplot.py
@@ -653,7 +653,7 @@ def test_BoxPlotSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category'
+            'name': 'some category'
           },
       ],
       'id': 'some-id-goes-here',
@@ -767,7 +767,7 @@ def test_BoxPlotSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category'
+            'name': 'some category'
           },
       ],
       'id': 'some-id-goes-here',
@@ -926,7 +926,7 @@ def test_BoxPlotSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category'
+            'name': 'some category'
           },
       ],
       'id': 'some-id-goes-here',
diff --git a/tests/options/series/test_bubble.py b/tests/options/series/test_bubble.py
index 2f2163e6..beba2bf9 100644
--- a/tests/options/series/test_bubble.py
+++ b/tests/options/series/test_bubble.py
@@ -113,8 +113,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ]
     }, None),
@@ -220,8 +220,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
@@ -340,8 +340,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
@@ -546,8 +546,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
diff --git a/tests/options/series/test_dumbbell.py b/tests/options/series/test_dumbbell.py
index 8714cebb..482787d9 100644
--- a/tests/options/series/test_dumbbell.py
+++ b/tests/options/series/test_dumbbell.py
@@ -116,8 +116,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ]
     }, None),
@@ -225,8 +225,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
@@ -431,8 +431,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
diff --git a/tests/options/series/test_heatmap.py b/tests/options/series/test_heatmap.py
index cae615d9..a4001463 100644
--- a/tests/options/series/test_heatmap.py
+++ b/tests/options/series/test_heatmap.py
@@ -115,7 +115,6 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
@@ -246,7 +245,6 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
@@ -383,7 +381,6 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
@@ -895,7 +892,6 @@ def test_HeatmapSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
@@ -1026,7 +1022,6 @@ def test_HeatmapSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
@@ -1159,7 +1154,6 @@ def test_HeatmapSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
@@ -1298,7 +1292,6 @@ def test_HeatmapSeries_from_js_literal(input_files, filename, as_file, error):
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
diff --git a/tests/options/series/test_pictorial.py b/tests/options/series/test_pictorial.py
index 6bedca56..ad18df84 100644
--- a/tests/options/series/test_pictorial.py
+++ b/tests/options/series/test_pictorial.py
@@ -112,8 +112,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category',
           },
           {
             'dataLabels': {
@@ -420,8 +420,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           },
           {
             'dataLabels': {
diff --git a/tests/options/series/test_polygon.py b/tests/options/series/test_polygon.py
index 2887a60b..66f9d122 100644
--- a/tests/options/series/test_polygon.py
+++ b/tests/options/series/test_polygon.py
@@ -111,7 +111,6 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
@@ -239,7 +238,6 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
@@ -453,7 +451,6 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
             'y': 123,
 
             'accessibility': {
diff --git a/tests/options/series/test_scatter.py b/tests/options/series/test_scatter.py
index 55898834..a9da9d3d 100644
--- a/tests/options/series/test_scatter.py
+++ b/tests/options/series/test_scatter.py
@@ -112,8 +112,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ]
     }, None),
@@ -217,8 +217,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
@@ -327,8 +327,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
@@ -523,8 +523,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
diff --git a/tests/options/series/test_spline.py b/tests/options/series/test_spline.py
index 7f89ad64..d63b7e93 100644
--- a/tests/options/series/test_spline.py
+++ b/tests/options/series/test_spline.py
@@ -111,8 +111,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ]
     }, None),
@@ -216,8 +216,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 
@@ -407,8 +407,8 @@
               'symbol': 'circle',
               'width': 48
             },
-            'x': 'some category',
-            'y': 123
+            'y': 123,
+            'name': 'some category'
           }
       ],
 

From 8d0730cc7c550a756ba40c94d951e9244e0836af Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Sat, 5 Aug 2023 10:32:41 -0400
Subject: [PATCH 12/17] Fixed failing unit tests for soft dependency support.

---
 tests/test_metaclasses.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/test_metaclasses.py b/tests/test_metaclasses.py
index fbba1126..e8198d8c 100644
--- a/tests/test_metaclasses.py
+++ b/tests/test_metaclasses.py
@@ -8,6 +8,19 @@
 from json.decoder import JSONDecodeError
 from validator_collection import checkers
 
+try:
+    import orjson as json
+    json_as_bytes = True
+except ImportError:
+    json_as_bytes = False
+    try:
+        import rapidjson as json
+    except ImportError:
+        try:
+            import simplejson as json
+        except ImportError:
+            import json
+
 
 class TestClass(HighchartsMeta):
     """Class used to test the :class:`HighchartsMeta` functionality."""
@@ -396,7 +409,10 @@ def _get_kwargs_from_dict(cls, as_dict):
         if not error:
             obj = ClassWithTimestamp()
             result = obj.to_json()
-            assert 'timestamp_value' in result
+            if json_as_bytes:
+                assert b'timestamp_value' in result
+            else:
+                assert 'timestamp_value' in result
             as_dict = json.loads(result)
             assert 'timestamp_value' in as_dict
             assert checkers.is_numeric(as_dict['timestamp_value']) is True
@@ -429,7 +445,10 @@ def _get_kwargs_from_dict(cls, as_dict):
     if not error:
         obj = ClassWithDate()
         result = obj.to_json()
-        assert 'date_value' in result
+        if json_as_bytes:
+            assert b'date_value' in result
+        else:
+            assert 'date_value' in result
         as_dict = json.loads(result)
         assert 'date_value' in as_dict
         assert checkers.is_string(as_dict['date_value']) is True
@@ -473,4 +492,7 @@ def test_enforced_null_to_dict():
 def test_enforced_null_to_json():
     obj = ClassWithEnforcedNull()
     result = obj.to_json()
-    assert result == '{"enforced_null_value": null}'
\ No newline at end of file
+    if json_as_bytes:
+        assert result == b'{"enforced_null_value":null}'
+    else:
+        assert result == '{"enforced_null_value": null}'
\ No newline at end of file

From bb2139091fc5c66558aa5f2b2a6a5c6f4abcf8f8 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Sat, 5 Aug 2023 11:01:12 -0400
Subject: [PATCH 13/17] Added DataBase.requires_js_object property with tests.

---
 highcharts_core/options/series/data/base.py | 36 ++++++++++++++++++++-
 tests/options/series/data/test_base.py      | 15 +++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/highcharts_core/options/series/data/base.py b/highcharts_core/options/series/data/base.py
index 5e8af127..3e654231 100644
--- a/highcharts_core/options/series/data/base.py
+++ b/highcharts_core/options/series/data/base.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List
 from decimal import Decimal
 
 from validator_collection import validators, checkers
@@ -304,6 +304,40 @@ def _to_untrimmed_dict(self, in_cls = None) -> dict:
 
         return untrimmed
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return []
+
+    @property
+    def requires_js_object(self) -> bool:
+        """Indicates whether or not the data point *must* be serialized to a JS literal 
+        object or whether it can be serialized to a primitive array.
+        
+        :returns: ``True`` if the data point *must* be serialized to a JS literal object.
+          ``False`` if it can be serialized to an array.
+        :rtype: :class:`bool <python:bool>`
+        """
+        from_array_props = [utility_functions.to_camelCase(x)
+                            for x in self._get_props_from_array()]
+        
+        as_dict = self.to_dict()
+        trimmed_dict = self.trim_dict(as_dict)
+        print(trimmed_dict)
+        for prop in from_array_props:
+            if prop in trimmed_dict:
+                del trimmed_dict[prop]
+
+        if trimmed_dict:
+            print('Should return True!')
+            return True
+        
+        return False
+
     @classmethod
     def from_array(cls, value):
         """Creates a collection of data point instances, parsing the contents of ``value``
diff --git a/tests/options/series/data/test_base.py b/tests/options/series/data/test_base.py
index 9d89724d..b0e338aa 100644
--- a/tests/options/series/data/test_base.py
+++ b/tests/options/series/data/test_base.py
@@ -20,6 +20,11 @@ def from_array(cls, value):
 cls = NonAbstractDataBase
 
 
+class RequiringJSObject(NonAbstractDataBase):
+    def _to_untrimmed_dict(self):
+        return {'someKey': 123}
+
+
 STANDARD_PARAMS = [
     ({}, None),
     ({
@@ -93,3 +98,13 @@ def test_to_dict(kwargs, error):
 ])
 def test_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls, input_files, filename, as_file, error)
+
+
+@pytest.mark.parametrize('cls, expected', [
+    (NonAbstractDataBase, False),
+    (RequiringJSObject, True),
+    
+])
+def test_requires_js_object(cls, expected):
+    obj = cls()
+    assert obj.requires_js_object is expected
\ No newline at end of file

From 8c7f80a7fa89a8d017b667baea2d28a5922dcd3a Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Sat, 5 Aug 2023 11:32:56 -0400
Subject: [PATCH 14/17] Implemented serialization framework for data point
 array structures.

---
 highcharts_core/js_literal_functions.py     |  9 ++++++++-
 highcharts_core/options/series/data/base.py | 21 ++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/highcharts_core/js_literal_functions.py b/highcharts_core/js_literal_functions.py
index 914fba01..51e647c2 100644
--- a/highcharts_core/js_literal_functions.py
+++ b/highcharts_core/js_literal_functions.py
@@ -25,7 +25,14 @@ def serialize_to_js_literal(item, encoding = 'utf-8') -> Optional[str]:
     :rtype: :class:`str <python:str>` or :obj:`None <python:None>`
     """
     if checkers.is_iterable(item, forbid_literals = (str, bytes, dict, UserDict)):
-        return [serialize_to_js_literal(x, encoding = encoding) for x in item]
+        requires_js_objects = all([getattr(x, 'requires_js_object', True) 
+                                   for x in item])
+        if requires_js_objects:
+            return [serialize_to_js_literal(x, encoding = encoding) 
+                    for x in item]
+        else:
+            return [serialize_to_js_literal(x.to_array(), encoding = encoding)
+                    for x in item]
     elif hasattr(item, 'to_js_literal'):
         return item.to_js_literal(encoding = encoding)
     elif isinstance(item, constants.EnforcedNullType) or item == 'null':
diff --git a/highcharts_core/options/series/data/base.py b/highcharts_core/options/series/data/base.py
index 3e654231..1db7231a 100644
--- a/highcharts_core/options/series/data/base.py
+++ b/highcharts_core/options/series/data/base.py
@@ -1,4 +1,4 @@
-from typing import Optional, List
+from typing import Optional, List, Dict
 from decimal import Decimal
 
 from validator_collection import validators, checkers
@@ -450,3 +450,22 @@ def from_array(cls, value):
             collection.append(as_obj)
 
         return collection
+
+    def to_array(self) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+          
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object:
+            return self._to_untrimmed_dict()
+        
+        return [getattr(self, x, None) for x in self._get_props_from_array()]
\ No newline at end of file

From e891cd94218be9f2c953b8e25b47b645c63814c8 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Sat, 5 Aug 2023 18:07:44 -0400
Subject: [PATCH 15/17] Implemented the .to_array() method across data points.
 Closes #77.

---
 .../options/series/data/arcdiagram.py         |  15 +-
 highcharts_core/options/series/data/bar.py    |  59 ++++++-
 highcharts_core/options/series/data/base.py   |  17 +-
 .../options/series/data/boxplot.py            |  69 +++++++-
 highcharts_core/options/series/data/bullet.py |  54 ++++++-
 .../options/series/data/cartesian.py          | 152 +++++++++++++++++-
 highcharts_core/options/series/data/range.py  |  54 ++++++-
 .../options/series/data/single_point.py       | 121 +++++++++++++-
 highcharts_core/options/series/data/vector.py |  59 ++++++-
 tests/input_files/series/vector/01.js         |   5 +-
 tests/input_files/series/vector/02.js         |   5 +-
 tests/options/series/data/test_bar.py         |  86 ++++++++++
 tests/options/series/data/test_boxplot.py     |  34 ++++
 tests/options/series/data/test_bullet.py      |  30 ++++
 tests/options/series/data/test_cartesian.py   |  82 ++++++++++
 tests/options/series/data/test_range.py       |  31 ++++
 .../options/series/data/test_single_point.py  |  74 +++++++++
 tests/options/series/data/test_vector.py      |  32 ++++
 18 files changed, 955 insertions(+), 24 deletions(-)

diff --git a/highcharts_core/options/series/data/arcdiagram.py b/highcharts_core/options/series/data/arcdiagram.py
index 3a889e9a..064902d3 100644
--- a/highcharts_core/options/series/data/arcdiagram.py
+++ b/highcharts_core/options/series/data/arcdiagram.py
@@ -1,10 +1,10 @@
-from typing import Optional
+from typing import Optional, List, Dict
 from decimal import Decimal
 from collections import UserDict
 
 from validator_collection import validators, checkers
 
-from highcharts_core import utility_functions, constants
+from highcharts_core import utility_functions, constants, errors
 from highcharts_core.options.series.data.base import DataBase
 from highcharts_core.utility_classes.gradients import Gradient
 from highcharts_core.utility_classes.patterns import Pattern
@@ -126,6 +126,17 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['from_',
+                'to',
+                'weight']
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
diff --git a/highcharts_core/options/series/data/bar.py b/highcharts_core/options/series/data/bar.py
index 7d6b8840..8c5b7bb3 100644
--- a/highcharts_core/options/series/data/bar.py
+++ b/highcharts_core/options/series/data/bar.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List, Dict
 from decimal import Decimal
 
 import datetime
@@ -376,6 +376,63 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x', 'value', 'direction', 'y', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.x is None and self.name is not None:
+            x = self.name
+        elif self.x is not None:
+            x = self.x
+        else:
+            x = constants.EnforcedNull
+            
+        if self.y is not None:
+            y = self.y
+        else:
+            y = constants.EnforcedNull
+        
+        if self.value is not None:
+            value = self.value
+        else:
+            value = constants.EnforcedNull
+            
+        if self.direction is not None:
+            direction = self.direction
+        else:
+            direction = constants.EnforcedNull
+        
+        if self.y is None:
+            return [x, value, direction]
+
+        return [x, value, direction, y]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
diff --git a/highcharts_core/options/series/data/base.py b/highcharts_core/options/series/data/base.py
index 1db7231a..6fd178f2 100644
--- a/highcharts_core/options/series/data/base.py
+++ b/highcharts_core/options/series/data/base.py
@@ -327,13 +327,11 @@ def requires_js_object(self) -> bool:
         
         as_dict = self.to_dict()
         trimmed_dict = self.trim_dict(as_dict)
-        print(trimmed_dict)
         for prop in from_array_props:
             if prop in trimmed_dict:
                 del trimmed_dict[prop]
 
         if trimmed_dict:
-            print('Should return True!')
             return True
         
         return False
@@ -451,7 +449,7 @@ def from_array(cls, value):
 
         return collection
 
-    def to_array(self) -> List | Dict:
+    def to_array(self, force_object = False) -> List | Dict:
         """Generate the array representation of the data point (the inversion 
         of 
         :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
@@ -461,11 +459,16 @@ def to_array(self) -> List | Dict:
           If the data point *cannot* be serialized to a JavaScript array,
           this method will instead return the untrimmed :class:`dict <python:dict>`
           representation of the data point as a fallback.
-          
+
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
         :returns: The array representation of the data point.
         :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
         """
-        if self.requires_js_object:
+        if self.requires_js_object or force_object:
             return self._to_untrimmed_dict()
-        
-        return [getattr(self, x, None) for x in self._get_props_from_array()]
\ No newline at end of file
+
+        return [getattr(self, x, constants.EnforcedNull)
+                for x in self._get_props_from_array()]
diff --git a/highcharts_core/options/series/data/boxplot.py b/highcharts_core/options/series/data/boxplot.py
index 22fbe413..55bf1591 100644
--- a/highcharts_core/options/series/data/boxplot.py
+++ b/highcharts_core/options/series/data/boxplot.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List, Dict
 from decimal import Decimal
 
 from validator_collection import validators, checkers
@@ -290,6 +290,73 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x', 'low', 'q1', 'median', 'q3', 'high', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.x is not None:
+            x = self.x
+        elif self.name is not None:
+            x = self.name
+        else:
+            x = constants.EnforcedNull
+            
+        if self.low is not None:
+            low = self.low
+        else:
+            low = constants.EnforcedNull
+            
+        if self.q1 is not None:
+            q1 = self.q1
+        else:
+            q1 = constants.EnforcedNull
+            
+        if self.median is not None:
+            median = self.median
+        else:
+            median = constants.EnforcedNull
+            
+        if self.q3 is not None:
+            q3 = self.q3
+        else:
+            q3 = constants.EnforcedNull
+            
+        if self.high is not None:
+            high = self.high
+        else:
+            high = constants.EnforcedNull
+
+        if self.x is None and self.name is None:
+            return [low, q1, median, q3, high]
+
+        return [x, low, q1, median, q3, high]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
diff --git a/highcharts_core/options/series/data/bullet.py b/highcharts_core/options/series/data/bullet.py
index badc7fc3..01981a1a 100644
--- a/highcharts_core/options/series/data/bullet.py
+++ b/highcharts_core/options/series/data/bullet.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List, Dict
 from decimal import Decimal
 
 from validator_collection import validators, checkers
@@ -99,6 +99,58 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x', 'y', 'target', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+          
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.x is not None:
+            x = self.x
+        elif self.name is not None:
+            x = self.name
+        else:
+            x = constants.EnforcedNull
+            
+        if self.y is not None:
+            y = self.y
+        else:
+            y = constants.EnforcedNull
+        
+        if self.target is not None:
+            target = self.target
+        else:
+            target = constants.EnforcedNull
+        
+        if self.x is None and self.name is None:
+            return [y, target]
+
+        return [x, y, target]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
diff --git a/highcharts_core/options/series/data/cartesian.py b/highcharts_core/options/series/data/cartesian.py
index 74f30e15..b5b2c666 100644
--- a/highcharts_core/options/series/data/cartesian.py
+++ b/highcharts_core/options/series/data/cartesian.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List, Dict
 from decimal import Decimal
 
 import datetime
@@ -189,6 +189,53 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x', 'y', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+          
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.y is not None:
+            y = self.y
+        else:
+            y = constants.EnforcedNull
+            
+        if self.x is None and self.name is None:
+            x = self.x
+        elif self.name is None:
+            x = self.x
+        else:
+            x = self.name
+        
+        if self.x is None and self.name is None:
+            return [y]
+
+        return [x, y]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
@@ -332,6 +379,57 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x', 'y', 'z', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+          
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.y is not None:
+            y = self.y
+        else:
+            y = constants.EnforcedNull
+        if self.z is not None:
+            z = self.z
+        else:
+            z = constants.EnforcedNull
+            
+        if self.x is None and self.name is not None:
+            x = self.name
+        elif self.name is None and self.x is not None:
+            x = self.x
+        else:
+            x = constants.EnforcedNull
+        
+        if self.x is None and self.name is None:
+            return [y, z]
+
+        return [x, y, z]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
@@ -492,6 +590,58 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x', 'y', 'value', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+          
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.y is not None:
+            y = self.y
+        else:
+            y = constants.EnforcedNull
+            
+        if self.value is not None:
+            value = self.value
+        else:
+            value = constants.EnforcedNull
+            
+        if self.x is None and self.name is not None:
+            x = self.name
+        elif self.x is not None:
+            x = self.x
+        else:
+            x = constants.EnforcedNull
+        
+        if self.x is None and self.name is None:
+            return [y, value]
+
+        return [x, y, value]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
diff --git a/highcharts_core/options/series/data/range.py b/highcharts_core/options/series/data/range.py
index 12af2736..2f7e8b8e 100644
--- a/highcharts_core/options/series/data/range.py
+++ b/highcharts_core/options/series/data/range.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List, Dict
 from decimal import Decimal
 
 import datetime
@@ -216,6 +216,58 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x', 'low', 'high', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.x is not None:
+            x = self.x
+        elif self.name is not None:
+            x = self.name
+        else:
+            x = constants.EnforcedNull
+            
+        if self.low is not None:
+            low = self.low
+        else:
+            low = constants.EnforcedNull
+            
+        if self.high is not None:
+            high = self.high
+        else:
+            high = constants.EnforcedNull
+
+        if self.x is None and self.name is None:
+            return [low, high]
+            
+        return [x, low, high]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
diff --git a/highcharts_core/options/series/data/single_point.py b/highcharts_core/options/series/data/single_point.py
index ac8b7f6e..5253ed11 100644
--- a/highcharts_core/options/series/data/single_point.py
+++ b/highcharts_core/options/series/data/single_point.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List, Dict
 from decimal import Decimal
 from collections import UserDict
 
@@ -197,6 +197,51 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['y', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+          
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.y is not None:
+            y = self.y
+        else:
+            y = constants.EnforcedNull
+            
+        if self.name is not None:
+            name = self.name
+        else:
+            name = constants.EnforcedNull
+        
+        if not self.name:
+            return [y]
+
+        return [name, y]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
@@ -316,6 +361,43 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['value']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+          
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.value is not None:
+            value = self.value
+        else:
+            value = constants.EnforcedNull
+        
+        return [value]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
@@ -434,6 +516,43 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+          
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.x is not None:
+            x = self.x
+        else:
+            x = constants.EnforcedNull
+        
+        return [x]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
diff --git a/highcharts_core/options/series/data/vector.py b/highcharts_core/options/series/data/vector.py
index 97cdf956..27f13531 100644
--- a/highcharts_core/options/series/data/vector.py
+++ b/highcharts_core/options/series/data/vector.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List, Dict
 from decimal import Decimal
 
 from validator_collection import validators, checkers
@@ -93,6 +93,63 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['x', 'y', 'length', 'direction', 'name']
+
+    def to_array(self, force_object = False) -> List | Dict:
+        """Generate the array representation of the data point (the inversion 
+        of 
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`).
+        
+        .. warning::
+        
+          If the data point *cannot* be serialized to a JavaScript array,
+          this method will instead return the untrimmed :class:`dict <python:dict>`
+          representation of the data point as a fallback.
+
+        :param force_object: if ``True``, forces the return of the instance's
+          untrimmed :class:`dict <python:dict>` representation. Defaults to ``False``.
+        :type force_object: :class:`bool <python:bool>`
+
+        :returns: The array representation of the data point.
+        :rtype: :class:`list <python:list>` of values or :class:`dict <python:dict>`
+        """
+        if self.requires_js_object or force_object:
+            return self._to_untrimmed_dict()
+        
+        if self.y is not None:
+            y = self.y
+        else:
+            y = constants.EnforcedNull
+            
+        if self.length is not None:
+            length = self.length
+        else:
+            length = constants.EnforcedNull
+            
+        if self.direction is not None:
+            direction = self.direction
+        else:
+            direction = constants.EnforcedNull
+            
+        if self.x is not None:
+            x = self.x
+        elif self.name is not None:
+            x = self.name
+        else:
+            x = constants.EnforcedNull
+        
+        if self.x is None and self.name is None:
+            return [y, length, direction]
+        
+        return [x, y, length, direction]
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
diff --git a/tests/input_files/series/vector/01.js b/tests/input_files/series/vector/01.js
index 4d739d09..f995ddd6 100644
--- a/tests/input_files/series/vector/01.js
+++ b/tests/input_files/series/vector/01.js
@@ -1,9 +1,6 @@
 {
   data: [
-    {
-      direction: 45,
-      length: 12
-    }
+    [0, 45, 12]
   ],
   cluster: {
     allowOverlap: true,
diff --git a/tests/input_files/series/vector/02.js b/tests/input_files/series/vector/02.js
index 192f2e69..b3758cf0 100644
--- a/tests/input_files/series/vector/02.js
+++ b/tests/input_files/series/vector/02.js
@@ -1,9 +1,6 @@
 {
   data: [
-    {
-      direction: 45,
-      length: 12
-    }
+    [0, 45, 12]
   ],
   cluster: {
     allowOverlap: true,
diff --git a/tests/options/series/data/test_bar.py b/tests/options/series/data/test_bar.py
index 542726e6..2aef2592 100644
--- a/tests/options/series/data/test_bar.py
+++ b/tests/options/series/data/test_bar.py
@@ -324,6 +324,36 @@ def test_BarData_from_array(array, expected, error):
         with pytest.raises(error):
             result = cls.from_array(array)
 
+
+utc_now = datetime.datetime.utcnow()
+today = datetime.date.today()
+
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[123, 456], [789, 123]], {}, list, [[123, 456], [789, 123]]),
+    ([['A', 456], ['B', 123]], {}, list, [['A', 456], ['B', 123]]),
+    ([[utc_now, 456], [utc_now, 123]], {}, list, [[utc_now, 456], [utc_now, 123]]),
+    ([[today, 456], [today, 123]], {}, list, [[today, 456], [today, 123]]),
+    
+    ([[123, 456], [789, 123]], {'id': 'some_id'}, dict, None),
+])
+def test_BarData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
+
 ## NEXT CLASS
 
 STANDARD_PARAMS_2 = [
@@ -595,6 +625,31 @@ def test_WaterfallData_to_dict(kwargs, error):
 def test_WaterfallData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls2, input_files, filename, as_file, error)
 
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[123, 456], [789, 123]], {}, list, [[123, 456], [789, 123]]),
+    ([['A', 456], ['B', 123]], {}, list, [['A', 456], ['B', 123]]),
+    ([[utc_now, 456], [utc_now, 123]], {}, list, [[utc_now, 456], [utc_now, 123]]),
+    ([[today, 456], [today, 123]], {}, list, [[today, 456], [today, 123]]),
+    
+    ([[123, 456], [789, 123]], {'id': 'some_id'}, dict, None),
+])
+def test_WaterfallData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
 ## NEXT CLASS
 
 STANDARD_PARAMS_3 = [
@@ -883,6 +938,37 @@ def test_WindBarbData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls3, input_files, filename, as_file, error)
 
 
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[123, 456, 789, 987], [789, 123, 456, 789]], {}, list, [[123, 456, 789, 987], [789, 123, 456, 789]]),
+    ([['A', 456, 789, 987], ['B', 123, 456, 789]], {}, list, [['A', 456, 789, 987], ['B', 123, 456, 789]]),
+    ([[utc_now, 456, 789, 987], [utc_now, 123, 456, 789]], {}, list, [[utc_now, 456, 789, 987], [utc_now, 123, 456, 789]]),
+    ([[today, 456, 789, 987], [today, 123, 456, 789]], {}, list, [[today, 456, 789, 987], [today, 123, 456, 789]]),
+
+    ([[123, 456, 789], [789, 123, 456]], {}, list, [[123, 456, 789], [789, 123, 456]]),
+    ([['A', 456, 789], ['B', 123, 456]], {}, list, [['A', 456, 789], ['B', 123, 456]]),
+    ([[utc_now, 456, 789], [utc_now, 123, 456]], {}, list, [[utc_now, 456, 789], [utc_now, 123, 456]]),
+    ([[today, 456, 789], [today, 123, 456]], {}, list, [[today, 456, 789], [today, 123, 456]]),
+
+    ([[123, 456, 789, 987], [789, 123, 456, 789]], {'id': 'some_id'}, dict, None),
+    ([[123, 456, 789], [789, 123, 456]], {'id': 'some_id'}, dict, None),
+])
+def test_WindBarbData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls3.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
+
 ## NEXT CLASS
 
 STANDARD_PARAMS_4 = [
diff --git a/tests/options/series/data/test_boxplot.py b/tests/options/series/data/test_boxplot.py
index 396dafc2..96a68f41 100644
--- a/tests/options/series/data/test_boxplot.py
+++ b/tests/options/series/data/test_boxplot.py
@@ -806,3 +806,37 @@ def test_BoxPlotData_to_dict(kwargs, error):
 ])
 def test_BoxPlotData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls, input_files, filename, as_file, error)
+
+
+utc_now = datetime.datetime.utcnow()
+today = datetime.date.today()
+
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[123, 456, 789, 987, 654, 321]], {}, list, [[123, 456, 789, 987, 654, 321]]),
+    ([['A', 456, 789, 987, 654, 321], ['B', 123, 456, 789, 987, 654]], {}, list, [['A', 456, 789, 987, 654, 321], ['B', 123, 456, 789, 987, 654]]),
+    ([[utc_now, 456, 789, 987, 654, 321]], {}, list, [[utc_now, 456, 789, 987, 654, 321]]),
+    ([[today, 456, 789, 987, 654, 321]], {}, list, [[today, 456, 789, 987, 654, 321]]),
+
+    ([[456, 789, 987, 654, 321]], {}, list, [[456, 789, 987, 654, 321]]),
+    ([[456, 789, 987, 654, 321], [123, 456, 789, 987, 654]], {}, list, [[456, 789, 987, 654, 321], [123, 456, 789, 987, 654]]),
+    ([[456, 789, 987, 654, 321]], {}, list, [[456, 789, 987, 654, 321]]),
+
+    ([[123, 456, 789, 987, 654, 321]], {'id': 'some_id'}, dict, None),
+
+])
+def test_BoxPlotData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
diff --git a/tests/options/series/data/test_bullet.py b/tests/options/series/data/test_bullet.py
index fb2db83e..77ff9b16 100644
--- a/tests/options/series/data/test_bullet.py
+++ b/tests/options/series/data/test_bullet.py
@@ -331,3 +331,33 @@ def test_BulletData_to_dict(kwargs, error):
 ])
 def test_BulletData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls, input_files, filename, as_file, error)
+
+
+utc_now = datetime.datetime.utcnow()
+today = datetime.date.today()
+
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[321, 123, 456], [123, 789, 123]], {}, list, [[321, 123, 456], [123, 789, 123]]),
+    ([[123, 456], [789, 123]], {}, list, [[123, 456], [789, 123]]),
+    ([['A', 123, 456], ['B', 321, 123]], {}, list, [['A', 123, 456], ['B', 321, 123]]),
+    ([[utc_now, 123, 456], [utc_now, 321, 123]], {}, list, [[utc_now, 123, 456], [utc_now, 321, 123]]),
+    ([[today, 123, 456], [today, 321, 123]], {}, list, [[today, 123, 456], [today, 321, 123]]),
+    
+    ([[123, 456], [789, 123]], {'id': 'some_id'}, dict, None),
+])
+def test_BulletData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
diff --git a/tests/options/series/data/test_cartesian.py b/tests/options/series/data/test_cartesian.py
index 9708e1ba..6041c085 100644
--- a/tests/options/series/data/test_cartesian.py
+++ b/tests/options/series/data/test_cartesian.py
@@ -746,6 +746,35 @@ def test_CartesianData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls, input_files, filename, as_file, error)
 
 
+utc_now = datetime.datetime.utcnow()
+today = datetime.date.today()
+
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[123, 456], [789, 123]], {}, list, [[123, 456], [789, 123]]),
+    ([['A', 456], ['B', 123]], {}, list, [['A', 456], ['B', 123]]),
+    ([[utc_now, 456], [utc_now, 123]], {}, list, [[utc_now, 456], [utc_now, 123]]),
+    ([[today, 456], [today, 123]], {}, list, [[today, 456], [today, 123]]),
+    
+    ([[123, 456], [789, 123]], {'id': 'some_id'}, dict, None),
+])
+def test_CartesianData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
+
 ## NEXT CLASS
 
 STANDARD_PARAMS_2 = [
@@ -1033,6 +1062,33 @@ def test_Cartesian3DData_to_dict(kwargs, error):
 def test_Cartesian3DData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls2, input_files, filename, as_file, error)
 
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[321, 123, 456], [123, 789, 123]], {}, list, [[321, 123, 456], [123, 789, 123]]),
+    ([[123, 456], [789, 123]], {}, list, [[123, 456], [789, 123]]),
+    ([['A', 123, 456], ['B', 321, 123]], {}, list, [['A', 123, 456], ['B', 321, 123]]),
+    ([[utc_now, 123, 456], [utc_now, 321, 123]], {}, list, [[utc_now, 123, 456], [utc_now, 321, 123]]),
+    ([[today, 123, 456], [today, 321, 123]], {}, list, [[today, 123, 456], [today, 321, 123]]),
+    
+    ([[123, 456], [789, 123]], {'id': 'some_id'}, dict, None),
+])
+def test_Cartesian3DData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls2.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
+
 ## NEXT CLASS
 
 STANDARD_PARAMS_3 = [
@@ -1322,3 +1378,29 @@ def test_CartesianValueData_to_dict(kwargs, error):
 ])
 def test_CartesianValueData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls3, input_files, filename, as_file, error)
+
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[321, 123, 456], [123, 789, 123]], {}, list, [[321, 123, 456], [123, 789, 123]]),
+    ([[123, 456], [789, 123]], {}, list, [[123, 456], [789, 123]]),
+    ([['A', 123, 456], ['B', 321, 123]], {}, list, [['A', 123, 456], ['B', 321, 123]]),
+    ([[utc_now, 123, 456], [utc_now, 321, 123]], {}, list, [[utc_now, 123, 456], [utc_now, 321, 123]]),
+    ([[today, 123, 456], [today, 321, 123]], {}, list, [[today, 123, 456], [today, 321, 123]]),
+    
+    ([[123, 456], [789, 123]], {'id': 'some_id'}, dict, None),
+])
+def test_CartesianValueData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls3.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
diff --git a/tests/options/series/data/test_range.py b/tests/options/series/data/test_range.py
index 9e512cdc..3e27ecaf 100644
--- a/tests/options/series/data/test_range.py
+++ b/tests/options/series/data/test_range.py
@@ -1,6 +1,7 @@
 """Tests for ``highcharts.no_data``."""
 
 import pytest
+import datetime
 
 from json.decoder import JSONDecodeError
 
@@ -290,6 +291,36 @@ def test_RangeData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls, input_files, filename, as_file, error)
 
 
+utc_now = datetime.datetime.utcnow()
+today = datetime.date.today()
+
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[321, 123, 456], [123, 789, 123]], {}, list, [[321, 123, 456], [123, 789, 123]]),
+    ([[123, 456], [789, 123]], {}, list, [[123, 456], [789, 123]]),
+    ([['A', 123, 456], ['B', 321, 123]], {}, list, [['A', 123, 456], ['B', 321, 123]]),
+    ([[utc_now, 123, 456], [utc_now, 321, 123]], {}, list, [[utc_now, 123, 456], [utc_now, 321, 123]]),
+    ([[today, 123, 456], [today, 321, 123]], {}, list, [[today, 123, 456], [today, 321, 123]]),
+    
+    ([[123, 456], [789, 123]], {'id': 'some_id'}, dict, None),
+])
+def test_RangeData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
+
 ## NEXT CLASS
 
 STANDARD_PARAMS_2 = [
diff --git a/tests/options/series/data/test_single_point.py b/tests/options/series/data/test_single_point.py
index fc9f0a7c..ab6684ea 100644
--- a/tests/options/series/data/test_single_point.py
+++ b/tests/options/series/data/test_single_point.py
@@ -1,6 +1,7 @@
 """Tests for ``highcharts.no_data``."""
 
 import pytest
+import datetime
 
 from json.decoder import JSONDecodeError
 
@@ -506,6 +507,35 @@ def test_SinglePointData_to_dict(kwargs, error):
 def test_SinglePointData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls2, input_files, filename, as_file, error)
 
+
+utc_now = datetime.datetime.utcnow()
+today = datetime.date.today()
+
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([['123', 456], ['789', 123]], {}, list, [['123', 456], ['789', 123]]),
+    ([['A', 456], ['B', 123]], {}, list, [['A', 456], ['B', 123]]),
+    ([[123], [456]], {}, list, [[123], [456]]),
+    
+    ([['123', 456], ['789', 123]], {'id': 'some_id'}, dict, None),
+])
+def test_SinglePointData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls2.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
+
 ## NEXT CLASS
 
 
@@ -756,6 +786,28 @@ def test_SingleValueData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls3, input_files, filename, as_file, error)
 
 
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([123, 456], {}, list, [[123], [456]]),
+    
+    ([123, 456], {'id': 'some_id'}, dict, None),
+])
+def test_SingleValueData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls3.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
+
 ## NEXT CLASS
 
 
@@ -1006,6 +1058,28 @@ def test_SingleXData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls4, input_files, filename, as_file, error)
 
 
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([123, 456], {}, list, [[123], [456]]),
+    
+    ([123, 456], {'id': 'some_id'}, dict, None),
+])
+def test_SingleXData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls4.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected
+
+
 ## NEXT CLASS
 
 
diff --git a/tests/options/series/data/test_vector.py b/tests/options/series/data/test_vector.py
index 161993ae..7804322e 100644
--- a/tests/options/series/data/test_vector.py
+++ b/tests/options/series/data/test_vector.py
@@ -757,3 +757,35 @@ def test_VectorData_to_dict(kwargs, error):
 ])
 def test_VectorData_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls, input_files, filename, as_file, error)
+
+
+utc_now = datetime.datetime.utcnow()
+today = datetime.date.today()
+
+
+@pytest.mark.parametrize('input_array, set_props, expected_type, expected', [
+    ([], {}, list, []),
+    ([[123, 456, 789, 987], [789, 123, 456, 789]], {}, list, [[123, 456, 789, 987], [789, 123, 456, 789]]),
+    ([['A', 456, 789, 987], ['B', 123, 456, 789]], {}, list, [['A', 456, 789, 987], ['B', 123, 456, 789]]),
+    ([[utc_now, 456, 789, 987], [utc_now, 123, 456, 789]], {}, list, [[utc_now, 456, 789, 987], [utc_now, 123, 456, 789]]),
+    ([[today, 456, 789, 987], [today, 123, 456, 789]], {}, list, [[today, 456, 789, 987], [today, 123, 456, 789]]),
+
+    ([[123, 456, 789], [789, 123, 456]], {}, list, [[123, 456, 789], [789, 123, 456]]),
+
+    ([[123, 456, 789, 987], [789, 123, 456, 789]], {'id': 'some_id'}, dict, None),
+    ([[123, 456, 789], [789, 123, 456]], {'id': 'some_id'}, dict, None),
+])
+def test_VectorData_to_array(input_array, set_props, expected_type, expected):
+    iterable = cls.from_array(input_array)
+    for data_point in iterable:
+        for key in set_props:
+            setattr(data_point, key, set_props[key])
+    
+    results = []
+    for data_point in iterable:
+        result = data_point.to_array()
+        assert isinstance(result, expected_type) is True
+        results.append(result)
+        
+    if expected_type == list:
+        assert results == expected

From 27ca1a730a2372629ac2dd5ae2b4acdd51be5e23 Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Sat, 5 Aug 2023 20:05:04 -0400
Subject: [PATCH 16/17] Updated changelog.

---
 CHANGES.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a433a73a..450ff187 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,12 +1,13 @@
 Release 1.3.0
 =========================================
 
-* **BUGFIX:** Fixed incorrect serialization of datetime and Pandas ``Timestamp`` objects in ``.to_dict()`` and ``.to_json()`` (#74).
-* **BUGFIX:** Fixed incorrect serialization of ``EnforcedNull`` in ``.to_dict()`` and ``.to_json()`` (#75).
+* **ENHANCEMENT:** Modified the way that data points are serialized to JavaScript literal objects. Now, they are serialized to a JavaScript array if their configured properties are those that Highcharts (JS) supports in JavaScript array notation. Otherwise, the code falls back to serialize the data point as a JavaScript object literal. This change is intended to improve performance and reduce the size of the serialized data. (#77)
 * **ENHANCEMENT:** Added ``__repr__()`` method for Highcharts Core for Python classes (#76).
 * **ENHANCEMENT:** Added ``__str__()`` method with special handling for difficult-to-read classes (#76).
 * **ENHANCEMENT:** Added ``Chart.get_script_tags()`` to retrieve Javascript ``<script>`` tags (#78).
 * **ENHANCEMENT:** Added ``utility_functions.to_snake_case()`` function.
+* **BUGFIX:** Fixed incorrect serialization of datetime and Pandas ``Timestamp`` objects in ``.to_dict()`` and ``.to_json()`` (#74).
+* **BUGFIX:** Fixed incorrect serialization of ``EnforcedNull`` in ``.to_dict()`` and ``.to_json()`` (#75).
 
 ------------------
 

From e51b86ed5460f5af17955f84c666ece9ded688bb Mon Sep 17 00:00:00 2001
From: Chris Modzelewski <chris@highchartspython.com>
Date: Sun, 6 Aug 2023 10:40:33 -0400
Subject: [PATCH 17/17] Fixed missing .to_array() support.

---
 .../options/series/data/connections.py        | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/highcharts_core/options/series/data/connections.py b/highcharts_core/options/series/data/connections.py
index 81f17fb7..c22e3035 100644
--- a/highcharts_core/options/series/data/connections.py
+++ b/highcharts_core/options/series/data/connections.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, List
 from decimal import Decimal
 
 from validator_collection import validators, checkers
@@ -214,6 +214,16 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return ['from_',
+                'to']
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the
@@ -321,6 +331,15 @@ def from_array(cls, value):
 
         return collection
 
+    def _get_props_from_array(self) -> List[str]:
+        """Returns a list of the property names that can be set using the
+        :meth:`.from_array() <highcharts_core.options.series.data.base.DataBase.from_array>`
+        method.
+        
+        :rtype: :class:`list <python:list>` of :class:`str <python:str>`
+        """
+        return []
+
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
         """Convenience method which returns the keyword arguments used to initialize the