fix revisions

Author: Ethan-Arrowood

.vscode/settings.json

@@ -1,19 +1,5 @@
 // Place your settings in this file to overwrite default and user settings.
 {
     "typescript.tsdk": "node_modules/typescript/lib",
-    "editor.tabSize": 2,
-    "workbench.colorCustomizations": {
-        "activityBar.background": "#cba9e2",
-        "activityBar.foreground": "#15202b",
-        "activityBar.inactiveForeground": "#15202b99",
-        "activityBarBadge.background": "#8f6930",
-        "activityBarBadge.foreground": "#e7e7e7",
-        "titleBar.activeBackground": "#b483d5",
-        "titleBar.inactiveBackground": "#b483d599",
-        "titleBar.activeForeground": "#15202b",
-        "titleBar.inactiveForeground": "#15202b99",
-        "statusBar.background": "#b483d5",
-        "statusBarItem.hoverBackground": "#9d5dc8",
-        "statusBar.foreground": "#15202b"
-    }
+    "editor.tabSize": 2
 }

package.json

@@ -47,6 +47,7 @@
   "dependencies": {
     "@types/is-glob": "^4.0.1",
     "@types/json-schema": "^7.0.3",
+    "@types/mkdirp": "^0.5.2",
     "@types/node": ">=4.5.0",
     "@types/prettier": "^1.16.1",
     "cli-color": "^1.4.0",
@@ -56,6 +57,7 @@
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.11",
     "minimist": "^1.2.0",
+    "mkdirp": "^0.5.1",
     "mz": "^2.7.0",
     "prettier": "^1.18.2",
     "stdin": "0.0.1"

src/cli.ts

@@ -3,14 +3,23 @@
 import { whiteBright } from 'cli-color'
 import { JSONSchema4 } from 'json-schema'
 import minimist = require('minimist')
-import { readFile, writeFile, mkdir, existsSync } from 'mz/fs'
+import { readFile, writeFile, existsSync } from 'mz/fs'
+import * as _mkdirp from 'mkdirp'
 import * as _glob from 'glob'
 import isGlob = require('is-glob')
 import { promisify } from 'util'
 import { join, resolve, basename } from 'path'
 import stdin = require('stdin')
 import { compile, Options } from './index'
 
+// Promisify mkdirp
+const mkdirp = (path: string) => new Promise((res, rej) => {
+  _mkdirp(path, (err, made) => {
+    if (err) rej(err)
+    else res(made)
+  })
+})
+
 const glob = promisify(_glob)
 
 main(minimist(process.argv.slice(2), {
@@ -33,24 +42,34 @@ async function main(argv: minimist.ParsedArgs) {
   const argOut: string = argv._[1] || argv.output
 
   try {
-    if (isGlob(argIn)) {
-      if (!existsSync(argOut)) {
-        await mkdir(argOut)
-      }
-
-      const files = await glob(join(process.cwd(), argIn))
-      const processFiles = files.map(file => processFile(file, { dir: argOut }, argv as Partial<Options>))
-      await Promise.all(processFiles)
-    } else {
-      await processFile(argIn, { file: argOut }, argv as Partial<Options>)
-    }
+    let files = await getFilesToProcess(argIn, argOut, argv as Partial<Options>)
+    await Promise.all(files)
   } catch (e) {
     console.error(whiteBright.bgRedBright('error'), e)
     process.exit(1)
   }
 }
 
-function processFile(file: string, out: {dir?: string, file?: string}, argv: Partial<Options>) {
+function getFilesToProcess(argIn: string, argOut: string, argv: Partial<Options>): Promise<Promise<void>[]> {
+  return new Promise(async (res, rej) => {
+    if (isGlob(argIn)){
+      let files = await glob(join(process.cwd(), argIn))
+
+      if (files.length === 0) {
+        rej('No files match glob pattern')
+      }
+
+      if (!existsSync(argOut)) {
+        await mkdirp(argOut)
+      }
+
+      res(files.map(file => processFile(file, { dir: argOut }, argv)))
+    }
+    res([processFile(argIn, { file: argOut }, argv)])
+  })
+}
+
+function processFile(file: string, out: {dir?: string, file?: string}, argv: Partial<Options>): Promise<void> {
   return new Promise(async (res, rej) => {
     try {
       const schema = JSON.parse(await readInput(file))

test/__snapshots__/test/test.ts.md

@@ -9460,3 +9460,42 @@ Generated by [AVA](https://ava.li).
       [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
+
+    ''

test/__snapshots__/test/test.ts.snap

@@ -93,4 +93,20 @@ export function run() {
     rmdirSync('./test/resources/MultiSchema/out')
   })
 
+  test('files in (-i), pipe out', t => {
+    t.snapshot(
+      execSync('node dist/src/cli.js -i ./test/resources/MultiSchema/**/*.json').toString()
+    )
+  })
+
+  test('files in (-i), files out (-o) nested dir does not exist', t => {
+    execSync('node dist/src/cli.js -i ./test/resources/MultiSchema/**/*.json -o ./test/resources/MultiSchema/foo/bar/out').toString()
+    
+    readdirSync('./test/resources/MultiSchema/foo/bar/out').forEach(f => {
+      const path = `./test/resources/MultiSchema/foo/bar/out/${f}`
+      t.snapshot(readFileSync(path, 'utf-8'))
+      unlinkSync(path)
+    })
+    rmdirSync('./test/resources/MultiSchema/foo/bar/out')
+  })
 }