resolve definitions dependencies for generated json scheme

plantain-00 · Jul 24, 2017 · 65cd778 · 65cd778
1 parent 1d9782b
commit 65cd778
Show file tree

Hide file tree

Showing 9 changed files with 194 additions and 691 deletions.
diff --git a/demo/flow-protocol.json b/demo/flow-protocol.json
@@ -1,247 +1,6 @@
 {
+  "$ref": "#/definitions/FlowProtocol",
   "definitions": {
-    "RequestProtocol": {
-      "type": "object",
-      "properties": {
-        "requestId": {
-          "type": "number"
-        },
-        "kind": {
-          "type": "string",
-          "enum": [
-            "search logs",
-            "search samples",
-            "resave failed logs"
-          ]
-        },
-        "searchLogs": {
-          "$ref": "#/definitions/SearchLogs"
-        },
-        "searchSamples": {
-          "$ref": "#/definitions/SearchSamples"
-        }
-      },
-      "required": [
-        "requestId",
-        "kind"
-      ],
-      "additionalProperties": false,
-      "maxProperties": 3
-    },
-    "SearchLogs": {
-      "type": "object",
-      "properties": {
-        "content": {
-          "type": "string"
-        },
-        "time": {
-          "type": "string"
-        },
-        "hostname": {
-          "type": "string"
-        },
-        "from": {
-          "type": "number"
-        },
-        "size": {
-          "type": "number"
-        }
-      },
-      "required": [
-        "content",
-        "time",
-        "hostname",
-        "from",
-        "size"
-      ],
-      "additionalProperties": false
-    },
-    "SearchSamples": {
-      "type": "object",
-      "properties": {
-        "from": {
-          "type": "string"
-        },
-        "to": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "from",
-        "to"
-      ],
-      "additionalProperties": false
-    },
-    "ResponseProtocol": {
-      "type": "object",
-      "properties": {
-        "kind": {
-          "type": "string",
-          "enum": [
-            "flows",
-            "history samples",
-            "search logs result",
-            "search samples result",
-            "resave failed logs result"
-          ]
-        },
-        "flows": {
-          "$ref": "#/definitions/Flows"
-        },
-        "historySamples": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/SampleFrame"
-          }
-        },
-        "searchLogsResult": {
-          "$ref": "#/definitions/SearchLogsResult"
-        },
-        "searchSamplesResult": {
-          "$ref": "#/definitions/SearchSamplesResult"
-        },
-        "resaveFailedLogsResult": {
-          "$ref": "#/definitions/ResaveFailedLogsResult"
-        }
-      },
-      "required": [
-        "kind"
-      ],
-      "additionalProperties": false,
-      "maxProperties": 2
-    },
-    "Flows": {
-      "type": "object",
-      "properties": {
-        "serverTime": {
-          "type": "string"
-        },
-        "flows": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Flow"
-          }
-        }
-      },
-      "required": [
-        "serverTime",
-        "flows"
-      ],
-      "additionalProperties": false
-    },
-    "SearchLogsResult": {
-      "type": "object",
-      "properties": {
-        "requestId": {
-          "type": "number"
-        },
-        "kind": {
-          "type": "string",
-          "enum": [
-            "success",
-            "fail"
-          ]
-        },
-        "total": {
-          "type": "number"
-        },
-        "logs": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Log"
-          }
-        },
-        "error": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "requestId",
-        "kind"
-      ],
-      "additionalProperties": false,
-      "minProperties": 3,
-      "maxProperties": 4
-    },
-    "SearchSamplesResult": {
-      "type": "object",
-      "properties": {
-        "requestId": {
-          "type": "number"
-        },
-        "kind": {
-          "type": "string",
-          "enum": [
-            "success",
-            "fail"
-          ]
-        },
-        "searchSampleResult": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/SampleFrame"
-          }
-        },
-        "error": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "requestId",
-        "kind"
-      ],
-      "additionalProperties": false,
-      "maxProperties": 3
-    },
-    "ResaveFailedLogsResult": {
-      "type": "object",
-      "properties": {
-        "requestId": {
-          "type": "number"
-        },
-        "kind": {
-          "type": "string",
-          "enum": [
-            "success",
-            "fail"
-          ]
-        },
-        "savedCount": {
-          "type": "number"
-        },
-        "totalCount": {
-          "type": "number"
-        },
-        "error": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "requestId",
-        "kind"
-      ],
-      "additionalProperties": false,
-      "minProperties": 3,
-      "maxProperties": 4
-    },
-    "SampleFrame": {
-      "type": "object",
-      "properties": {
-        "time": {
-          "type": "string"
-        },
-        "samples": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Sample"
-          }
-        }
-      },
-      "required": [
-        "time"
-      ],
-      "additionalProperties": false
-    },
     "FlowProtocol": {
       "type": "object",
       "properties": {
@@ -327,6 +86,5 @@
       ],
       "additionalProperties": false
     }
-  },
-  "$ref": "#/definitions/FlowProtocol"
+  }
 }
diff --git a/demo/match-debug.json b/demo/match-debug.json
@@ -121,6 +121,7 @@
     "type": {
       "kind": "string"
     },
+    "entry": "team-schema.json",
     "uniqueItems": true,
     "minItems": 1
   }

diff --git a/demo/match-schema.json b/demo/match-schema.json
@@ -1,4 +1,5 @@
 {
+  "$ref": "#/definitions/Groups",
   "definitions": {
     "Groups": {
       "type": "array",
@@ -85,6 +86,5 @@
       "uniqueItems": true,
       "minItems": 1
     }
-  },
-  "$ref": "#/definitions/Groups"
+  }
 }
diff --git a/demo/match.ts b/demo/match.ts
@@ -41,6 +41,7 @@ export type Match = {
 };
 
 /**
+ * @entry team-schema.json
  * @uniqueItems
  * @minItems 1
  */