Upgrade dependencies. Add yarn

Author: domoritz

package.json

@@ -38,27 +38,27 @@
     "schema"
   ],
   "dependencies": {
-    "glob": "~7.1.1",
+    "glob": "~7.1.2",
     "json-stable-stringify": "^1.0.1",
     "typescript": "~2.1.5",
-    "yargs": "^7.0.2"
+    "yargs": "^8.0.1"
   },
   "devDependencies": {
     "@types/assertion-error": "^1.0.30",
-    "@types/chai": "^3.4.35",
+    "@types/chai": "^3.5.2",
     "@types/glob": "^5.0.30",
-    "@types/json-stable-stringify": "^1.0.30",
-    "@types/mocha": "^2.2.39",
-    "@types/node": "^7.0.5",
-    "ajv": "^4.11.3",
-    "chai": "^3.5.0",
-    "mocha": "^3.2.0",
-    "source-map-support": "^0.4.11",
-    "tslint": "^4.5.0"
+    "@types/json-stable-stringify": "^1.0.31",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^7.0.22",
+    "ajv": "^5.1.5",
+    "chai": "^4.0.0",
+    "mocha": "^3.4.2",
+    "source-map-support": "^0.4.15",
+    "tslint": "^5.3.2"
   },
   "scripts": {
     "test": "npm run build && mocha -t 5000 --require source-map-support/register test",
     "build": "tsc -p .",
-    "lint": "tslint -c tslint.json 'typescript-json-schema.ts' 'test/**/*.ts' --exclude '**/*.d.ts'"
+    "lint": "tslint --project tsconfig.json -c tslint.json --type-check --exclude '**/*.d.ts'"
   }
 }

test/schema.test.ts

@@ -7,17 +7,20 @@ import * as Ajv from "ajv";
 
 const ajv = new Ajv();
 
-const base = "test/programs/";
+const metaSchema = require("ajv/lib/refs/json-schema-draft-04.json");
+ajv.addMetaSchema(metaSchema, "http://json-schema.org/draft-04/schema#");
+
+const BASE = "test/programs/";
 
 export function assertSchema(group: string, name: string, type: string, settings: TJS.PartialArgs = {}, compilerOptions?: CompilerOptions) {
     it(group + " should create correct schema", () => {
         if (!("generateRequired" in settings)) {
             settings.generateRequired = true;
         }
 
-        const actual = TJS.generateSchema(TJS.getProgramFromFiles([resolve(base + group + "/" + name)], compilerOptions), type, settings);
+        const actual = TJS.generateSchema(TJS.getProgramFromFiles([resolve(BASE + group + "/" + name)], compilerOptions), type, settings);
 
-        const file = readFileSync(base + group + "/schema.json", "utf8");
+        const file = readFileSync(BASE + group + "/schema.json", "utf8");
         const expected = JSON.parse(file);
 
         assert.isObject(actual);
@@ -33,7 +36,7 @@ export function assertSchema(group: string, name: string, type: string, settings
 
 describe("interfaces", () => {
     it("should return an instance of JsonSchemaGenerator", () => {
-        const program = TJS.getProgramFromFiles([resolve(base + "comments/main.ts")]);
+        const program = TJS.getProgramFromFiles([resolve(BASE + "comments/main.ts")]);
         const generator = TJS.buildGenerator(program);
 
         assert.instanceOf(generator, TJS.JsonSchemaGenerator);
@@ -47,7 +50,7 @@ describe("interfaces", () => {
         }
     });
     it("should output the schemas set by setSchemaOverride", () => {
-        const program = TJS.getProgramFromFiles([resolve(base + "interface-multi/main.ts")]);
+        const program = TJS.getProgramFromFiles([resolve(BASE + "interface-multi/main.ts")]);
         const generator = TJS.buildGenerator(program);
         assert(generator !== null);
         if (generator !== null) {

tslint.json

@@ -50,6 +50,7 @@
     "no-switch-case-fall-through": true,
     "quotemark": [true, "double", "avoid-escape"],
     "triple-equals": [true, "allow-null-check"],
-    "variable-name": [true, "check-format", "allow-leading-underscore", "ban-keywords"]
+    "variable-name": [true, "check-format", "allow-leading-underscore", "ban-keywords"],
+    "object-literal-key-quotes": [true, "as-needed"]
   }
 }

typescript-json-schema.ts

@@ -247,7 +247,7 @@ export class JsonSchemaGenerator {
             definition.items = fixedTypes;
             definition.minItems = fixedTypes.length;
             definition.additionalItems = {
-                "anyOf": fixedTypes
+                anyOf: fixedTypes
             };
         } else {
             const propertyTypeString = tc.typeToString(propertyType, undefined, ts.TypeFormatFlags.UseFullyQualifiedType);
@@ -676,7 +676,7 @@ export class JsonSchemaGenerator {
 
         if (asRef) {
             returnedDefinition = {
-                "$ref":  "#/definitions/" + fullTypeName
+                $ref:  "#/definitions/" + fullTypeName
             };
         }
 
@@ -760,7 +760,7 @@ export class JsonSchemaGenerator {
 
     public getSchemaForSymbols(symbols: string[]): Definition {
         const root = {
-            "$schema": "http://json-schema.org/draft-04/schema#",
+            $schema: "http://json-schema.org/draft-04/schema#",
             definitions: {}
         };
         for (let i = 0; i < symbols.length; i++) {