Fix merge of markup PR (#591)

* Fix merge of #574 and #585

* Fix JSON Schema options definition

Author: eemeli

spec/data-model/README.md

@@ -111,19 +111,20 @@ interface CatchallKey {
 
 Each `Pattern` contains a linear sequence of text and placeholders corresponding to potential output of a message.
 
-Each element of the `Pattern` MUST either be a non-empty string or an `Expression` object.
+Each element of the `Pattern` MUST either be a non-empty string, an `Expression`, or a `Markup` object.
 String values represent literal _text_.
 String values include all processing of the underlying _text_ values,
 including escape sequence processing.
-`Expression` values wrap each of the _expression_ shapes.
+`Expression` wraps each of the potential _expression_ shapes.
+`Markup` wraps each of the potential _markup_ shapes.
 
 Implementations MUST NOT rely on the set of `Expression` and 
 `Markup` interfaces defined in this document being exhaustive.
 Future versions of this specification might define additional
 expressions or markup.
 
 ```ts
-type Pattern = Array<string | Expression>;
+type Pattern = Array<string | Expression | Markup>;
 
 type Expression =
   | LiteralExpression

spec/data-model/message.json

@@ -22,18 +22,21 @@
       },
       "required": ["type", "name"]
     },
-    "option": {
-      "type": "object",
-      "properties": {
-        "name": { "type": "string" },
-        "value": {
-          "oneOf": [
-            { "$ref": "#/$defs/literal" },
-            { "$ref": "#/$defs/variable" }
-          ]
-        }
-      },
-      "required": ["name", "value"]
+    "options": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": { "type": "string" },
+          "value": {
+            "oneOf": [
+              { "$ref": "#/$defs/literal" },
+              { "$ref": "#/$defs/variable" }
+            ]
+          }
+        },
+        "required": ["name", "value"]
+      }
     },
 
     "function-annotation": {
@@ -146,7 +149,11 @@
     "pattern": {
       "type": "array",
       "items": {
-        "oneOf": [{ "type": "string" }, { "$ref": "#/$defs/expression" }]
+        "oneOf": [
+          { "type": "string" },
+          { "$ref": "#/$defs/expression" },
+          { "$ref": "#/$defs/markup" }
+        ]
       }
     },