Add missing id, name fields to json schema docs

s2tQuicktypeUtil.js

@@ -44,7 +44,7 @@ while (dirIndex < inputs.length) {
 //const quicktypeExec = "node " + ["..","quicktype","dist","index.js"].join(path.sep);
 const quicktypeExec = ['.', 'node_modules', '.bin', 'quicktype'].join(path.sep);
 
-const command = `${quicktypeExec} --prefer-const-values --prefer-unions -s schema -o ${outputFile} ${sources}`;
+const command = `${quicktypeExec} --prefer-const-values --prefer-unions --no-combine-classes -s schema -o ${outputFile} ${sources}`;
 console.log('command to run: ' + command);
 
 exec(command, function(error, stdout, stderr) {

schemas/context/chatSearchCriteria.schema.json

@@ -16,22 +16,7 @@
           "description": "An array of criteria that should match chats returned from by a search.\n\n⚠️ Operators (and/or/not) are not defined in `fdc3.chat.searchCriteria`. It is up to the application that processes the FDC3 Intent to choose and apply the operators between the criteria.\n\nEmpty search criteria can be supported to allow resetting of filters.",
           "type": "array",
           "items": {
-            "anyOf": [
-              {
-                "$ref": "instrument.schema.json#"
-              },
-              {
-                "$ref": "organization.schema.json#"
-              },
-              {
-                "$ref": "contact.schema.json#"
-              },
-              {
-                "type": "string",
-                "title": "Free text",
-                "description": "Free text to be used for a keyword search"
-              }
-            ]
+            "$ref": "#/$defs/SearchCriteria"
           }
         }
       },
@@ -41,6 +26,29 @@
     },
     { "$ref": "context.schema.json#/definitions/BaseContext" }
   ],
+  "$defs": {
+    "SearchCriteria": {
+      "type": "object",
+      "title": "Search Criteria",
+      "description": "An individual criteria against which to match chat messages, based on an FDC3 context or free-text string.",
+      "oneOf": [
+        {
+          "$ref": "instrument.schema.json#"
+        },
+        {
+          "$ref": "contact.schema.json#"
+        },
+        {
+          "$ref": "organization.schema.json#"
+        },
+        {
+          "type": "string",
+          "title": "Free text",
+          "description": "Free text to be used for a keyword search"
+        }
+      ]
+    }
+  },
   "examples": [
     {
       "type": "fdc3.chat.searchCriteria",

schemas/context/contact.schema.json

@@ -28,6 +28,10 @@
               "description": "FactSet Permanent Identifier representing the contact"
             }
           }
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable name for the contact"
         }
       },
       "required": [

schemas/context/contactList.schema.json

@@ -11,6 +11,18 @@
         "type": {
           "const": "fdc3.contactList"
         },
+        "id": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "title": "Contact List Identifiers",
+          "description": "One or more identifiers that refer to the contact list in an OMS, EMS or related system. Specific key names for systems are expected to be standardized in future."
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable summary of the contact list"
+        },
         "contacts": {
           "type": "array",
           "title": "List of Contacts",
@@ -47,4 +59,4 @@
       ]
     }
   ]
-}
+}

schemas/context/country.schema.json

@@ -37,6 +37,10 @@
               "deprecated": true
             }
           }
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable name for the country"
         }
       },
       "required": [
@@ -54,4 +58,4 @@
       }
     }
   ]
-}
+}

schemas/context/instrument.schema.json

@@ -63,6 +63,11 @@
             }
           }
         },
+        "name": {
+          "type": "string",
+          "title": "Name",
+          "description": "An optional human-readable name for the instrument"
+        },  
         "market": {
           "description": "The `market` map can be used to further specify the instrument and help achieve interoperability between disparate data sources. This is especially useful when using an `id` field that is not globally unique.",
           "type": "object",

schemas/context/instrumentList.schema.json

@@ -11,6 +11,18 @@
         "type": {
           "const": "fdc3.instrumentList"
         },
+        "id": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "title": "Instrument List Identifiers",
+          "description": "One or more identifiers that refer to the instrument list in an OMS, EMS or related system. Specific key names for systems are expected to be standardized in future."
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable summary of the instrument list"
+        },
         "instruments": {
           "type": "array",
           "title": "List of instruments",
@@ -48,4 +60,4 @@
       ]
     }
   ]
-}
+}

schemas/context/orderList.schema.json

@@ -11,6 +11,18 @@
         "type": {
           "const": "fdc3.orderList"
         },
+        "id": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "title": "Order List Identifiers",
+          "description": "One or more identifiers that refer to the order list in an OMS, EMS or related system. Specific key names for systems are expected to be standardized in future."
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable summary of the order list"
+        },
         "orders": {
           "type": "array",
           "items": {
@@ -46,4 +58,4 @@
       ]
     }
   ]
-}
+}

schemas/context/organization.schema.json

@@ -33,6 +33,10 @@
               "description": "FactSet Permanent Identifier representing the organization"
             }
           }
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable name for the organization"
         }
       },
       "required": [

schemas/context/portfolio.schema.json

@@ -18,6 +18,18 @@
           },
           "title": "Portfolio positions",
           "description": "The List of Positions which make up the Portfolio"
+        },
+        "id": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "title": "Portfolio Identifiers",
+          "description": "One or more identifiers that refer to the portfolio in an OMS, EMS or related system. Specific key names for systems are expected to be standardized in future."
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable name for the portfolio"
         }
       },
       "required": [
@@ -63,4 +75,4 @@
       ]
     }
   ]
-}
+}

schemas/context/position.schema.json

@@ -20,6 +20,18 @@
           "type": "number",
           "title": "The size of the holding represented by this position",
           "description": "The amount of the holding, e.g. a number of shares"
+        },
+        "id": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "title": "Position Identifiers",
+          "description": "One or more identifiers that refer to the position in an OMS, EMS or related system. Specific key names for systems are expected to be standardized in future."
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable name for the position"
         }
       },
       "required": [
@@ -41,4 +53,4 @@
       "holding": 2000000
     }
   ]
-}
+}

schemas/context/tradeList.schema.json

@@ -18,7 +18,20 @@
           },
           "title": "List of Trades",
           "description": "An array of trade contexts that forms the list."
+        },
+        "id": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "title": "Trade List Identifiers",
+          "description": "One or more identifiers that refer to the trade list in an OMS, EMS or related system. Specific key names for systems are expected to be standardized in future."
+        },
+        "name": {
+          "type": "string",
+          "description": "An optional human-readable name for the trade list"
         }
+
       },
       "required": [
         "type",
@@ -71,4 +84,4 @@
       ]
     }
   ]
-}
+}