From d6bc230473045bc5ac999b180cca27afca480fc5 Mon Sep 17 00:00:00 2001
From: GlassOfWhiskey <iacopo.c92@gmail.com>
Date: Sat, 7 Oct 2023 14:56:33 +0200
Subject: [PATCH] Make CWLType extend original sld:Type

---
 Base.yml                                      | 35 ++-----------------
 .../metaschema/metaschema_base.yml            |  8 ++++-
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/Base.yml b/Base.yml
index 36a562d2..a3c82fc5 100644
--- a/Base.yml
+++ b/Base.yml
@@ -19,19 +19,8 @@ $graph:
 
 - name: CWLArraySchema
   type: record
+  extends: "sld:ArraySchema"
   fields:
-    type:
-      doc: "Must be `array`"
-      type:
-        type: enum
-        name: cwl_array_name
-        symbols:
-          - "sld:array"
-      jsonldPredicate:
-        _id: "sld:type"
-        _type: "@vocab"
-        typeDSL: true
-        refScope: 2
     items:
       type:
         - PrimitiveType
@@ -54,15 +43,8 @@ $graph:
 
 - name: CWLRecordField
   type: record
-  extends: "sld:Documented"
-  doc: A field of a record.
+  extends: "sld:RecordField"
   fields:
-    - name: name
-      type: string
-      jsonldPredicate: "@id"
-      doc: |
-        The name of the field
-
     - name: type
       type:
         - PrimitiveType
@@ -87,19 +69,8 @@ $graph:
 
 - name: CWLRecordSchema
   type: record
+  extends: "sld:RecordSchema"
   fields:
-    type:
-      doc: "Must be `record`"
-      type:
-        type: enum
-        name: cwl_record_name
-        symbols:
-          - "sld:record"
-      jsonldPredicate:
-        _id: "sld:type"
-        _type: "@vocab"
-        typeDSL: true
-        refScope: 2
     fields:
       type: CWLRecordField[]?
       jsonldPredicate:
diff --git a/salad/schema_salad/metaschema/metaschema_base.yml b/salad/schema_salad/metaschema/metaschema_base.yml
index 459e28b1..c29b6f99 100644
--- a/salad/schema_salad/metaschema/metaschema_base.yml
+++ b/salad/schema_salad/metaschema/metaschema_base.yml
@@ -77,6 +77,7 @@ $graph:
         - RecordSchema
         - EnumSchema
         - ArraySchema
+        - MapSchema
         - UnionSchema
         - string
         - type: array
@@ -85,6 +86,7 @@ $graph:
             - RecordSchema
             - EnumSchema
             - ArraySchema
+            - MapSchema
             - UnionSchema
             - string
       jsonldPredicate:
@@ -93,7 +95,9 @@ $graph:
         typeDSL: true
         refScope: 2
       doc: |
-        The field type
+        The field type. If it is an array, it indicates
+        that the field type is a union type of its elements.
+        Its elements may be duplicated.
 
 
 - name: RecordSchema
@@ -170,6 +174,7 @@ $graph:
         - RecordSchema
         - EnumSchema
         - ArraySchema
+        - MapSchema
         - UnionSchema
         - string
         - type: array
@@ -178,6 +183,7 @@ $graph:
             - RecordSchema
             - EnumSchema
             - ArraySchema
+            - MapSchema
             - UnionSchema
             - string
       jsonldPredicate: