Do not use `title` for objects containing only `additionalProperties` or `patternProperties` (#1801)

Previously, titles would appear that do not link to a subchema definition.
It would also mean that named subschemas would appear without being clearly referenced.

Now, the type clearly shows the nesting of objects
and subschema definitions should be clearly referenced.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
pull/1800/head^2
Kévin Commaille 7 months ago committed by GitHub
parent 85ad0c767c
commit 1fc25d8d48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1 @@
Do not use the `title` of objects containing only `additionalProperties` or `patternProperties`.

@ -84,6 +84,9 @@
* `oneOf`: optional array of dictionaries describing the different formats * `oneOf`: optional array of dictionaries describing the different formats
that the property can have that the property can have
* `properties`: if the type is an object, optional dictionary for
well-defined properties, each given as: `property_name` : `property_data`
* `additionalProperties`: if the type is an object, optional dictionary for * `additionalProperties`: if the type is an object, optional dictionary for
properties with undefined names properties with undefined names
@ -148,6 +151,9 @@
* `title`: optional string for the title of the object property * `title`: optional string for the title of the object property
* `properties`: optional dictionary for well-defined properties, each given
as: `property_name` : `property_data`
* `additionalProperties`: optional dictionary for properties with undefined * `additionalProperties`: optional dictionary for properties with undefined
names names
@ -155,19 +161,19 @@
adhering to a regex pattern adhering to a regex pattern
* `anchor`: optional HTML element id for the target type, which will be used to link to it. * `anchor`: optional HTML element id for the target type, which will be used to link to it.
The title has a higher priority than anything else.
*/}} */}}
{{ define "partials/object-type-or-title" }} {{ define "partials/object-type-or-title" }}
{{ $type := "object" }} {{ $type := "object" }}
{{ if .title }} {{ if .properties }}
{{/* {{/*
If the property has a `title`, use that rather than `type`. The object has its own (regular) properties, so we will make a
This means we can write things like `EventFilter` rather than `object`. separate table for it. Refer to it using its title, if it has one.
*/}} */}}
{{ $type = .title | htmlEscape }} {{ if .title }}
{{ if .anchor }} {{ $type = .title | htmlEscape }}
{{ $type = printf "<a href=\"#%s\">%s</a>" (htmlEscape .anchor) $type }} {{ if .anchor }}
{{ $type = printf "<a href=\"#%s\">%s</a>" (htmlEscape .anchor) $type }}
{{ end }}
{{ end }} {{ end }}
{{ else if reflect.IsMap .additionalProperties }} {{ else if reflect.IsMap .additionalProperties }}
{{/* {{/*
@ -218,6 +224,13 @@
{{/* Then join all the formats. */}} {{/* Then join all the formats. */}}
{{ $type = delimit $types "|" }} {{ $type = delimit $types "|" }}
{{ else if .title }}
{{/*
No properties, so there won't be a separate table. We use the title
anyway, because showing the title (like `EventFilter`) is better
than showing `object`.
*/}}
{{ $type = .title | htmlEscape }}
{{ end }} {{ end }}
{{ return $type }} {{ return $type }}

Loading…
Cancel
Save