shacl2code 0.0.6__tar.gz → 0.0.7__tar.gz

{shacl2code-0.0.6 → shacl2code-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: shacl2code
-Version: 0.0.6
+Version: 0.0.7
 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.6 → shacl2code-0.0.7}/src/shacl2code/lang/common.py

@@ -8,6 +8,8 @@ import os
 from pathlib import Path
 from contextlib import contextmanager
 from jinja2 import Environment, FileSystemLoader, TemplateRuntimeError
+from rdflib.namespace import SH
+from ..model import SHACL2CODE
 
 THIS_DIR = Path(__file__).parent
 
@@ -97,6 +99,8 @@ class BasicJinjaRender(object):
             env.globals[k] = v
         env.globals["abort"] = abort_helper
         env.globals["get_all_derived"] = get_all_derived
+        env.globals["SHACL2CODE"] = SHACL2CODE
+        env.globals["SH"] = SH
         template = env.get_template(self.__template.name)
 
         classes = ObjectList(model.classes)

{shacl2code-0.0.6 → shacl2code-0.0.7}/src/shacl2code/lang/templates/jsonschema.j2

@@ -61,19 +61,10 @@
             "allOf": [
                 {
                     "properties": {
-                        {%- if class.refable != "no" %}
-                        "{{ class.id_property or context.compact("@id") }}":
-                        {%- if class.refable == "always" or class.refable == "yes" -%}
-                            { "$ref": "#/$defs/externalRef" }
-                        {%- elif class.refable == "local" -%}
-                            { "$ref": "#/$defs/localRef" }
-                        {%- elif class.refable == "optional" -%}
-                            { "$ref": "#/$defs/anyRef" }
-                        {%- endif %},
-                        {%- endif %}
+                        "{{ class.id_property or "@id" }}": { "$ref": "#/$defs/{{ class.node_kind.split("#")[-1] }}" },
                         "{{ context.compact("@type") }}": { "const": "{{ context.compact_vocab(class._id) }}" }
-                    }{%- if class.refable == "always" or class.refable == "yes" %},
-                    "required": ["{{ class.id_property or context.compact("@id") }}"]
+                    }{%- if class.node_kind == SH.IRI %},
+                    "required": ["{{ class.id_property or "@id" }}"]
                     {%- endif %}
                 },
                 { "$ref": "#/$defs/{{ varname(class.clsname) }}_props" }
@@ -82,27 +73,9 @@
         "{{ varname(class.clsname) }}_derived": {
             {%- set ns = namespace(external_ref=False, local_ref=False, any_ref=False, json_refs=[]) %}
             {%- for d in get_all_derived(class) + [class._id] %}
-                {%- if class.refable == "always" or class.refable == "yes" %}
-                    {%- set ns.external_ref = True %}
-                {%- elif class.refable == "local" %}
-                    {%- set ns.local_ref = True %}
-                {%- elif class.refable == "optional" %}
-                    {%- set ns.any_ref = True %}
-                {%- endif %}
-                {%- if classes.get(d).refable != "always" %}
-                    {%- set ns.json_refs = ns.json_refs + ["#/$defs/" + varname(classes.get(d).clsname)] %}
-                {%- endif %}
+                {%- set ns.json_refs = ns.json_refs + ["#/$defs/" + varname(classes.get(d).clsname)] %}
             {%- endfor %}
-            {%- if ns.any_ref %}
-                {%- set ns.json_refs = ns.json_refs + ["#/$defs/anyRef"] %}
-            {%- else %}
-                {%- if ns.local_ref %}
-                    {%- set ns.json_refs = ns.json_refs + ["#/$defs/localRef"] %}
-                {%- endif %}
-                {%- if ns.external_ref %}
-                    {%- set ns.json_refs = ns.json_refs + ["#/$defs/externalRef"] %}
-                {%- endif %}
-            {%- endif %}
+            {%- set ns.json_refs = ns.json_refs + ["#/$defs/BlankNodeOrIRI"] %}
 
             {%- if ns.json_refs | length == 1 %}
             "$ref": "{{ ns.json_refs[0] }}",
@@ -185,6 +158,17 @@
                     {%- endif %}
                     "type": "string"
                 {%- elif prop.datatype == "http://www.w3.org/2001/XMLSchema#dateTime" %}
+                    "type": "string",
+                    "allOf": [
+                        {
+                            "pattern": "^[0-9]{4}-[0-1][0-9]-[0-3][0-9]T[0-2][0-9]:[0-6][0-9]:[0-6][0-9](Z|[+-][0-9]{2}:[0-9]{2})?$"
+                        }{%- if prop.pattern %},
+                        {
+                            "pattern": "{{ prop.pattern | replace("\\", "\\\\") }}"
+                        }
+                        {%- endif %}
+                    ]
+                {%- elif prop.datatype == "http://www.w3.org/2001/XMLSchema#dateTimeStamp" %}
                     "type": "string",
                     "allOf": [
                         {
@@ -227,17 +211,20 @@
         },
         {%- endfor %}
     {%- endfor %}
-        "anyRef": {
-            "type": "string"
-        },
-        "externalRef": {
+        "IRI": {
             "type": "string",
             "pattern": "^(?!_:).*"
         },
-        "localRef": {
+        "BlankNode": {
             "type": "string",
             "pattern": "^_:.*"
         },
+        "BlankNodeOrIRI": {
+            "oneOf": [
+                { "$ref": "#/$defs/IRI" },
+                { "$ref": "#/$defs/BlankNode" }
+            ]
+        },
         "anyURI": {
             "type": "string"
         },