Fix merged result in parse_item not passed back to parse_object_fields (#2997)

koxudaxi · web-flow · commit f3ef9c619a01 · 2026-02-15T00:49:03.000+09:00
* Fix merged result in parse_item not passed back to parse_object_fields (#2995) * Simplify docstring in test_ref_merge_field_metadata
diff --git a/src/datamodel_code_generator/parser/jsonschema.py b/src/datamodel_code_generator/parser/jsonschema.py
@@ -2745,6 +2745,9 @@ def parse_object_fields(
                 )
                 continue
 
+            if field.has_ref_with_schema_keywords and not field.is_ref_with_nullable_only:
+                field = self._merge_ref_with_schema(field)  # noqa: PLW2901
+
             field_type = self.parse_item(modular_name, field, [*path, field_name])
 
             effective_default, effective_has_default = self.model_resolver.resolve_default_value(
@@ -2814,18 +2817,21 @@ def parse_object(
         if fields or not isinstance(obj.additionalProperties, JsonSchemaObject):
             data_model_type_class = self.data_model_type
         else:
+            additional_props = obj.additionalProperties
+            if additional_props.has_ref_with_schema_keywords and not additional_props.is_ref_with_nullable_only:
+                additional_props = self._merge_ref_with_schema(additional_props)
             fields.append(
                 self.get_object_field(
                     field_name=None,
-                    field=obj.additionalProperties,
+                    field=additional_props,
                     required=True,
                     original_field_name=None,
                     field_type=self.data_type(
                         data_types=[
                             self.parse_item(
                                 # TODO: Improve naming for nested ClassName
                                 name,
-                                obj.additionalProperties,
+                                additional_props,
                                 [*path, "additionalProperties"],
                             )
                         ],
diff --git a/src/datamodel_code_generator/parser/openapi.py b/src/datamodel_code_generator/parser/openapi.py
@@ -508,7 +508,7 @@ def _get_model_name(cls, path_name: str, method: str, suffix: str) -> str:
         camel_path_name = snake_to_upper_camel(normalized)
         return f"{camel_path_name}{method.capitalize()}{suffix}"
 
-    def parse_all_parameters(  # noqa: PLR0912, PLR0914
+    def parse_all_parameters(  # noqa: PLR0912, PLR0914, PLR0915
         self,
         name: str,
         parameters: list[ReferenceObject | ParameterObject],
@@ -541,10 +541,13 @@ def parse_all_parameters(  # noqa: PLR0912, PLR0914
                 class_name=name,
             )
             if parameter.schema_:
+                param_schema = parameter.schema_
+                if param_schema.has_ref_with_schema_keywords and not param_schema.is_ref_with_nullable_only:
+                    param_schema = self._merge_ref_with_schema(param_schema)
                 effective_default, effective_has_default = self.model_resolver.resolve_default_value(
                     parameter_name,
-                    parameter.schema_.default,
-                    parameter.schema_.has_default,
+                    param_schema.default,
+                    param_schema.has_default,
                     class_name=reference.name,
                 )
                 effective_required = parameter.required
@@ -553,8 +556,8 @@ def parse_all_parameters(  # noqa: PLR0912, PLR0914
                 fields.append(
                     self.get_object_field(
                         field_name=field_name,
-                        field=parameter.schema_,
-                        field_type=self.parse_item(field_name, parameter.schema_, [*path, name, parameter_name]),
+                        field=param_schema,
+                        field_type=self.parse_item(field_name, param_schema, [*path, name, parameter_name]),
                         original_field_name=parameter_name,
                         required=effective_required,
                         alias=alias,
diff --git a/tests/data/expected/main/jsonschema/ids/ContactPoint.py b/tests/data/expected/main/jsonschema/ids/ContactPoint.py
@@ -6,15 +6,15 @@
 
 from enum import Enum
 
-from pydantic import BaseModel, EmailStr
+from pydantic import BaseModel, EmailStr, Field
 
 
 class Type(Enum):
     ContactPoint = 'ContactPoint'
 
 
 class Schema(BaseModel):
-    type: Type
+    type: Type = Field(..., description='Type of this object.', title='type')
     contactType: str | None = None
     email: EmailStr
     telephone: str | None = None
diff --git a/tests/data/expected/main/jsonschema/ids/__init__.py b/tests/data/expected/main/jsonschema/ids/__init__.py
@@ -6,7 +6,7 @@
 
 from enum import Enum
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from . import URI, ContactPoint
 from . import id as id_1
@@ -20,7 +20,7 @@ class Type(Enum):
 
 class Organization(BaseModel):
     id: id_1.Schema | None = None
-    type: Type
+    type: Type = Field(..., description='Type of this object.', title='type')
     name: name_1.Schema
     contactPoint: ContactPoint.Schema | None = None
     sameAs: sameAs_1.Schema | None = None
diff --git a/tests/data/expected/main/jsonschema/ref_merge_additional_properties.py b/tests/data/expected/main/jsonschema/ref_merge_additional_properties.py
@@ -0,0 +1,21 @@
+# generated by datamodel-codegen:
+#   filename:  ref_merge_additional_properties.json
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from typing import Annotated, Literal
+
+from pydantic import BaseModel, Field, RootModel
+
+
+class ConstrainedString(RootModel[str]):
+    root: Annotated[str, Field(max_length=100, min_length=1)]
+
+
+class DictModel(RootModel[Literal['fixed']]):
+    root: Annotated[Literal['fixed'], Field(max_length=100, min_length=1)]
+
+
+class Model(BaseModel):
+    data: DictModel | None = None
diff --git a/tests/data/expected/main/jsonschema/ref_merge_field_metadata.py b/tests/data/expected/main/jsonschema/ref_merge_field_metadata.py
@@ -0,0 +1,40 @@
+# generated by datamodel-codegen:
+#   filename:  ref_merge_field_metadata.json
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from typing import Annotated, Literal
+
+from pydantic import BaseModel, Field, RootModel
+
+
+class Model(BaseModel):
+    readonly_via_ref: Annotated[Literal['fixed_readonly'], Field(frozen=True)]
+    readonly_direct: Annotated[Literal['fixed_readonly'], Field(frozen=True)]
+    constrained_via_ref: Annotated[
+        Literal['constrained_value'], Field(max_length=100, min_length=1)
+    ]
+    constrained_direct: Annotated[
+        Literal['constrained_value'], Field(max_length=100, min_length=1)
+    ]
+    default_via_ref: Literal['default_value'] = 'default_value'
+    default_direct: Literal['default_value'] = 'default_value'
+    nullable_via_ref: Literal['nullable_value']
+    nullable_direct: Literal['nullable_value']
+
+
+class ReadOnlyString(RootModel[str]):
+    root: str
+
+
+class ConstrainedString(RootModel[str]):
+    root: Annotated[str, Field(max_length=100, min_length=1)]
+
+
+class DefaultString(RootModel[str]):
+    root: str = 'default_value'
+
+
+class NullableString(RootModel[str | None]):
+    root: str | None = None
diff --git a/tests/data/expected/main/openapi/ref_merge_parameters.py b/tests/data/expected/main/openapi/ref_merge_parameters.py
@@ -0,0 +1,17 @@
+# generated by datamodel-codegen:
+#   filename:  ref_merge_parameters.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from typing import Annotated, Literal
+
+from pydantic import BaseModel, Field, RootModel
+
+
+class StatusString(RootModel[str]):
+    root: str
+
+
+class ItemsGetParametersQuery(BaseModel):
+    status: Annotated[Literal['active'], Field(frozen=True)]
diff --git a/tests/data/jsonschema/ref_merge_additional_properties.json b/tests/data/jsonschema/ref_merge_additional_properties.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "ConstrainedString": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 100
+    },
+    "DictModel": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/definitions/ConstrainedString",
+        "const": "fixed"
+      }
+    }
+  },
+  "type": "object",
+  "properties": {
+    "data": {
+      "$ref": "#/definitions/DictModel"
+    }
+  }
+}
diff --git a/tests/data/jsonschema/ref_merge_field_metadata.json b/tests/data/jsonschema/ref_merge_field_metadata.json
@@ -0,0 +1,70 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "ReadOnlyString": {
+      "type": "string",
+      "readOnly": true
+    },
+    "ConstrainedString": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 100
+    },
+    "DefaultString": {
+      "type": "string",
+      "default": "default_value"
+    },
+    "NullableString": {
+      "type": "string",
+      "nullable": true
+    }
+  },
+  "type": "object",
+  "properties": {
+    "readonly_via_ref": {
+      "$ref": "#/definitions/ReadOnlyString",
+      "const": "fixed_readonly"
+    },
+    "readonly_direct": {
+      "type": "string",
+      "readOnly": true,
+      "const": "fixed_readonly"
+    },
+    "constrained_via_ref": {
+      "$ref": "#/definitions/ConstrainedString",
+      "const": "constrained_value"
+    },
+    "constrained_direct": {
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 100,
+      "const": "constrained_value"
+    },
+    "default_via_ref": {
+      "$ref": "#/definitions/DefaultString",
+      "const": "default_value"
+    },
+    "default_direct": {
+      "type": "string",
+      "default": "default_value",
+      "const": "default_value"
+    },
+    "nullable_via_ref": {
+      "$ref": "#/definitions/NullableString",
+      "const": "nullable_value"
+    },
+    "nullable_direct": {
+      "type": "string",
+      "nullable": true,
+      "const": "nullable_value"
+    }
+  },
+  "required": [
+    "readonly_via_ref",
+    "readonly_direct",
+    "constrained_via_ref",
+    "constrained_direct",
+    "nullable_via_ref",
+    "nullable_direct"
+  ]
+}
diff --git a/tests/data/openapi/ref_merge_parameters.yaml b/tests/data/openapi/ref_merge_parameters.yaml
@@ -0,0 +1,23 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Test
+paths:
+  /items:
+    get:
+      operationId: getItems
+      parameters:
+        - name: status
+          in: query
+          required: true
+          schema:
+            $ref: "#/components/schemas/StatusString"
+            const: "active"
+      responses:
+        '200':
+          description: OK
+components:
+  schemas:
+    StatusString:
+      type: string
+      readOnly: true
diff --git a/tests/main/jsonschema/test_main_jsonschema.py b/tests/main/jsonschema/test_main_jsonschema.py
@@ -8612,3 +8612,38 @@ def test_ref_with_const(output_file: Path) -> None:
         expected_file="ref_with_const.py",
         extra_args=["--output-model-type", "pydantic_v2.BaseModel", "--strict-nullable"],
     )
+
+
+def test_ref_merge_field_metadata(output_file: Path) -> None:
+    """Test $ref + const merges ref metadata."""
+    run_main_and_assert(
+        input_path=JSON_SCHEMA_DATA_PATH / "ref_merge_field_metadata.json",
+        output_path=output_file,
+        input_file_type="jsonschema",
+        assert_func=assert_file_content,
+        expected_file="ref_merge_field_metadata.py",
+        extra_args=[
+            "--output-model-type",
+            "pydantic_v2.BaseModel",
+            "--use-frozen-field",
+            "--field-constraints",
+            "--use-annotated",
+            "--strict-nullable",
+        ],
+    )
+
+
+def test_ref_merge_additional_properties(output_file: Path) -> None:
+    """Test $ref + const merge in additionalProperties root model path."""
+    run_main_and_assert(
+        input_path=JSON_SCHEMA_DATA_PATH / "ref_merge_additional_properties.json",
+        output_path=output_file,
+        input_file_type="jsonschema",
+        assert_func=assert_file_content,
+        extra_args=[
+            "--output-model-type",
+            "pydantic_v2.BaseModel",
+            "--field-constraints",
+            "--use-annotated",
+        ],
+    )
diff --git a/tests/main/openapi/test_main_openapi.py b/tests/main/openapi/test_main_openapi.py
@@ -5079,3 +5079,23 @@ def test_main_openapi_allof_array_ref_no_duplicate_model(output_file: Path) -> N
             "--use-schema-description",
         ],
     )
+
+
+def test_ref_merge_parameters(output_file: Path) -> None:
+    """Test $ref + const merge in OpenAPI parse_all_parameters path."""
+    run_main_and_assert(
+        input_path=OPEN_API_DATA_PATH / "ref_merge_parameters.yaml",
+        output_path=output_file,
+        input_file_type="openapi",
+        assert_func=assert_file_content,
+        extra_args=[
+            "--output-model-type",
+            "pydantic_v2.BaseModel",
+            "--use-frozen-field",
+            "--use-annotated",
+            "--openapi-scopes",
+            "paths",
+            "schemas",
+            "parameters",
+        ],
+    )
