Add support for pattern formats for `patternProperties` (#1796)

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
pull/1802/head
Kévin Commaille 3 weeks ago committed by GitHub
parent 26ce3929b4
commit 2edfb21d5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1 @@
Add support for pattern formats for `patternProperties`.

@ -0,0 +1,33 @@
# Copyright 2024 Commaille Kévin
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# This file contains the list of custom formats supported for the `format` key
# and the `x-pattern-format` extension (see `openapi_extensions.md` for more
# details).
#
# Each entry must use the `mx-` prefix and have the form:
#
# mx-custom-key:
# title: The title rendered in the specification
# url: /url/to#definition
mx-user-id:
title: User ID
url: /appendices#user-identifiers
# regex: "^@"
mx-event-id:
title: Event ID
url: /appendices#event-ids
# regex: "^\\$"

@ -17,7 +17,7 @@ properties:
"^@": "^@":
type: "object" type: "object"
description: "An empty object for future enhancement" description: "An empty object for future enhancement"
x-pattern: "$USER_ID" x-pattern-format: "mx-user-id"
required: required:
- ignored_users - ignored_users
type: type:

@ -16,7 +16,7 @@ properties:
patternProperties: patternProperties:
"^\\$": "^\\$":
type: object type: object
x-pattern: "$EVENT_ID" x-pattern-format: "mx-event-id"
title: Event Receipts title: Event Receipts
description: |- description: |-
The collection of receipts for this event ID. The collection of receipts for this event ID.
@ -34,7 +34,7 @@ properties:
description: |- description: |-
The mapping of user ID to receipt. The user ID is the The mapping of user ID to receipt. The user ID is the
entity who sent this receipt. entity who sent this receipt.
x-pattern: "$USER_ID" x-pattern-format: "mx-user-id"
properties: properties:
ts: ts:
type: integer type: integer

@ -179,17 +179,45 @@
{{/* {{/*
If the property uses `patternProperties` to describe its If the property uses `patternProperties` to describe its
internal structure, handle this with a bit of recursion. internal structure, handle this with a bit of recursion.
Note that we ignore the pattern as the current definitions Types are grouped by pattern format. Note that we ignore
patterns without a format as the current definitions
always have a single pattern, but we might need to handle always have a single pattern, but we might need to handle
them later to differentiate schemas according to patterns. them later to differentiate schemas according to patterns.
*/}} */}}
{{/*
Construct a map from format ID to the type string of the format.
*/}}
{{ $formatMap := newScratch }}
{{ range $pattern, $schema := .patternProperties }}
{{ $formatId := or (index $schema "x-pattern-format") "string" }}
{{ if $formatMap.Get $formatId }}
{{ errorf "'%s' pattern format is defined more than once for the same property" $formatId }}
{{ end }}
{{ $formatMap.Set $formatId (partial "property-type" $schema) }}
{{ end }}
{{/* First generate the type string for each format. */}}
{{ $types := slice }} {{ $types := slice }}
{{ range $formatId, $formatType := $formatMap.Values }}
{{ $formatKey := "string" }}
{{ if ne $formatId "string" }}
{{ with index site.Data "custom-formats" $formatId }}
{{ $formatKey = printf "<a href=\"%s\">%s</a>" (htmlEscape .url) (htmlEscape .title) }}
{{ else }}
{{ errorf "Unsupported value for `x-pattern-format`: %s" $formatId }}
{{ end }}
{{ end }}
{{ range $pattern, $schema := .patternProperties}} {{ $formatString := printf "{%s: %s}" $formatKey $formatType }}
{{ $types = $types | append (partial "property-type" $schema) }} {{ $types = $types | append $formatString }}
{{ end }} {{ end }}
{{ $type = delimit (slice "{string: " (delimit $types "|") "}" ) "" }} {{/* Then join all the formats. */}}
{{ $type = delimit $types "|" }}
{{ end }} {{ end }}
{{ return $type }} {{ return $type }}

@ -31,3 +31,13 @@ particular Matrix specification versions.
Although the OpenAPI/JSON Schema specs only allow to use `$ref` to reference a Although the OpenAPI/JSON Schema specs only allow to use `$ref` to reference a
whole example, we use it to compose examples from other examples. whole example, we use it to compose examples from other examples.
## Custom `x-pattern-format` key and custom formats
In JSON Schema, [`format`](https://json-schema.org/understanding-json-schema/reference/string#format)
is a property to convey semantic information about a schema. We define
`x-pattern-format` as a key on the schemas under `patternProperties` with the
same use as `format`, but that applies to the pattern of the property. We also
define custom values for formats with the `mx-` prefix in
`data/custom-formats.yaml`. Those values are recognized in the rendered
specification and link to the definition of the format.

Loading…
Cancel
Save