Merge pull request #29 from OpenDataServices/28-anyof-allof

28 anyof allof

Author: James (ODSC)

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.5', '3.6', '3.7', '3.8']
+        python-version: [ '3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
     steps:
     - uses: actions/checkout@v2
     - name: Setup python

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- Process anyOf and allOf and well as oneOf https://github.com/OpenDataServices/compile-to-json-schema/issues/28
+
 ## [0.4.0] - 2021-07-30
 
 ### Added

compiletojsonschema/compiletojsonschema.py

@@ -72,6 +72,14 @@ def __process(self, source):
             for idx, data in enumerate(list(source["oneOf"])):
                 out["oneOf"][idx] = self.__process(source["oneOf"][idx])
 
+        if "anyOf" in source:
+            for idx, data in enumerate(list(source["anyOf"])):
+                out["anyOf"][idx] = self.__process(source["anyOf"][idx])
+
+        if "allOf" in source:
+            for idx, data in enumerate(list(source["allOf"])):
+                out["allOf"][idx] = self.__process(source["allOf"][idx])
+
         if "codelist" in source and (
             "openCodelist" not in source or not source["openCodelist"]
         ):

tests/fixtures/simple/file-list-allof.json

@@ -0,0 +1,21 @@
+{
+  "id": "file-list-allof.json",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "version": "0.1",
+  "type": "array",
+  "items": {
+    "allOf": [
+      {
+        "$ref": "file-list-component-part1.json"
+      },
+      {
+        "type": "object",
+        "properties": {
+          "pets": {
+            "type": "string"
+          }
+        }
+      }
+    ]
+  }
+}

tests/fixtures/simple/file-list-anyof.json

@@ -4,12 +4,12 @@
   "version": "0.1",
   "type": "array",
   "items": {
-    "oneOf": [
+    "anyOf": [
       {
-        "$ref": "file-list-anyof-part1.json"
+        "$ref": "file-list-component-part1.json"
       },
       {
-        "$ref": "file-list-anyof-part2.json"
+        "$ref": "file-list-component-part2.json"
       }
     ]
   }

tests/fixtures/simple/file-list-anyof-part1.json renamed to tests/fixtures/simple/file-list-component-part1.json

@@ -0,0 +1,16 @@
+{
+  "id": "file-list-oneof.json",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "version": "0.1",
+  "type": "array",
+  "items": {
+    "oneOf": [
+      {
+        "$ref": "file-list-component-part1.json"
+      },
+      {
+        "$ref": "file-list-component-part2.json"
+      }
+    ]
+  }
+}

tests/fixtures/simple/file-list-anyof-part2.json renamed to tests/fixtures/simple/file-list-component-part2.json

@@ -78,6 +78,31 @@ def test_file_list_anyof():
     out_string = ctjs.get_as_string()
     out = json.loads(out_string)
 
+    assert out["items"]["anyOf"][0]["properties"]["address"]["title"] == "Home Address"
+    assert (
+        out["items"]["anyOf"][0]["properties"]["address"]["description"]
+        == "Where the person lives"
+    )
+    assert out["items"]["anyOf"][1]["properties"]["address"]["title"] == "Work Address"
+    assert (
+        out["items"]["anyOf"][1]["properties"]["address"]["description"]
+        == "Where the person works"
+    )
+
+
+def test_file_list_oneof():
+
+    input_filename = os.path.join(
+        os.path.dirname(os.path.realpath(__file__)),
+        "fixtures",
+        "simple",
+        "file-list-oneof.json",
+    )
+
+    ctjs = CompileToJsonSchema(input_filename=input_filename)
+    out_string = ctjs.get_as_string()
+    out = json.loads(out_string)
+
     assert out["items"]["oneOf"][0]["properties"]["address"]["title"] == "Home Address"
     assert (
         out["items"]["oneOf"][0]["properties"]["address"]["description"]
@@ -90,6 +115,26 @@ def test_file_list_anyof():
     )
 
 
+def test_file_list_allof():
+
+    input_filename = os.path.join(
+        os.path.dirname(os.path.realpath(__file__)),
+        "fixtures",
+        "simple",
+        "file-list-allof.json",
+    )
+
+    ctjs = CompileToJsonSchema(input_filename=input_filename)
+    out_string = ctjs.get_as_string()
+    out = json.loads(out_string)
+
+    assert out["items"]["allOf"][0]["properties"]["address"]["title"] == "Home Address"
+    assert (
+        out["items"]["allOf"][0]["properties"]["address"]["description"]
+        == "Where the person lives"
+    )
+
+
 def test_passing_empty_schema_is_ok():
     ctjs = CompileToJsonSchema(input_schema={})
     assert "{}" == ctjs.get_as_string()