add support for directory of json files

move to promise.all and merge cli arg

Add tests for multi schema

fix revisions

rebase master

fix promise thing

Author: Ethan-Arrowood

.vscode/settings.json

@@ -1,5 +1,19 @@
 // Place your settings in this file to overwrite default and user settings.
 {
     "typescript.tsdk": "node_modules/typescript/lib",
+<<<<<<< HEAD
+    "editor.tabSize": 2,
+    "workbench.colorCustomizations": {
+        "titleBar.activeBackground": "#b483d5",
+        "titleBar.inactiveBackground": "#b483d599",
+        "titleBar.activeForeground": "#15202b",
+        "titleBar.inactiveForeground": "#15202b99",
+        "statusBar.background": "#b483d5",
+        "statusBarItem.hoverBackground": "#9d5dc8",
+        "statusBar.foreground": "#15202b"
+    },
+    "peacock.color": "#b483d5"
+=======
     "editor.tabSize": 2
+>>>>>>> f506531... fix revisions
 }

package.json

@@ -45,20 +45,26 @@
   },
   "homepage": "https://github.com/bcherny/json-schema-to-typescript#readme",
   "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",
+    "glob": "^7.1.4",
+    "is-glob": "^4.0.1",
     "json-schema-ref-parser": "^6.1.0",
     "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"
   },
   "devDependencies": {
     "@types/cli-color": "^0.3.29",
+    "@types/glob": "^7.1.1",
     "@types/lodash": "^4.14.121",
     "@types/minimist": "^1.2.0",
     "@types/mz": "0.0.32",

src/cli.ts

@@ -1,18 +1,32 @@
 #!/usr/bin/env node
 
 import { whiteBright } from 'cli-color'
-import { JSONSchema4 } from 'json-schema'
 import minimist = require('minimist')
-import { readFile, writeFile } from 'mz/fs'
-import { resolve } from 'path'
+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 === null ? undefined : made)
+  })
+})
+
+const glob = promisify(_glob)
+
 main(minimist(process.argv.slice(2), {
   alias: {
     help: ['h'],
     input: ['i'],
-    output: ['o']
+    output: ['o'],
+    recursive: ['r']
   }
 }))
 
@@ -27,14 +41,54 @@ async function main(argv: minimist.ParsedArgs) {
   const argOut: string = argv._[1] || argv.output
 
   try {
-    const schema: JSONSchema4 = JSON.parse(await readInput(argIn))
-    const ts = await compile(schema, argIn, argv as Partial<Options>)
-    await writeOutput(ts, argOut)
+    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 getFilesToProcess(argIn: string, argOut: string, argv: Partial<Options>): Promise<Promise<void>[]> {
+  return new Promise(async (res, rej) => {
+    try {
+      if (isGlob(argIn)) {
+        let files = await glob(join(process.cwd(), argIn))
+  
+        if (files.length === 0) {
+          rej('No files match glob pattern')
+        }
+  
+        if (argOut && !existsSync(argOut)) {
+          await mkdirp(argOut)
+        }
+  
+        res(files.map(file => processFile(file, { dir: argOut }, argv)))
+        return
+      } else {
+        res([processFile(argIn, { file: argOut }, argv)])
+      }
+    } catch (e) {
+      console.error(whiteBright.bgRedBright('error'), e)
+      process.exit(1)
+    }
+  })
+}
 
+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))
+      const ts = await compile(schema, file, argv)
+      await writeOutput(
+        ts,
+        out.dir ? join(process.cwd(), out.dir, `${basename(file, '.json')}.d.ts`) : out.file || ''
+      )
+      res()
+    } catch (err) {
+      rej(err)
+    }
+  })
 }
 
 function readInput(argIn?: string) {

test/__snapshots__/test/test.ts.md

@@ -1539,6 +1539,101 @@ 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
+
+    `/* 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;␊
+    }␊
+    /* 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;␊
+    }␊
+    `
+
 ## formatterOptions.js
 
 > Snapshot 1
@@ -9425,20 +9520,3 @@ Generated by [AVA](https://ava.li).
       [k: string]: any;␊
     }␊
     `
-
-## strictIndexSignatures.js
-
-> 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 StrictIndexSignatures {␊
-      maybe?: string;␊
-      [k: string]: string | undefined;␊
-    }␊
-    `

test/resources/MultiSchema/a.json

@@ -0,0 +1,10 @@
+{
+  "title": "A schema",
+  "type": "object",
+  "properties": {
+    "f": {"type": "string"},
+    "g": {"type": "integer"}
+  },
+  "additionalProperties": false,
+  "required": ["f"]
+}

test/resources/MultiSchema/b.json

@@ -0,0 +1,10 @@
+{
+  "title": "B schema",
+  "type": "object",
+  "properties": {
+    "x": {"type": "string"},
+    "y": {"type": "integer"}
+  },
+  "additionalProperties": true,
+  "required": ["y"]
+}

test/testCLI.ts

@@ -1,6 +1,6 @@
 import test from 'ava'
 import { execSync } from 'child_process'
-import { readFileSync, unlinkSync } from 'fs'
+import { readFileSync, unlinkSync, readdirSync, rmdirSync } from 'fs'
 
 export function run() {
 
@@ -82,4 +82,31 @@ export function run() {
     unlinkSync('./ReferencedType.d.ts')
   })
 
+  test('files in (-i), files out (-o)', t => {
+    execSync('node dist/src/cli.js -i ./test/resources/MultiSchema/**/*.json -o ./test/resources/MultiSchema/out').toString()
+    
+    readdirSync('./test/resources/MultiSchema/out').forEach(f => {
+      const path = `./test/resources/MultiSchema/out/${f}`
+      t.snapshot(readFileSync(path, 'utf-8'))
+      unlinkSync(path)
+    })
+    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')
+  })
 }