Completely remove Array and Object proxies, they were a mistake and r…

…esulted in misuses. Closes #82, #109.

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.0.2
+current_version = 6.0.0
 commit = True
 tag = True
 

setup.py

@@ -30,15 +30,19 @@
     )
 
 if os.getenv('BUILD_WITH_CYTHON') and CYTHON_AVAILABLE:
-    macros = []
+    macros = [
+        ('NDEBUG', 1)
+    ]
     compiler_directives = {
-        'embedsignature': True
+        'embedsignature': True,
+        'boundscheck': False
     }
 
     if os.getenv('BUILD_FOR_DEBUG'):
         # Enable line tracing, which also enables support for coverage
         # reporting.
         macros = [
+            ('CYTHON_PROFILE', 1),
             ('CYTHON_TRACE', 1),
             ('CYTHON_TRACE_NOGIL', 1)
         ]
@@ -68,14 +72,17 @@
                 'simdjson/csimdjson.cpp'
             ],
             extra_compile_args=extra_compile_args,
-            language='c++'
+            language='c++',
+            define_macros=[
+                ('NDEBUG', 1)
+            ]
         )
     ]
 
 setup(
     name='pysimdjson',
     packages=find_packages(),
-    version='5.0.2',
+    version='6.0.0',
     description='simdjson bindings for python',
     long_description=long_description,
     long_description_content_type='text/markdown',

simdjson/__init__.py

@@ -5,8 +5,7 @@
     from csimdjson import (
         # Objects
         Parser,
-        Array,
-        Object,
+        Document,
         # Constants
         MAXSIZE_BYTES,
         PADDING
@@ -17,8 +16,6 @@
 # Shuts up *all* linters complaining about our unused imports.
 _ALL_IMPORTS = [
     Parser,
-    Array,
-    Object,
     MAXSIZE_BYTES,
     PADDING
 ]
@@ -34,8 +31,7 @@ def load(fp, *, cls=None, object_hook=None, parse_float=None, parse_int=None,
         - object_pairs_hook is ignored.
         - cls is ignored.
     """
-    parser = Parser()
-    return parser.parse(fp.read(), True)
+    return Parser().parse(fp.read()).as_object
 
 
 def loads(s, *, cls=None, object_hook=None, parse_float=None, parse_int=None,
@@ -48,8 +44,7 @@ def loads(s, *, cls=None, object_hook=None, parse_float=None, parse_int=None,
         - object_pairs_hook is ignored.
         - cls is ignored.
     """
-    parser = Parser()
-    return parser.parse(s, True)
+    return Parser().parse(s).as_object
 
 
 dumps = json.dumps

simdjson/__init__.pyi

@@ -1,18 +1,14 @@
 import json
 from pathlib import Path
 from typing import (
-    AbstractSet,
     Any,
     Dict,
     Final,
-    Iterator,
     List,
-    Mapping,
     Optional,
     Sequence,
     Tuple,
     Union,
-    ValuesView,
     overload,
 )
 
@@ -22,61 +18,10 @@ except ImportError:
     from typing_extensions import Literal  # type: ignore
 
 Primitives = Union[int, float, str, bool]
-SimValue = Optional[Union['Object', 'Array', Primitives]]
+SimValue = Optional[Primitives]
 UnboxedValue = Optional[Union[Primitives, Dict[str, Any], List[Any]]]
 
 
-class Object(Mapping[str, SimValue]):
-    def __getitem__(self, key: str) -> SimValue:
-        ...
-
-    def __iter__(self) -> Iterator[str]:
-        ...
-
-    def __len__(self) -> int:
-        ...
-
-    def as_dict(self) -> Dict[str, UnboxedValue]:
-        ...
-
-    def at_pointer(self, key: str) -> SimValue:
-        ...
-
-    def keys(self) -> AbstractSet[str]:
-        ...
-
-    def values(self) -> ValuesView[SimValue]:
-        ...
-
-    def items(self) -> AbstractSet[Tuple[str, SimValue]]:
-        ...
-
-    @property
-    def mini(self) -> str:
-        ...
-
-
-class Array(Sequence[SimValue]):
-    def __len__(self) -> int:
-        ...
-
-    def __getitem__(self, idx: Union[int, slice]) -> 'Array':
-        ...
-
-    def as_list(self) -> List[Optional[Union[Primitives, dict, list]]]:
-        ...
-
-    def as_buffer(self, *, of_type: Literal['d', 'i', 'u']) -> bytes:
-        ...
-
-    def at_pointer(self, key: str) -> SimValue:
-        ...
-
-    @property
-    def mini(self) -> str:
-        ...
-
-
 class Parser:
     def __init__(self, max_capacity: int = ...) -> None:
         ...
@@ -98,32 +43,28 @@ class Parser:
     @overload
     def load(
         self,
-        path: Union[str, Path],
-        recursive: Literal[False] = ...,
+        path: Union[str, Path]
     ) -> SimValue:
         ...
 
     @overload
     def load(
         self,
-        path: Union[str, Path],
-        recursive: Literal[True],
+        path: Union[str, Path]
     ) -> UnboxedValue:
         ...
 
     @overload
     def parse(
         self,
-        data: Union[str, bytes, bytearray, memoryview],
-        recursive: Literal[False] = ...,
+        data: Union[str, bytes, bytearray, memoryview]
     ) -> SimValue:
         ...
 
     @overload
     def parse(
         self,
-        data: Union[str, bytes, bytearray, memoryview],
-        recursive: Literal[True],
+        data: Union[str, bytes, bytearray, memoryview]
     ) -> UnboxedValue:
         ...