shacl2code 0.0.11__tar.gz → 0.0.12__tar.gz

{shacl2code-0.0.11 → shacl2code-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: shacl2code
-Version: 0.0.11
+Version: 0.0.12
 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.11 → shacl2code-0.0.12}/src/shacl2code/lang/templates/jsonschema.j2

@@ -59,7 +59,7 @@
         {#- Classes are divided into 2 parts. The properties are separated into a separate object #}
         {#- so that a object can references the properties of its parent without needing the const #}
         {#- @type tag #}
-        {%- if not class.is_abstract %}
+        {%- if not class.is_abstract or class.is_extensible %}
         "{{ varname(*class.clsname) }}": {
             "allOf": [
                 {
@@ -70,12 +70,20 @@
                     "properties": {
                         "{{ class.id_property or "@id" }}": { "$ref": "#/$defs/{{ class.node_kind.split("#")[-1] }}" },
                         "{{ context.compact("@type") }}": {
+                        {#- Abstract Extensible classes are weird; any type _except_ the specific class type is allowed #}
+                        {%- if class.is_abstract and class.is_extensible %}
+                            "allOf":  [
+                                { "$ref": "#/$defs/IRI" },
+                                { "not": { "const": "{{ context.compact_vocab(class._id) }}" } }
+                            ]
+                        {%- else %}
                             "oneOf": [
                                 {%- if class.is_extensible %}
                                 { "$ref": "#/$defs/IRI" },
                                 {%- endif %}
                                 { "const": "{{ context.compact_vocab(class._id) }}" }
                             ]
+                        {%- endif %}
                         }
                     }{%- if class.node_kind == SH.IRI %},
                     "required": ["{{ class.id_property or "@id" }}"]
@@ -86,9 +94,14 @@
         },
         {%- endif %}
         "{{ varname(*class.clsname) }}_derived": {
-            {%- set ns = namespace(external_ref=False, local_ref=False, any_ref=False, json_refs=[]) %}
+            {%- set ns = namespace(json_refs=[], named_individuals=[]) %}
             {%- for d in get_all_derived(class) + [class._id] %}
                 {%- set ns.json_refs = ns.json_refs + ["#/$defs/" + varname(*classes.get(d).clsname)] %}
+                {%- for n in classes.get(d).named_individuals %}
+                    {%- if context.compact(n._id) != n._id %}
+                        {%- set ns.named_individuals = ns.named_individuals + [context.compact(n._id)] %}
+                    {%- endif %}
+                {%- endfor %}
             {%- endfor %}
             "anyOf": [
                 {%- if ns.json_refs %}
@@ -104,6 +117,9 @@
                     ]
                 },
                 {%- endif %}
+                {%- for n in ns.named_individuals %}
+                { "const": "{{ n }}" },
+                {%- endfor %}
                 { "$ref": "#/$defs/BlankNodeOrIRI" }
             ]
         },

{shacl2code-0.0.11 → shacl2code-0.0.12}/src/shacl2code/lang/templates/python.j2

@@ -264,6 +264,7 @@ class ObjectProp(Property):
             raise ValueError("Object cannot be None")
 
         if isinstance(value, str):
+            value = _NI_ENCODE_CONTEXT.get(value, value)
             encoder.write_iri(value)
             return
 
@@ -274,6 +275,8 @@ class ObjectProp(Property):
         if iri is None:
             return self.cls.decode(decoder, objectset=objectset)
 
+        iri = _NI_DECODE_CONTEXT.get(iri, iri)
+
         if objectset is None:
             return iri
 
@@ -506,6 +509,8 @@ def register(type_iri, *, compact_type=None, abstract=False):
         SHACLObject.CLASSES[key] = c
 
     def decorator(c):
+        global NAMED_INDIVIDUALS
+
         assert issubclass(
             c, SHACLObject
         ), f"{c.__name__} is not derived from SHACLObject"
@@ -518,6 +523,8 @@ def register(type_iri, *, compact_type=None, abstract=False):
         if compact_type:
             add_class(compact_type, c)
 
+        NAMED_INDIVIDUALS |= set(c.NAMED_INDIVIDUALS.values())
+
         # Registration is deferred until the first instance of class is created
         # so that it has access to any other defined class
         c._NEEDS_REG = True
@@ -527,6 +534,7 @@ def register(type_iri, *, compact_type=None, abstract=False):
 
 
 register_lock = threading.Lock()
+NAMED_INDIVIDUALS = set()
 
 
 @functools.total_ordering
@@ -537,7 +545,7 @@ class SHACLObject(object):
     IS_ABSTRACT = True
 
     def __init__(self, **kwargs):
-        if self.__class__.IS_ABSTRACT:
+        if self._is_abstract():
             raise NotImplementedError(
                 f"{self.__class__.__name__} is abstract and cannot be implemented"
             )
@@ -559,6 +567,9 @@ class SHACLObject(object):
         for k, v in kwargs.items():
             setattr(self, k, v)
 
+    def _is_abstract(self):
+        return self.__class__.IS_ABSTRACT
+
     @classmethod
     def _register_props(cls):
         cls._add_property("_id", StringProp(), iri="@id")
@@ -875,11 +886,20 @@ class SHACLExtensibleObject(object):
     CLOSED = False
 
     def __init__(self, typ=None, **kwargs):
-        super().__init__(**kwargs)
         if typ:
             self.__dict__["_obj_TYPE"] = (typ, None)
         else:
             self.__dict__["_obj_TYPE"] = (self._OBJ_TYPE, self._OBJ_COMPACT_TYPE)
+        super().__init__(**kwargs)
+
+    def _is_abstract(self):
+        # Unknown classes are assumed to not be abstract so that they can be
+        # deserialized
+        typ = self.__dict__["_obj_TYPE"][0]
+        if typ in self.__class__.CLASSES:
+            return self.__class__.CLASSES[typ].IS_ABSTRACT
+
+        return False
 
     @classmethod
     def _make_object(cls, typ):
@@ -1079,6 +1099,8 @@ class SHACLObjectSet(object):
         return self._link()
 
     def _link(self):
+        global NAMED_INDIVIDUALS
+
         self.missing_ids = set()
         visited = set()
 
@@ -1101,6 +1123,9 @@ class SHACLObjectSet(object):
                 obj_by_id[_id] = obj
         self.obj_by_id = obj_by_id
 
+        # Named individuals aren't considered missing
+        self.missing_ids -= NAMED_INDIVIDUALS
+
         return self.missing_ids
 
     def find_by_id(self, _id, default=None):
@@ -1938,6 +1963,26 @@ CONTEXT_URLS = [
 {%- endfor %}
 ]
 
+_NI_ENCODE_CONTEXT = {
+{%- for class in classes %}
+{%- for member in class.named_individuals %}
+    {%- if context.compact(member._id) != member._id %}
+    "{{ member._id }}": "{{ context.compact(member._id) }}",
+    {%- endif %}
+{%- endfor %}
+{%- endfor %}
+}
+
+_NI_DECODE_CONTEXT = {
+{%- for class in classes %}
+{%- for member in class.named_individuals %}
+    {%- if context.compact(member._id) != member._id %}
+    "{{ context.compact(member._id) }}": "{{ member._id }}",
+    {%- endif %}
+{%- endfor %}
+{%- endfor %}
+}
+
 
 # CLASSES
 {%- for class in classes %}

shacl2code-0.0.12/src/shacl2code/version.py

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

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/data/model/test-context.json

@@ -87,6 +87,7 @@
       "@id": "test:test-class/enum-prop-no-class",
       "@type": "@id"
     },
+    "test-class/named": "test:test-class/named",
     "test-class/regex": {
       "@id": "test:test-class/regex",
       "@type": "xsd:string"
@@ -130,6 +131,10 @@
     "extensible-class/required": {
       "@id": "test:extensible-class/required",
       "@type": "xsd:string"
+    },
+    "uses-extensible-abstract-class/prop": {
+      "@id": "test:uses-extensible-abstract-class/prop",
+      "@type": "@id"
     }
   }
 }

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/data/model/test.ttl

@@ -166,6 +166,10 @@
     ]
     .
 
+<test-class/named> a owl:NamedIndividual, <test-class> ;
+    rdfs:label "A named individual of the test class"
+    .
+
 <test-class-required> a sh:NodeShape, owl:Class ;
     rdfs:subClassOf <test-class> ;
     sh:property [
@@ -510,3 +514,24 @@
     rdfs:comment "A required abstract class property" ;
     rdfs:range <abstract-class>
     .
+
+<extensible-abstract-class> a rdf:Class, sh:NodeShape, owl:Class ;
+    sh-to-code:isExtensible true ;
+    sh-to-code:isAbstract true ;
+    rdfs:comment "An extensible abstract class"
+    .
+
+<uses-extensible-abstract-class> a rdf:Class, sh:NodeShape, owl:Class ;
+    rdfs:comment "A class that uses an abstract extensible class" ;
+    sh:property [
+        sh:class <extensible-abstract-class> ;
+        sh:path <uses-extensible-abstract-class/prop> ;
+        sh:minCount 1 ;
+        sh:maxCount 1
+    ]
+    .
+
+<uses-extensible-abstract-class/prop> a rdf:Property ;
+    rdfs:comment "A property that references and abstract extensible class" ;
+    rdfs:range <extensible-abstract-class>
+    .

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/data/python/roundtrip.json

@@ -76,10 +76,22 @@
             "@id": "http://serialize.example.com/test-derived",
             "@type": "test-derived-class"
         },
+        {
+            "@type": "test-class",
+            "@id": "http://serialize.example.com/test-named-individual-reference",
+            "test-class/class-prop": "test-class/named"
+        },
         {
             "@type": "test-class",
             "@id": "http://serialize.example.com/test-special-chars",
             "test-class/string-scalar-prop": "special chars \"\n\r:{}[]"
+        },
+        {
+            "@type": "uses-extensible-abstract-class",
+            "@id": "http://serialize.example.com/test-uses-extensible-abstract",
+            "uses-extensible-abstract-class/prop": {
+                "@type": " http://serialize.example.com/custom-extensible"
+            }
         }
     ]
 }

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/expect/jsonschema/test-context.json

