Codegen: add set to schema definitions

redsun82 · redsun82 · commit bba5d9dbd64c · 2023-03-29T15:44:06.000+02:00
diff --git a/misc/codegen/lib/schema.py b/misc/codegen/lib/schema.py
@@ -25,6 +25,7 @@ class Kind(Enum):
         OPTIONAL = auto()
         REPEATED_OPTIONAL = auto()
         PREDICATE = auto()
+        REPEATED_UNORDERED = auto()
 
     kind: Kind
     name: Optional[str] = None
@@ -44,7 +45,11 @@ def is_optional(self) -> bool:
 
     @property
     def is_repeated(self) -> bool:
-        return self.kind in (self.Kind.REPEATED, self.Kind.REPEATED_OPTIONAL)
+        return self.kind in (self.Kind.REPEATED, self.Kind.REPEATED_OPTIONAL, self.Kind.REPEATED_UNORDERED)
+
+    @property
+    def is_unordered(self) -> bool:
+        return self.kind == self.Kind.REPEATED_UNORDERED
 
     @property
     def is_predicate(self) -> bool:
@@ -65,6 +70,7 @@ def has_builtin_type(self) -> bool:
 RepeatedOptionalProperty = functools.partial(
     Property, Property.Kind.REPEATED_OPTIONAL)
 PredicateProperty = functools.partial(Property, Property.Kind.PREDICATE)
+RepeatedUnorderedProperty = functools.partial(Property, Property.Kind.REPEATED_UNORDERED)
 
 
 @dataclass
diff --git a/misc/codegen/lib/schemadefs.py b/misc/codegen/lib/schemadefs.py
@@ -77,7 +77,7 @@ def modify(self, prop: _schema.Property):
         K = _schema.Property.Kind
         if prop.kind != K.SINGLE:
             raise _schema.Error(
-                "Optional should only be applied to simple property types")
+                "optional should only be applied to simple property types")
         prop.kind = K.OPTIONAL
 
 
@@ -90,7 +90,14 @@ def modify(self, prop: _schema.Property):
             prop.kind = K.REPEATED_OPTIONAL
         else:
             raise _schema.Error(
-                "Repeated should only be applied to simple or optional property types")
+                "list should only be applied to simple or optional property types")
+
+class _Setifier(_schema.PropertyModifier):
+    def modify(self, prop: _schema.Property):
+        K = _schema.Property.Kind
+        if prop.kind != K.SINGLE:
+            raise _schema.Error("set should only be applied to simple property types")
+        prop.kind = K.REPEATED_UNORDERED
 
 
 class _TypeModifier:
@@ -122,6 +129,7 @@ def f(cls: type) -> type:
 predicate = _schema.predicate_marker
 optional = _TypeModifier(_Optionalizer())
 list = _TypeModifier(_Listifier())
+set = _TypeModifier(_Setifier())
 
 child = _ChildModifier()
 doc = _DocModifier
diff --git a/misc/codegen/schemadefs.py b/misc/codegen/schemadefs.py
diff --git a/misc/codegen/test/test_schemaloader.py b/misc/codegen/test/test_schemaloader.py
@@ -167,6 +167,7 @@ class A:
             three: defs.list[defs.boolean]
             four: defs.list[defs.optional[defs.string]]
             five: defs.predicate
+            six: defs.set[defs.string]
 
     assert data.classes == {
         'A': schema.Class('A', properties=[
@@ -175,6 +176,7 @@ class A:
             schema.RepeatedProperty('three', 'boolean'),
             schema.RepeatedOptionalProperty('four', 'string'),
             schema.PredicateProperty('five'),
+            schema.RepeatedUnorderedProperty('six', 'string'),
         ]),
     }
 
@@ -193,6 +195,7 @@ class B(A):
             two: defs.optional[A]
             three: defs.list[A]
             four: defs.list[defs.optional[A]]
+            five: defs.set[A]
 
     assert data.classes == {
         'A': schema.Class('A', derived={'B'}),
@@ -201,6 +204,7 @@ class B(A):
             schema.OptionalProperty('two', 'A'),
             schema.RepeatedProperty('three', 'A'),
             schema.RepeatedOptionalProperty('four', 'A'),
+            schema.RepeatedUnorderedProperty('five', 'A'),
         ]),
     }
 
@@ -213,13 +217,15 @@ class A:
             two: defs.optional["A"]
             three: defs.list["A"]
             four: defs.list[defs.optional["A"]]
+            five: defs.set["A"]
 
     assert data.classes == {
         'A': schema.Class('A', properties=[
             schema.SingleProperty('one', 'A'),
             schema.OptionalProperty('two', 'A'),
             schema.RepeatedProperty('three', 'A'),
             schema.RepeatedOptionalProperty('four', 'A'),
+            schema.RepeatedUnorderedProperty('five', 'A'),
         ]),
     }
 
