Fix the old typeDSL handling for better message

Author: tom-tan

schema_salad/metaschema.py

@@ -595,10 +595,15 @@ def resolve(
         if doc_.endswith("[]"):
             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]
+            rest = doc_[0:-2]
             if salad_versions < [1, 3]:
-                items = expand_url(doc_[0:-2], baseuri, loadingOptions, False, True, self.refScope)
+                if rest.endswith("[]"):
+                    # To show the error message with the original type
+                    return doc
+                else:
+                    items = expand_url(rest, baseuri, loadingOptions, False, True, self.refScope)
             else:
-                items = self.resolve(doc_[0:-2], baseuri, loadingOptions)
+                items = self.resolve(rest, 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]

schema_salad/python_codegen_support.py

@@ -592,10 +592,15 @@ def resolve(
         if doc_.endswith("[]"):
             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]
+            rest = doc_[0:-2]
             if salad_versions < [1, 3]:
-                items = expand_url(doc_[0:-2], baseuri, loadingOptions, False, True, self.refScope)
+                if rest.endswith("[]"):
+                    # To show the error message with the original type
+                    return doc
+                else:
+                    items = expand_url(rest, baseuri, loadingOptions, False, True, self.refScope)
             else:
-                items = self.resolve(doc_[0:-2], baseuri, loadingOptions)
+                items = self.resolve(rest, 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]

schema_salad/ref_resolver.py

@@ -645,10 +645,15 @@ def _type_dsl(
 
         if t_.endswith("[]"):
             salad_versions = [int(v) for v in self.salad_version[1:].split(".")]
+            rest = t_[0:-2]
             if salad_versions < [1, 3]:
-                cmap = CommentedMap((("type", "array"), ("items", t_[0:-2])))
+                if rest.endswith("[]"):
+                    # To show the error message with the original type
+                    return t
+                else:
+                    cmap = CommentedMap((("type", "array"), ("items", rest)))
             else:
-                items = self._type_dsl(t_[0:-2], lc, filename)
+                items = self._type_dsl(rest, lc, filename)
                 cmap = CommentedMap((("type", "array"), ("items", items)))
             cmap.lc.add_kv_line_col("type", lc)
             cmap.lc.add_kv_line_col("items", lc)

schema_salad/tests/test_examples.py

@@ -9,6 +9,7 @@
 
 import schema_salad.main
 import schema_salad.schema
+from schema_salad.exceptions import ValidationException
 from schema_salad.jsonld_context import makerdf
 from schema_salad.ref_resolver import Loader, file_uri, uri_file_path
 from schema_salad.sourceline import SourceLine, cmap
@@ -355,8 +356,8 @@ def test_typedsl_ref() -> None:
     ra, _ = ldr.resolve_all(cmap({"type": "File[]?"}), "")
     assert {"type": ["null", {"items": "File", "type": "array"}]} == ra
 
-    ra, _ = ldr.resolve_all(cmap({"type": "File[][]"}), "")
-    assert {"type": {"items": "File[]", "type": "array"}} == ra
+    with pytest.raises(ValidationException):
+        ldr.resolve_all(cmap({"type": "File[][]"}), "")
 
 
 def test_nested_typedsl_ref() -> None: