examples fix

Author: skarimo

.generator/src/generator/cli.py

@@ -47,7 +47,7 @@ def cli(specs, output):
     env.filters["upperfirst"] = utils.upperfirst
     env.filters["variable_name"] = formatter.variable_name
     env.filters["has_optional_parameter"] = openapi.has_optional_parameter
-    env.filters["is_additional_properties_container"] = openapi.is_additional_properties_container
+    env.filters["is_additional_properties_container"] = utils.is_additional_properties_container
 
     env.globals["enumerate"] = enumerate
     env.globals["responses_by_types"] = openapi.responses_by_types

.generator/src/generator/formatter.py

@@ -5,7 +5,7 @@
 
 import dateutil.parser
 
-from .utils import snake_case, camel_case, untitle_case, schema_name
+from .utils import snake_case, camel_case, untitle_case, schema_name, is_additional_properties_container
 
 PRIMITIVE_TYPES = ["string", "number", "boolean", "integer"]
 
@@ -362,7 +362,7 @@ def _format_oneof(schema, data, name, replace_values, imports, **kwargs):
     if not one_of_schema_name:
         one_of_schema_name = simple_type(one_of_schema, render_option=False).title()
 
-    if not is_primitive(one_of_schema) and one_of_schema.get("type") != "array":
+    if not is_primitive(one_of_schema) and one_of_schema.get("type") != "array" and not is_additional_properties_container(one_of_schema):
         # TODO: revisit possibility of removing all boxes
         parameters = f"Box::new({parameters})"
     if name:

.generator/src/generator/openapi.py

@@ -11,7 +11,7 @@
 from yaml import CSafeLoader
 
 from . import formatter
-from .utils import schema_name
+from .utils import schema_name, is_additional_properties_container
 
 
 def load(filename):
@@ -35,16 +35,6 @@ def option_wrapper(name, option, nullable):
     return name
 
 
-def is_additional_properties_container(schema):
-    if schema.get("type", "object") != "object":
-        return False
-    if "properties" in schema:
-        return False
-    if schema.get("additionalProperties", False) is False:
-        return False
-    return True
-
-
 def type_to_rust(schema, alternative_name=None, render_nullable=False, render_option=True, render_box=False, version=None):
     """Return Rust type name for the type."""
     # special case for additionalProperties: true

.generator/src/generator/utils.py

@@ -45,3 +45,13 @@ def schema_name(schema):
 def given_variables(context):
     """Return a list of variables using in given steps."""
     return {key for values in context.get("_given", {}).values() for key in values}
+
+
+def is_additional_properties_container(schema):
+    if schema.get("type", "object") != "object":
+        return False
+    if "properties" in schema:
+        return False
+    if schema.get("additionalProperties", False) is False:
+        return False
+    return True