ArraySchema.items is also TypeDSL

Othwerwise the codegen code doesn't allow refering to arrays of custom types
common-workflow-language · Sep 4, 2021 · 5fccc55 · 5fccc55
1 parent b2abeb5
commit 5fccc55
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/schema_salad/metaschema.py b/schema_salad/metaschema.py
@@ -1053,7 +1053,7 @@ def fromDoc(cls, doc, baseuri, loadingOptions, docRoot=None):
         _errors__ = []
         try:
             items = load_field(_doc.get(
-                'items'), 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, baseuri, loadingOptions)
+                'items'), 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, baseuri, loadingOptions)
         except ValidationException as e:
             _errors__.append(
                 ValidationException(
@@ -1104,14 +1104,11 @@ def save(self, top=False, base_url="", relative_uris=True):
             r[prefix_url(ef, self.loadingOptions.vocab)] = self.extension_fields[ef]
 
         if self.items is not None:
-            u = save_relative_uri(
+            r['items'] = save(
                 self.items,
-                base_url,
-                False,
-                2,
-                relative_uris)
-            if u:
-                r['items'] = u
+                top=False,
+                base_url=base_url,
+                relative_uris=relative_uris)
 
         if self.type is not None:
             r['type'] = save(
@@ -2847,7 +2844,6 @@ def save(self, top=False, base_url="", relative_uris=True):
 uri_array_of_strtype_True_False_None = _URILoader(array_of_strtype, True, False, None)
 enum_d961d79c225752b9fadb617367615ab176b47d77Loader = _EnumLoader(("enum",))
 typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77Loader_2 = _TypeDSLLoader(enum_d961d79c225752b9fadb617367615ab176b47d77Loader, 2)
-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)
 enum_d062602be0b4b8fd33e69e29a841317b6ab665bcLoader = _EnumLoader(("array",))
 typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bcLoader_2 = _TypeDSLLoader(enum_d062602be0b4b8fd33e69e29a841317b6ab665bcLoader, 2)
 union_of_None_type_or_strtype = _UnionLoader((None_type, strtype,))

diff --git a/schema_salad/metaschema/metaschema_base.yml b/schema_salad/metaschema/metaschema_base.yml
@@ -173,4 +173,5 @@ $graph:
         _id: "sld:items"
         _type: "@vocab"
         refScope: 2
+        typeDSL: True
       doc: "Defines the type of the array elements."
diff --git a/schema_salad/tests/metaschema-pre.yml b/schema_salad/tests/metaschema-pre.yml
@@ -265,7 +265,8 @@
                 "jsonldPredicate": {
                     "_id": "https://w3id.org/cwl/salad#items",
                     "_type": "@vocab",
-                    "refScope": 2
+                    "refScope": 2,
+                    "typeDSL": true
                 }
             },
             {