@@ -178,6 +178,9 @@
                         { "$ref": "#/$defs/enumType" }
                     ]
                 },
+                { "const": "enumType/foo" },
+                { "const": "enumType/bar" },
+                { "const": "enumType/nolabel" },
                 { "$ref": "#/$defs/BlankNodeOrIRI" }
             ]
         },
@@ -191,6 +194,45 @@
                 }
             ]
         },
+        "extensibleabstractclass": {
+            "allOf": [
+                {
+                    "type": "object",
+                    "unevaluatedProperties": true,
+                    "properties": {
+                        "@id": { "$ref": "#/$defs/BlankNodeOrIRI" },
+                        "@type": {
+                            "allOf":  [
+                                { "$ref": "#/$defs/IRI" },
+                                { "not": { "const": "extensible-abstract-class" } }
+                            ]
+                        }
+                    }
+                },
+                { "$ref": "#/$defs/extensibleabstractclass_props" }
+            ]
+        },
+        "extensibleabstractclass_derived": {
+            "anyOf": [
+                {
+                    "type": "object",
+                    "anyOf": [
+                        { "$ref": "#/$defs/extensibleabstractclass" }
+                    ]
+                },
+                { "$ref": "#/$defs/BlankNodeOrIRI" }
+            ]
+        },
+        "extensibleabstractclass_props": {
+            "allOf": [
+                { "$ref": "#/$defs/SHACLClass" },
+                {
+                    "type": "object",
+                    "properties": {
+                    }
+                }
+            ]
+        },
         "idpropclass": {
             "allOf": [
                 {
@@ -564,6 +606,7 @@
                         { "$ref": "#/$defs/parentclass" }
                     ]
                 },
+                { "const": "test-class/named" },
                 { "$ref": "#/$defs/BlankNodeOrIRI" }
             ]
         },
@@ -689,6 +732,7 @@
                         { "$ref": "#/$defs/testclass" }
                     ]
                 },
+                { "const": "test-class/named" },
                 { "$ref": "#/$defs/BlankNodeOrIRI" }
             ]
         },
@@ -1065,6 +1109,53 @@
         "prop_testderivedclass_testderivedclassstringprop": {
                     "type": "string"
         },
