shacl2code 0.0.9__tar.gz → 0.0.10__tar.gz

{shacl2code-0.0.9 → shacl2code-0.0.10}/PKG-INFO

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

@@ -36,11 +36,13 @@
 
     "oneOf": [
         {
+            "type": "object",
             "properties": {
                 "@graph": {
                     "description": "Top level container for JSON-LD objects",
                     "type": "array",
                     "items": {
+                        "type": "object",
                         "$ref": "#/$defs/AnyClass",
                         "unevaluatedProperties": false
                     }
@@ -60,14 +62,15 @@
         "{{ varname(class.clsname) }}": {
             "allOf": [
                 {
-                    {%- if class.extensible %}
+                    "type": "object",
+                    {%- if class.is_extensible %}
                     "unevaluatedProperties": true,
                     {%- endif %}
                     "properties": {
                         "{{ class.id_property or "@id" }}": { "$ref": "#/$defs/{{ class.node_kind.split("#")[-1] }}" },
                         "{{ context.compact("@type") }}": {
                             "oneOf": [
-                                {%- if class.extensible %}
+                                {%- if class.is_extensible %}
                                 { "$ref": "#/$defs/IRI" },
                                 {%- endif %}
                                 { "const": "{{ context.compact_vocab(class._id) }}" }
@@ -81,24 +84,26 @@
             ]
         },
         "{{ varname(class.clsname) }}_derived": {
-            {%- if not class.extensible %}
-            "unevaluatedProperties": false,
-            {%- endif %}
             {%- set ns = namespace(external_ref=False, local_ref=False, any_ref=False, json_refs=[]) %}
             {%- for d in get_all_derived(class) + [class._id] %}
                 {%- set ns.json_refs = ns.json_refs + ["#/$defs/" + varname(classes.get(d).clsname)] %}
             {%- endfor %}
-            {%- set ns.json_refs = ns.json_refs + ["#/$defs/BlankNodeOrIRI"] %}
-
-            {%- if ns.json_refs | length == 1 %}
-            "$ref": "{{ ns.json_refs[0] }}",
-            {%- elif ns.json_refs %}
             "anyOf": [
-                {%- for r in ns.json_refs %}
-                { "$ref": "{{ r }}" }{% if not loop.last %},{% endif %}
-                {%- endfor %}
+                {%- if ns.json_refs %}
+                {
+                    "type": "object",
+                    {%- if not class.is_extensible %}
+                    "unevaluatedProperties": false,
+                    {%- endif %}
+                    "anyOf": [
+                        {%- for r in ns.json_refs %}
+                        { "$ref": "{{ r }}" }{% if not loop.last %},{% endif %}
+                        {%- endfor %}
+                    ]
+                },
+                {%- endif %}
+                { "$ref": "#/$defs/BlankNodeOrIRI" }
             ]
-            {%- endif %}
         },
         "{{ varname(class.clsname) }}_props": {
             "allOf": [
@@ -111,6 +116,7 @@
                 {%- endif %}
                 {%- set required = [] %}
                 {
+                    "type": "object",
                     "properties": {
                         {%- for prop in class.properties %}
                         {%- if not prop.min_count is none and prop.min_count > 0 %}
@@ -155,14 +161,14 @@
         },
         {%- for prop in class.properties %}
         "prop_{{ varname(class.clsname) }}_{{ varname(prop.varname) }}": {
-            {%- if prop.class_id %}
-                "$ref": "#/$defs/{{ varname(classes.get(prop.class_id).clsname) }}_derived"
-            {%- elif prop.enum_id %}
+            {%- if prop.enum_values %}
                 "enum": [
-                {%- for e in enums.get(prop.enum_id).values %}
-                    "{{ context.compact_vocab(e._id, prop.path) }}"{% if not loop.last %},{% endif %}
+                {%- for e in prop.enum_values %}
+                    "{{ context.compact_vocab(e, prop.path) }}"{% if not loop.last %},{% endif %}
                 {%- endfor %}
                 ]
+            {%- elif prop.class_id %}
+                "$ref": "#/$defs/{{ varname(classes.get(prop.class_id).clsname) }}_derived"
             {%- else %}
                 {%- if prop.datatype == "http://www.w3.org/2001/XMLSchema#string" %}
                     {%- if prop.pattern %}