Adjust ref scopes

Author: Peter Amstutz

schema_salad/metaschema/metaschema.yml

@@ -286,7 +286,7 @@ $graph:
         _id: sld:type
         _type: "@vocab"
         typeDSL: true
-        refScope: 0
+        refScope: 2
       doc: |
         The field type
 
@@ -318,7 +318,7 @@ $graph:
         _id: "sld:type"
         _type: "@vocab"
         typeDSL: true
-        refScope: 0
+        refScope: 2
     - name: "fields"
       type: RecordField[]?
       jsonldPredicate: "sld:fields"
@@ -346,7 +346,7 @@ $graph:
       jsonldPredicate:
         _id: "sld:extends"
         _type: "@id"
-        refScope: 0
+        refScope: 1
       doc: |
         Indicates that this record inherits fields from one or more base records.
 
@@ -377,7 +377,7 @@ $graph:
         _id: "sld:type"
         _type: "@vocab"
         typeDSL: true
-        refScope: 0
+        refScope: 2
     - name: "symbols"
       type: string[]
       jsonldPredicate:
@@ -401,7 +401,7 @@ $graph:
       jsonldPredicate:
         _id: "sld:extends"
         _type: "@id"
-        refScope: 0
+        refScope: 1
       doc: |
         Indicates that this enum inherits symbols from a base enum.
 
@@ -420,7 +420,7 @@ $graph:
         _id: "sld:type"
         _type: "@vocab"
         typeDSL: true
-        refScope: 0
+        refScope: 2
     - name: items
       type:
         - PrimitiveType
@@ -438,7 +438,7 @@ $graph:
       jsonldPredicate:
         _id: "sld:items"
         _type: "@vocab"
-        refScope: 0
+        refScope: 2
       doc: "Defines the type of the array elements."
 
 
@@ -461,4 +461,4 @@ $graph:
         _id: "sld:type"
         _type: "@vocab"
         typeDSL: true
-        refScope: 0
+        refScope: 2

schema_salad/schema.py

@@ -94,7 +94,7 @@ def get_metaschema():
         "extends": {
             "@id": "https://w3id.org/cwl/salad#extends",
             "@type": "@id",
-            "refScope": 0
+            "refScope": 1
         },
         "fields": "sld:fields",
         "float": "http://www.w3.org/2001/XMLSchema#float",
@@ -103,7 +103,7 @@ def get_metaschema():
         "items": {
             "@id": "https://w3id.org/cwl/salad#items",
             "@type": "@vocab",
-            "refScope": 0
+            "refScope": 2
         },
         "jsonldPredicate": "sld:jsonldPredicate",
         "long": "http://www.w3.org/2001/XMLSchema#long",
@@ -135,8 +135,8 @@ def get_metaschema():
         "type": {
             "@id": "https://w3id.org/cwl/salad#type",
             "@type": "@vocab",
-            "typeDSL": True,
-            "refScope": 0
+            "refScope": 2,
+            "typeDSL": True
         },
         "typeDSL": "https://w3id.org/cwl/salad#JsonldPredicate/typeDSL",
         "xsd": "http://www.w3.org/2001/XMLSchema#"

tests/test_examples.py

@@ -172,6 +172,9 @@ def test_scoped_ref(self):
             {'inputs': [{
                 'id': 'http://example2.com/#inp',
                 'type': 'string'
+            }, {
+                'id': 'http://example2.com/#inp2',
+                'type': 'string'
             }],
              'outputs': [{
                 'id': 'http://example2.com/#out',
@@ -186,7 +189,10 @@ def test_scoped_ref(self):
                             'source': 'http://example2.com/#inp'
                     }, {
                             'id': 'http://example2.com/#step1/inp2',
-                            'source': 'http://example2.com/#inp'
+                            'source': 'http://example2.com/#inp2'
+                    }, {
+                            'id': 'http://example2.com/#step1/inp3',
+                            'source': ['http://example2.com/#inp', 'http://example2.com/#inp2']
                     }],
                     "out": ["http://example2.com/#step1/out"],
             }, {