Allow idmaps for record fields.

Author: Peter Amstutz

schema_salad/metaschema/metaschema_base.yml

@@ -43,19 +43,19 @@ $graph:
   type: record
   doc: A field of a record.
   fields:
-    - name: name
+    name:
       type: string
       jsonldPredicate: "@id"
       doc: |
         The name of the field
 
-    - name: doc
+    doc:
       type: string?
       doc: |
         A documentation string for this field
       jsonldPredicate: "sld:doc"
 
-    - name: type
+    type:
       type:
         - PrimitiveType
         - RecordSchema
@@ -81,7 +81,7 @@ $graph:
 - name: RecordSchema
   type: record
   fields:
-    - name: type
+    type:
       doc: "Must be `record`"
       type:
         name: Record_symbol
@@ -93,9 +93,12 @@ $graph:
         _type: "@vocab"
         typeDSL: true
         refScope: 2
-    - name: "fields"
+    fields:
       type: RecordField[]?
-      jsonldPredicate: "sld:fields"
+      jsonldPredicate:
+        _id: sld:fields
+        mapSubject: name
+        mapPredicate: type
       doc: "Defines the fields of the record."
 
 
@@ -104,7 +107,7 @@ $graph:
   doc: |
     Define an enumerated type.
   fields:
-    - name: type
+    type:
       doc: "Must be `enum`"
       type:
         name: Enum_symbol
@@ -116,7 +119,7 @@ $graph:
         _type: "@vocab"
         typeDSL: true
         refScope: 2
-    - name: "symbols"
+    symbols:
       type: string[]
       jsonldPredicate:
         _id: "sld:symbols"
@@ -128,7 +131,7 @@ $graph:
 - name: ArraySchema
   type: record
   fields:
-    - name: type
+    type:
       doc: "Must be `array`"
       type:
         name: Array_symbol
@@ -140,7 +143,7 @@ $graph:
         _type: "@vocab"
         typeDSL: true
         refScope: 2
-    - name: items
+    items:
       type:
         - PrimitiveType
         - RecordSchema

schema_salad/schema.py

@@ -97,7 +97,11 @@ def get_metaschema():
             "@type": "@id",
             "refScope": 1
         },
-        "fields": "sld:fields",
+        "fields": {
+            "@id": "sld:fields",
+            "mapSubject": "name",
+            "mapPredicate": "type"
+        },
         "float": "http://www.w3.org/2001/XMLSchema#float",
         "identity": "https://w3id.org/cwl/salad#JsonldPredicate/identity",
         "int": "http://www.w3.org/2001/XMLSchema#int",

setup.py

@@ -41,7 +41,7 @@
 extras_require = {}               # TODO: to be removed when the above is added
 
 setup(name='schema-salad',
-      version='1.12',
+      version='1.13',
       description='Schema Annotations for Linked Avro Data (SALAD)',
       long_description=open(README).read(),
       author='Common workflow language working group',