🐛 Fix normalization of allof; add tests.

Author: rafalkrupinski

src/lapidary_render/model/metamodel.py

@@ -133,7 +133,7 @@ def normalize_model(self) -> MetaModel | None:
         for schema in self.all_of or ():
             if model is None:
                 return None
-            model &= schema
+            model &= schema.normalize_model()
 
         assert model is not None
         model.all_of = None
@@ -197,7 +197,6 @@ def intersect(self, other: MetaModel | bool, stack: Stack) -> MetaModel | None:
         model = dc.replace(self, stack=stack)
 
         model.type_ = not_none_or(self.type_, other.type_, operator.and_)
-
         model.enum = not_none_or(self.enum, other.enum, operator.and_)
         model.gt = not_none_or(self.gt, other.gt, max)
         model.ge = not_none_or(self.ge, other.ge, max)
@@ -236,7 +235,7 @@ def intersect(self, other: MetaModel | bool, stack: Stack) -> MetaModel | None:
         model.items = not_none_or(self.items, other.items, operator.and_)
 
         for field in ('all_of', 'any_of', 'one_of'):
-            merge(model, other, field, operator.and_)
+            merge(model, other, field, operator.add)
 
         # not_: MetaModel | None = None
 

tests/process/test_normalize.py

@@ -4,6 +4,66 @@
 from lapidary_render.model.stack import Stack
 
 
+def test_normalize_allof_type_intersection():
+    # docs/json-schema.md#allof-and-type — allOf applies set intersection to type
+    schema = MetaModel(
+        stack=Stack.from_str('#/components/schemas/obj'),
+        all_of=[
+            MetaModel(
+                stack=Stack.from_str('#/components/schemas/obj/allOf/0'),
+                type_={DataType.INTEGER, DataType.STRING},
+            ),
+            MetaModel(
+                stack=Stack.from_str('#/components/schemas/obj/allOf/1'),
+                type_={DataType.INTEGER, DataType.BOOLEAN},
+            ),
+        ],
+    )
+
+    result = schema.normalize_model()
+
+    assert result == MetaModel(
+        stack=Stack.from_str('#/components/schemas/obj'),
+        type_={DataType.INTEGER},
+    )
+
+
+def test_normalize_nested_allof():
+    # docs/json-schema.md#nested-allof — nested allOf is flattened into a single allOf
+    root = Stack.from_str('#/components/schemas/obj')
+    schema = MetaModel(
+        stack=root,
+        all_of=[
+            MetaModel(
+                stack=root.push('allOf/0'),
+                all_of=[
+                    MetaModel(
+                        stack=root.push('allOf/0'),
+                        type_={DataType.INTEGER},
+                    ),
+                    MetaModel(
+                        stack=root.push('allOf/1'),
+                        ge=10.0,
+                    ),
+                ],
+            ),
+            MetaModel(
+                stack=root.push('allOf/1'),
+                multiple_of=2,
+            ),
+        ],
+    )
+
+    result = schema.normalize_model()
+
+    assert result == MetaModel(
+        stack=Stack.from_str('#/components/schemas/obj'),
+        type_={DataType.INTEGER},
+        ge=10.0,
+        multiple_of=2,
+    )
+
+
 def test_normalize_allof_scalar_constraints():
     # docs/json-schema.md#allof-and-scalar-constraints — most restrictive value wins: max for ge/gt, min for le/lt
     schema = MetaModel(