Fix runtime and code-generated handling of nested typeDSL

Author: tom-tan

schema_salad/codegen.py

@@ -57,6 +57,8 @@ def codegen(
         else ".".join(list(reversed(sp.netloc.split("."))) + sp.path.strip("/").split("/"))
     )
     info = parser_info or pkg
+    salad_version = schema_metadata.get("saladVersion", "v1.1")
+
     if lang in set(["python", "cpp", "dlang"]):
         if target:
             dest: Union[TextIOWrapper, TextIO] = open(target, mode="w", encoding="utf-8")
@@ -83,7 +85,9 @@ def codegen(
             )
             gen.parse(j)
             return
-        gen = PythonCodeGen(dest, copyright=copyright, parser_info=info)
+        gen = PythonCodeGen(
+            dest, copyright=copyright, parser_info=info, salad_version=salad_version
+        )
 
     elif lang == "java":
         gen = JavaCodeGen(

schema_salad/main.py

@@ -299,7 +299,10 @@ def main(argsl: Optional[List[str]] = None) -> int:
         raise ValidationException(f"Expected a CommentedSeq, got {type(schema_doc)}: {schema_doc}.")
 
     # Create the loader that will be used to load the target document.
-    document_loader = Loader(schema_ctx, skip_schemas=args.skip_schemas)
+    schema_version = schema_metadata.get("saladVersion", None)
+    document_loader = Loader(
+        schema_ctx, skip_schemas=args.skip_schemas, salad_version=schema_version
+    )
 
     if args.codegen:
         codegen.codegen(

schema_salad/metaschema.py

@@ -59,7 +59,6 @@ class LoadingOptions:
     cache: CacheType
     imports: List[str]
     includes: List[str]
-    salad_version: str
 
     def __init__(
         self,
@@ -74,7 +73,6 @@ 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
@@ -140,11 +138,6 @@ 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()
@@ -580,10 +573,11 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
 
 
 class _TypeDSLLoader(_Loader):
-    def __init__(self, inner, refScope):
-        # type: (_Loader, Union[int, None]) -> None
+    def __init__(self, inner, refScope, salad_version):
+        # type: (_Loader, Union[int, None], str) -> None
         self.inner = inner
         self.refScope = refScope
+        self.salad_version = salad_version
 
     def resolve(
         self,
@@ -599,7 +593,7 @@ def resolve(
             doc_ = doc_[0:-1]
 
         if doc_.endswith("[]"):
-            salad_versions = [int(v) for v in loadingOptions.salad_version[1:].split(".")]
+            salad_versions = [int(v) for v in self.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)
@@ -720,9 +714,6 @@ def _document_load(
                 loadingOptions,
             )
 
-        if "saladVersion" in doc:
-            loadingOptions.salad_version = doc["saladVersion"]
-
         if docuri != baseuri:
             loadingOptions.idx[docuri] = loadingOptions.idx[baseuri]
 
@@ -3585,6 +3576,7 @@ def save(
 typedsl_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_or_array_of_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_2 = _TypeDSLLoader(
     union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_or_array_of_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype,
     2,
+    "v1.1",
 )
 array_of_RecordFieldLoader = _ArrayLoader(RecordFieldLoader)
 union_of_None_type_or_array_of_RecordFieldLoader = _UnionLoader(
@@ -3597,7 +3589,7 @@ def save(
     union_of_None_type_or_array_of_RecordFieldLoader, "name", "type"
 )
 Record_nameLoader = _EnumLoader(("record",), "Record_name")
-typedsl_Record_nameLoader_2 = _TypeDSLLoader(Record_nameLoader, 2)
+typedsl_Record_nameLoader_2 = _TypeDSLLoader(Record_nameLoader, 2, "v1.1")
 union_of_None_type_or_strtype = _UnionLoader(
     (
         None_type,
@@ -3609,15 +3601,15 @@ def save(
 )
 uri_array_of_strtype_True_False_None = _URILoader(array_of_strtype, True, False, None)
 Enum_nameLoader = _EnumLoader(("enum",), "Enum_name")
-typedsl_Enum_nameLoader_2 = _TypeDSLLoader(Enum_nameLoader, 2)
+typedsl_Enum_nameLoader_2 = _TypeDSLLoader(Enum_nameLoader, 2, "v1.1")
 uri_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_or_array_of_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_False_True_2 = _URILoader(
     union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_or_array_of_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype,
     False,
     True,
     2,
 )
 Array_nameLoader = _EnumLoader(("array",), "Array_name")
-typedsl_Array_nameLoader_2 = _TypeDSLLoader(Array_nameLoader, 2)
+typedsl_Array_nameLoader_2 = _TypeDSLLoader(Array_nameLoader, 2, "v1.1")
 union_of_None_type_or_booltype = _UnionLoader(
     (
         None_type,
@@ -3674,7 +3666,7 @@ def save(
     union_of_None_type_or_array_of_SpecializeDefLoader, "specializeFrom", "specializeTo"
 )
 Documentation_nameLoader = _EnumLoader(("documentation",), "Documentation_name")
-typedsl_Documentation_nameLoader_2 = _TypeDSLLoader(Documentation_nameLoader, 2)
+typedsl_Documentation_nameLoader_2 = _TypeDSLLoader(Documentation_nameLoader, 2, "v1.1")
 union_of_SaladRecordSchemaLoader_or_SaladEnumSchemaLoader_or_DocumentationLoader = (
     _UnionLoader(
         (

schema_salad/python_codegen.py

@@ -82,6 +82,7 @@ def __init__(
         out: IO[str],
         copyright: Optional[str],
         parser_info: str,
+        salad_version: str,
     ) -> None:
         super().__init__()
         self.out = out
@@ -90,6 +91,7 @@ def __init__(
         self.idfield = ""
         self.copyright = copyright
         self.parser_info = parser_info
+        self.salad_version = salad_version
 
     @staticmethod
     def safe_name(name: str) -> str:
@@ -629,7 +631,7 @@ def typedsl_loader(self, inner: TypeDef, ref_scope: Optional[int]) -> TypeDef:
         return self.declare_type(
             TypeDef(
                 f"typedsl_{self.safe_name(inner.name)}_{ref_scope}",
-                f"_TypeDSLLoader({self.safe_name(inner.name)}, {ref_scope})",
+                f"_TypeDSLLoader({self.safe_name(inner.name)}, {ref_scope}, '{self.salad_version}')",
             )
         )
 

schema_salad/python_codegen_support.py

@@ -56,7 +56,6 @@ class LoadingOptions:
     cache: CacheType
     imports: List[str]
     includes: List[str]
-    salad_version: str
 
     def __init__(
         self,
@@ -71,7 +70,6 @@ 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
@@ -137,11 +135,6 @@ 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()
@@ -577,10 +570,11 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
 
 
 class _TypeDSLLoader(_Loader):
-    def __init__(self, inner, refScope):
-        # type: (_Loader, Union[int, None]) -> None
+    def __init__(self, inner, refScope, salad_version):
+        # type: (_Loader, Union[int, None], str) -> None
         self.inner = inner
         self.refScope = refScope
+        self.salad_version = salad_version
 
     def resolve(
         self,
@@ -596,7 +590,7 @@ def resolve(
             doc_ = doc_[0:-1]
 
         if doc_.endswith("[]"):
-            salad_versions = [int(v) for v in loadingOptions.salad_version[1:].split(".")]
+            salad_versions = [int(v) for v in self.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)
@@ -717,9 +711,6 @@ 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

@@ -140,6 +140,7 @@ def SubLoader(loader: "Loader") -> "Loader":
         url_fields=loader.url_fields,
         allow_attachments=loader.allow_attachments,
         session=loader.session,
+        salad_version=loader.salad_version,
     )
 
 
@@ -157,6 +158,7 @@ def __init__(
         url_fields: Optional[Set[str]] = None,
         allow_attachments: Optional[AttachmentsType] = None,
         doc_cache: Union[str, bool] = True,
+        salad_version: Optional[str] = None,
     ) -> None:
         self.idx: IdxType = (
             NormDict(lambda url: urllib.parse.urlsplit(url).geturl()) if idx is None else idx
@@ -205,7 +207,11 @@ def __init__(
         self.subscopes: Dict[str, str] = {}
         self.secondaryFile_dsl_fields: Set[str] = set()
         self.allow_attachments = allow_attachments
-        self.salad_version = "v1.0"
+
+        if salad_version:
+            self.salad_version = salad_version
+        else:
+            self.salad_version = "v1.1"
 
         self.add_context(ctx)
 

schema_salad/schema.py

@@ -177,7 +177,8 @@ def get_metaschema() -> Tuple[Names, List[Dict[str, str]], Loader]:
             },
             "typeDSL": saladp + "JsonldPredicate/typeDSL",
             "xsd": "http://www.w3.org/2001/XMLSchema#",
-        }
+        },
+        salad_version="v1.3",
     )
 
     for salad in SALAD_FILES:

schema_salad/tests/test_examples.py

@@ -333,7 +333,7 @@ def test_yaml_float_test() -> None:
 
 
 def test_typedsl_ref() -> None:
-    ldr = Loader({})
+    ldr = Loader({}, salad_version="v1.1")
     ldr.add_context(
         {
             "File": "http://example.com/File",
@@ -355,13 +355,12 @@ 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 = Loader({}, salad_version="v1.3")
     ldr.add_context(
         {
             "File": "http://example.com/File",
@@ -370,7 +369,6 @@ def test_nested_typedsl_ref() -> None:
             "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