+        "usesextensibleabstractclass": {
+            "allOf": [
+                {
+                    "type": "object",
+                    "properties": {
+                        "@id": { "$ref": "#/$defs/BlankNodeOrIRI" },
+                        "@type": {
+                            "oneOf": [
+                                { "const": "uses-extensible-abstract-class" }
+                            ]
+                        }
+                    }
+                },
+                { "$ref": "#/$defs/usesextensibleabstractclass_props" }
+            ]
+        },
+        "usesextensibleabstractclass_derived": {
+            "anyOf": [
+                {
+                    "type": "object",
+                    "unevaluatedProperties": false,
+                    "anyOf": [
+                        { "$ref": "#/$defs/usesextensibleabstractclass" }
+                    ]
+                },
+                { "$ref": "#/$defs/BlankNodeOrIRI" }
+            ]
+        },
+        "usesextensibleabstractclass_props": {
+            "allOf": [
+                { "$ref": "#/$defs/SHACLClass" },
+                {
+                    "type": "object",
+                    "properties": {
+                        "uses-extensible-abstract-class/prop": {
+                            "$ref": "#/$defs/prop_usesextensibleabstractclass_usesextensibleabstractclassprop"
+                        }
+                    },
+                    "required": [
+                        "uses-extensible-abstract-class/prop"
+                    ]
+                }
+            ]
+        },
+        "prop_usesextensibleabstractclass_usesextensibleabstractclassprop": {
+                "$ref": "#/$defs/extensibleabstractclass_derived"
+        },
         "aaaderivedclass": {
             "allOf": [
                 {
@@ -1238,6 +1329,7 @@
                                 "test-class",
                                 "test-class-required",
                                 "test-derived-class",
+                                "uses-extensible-abstract-class",
                                 "aaa-derived-class",
                                 "derived-node-kind-iri",
                                 "extensible-class"
@@ -1267,6 +1359,7 @@
                 { "$ref": "#/$defs/testclass" },
                 { "$ref": "#/$defs/testclassrequired" },
                 { "$ref": "#/$defs/testderivedclass" },
+                { "$ref": "#/$defs/usesextensibleabstractclass" },
                 { "$ref": "#/$defs/aaaderivedclass" },
                 { "$ref": "#/$defs/derivednodekindiri" },
                 { "$ref": "#/$defs/extensibleclass" }

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/expect/jsonschema/test.json

@@ -187,6 +187,45 @@
                 }
             ]
         },
