shacl2code 0.0.13__tar.gz → 0.0.14__tar.gz

{shacl2code-0.0.13 → shacl2code-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: shacl2code
-Version: 0.0.13
+Version: 0.0.14
 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.13 → shacl2code-0.0.14}/pyproject.toml

@@ -53,6 +53,9 @@ addopts = [
     "--import-mode=importlib",
     "--cov=shacl2code",
 ]
+pythonpath = [
+    "testfixtures"
+]
 
 [tool.coverage.run]
 relative_files = true

{shacl2code-0.0.13 → shacl2code-0.0.14}/src/shacl2code/lang/templates/jsonschema.j2

@@ -96,7 +96,11 @@
         "{{ varname(*class.clsname) }}_derived": {
             {%- 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)] %}
+                {%- if not classes.get(d).is_abstract %}
+                    {%- set ns.json_refs = ns.json_refs + ["#/$defs/" + varname(*classes.get(d).clsname)] %}
+                {%- elif classes.get(d).is_extensible %}
+                    {%- set ns.json_refs = ns.json_refs + ["#/$defs/" + varname(*classes.get(d).clsname) + "_props"] %}
+                {%- endif %}
                 {%- for n in classes.get(d).named_individuals %}
                     {%- if context.compact_iri(n._id) != n._id %}
                         {%- set ns.named_individuals = ns.named_individuals + [context.compact_iri(n._id)] %}

shacl2code-0.0.14/src/shacl2code/version.py

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