Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add description of union types #720

Merged
merged 2 commits into from
Jul 29, 2023
Merged

Add description of union types #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf9182c
Clarify union types
tom-tan Jul 22, 2023
a8a9e1e
Fix tests
tom-tan Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion schema_salad/metaschema/metaschema_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,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
Expand Down
2 changes: 1 addition & 1 deletion schema_salad/tests/metaschema-pre.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"typeDSL": true,
"refScope": 2
},
"doc": "The field type\n"
"doc": "The field type. If it is an array, it indicates\nthat the field type is a union type of its elements.\nIts elements may be duplicated.\n"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion schema_salad/tests/test_makedoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,5 +239,5 @@ def test_detect_changes_in_html(metaschema_doc: str, tmp_path: Path) -> None:
with open(result, "w") as h:
h.write(metaschema_doc)
assert (
hasher.hexdigest() == "360fcb7860e6ccc15db70a20f95247a0b5ee729dd3446747463e68054e186e59"
hasher.hexdigest() == "400bd8b4f3af31ffaeeb04b7780a140b0d26151645016e49a1a375964b67ea7e"
), result