Issue YousefED#113: @TJS-format now fully supported.

Author: robertmassaioli

test/programs/annotation-tjs/main.ts

@@ -0,0 +1,47 @@
+// All of these formats are defined in this specification: http://json-schema.org/latest/json-schema-validation.html#rfc.section.8.3
+interface MyObject {
+    /**
+     * @TJS-format date-time
+     */
+    dateTime: string;
+
+    /**
+     * @TJS-format email
+     */
+    email: string;
+
+    /**
+     * @TJS-format hostname
+     */
+    hostname: string;
+
+    /**
+     * @TJS-format ipv4
+     */
+    ipv4: string;
+
+    /**
+     * @TJS-format ipv6
+     */
+    ipv6: string;
+
+    /**
+     * @TJS-format uri
+     */
+    uri: string;
+
+    /**
+     * @TJS-format uri-reference
+     */
+    uriReference: string;
+
+    /**
+     * @TJS-format uri-template
+     */
+    uriTemplate: string;
+
+    /**
+     * @TJS-format json-pointer
+     */
+    jsonPointer: string;
+}

test/programs/annotation-tjs/schema.json

@@ -0,0 +1,53 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "properties": {
+    "dateTime": {
+      "format": "date-time",
+      "type": "string"
+    },
+    "email": {
+      "format": "email",
+      "type": "string"
+    },
+    "hostname": {
+      "format": "hostname",
+      "type": "string"
+    },
+    "ipv4": {
+      "format": "ipv4",
+      "type": "string"
+    },
+    "ipv6": {
+      "format": "ipv6",
+      "type": "string"
+    },
+    "jsonPointer": {
+      "format": "json-pointer",
+      "type": "string"
+    },
+    "uri": {
+      "format": "uri",
+      "type": "string"
+    },
+    "uriReference": {
+      "format": "uri-reference",
+      "type": "string"
+    },
+    "uriTemplate": {
+      "format": "uri-template",
+      "type": "string"
+    }
+  },
+  "required": [
+    "dateTime",
+    "email",
+    "hostname",
+    "ipv4",
+    "ipv6",
+    "jsonPointer",
+    "uri",
+    "uriReference",
+    "uriTemplate"
+  ],
+  "type": "object"
+}

typescript-json-schema.ts

@@ -7,7 +7,7 @@ import * as stringify from "json-stable-stringify";
 const vm = require("vm");
 
 const REGEX_FILE_NAME = /".*"\./;
-const REGEX_TJS_JSDOC = /^-([\w]+)\s([\w]+)/g;
+const REGEX_TJS_JSDOC = /^-([\w]+)\s([\w-]+)/g;
 
 export function getDefaultArgs(): Args {
     return {