diff --git a/schemas/2020-12/iso/datetime/2019/duration/designator-extension.json b/schemas/2020-12/iso/datetime/2019/duration/designator-extension.json index 103a440f..b6c4d0ef 100644 --- a/schemas/2020-12/iso/datetime/2019/duration/designator-extension.json +++ b/schemas/2020-12/iso/datetime/2019/duration/designator-extension.json @@ -15,28 +15,6 @@ "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE", "x-links": [ "https://www.iso.org/standard/70908.html" ], "type": "string", - "allOf": [ - { - "not": { - "const": "P" - } - }, - { - "not": { - "const": "PT" - } - }, - { - "not": { - "const": "-P" - } - }, - { - "not": { - "const": "-PT" - } - } - ], "anyOf": [ { "$comment": "Positive: Date-only: Years with decimal (lowest order)", @@ -422,5 +400,8 @@ "$comment": "Negative: Date+Time: Days + Seconds with decimal (lowest order)", "pattern": "^-P[0-9]+DT[0-9]+(?:\\.[0-9]+)?S$" } - ] + ], + "not": { + "enum": [ "P", "PT", "-P", "-PT" ] + } } diff --git a/schemas/2020-12/iso/datetime/2019/duration/designator.json b/schemas/2020-12/iso/datetime/2019/duration/designator.json index 90213d2c..463d3d94 100644 --- a/schemas/2020-12/iso/datetime/2019/duration/designator.json +++ b/schemas/2020-12/iso/datetime/2019/duration/designator.json @@ -14,18 +14,6 @@ "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE", "x-links": [ "https://www.iso.org/standard/70907.html" ], "type": "string", - "allOf": [ - { - "not": { - "const": "P" - } - }, - { - "not": { - "const": "PT" - } - } - ], "anyOf": [ { "$comment": "Date-only: Years with decimal (lowest order)", @@ -219,5 +207,8 @@ "$comment": "Date+Time: Days + Seconds with decimal (lowest order)", "pattern": "^P[0-9]+DT[0-9]+(?:\\.[0-9]+)?S$" } - ] + ], + "not": { + "enum": [ "P", "PT" ] + } }