jsonbp 1.2.2__tar.gz → 1.3.0__tar.gz

{jsonbp-1.2.2/jsonbp.egg-info → jsonbp-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonbp
-Version: 1.2.2
+Version: 1.3.0
 Summary: Schema based JSON Parser/Serializer
 Author-email: Gustavo Venturini <gustavo.c.venturini@gmail.com>
 License-Expression: BSD-3-Clause
@@ -11,6 +11,7 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -27,7 +28,7 @@ to and from Python based on schemas. While [json-schema][json_schema] and its
 implementations offer a more mature and widely used technique, a different
 approach was desired, which led to the development of this library.
 
-jsonbp's design main goals were:
+jsonbp's main design goals were:
 - schema reuse through import / type system
 - custom user definable primitive types
 - built in numeric fixed precision type which deserializes into Python's Decimal

{jsonbp-1.2.2 → jsonbp-1.3.0}/README.md

@@ -9,7 +9,7 @@ to and from Python based on schemas. While [json-schema][json_schema] and its
 implementations offer a more mature and widely used technique, a different
 approach was desired, which led to the development of this library.
 
-jsonbp's design main goals were:
+jsonbp's main design goals were:
 - schema reuse through import / type system
 - custom user definable primitive types
 - built in numeric fixed precision type which deserializes into Python's Decimal

{jsonbp-1.2.2 → jsonbp-1.3.0}/jsonbp/blueprint.py

@@ -28,7 +28,7 @@ unquote = lambda x : unquoted_str(x)
 
 class JsonBlueprint:
   """
-    Class to serialize Python objects to JSON strings and vice-versa.
+    Class to serialize Python objects to JSON strings and vice versa.
   """
 
   def __init__(self, primitive_types):
@@ -38,6 +38,8 @@ class JsonBlueprint:
     self.derived_types = dict()
     self.enums = dict()
     self.objects = dict()
+    self.templates = dict()
+    self.unions = dict()
     self.root = None
 
   def __str__(self): # pragma: no cover
@@ -90,6 +92,35 @@ class JsonBlueprint:
     return True, value
 
 
+  def _validate_union(self, field_name, unionDef, contents):
+    if not isinstance(contents, collections.abc.Mapping):
+      return False, create_field_error(field_name,
+        ErrorType.INVALID_OBJECT)
+
+    discriminator = unionDef['discriminator']
+    if discriminator not in contents:
+      return False, create_field_error(field_name,
+        ErrorType.MISSING_FIELD, field=discriminator)
+
+    tag_value = contents[discriminator]
+    if isinstance(tag_value, unquoted_str):
+      return False, create_field_error(field_name,
+        ErrorType.INVALID_ENUM)
+
+    branch_name = unionDef['branches'].get(tag_value)
+    if branch_name is None:
+      return False, create_field_error(field_name,
+        ErrorType.UNKNOWN_LITERAL)
+
+    branch_fields = self._find_object_decl(branch_name)
+    success, outcome = self._validate_object(field_name, branch_fields, contents)
+    if not success:
+      return False, outcome
+
+    outcome[discriminator] = tag_value
+    return True, outcome
+
+
   def _validate_array(self, field_name, jArray, contents):
     if not isinstance(contents, collections.abc.Sequence):
       return False, create_field_error(field_name,
@@ -111,6 +142,10 @@ class JsonBlueprint:
       element_type = self._find_object_decl(array_type)
       deserializer = self._validate_object
 
+    if array_kind == FieldType.UNION:
+      element_type = self._find_union_decl(array_type)
+      deserializer = self._validate_union
+
     result = list()
     for idx, value in enumerate(contents):
       if value is None:
@@ -213,6 +248,18 @@ class JsonBlueprint:
         result[field_name] = processed
         continue
 
+      if field_kind == FieldType.UNION:
+        unionDef = self._find_union_decl(field_type)
+        success, outcome = self._validate_union(
+          field_name, unionDef,
+          retrieved)
+
+        if not success:
+          return False, outcome
+
+        result[field_name] = outcome
+        continue
+
       success, outcome = self._validate_field(
         field_name, field_type,
         retrieved)
@@ -264,12 +311,16 @@ class JsonBlueprint:
       return self._validate_field(None, root_type,
         root_contents)
 
+    if root_kind == FieldType.UNION:
+      unionDef = self._find_union_decl(root_type)
+      return self._validate_union(None, unionDef, root_contents)
+
 
   def deserialize(self, contents):
     """Attempts to deserialize a JSON string into a Python object.
 
     The returned tuple's first element indicates whether the deserialization
-    was successful. When deserialization succeeds the respective Python data
+    was successful. When deserialization succeeds the resulting Python data
     will be the second element. Conversely, when a problem is found the first
     element will be False and the second element will be an instance of
     :class:`DeserializationError`.
@@ -318,6 +369,8 @@ class JsonBlueprint:
       collected.extend(source.derived_types.keys())
       collected.extend(source.enums.keys())
       collected.extend(source.objects.keys())
+      collected.extend(source.templates.keys())
+      collected.extend(source.unions.keys())
 
     return collected
 
@@ -369,6 +422,38 @@ class JsonBlueprint:
 
     return None
 
+
+  def _find_union_decl(self, union_name, checked=None):
+    if union_name in self.unions:
+      return self.unions[union_name]
+
+    checked = checked or set()
+    checked.add(self)
+
+    for blueprint in self.includes:
+      if blueprint not in checked:
+        found = blueprint._find_union_decl(union_name, checked)
+        if found is not None:
+          return found
+
+    return None
+
+
+  def _find_template_decl(self, template_name, checked=None):
+    if template_name in self.templates:
+      return self.templates[template_name]
+
+    checked = checked or set()
+    checked.add(self)
+
+    for blueprint in self.includes:
+      if blueprint not in checked:
+        found = blueprint._find_template_decl(template_name, checked)
+        if found is not None:
+          return found
+
+    return None
+
   #----------------------------------------------------------------------------
 
   def choose_root(self, root_type, as_array=False,
@@ -377,15 +462,15 @@ class JsonBlueprint:
     """Selects or changes the root element of a blueprint.
 
       This function allows you to create a derivative JsonBlueprint
-      instance, overwriting the root type (or selecting one, if none
+      instance, overriding the root type (or selecting one, if none
       is defined). The original source JsonBlueprint instance remains
       unchanged.
 
       Args:
         root_type (str): name of the type to be used as root.
-		    as_array (bool): whether the chosen root is an array or not of the selected type.
-        min_array_length (int): if set as array, minimum size that the root must be.
-        max_array_length (int): if set as array, maximum size that the root can be.
+		    as_array (bool): whether the root should be an array of the selected type.
+        min_array_length (int): if `as_array` is True, the minimum number of elements the root array must contain.
+        max_array_length (int): if `as_array` is True, the maximum number of elements the root array can contain.
 
       Returns:
         A new blueprint, with the root selected or replaced.
@@ -399,7 +484,8 @@ class JsonBlueprint:
     lookups = [
       (self._find_object_decl, FieldType.OBJECT),
       (self._find_element_decl, FieldType.SIMPLE),
-      (self._find_enum_decl, FieldType.ENUM)
+      (self._find_enum_decl, FieldType.ENUM),
+      (self._find_union_decl, FieldType.UNION),
     ]
 
     found_root = None
@@ -428,11 +514,44 @@ class JsonBlueprint:
     result.derived_types = self.derived_types
     result.enums = self.enums
     result.objects = self.objects
+    result.unions = self.unions
 
     return result
 
   #----------------------------------------------------------------------------
 
+  def _serialize_union(self, union_type, field_name, content):
+    unionDef = self._find_union_decl(union_type)
+    discriminator = unionDef['discriminator']
+
+    if not isinstance(content, collections.abc.Mapping):
+      raise SerializationException(f"{field_name} needs a dict to serialize")
+
+    if discriminator not in content:
+      raise SerializationException(
+        f"{field_name}: missing discriminator field '{discriminator}'")
+
+    tag_value = content[discriminator]
+    branch_name = unionDef['branches'].get(tag_value)
+    if branch_name is None:
+      raise SerializationException(
+        f"{field_name}: unknown tag value '{tag_value}'")
+
+    serialized = [f'"{discriminator}":"{tag_value}"']
+    branch_fields = self._find_object_decl(branch_name)
+
+    for fname, fdata in branch_fields.items():
+      if fname not in content:
+        if fdata.optional:
+          continue
+        raise SerializationException(f"{field_name}: missing field '{fname}'")
+
+      processed = self._serialize_element(fdata, fname, content[fname])
+      serialized.append(f'"{fname}":{processed}')
+
+    return "{" + ",".join(serialized) + "}"
+
+
   def _serialize_element(self, element, elementName, content):
     contentKind = element.fieldKind
     contentType = element.fieldType
@@ -440,7 +559,8 @@ class JsonBlueprint:
     method = {
       FieldType.OBJECT: JsonBlueprint._serialize_object,
       FieldType.ENUM: JsonBlueprint._serialize_enum,
-      FieldType.SIMPLE: JsonBlueprint._serialize_field
+      FieldType.SIMPLE: JsonBlueprint._serialize_field,
+      FieldType.UNION: JsonBlueprint._serialize_union,
     } [contentKind]
 
     if is_array(element):

{jsonbp-1.2.2 → jsonbp-1.3.0}/jsonbp/error.py

@@ -30,8 +30,8 @@ def use_default_language(language):
 
 		This language will be applied when no languages are
 		specified in the :func:`DeserializationError.localize` method. When
-		jsonbp starts, this language is set to American English (en-US). If 
-		he language code passed is not available, it'll also fallback to
+		jsonbp starts, this language is set to American English (en-US). If
+		the language code passed is not available, it will also fall back to
 		American English.
 
 		Args:
@@ -57,7 +57,7 @@ def load_translation(filename, language):
 
 		Args:
 			filename (str): path to the ini file.
-			language (str): language code that that file corresponds to.
+			language (str): language code that the file corresponds to.
 
 		Raises:
 			IOError: When `filename` cannot be opened for reading.
@@ -139,7 +139,7 @@ class DeserializationError:
 					:func:`use_default_language`.
 
 			Returns:
-				the localized issue with the JSON string.
+				the localized error message describing the issue.
 				
 		"""
 
@@ -149,6 +149,9 @@ class DeserializationError:
 
 		for candidate in localization_priority:
 			translation = translations.get(candidate)
+			if translation is None:
+				prefix = candidate + '_'
+				translation = next((translations[k] for k in translations if k.startswith(prefix)), None)
 			if translation is not None:
 				break
 

jsonbp-1.3.0/jsonbp/localization/de_DE.ini

@@ -0,0 +1,20 @@
+
+[Messages]
+JSON_PARSING=Ungültiges JSON, Fehler in Zeile {line}, Spalte {column}: {message}
+VALUE_PARSING=Wert konnte nicht als '{type}' dekodiert werden
+NULL_VALUE=Nullwert
+OUTSIDE_RANGE=Wert {value} liegt außerhalb des erwarteten Bereichs
+INVALID_LENGTH=Länge {length} liegt außerhalb des erwarteten Bereichs
+UNKNOWN_LITERAL=Unbekannter Wert
+INVALID_ENUM=Wert muss eine Zeichenkette sein
+INVALID_FORMAT=Inhalt entspricht nicht dem erwarteten Format
+MISSING_FIELD=Fehlendes Feld '{field}'
+INVALID_ARRAY=Muss eine Liste sein
+INVALID_OBJECT=Muss ein Objekt sein
+
+[Prefixes]
+FIELD=Feld '{assignee}'
+OBJECT=Objekt '{assignee}'
+ARRAY=In Liste '{assignee}' bei Index {index}
+ROOT=Auf Wurzelebene
+

jsonbp-1.3.0/jsonbp/localization/fr_FR.ini

@@ -0,0 +1,20 @@
+
+[Messages]
+JSON_PARSING=JSON invalide, erreur à la ligne {line}, colonne {column}: {message}
+VALUE_PARSING=Impossible de décoder la valeur en '{type}'
+NULL_VALUE=Valeur nulle
+OUTSIDE_RANGE=La valeur {value} est en dehors de la plage attendue
+INVALID_LENGTH=La longueur {length} est en dehors de la plage attendue
+UNKNOWN_LITERAL=Valeur inconnue
+INVALID_ENUM=La valeur doit être une chaîne de caractères
+INVALID_FORMAT=Le contenu n'est pas dans le format attendu
+MISSING_FIELD=Champ manquant '{field}'
+INVALID_ARRAY=Doit être une liste
+INVALID_OBJECT=Doit être un objet
+
+[Prefixes]
+FIELD=Champ '{assignee}'
+OBJECT=Objet '{assignee}'
+ARRAY=Dans la liste '{assignee}' à l'index {index}
+ROOT=Au niveau racine
+

jsonbp-1.3.0/jsonbp/localization/ru_RU.ini

@@ -0,0 +1,20 @@
+
+[Messages]
+JSON_PARSING=Некорректный JSON, ошибка в строке {line}, столбец {column}: {message}
+VALUE_PARSING=Не удалось декодировать значение как '{type}'
+NULL_VALUE=Нулевое значение
+OUTSIDE_RANGE=Значение {value} выходит за пределы ожидаемого диапазона
+INVALID_LENGTH=Длина {length} выходит за пределы ожидаемого диапазона
+UNKNOWN_LITERAL=Неизвестное значение
+INVALID_ENUM=Значение должно быть строкой
+INVALID_FORMAT=Содержимое не соответствует ожидаемому формату
+MISSING_FIELD=Отсутствует поле '{field}'
+INVALID_ARRAY=Должно быть списком
+INVALID_OBJECT=Должно быть объектом
+
+[Prefixes]
+FIELD=Поле '{assignee}'
+OBJECT=Объект '{assignee}'
+ARRAY=В списке '{assignee}' по индексу {index}
+ROOT=На корневом уровне
+

jsonbp-1.3.0/jsonbp/localization/zh_CN.ini

@@ -0,0 +1,20 @@
+
+[Messages]
+JSON_PARSING=无效的JSON，第{line}行第{column}列发生错误：{message}
+VALUE_PARSING=无法将值解码为"{type}"
+NULL_VALUE=空值
+OUTSIDE_RANGE=值{value}超出预期范围
+INVALID_LENGTH=长度{length}超出预期范围
+UNKNOWN_LITERAL=未知值
+INVALID_ENUM=值必须是字符串
+INVALID_FORMAT=内容格式不符合预期
+MISSING_FIELD=缺少字段"{field}"
+INVALID_ARRAY=必须是列表
+INVALID_OBJECT=必须是对象
+
+[Prefixes]
+FIELD=字段"{assignee}"
+OBJECT=对象"{assignee}"
+ARRAY=列表"{assignee}"的索引{index}处
+ROOT=根级别
+

{jsonbp-1.2.2 → jsonbp-1.3.0}/jsonbp/parser.py

@@ -9,8 +9,8 @@ from .error import print_warning, print_error
 from .loader import load_types
 from .blueprint import JsonBlueprint
 from .declaration import create_declaration
-from .field import create_field
-from .array import make_array
+from .field import create_field, JsonField
+from .array import make_array, is_array
 
 reserved = (
 	'root',
@@ -20,7 +20,10 @@ reserved = (
 	'optional',
 	'nullable',
 	'extends',
-	'include'
+	'include',
+	'wraps',
+	'union',
+	'on'
 )
 
 literals = (
@@ -32,7 +35,9 @@ literals = (
 	']',
 	',',
 	'=',
-	':'
+	':',
+	'<',
+	'>'
 )
 
 # List of tokens
@@ -44,12 +49,17 @@ types = (
 	'FLOAT_CONST',
 	'INTEGER_AMOUNT',
 	'IDENTIFIER',
+	'ARROW',
 )
 
 tokens = list(types) + [token.upper() for token in reserved]
 
 #------------------------------------------------------------
 
+def t_ARROW(t):
+	r'=>'
+	return t
+
 def t_STRING(t):
 	r'"[^"]*"'
 	t.value = t.value[1:-1]
@@ -117,7 +127,8 @@ def typeExists(typeName, excluded=None):
 	lookups = (
 	  currentBlueprint._find_object_decl,
 	  currentBlueprint._find_element_decl,
-	  currentBlueprint._find_enum_decl
+	  currentBlueprint._find_enum_decl,
+	  currentBlueprint._find_union_decl,
 	)
 
 	for method in lookups:
@@ -134,6 +145,8 @@ def getNextAdhoc():
 	adhoc_counter += 1
 	return adhoc_counter
 
+currentTypeParam = None
+
 #---------------- general structure -----------------------------
 
 def p_schema(p):
@@ -149,6 +162,7 @@ def p_construction(p):
 	                 | object
 	                 | root
 	                 | include
+	                 | union
 	'''
 
 #---------------- constructs -----------------------------
@@ -191,12 +205,39 @@ def p_root(p):
 	currentBlueprint.root = p[2]
 
 
+def p_generic_header(p):
+	'''
+	  generic_header : OBJECT IDENTIFIER WRAPS IDENTIFIER
+	'''
+
+	global currentTypeParam
+	currentTypeParam = p[4]
+	p[0] = p[2]
+
+
 def p_object(p):
 	'''
-	  object : OBJECT IDENTIFIER EXTENDS IDENTIFIER object_declaration
+	  object : generic_header object_declaration
+	         | OBJECT IDENTIFIER EXTENDS IDENTIFIER object_declaration
 	         | OBJECT IDENTIFIER object_declaration
 	'''
 
+	global currentTypeParam
+
+	if len(p) == 3:
+	  templateName = p[1]
+	  paramName = currentTypeParam
+	  currentTypeParam = None
+
+	  if typeExists(templateName) or currentBlueprint._find_template_decl(templateName) is not None:
+	    raise SchemaViolation(f"Duplicated type '{templateName}'")
+
+	  currentBlueprint.templates[templateName] = {
+	    'param': paramName,
+	    'fields': p[2]
+	  }
+	  return
+
 	objectName = p[2]
 	if typeExists(objectName):
 	  msg = f"Duplicated type '{objectName}'"
@@ -229,13 +270,30 @@ def p_object(p):
 def p_object_specs(p):
 	'''
 	  object_declaration : '{' attributes '}'
+	                     | EXTENDS IDENTIFIER '{' attributes '}'
 	'''
 
-	decls = p[2]
+	if len(p) == 4:
+	  decls = p[2]
+	  baseFields = {}
+
+	else:
+	  baseObject = p[2]
+	  baseFields = currentBlueprint._find_object_decl(baseObject)
+	  if baseFields is None:
+	    raise SchemaViolation(f"Object '{baseObject}' is not defined")
+	  decls = p[4]
+
 	newObject = dict()
 	for decl in decls:
-	  newObject[decl[0]] = decl[1]
+	  fieldName = decl[0]
+	  if fieldName in baseFields:
+	    raise SchemaViolation(
+	      f"Field '{fieldName}' already defined in '{baseObject}'"
+	    )
+	  newObject[fieldName] = decl[1]
 
+	newObject.update(baseFields)
 	p[0] = newObject
 
 
@@ -296,10 +354,12 @@ def p_type(p):
 def p_attributes(p):
 	'''
 	  attributes : attributes ',' attribute
+	             | attributes ','
 	             | attribute
 	'''
 
 	if len(p) == 4: p[1].append(p[3])
+	if len(p) == 3: p[0] = p[1]; return
 	if len(p) == 2: p[1] = [p[1]]
 	p[0] = p[1]
 
@@ -358,11 +418,66 @@ def p_single_declaration(p):
 	p[0] = p[1]
 
 
+def instantiateTemplate(templateName, argType):
+	template = currentBlueprint._find_template_decl(templateName)
+	if template is None:
+	  raise SchemaViolation(f"Template '{templateName}' is not defined")
+
+	if not typeExists(argType):
+	  raise SchemaViolation(f"Type not declared: '{argType}'")
+
+	concreteName = f'{templateName}__{argType}'
+	if currentBlueprint._find_object_decl(concreteName) is not None:
+	  return concreteName
+
+	if currentBlueprint._find_object_decl(argType) is not None:
+	  argKind = FieldType.OBJECT
+	elif currentBlueprint._find_enum_decl(argType) is not None:
+	  argKind = FieldType.ENUM
+	else:
+	  argKind = FieldType.SIMPLE
+
+	paramName = template['param']
+	concreteFields = dict()
+
+	for fieldName, field in template['fields'].items():
+	  if field.fieldType != paramName:
+	    concreteFields[fieldName] = field
+	    continue
+
+	  if is_array(field):
+	    newBase = create_field(argKind, argType)
+	    newBase.nullable = field.nullable
+	    newField = make_array(newBase)
+	    newField.minLength = field.minLength
+	    newField.maxLength = field.maxLength
+	    newField.nullableArray = field.nullableArray
+	  else:
+	    newField = create_field(argKind, argType)
+	    newField.nullable = field.nullable
+	    newField.optional = field.optional
+
+	  concreteFields[fieldName] = newField
+
+	currentBlueprint.objects[concreteName] = concreteFields
+	return concreteName
+
+
+def p_template_declaration(p):
+	'''
+	  template_declaration : IDENTIFIER '<' IDENTIFIER '>'
+	'''
+
+	concreteName = instantiateTemplate(p[1], p[3])
+	p[0] = create_field(FieldType.OBJECT, concreteName)
+
+
 def p_atomic_declaration(p):
 	'''
 	  atomic_declaration : object_declaration
 	                     | enum_declaration
 	                     | element_declaration
+	                     | template_declaration
 	'''
 
 	declaration = p[1]
@@ -378,6 +493,10 @@ def p_atomic_declaration(p):
 	  kind = FieldType.ENUM
 	  fieldId = adhoc_enum
 
+	elif isinstance(declaration, JsonField):
+	  p[0] = declaration
+	  return
+
 	else:
 	  declType = declaration.typeName
 	  if currentBlueprint._find_element_decl(declType) is not None:
@@ -395,6 +514,10 @@ def p_atomic_declaration(p):
 	    kind = FieldType.ENUM
 	    fieldId = declType
 
+	  elif currentBlueprint._find_union_decl(declType):
+	    kind = FieldType.UNION
+	    fieldId = declType
+
 	  else:
 	    kind = FieldType.OBJECT
 	    fieldId = declType
@@ -427,7 +550,7 @@ def p_element_declaration(p):
 	  specs = p[3]
 
 	else:
-	  if not typeExists(typeName):
+	  if typeName != currentTypeParam and not typeExists(typeName):
 	    msg = f"Type not declared: '{typeName}'"
 	    raise SchemaViolation(msg)
 
@@ -466,6 +589,65 @@ def p_specified_value(p):
 
 	p[0] = p[1]
 
+#---------------- unions ----------------------------
+
+def p_union(p):
+	'''
+	  union : UNION IDENTIFIER ON STRING '{' union_branches '}'
+	'''
+
+	union_name = p[2]
+	if typeExists(union_name) or currentBlueprint._find_template_decl(union_name) is not None:
+	  raise SchemaViolation(f"Duplicated type '{union_name}'")
+
+	currentBlueprint.unions[union_name] = {
+	  'discriminator': p[4],
+	  'branches': p[6]
+	}
+
+
+def p_union_branches(p):
+	'''
+	  union_branches : union_branches ',' union_branch
+	                 | union_branches ','
+	                 | union_branch
+	'''
+
+	if len(p) == 4:
+	  p[1].update(p[3])
+	  p[0] = p[1]
+	elif len(p) == 3:
+	  p[0] = p[1]
+	else:
+	  p[0] = p[1]
+
+
+def p_union_branch(p):
+	'''
+	  union_branch : STRING ARROW branch_declaration
+	'''
+
+	p[0] = {p[1]: p[3]}
+
+
+def p_branch_declaration(p):
+	'''
+	  branch_declaration : object_declaration
+	                     | IDENTIFIER
+	'''
+
+	if isinstance(p[1], dict):
+	  adhoc_name = '_union_branch_' + str(getNextAdhoc()) + '_'
+	  currentBlueprint.objects[adhoc_name] = p[1]
+	  p[0] = adhoc_name
+
+	else:
+	  type_name = p[1]
+	  if currentBlueprint._find_object_decl(type_name) is None:
+	    raise SchemaViolation(f"Object '{type_name}' is not defined")
+	  p[0] = type_name
+
+
 #---------------- enums -----------------------------
 
 def p_enum(p):
@@ -492,6 +674,7 @@ def p_enum_declaration(p):
 def p_constants(p):
 	'''
 	    constants : constants ',' IDENTIFIER
+	              | constants ','
 	              | IDENTIFIER
 	'''
 
@@ -499,6 +682,9 @@ def p_constants(p):
 	  p[1].append(p[3])
 	  p[0] = p[1]
 
+	elif len(p) == 3:
+	  p[0] = p[1]
+
 	else:
 	  p[0] = [p[1]]
 
@@ -536,7 +722,7 @@ def _load(contents, contentPath, contentName, typeDirs):
 	parser = plyYacc.yacc()
 
 	ownPath = os.path.dirname(os.path.realpath(__file__))
-	primitivesPath = os.path.join(ownPath, "types")
+	primitivesPath = os.path.join(ownPath, "basetypes")
 	loaded, notLoaded = load_types(primitivesPath)
 
 	primitive_types = dict()
@@ -589,9 +775,9 @@ def load_file(filepath, **kwargs):
 
 	'''Loads a :class:`JsonBlueprint` from a file.
 
-	On success, the  returned instance is associated with the
-	absolute path of the argument file, and subsequent calls of this
-	function to the same file will be presented with the same instance,
+	On success, the returned instance is associated with the
+	absolute path of the argument file, and subsequent calls to this
+	function with the same file path will return the same cached instance,
 	unless :func:`invalidate_cache` is invoked.
 
 	Args:
@@ -651,7 +837,7 @@ def invalidate_cache():
 	'''Clears associations between files and existing JsonBlueprint instances.
 
 	This forces new :func:`load_file` invocations to effectively parse the files instead
-	of returning a cached result (Useful when your schema file changed and needs
+	of returning a cached result (useful when the schema file has changed and needs
 	to be refreshed).
 
 	'''

{jsonbp-1.2.2 → jsonbp-1.3.0}/jsonbp/types.py

@@ -17,6 +17,7 @@ class FieldType:
 	SIMPLE = 0
 	ENUM   = 1
 	OBJECT = 2
+	UNION  = 3
 
 
 class unquoted_str(str):

{jsonbp-1.2.2 → jsonbp-1.3.0/jsonbp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonbp
-Version: 1.2.2
+Version: 1.3.0
 Summary: Schema based JSON Parser/Serializer
 Author-email: Gustavo Venturini <gustavo.c.venturini@gmail.com>
 License-Expression: BSD-3-Clause
@@ -11,6 +11,7 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -27,7 +28,7 @@ to and from Python based on schemas. While [json-schema][json_schema] and its
 implementations offer a more mature and widely used technique, a different
 approach was desired, which led to the development of this library.
 
-jsonbp's design main goals were:
+jsonbp's main design goals were:
 - schema reuse through import / type system
 - custom user definable primitive types
 - built in numeric fixed precision type which deserializes into Python's Decimal

{jsonbp-1.2.2 → jsonbp-1.3.0}/jsonbp.egg-info/SOURCES.txt

@@ -16,21 +16,25 @@ jsonbp.egg-info/PKG-INFO
 jsonbp.egg-info/SOURCES.txt
 jsonbp.egg-info/dependency_links.txt
 jsonbp.egg-info/top_level.txt
+jsonbp/basetypes/__init__.py
+jsonbp/basetypes/bool.py
+jsonbp/basetypes/date.py
+jsonbp/basetypes/decimal.py
+jsonbp/basetypes/float.py
+jsonbp/basetypes/instant.py
+jsonbp/basetypes/integer.py
+jsonbp/basetypes/limits.py
+jsonbp/basetypes/string.py
 jsonbp/localization/__init__.py
+jsonbp/localization/de_DE.ini
 jsonbp/localization/en_US.ini
+jsonbp/localization/fr_FR.ini
 jsonbp/localization/pt_BR.ini
+jsonbp/localization/ru_RU.ini
+jsonbp/localization/zh_CN.ini
 jsonbp/ply/__init__.py
 jsonbp/ply/lex.py
 jsonbp/ply/yacc.py
-jsonbp/types/__init__.py
-jsonbp/types/bool.py
-jsonbp/types/date.py
-jsonbp/types/decimal.py
-jsonbp/types/float.py
-jsonbp/types/instant.py
-jsonbp/types/integer.py
-jsonbp/types/limits.py
-jsonbp/types/string.py
 tests/test_caching.py
 tests/test_choose_root.py
 tests/test_deserialization.py

{jsonbp-1.2.2 → jsonbp-1.3.0}/pyproject.toml

@@ -4,11 +4,16 @@ requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
-packages = ["jsonbp", "jsonbp.ply", "jsonbp.types", "jsonbp.localization"]
+packages = [
+  "jsonbp",
+  "jsonbp.basetypes",
+  "jsonbp.localization",
+  "jsonbp.ply"
+]
 
 [project]
 name = "jsonbp"
-version = "1.2.2"
+version = "1.3.0"
 description = "Schema based JSON Parser/Serializer"
 authors = [
 	{ name = "Gustavo Venturini", email = "gustavo.c.venturini@gmail.com" }
@@ -22,6 +27,7 @@ classifiers = [
 	"Intended Audience :: Developers",
 	"Operating System :: OS Independent",
 	"Programming Language :: Python :: 3 :: Only",
+  "Topic :: Software Development :: Libraries :: Python Modules"
 ]
 
 [project.urls]

{jsonbp-1.2.2 → jsonbp-1.3.0}/tests/test_deserialization.py

@@ -4,7 +4,7 @@ import os.path
 import sys
 
 from decimal import Decimal
-from datetime import datetime, timedelta, timezone
+from datetime import date, datetime, timedelta, timezone
 import pytest
 
 verificationDir = 'deserialization'