Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-26 13:04:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update resolve-additional-types to take a dict

Browse source 
I want to add more params to this, so first make it take a dict.
This commit is contained in:
Richard van der Hoff 2022-07-19 17:13:14 +01:00
parent 16b3cc1617
commit c508f1e917
6 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
layouts/partials/events/render-event.html
View file

@ -53,7 +53,7 @@
<h2>Content</h2> <h2>Content</h2>
{{ $additional_types := partial "json-schema/resolve-additional-types" $event_data.properties.content }} {{ $additional_types := partial "json-schema/resolve-additional-types" (dict "schema" $event_data.properties.content) }}
{{ range $additional_types }} {{ range $additional_types }}
{{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }} {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}

12
layouts/partials/json-schema/resolve-additional-types.html
View file

@ -1,11 +1,9 @@
{{/* {{/*
Finds and returns all nested objects, given: Finds and returns all nested objects, given a dict containing:
* `schema`: a JSON schema object
* `this_object`: a JSON schema object This template finds all nested objects inside `schema`.
Given a schema object, this template finds all nested objects under that
schema.
Assumes that "resolve-refs" and "resolve-allof" has already been called on the Assumes that "resolve-refs" and "resolve-allof" has already been called on the
input schema. input schema.
@ -19,7 +17,7 @@
*/}} */}}
{{ $this_object := . }} {{ $this_object := .schema }}
{{ $additional_objects := slice }} {{ $additional_objects := slice }}
{{ if eq $this_object.type "object" }} {{ if eq $this_object.type "object" }}
@ -79,7 +77,7 @@
*/ */
{{ $this_object := partial "json-schema/resolve-allof" .this_object }} {{ $this_object := partial "json-schema/resolve-allof" .this_object }}
{{ $more_objects := partial "json-schema/resolve-additional-types" $this_object }} {{ $more_objects := partial "json-schema/resolve-additional-types" (dict "schema" $this_object) }}
{{/* {{/*
As far as I know we don't have something like Array.concat(), so add them one at a time As far as I know we don't have something like Array.concat(), so add them one at a time
*/}} */}}

2
layouts/partials/openapi/render-request.html
View file

@ -38,7 +38,7 @@
{{ $schema := partial "json-schema/resolve-refs" (dict "schema" $body_parameter.schema "path" $path) }} {{ $schema := partial "json-schema/resolve-refs" (dict "schema" $body_parameter.schema "path" $path) }}
{{ $schema := partial "json-schema/resolve-allof" $schema }} {{ $schema := partial "json-schema/resolve-allof" $schema }}
{{ $additional_types := partial "json-schema/resolve-additional-types" $schema }} {{ $additional_types := partial "json-schema/resolve-additional-types" (dict "schema" $schema) }}
{{ $additional_types = uniq $additional_types }} {{ $additional_types = uniq $additional_types }}
{{ range $additional_types }} {{ range $additional_types }}
{{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }} {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}

2
layouts/partials/openapi/render-responses.html
View file

@ -71,7 +71,7 @@
response. (This will be a no-op for response types which aren't response. (This will be a no-op for response types which aren't
objects or arrays.) objects or arrays.)
*/}} */}}
{{ $additional_types := partial "json-schema/resolve-additional-types" $schema }} {{ $additional_types := partial "json-schema/resolve-additional-types" (dict "schema" $schema) }}
{{ $additional_types = uniq $additional_types }} {{ $additional_types = uniq $additional_types }}
{{ range $additional_types }} {{ range $additional_types }}
{{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }} {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}

2
layouts/shortcodes/definition.html
View file

@ -45,7 +45,7 @@
</summary> </summary>
{{ $additional_types := partial "json-schema/resolve-additional-types" $definition }} {{ $additional_types := partial "json-schema/resolve-additional-types" (dict "schema" $definition) }}
{{ $additional_types = uniq $additional_types }} {{ $additional_types = uniq $additional_types }}
{{ range $additional_types }} {{ range $additional_types }}

2
layouts/shortcodes/event-fields.html
View file

@ -35,7 +35,7 @@
{{ $event = merge $event (dict "title" "") }} {{ $event = merge $event (dict "title" "") }}
{{ $additional_types := partial "json-schema/resolve-additional-types" $event }} {{ $additional_types := partial "json-schema/resolve-additional-types" (dict "schema" $event) }}
{{ range $additional_types }} {{ range $additional_types }}
{{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }} {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}
{{end}} {{end}}