Tentative support for switching nested TypeDSL with saladVersion

Author: tom-tan

schema_salad/metaschema.py

@@ -59,6 +59,7 @@ class LoadingOptions:
     cache: CacheType
     imports: List[str]
     includes: List[str]
+    salad_version: str
 
     def __init__(
         self,
@@ -73,6 +74,7 @@ def __init__(
         idx: Optional[IdxType] = None,
         imports: Optional[List[str]] = None,
         includes: Optional[List[str]] = None,
+        salad_version: Optional[str] = None,
     ) -> None:
         """Create a LoadingOptions object."""
         self.original_doc = original_doc
@@ -138,6 +140,11 @@ def __init__(
         self.vocab = _vocab
         self.rvocab = _rvocab
 
+        if salad_version:
+            self.salad_version = salad_version
+        else:
+            self.salad_version = "v1.0"
+
         if namespaces is not None:
             self.vocab = self.vocab.copy()
             self.rvocab = self.rvocab.copy()
@@ -592,9 +599,14 @@ def resolve(
             doc_ = doc_[0:-1]
 
         if doc_.endswith("[]"):
-            items = self.resolve(doc_[0:-2], baseuri, loadingOptions)
-            if isinstance(items, str):
-                items = expand_url(items, baseuri, loadingOptions, False, True, self.refScope)
+            salad_versions = [int(v) for v in loadingOptions.salad_version[1:].split(".")]
+            items = ""  # type: Union[list[Union[dict[str, Any], str]], dict[str, Any], str]
+            if salad_versions < [1, 3]:
+                items = expand_url(doc_[0:-2], baseuri, loadingOptions, False, True, self.refScope)
+            else:
+                items = self.resolve(doc_[0:-2], baseuri, loadingOptions)
+                if isinstance(items, str):
+                    items = expand_url(items, baseuri, loadingOptions, False, True, self.refScope)
             expanded = {"type": "array", "items": items}  # type: Union[Dict[str, Any], str]
         else:
             expanded = expand_url(doc_, baseuri, loadingOptions, False, True, self.refScope)
@@ -708,6 +720,9 @@ def _document_load(
                 loadingOptions,
             )
 
+        if "saladVersion" in doc:
+            loadingOptions.salad_version = doc["saladVersion"]
+
         if docuri != baseuri:
             loadingOptions.idx[docuri] = loadingOptions.idx[baseuri]
 

schema_salad/python_codegen_support.py

@@ -56,6 +56,7 @@ class LoadingOptions:
     cache: CacheType
     imports: List[str]
     includes: List[str]
+    salad_version: str
 
     def __init__(
         self,
@@ -70,6 +71,7 @@ def __init__(
         idx: Optional[IdxType] = None,
         imports: Optional[List[str]] = None,
         includes: Optional[List[str]] = None,
+        salad_version: Optional[str] = None,
     ) -> None:
         """Create a LoadingOptions object."""
         self.original_doc = original_doc
@@ -135,6 +137,11 @@ def __init__(
         self.vocab = _vocab
         self.rvocab = _rvocab
 
+        if salad_version:
+            self.salad_version = salad_version
+        else:
+            self.salad_version = "v1.0"
+
         if namespaces is not None:
             self.vocab = self.vocab.copy()
             self.rvocab = self.rvocab.copy()
@@ -589,9 +596,14 @@ def resolve(
             doc_ = doc_[0:-1]
 
         if doc_.endswith("[]"):
-            items = self.resolve(doc_[0:-2], baseuri, loadingOptions)
-            if isinstance(items, str):
-                items = expand_url(items, baseuri, loadingOptions, False, True, self.refScope)
+            salad_versions = [int(v) for v in loadingOptions.salad_version[1:].split(".")]
+            items = ""  # type: Union[list[Union[dict[str, Any], str]], dict[str, Any], str]
+            if salad_versions < [1, 3]:
+                items = expand_url(doc_[0:-2], baseuri, loadingOptions, False, True, self.refScope)
+            else:
+                items = self.resolve(doc_[0:-2], baseuri, loadingOptions)
+                if isinstance(items, str):
+                    items = expand_url(items, baseuri, loadingOptions, False, True, self.refScope)
             expanded = {"type": "array", "items": items}  # type: Union[Dict[str, Any], str]
         else:
             expanded = expand_url(doc_, baseuri, loadingOptions, False, True, self.refScope)
@@ -705,6 +717,9 @@ def _document_load(
                 loadingOptions,
             )
 
+        if "saladVersion" in doc:
+            loadingOptions.salad_version = doc["saladVersion"]
+
         if docuri != baseuri:
             loadingOptions.idx[docuri] = loadingOptions.idx[baseuri]
 

schema_salad/ref_resolver.py

@@ -205,6 +205,7 @@ def __init__(
         self.subscopes: Dict[str, str] = {}
         self.secondaryFile_dsl_fields: Set[str] = set()
         self.allow_attachments = allow_attachments
+        self.salad_version = "v1.0"
 
         self.add_context(ctx)
 
@@ -637,8 +638,12 @@ def _type_dsl(
             t_ = t_[0:-1]
 
         if t_.endswith("[]"):
-            items = self._type_dsl(t_[0:-2], lc, filename)
-            cmap = CommentedMap((("type", "array"), ("items", items)))
+            salad_versions = [int(v) for v in self.salad_version[1:].split(".")]
+            if salad_versions < [1, 3]:
+                cmap = CommentedMap((("type", "array"), ("items", t_[0:-2])))
+            else:
+                items = self._type_dsl(t_[0:-2], lc, filename)
+                cmap = CommentedMap((("type", "array"), ("items", items)))
             cmap.lc.add_kv_line_col("type", lc)
             cmap.lc.add_kv_line_col("items", lc)
             cmap.lc.filename = filename

schema_salad/tests/test_examples.py

@@ -355,6 +355,23 @@ def test_typedsl_ref() -> None:
     ra, _ = ldr.resolve_all(cmap({"type": "File[]?"}), "")
     assert {"type": ["null", {"items": "File", "type": "array"}]} == ra
 
+    assert ldr.salad_version == "v1.0"
+    ra, _ = ldr.resolve_all(cmap({"type": "File[][]"}), "")
+    assert {"type": {"items": "File[]", "type": "array"}} == ra
+
+
+def test_nested_typedsl_ref() -> None:
+    ldr = Loader({})
+    ldr.add_context(
+        {
+            "File": "http://example.com/File",
+            "null": "http://example.com/null",
+            "array": "http://example.com/array",
+            "type": {"@type": "@vocab", "typeDSL": True},
+        }
+    )
+    ldr.salad_version = "v1.3"
+
     ra, _ = ldr.resolve_all(cmap({"type": "File[][]"}), "")
     assert {"type": {"items": {"items": "File", "type": "array"}, "type": "array"}} == ra