Only add orderings when there is a type string field

CodeYellowBV · Dec 12, 2024 · a65161a · a65161a
1 parent b3d9af7
commit a65161a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/helpor/dict_ordering.py b/helpor/dict_ordering.py
@@ -2,7 +2,8 @@ def add_orderings(target: dict) -> dict:
     next_ordering = 0
     for value in target.values():
         if isinstance(value, dict):
-            value['ordering'] = next_ordering
-            next_ordering += 1
+            if 'type' in value and isinstance(value['type'], str):
+                value['ordering'] = next_ordering
+                next_ordering += 1
             add_orderings(value)
     return target
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,6 +4,6 @@ build-backend = "hatchling.build"
 
 [project]
 name = 'helpor'
-version = '0.1.3'
+version = '0.1.4'
 requires-python = '>= 3.7'
 
diff --git a/tests/test_dict_ordering.py b/tests/test_dict_ordering.py
@@ -13,20 +13,18 @@ def test_dict_with_one_level(self):
         original = {
             'nope': None,
             'first': {
-                'go': 'not deep'
+                'type': 'string'
             },
             'second': {},
             'last': 1234
         }
         expected = {
             'nope': None,
             'first': {
-                'go': 'not deep',
+                'type': 'string',
                 'ordering': 0
             },
-            'second': {
-                'ordering': 1
-            },
+            'second': {},
             'last': 1234
         }
         self.assertEqual(expected, add_orderings(original))
@@ -45,7 +43,11 @@ def test_deeper_dict(self):
                             'hello': 'world'
                         },
                         'object2': {
+                            'type': 'string',
                             'this is': 'deep enough'
+                        },
+                        'type': {
+                            'type': 'number'
                         }
                     }
                 }
@@ -71,13 +73,16 @@ def test_deeper_dict(self):
                     'deeper': {
                         'object1': {
                             'hello': 'world',
-                            'ordering': 0
                         },
                         'object2': {
+                            'type': 'string',
                             'this is': 'deep enough',
-                            'ordering': 1
+                            'ordering': 0
                         },
-                        'ordering': 0
+                        'type': {
+                            'type': 'number',
+                            'ordering': 1
+                        }
                     },
                     'ordering': 1
                 },