shacl2code 0.0.18__tar.gz → 0.0.19__tar.gz

{shacl2code-0.0.18 → shacl2code-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shacl2code
-Version: 0.0.18
+Version: 0.0.19
 Summary: Convert SHACL model file to code bindings
 Project-URL: Homepage, https://github.com/JPEWdev/shacl2code
 Project-URL: Repository, https://github.com/JPEWdev/shacl2code.git

{shacl2code-0.0.18 → shacl2code-0.0.19}/src/shacl2code/lang/templates/golang/classes.go.j2

@@ -148,13 +148,17 @@ type {{ interface_name(class) }} interface {
     SHACLObject
 {%- endif %}
 {%- for prop in class.properties %}
-{%- if prop_is_list(prop) %}
-    {{ varname(prop.varname) }}() ListPropertyInterface[{{ prop_go_type(prop, classes) }}]
-{%- elif not prop.enum_values and prop.class_id %}
-    {{ varname(prop.varname) }}() RefPropertyInterface[{{ interface_name(classes.get(prop.class_id)) }}]
-{%- else %}
-    {{ varname(prop.varname) }}() PropertyInterface[{{ prop_go_type(prop, classes) }}]
-{%- endif %}
+    {{ varname(prop.varname) }}() {% if not prop.enum_values and prop.class_id -%}
+            Ref
+        {%- endif %}{% if prop_is_list(prop) -%}
+            List
+        {%- endif %}PropertyInterface[
+        {%- if not prop.enum_values and prop.class_id -%}
+            {{ interface_name(classes.get(prop.class_id)) }}
+        {%- else -%}
+            {{ prop_go_type(prop, classes) }}
+        {%- endif -%}
+        ]
 {%- endfor %}
 }
 
@@ -260,13 +264,19 @@ func (self *{{ struct_name(class) }}) Link(state *LinkState) error {
 }
 
 {% for prop in class.properties %}
-{%- if prop_is_list(prop) %}
-func (self *{{ struct_name(class) }}) {{ varname(prop.varname) }}() ListPropertyInterface[{{ prop_go_type(prop, classes) }}] { return &self.{{ prop_name(prop) }} }
-{%- elif not prop.enum_values and prop.class_id %}
-func (self *{{ struct_name(class) }}) {{ varname(prop.varname) }}() RefPropertyInterface[{{ interface_name(classes.get(prop.class_id)) }}] { return &self.{{ prop_name(prop) }} }
-{%- else %}
-func (self *{{ struct_name(class) }}) {{ varname(prop.varname) }}() PropertyInterface[{{ prop_go_type(prop, classes) }}] { return &self.{{ prop_name(prop) }} }
-{%- endif %}
+func (self *{{ struct_name(class) }}) {{ varname(prop.varname) }}() {% if not prop.enum_values and prop.class_id -%}
+            Ref
+        {%- endif %}{% if prop_is_list(prop) -%}
+            List
+        {%- endif %}PropertyInterface[
+        {%- if not prop.enum_values and prop.class_id -%}
+            {{ interface_name(classes.get(prop.class_id)) }}
+        {%- else -%}
+            {{ prop_go_type(prop, classes) }}
+        {%- endif -%}
+        ] {
+    return &self.{{ prop_name(prop) }}
+}
 {%- endfor %}
 
 func (self *{{ struct_name(class) }}) EncodeProperties(data map[string]interface{}, path Path, state *EncodeState) error {

{shacl2code-0.0.18 → shacl2code-0.0.19}/src/shacl2code/lang/templates/golang/reflistproperty.go.j2

@@ -8,6 +8,12 @@ vim: ft=go
 
 package {{ package }}
 
+type RefListPropertyInterface[T SHACLObject] interface {
+    ListPropertyInterface[Ref[T]]
+    AppendObj(obj T) error
+    AppendIRI(iri string) error
+}
+
 type RefListProperty[T SHACLObject] struct {
     ListProperty[Ref[T]]
 }
@@ -43,3 +49,14 @@ func (self *RefListProperty[T]) Link(state *LinkState) error {
     return nil
 }
 
+func (self *RefListProperty[T]) AppendObj(obj T) error {
+    // Shorthand to append an object by making a reference to it
+    return self.Append(MakeObjectRef(obj))
+}
+
+func (self *RefListProperty[T]) AppendIRI(iri string) error {
+    // Shorthand to append an IRI by making a reference to it
+    return self.Append(MakeIRIRef[T](iri))
+}
+
+

{shacl2code-0.0.18 → shacl2code-0.0.19}/src/shacl2code/lang/templates/golang/shaclobjectset.go.j2

@@ -11,6 +11,7 @@ package {{ package }}
 import (
     "encoding/json"
     "fmt"
+    "sort"
 )
 
 type SHACLObjectSet interface {
@@ -29,6 +30,46 @@ type SHACLObjectSetObject struct {
     missingIDs map[string]bool
 }
 
+
+type shaclObjectList struct {
+    v []SHACLObject
+    idx map[SHACLObject]int
+}
+
+func makeshaclObjectList(lst []SHACLObject) shaclObjectList {
+    idx := make(map[SHACLObject]int)
+    for i, o := range lst {
+        idx[o] = i
+    }
+
+    return shaclObjectList{lst, idx}
+}
+
+func (v shaclObjectList) Len() int {
+    return len(v.v)
+}
+
+func (v shaclObjectList) Swap(i, j int) {
+    v.v[i], v.v[j] = v.v[j], v.v[i]
+}
+
+func (v shaclObjectList) Less(i, j int) bool {
+    if v.v[i].ID().IsSet() {
+        if v.v[j].ID().IsSet() {
+            return v.v[i].ID().Get() < v.v[j].ID().Get()
+        } else {
+            return false;
+        }
+    } else {
+        if v.v[j].ID().IsSet() {
+            return true
+        } else {
+            // Neither has an ID. Preserve original insertion order
+            return v.idx[v.v[i]] < v.idx[v.v[j]]
+        }
+    }
+}
+
 func (self *SHACLObjectSetObject) Objects(yield func(SHACLObject) bool) {
     for _, o := range self.objects {
         if !yield(o) {
@@ -129,6 +170,7 @@ func (self *SHACLObjectSetObject) Encode(encoder *json.Encoder) error {
     }
 
     ref_counts := make(map[SHACLObject]int)
+    top_objects := make(map[SHACLObject]bool)
 
     // Count references
     self.Walk(func (path Path, v any) {
@@ -151,6 +193,7 @@ func (self *SHACLObjectSetObject) Encode(encoder *json.Encoder) error {
         ref_counts[o] = ref_counts[o] + 1
     })
 
+    // Assign blank nodes to objects that have more than one reference
     blank_count := 0
     for o, count := range ref_counts {
         if count <= 1 {
@@ -161,27 +204,41 @@ func (self *SHACLObjectSetObject) Encode(encoder *json.Encoder) error {
             continue
         }
 
-        o.ID().Set(fmt.Sprintf("_:%d", blank_count))
+
+        o.ID().Set(fmt.Sprintf("_:%s%d", o.GetType().GetCompactTypeIRI().GetDefault(""), blank_count))
         blank_count += 1
+        top_objects[o] = true
     }
 
-    if len(self.objects) == 1 {
-        err := self.objects[0].EncodeProperties(data, path, &state)
+    for _, o := range self.objects {
+        top_objects[o] = true
+    }
+
+    // Convert to a list and sort
+    top_list := []SHACLObject{}
+    for o, _ := range top_objects {
+        top_list = append(top_list, o)
+    }
+
+    sort.Sort(makeshaclObjectList(top_list))
+
+    if len(top_list) == 1 {
+        err := top_list[0].EncodeProperties(data, path, &state)
         if err != nil {
             return err
         }
-    } else if len(self.objects) > 1 {
+    } else if len(top_objects) > 1 {
         // All objects directly added to the object set should be written as
         // top level objects, so mark then as written until they are ready to
         // be serialized, which will force them to be referenced by IRI until
         // we are ready
-        for _, o := range self.objects {
+        for _, o := range top_list {
             state.Written[o] = true
         }
 
         graph_path := path.PushPath("@graph")
         lst := []interface{}{}
-        for idx, o := range self.objects {
+        for idx, o := range top_list {
             // Remove this object from the written set now so it gets serialized
             delete(state.Written, o)
 

shacl2code-0.0.19/src/shacl2code/version.py

@@ -0,0 +1 @@
+VERSION = "0.0.19"

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/cpp/context/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "test-context"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.0.18"
+PROJECT_NUMBER         = "0.0.1"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/cpp/context/Makefile

@@ -22,9 +22,9 @@ clean:
 install: libtest-context.so libtest-context.a docs
 	# Library
 	$(INSTALL) -d $(DESTDIR)/$(PREFIX)/lib
-	$(INSTALL) -m 0755 libtest-context.so $(DESTDIR)/$(PREFIX)/lib/libtest-context.so.0.0.18
-	ln -s libtest-context.so.0.0.18 $(DESTDIR)/$(PREFIX)/lib/libtest-context.so
-	ln -s libtest-context.so.0.0.18 $(DESTDIR)/$(PREFIX)/lib/libtest-context.so.0
+	$(INSTALL) -m 0755 libtest-context.so $(DESTDIR)/$(PREFIX)/lib/libtest-context.so.0.0.1
+	ln -s libtest-context.so.0.0.1 $(DESTDIR)/$(PREFIX)/lib/libtest-context.so
+	ln -s libtest-context.so.0.0.1 $(DESTDIR)/$(PREFIX)/lib/libtest-context.so.0
 
 	$(INSTALL) -m 0644 libtest-context.a $(DESTDIR)/$(PREFIX)/lib/
 

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/cpp/context/test-context-validate.cpp

@@ -106,7 +106,7 @@ int main(int argc, char* argv[]) {
         switch (opt) {
             case 'h':
                 std::cout << "Validate test-context" << std::endl
-                          << "Version 0.0.18" << std::endl
+                          << "Version 0.0.1" << std::endl
                           << std::endl;
                 showHelp(argv[0]);
                 return 0;
@@ -116,7 +116,7 @@ int main(int argc, char* argv[]) {
                 break;
 
             case 'V':
-                std::cout << "0.0.18" << std::endl;
+                std::cout << "0.0.1" << std::endl;
                 return 0;
 
             case '?':

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/cpp/context/test-context.pc

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
 
 Name: test-context
 Description: shacl2code generated binding test-context
-Version: 0.0.18
+Version: 0.0.1
 Cflags: -I${includedir} -DSHACL2CODE_TEST_CONTEXT_DLL
 Libs: -L${libdir} -ltest-context

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/cpp/nocontext/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "test"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.0.18"
+PROJECT_NUMBER         = "0.0.1"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/cpp/nocontext/Makefile

@@ -22,9 +22,9 @@ clean:
 install: libtest.so libtest.a docs
 	# Library
 	$(INSTALL) -d $(DESTDIR)/$(PREFIX)/lib
-	$(INSTALL) -m 0755 libtest.so $(DESTDIR)/$(PREFIX)/lib/libtest.so.0.0.18
-	ln -s libtest.so.0.0.18 $(DESTDIR)/$(PREFIX)/lib/libtest.so
-	ln -s libtest.so.0.0.18 $(DESTDIR)/$(PREFIX)/lib/libtest.so.0
+	$(INSTALL) -m 0755 libtest.so $(DESTDIR)/$(PREFIX)/lib/libtest.so.0.0.1
+	ln -s libtest.so.0.0.1 $(DESTDIR)/$(PREFIX)/lib/libtest.so
+	ln -s libtest.so.0.0.1 $(DESTDIR)/$(PREFIX)/lib/libtest.so.0
 
 	$(INSTALL) -m 0644 libtest.a $(DESTDIR)/$(PREFIX)/lib/
 

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/cpp/nocontext/test-validate.cpp

@@ -106,7 +106,7 @@ int main(int argc, char* argv[]) {
         switch (opt) {
             case 'h':
                 std::cout << "Validate test" << std::endl
-                          << "Version 0.0.18" << std::endl
+                          << "Version 0.0.1" << std::endl
                           << std::endl;
                 showHelp(argv[0]);
                 return 0;
@@ -116,7 +116,7 @@ int main(int argc, char* argv[]) {
                 break;
 
             case 'V':
-                std::cout << "0.0.18" << std::endl;
+                std::cout << "0.0.1" << std::endl;
                 return 0;
 
             case '?':

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/cpp/nocontext/test.pc

@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
 
 Name: test
 Description: shacl2code generated binding test
-Version: 0.0.18
+Version: 0.0.1
 Cflags: -I${includedir} -DSHACL2CODE_TEST_DLL
 Libs: -L${libdir} -ltest

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/golang/context/test-context/classes.go

@@ -927,7 +927,7 @@ func ConstructLinkClassObject(o *LinkClassObject, typ SHACLType) *LinkClassObjec
 type LinkClass interface {
     SHACLObject
     LinkClassExtensible() RefPropertyInterface[ExtensibleClass]
-    LinkClassLinkListProp() ListPropertyInterface[Ref[LinkClass]]
+    LinkClassLinkListProp() RefListPropertyInterface[LinkClass]
     LinkClassLinkProp() RefPropertyInterface[LinkClass]
     LinkClassLinkPropNoClass() RefPropertyInterface[LinkClass]
     LinkClassTag() PropertyInterface[string]
@@ -1013,11 +1013,21 @@ func (self *LinkClassObject) Link(state *LinkState) error {
 }
 
 
-func (self *LinkClassObject) LinkClassExtensible() RefPropertyInterface[ExtensibleClass] { return &self.linkClassExtensible }
-func (self *LinkClassObject) LinkClassLinkListProp() ListPropertyInterface[Ref[LinkClass]] { return &self.linkClassLinkListProp }
-func (self *LinkClassObject) LinkClassLinkProp() RefPropertyInterface[LinkClass] { return &self.linkClassLinkProp }
-func (self *LinkClassObject) LinkClassLinkPropNoClass() RefPropertyInterface[LinkClass] { return &self.linkClassLinkPropNoClass }
-func (self *LinkClassObject) LinkClassTag() PropertyInterface[string] { return &self.linkClassTag }
+func (self *LinkClassObject) LinkClassExtensible() RefPropertyInterface[ExtensibleClass] {
+    return &self.linkClassExtensible
+}
+func (self *LinkClassObject) LinkClassLinkListProp() RefListPropertyInterface[LinkClass] {
+    return &self.linkClassLinkListProp
+}
+func (self *LinkClassObject) LinkClassLinkProp() RefPropertyInterface[LinkClass] {
+    return &self.linkClassLinkProp
+}
+func (self *LinkClassObject) LinkClassLinkPropNoClass() RefPropertyInterface[LinkClass] {
+    return &self.linkClassLinkPropNoClass
+}
+func (self *LinkClassObject) LinkClassTag() PropertyInterface[string] {
+    return &self.linkClassTag
+}
 
 func (self *LinkClassObject) EncodeProperties(data map[string]interface{}, path Path, state *EncodeState) error {
     if err := self.SHACLObjectBase.EncodeProperties(data, path, state); err != nil {
@@ -1655,7 +1665,9 @@ func (self *RequiredAbstractObject) Link(state *LinkState) error {
 }
 
 
-func (self *RequiredAbstractObject) RequiredAbstractAbstractClassProp() RefPropertyInterface[AbstractClass] { return &self.requiredAbstractAbstractClassProp }
+func (self *RequiredAbstractObject) RequiredAbstractAbstractClassProp() RefPropertyInterface[AbstractClass] {
+    return &self.requiredAbstractAbstractClassProp
+}
 
 func (self *RequiredAbstractObject) EncodeProperties(data map[string]interface{}, path Path, state *EncodeState) error {
     if err := self.SHACLObjectBase.EncodeProperties(data, path, state); err != nil {
@@ -2311,7 +2323,7 @@ type TestClass interface {
     Import() PropertyInterface[string]
     TestClassAnyuriProp() PropertyInterface[string]
     TestClassBooleanProp() PropertyInterface[bool]
-    TestClassClassListProp() ListPropertyInterface[Ref[TestClass]]
+    TestClassClassListProp() RefListPropertyInterface[TestClass]
     TestClassClassProp() RefPropertyInterface[TestClass]
     TestClassClassPropNoClass() RefPropertyInterface[TestClass]
     TestClassDatetimeListProp() ListPropertyInterface[time.Time]
@@ -2625,32 +2637,84 @@ func (self *TestClassObject) Link(state *LinkState) error {
 }
 
 
-func (self *TestClassObject) Encode() PropertyInterface[string] { return &self.encode }
-func (self *TestClassObject) Import() PropertyInterface[string] { return &self.import_ }
-func (self *TestClassObject) TestClassAnyuriProp() PropertyInterface[string] { return &self.testClassAnyuriProp }
-func (self *TestClassObject) TestClassBooleanProp() PropertyInterface[bool] { return &self.testClassBooleanProp }
-func (self *TestClassObject) TestClassClassListProp() ListPropertyInterface[Ref[TestClass]] { return &self.testClassClassListProp }
-func (self *TestClassObject) TestClassClassProp() RefPropertyInterface[TestClass] { return &self.testClassClassProp }
-func (self *TestClassObject) TestClassClassPropNoClass() RefPropertyInterface[TestClass] { return &self.testClassClassPropNoClass }
-func (self *TestClassObject) TestClassDatetimeListProp() ListPropertyInterface[time.Time] { return &self.testClassDatetimeListProp }
-func (self *TestClassObject) TestClassDatetimeScalarProp() PropertyInterface[time.Time] { return &self.testClassDatetimeScalarProp }
-func (self *TestClassObject) TestClassDatetimestampScalarProp() PropertyInterface[time.Time] { return &self.testClassDatetimestampScalarProp }
-func (self *TestClassObject) TestClassEnumListProp() ListPropertyInterface[string] { return &self.testClassEnumListProp }
-func (self *TestClassObject) TestClassEnumProp() PropertyInterface[string] { return &self.testClassEnumProp }
-func (self *TestClassObject) TestClassEnumPropNoClass() PropertyInterface[string] { return &self.testClassEnumPropNoClass }
-func (self *TestClassObject) TestClassFloatProp() PropertyInterface[float64] { return &self.testClassFloatProp }
-func (self *TestClassObject) TestClassIntegerProp() PropertyInterface[int] { return &self.testClassIntegerProp }
-func (self *TestClassObject) NamedProperty() PropertyInterface[string] { return &self.namedProperty }
-func (self *TestClassObject) TestClassNonShape() RefPropertyInterface[NonShapeClass] { return &self.testClassNonShape }
-func (self *TestClassObject) TestClassNonnegativeIntegerProp() PropertyInterface[int] { return &self.testClassNonnegativeIntegerProp }
-func (self *TestClassObject) TestClassPositiveIntegerProp() PropertyInterface[int] { return &self.testClassPositiveIntegerProp }
-func (self *TestClassObject) TestClassRegex() PropertyInterface[string] { return &self.testClassRegex }
-func (self *TestClassObject) TestClassRegexDatetime() PropertyInterface[time.Time] { return &self.testClassRegexDatetime }
-func (self *TestClassObject) TestClassRegexDatetimestamp() PropertyInterface[time.Time] { return &self.testClassRegexDatetimestamp }
-func (self *TestClassObject) TestClassRegexList() ListPropertyInterface[string] { return &self.testClassRegexList }
-func (self *TestClassObject) TestClassStringListNoDatatype() ListPropertyInterface[string] { return &self.testClassStringListNoDatatype }
-func (self *TestClassObject) TestClassStringListProp() ListPropertyInterface[string] { return &self.testClassStringListProp }
-func (self *TestClassObject) TestClassStringScalarProp() PropertyInterface[string] { return &self.testClassStringScalarProp }
+func (self *TestClassObject) Encode() PropertyInterface[string] {
+    return &self.encode
+}
+func (self *TestClassObject) Import() PropertyInterface[string] {
+    return &self.import_
+}
+func (self *TestClassObject) TestClassAnyuriProp() PropertyInterface[string] {
+    return &self.testClassAnyuriProp
+}
+func (self *TestClassObject) TestClassBooleanProp() PropertyInterface[bool] {
+    return &self.testClassBooleanProp
+}
+func (self *TestClassObject) TestClassClassListProp() RefListPropertyInterface[TestClass] {
+    return &self.testClassClassListProp
+}
+func (self *TestClassObject) TestClassClassProp() RefPropertyInterface[TestClass] {
+    return &self.testClassClassProp
+}
+func (self *TestClassObject) TestClassClassPropNoClass() RefPropertyInterface[TestClass] {
+    return &self.testClassClassPropNoClass
+}
+func (self *TestClassObject) TestClassDatetimeListProp() ListPropertyInterface[time.Time] {
+    return &self.testClassDatetimeListProp
+}
+func (self *TestClassObject) TestClassDatetimeScalarProp() PropertyInterface[time.Time] {
+    return &self.testClassDatetimeScalarProp
+}
+func (self *TestClassObject) TestClassDatetimestampScalarProp() PropertyInterface[time.Time] {
+    return &self.testClassDatetimestampScalarProp
+}
+func (self *TestClassObject) TestClassEnumListProp() ListPropertyInterface[string] {
+    return &self.testClassEnumListProp
+}
+func (self *TestClassObject) TestClassEnumProp() PropertyInterface[string] {
+    return &self.testClassEnumProp
+}
+func (self *TestClassObject) TestClassEnumPropNoClass() PropertyInterface[string] {
+    return &self.testClassEnumPropNoClass
+}
+func (self *TestClassObject) TestClassFloatProp() PropertyInterface[float64] {
+    return &self.testClassFloatProp
+}
+func (self *TestClassObject) TestClassIntegerProp() PropertyInterface[int] {
+    return &self.testClassIntegerProp
+}
+func (self *TestClassObject) NamedProperty() PropertyInterface[string] {
+    return &self.namedProperty
+}
+func (self *TestClassObject) TestClassNonShape() RefPropertyInterface[NonShapeClass] {
+    return &self.testClassNonShape
+}
+func (self *TestClassObject) TestClassNonnegativeIntegerProp() PropertyInterface[int] {
+    return &self.testClassNonnegativeIntegerProp
+}
+func (self *TestClassObject) TestClassPositiveIntegerProp() PropertyInterface[int] {
+    return &self.testClassPositiveIntegerProp
+}
+func (self *TestClassObject) TestClassRegex() PropertyInterface[string] {
+    return &self.testClassRegex
+}
+func (self *TestClassObject) TestClassRegexDatetime() PropertyInterface[time.Time] {
+    return &self.testClassRegexDatetime
+}
+func (self *TestClassObject) TestClassRegexDatetimestamp() PropertyInterface[time.Time] {
+    return &self.testClassRegexDatetimestamp
+}
+func (self *TestClassObject) TestClassRegexList() ListPropertyInterface[string] {
+    return &self.testClassRegexList
+}
+func (self *TestClassObject) TestClassStringListNoDatatype() ListPropertyInterface[string] {
+    return &self.testClassStringListNoDatatype
+}
+func (self *TestClassObject) TestClassStringListProp() ListPropertyInterface[string] {
+    return &self.testClassStringListProp
+}
+func (self *TestClassObject) TestClassStringScalarProp() PropertyInterface[string] {
+    return &self.testClassStringScalarProp
+}
 
 func (self *TestClassObject) EncodeProperties(data map[string]interface{}, path Path, state *EncodeState) error {
     if err := self.ParentClassObject.EncodeProperties(data, path, state); err != nil {
@@ -2994,8 +3058,12 @@ func (self *TestClassRequiredObject) Link(state *LinkState) error {
 }
 
 
-func (self *TestClassRequiredObject) TestClassRequiredStringListProp() ListPropertyInterface[string] { return &self.testClassRequiredStringListProp }
-func (self *TestClassRequiredObject) TestClassRequiredStringScalarProp() PropertyInterface[string] { return &self.testClassRequiredStringScalarProp }
+func (self *TestClassRequiredObject) TestClassRequiredStringListProp() ListPropertyInterface[string] {
+    return &self.testClassRequiredStringListProp
+}
+func (self *TestClassRequiredObject) TestClassRequiredStringScalarProp() PropertyInterface[string] {
+    return &self.testClassRequiredStringScalarProp
+}
 
 func (self *TestClassRequiredObject) EncodeProperties(data map[string]interface{}, path Path, state *EncodeState) error {
     if err := self.TestClassObject.EncodeProperties(data, path, state); err != nil {
@@ -3120,7 +3188,9 @@ func (self *TestDerivedClassObject) Link(state *LinkState) error {
 }
 
 
-func (self *TestDerivedClassObject) TestDerivedClassStringProp() PropertyInterface[string] { return &self.testDerivedClassStringProp }
+func (self *TestDerivedClassObject) TestDerivedClassStringProp() PropertyInterface[string] {
+    return &self.testDerivedClassStringProp
+}
 
 func (self *TestDerivedClassObject) EncodeProperties(data map[string]interface{}, path Path, state *EncodeState) error {
     if err := self.TestClassObject.EncodeProperties(data, path, state); err != nil {
@@ -3244,7 +3314,9 @@ func (self *UsesExtensibleAbstractClassObject) Link(state *LinkState) error {
 }
 
 
-func (self *UsesExtensibleAbstractClassObject) UsesExtensibleAbstractClassProp() RefPropertyInterface[ExtensibleAbstractClass] { return &self.usesExtensibleAbstractClassProp }
+func (self *UsesExtensibleAbstractClassObject) UsesExtensibleAbstractClassProp() RefPropertyInterface[ExtensibleAbstractClass] {
+    return &self.usesExtensibleAbstractClassProp
+}
 
 func (self *UsesExtensibleAbstractClassObject) EncodeProperties(data map[string]interface{}, path Path, state *EncodeState) error {
     if err := self.SHACLObjectBase.EncodeProperties(data, path, state); err != nil {
@@ -3560,8 +3632,12 @@ func (self *ExtensibleClassObject) Link(state *LinkState) error {
 }
 
 
-func (self *ExtensibleClassObject) ExtensibleClassProperty() PropertyInterface[string] { return &self.extensibleClassProperty }
-func (self *ExtensibleClassObject) ExtensibleClassRequired() PropertyInterface[string] { return &self.extensibleClassRequired }
+func (self *ExtensibleClassObject) ExtensibleClassProperty() PropertyInterface[string] {
+    return &self.extensibleClassProperty
+}
+func (self *ExtensibleClassObject) ExtensibleClassRequired() PropertyInterface[string] {
+    return &self.extensibleClassRequired
+}
 
 func (self *ExtensibleClassObject) EncodeProperties(data map[string]interface{}, path Path, state *EncodeState) error {
     if err := self.LinkClassObject.EncodeProperties(data, path, state); err != nil {

{shacl2code-0.0.18 → shacl2code-0.0.19}/tests/expect/golang/context/test-context/reflistproperty.go

@@ -6,6 +6,12 @@
 
 package model
 
+type RefListPropertyInterface[T SHACLObject] interface {
+    ListPropertyInterface[Ref[T]]
+    AppendObj(obj T) error
+    AppendIRI(iri string) error
+}
+
 type RefListProperty[T SHACLObject] struct {
     ListProperty[Ref[T]]
 }
@@ -40,3 +46,14 @@ func (self *RefListProperty[T]) Link(state *LinkState) error {
     }
     return nil
 }
+
+func (self *RefListProperty[T]) AppendObj(obj T) error {
+    // Shorthand to append an object by making a reference to it
+    return self.Append(MakeObjectRef(obj))
+}
+
+func (self *RefListProperty[T]) AppendIRI(iri string) error {
+    // Shorthand to append an IRI by making a reference to it
+    return self.Append(MakeIRIRef[T](iri))
+}
+