jsonschema: Add JSF (JSON Signature Format) support

src/shacl2code/lang/common.py

@@ -137,6 +137,7 @@ def get_all_named_individuals(cls):
             "concrete_classes": concrete_classes,
             "abstract_classes": abstract_classes,
             "context": model.context,
+            "jsf_signature": model.jsf_signature,
             **self.get_additional_render_args(model),
         }
 

src/shacl2code/lang/templates/cpp/jsonld-source.j2

@@ -485,6 +485,17 @@ void JSONLDDeserializer::read(std::istream& input, SHACLObjectSet& objectSet,
         errorHandler.handleDeserializeError("Invalid context URLs", path);
         return;
     }
+    {%- if jsf_signature %}
+    if (d.contains("{{ jsf_signature }}")) {
+        path.pushMember("{{ jsf_signature }}", [&] {
+            if (!d["{{ jsf_signature }}"].is_object()) {
+                errorHandler.handleDeserializeError("Signature {{ jsf_signature }} must be an object", path);
+                return;
+            }
+        });
+        d.erase("{{ jsf_signature }}");
+    }
+    {%- endif %}
 
     if (!d.contains("@graph")) {
         JSONData data;

src/shacl2code/lang/templates/golang/shaclobjectset.go.j2

@@ -53,6 +53,8 @@ var CONTEXT_URLS = []string{
 	  {{ '/' }}{{ '*' }}*/
 }
 
+var JSF_SIGNATURE = "{{ jsf_signature or '' }}"
+
 func makeshaclObjectList(lst []SHACLObject) shaclObjectList {
 	idx := make(map[SHACLObject]int)
 	for i, o := range lst {
@@ -187,6 +189,16 @@ func (self *SHACLObjectSetObject) Decode(decoder *json.Decoder) error {
 		return DecodeSHACLObject[SHACLObject](data, path, context, nil, state)
 	}
 
+	if JSF_SIGNATURE != "" {
+		if signature, found := data[JSF_SIGNATURE]; found {
+			_, ok := signature.(map[string]interface{})
+			if !ok {
+				return &DecodeError{path, "Bad type for signature '" + JSF_SIGNATURE + "'"}
+			}
+		}
+		delete(data, JSF_SIGNATURE)
+	}
+
 	_, has_graph := data["@graph"]
 	if has_graph {
 		for k, v := range data {

src/shacl2code/lang/templates/jsonschema.j2

@@ -50,12 +50,24 @@
                     "$ref": "#/$defs/AnyClass",
                     "unevaluatedProperties": false
                 }
-            }
+            }{%- if jsf_signature %},
+            "{{ jsf_signature }}": {
+                "$ref": "#/$defs/JSF"
+            }{%- endif %}
         },
         "required": ["@graph"]
     },
     "else": {
-        "$ref": "#/$defs/AnyClass"
+        "allOf": [
+            {
+                "$ref": "#/$defs/AnyClass"
+            }{%- if jsf_signature %},
+            {
+                "properties": {
+                    "{{ jsf_signature }}": { "$ref": "#/$defs/JSF" }
+                }
+            }{%- endif %}
+        ]
     },
     "unevaluatedProperties": false,
 
@@ -328,6 +340,7 @@
                     }
                 }
             ]
-        }
+        },
+        "JSF": { "type": "object" }
     }
 }

src/shacl2code/lang/templates/python/cmd.py.j2

@@ -6,9 +6,10 @@
 
 import argparse
 from pathlib import Path
-from typing import Any, Iterable, List
+from typing import Any
 
 from .model import (
+    DataPath,
     JSONLDDeserializer,
     JSONLDSerializer,
     ListProxy,
@@ -17,13 +18,13 @@ from .model import (
 )
 
 
-def print_tree(objects: Iterable[SHACLObject], all_fields: bool = False) -> None:
+def print_tree(objectset: SHACLObjectSet, all_fields: bool = False) -> None:
     """
     Print object tree
     """
     seen = set()
 
-    def callback(value: Any, path: List[str]) -> bool:
+    def callback(value: Any, path: DataPath) -> bool:
         s = ("  " * (len(path) - 1)) + f"{path[-1]}"
         if isinstance(value, SHACLObject):
             s += f" {value} ({id(value)})"
@@ -47,8 +48,7 @@ def print_tree(objects: Iterable[SHACLObject], all_fields: bool = False) -> None
 
         return True
 
-    for o in objects:
-        o.walk(callback)
+    objectset.walk(callback)
 
 
 def main() -> int:
@@ -65,7 +65,7 @@ def main() -> int:
         d.read(f, objectset)
 
     if args.print:
-        print_tree(objectset.objects)
+        print_tree(objectset)
 
     if args.outfile:
         with args.outfile.open("wb") as f: