rebase master

Author: Ethan-Arrowood

src/cli.ts

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 import { whiteBright } from 'cli-color'
-import { JSONSchema4 } from 'json-schema'
 import minimist = require('minimist')
 import { readFile, writeFile, existsSync } from 'mz/fs'
 import * as _mkdirp from 'mkdirp'

test/__snapshots__/test/test.ts.md

@@ -1539,6 +1539,78 @@ Generated by [AVA](https://ava.li).
     }␊
     `
 
+## files in (-i), files out (-o)
+
+> Snapshot 1
+
+    `/* tslint:disable */␊
+    /**␊
+     * This file was automatically generated by json-schema-to-typescript.␊
+     * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,␊
+     * and run json-schema-to-typescript to regenerate this file.␊
+     */␊
+    ␊
+    export interface ASchema {␊
+      f: string;␊
+      g?: number;␊
+    }␊
+    `
+
+> Snapshot 2
+
+    `/* tslint:disable */␊
+    /**␊
+     * This file was automatically generated by json-schema-to-typescript.␊
+     * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,␊
+     * and run json-schema-to-typescript to regenerate this file.␊
+     */␊
+    ␊
+    export interface BSchema {␊
+      x?: string;␊
+      y: number;␊
+      [k: string]: any;␊
+    }␊
+    `
+
+## files in (-i), files out (-o) nested dir does not exist
+
+> Snapshot 1
+
+    `/* tslint:disable */␊
+    /**␊
+     * This file was automatically generated by json-schema-to-typescript.␊
+     * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,␊
+     * and run json-schema-to-typescript to regenerate this file.␊
+     */␊
+    ␊
+    export interface ASchema {␊
+      f: string;␊
+      g?: number;␊
+    }␊
+    `
+
+> Snapshot 2
+
+    `/* tslint:disable */␊
+    /**␊
+     * This file was automatically generated by json-schema-to-typescript.␊
+     * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,␊
+     * and run json-schema-to-typescript to regenerate this file.␊
+     */␊
+    ␊
+    export interface BSchema {␊
+      x?: string;␊
+      y: number;␊
+      [k: string]: any;␊
+    }␊
+    `
+
+## files in (-i), pipe out
+
+> Snapshot 1
+
+    ''
+
 ## formatterOptions.js
 
 > Snapshot 1
@@ -9425,77 +9497,3 @@ Generated by [AVA](https://ava.li).
       [k: string]: any;␊
     }␊
     `
-
-## files in (-i), files out (-o)
-
-> Snapshot 1
-
-    `/* tslint:disable */␊
-    /**␊
-     * This file was automatically generated by json-schema-to-typescript.␊
-     * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,␊
-     * and run json-schema-to-typescript to regenerate this file.␊
-     */␊
-    ␊
-    export interface ASchema {␊
-      f: string;␊
-      g?: number;␊
-    }␊
-    `
-
-## files in (-i), files out (-o)
-
-> Snapshot 2
-
-    `/* tslint:disable */␊
-    /**␊
-     * This file was automatically generated by json-schema-to-typescript.␊
-     * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,␊
-     * and run json-schema-to-typescript to regenerate this file.␊
-     */␊
-    ␊
-    export interface BSchema {␊
-      x?: string;␊
-      y: number;␊
-      [k: string]: any;␊
-    }␊
-    `
-
-## files in (-i), files out (-o) nested dir does not exist
-
-> Snapshot 1
-
-    `/* tslint:disable */␊
-    /**␊
-     * This file was automatically generated by json-schema-to-typescript.␊
-     * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,␊
-     * and run json-schema-to-typescript to regenerate this file.␊
-     */␊
-    ␊
-    export interface ASchema {␊
-      f: string;␊
-      g?: number;␊
-    }␊
-    `
-
-> Snapshot 2
-
-    `/* tslint:disable */␊
-    /**␊
-     * This file was automatically generated by json-schema-to-typescript.␊
-     * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,␊
-     * and run json-schema-to-typescript to regenerate this file.␊
-     */␊
-    ␊
-    export interface BSchema {␊
-      x?: string;␊
-      y: number;␊
-      [k: string]: any;␊
-    }␊
-    `
-
-## files in (-i), pipe out
-
-> Snapshot 1
-
-    ''