+        "http_exampleorgextensibleabstractclass": {
+            "allOf": [
+                {
+                    "type": "object",
+                    "unevaluatedProperties": true,
+                    "properties": {
+                        "@id": { "$ref": "#/$defs/BlankNodeOrIRI" },
+                        "@type": {
+                            "allOf":  [
+                                { "$ref": "#/$defs/IRI" },
+                                { "not": { "const": "http://example.org/extensible-abstract-class" } }
+                            ]
+                        }
+                    }
+                },
+                { "$ref": "#/$defs/http_exampleorgextensibleabstractclass_props" }
+            ]
+        },
+        "http_exampleorgextensibleabstractclass_derived": {
+            "anyOf": [
+                {
+                    "type": "object",
+                    "anyOf": [
+                        { "$ref": "#/$defs/http_exampleorgextensibleabstractclass" }
+                    ]
+                },
+                { "$ref": "#/$defs/BlankNodeOrIRI" }
+            ]
+        },
+        "http_exampleorgextensibleabstractclass_props": {
+            "allOf": [
+                { "$ref": "#/$defs/SHACLClass" },
+                {
+                    "type": "object",
+                    "properties": {
+                    }
+                }
+            ]
+        },
         "http_exampleorgidpropclass": {
             "allOf": [
                 {
@@ -1061,6 +1100,53 @@
         "prop_http_exampleorgtestderivedclass_stringprop": {
                     "type": "string"
         },
+        "http_exampleorgusesextensibleabstractclass": {
+            "allOf": [
+                {
+                    "type": "object",
+                    "properties": {
+                        "@id": { "$ref": "#/$defs/BlankNodeOrIRI" },
+                        "@type": {
+                            "oneOf": [
+                                { "const": "http://example.org/uses-extensible-abstract-class" }
+                            ]
+                        }
+                    }
+                },
+                { "$ref": "#/$defs/http_exampleorgusesextensibleabstractclass_props" }
+            ]
+        },
+        "http_exampleorgusesextensibleabstractclass_derived": {
+            "anyOf": [
+                {
+                    "type": "object",
+                    "unevaluatedProperties": false,
+                    "anyOf": [
+                        { "$ref": "#/$defs/http_exampleorgusesextensibleabstractclass" }
+                    ]
+                },
+                { "$ref": "#/$defs/BlankNodeOrIRI" }
+            ]
+        },
+        "http_exampleorgusesextensibleabstractclass_props": {
+            "allOf": [
+                { "$ref": "#/$defs/SHACLClass" },
+                {
+                    "type": "object",
+                    "properties": {
+                        "http://example.org/uses-extensible-abstract-class/prop": {
+                            "$ref": "#/$defs/prop_http_exampleorgusesextensibleabstractclass_prop"
+                        }
+                    },
+                    "required": [
+                        "http://example.org/uses-extensible-abstract-class/prop"
+                    ]
+                }
+            ]
+        },
+        "prop_http_exampleorgusesextensibleabstractclass_prop": {
+                "$ref": "#/$defs/http_exampleorgextensibleabstractclass_derived"
+        },
         "http_exampleorgaaaderivedclass": {
             "allOf": [
                 {
@@ -1234,6 +1320,7 @@
                                 "http://example.org/test-class",
                                 "http://example.org/test-class-required",
                                 "http://example.org/test-derived-class",
+                                "http://example.org/uses-extensible-abstract-class",
                                 "http://example.org/aaa-derived-class",
                                 "http://example.org/derived-node-kind-iri",
                                 "http://example.org/extensible-class"
@@ -1263,6 +1350,7 @@
                 { "$ref": "#/$defs/http_exampleorgtestclass" },
                 { "$ref": "#/$defs/http_exampleorgtestclassrequired" },
                 { "$ref": "#/$defs/http_exampleorgtestderivedclass" },
+                { "$ref": "#/$defs/http_exampleorgusesextensibleabstractclass" },
                 { "$ref": "#/$defs/http_exampleorgaaaderivedclass" },
                 { "$ref": "#/$defs/http_exampleorgderivednodekindiri" },
                 { "$ref": "#/$defs/http_exampleorgextensibleclass" }

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/expect/python/test-context.py

@@ -264,6 +264,7 @@ class ObjectProp(Property):
             raise ValueError("Object cannot be None")
 
         if isinstance(value, str):
+            value = _NI_ENCODE_CONTEXT.get(value, value)
             encoder.write_iri(value)
             return
 
@@ -274,6 +275,8 @@ class ObjectProp(Property):
         if iri is None:
             return self.cls.decode(decoder, objectset=objectset)
 
+        iri = _NI_DECODE_CONTEXT.get(iri, iri)
+
         if objectset is None:
             return iri
 
@@ -506,6 +509,8 @@ def register(type_iri, *, compact_type=None, abstract=False):
         SHACLObject.CLASSES[key] = c
 
     def decorator(c):
+        global NAMED_INDIVIDUALS
+
         assert issubclass(
             c, SHACLObject
         ), f"{c.__name__} is not derived from SHACLObject"
@@ -518,6 +523,8 @@ def register(type_iri, *, compact_type=None, abstract=False):
         if compact_type:
             add_class(compact_type, c)
 
+        NAMED_INDIVIDUALS |= set(c.NAMED_INDIVIDUALS.values())
+
         # Registration is deferred until the first instance of class is created
         # so that it has access to any other defined class
         c._NEEDS_REG = True
@@ -527,6 +534,7 @@ def register(type_iri, *, compact_type=None, abstract=False):
 
 
 register_lock = threading.Lock()
+NAMED_INDIVIDUALS = set()
 
 
 @functools.total_ordering
@@ -537,7 +545,7 @@ class SHACLObject(object):
     IS_ABSTRACT = True
 
     def __init__(self, **kwargs):
-        if self.__class__.IS_ABSTRACT:
+        if self._is_abstract():
             raise NotImplementedError(
                 f"{self.__class__.__name__} is abstract and cannot be implemented"
             )
@@ -559,6 +567,9 @@ class SHACLObject(object):
         for k, v in kwargs.items():
             setattr(self, k, v)
 
+    def _is_abstract(self):
+        return self.__class__.IS_ABSTRACT
+
     @classmethod
     def _register_props(cls):
         cls._add_property("_id", StringProp(), iri="@id")
@@ -875,11 +886,20 @@ class SHACLExtensibleObject(object):
     CLOSED = False
 
     def __init__(self, typ=None, **kwargs):
-        super().__init__(**kwargs)
         if typ:
             self.__dict__["_obj_TYPE"] = (typ, None)
         else:
             self.__dict__["_obj_TYPE"] = (self._OBJ_TYPE, self._OBJ_COMPACT_TYPE)
+        super().__init__(**kwargs)
+
+    def _is_abstract(self):
+        # Unknown classes are assumed to not be abstract so that they can be
+        # deserialized
+        typ = self.__dict__["_obj_TYPE"][0]
+        if typ in self.__class__.CLASSES:
+            return self.__class__.CLASSES[typ].IS_ABSTRACT
+
+        return False
 
     @classmethod
     def _make_object(cls, typ):
@@ -1079,6 +1099,8 @@ class SHACLObjectSet(object):
         return self._link()
 
     def _link(self):
+        global NAMED_INDIVIDUALS
+
         self.missing_ids = set()
         visited = set()
 
@@ -1101,6 +1123,9 @@ class SHACLObjectSet(object):
                 obj_by_id[_id] = obj
         self.obj_by_id = obj_by_id
 
+        # Named individuals aren't considered missing
+        self.missing_ids -= NAMED_INDIVIDUALS
+
         return self.missing_ids
 
     def find_by_id(self, _id, default=None):
@@ -1924,6 +1949,20 @@ CONTEXT_URLS = [
     "https://spdx.github.io/spdx-3-model/context.json",
 ]
 
+_NI_ENCODE_CONTEXT = {
+    "http://example.org/enumType/foo": "enumType/foo",
+    "http://example.org/enumType/bar": "enumType/bar",
+    "http://example.org/enumType/nolabel": "enumType/nolabel",
+    "http://example.org/test-class/named": "test-class/named",
+}
+
+_NI_DECODE_CONTEXT = {
+    "enumType/foo": "http://example.org/enumType/foo",
+    "enumType/bar": "http://example.org/enumType/bar",
+    "enumType/nolabel": "http://example.org/enumType/nolabel",
+    "test-class/named": "http://example.org/test-class/named",
+}
+
 
 # CLASSES
 # An Abstract class
@@ -1975,6 +2014,14 @@ class enumType(SHACLObject):
     nolabel = "http://example.org/enumType/nolabel"
 
 
+# An extensible abstract class
+@register("http://example.org/extensible-abstract-class", compact_type="extensible-abstract-class", abstract=True)
+class extensible_abstract_class(SHACLExtensibleObject, SHACLObject):
+    NODE_KIND = NodeKind.BlankNodeOrIRI
+    NAMED_INDIVIDUALS = {
+    }
+
+
 # A class with an ID alias
 @register("http://example.org/id-prop-class", compact_type="id-prop-class", abstract=False)
 class id_prop_class(SHACLObject):
@@ -2114,7 +2161,9 @@ class test_another_class(SHACLObject):
 class test_class(parent_class):
     NODE_KIND = NodeKind.BlankNodeOrIRI
     NAMED_INDIVIDUALS = {
+        "named": "http://example.org/test-class/named",
     }
+    named = "http://example.org/test-class/named"
 
     @classmethod
     def _register_props(cls):
@@ -2365,6 +2414,26 @@ class test_derived_class(test_class):
         )
 
 
+# A class that uses an abstract extensible class
+@register("http://example.org/uses-extensible-abstract-class", compact_type="uses-extensible-abstract-class", abstract=False)
+class uses_extensible_abstract_class(SHACLObject):
+    NODE_KIND = NodeKind.BlankNodeOrIRI
+    NAMED_INDIVIDUALS = {
+    }
+
+    @classmethod
+    def _register_props(cls):
+        super()._register_props()
+        # A property that references and abstract extensible class
+        cls._add_property(
+            "uses_extensible_abstract_class_prop",
+            ObjectProp(extensible_abstract_class, True),
+            iri="http://example.org/uses-extensible-abstract-class/prop",
+            min_count=1,
+            compact="uses-extensible-abstract-class/prop",
+        )
+
+
 # Derived class that sorts before the parent to test ordering
 @register("http://example.org/aaa-derived-class", compact_type="aaa-derived-class", abstract=False)
 class aaa_derived_class(parent_class):

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/expect/python/test.py

@@ -264,6 +264,7 @@ class ObjectProp(Property):
             raise ValueError("Object cannot be None")
 
         if isinstance(value, str):
+            value = _NI_ENCODE_CONTEXT.get(value, value)
             encoder.write_iri(value)
             return
 
@@ -274,6 +275,8 @@ class ObjectProp(Property):
         if iri is None:
             return self.cls.decode(decoder, objectset=objectset)
 
+        iri = _NI_DECODE_CONTEXT.get(iri, iri)
+
         if objectset is None:
             return iri
 
@@ -506,6 +509,8 @@ def register(type_iri, *, compact_type=None, abstract=False):
         SHACLObject.CLASSES[key] = c
 
     def decorator(c):
+        global NAMED_INDIVIDUALS
+
         assert issubclass(
             c, SHACLObject
         ), f"{c.__name__} is not derived from SHACLObject"
@@ -518,6 +523,8 @@ def register(type_iri, *, compact_type=None, abstract=False):
         if compact_type:
             add_class(compact_type, c)
 
+        NAMED_INDIVIDUALS |= set(c.NAMED_INDIVIDUALS.values())
+
         # Registration is deferred until the first instance of class is created
         # so that it has access to any other defined class
         c._NEEDS_REG = True
@@ -527,6 +534,7 @@ def register(type_iri, *, compact_type=None, abstract=False):
 
 
 register_lock = threading.Lock()
+NAMED_INDIVIDUALS = set()
 
 
 @functools.total_ordering
@@ -537,7 +545,7 @@ class SHACLObject(object):
     IS_ABSTRACT = True
 
     def __init__(self, **kwargs):
-        if self.__class__.IS_ABSTRACT:
+        if self._is_abstract():
             raise NotImplementedError(
                 f"{self.__class__.__name__} is abstract and cannot be implemented"
             )
@@ -559,6 +567,9 @@ class SHACLObject(object):
         for k, v in kwargs.items():
             setattr(self, k, v)
 
+    def _is_abstract(self):
+        return self.__class__.IS_ABSTRACT
+
     @classmethod
     def _register_props(cls):
         cls._add_property("_id", StringProp(), iri="@id")
@@ -875,11 +886,20 @@ class SHACLExtensibleObject(object):
     CLOSED = False
 
     def __init__(self, typ=None, **kwargs):
-        super().__init__(**kwargs)
         if typ:
             self.__dict__["_obj_TYPE"] = (typ, None)
         else:
             self.__dict__["_obj_TYPE"] = (self._OBJ_TYPE, self._OBJ_COMPACT_TYPE)
+        super().__init__(**kwargs)
+
+    def _is_abstract(self):
+        # Unknown classes are assumed to not be abstract so that they can be
+        # deserialized
+        typ = self.__dict__["_obj_TYPE"][0]
+        if typ in self.__class__.CLASSES:
+            return self.__class__.CLASSES[typ].IS_ABSTRACT
+
+        return False
 
     @classmethod
     def _make_object(cls, typ):
@@ -1079,6 +1099,8 @@ class SHACLObjectSet(object):
         return self._link()
 
     def _link(self):
+        global NAMED_INDIVIDUALS
+
         self.missing_ids = set()
         visited = set()
 
@@ -1101,6 +1123,9 @@ class SHACLObjectSet(object):
                 obj_by_id[_id] = obj
         self.obj_by_id = obj_by_id
 
+        # Named individuals aren't considered missing
+        self.missing_ids -= NAMED_INDIVIDUALS
+
         return self.missing_ids
 
     def find_by_id(self, _id, default=None):
@@ -1923,6 +1948,12 @@ def print_tree(objects, all_fields=False):
 CONTEXT_URLS = [
 ]
 
+_NI_ENCODE_CONTEXT = {
+}
+
+_NI_DECODE_CONTEXT = {
+}
+
 
 # CLASSES
 # An Abstract class
@@ -1974,6 +2005,14 @@ class http_example_org_enumType(SHACLObject):
     nolabel = "http://example.org/enumType/nolabel"
 
 
+# An extensible abstract class
+@register("http://example.org/extensible-abstract-class", abstract=True)
+class http_example_org_extensible_abstract_class(SHACLExtensibleObject, SHACLObject):
+    NODE_KIND = NodeKind.BlankNodeOrIRI
+    NAMED_INDIVIDUALS = {
+    }
+
+
 # A class with an ID alias
 @register("http://example.org/id-prop-class", abstract=False)
 class http_example_org_id_prop_class(SHACLObject):
@@ -2108,7 +2147,9 @@ class http_example_org_test_another_class(SHACLObject):
 class http_example_org_test_class(http_example_org_parent_class):
     NODE_KIND = NodeKind.BlankNodeOrIRI
     NAMED_INDIVIDUALS = {
+        "named": "http://example.org/test-class/named",
     }
+    named = "http://example.org/test-class/named"
 
     @classmethod
     def _register_props(cls):
@@ -2330,6 +2371,25 @@ class http_example_org_test_derived_class(http_example_org_test_class):
         )
 
 
+# A class that uses an abstract extensible class
+@register("http://example.org/uses-extensible-abstract-class", abstract=False)
+class http_example_org_uses_extensible_abstract_class(SHACLObject):
+    NODE_KIND = NodeKind.BlankNodeOrIRI
+    NAMED_INDIVIDUALS = {
+    }
+
+    @classmethod
+    def _register_props(cls):
+        super()._register_props()
+        # A property that references and abstract extensible class
+        cls._add_property(
+            "prop",
+            ObjectProp(http_example_org_extensible_abstract_class, True),
+            iri="http://example.org/uses-extensible-abstract-class/prop",
+            min_count=1,
+        )
+
+
 # Derived class that sorts before the parent to test ordering
 @register("http://example.org/aaa-derived-class", abstract=False)
 class http_example_org_aaa_derived_class(http_example_org_parent_class):

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/expect/raw/test-context.txt

@@ -11,6 +11,8 @@ http://example.org/concrete-spdx-class: concrete-spdx-class
 
 http://example.org/enumType: enumType
 
+http://example.org/extensible-abstract-class: extensible-abstract-class
+
 http://example.org/id-prop-class: id-prop-class
 
 http://example.org/inherited-id-prop-class: inherited-id-prop-class
@@ -39,6 +41,8 @@ http://example.org/test-class-required: test-class-required
 
 http://example.org/test-derived-class: test-derived-class
 
+http://example.org/uses-extensible-abstract-class: uses-extensible-abstract-class
+
 http://example.org/aaa-derived-class: aaa-derived-class
 
 http://example.org/derived-node-kind-iri: derived-node-kind-iri

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/expect/raw/test.txt

@@ -5,6 +5,7 @@ Class(_id='http://example.org/abstract-spdx-class', clsname=['http', '//example.
 Class(_id='http://example.org/concrete-class', clsname=['http', '//example.org/concrete-class'], parent_ids=['http://example.org/abstract-class'], derived_ids=[], properties=[], comment='A concrete class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/concrete-spdx-class', clsname=['http', '//example.org/concrete-spdx-class'], parent_ids=['http://example.org/abstract-spdx-class'], derived_ids=[], properties=[], comment='A concrete class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/enumType', clsname=['http', '//example.org/enumType'], parent_ids=[], derived_ids=[], properties=[], comment='An enumerated type', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[Individual(_id='http://example.org/enumType/foo', varname='foo', comment='The foo value of enumType'), Individual(_id='http://example.org/enumType/bar', varname='bar', comment='The bar value of enumType'), Individual(_id='http://example.org/enumType/nolabel', varname='nolabel', comment='This value has no label')])
+Class(_id='http://example.org/extensible-abstract-class', clsname=['http', '//example.org/extensible-abstract-class'], parent_ids=[], derived_ids=[], properties=[], comment='An extensible abstract class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=True, is_abstract=True, named_individuals=[])
 Class(_id='http://example.org/id-prop-class', clsname=['http', '//example.org/id-prop-class'], parent_ids=[], derived_ids=['http://example.org/inherited-id-prop-class'], properties=[], comment='A class with an ID alias', id_property='testid', node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/inherited-id-prop-class', clsname=['http', '//example.org/inherited-id-prop-class'], parent_ids=['http://example.org/id-prop-class'], derived_ids=[], properties=[], comment='A class that inherits its idPropertyName from the parent', id_property='testid', node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/link-class', clsname=['http', '//example.org/link-class'], parent_ids=[], derived_ids=['http://example.org/extensible-class', 'http://example.org/link-derived-class', 'http://example.org/node-kind-blank', 'http://example.org/node-kind-iri', 'http://example.org/node-kind-iri-or-blank'], properties=[Property(path='http://example.org/link-class-extensible', varname='-extensible', comment='A link to an extensible-class', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/extensible-class', datatype='', pattern=''), Property(path='http://example.org/link-class-link-list-prop', varname='-link-list-prop', comment='A link-class list property', max_count=None, min_count=None, enum_values=None, class_id='http://example.org/link-class', datatype='', pattern=''), Property(path='http://example.org/link-class-link-prop', varname='-link-prop', comment='A link-class property', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/link-class', datatype='', pattern=''), Property(path='http://example.org/link-class-link-prop-no-class', varname='-link-prop-no-class', comment='A link-class property with no sh:class', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/link-class', datatype='', pattern='')], comment='A class to test links', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
@@ -16,9 +17,10 @@ Class(_id='http://example.org/non-shape-class', clsname=['http', '//example.org/
 Class(_id='http://example.org/parent-class', clsname=['http', '//example.org/parent-class'], parent_ids=[], derived_ids=['http://example.org/aaa-derived-class', 'http://example.org/test-class'], properties=[], comment='The parent class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/required-abstract', clsname=['http', '//example.org/required-abstract'], parent_ids=[], derived_ids=[], properties=[Property(path='http://example.org/required-abstract/abstract-class-prop', varname='abstract-class-prop', comment='A required abstract class property', max_count=1, min_count=1, enum_values=None, class_id='http://example.org/abstract-class', datatype='', pattern='')], comment='A class with a mandatory abstract class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/test-another-class', clsname=['http', '//example.org/test-another-class'], parent_ids=[], derived_ids=[], properties=[], comment='Another class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
-Class(_id='http://example.org/test-class', clsname=['http', '//example.org/test-class'], parent_ids=['http://example.org/parent-class'], derived_ids=['http://example.org/test-class-required', 'http://example.org/test-derived-class'], properties=[Property(path='http://example.org/encode', varname='encode', comment='A property that conflicts with an existing SHACLObject property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/import', varname='import', comment='A property that is a keyword', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/anyuri-prop', varname='anyuri-prop', comment='a URI', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#anyURI', pattern=''), Property(path='http://example.org/test-class/boolean-prop', varname='boolean-prop', comment='a boolean property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#boolean', pattern=''), Property(path='http://example.org/test-class/class-list-prop', varname='class-list-prop', comment='A test-class list property', max_count=None, min_count=None, enum_values=None, class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/class-prop', varname='class-prop', comment='A test-class property', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/class-prop-no-class', varname='class-prop-no-class', comment='A test-class property with no sh:class', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/datetime-list-prop', varname='datetime-list-prop', comment='A datetime list property', max_count=None, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern=''), Property(path='http://example.org/test-class/datetime-scalar-prop', varname='datetime-scalar-prop', comment='A scalar datetime property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern=''), Property(path='http://example.org/test-class/datetimestamp-scalar-prop', varname='datetimestamp-scalar-prop', comment='A scalar dateTimeStamp property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTimeStamp', pattern=''), Property(path='http://example.org/test-class/enum-list-prop', varname='enum-list-prop', comment='A enum list property', max_count=None, min_count=None, enum_values=[rdflib.term.URIRef('http://example.org/enumType/bar'), rdflib.term.URIRef('http://example.org/enumType/foo'), rdflib.term.URIRef('http://example.org/enumType/nolabel'), rdflib.term.URIRef('http://example.org/enumType/non-named-individual')], class_id='http://example.org/enumType', datatype='', pattern=''), Property(path='http://example.org/test-class/enum-prop', varname='enum-prop', comment='A enum property', max_count=1, min_count=None, enum_values=[rdflib.term.URIRef('http://example.org/enumType/bar'), rdflib.term.URIRef('http://example.org/enumType/foo'), rdflib.term.URIRef('http://example.org/enumType/nolabel'), rdflib.term.URIRef('http://example.org/enumType/non-named-individual')], class_id='http://example.org/enumType', datatype='', pattern=''), Property(path='http://example.org/test-class/enum-prop-no-class', varname='enum-prop-no-class', comment='A enum property with no sh:class', max_count=1, min_count=None, enum_values=[rdflib.term.URIRef('http://example.org/enumType/bar'), rdflib.term.URIRef('http://example.org/enumType/foo'), rdflib.term.URIRef('http://example.org/enumType/nolabel'), rdflib.term.URIRef('http://example.org/enumType/non-named-individual')], class_id='http://example.org/enumType', datatype='', pattern=''), Property(path='http://example.org/test-class/float-prop', varname='float-prop', comment='a float property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#decimal', pattern=''), Property(path='http://example.org/test-class/integer-prop', varname='integer-prop', comment='a non-negative integer', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#integer', pattern=''), Property(path='http://example.org/test-class/named-property', varname=rdflib.term.Literal('named_property'), comment='A named property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/non-shape', varname='non-shape', comment='A class with no shape', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/non-shape-class', datatype='', pattern=''), Property(path='http://example.org/test-class/nonnegative-integer-prop', varname='nonnegative-integer-prop', comment='a non-negative integer', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#nonNegativeInteger', pattern=''), Property(path='http://example.org/test-class/positive-integer-prop', varname='positive-integer-prop', comment='A positive integer', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#positiveInteger', pattern=''), Property(path='http://example.org/test-class/regex', varname='regex', comment='A regex validated string', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='^foo\\d'), Property(path='http://example.org/test-class/regex-datetime', varname='regex-datetime', comment='A regex dateTime', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern='^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\d\\+01:00$'), Property(path='http://example.org/test-class/regex-datetimestamp', varname='regex-datetimestamp', comment='A regex dateTimeStamp', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTimeStamp', pattern='^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\dZ$'), Property(path='http://example.org/test-class/regex-list', varname='regex-list', comment='A regex validated string list', max_count=None, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='^foo\\d'), Property(path='http://example.org/test-class/string-list-no-datatype', varname='string-list-no-datatype', comment='A string list property with no sh:datatype', max_count=None, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/string-list-prop', varname='string-list-prop', comment='A string list property', max_count=None, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/string-scalar-prop', varname='string-scalar-prop', comment='A scalar string propery', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='')], comment='The test class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
+Class(_id='http://example.org/test-class', clsname=['http', '//example.org/test-class'], parent_ids=['http://example.org/parent-class'], derived_ids=['http://example.org/test-class-required', 'http://example.org/test-derived-class'], properties=[Property(path='http://example.org/encode', varname='encode', comment='A property that conflicts with an existing SHACLObject property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/import', varname='import', comment='A property that is a keyword', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/anyuri-prop', varname='anyuri-prop', comment='a URI', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#anyURI', pattern=''), Property(path='http://example.org/test-class/boolean-prop', varname='boolean-prop', comment='a boolean property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#boolean', pattern=''), Property(path='http://example.org/test-class/class-list-prop', varname='class-list-prop', comment='A test-class list property', max_count=None, min_count=None, enum_values=None, class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/class-prop', varname='class-prop', comment='A test-class property', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/class-prop-no-class', varname='class-prop-no-class', comment='A test-class property with no sh:class', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/datetime-list-prop', varname='datetime-list-prop', comment='A datetime list property', max_count=None, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern=''), Property(path='http://example.org/test-class/datetime-scalar-prop', varname='datetime-scalar-prop', comment='A scalar datetime property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern=''), Property(path='http://example.org/test-class/datetimestamp-scalar-prop', varname='datetimestamp-scalar-prop', comment='A scalar dateTimeStamp property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTimeStamp', pattern=''), Property(path='http://example.org/test-class/enum-list-prop', varname='enum-list-prop', comment='A enum list property', max_count=None, min_count=None, enum_values=[rdflib.term.URIRef('http://example.org/enumType/bar'), rdflib.term.URIRef('http://example.org/enumType/foo'), rdflib.term.URIRef('http://example.org/enumType/nolabel'), rdflib.term.URIRef('http://example.org/enumType/non-named-individual')], class_id='http://example.org/enumType', datatype='', pattern=''), Property(path='http://example.org/test-class/enum-prop', varname='enum-prop', comment='A enum property', max_count=1, min_count=None, enum_values=[rdflib.term.URIRef('http://example.org/enumType/bar'), rdflib.term.URIRef('http://example.org/enumType/foo'), rdflib.term.URIRef('http://example.org/enumType/nolabel'), rdflib.term.URIRef('http://example.org/enumType/non-named-individual')], class_id='http://example.org/enumType', datatype='', pattern=''), Property(path='http://example.org/test-class/enum-prop-no-class', varname='enum-prop-no-class', comment='A enum property with no sh:class', max_count=1, min_count=None, enum_values=[rdflib.term.URIRef('http://example.org/enumType/bar'), rdflib.term.URIRef('http://example.org/enumType/foo'), rdflib.term.URIRef('http://example.org/enumType/nolabel'), rdflib.term.URIRef('http://example.org/enumType/non-named-individual')], class_id='http://example.org/enumType', datatype='', pattern=''), Property(path='http://example.org/test-class/float-prop', varname='float-prop', comment='a float property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#decimal', pattern=''), Property(path='http://example.org/test-class/integer-prop', varname='integer-prop', comment='a non-negative integer', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#integer', pattern=''), Property(path='http://example.org/test-class/named-property', varname=rdflib.term.Literal('named_property'), comment='A named property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/non-shape', varname='non-shape', comment='A class with no shape', max_count=1, min_count=None, enum_values=None, class_id='http://example.org/non-shape-class', datatype='', pattern=''), Property(path='http://example.org/test-class/nonnegative-integer-prop', varname='nonnegative-integer-prop', comment='a non-negative integer', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#nonNegativeInteger', pattern=''), Property(path='http://example.org/test-class/positive-integer-prop', varname='positive-integer-prop', comment='A positive integer', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#positiveInteger', pattern=''), Property(path='http://example.org/test-class/regex', varname='regex', comment='A regex validated string', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='^foo\\d'), Property(path='http://example.org/test-class/regex-datetime', varname='regex-datetime', comment='A regex dateTime', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern='^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\d\\+01:00$'), Property(path='http://example.org/test-class/regex-datetimestamp', varname='regex-datetimestamp', comment='A regex dateTimeStamp', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTimeStamp', pattern='^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\dZ$'), Property(path='http://example.org/test-class/regex-list', varname='regex-list', comment='A regex validated string list', max_count=None, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='^foo\\d'), Property(path='http://example.org/test-class/string-list-no-datatype', varname='string-list-no-datatype', comment='A string list property with no sh:datatype', max_count=None, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/string-list-prop', varname='string-list-prop', comment='A string list property', max_count=None, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/string-scalar-prop', varname='string-scalar-prop', comment='A scalar string propery', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='')], comment='The test class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[Individual(_id='http://example.org/test-class/named', varname='named', comment='')])
 Class(_id='http://example.org/test-class-required', clsname=['http', '//example.org/test-class-required'], parent_ids=['http://example.org/test-class'], derived_ids=[], properties=[Property(path='http://example.org/test-class/required-string-list-prop', varname='required-string-list-prop', comment='A required string list property', max_count=2, min_count=1, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/required-string-scalar-prop', varname='required-string-scalar-prop', comment='A required scalar string property', max_count=1, min_count=1, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='')], comment='', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/test-derived-class', clsname=['http', '//example.org/test-derived-class'], parent_ids=['http://example.org/test-class'], derived_ids=[], properties=[Property(path='http://example.org/test-derived-class/string-prop', varname='string-prop', comment='A string property in a derived class', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='')], comment='A class derived from test-class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
+Class(_id='http://example.org/uses-extensible-abstract-class', clsname=['http', '//example.org/uses-extensible-abstract-class'], parent_ids=[], derived_ids=[], properties=[Property(path='http://example.org/uses-extensible-abstract-class/prop', varname='prop', comment='A property that references and abstract extensible class', max_count=1, min_count=1, enum_values=None, class_id='http://example.org/extensible-abstract-class', datatype='', pattern='')], comment='A class that uses an abstract extensible class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/aaa-derived-class', clsname=['http', '//example.org/aaa-derived-class'], parent_ids=['http://example.org/parent-class'], derived_ids=[], properties=[], comment='Derived class that sorts before the parent to test ordering', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/derived-node-kind-iri', clsname=['http', '//example.org/derived-node-kind-iri'], parent_ids=['http://example.org/node-kind-iri'], derived_ids=[], properties=[], comment='A class that derives its nodeKind from parent', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#IRI'), is_extensible=False, is_abstract=False, named_individuals=[])
 Class(_id='http://example.org/extensible-class', clsname=['http', '//example.org/extensible-class'], parent_ids=['http://example.org/link-class'], derived_ids=[], properties=[Property(path='http://example.org/extensible-class/property', varname='property', comment='An extensible property', max_count=1, min_count=None, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/extensible-class/required', varname='required', comment='A required extensible property', max_count=1, min_count=1, enum_values=None, class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='')], comment='An extensible class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'), is_extensible=True, is_abstract=False, named_individuals=[])

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/test_jsonschema.py

@@ -701,6 +701,38 @@ def node_kind_tests(name, blank, iri):
                 "@type": "concrete-spdx-class",
             },
         ),
+        # An extensible abstract class cannot be instantiated
+        (
+            False,
+            {
+                "@context": CONTEXT,
+                "@type": "extensible-abstract-class",
+            },
+        ),
+        # Any can type can be used where a extensible abstract class is
+        # references, except... (SEE NEXT)
+        (
+            True,
+            {
+                "@context": CONTEXT,
+                "@type": "uses-extensible-abstract-class",
+                "uses-extensible-abstract-class/prop": {
+                    "@type": "http://example.com/extended",
+                },
+            },
+        ),
+        # ... the exact type of the extensible abstract class is specifically
+        # not allowed
+        (
+            False,
+            {
+                "@context": CONTEXT,
+                "@type": "uses-extensible-abstract-class",
+                "uses-extensible-abstract-class/prop": {
+                    "@type": "extensible-abstract-class",
+                },
+            },
+        ),
         # Base object for type tests
         (True, BASE_OBJ),
     ],
@@ -815,10 +847,14 @@ def type_tests(name, *, good=[], bad=[], typ=[]):
                 {"@type": "test-derived-class"},
                 "_:blanknode",
                 "http://serialize.example.org/test",
+                # Named individual
+                "test-class/named",
             ],
             bad=[
                 {"@type": "test-another-class"},
                 {"@type": "parent-class"},
+                "not/an/iri",
+                "not-an-iri",
             ],
             typ=[object, str],
         ),

{shacl2code-0.0.11 → shacl2code-0.0.12}/tests/test_python.py

@@ -754,6 +754,7 @@ def type_tests(name, *typ):
         ),
         ("test_class_class_prop", lambda model: model.test_another_class(), TypeError),
         ("test_class_class_prop", lambda model: model.parent_class(), TypeError),
+        ("test_class_class_prop", lambda model: model.test_class.named, SAME_AS_VALUE),
         ("test_class_class_prop", "_:blanknode", "_:blanknode"),
         (
             "test_class_class_prop",
@@ -1619,6 +1620,11 @@ def test_objset_foreach_type(model, roundtrip):
 
     expect.add(objset.find_by_id("http://serialize.example.com/test"))
     expect.add(objset.find_by_id("http://serialize.example.com/nested-parent"))
+    expect.add(
+        objset.find_by_id(
+            "http://serialize.example.com/test-named-individual-reference"
+        )
+    )
     expect.add(
         objset.find_by_id(
             "http://serialize.example.com/nested-parent"
@@ -1739,3 +1745,43 @@ def test_required_abstract_class_property(model, tmp_path):
     # Deleting an abstract class property should return it to None
     del c.required_abstract_abstract_class_prop
     assert c.required_abstract_abstract_class_prop is None
+
+
+def test_extensible_abstract_class(model):
+    @model.register("http://example.org/custom-extension-class")
+    class Extension(model.extensible_abstract_class):
+        pass
+
+    # Test that an extensible abstract class cannot be created
+    with pytest.raises(NotImplementedError):
+        model.extensible_abstract_class()
+
+    # Test that a class derived from an abstract extensible class can be
+    # created
+    Extension()
+
+
+def test_named_individual(model, roundtrip):
+    objset = model.SHACLObjectSet()
+    with roundtrip.open("r") as f:
+        d = model.JSONLDDeserializer()
+        d.read(f, objset)
+
+    c = objset.find_by_id(
+        "http://serialize.example.com/test-named-individual-reference"
+    )
+    assert c is not None
+    assert c.test_class_class_prop == model.test_class.named
+
+    assert model.test_class.named not in objset.missing_ids
+
+
+def test_missing_ids(model, roundtrip):
+    objset = model.SHACLObjectSet()
+    with roundtrip.open("r") as f:
+        d = model.JSONLDDeserializer()
+        d.read(f, objset)
+
+    assert objset.missing_ids == {
+        "http://serialize.example.com/non-shape",
+    }

shacl2code-0.0.11/src/shacl2code/version.py

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